Gerald 8 лет назад
Родитель
Сommit
3600e4dd3f
2 измененных файлов с 5 добавлено и 7 удалено
  1. 5 5
      gulpfile.js
  2. 0 2
      package.json

+ 5 - 5
gulpfile.js

@@ -1,7 +1,6 @@
 const del = require('del');
 const gulp = require('gulp');
 const gutil = require('gulp-util');
-const concat = require('gulp-concat');
 const gulpFilter = require('gulp-filter');
 const uglify = require('gulp-uglify');
 const svgSprite = require('gulp-svg-sprite');
@@ -9,6 +8,7 @@ const webpack = require('webpack');
 const i18n = require('./scripts/i18n');
 const json = require('./scripts/json');
 const pkg = require('./package.json');
+
 const isProd = process.env.NODE_ENV === 'production';
 const webpackConfig = require('./scripts/webpack.conf');
 
@@ -60,7 +60,7 @@ gulp.task('js-dev', () => webpack(webpackConfig).watch({}, webpackCallback));
 gulp.task('js-prd', () => webpack(webpackConfig, webpackCallback));
 
 gulp.task('manifest', () => (
-  gulp.src(paths.manifest, {base: 'src'})
+  gulp.src(paths.manifest, { base: 'src' })
   .pipe(json(data => {
     data.version = pkg.version.replace(/-[^.]*/, '');
     return data;
@@ -69,13 +69,13 @@ gulp.task('manifest', () => (
 ));
 
 gulp.task('copy-files', () => {
-  const jsFilter = gulpFilter(['**/*.js'], {restore: true});
-  let stream = gulp.src(paths.copy, {base: 'src'});
+  const jsFilter = gulpFilter(['**/*.js'], { restore: true });
+  let stream = gulp.src(paths.copy, { base: 'src' });
   if (isProd) stream = stream
   .pipe(jsFilter)
   .pipe(uglify())
   .pipe(jsFilter.restore);
-  stream = stream
+  return stream
   .pipe(gulp.dest('dist/'));
 });
 

+ 0 - 2
package.json

@@ -33,7 +33,6 @@
     "extract-text-webpack-plugin": "^2.1.0",
     "friendly-errors-webpack-plugin": "^1.6.1",
     "gulp": "^3.9.1",
-    "gulp-concat": "^2.6.0",
     "gulp-filter": "^5.0.0",
     "gulp-svg-sprite": "^1.2.19",
     "gulp-uglify": "^2.0.0",
@@ -65,7 +64,6 @@
   "dependencies": {
     "codemirror": "^5.25.0",
     "core-js": "^2.4.1",
-    "define-commonjs": "^1.1.2",
     "sync-promise-lite": "^0.2.3",
     "vue": "^2.2.5"
   }