updated dependencies

improved build performance
nk-crew · Oct 1, 2018 · 231ab1f · 231ab1f
1 parent c4f88b2
commit 231ab1f
Show file tree

Hide file tree

Showing 9 changed files with 4,130 additions and 4,861 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,6 +1,6 @@
 {
     "presets": [
-        [ "env", {
+        [ "@babel/preset-env", {
             "modules": false,
             "targets": {
                 "browsers": [
@@ -19,6 +19,6 @@
         [ "transform-react-jsx", {
             "pragma": "wp.element.createElement"
         } ],
-        [ "transform-object-rest-spread" ]
+        [ "@babel/plugin-proposal-object-rest-spread" ]
     ]
 }
diff --git a/.eslintrc b/.eslintrc
@@ -5,15 +5,13 @@
     "extends": [
         "wordpress",
         "plugin:react/recommended",
-        "plugin:jsx-a11y/recommended",
-        "plugin:jest/recommended"
+        "plugin:jsx-a11y/recommended"
     ],
     "env": {
         "browser": false,
         "es6": true,
         "node": true,
-        "mocha": true,
-        "jest/globals": true
+        "mocha": true
     },
     "parserOptions": {
         "sourceType": "module",
@@ -27,7 +25,7 @@
         "window": true,
         "document": true
     },
-    "plugins": ["react", "jsx-a11y", "jest"],
+    "plugins": ["react", "jsx-a11y"],
     "settings": {
         "react": {
             "pragma": "wp"

diff --git a/gulpfile.babel.js b/gulpfile.babel.js
@@ -17,6 +17,8 @@ const production_config = template(data.gulp_config.production);
 
 const dist = templateVars.dist;
 
+let isDev = false;
+
 // run streams for each of theme items (theme and plugins)
 function runStream (arr, func) {
     var streams = merge();
@@ -75,7 +77,7 @@ gulp.task('build_blocks_js', function () {
         return gulp.src(itemData.from + '/blocks/index.jsx')
             .pipe($.plumber({ errorHandler }))
             .pipe(named())
-            .pipe(webpack(webpackconfig))
+            .pipe(webpack(webpackconfig(isDev)))
             .pipe($.rename({
                 suffix: '.min'
             }))
@@ -88,8 +90,9 @@ gulp.task('build_js', function () {
             .pipe($.plumber({ errorHandler }))
             .pipe(named())
             .pipe(webpack({
+                mode: isDev ? 'development' : 'production',
                 module: {
-                    loaders: [
+                    rules: [
                         {
                             test: /.js$/,
                             loader: 'babel-loader',
@@ -98,11 +101,6 @@ gulp.task('build_js', function () {
                     ],
                 },
             }))
-            .pipe($.uglify({
-                output: {
-                    comments: /^!/
-                }
-            }))
             .pipe($.rename({
                 suffix: '.min'
             }))
@@ -228,15 +226,23 @@ gulp.task('watch_build_vendors', function(cb) {
 /**
  * Watch Task
  */
-gulp.task('watch', ['build'], function() {
-    for (var k = 0; k < work_folders.length; k++) {
-        var itemData = work_folders[k];
-        gulp.watch([itemData.from + '/**/*.php', '!' + itemData.from + '/*vendor/**/*'], ['watch_build_php']);
-        gulp.watch([itemData.from + '/**/*.{js,jsx}', '!' + itemData.from + '/*vendor/**/*'], ['build_blocks_js', 'build_js']);
-        gulp.watch([itemData.from + '/**/*.scss', '!' + itemData.from + '/*vendor/**/*'], ['build_scss', 'build_blocks_js']);
-        gulp.watch([itemData.from + '/**/*', '!' + itemData.from + '/**/*.{php,js,jsx,scss}', itemData.from + '/*vendor/**/*'], ['watch_build_all']);
-        gulp.watch(itemData.from + '/**/vendor/**/*', ['watch_build_vendors']);
-    }
+gulp.task('watch', function() {
+    isDev = true;
+    runSequence(
+        'build',
+        function() {
+            for (var k = 0; k < work_folders.length; k++) {
+                var itemData = work_folders[k];
+                gulp.watch([itemData.from + '/**/*.php', '!' + itemData.from + '/*vendor/**/*'], ['watch_build_php']);
+                gulp.watch([itemData.from + '/**/*.{js,jsx}', '!' + itemData.from + '/*vendor/**/*'], () => {
+                    runSequence('build_blocks_js', 'build_js');
+                });
+                gulp.watch([itemData.from + '/**/*.scss', '!' + itemData.from + '/*vendor/**/*'], ['build_scss', 'build_blocks_js']);
+                gulp.watch([itemData.from + '/**/*', '!' + itemData.from + '/**/*.{php,js,jsx,scss}', itemData.from + '/*vendor/**/*'], ['watch_build_all']);
+                gulp.watch(itemData.from + '/**/vendor/**/*', ['watch_build_vendors']);
+            }
+        }
+    );
 });