From: Nicolas Coden Date: Thu, 5 Apr 2018 20:50:37 +0000 (+0200) Subject: chore: migrate to webpack 4 X-Git-Tag: v6.6.0~3^2~241^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d09fbc3b811762399af980dda97428c632fcaeac;p=thirdparty%2Ffoundation%2Ffoundation-sites.git chore: migrate to webpack 4 Changes: * add required `mode` option. Use "development" mode as optimization are handled by others gulp plugins. * use `webpack` instead of `webpack2` * remove stats about chunks (set as true by default in webpack 4) --- diff --git a/gulp/tasks/customizer.js b/gulp/tasks/customizer.js index ecd143f6e..f4bffcd68 100644 --- a/gulp/tasks/customizer.js +++ b/gulp/tasks/customizer.js @@ -22,7 +22,7 @@ var zip = require('gulp-zip'); var postcss = require('gulp-postcss'); var autoprefixer = require('autoprefixer'); var webpackStream = require('webpack-stream'); -var webpack2 = require('webpack'); +var webpack = require('webpack'); var named = require('vinyl-named'); var utils = require('../utils.js'); @@ -40,6 +40,7 @@ var MODULE_LIST; var VARIABLE_LIST; var WEBPACK_CONFIG = { + mode: 'development', externals: utils.umdExternals({ 'jquery': 'jQuery' }), @@ -123,7 +124,7 @@ gulp.task('customizer:javascript-entry', ['customizer:loadConfig'], function() { gulp.task('customizer:javascript', ['customizer:javascript-entry'], function() { return gulp.src(path.join(OUTPUT_DIR, 'js/vendor/foundation.js')) - .pipe(webpackStream(WEBPACK_CONFIG, webpack2)) + .pipe(webpackStream(WEBPACK_CONFIG, webpack)) .pipe(rename('foundation.js')) .pipe(gulp.dest(path.join(OUTPUT_DIR, 'js/vendor'))) .pipe(uglify()) diff --git a/gulp/tasks/javascript.js b/gulp/tasks/javascript.js index 63f8f7636..5c83c82bc 100644 --- a/gulp/tasks/javascript.js +++ b/gulp/tasks/javascript.js @@ -4,7 +4,7 @@ var babel = require('gulp-babel'); var onBabelError = require('./babel-error.js'); var rename = require('gulp-rename'); var webpackStream = require('webpack-stream'); -var webpack2 = require('webpack'); +var webpack = require('webpack'); var named = require('vinyl-named'); var sequence = require('run-sequence'); var sourcemaps = require('gulp-sourcemaps'); @@ -53,6 +53,7 @@ var webpackOutputAsExternal = { }; var webpackConfig = { + mode: 'development', externals: utils.umdExternals({ 'jquery': 'jQuery' }), @@ -72,7 +73,11 @@ var webpackConfig = { libraryTarget: 'umd', }, // https://github.com/shama/webpack-stream#source-maps - devtool: 'source-map' + devtool: 'source-map', + stats: { + chunks: false, + entrypoints: false, + } } // ----- TASKS ----- @@ -92,7 +97,7 @@ gulp.task('javascript:plugin-core', function() { .pipe(sourcemaps.init()) .pipe(webpackStream(Object.assign({}, webpackConfig, { output: webpackOutputAsExternal, - }), webpack2)) + }), webpack)) .pipe(sourcemaps.write('.')) .pipe(gulp.dest('_build/assets/js/plugins')); }); @@ -103,7 +108,7 @@ gulp.task('javascript:plugins', ['javascript:plugin-core'], function () { .pipe(webpackStream(Object.assign({}, webpackConfig, { externals: webpackExternalPlugins, output: webpackOutputAsExternal, - }), webpack2)) + }), webpack)) .pipe(sourcemaps.write('.')) .pipe(gulp.dest('_build/assets/js/plugins')); }); @@ -112,7 +117,7 @@ gulp.task('javascript:foundation', ['javascript:plugins'], function() { return gulp.src('js/entries/foundation.js') .pipe(named()) .pipe(sourcemaps.init()) - .pipe(webpackStream(webpackConfig, webpack2)) + .pipe(webpackStream(webpackConfig, webpack)) .pipe(sourcemaps.write('.')) .pipe(gulp.dest('_build/assets/js')); });