From b6e942436c988168b49eb78bba065dcd4dd438f9 Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Sun, 17 Apr 2016 06:24:48 -0700
Subject: [PATCH] Update to JSZip 3.0.0.

---
 npm-shrinkwrap.json | 28 +++++++++++++++++++++++++---
 package.json        |  2 +-
 tools/zip-crx.js    |  7 +++++--
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 75a60aeec..cef9cecdf 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -28,6 +28,11 @@
       "from": "array-find-index@>=1.0.0 <2.0.0",
       "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.1.tgz"
     },
+    "asap": {
+      "version": "2.0.3",
+      "from": "asap@>=2.0.3 <2.1.0",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.3.tgz"
+    },
     "asn1": {
       "version": "0.2.3",
       "from": "asn1@0.2.3",
@@ -537,9 +542,26 @@
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz"
     },
     "jszip": {
-      "version": "2.6.0",
-      "from": "jszip@>=2.6.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/jszip/-/jszip-2.6.0.tgz"
+      "version": "3.0.0",
+      "from": "jszip@latest",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.0.0.tgz",
+      "dependencies": {
+        "es6-promise": {
+          "version": "3.0.2",
+          "from": "es6-promise@>=3.0.2 <3.1.0",
+          "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz"
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "from": "isarray@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+        },
+        "readable-stream": {
+          "version": "2.0.6",
+          "from": "readable-stream@>=2.0.6 <2.1.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
+        }
+      }
     },
     "lazystream": {
       "version": "0.1.0",
diff --git a/package.json b/package.json
index f0dbd99aa..aff1c36ca 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "esprima": "^2.7.2",
     "font-awesome": "4.5.0",
     "jshint": "^2.9.1",
-    "jszip": "^2.6.0",
+    "jszip": "^3.0.0",
     "lodash": "^4.10.0",
     "marked": "^0.3.5",
     "webstore-upload": "0.0.7"
diff --git a/tools/zip-crx.js b/tools/zip-crx.js
index 06a90d15f..8cd3c605e 100644
--- a/tools/zip-crx.js
+++ b/tools/zip-crx.js
@@ -13,9 +13,12 @@ for (var file of ['script.js', 'eventPage.js', 'icon16.png', 'icon48.png', 'icon
     {date: new Date(v.date)}
   );
 }
-var output = zip.generate({
+zip.generateAsync({
   type: 'nodebuffer',
   compression: 'DEFLATE',
   compressionOptions: {level: 9},
+}).then(function(output) {
+  fs.writeFileSync(`testbuilds/${pkg.name}${channel}.crx.zip`, output);
+}, function() {
+  process.exit(1);
 });
-fs.writeFileSync(`testbuilds/${pkg.name}${channel}.crx.zip`, output);