Make ServiceWorker.minify option auto-detect usage of optimization.minimize (webpack 4+)

Fixes #379

Author: NekR

lib/misc/sw-loader.js

@@ -12,7 +12,7 @@ module.exports = function () {};
 module.exports.pitch = function pitch(remainingRequest, precedingRequest, data) {
   var _this = this;
 
-  this.cacheable && this.cacheable();;
+  this.cacheable && this.cacheable();
 
   var callback = this.async();
   var templatePath = path.join(__dirname, 'sw-template.js');

lib/service-worker.js

@@ -88,32 +88,36 @@ var ServiceWorker = (function () {
       childCompiler.context = compiler.context;
       new _webpackLibSingleEntryPlugin2['default'](compiler.context, entry, name).apply(childCompiler);
 
+      var optimization = compiler.options.optimization || {};
+
+      var uglifyOptions = {
+        compress: {
+          warnings: false,
+          dead_code: true,
+          drop_console: true,
+          unused: true
+        },
+
+        output: {
+          comments: false
+        }
+      };
+
       if (this.minify === true) {
         if (!_miscGetUglifyPlugin2['default']) {
-          throw new Error('OfflinePlugin: uglifyjs-webpack-plugin is required to preform minification');
+          throw new Error('OfflinePlugin: uglifyjs-webpack-plugin is required to preform a minification');
         }
 
         var options = {
           test: new RegExp(name),
-          uglifyOptions: {
-            compress: {
-              warnings: false,
-              dead_code: true,
-              drop_console: true,
-              unused: true
-            },
-
-            output: {
-              comments: false
-            }
-          }
+          uglifyOptions: uglifyOptions
         };
 
         new _miscGetUglifyPlugin2['default'](options).apply(childCompiler);
-      } else if (this.minify !== false && _miscGetUglifyPlugin2['default']) {
+      } else if ((this.minify !== false || optimization.minimize) && _miscGetUglifyPlugin2['default']) {
         // Do not perform auto-minification if UglifyJsPlugin isn't installed
 
-        (compiler.options.plugins || []).some(function (plugin) {
+        var added = (optimization.minimize && optimization.minimizer || []).concat(compiler.options.plugins || []).some(function (plugin) {
           if (plugin instanceof _miscGetUglifyPlugin2['default']) {
             var options = (0, _deepExtend2['default'])({}, plugin.options);
 
@@ -123,6 +127,15 @@ var ServiceWorker = (function () {
             return true;
           }
         });
+
+        if (!added && optimization.minimize) {
+          var options = {
+            test: new RegExp(name),
+            uglifyOptions: uglifyOptions
+          };
+
+          new _miscGetUglifyPlugin2['default'](options).apply(childCompiler);
+        }
       }
 
       // Needed for HMR. offline-plugin doesn't support it,
@@ -163,9 +176,9 @@ var ServiceWorker = (function () {
       if (typeof this.minify === 'boolean') {
         minify = this.minify;
       } else {
-        minify = !!_miscGetUglifyPlugin2['default'] && !!(compiler.options.plugins || []).some(function (plugin) {
+        minify = !!_miscGetUglifyPlugin2['default'] && (!!(compiler.options.optimization && compiler.options.optimization.minimize) || !!(compiler.options.plugins || []).some(function (plugin) {
           return plugin instanceof _miscGetUglifyPlugin2['default'];
-        });
+        }));
       }
 
       var source = this.getDataTemplate(plugin.caches, plugin, minify);

src/service-worker.js

@@ -66,32 +66,39 @@ export default class ServiceWorker {
     childCompiler.context = compiler.context;
     new SingleEntryPlugin(compiler.context, entry, name).apply(childCompiler);
 
+    const optimization = compiler.options.optimization || {};
+
+    const uglifyOptions = {
+      compress: {
+        warnings: false,
+        dead_code: true,
+        drop_console: true,
+        unused: true
+      },
+
+      output: {
+        comments: false
+      }
+    };
+
     if (this.minify === true) {
       if (!UglifyJsPlugin) {
-        throw new Error('OfflinePlugin: uglifyjs-webpack-plugin is required to preform minification')
+        throw new Error('OfflinePlugin: uglifyjs-webpack-plugin is required to preform a minification')
       }
 
       const options = {
         test: new RegExp(name),
-        uglifyOptions: {
-          compress: {
-            warnings: false,
-            dead_code: true,
-            drop_console: true,
-            unused: true
-          },
-
-          output: {
-            comments: false
-          }
-        }
+        uglifyOptions: uglifyOptions
       };
 
       new UglifyJsPlugin(options).apply(childCompiler);
-    } else if (this.minify !== false && UglifyJsPlugin) {
+    } else if (
+      (this.minify !== false || optimization.minimize) && UglifyJsPlugin
+    ) {
       // Do not perform auto-minification if UglifyJsPlugin isn't installed
 
-      (compiler.options.plugins || []).some((plugin) => {
+      const added = ((optimization.minimize && optimization.minimizer) || [])
+      .concat(compiler.options.plugins || []).some((plugin) => {
         if (plugin instanceof UglifyJsPlugin) {
           const options = deepExtend({}, plugin.options);
 
@@ -101,6 +108,15 @@ export default class ServiceWorker {
           return true;
         }
       });
+
+      if (!added && optimization.minimize) {
+        const options = {
+          test: new RegExp(name),
+          uglifyOptions: uglifyOptions
+        };
+
+        new UglifyJsPlugin(options).apply(childCompiler);
+      }
     }
 
     // Needed for HMR. offline-plugin doesn't support it,
@@ -140,10 +156,16 @@ export default class ServiceWorker {
     if (typeof this.minify === 'boolean') {
       minify = this.minify;
     } else {
-      minify = !!UglifyJsPlugin &&
-        !!(compiler.options.plugins || []).some((plugin) => {
-          return plugin instanceof UglifyJsPlugin;
-        });
+      minify = !!UglifyJsPlugin && (
+        !!(
+          compiler.options.optimization &&
+          compiler.options.optimization.minimize
+        ) || !!(
+          (compiler.options.plugins || []).some((plugin) => {
+            return plugin instanceof UglifyJsPlugin;
+          })
+        )
+      );
     }
 
     let source = this.getDataTemplate(plugin.caches, plugin, minify);

tests/legacy/compare.js

@@ -35,6 +35,12 @@ module.exports = function(testDir) {
   var expectedFolder = path.join(testDir, '__expected', 'webpack' + webpackVersion.split('.')[0]);
   var outputFolder = path.join(testDir, '__output');
 
+  try {
+    fs.accessSync(expectedFolder);
+  } catch (e) {
+    return Promise.resolve();
+  }
+
   var res = dircompare.compareSync(
     expectedFolder,
     outputFolder,

tests/legacy/fixtures/sw-minify-auto/__expected/webpack2/appcache/manifest.appcache

@@ -0,0 +1,8 @@
+CACHE MANIFEST
+#ver:da39a3ee5e6b4b0d3255bfef95601890afd80709
+
+CACHE:
+../external.js
+
+NETWORK:
+*

tests/legacy/fixtures/sw-minify-auto/__expected/webpack2/appcache/manifest.html

@@ -0,0 +1,2 @@
+<!doctype html>
+<html manifest="manifest.appcache"></html>

tests/legacy/fixtures/sw-minify-auto/__expected/webpack2/main.js

@@ -0,0 +1,8 @@
+CACHE MANIFEST
+#ver:da39a3ee5e6b4b0d3255bfef95601890afd80709
+
+CACHE:
+../external.js
+
+NETWORK:
+*

tests/legacy/fixtures/sw-minify-auto/__expected/webpack2/sw.js

@@ -0,0 +1,2 @@
+<!doctype html>
+<html manifest="manifest.appcache"></html>