Removing homemade zip script in favor of webpack zip plugin

Author: adambullmer

index.js

@@ -6,6 +6,7 @@ const CopyWebpackPlugin = require('copy-webpack-plugin')
 const ChromeExtensionReloader = require('webpack-chrome-extension-reloader')
 const WebpackShellPlugin = require('webpack-shell-plugin-next')
 const HtmlWebpackPlugin = require('html-webpack-plugin')
+const ZipPlugin = require('zip-webpack-plugin')
 
 const appRootPath = process.cwd()
 
@@ -14,7 +15,7 @@ module.exports = (api) => {
   const isDevelopment = api.service.mode === 'development'
   const isProduction = api.service.mode === 'production'
   const outputDir = api.resolve(api.service.projectOptions.outputDir || 'dist')
-  const packageScript = isProduction ? 'build-zip.js' : 'remove-evals.js'
+  const packageScript = isProduction ? null : 'remove-evals.js'
   const hasOptionsPageEntry = fs.existsSync(api.resolve('./src/options/options.js'))
   const hasKeyFile = fs.existsSync(api.resolve('key.pem'))
 
@@ -103,13 +104,20 @@ module.exports = (api) => {
       }))
     }
 
-    webpackConfig.plugins.push(new WebpackShellPlugin({
-      onBuildExit: {
-        scripts: [`node ${path.join(__dirname, 'scripts', packageScript)} ${outputDir}`],
-        blocking: true,
-        parallel: false
-      }
-    }))
+    if (packageScript === null) {
+      webpackConfig.plugins.push(new ZipPlugin({
+        path: api.resolve(`${api.service.projectOptions.outputDir || 'dist'}-zip`),
+        filename: `${name}-v${version}.zip`
+      }))
+    } else {
+      webpackConfig.plugins.push(new WebpackShellPlugin({
+        onBuildExit: {
+          scripts: [`node ${path.join(__dirname, 'scripts', packageScript)} ${outputDir}`],
+          blocking: true,
+          parallel: false
+        }
+      }))
+    }
 
     if (isDevelopment) {
       webpackConfig.plugins = (webpackConfig.plugins || []).concat([

scripts/build-zip.js

@@ -511,7 +511,7 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-buffer-crc32@~0.2.1:
+buffer-crc32@~0.2.1, buffer-crc32@~0.2.3:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
 
@@ -3819,6 +3819,12 @@ yallist@^3.0.0, yallist@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
 
+yazl@^2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/yazl/-/yazl-2.4.3.tgz#ec26e5cc87d5601b9df8432dbdd3cd2e5173a071"
+  dependencies:
+    buffer-crc32 "~0.2.3"
+
 zip-folder@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/zip-folder/-/zip-folder-1.0.0.tgz#70a7744fd1789a2feb41ad3419b32e9fd87957b2"
@@ -3832,3 +3838,10 @@ zip-stream@~0.4.0:
     compress-commons "~0.1.0"
     lodash "~2.4.1"
     readable-stream "~1.0.26"
+
+zip-webpack-plugin@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/zip-webpack-plugin/-/zip-webpack-plugin-3.0.0.tgz#63b3c173f1a87a006915cd7328a3c40b44dc8e32"
+  dependencies:
+    webpack-sources "^1.1.0"
+    yazl "^2.4.3"