bumped to webpack 5

oguilleux · Oct 16, 2020 · 5af38b3 · 5af38b3
1 parent 70a4ea0
commit 5af38b3
Show file tree

Hide file tree

Showing 7 changed files with 402 additions and 521 deletions.
diff --git a/gulp/core/config/scripts.js b/gulp/core/config/scripts.js
@@ -51,9 +51,6 @@ module.exports = deepMerge({
 			// for :prod task
 			prod: {
 				mode: 'production',
-				plugins: [
-					new webpack.optimize.OccurrenceOrderPlugin(true),
-				],
 				optimization: {
 					minimize: true,
 					minimizer: [

diff --git a/gulp/core/recipes/scripts/dev.js b/gulp/core/recipes/scripts/dev.js
@@ -1,6 +1,7 @@
 var gulp         = require('gulp');
 var plumber      = require('gulp-plumber');
 var named        = require('vinyl-named');
+var webpack 	 = require('webpack');
 var gulpWebpack  = require('webpack-stream');
 var browserSync  = require('browser-sync');
 
@@ -31,7 +32,7 @@ module.exports = function () {
 			deepMerge(
 				config.options.webpack.defaults,
 				config.options.webpack.dev
-			), null, function (err, stats) {
+			), webpack, function (err, stats) {
 				logStats(err, stats);
 				// reload browser-sync when
 				// a package is updated

diff --git a/gulp/core/recipes/scripts/prod.js b/gulp/core/recipes/scripts/prod.js
@@ -1,6 +1,7 @@
 var gulp         = require('gulp');
 var plumber      = require('gulp-plumber');
 var named        = require('vinyl-named');
+var webpack 	 = require('webpack');
 var gulpWebpack  = require('webpack-stream');
 var notify       = require('gulp-notify');
 
@@ -27,7 +28,7 @@ module.exports = function () {
 			deepMerge(
 				config.options.webpack.defaults,
 				config.options.webpack.prod
-			)
+			), webpack
 		))
 
 		.pipe(gulp.dest(config.paths.dest))

diff --git a/gulp/core/recipes/scripts/watch.js b/gulp/core/recipes/scripts/watch.js
@@ -1,6 +1,7 @@
 var gulp         = require('gulp');
 var plumber      = require('gulp-plumber');
 var named        = require('vinyl-named');
+var webpack 	 = require('webpack');
 var gulpWebpack  = require('webpack-stream');
 var browserSync  = require('browser-sync');
 
@@ -23,7 +24,7 @@ var config       = require('../../config/scripts');
  * @returns {*}
  */
 module.exports = function (done) {
-	return gulp.src(config.paths.src)
+	gulp.src(config.paths.src)
 		.pipe(plumber())
 
 		.pipe(named()) // vinyl-named is used to allow for
@@ -32,16 +33,15 @@ module.exports = function (done) {
 			deepMerge(
 				config.options.webpack.defaults,
 				config.options.webpack.watch
-			), null, function (err, stats) {
+			), webpack, function (err, stats) {
 				logStats(err, stats, { watch: true });
 
 				// reload browser-sync when
 				// a package is updated
 				browserSync.reload();
 				notifaker(pumped('JS Packaged'));
-   	 	})
+   	 		})
 		)
-
 		.pipe(gulp.dest(config.paths.dest));
 
 	done();