|
|
@@ -229,163 +229,163 @@ gulp.task('css',function () {
|
|
|
return css(commonOptions);
|
|
|
})
|
|
|
|
|
|
-gulp.task('common', ['minify','css']);
|
|
|
+gulp.task('common', gulp.series('minify','css'));
|
|
|
|
|
|
-gulp.task('login_minify',['common'], function (){
|
|
|
- return minify(loginOptions);
|
|
|
-});
|
|
|
+gulp.task('login_minify',gulp.series('common', function (){
|
|
|
+ return minify(loginOptions);
|
|
|
+}));
|
|
|
|
|
|
gulp.task('login_css',function () {
|
|
|
return css(loginOptions);
|
|
|
})
|
|
|
|
|
|
-gulp.task('login_inject',['login_minify','login_css'],function () {
|
|
|
- return inject(loginOptions);
|
|
|
-})
|
|
|
+gulp.task('login_inject',gulp.series('login_minify','login_css',function () {
|
|
|
+ return inject(loginOptions);
|
|
|
+}))
|
|
|
|
|
|
-gulp.task('login',['login_inject'], function (){
|
|
|
- return htmlmin(loginOptions);
|
|
|
-});
|
|
|
+gulp.task('login',gulp.series('login_inject', function (){
|
|
|
+ return htmlmin(loginOptions);
|
|
|
+}));
|
|
|
|
|
|
|
|
|
-gulp.task('header_minify',['common'], function (){
|
|
|
- return minify(headerOptions);
|
|
|
-});
|
|
|
+gulp.task('header_minify',gulp.series('common', function (){
|
|
|
+ return minify(headerOptions);
|
|
|
+}));
|
|
|
|
|
|
gulp.task('header_css',function () {
|
|
|
return css(headerOptions);
|
|
|
})
|
|
|
|
|
|
-gulp.task('header_inject',['header_minify','header_css'],function () {
|
|
|
- return inject(headerOptions);
|
|
|
-})
|
|
|
+gulp.task('header_inject',gulp.series('header_minify','header_css',function () {
|
|
|
+ return inject(headerOptions);
|
|
|
+}))
|
|
|
|
|
|
-gulp.task('header',['header_inject'], function (){
|
|
|
- return htmlmin(headerOptions);
|
|
|
-});
|
|
|
+gulp.task('header',gulp.series('header_inject', function (){
|
|
|
+ return htmlmin(headerOptions);
|
|
|
+}));
|
|
|
|
|
|
-gulp.task('pm_minify',['common'], function (){
|
|
|
- return minify(pmOptions);
|
|
|
-});
|
|
|
+gulp.task('pm_minify',gulp.series('common', function (){
|
|
|
+ return minify(pmOptions);
|
|
|
+}));
|
|
|
|
|
|
gulp.task('pm_css',function () {
|
|
|
return css(pmOptions);
|
|
|
})
|
|
|
|
|
|
-gulp.task('pm_inject',['pm_minify','pm_css'],function () {
|
|
|
- return inject(pmOptions);
|
|
|
-})
|
|
|
+gulp.task('pm_inject',gulp.series('pm_minify','pm_css',function () {
|
|
|
+ return inject(pmOptions);
|
|
|
+}))
|
|
|
|
|
|
-gulp.task('pm',['pm_inject'], function (){
|
|
|
- return htmlmin(pmOptions);
|
|
|
-});
|
|
|
+gulp.task('pm',gulp.series('pm_inject', function (){
|
|
|
+ return htmlmin(pmOptions);
|
|
|
+}));
|
|
|
|
|
|
-gulp.task('main_minify',['common'], function (){
|
|
|
- return minify(mainOptions);
|
|
|
-});
|
|
|
+gulp.task('main_minify',gulp.series('common', function (){
|
|
|
+ return minify(mainOptions);
|
|
|
+}));
|
|
|
|
|
|
gulp.task('main_css',function () {
|
|
|
return css(mainOptions);
|
|
|
})
|
|
|
|
|
|
-gulp.task('main_inject',['main_minify'],function () {//, ['main_minify','main_css' ] main css 打包到一起会出现样式冲突问题, 现改成不打包
|
|
|
- return inject(mainOptions);
|
|
|
-})
|
|
|
+gulp.task('main_inject',gulp.series('main_minify',function () {//, ['main_minify','main_css' ] main css 打包到一起会出现样式冲突问题, 现改成不打包
|
|
|
+ return inject(mainOptions);
|
|
|
+}))
|
|
|
|
|
|
-gulp.task('main',['main_inject'], function (){
|
|
|
- return htmlmin(mainOptions);
|
|
|
-});
|
|
|
+gulp.task('main',gulp.series('main_inject', function (){
|
|
|
+ return htmlmin(mainOptions);
|
|
|
+}));
|
|
|
|
|
|
-gulp.task('compleGlj_minify', ['common'], function () {
|
|
|
- return minify(compleGljOptions);
|
|
|
-});
|
|
|
+gulp.task('compleGlj_minify',gulp.series('common', function () {
|
|
|
+ return minify(compleGljOptions);
|
|
|
+}));
|
|
|
|
|
|
gulp.task('compleGlj_css', function () {
|
|
|
return css(compleGljOptions);
|
|
|
});
|
|
|
|
|
|
-gulp.task('compleGlj_inject', ['compleGlj_minify', 'compleGlj_css'], function () {
|
|
|
- return inject(compleGljOptions);
|
|
|
-});
|
|
|
+gulp.task('compleGlj_inject',gulp.series('compleGlj_minify', 'compleGlj_css', function () {
|
|
|
+ return inject(compleGljOptions);
|
|
|
+}));
|
|
|
|
|
|
-gulp.task('compleGlj', ['compleGlj_inject'], function () {
|
|
|
- return htmlmin(compleGljOptions);
|
|
|
-});
|
|
|
+gulp.task('compleGlj',gulp.series('compleGlj_inject', function () {
|
|
|
+ return htmlmin(compleGljOptions);
|
|
|
+}));
|
|
|
|
|
|
-gulp.task('compleRation_ration_minify', ['common'], function () {
|
|
|
- return minify(compleRation_rationOptions);
|
|
|
-});
|
|
|
+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_inject', ['compleRation_ration_minify', 'compleRation_ration_css'], function () {
|
|
|
- return inject(compleRation_rationOptions);
|
|
|
-});
|
|
|
+gulp.task('compleRation_ration_inject',gulp.series('compleRation_ration_minify', 'compleRation_ration_css', function () {
|
|
|
+ return inject(compleRation_rationOptions);
|
|
|
+}));
|
|
|
|
|
|
-gulp.task('compleRation_ration', ['compleRation_ration_inject'], function () {
|
|
|
- return htmlmin(compleRation_rationOptions);
|
|
|
-});
|
|
|
+gulp.task('compleRation_ration',gulp.series('compleRation_ration_inject', function () {
|
|
|
+ return htmlmin(compleRation_rationOptions);
|
|
|
+}));
|
|
|
|
|
|
-gulp.task('compleRation_glj_minify', ['common'], function () {
|
|
|
- return minify(compleRation_gljOptions);
|
|
|
-});
|
|
|
+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_inject', ['compleRation_glj_minify', 'compleRation_glj_css'], function () {
|
|
|
- return inject(compleRation_gljOptions);
|
|
|
-});
|
|
|
+gulp.task('compleRation_glj_inject',gulp.series('compleRation_glj_minify', 'compleRation_glj_css', function () {
|
|
|
+ return inject(compleRation_gljOptions);
|
|
|
+}));
|
|
|
|
|
|
-gulp.task('compleRation_glj', ['compleRation_glj_inject'], function () {
|
|
|
- return htmlmin(compleRation_gljOptions);
|
|
|
-});
|
|
|
+gulp.task('compleRation_glj',gulp.series('compleRation_glj_inject', function () {
|
|
|
+ return htmlmin(compleRation_gljOptions);
|
|
|
+}));
|
|
|
|
|
|
-gulp.task('compleRation_coe_minify', ['common'], function () {
|
|
|
- return minify(compleRation_coeOptions);
|
|
|
-});
|
|
|
+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_inject', ['compleRation_coe_minify', 'compleRation_coe_css'], function () {
|
|
|
- return inject(compleRation_coeOptions);
|
|
|
-});
|
|
|
+gulp.task('compleRation_coe_inject', gulp.series('compleRation_coe_minify', 'compleRation_coe_css', function () {
|
|
|
+ return inject(compleRation_coeOptions);
|
|
|
+}));
|
|
|
|
|
|
-gulp.task('compleRation_coe', ['compleRation_coe_inject'], function () {
|
|
|
- return htmlmin(compleRation_coeOptions);
|
|
|
-});
|
|
|
+gulp.task('compleRation_coe', gulp.series('compleRation_coe_inject', function () {
|
|
|
+ return htmlmin(compleRation_coeOptions);
|
|
|
+}));
|
|
|
|
|
|
-gulp.task('compleRation_inst_minify', ['common'], function () {
|
|
|
- return minify(compleRation_instOptions);
|
|
|
-});
|
|
|
+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_inject', ['compleRation_inst_minify', 'compleRation_inst_css'], function () {
|
|
|
- return inject(compleRation_instOptions);
|
|
|
-});
|
|
|
+gulp.task('compleRation_inst_inject', gulp.series('compleRation_inst_minify', 'compleRation_inst_css', function () {
|
|
|
+ return inject(compleRation_instOptions);
|
|
|
+}));
|
|
|
|
|
|
-gulp.task('compleRation_inst', ['compleRation_inst_inject'], function () {
|
|
|
- return htmlmin(compleRation_instOptions);
|
|
|
-});
|
|
|
+gulp.task('compleRation_inst', gulp.series('compleRation_inst_inject', function () {
|
|
|
+ return htmlmin(compleRation_instOptions);
|
|
|
+}));
|
|
|
|
|
|
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.series('header','login','pm','main', 'compleGlj', 'compleRation_ration', 'compleRation_glj', 'compleRation_coe', 'compleRation_inst','unit_price'));
|