diff --git a/gulpfile.js b/gulpfile.js index 88583a976dd261bc1d9bba37bdad242effbb265c..fdd2c95029a5c7342465c75c1ea7169a16fe2e06 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,12 +1,13 @@ -const gulp = require('gulp'); -var sass = require('gulp-sass'); -var autoprefixer = require('gulp-autoprefixer'); -var cssmin = require('gulp-cssmin'); -const webpack = require('webpack'); -const webpackConf = require('./build/build.js'); +const gulp = require("gulp"); +var sass = require("gulp-sass"); +var autoprefixer = require("gulp-autoprefixer"); +var cssmin = require("gulp-cssmin"); +const webpack = require("webpack"); +const webpackConf = require("./build/build.js"); + // 构建webpack配置 -gulp.task('webpack', function () { - webpack(webpackConf, function (err, stats) { +gulp.task("webpack", async function() { + await webpack(webpackConf, function(err, stats) { if (err) { console.log(err); } @@ -14,24 +15,25 @@ gulp.task('webpack', function () { }); // 处理样式的配置 -gulp.task('compile', function () { +gulp.task("compile", function() { return gulp - .src('./styles/index.scss') + .src("./styles/index.scss") .pipe(sass.sync()) .pipe( autoprefixer({ - browsers: ['ie > 9', 'last 2 versions'], + browsers: ["ie > 9", "last 2 versions"], cascade: false }) ) .pipe(cssmin()) - .pipe(gulp.dest('./lib/')); + .pipe(gulp.dest("./lib/")); }); + // 打包文件 -gulp.task('build', ['webpack', 'compile']); +gulp.task("build", gulp.series(["webpack", "compile"])); // 监听文件变化 -gulp.task('watch', ['webpack', 'compile'], function () { - gulp.watch(['./src/**', './packages/**'], ['webpack']); - gulp.watch(['./styles/**'], ['compile']); +gulp.task("watch", async function() { + gulp.watch(["./src/**", "./packages/**"], gulp.series(["webpack"])); + gulp.watch(["./styles/**"], gulp.series(["compile"])); }); diff --git a/package.json b/package.json index 267cd2d18c6dc26d37a513350aa6dfb95307081f..618a1727539aa5f604d08f5aed846464ce02f466 100644 --- a/package.json +++ b/package.json @@ -49,11 +49,11 @@ "eslint-loader": "^1.9.0", "eslint-plugin-html": "^4.0.1", "eslint-plugin-json": "^1.2.0", - "gulp": "^3.9.1", + "gulp": "^4.0.0", "gulp-autoprefixer": "^4.0.0", "gulp-cssmin": "^0.1.7", "gulp-postcss": "^6.1.1", - "gulp-sass": "^3.1.0", + "gulp-sass": "^4.1.0", "karma": "^1.3.0", "karma-chrome-launcher": "^2.2.0", "karma-coverage": "^1.1.1", @@ -90,4 +90,4 @@ "README.md", "LICENSE" ] -} \ No newline at end of file +}