gulp 版本冲突问题

Dockerfile

@@ -3,7 +3,6 @@ FROM costbase_package_new_node_npm as build
 WORKDIR /home/ConstructionCost
 
 COPY package.json /home/ConstructionCost/
-COPY npm-shrinkwrap.json /home/ConstructionCost/
 
 RUN npm install
 

gulpfile.js

@@ -190,18 +190,18 @@ function minify(options) {
             .pipe($.concat(options.concatName+"."+version+".js"))
             .pipe(gulp.dest(scriptsDest));
     }
-    return;
+    return null;
 }
 
-function css(options) {
-    if(options.csspaths){
+function css(options,done) {
+    if(options.csspaths && options.csspaths.length > 0){
         return gulp.src(options.csspaths)
             .pipe($.plumber())
             .pipe($.cssnano({reduceIdents: false}))
             .pipe($.concat(options.concatName+"."+version+".css"))
             .pipe(gulp.dest(cssDest));
     }
-    return;
+    if(done) return done();
 }
 
 function inject(options) {
@@ -228,150 +228,150 @@ gulp.task('css',function () {
     return css(commonOptions);
 })
 
-gulp.task('common', ['minify','css']);
+gulp.task('common', gulp.parallel('minify','css'));
 
-gulp.task('login_minify',['common'], function (){
+gulp.task('login_minify',gulp.series('common'), function (){
     return minify(loginOptions);
 });
 
-gulp.task('login_css',function () {
-    return css(loginOptions);
+gulp.task('login_css',function (done) {
+    return css(loginOptions,done);
 })
 
-gulp.task('login_inject',['login_minify','login_css'],function () {
+gulp.task('login_inject', gulp.parallel('login_minify','login_css'),function () {
     return inject(loginOptions);
 })
 
-gulp.task('login',['login_inject'], function (){
+gulp.task('login',gulp.series('login_inject'), function (){
     return htmlmin(loginOptions);
 });
 
 
-gulp.task('header_minify',['common'], function (){
+gulp.task('header_minify',gulp.series('common'), function (){
     return minify(headerOptions);
 });
 
-gulp.task('header_css',function () {
-    return css(headerOptions);
+gulp.task('header_css',function (done) {
+    return css(headerOptions,done);
 })
 
-gulp.task('header_inject',['header_minify','header_css'],function () {
+gulp.task('header_inject', gulp.parallel('header_minify','header_css'),function () {
     return inject(headerOptions);
 })
 
-gulp.task('header',['header_inject'], function (){
+gulp.task('header',gulp.series('header_inject'), function (){
     return htmlmin(headerOptions);
 });
 
-gulp.task('pm_minify',['common'], function (){
+gulp.task('pm_minify',gulp.series('common'), function (){
     return minify(pmOptions);
 });
 
-gulp.task('pm_css',function () {
-    return css(pmOptions);
+gulp.task('pm_css',function (done) {
+    return css(pmOptions,done);
 })
 
-gulp.task('pm_inject',['pm_minify','pm_css'],function () {
+gulp.task('pm_inject',gulp.parallel('pm_minify','pm_css'),function () {
     return inject(pmOptions);
 })
 
-gulp.task('pm',['pm_inject'], function (){
+gulp.task('pm',gulp.series('pm_inject'), function (){
     return htmlmin(pmOptions);
 });
 
-gulp.task('main_minify',['common'], function (){
+gulp.task('main_minify',gulp.series('common'), function (){
     return minify(mainOptions);
 });
 
-gulp.task('main_css',function () {
-    return css(mainOptions);
+gulp.task('main_css',function (done) {
+    return css(mainOptions,done);
 })
 
-gulp.task('main_inject',['main_minify'],function () {//, ['main_minify','main_css'  ] main css 打包到一起会出现样式冲突问题， 现改成不打包
+gulp.task('main_inject',gulp.series('main_minify'),function () {//, ['main_minify','main_css'  ] main css 打包到一起会出现样式冲突问题， 现改成不打包
     return inject(mainOptions);
 })
 
-gulp.task('main',['main_inject'], function (){
+gulp.task('main',gulp.series('main_inject'), function (){
     return htmlmin(mainOptions);
 });
 
-gulp.task('compleGlj_minify', ['common'], function () {
+gulp.task('compleGlj_minify', gulp.series('common'), function () {
     return minify(compleGljOptions);
 });
 
-gulp.task('compleGlj_css', function () {
-    return css(compleGljOptions);
+gulp.task('compleGlj_css', function (done) {
+    return css(compleGljOptions,done);
 });
 
-gulp.task('compleGlj_inject', ['compleGlj_minify', 'compleGlj_css'], function () {
+gulp.task('compleGlj_inject',  gulp.parallel('compleGlj_minify', 'compleGlj_css'), function () {
     return inject(compleGljOptions);
 });
 
-gulp.task('compleGlj', ['compleGlj_inject'], function () {
+gulp.task('compleGlj', gulp.series('compleGlj_inject'), function () {
     return htmlmin(compleGljOptions);
 });
 
-gulp.task('compleRation_ration_minify', ['common'], function () {
+gulp.task('compleRation_ration_minify', gulp.series('common'), function () {
     return minify(compleRation_rationOptions);
 });
 
-gulp.task('compleRation_ration_css', function () {
-    return css(compleRation_rationOptions);
+gulp.task('compleRation_ration_css', function (done) {
+    return css(compleRation_rationOptions,done);
 });
 
-gulp.task('compleRation_ration_inject', ['compleRation_ration_minify', 'compleRation_ration_css'], function () {
+gulp.task('compleRation_ration_inject',  gulp.parallel('compleRation_ration_minify', 'compleRation_ration_css'), function () {
     return inject(compleRation_rationOptions);
 });
 
-gulp.task('compleRation_ration', ['compleRation_ration_inject'], function () {
+gulp.task('compleRation_ration', gulp.series('compleRation_ration_inject'), function () {
     return htmlmin(compleRation_rationOptions);
 });
 
-gulp.task('compleRation_glj_minify', ['common'], function () {
+gulp.task('compleRation_glj_minify', gulp.series('common'), function () {
     return minify(compleRation_gljOptions);
 });
 
-gulp.task('compleRation_glj_css', function () {
-    return css(compleRation_gljOptions);
+gulp.task('compleRation_glj_css', function (done) {
+    return css(compleRation_gljOptions,done);
 });
 
-gulp.task('compleRation_glj_inject', ['compleRation_glj_minify', 'compleRation_glj_css'], function () {
+gulp.task('compleRation_glj_inject',  gulp.parallel('compleRation_glj_minify', 'compleRation_glj_css'), function () {
     return inject(compleRation_gljOptions);
 });
 
-gulp.task('compleRation_glj', ['compleRation_glj_inject'], function () {
+gulp.task('compleRation_glj', gulp.series('compleRation_glj_inject'), function () {
     return htmlmin(compleRation_gljOptions);
 });
 
-gulp.task('compleRation_coe_minify', ['common'], function () {
+gulp.task('compleRation_coe_minify', gulp.series('common'), function () {
     return minify(compleRation_coeOptions);
 });
 
-gulp.task('compleRation_coe_css', function () {
-    return css(compleRation_coeOptions);
+gulp.task('compleRation_coe_css', function (done) {
+    return css(compleRation_coeOptions,done);
 });
 
-gulp.task('compleRation_coe_inject', ['compleRation_coe_minify', 'compleRation_coe_css'], function () {
+gulp.task('compleRation_coe_inject',  gulp.parallel('compleRation_coe_minify', 'compleRation_coe_css'), function () {
     return inject(compleRation_coeOptions);
 });
 
-gulp.task('compleRation_coe', ['compleRation_coe_inject'], function () {
+gulp.task('compleRation_coe', gulp.series('compleRation_coe_inject'), function () {
     return htmlmin(compleRation_coeOptions);
 });
 
-gulp.task('compleRation_inst_minify', ['common'], function () {
+gulp.task('compleRation_inst_minify', gulp.series('common'), function () {
     return minify(compleRation_instOptions);
 });
 
-gulp.task('compleRation_inst_css', function () {
-    return css(compleRation_instOptions);
+gulp.task('compleRation_inst_css', function (done) {
+    return css(compleRation_instOptions,done);
 });
 
-gulp.task('compleRation_inst_inject', ['compleRation_inst_minify', 'compleRation_inst_css'], function () {
+gulp.task('compleRation_inst_inject',  gulp.parallel('compleRation_inst_minify', 'compleRation_inst_css'), function () {
     return inject(compleRation_instOptions);
 });
 
-gulp.task('compleRation_inst', ['compleRation_inst_inject'], function () {
+gulp.task('compleRation_inst', gulp.series('compleRation_inst_inject'), function () {
     return htmlmin(compleRation_instOptions);
 });
 
@@ -379,13 +379,13 @@ gulp.task('unitPrice_minify', function (){
   return minify(unitPriceOptions);
 });
 
-gulp.task('unitPrice_inject',['unitPrice_minify'],function (){
+gulp.task('unitPrice_inject',gulp.series('unitPrice_minify'),function (){
   return inject(unitPriceOptions);
 })
 
-gulp.task('unit_price',['unitPrice_inject'], function (){
+gulp.task('unit_price',gulp.series('unitPrice_inject'), function (){
   return htmlmin(unitPriceOptions);
 });
 
 
-gulp.task('build',['header','login','pm','main', 'compleGlj', 'compleRation_ration', 'compleRation_glj', 'compleRation_coe', 'compleRation_inst','unit_price']);
+gulp.task('build', gulp.parallel('header','login','pm','main', 'compleGlj', 'compleRation_ration', 'compleRation_glj', 'compleRation_coe', 'compleRation_inst','unit_price'));

modules/common/fileUtils.js

@@ -29,17 +29,14 @@ module.exports.getGlobbedFiles = function(globPatterns, removeRoot) {
 		if (urlRegex.test(globPatterns)) {
 			output.push(globPatterns);
 		} else {
-			glob(globPatterns, {
-				sync: true
-			}, function(err, files) {
-				if (removeRoot) {
-					files = files.map(function(file) {
-						return file.replace(removeRoot, '');
-					});
-				}
-
-				output = _.union(output, files);
-			});
+      var files =  glob(globPatterns, {	sync: true});
+      if (removeRoot) {
+        files = files.map(function(file) {
+          return file.replace(removeRoot, '');
+        });
+      }
+
+      output = _.union(output, files);
 		}
 	}
 

modules/reports/controllers/rpt_controller.js

@@ -1,7 +1,7 @@
 /**
  * Created by Tony on 2017/3/13.
  */
-let UserModel require("../../users/models/user_model");
+let UserModel =  require("../../users/models/user_model");
 const mongoose = require("mongoose");
 const async = require("async");
 

npm-shrinkwrap.json

@@ -1,7 +0,0 @@
-{
-  "dependencies": {
-    "graceful-fs": {
-      "version": "4.2.3"
-    }
-  }
-}

package.json

@@ -16,13 +16,13 @@
     "tape": "^4.6.3",
     "nodemon": "^1.11.0",
     "lodash": "^3.10.1",
-    "glob": "~4.0.5"
+    "glob": "~7.1.6"
   },
   "dependencies": {
     "bluebird": "^3.5.0",
     "del": "^1.1.1",
     "gt3-sdk": "^2.0.0",
-    "gulp": "^3.9.0",
+    "gulp": "^4.0.2",
     "gulp-autoprefixer": "^3.0.1",
     "gulp-babel": "^6.1.1",
     "gulp-concat": "^2.6.1",
@@ -53,7 +53,7 @@
     "socket.io": "2.0.3",
     "ua-parser-js": "^0.7.14",
     "uuid": "^3.1.0",
-    "wiredep": "^2.2.2"
+    "wiredep": "^4.0.0"
   },
   "scripts": {
     "start": "node server.js",