From 4e3a56e46680c40a6e7de47c128f1a7b5a3b62c1 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 26 Aug 2018 22:39:04 +0300
Subject: [PATCH 01/29] Plugin packager

---
 client/src/ui/components/bd/PluginCard.vue    |  41 ++++++-
 .../src/ui/components/common/MaterialIcon.js  |   1 +
 .../common/materialicons/BoxDownload.vue      |  27 +++++
 client/webpack.config.js                      |   1 +
 package-lock.json                             | 108 ++++++++++--------
 5 files changed, 128 insertions(+), 50 deletions(-)
 create mode 100644 client/src/ui/components/common/materialicons/BoxDownload.vue

diff --git a/client/src/ui/components/bd/PluginCard.vue b/client/src/ui/components/bd/PluginCard.vue
index d36691db..f04aa102 100644
--- a/client/src/ui/components/bd/PluginCard.vue
+++ b/client/src/ui/components/bd/PluginCard.vue
@@ -12,6 +12,7 @@
     <Card :item="plugin">
         <SettingSwitch v-if="plugin.type === 'plugin'" slot="toggle" :value="plugin.enabled" @input="$emit('toggle-plugin')" />
         <ButtonGroup slot="controls">
+            <Button v-if="devmode" v-tooltip="'Package Plugin'" @click="package"><MiBoxDownload size="18"/></Button>
             <Button v-tooltip="'Settings (shift + click to open settings without cloning the set)'" v-if="plugin.hasSettings" @click="$emit('show-settings', $event.shiftKey)"><MiSettings size="18" /></Button>
             <Button v-tooltip="'Reload'" @click="$emit('reload-plugin')"><MiRefresh size="18" /></Button>
             <Button v-tooltip="'Edit'" @click="editPlugin"><MiPencil size="18" /></Button>
@@ -22,18 +23,54 @@
 
 <script>
     // Imports
+    import archiver from 'archiver';
+    import electron from 'electron';
+    import fs from 'fs';
+    import { Settings } from 'modules';
     import { ClientLogger as Logger } from 'common';
     import { shell } from 'electron';
     import Card from './Card.vue';
-    import { Button, ButtonGroup, SettingSwitch, MiSettings, MiRefresh, MiPencil, MiDelete, MiExtension } from '../common';
+    import { Button, ButtonGroup, SettingSwitch, MiSettings, MiRefresh, MiPencil, MiDelete, MiExtension, MiBoxDownload } from '../common';
 
     export default {
+        data() {
+            return {
+                devmode: Settings.getSetting('core', 'advanced', 'developer-mode').value
+            }
+        },
         props: ['plugin'],
         components: {
             Card, Button, ButtonGroup, SettingSwitch,
-            MiSettings, MiRefresh, MiPencil, MiDelete, MiExtension
+            MiSettings, MiRefresh, MiPencil, MiDelete, MiExtension, MiBoxDownload
         },
         methods: {
+            package() {
+                electron.remote.dialog.showSaveDialog({
+                    title: 'Save Plugin Package',
+                    defaultPath: this.plugin.name,
+                    filters: [
+                        {
+                            name: 'BetterDiscord Package',
+                            extensions: ['bd']
+                        }
+                    ]
+                }, filepath => {
+                    if (!filepath) return;
+
+                    const archive = archiver('zip', {
+                        zlib: { level: 0 }
+                    });
+
+                    const out = fs.createWriteStream(filepath);
+
+                    archive.pipe(out);
+                    archive.glob('**/*', {
+                        cwd: this.plugin.contentPath,
+                        root: this.plugin.contentPath
+                    });
+                    archive.finalize();
+                });
+            },
             editPlugin() {
                 try {
                     shell.openItem(this.plugin.contentPath);
diff --git a/client/src/ui/components/common/MaterialIcon.js b/client/src/ui/components/common/MaterialIcon.js
index 182b9826..59dd6717 100644
--- a/client/src/ui/components/common/MaterialIcon.js
+++ b/client/src/ui/components/common/MaterialIcon.js
@@ -22,3 +22,4 @@ export { default as MiLock } from './materialicons/Lock.vue';
 export { default as MiImagePlus } from './materialicons/ImagePlus.vue';
 export { default as MiIcVpnKey } from './materialicons/IcVpnKey.vue';
 export { default as MiArrowLeft } from './materialicons/ArrowLeft.vue';
+export { default as MiBoxDownload } from './materialicons/BoxDownload.vue';
diff --git a/client/src/ui/components/common/materialicons/BoxDownload.vue b/client/src/ui/components/common/materialicons/BoxDownload.vue
new file mode 100644
index 00000000..6d654397
--- /dev/null
+++ b/client/src/ui/components/common/materialicons/BoxDownload.vue
@@ -0,0 +1,27 @@
+/**
+ * BetterDiscord Material Design Icon
+ * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
+ * All rights reserved.
+ * https://betterdiscord.net
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * Material Design Icons
+ * Copyright (c) 2014 Google
+ * Apache 2.0 LICENSE
+ * https://www.apache.org/licenses/LICENSE-2.0.txt
+*/
+
+<template>
+    <span class="bd-materialDesignIcon">
+        <svg :width="size || 24" :height="size || 24" viewBox="0 0 24 24">
+           <path d="M 4.9956,3L 19.0076,3L 20.7359,5.99339L 20.7304,5.99653C 20.9018,6.29149 21,6.63428 21,7L 21,19C 21,20.1046 20.1046,21 19,21L 5,21C 3.89543,21 3,20.1046 3,19L 3,7C 3,6.638 3.09618,6.29846 3.26437,6.00554L 3.26135,6.0038L 4.9956,3 Z M 5.57294,4.00001L 4.99559,5.00001L 5,5.00001L 19.0076,5.00002L 18.4303,4.00001L 5.57294,4.00001 Z M 7,12L 12,17L 17,12L 14,12L 14,10L 10,10L 10,12L 7,12 Z "/>
+        </svg>
+    </span>
+</template>
+<script>
+    export default {
+        props: ['size']
+    }
+</script>
diff --git a/client/webpack.config.js b/client/webpack.config.js
index ca202b4d..f168c850 100644
--- a/client/webpack.config.js
+++ b/client/webpack.config.js
@@ -39,6 +39,7 @@ module.exports = {
         net: 'require("net")',
         request: 'require(require("path").join(require("electron").remote.app.getAppPath(), "node_modules", "request"))',
         sparkplug: 'require("../../core/dist/sparkplug")',
+        archiver: 'require("archiver")',
         'node-crypto': 'require("crypto")'
     },
     resolve: {
diff --git a/package-lock.json b/package-lock.json
index 5f627d6d..ccc6cf80 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -295,7 +295,7 @@
         "buffer-crc32": "0.2.13",
         "glob": "7.1.2",
         "lodash": "4.17.10",
-        "readable-stream": "2.3.5",
+        "readable-stream": "2.3.6",
         "tar-stream": "1.5.5",
         "zip-stream": "1.2.0"
       },
@@ -313,9 +313,9 @@
           "dev": true
         },
         "readable-stream": {
-          "version": "2.3.5",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
             "core-util-is": "1.0.2",
@@ -323,14 +323,14 @@
             "isarray": "1.0.0",
             "process-nextick-args": "2.0.0",
             "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
+            "string_decoder": "1.1.1",
             "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
             "safe-buffer": "5.1.1"
@@ -349,7 +349,7 @@
         "lazystream": "1.0.0",
         "lodash": "4.17.10",
         "normalize-path": "2.1.1",
-        "readable-stream": "2.3.5"
+        "readable-stream": "2.3.6"
       },
       "dependencies": {
         "isarray": {
@@ -365,9 +365,9 @@
           "dev": true
         },
         "readable-stream": {
-          "version": "2.3.5",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
             "core-util-is": "1.0.2",
@@ -375,14 +375,14 @@
             "isarray": "1.0.0",
             "process-nextick-args": "2.0.0",
             "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
+            "string_decoder": "1.1.1",
             "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
             "safe-buffer": "5.1.1"
@@ -2396,7 +2396,7 @@
         "buffer-crc32": "0.2.13",
         "crc32-stream": "2.0.0",
         "normalize-path": "2.1.1",
-        "readable-stream": "2.3.5"
+        "readable-stream": "2.3.6"
       },
       "dependencies": {
         "isarray": {
@@ -2412,9 +2412,9 @@
           "dev": true
         },
         "readable-stream": {
-          "version": "2.3.5",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
             "core-util-is": "1.0.2",
@@ -2422,14 +2422,14 @@
             "isarray": "1.0.0",
             "process-nextick-args": "2.0.0",
             "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
+            "string_decoder": "1.1.1",
             "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
             "safe-buffer": "5.1.1"
@@ -2601,10 +2601,25 @@
       }
     },
     "crc": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/crc/-/crc-3.5.0.tgz",
-      "integrity": "sha1-mLi6fUiWZbo5efWbITgTdBAaGWQ=",
-      "dev": true
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz",
+      "integrity": "sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==",
+      "dev": true,
+      "requires": {
+        "buffer": "5.2.0"
+      },
+      "dependencies": {
+        "buffer": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.0.tgz",
+          "integrity": "sha512-nUJyfChH7PMJy75eRDCCKtszSEFokUNXC1hNVSe+o+VdcgvDPLs20k3v8UXI8ruRYAJiYtyRea8mYyqPxoHWDw==",
+          "dev": true,
+          "requires": {
+            "base64-js": "1.3.0",
+            "ieee754": "1.1.12"
+          }
+        }
+      }
     },
     "crc32-stream": {
       "version": "2.0.0",
@@ -2612,8 +2627,8 @@
       "integrity": "sha1-483TtN8xaN10494/u8t7KX/pCPQ=",
       "dev": true,
       "requires": {
-        "crc": "3.5.0",
-        "readable-stream": "2.3.5"
+        "crc": "3.8.0",
+        "readable-stream": "2.3.6"
       },
       "dependencies": {
         "isarray": {
@@ -2629,9 +2644,9 @@
           "dev": true
         },
         "readable-stream": {
-          "version": "2.3.5",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
             "core-util-is": "1.0.2",
@@ -2639,14 +2654,14 @@
             "isarray": "1.0.0",
             "process-nextick-args": "2.0.0",
             "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
+            "string_decoder": "1.1.1",
             "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
             "safe-buffer": "5.1.1"
@@ -2733,9 +2748,6 @@
         "randomfill": "1.0.4"
       }
     },
-    "csp-parse": {
-      "version": "github:macropodhq/csp-parse#db7d5f954b420b527d7fb452a93bb6e2fa302c5a"
-    },
     "css-color-names": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
@@ -14655,7 +14667,7 @@
         "archiver-utils": "1.3.0",
         "compress-commons": "1.2.2",
         "lodash": "4.17.10",
-        "readable-stream": "2.3.5"
+        "readable-stream": "2.3.6"
       },
       "dependencies": {
         "isarray": {
@@ -14671,9 +14683,9 @@
           "dev": true
         },
         "readable-stream": {
-          "version": "2.3.5",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
             "core-util-is": "1.0.2",
@@ -14681,14 +14693,14 @@
             "isarray": "1.0.0",
             "process-nextick-args": "2.0.0",
             "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
+            "string_decoder": "1.1.1",
             "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
             "safe-buffer": "5.1.1"

From f14b1b71e7c5a07db2946f5b9a7671bc2627c1ee Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Mon, 27 Aug 2018 17:28:42 +0300
Subject: [PATCH 02/29] Use asar instead

---
 client/src/ui/components/bd/PluginCard.vue |  17 +-
 client/webpack.config.js                   |   3 +-
 package-lock.json                          | 793 +++++++++------------
 package.json                               |   4 +-
 4 files changed, 335 insertions(+), 482 deletions(-)

diff --git a/client/src/ui/components/bd/PluginCard.vue b/client/src/ui/components/bd/PluginCard.vue
index f04aa102..9a371ce8 100644
--- a/client/src/ui/components/bd/PluginCard.vue
+++ b/client/src/ui/components/bd/PluginCard.vue
@@ -23,9 +23,10 @@
 
 <script>
     // Imports
-    import archiver from 'archiver';
+    import asar from 'asar';
     import electron from 'electron';
     import fs from 'fs';
+    import { Toasts } from 'ui';
     import { Settings } from 'modules';
     import { ClientLogger as Logger } from 'common';
     import { shell } from 'electron';
@@ -57,18 +58,10 @@
                 }, filepath => {
                     if (!filepath) return;
 
-                    const archive = archiver('zip', {
-                        zlib: { level: 0 }
+                    asar.uncache(filepath);
+                    asar.createPackage(this.plugin.contentPath, filepath, () => {
+                        Toasts.success('Plugin Packaged!');
                     });
-
-                    const out = fs.createWriteStream(filepath);
-
-                    archive.pipe(out);
-                    archive.glob('**/*', {
-                        cwd: this.plugin.contentPath,
-                        root: this.plugin.contentPath
-                    });
-                    archive.finalize();
                 });
             },
             editPlugin() {
diff --git a/client/webpack.config.js b/client/webpack.config.js
index f168c850..0747c803 100644
--- a/client/webpack.config.js
+++ b/client/webpack.config.js
@@ -32,6 +32,7 @@ module.exports = {
     },
     externals: {
         electron: 'require("electron")',
+        asar: 'require("asar")',
         fs: 'require("fs")',
         path: 'require("path")',
         util: 'require("util")',
@@ -39,7 +40,7 @@ module.exports = {
         net: 'require("net")',
         request: 'require(require("path").join(require("electron").remote.app.getAppPath(), "node_modules", "request"))',
         sparkplug: 'require("../../core/dist/sparkplug")',
-        archiver: 'require("archiver")',
+        asar: 'require("asar")',
         'node-crypto': 'require("crypto")'
     },
     resolve: {
diff --git a/package-lock.json b/package-lock.json
index ccc6cf80..ac015656 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -58,7 +58,7 @@
     "aes256": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/aes256/-/aes256-1.0.4.tgz",
-      "integrity": "sha512-yuaKOdoKebChkP+uRsQovWsJYm6qf58cQTvXBu6MM0BMnrXZ9SXEiXREBuU513ZRr+Uo2qX/Ci6EODLUu/qiHA==",
+      "integrity": "sha1-fNRmZTUhbK4o7s7ODUb9tMRpxVc=",
       "dev": true
     },
     "ajv": {
@@ -132,7 +132,7 @@
     "ansi-escapes": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
-      "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==",
+      "integrity": "sha1-9zIHu4EgfXX9bIPxJa8m7qN4yjA=",
       "dev": true
     },
     "ansi-gray": {
@@ -284,112 +284,6 @@
       "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
       "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
     },
-    "archiver": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/archiver/-/archiver-2.1.1.tgz",
-      "integrity": "sha1-/2YrSnggFJSj7lRNOjP+dJZQnrw=",
-      "dev": true,
-      "requires": {
-        "archiver-utils": "1.3.0",
-        "async": "2.6.0",
-        "buffer-crc32": "0.2.13",
-        "glob": "7.1.2",
-        "lodash": "4.17.10",
-        "readable-stream": "2.3.6",
-        "tar-stream": "1.5.5",
-        "zip-stream": "1.2.0"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "process-nextick-args": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "2.0.0",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.1.1",
-            "util-deprecate": "1.0.2"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.1.1"
-          }
-        }
-      }
-    },
-    "archiver-utils": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-1.3.0.tgz",
-      "integrity": "sha1-5QtMCccL89aA4y/xt5lOn52JUXQ=",
-      "dev": true,
-      "requires": {
-        "glob": "7.1.2",
-        "graceful-fs": "4.1.11",
-        "lazystream": "1.0.0",
-        "lodash": "4.17.10",
-        "normalize-path": "2.1.1",
-        "readable-stream": "2.3.6"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "process-nextick-args": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "2.0.0",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.1.1",
-            "util-deprecate": "1.0.2"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.1.1"
-          }
-        }
-      }
-    },
     "archy": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
@@ -442,7 +336,7 @@
     "argparse": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=",
       "dev": true,
       "requires": {
         "sprintf-js": "1.0.3"
@@ -514,7 +408,7 @@
         "is-number": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+          "integrity": "sha1-ACbjf1RU1z41bf5lZGmYZ8an8P8=",
           "dev": true
         }
       }
@@ -522,7 +416,7 @@
     "array-last": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
-      "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
+      "integrity": "sha1-eqdwc/7FZd2rJJP1+IGF9ASp0zY=",
       "dev": true,
       "requires": {
         "is-number": "4.0.0"
@@ -531,7 +425,7 @@
         "is-number": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+          "integrity": "sha1-ACbjf1RU1z41bf5lZGmYZ8an8P8=",
           "dev": true
         }
       }
@@ -539,13 +433,13 @@
     "array-slice": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
-      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
+      "integrity": "sha1-42jqFfibxwaff/uJrsOmx9SsItQ=",
       "dev": true
     },
     "array-sort": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz",
-      "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==",
+      "integrity": "sha1-5MBTVkU/VvU1EqfR1hI/LFTAqIo=",
       "dev": true,
       "requires": {
         "default-compare": "1.0.0",
@@ -556,7 +450,7 @@
         "kind-of": {
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=",
           "dev": true
         }
       }
@@ -588,6 +482,43 @@
       "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
       "dev": true
     },
+    "asar": {
+      "version": "0.14.3",
+      "resolved": "https://registry.npmjs.org/asar/-/asar-0.14.3.tgz",
+      "integrity": "sha512-+hNnVVDmYbv05We/a9knj/98w171+A94A9DNHj+3kXUr3ENTQoSEcfbJRvBBRHyOh4vukBYWujmHvvaMmQoQbg==",
+      "requires": {
+        "chromium-pickle-js": "0.2.0",
+        "commander": "2.16.0",
+        "cuint": "0.2.2",
+        "glob": "6.0.4",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.1",
+        "mksnapshot": "0.3.1",
+        "tmp": "0.0.28"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "6.0.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
+          "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
+          "requires": {
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "tmp": {
+          "version": "0.0.28",
+          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.28.tgz",
+          "integrity": "sha1-Fyc1t/YU6nrzlmT6hM8N5OUV0SA=",
+          "requires": {
+            "os-tmpdir": "1.0.2"
+          }
+        }
+      }
+    },
     "asn1": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
@@ -596,7 +527,7 @@
     "asn1.js": {
       "version": "4.10.1",
       "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+      "integrity": "sha1-ucK/WAXx5kqt7tbfOiv6+1pz9aA=",
       "dev": true,
       "requires": {
         "bn.js": "4.11.8",
@@ -653,7 +584,7 @@
     "async-done": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.1.tgz",
-      "integrity": "sha512-R1BaUeJ4PMoLNJuk+0tLJgjmEqVsdN118+Z8O+alhnQDQgy0kmD5Mqi0DNEmMx2LM0Ed5yekKu+ZXYvIHceicg==",
+      "integrity": "sha1-FLe3Nme4ZMjwK1slP8nG7dt3fz4=",
       "dev": true,
       "requires": {
         "end-of-stream": "1.4.1",
@@ -743,7 +674,7 @@
     "babel-core": {
       "version": "6.26.3",
       "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz",
-      "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
+      "integrity": "sha1-suLwnjQtDwyI4vAuBneUEl51wgc=",
       "dev": true,
       "requires": {
         "babel-code-frame": "6.26.0",
@@ -770,7 +701,7 @@
     "babel-generator": {
       "version": "6.26.1",
       "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
-      "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
+      "integrity": "sha1-GERAjTuPDTWkBOp6wYDwh6YBvZA=",
       "dev": true,
       "requires": {
         "babel-messages": "6.23.0",
@@ -934,7 +865,7 @@
     "babel-loader": {
       "version": "7.1.5",
       "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-7.1.5.tgz",
-      "integrity": "sha512-iCHfbieL5d1LfOQeeVJEUyD9rTwBcP/fcEbRCfempxTDuqrKpu0AZjLAQHEQa3Yqyj9ORKe2iHfoj4rHLf7xpw==",
+      "integrity": "sha1-4+4M1zlKpVfgE7AtPkkr/QeqbWg=",
       "dev": true,
       "requires": {
         "find-cache-dir": "1.0.0",
@@ -1318,7 +1249,7 @@
     "babel-preset-env": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz",
-      "integrity": "sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==",
+      "integrity": "sha1-3qefpOvriDzTXasH4mDBycBN93o=",
       "dev": true,
       "requires": {
         "babel-plugin-check-es2015-constants": "6.22.0",
@@ -1521,7 +1452,7 @@
     "base64-js": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
-      "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
+      "integrity": "sha1-yrHmEY8FEJXli1KBrqjBzSK/wOM=",
       "dev": true
     },
     "bcrypt-pbkdf": {
@@ -1542,9 +1473,18 @@
     "big.js": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
-      "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
+      "integrity": "sha1-pfwpi4G54Nyi5FiCR4S2XFK6WI4=",
       "dev": true
     },
+    "binary": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+      "integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=",
+      "requires": {
+        "buffers": "0.1.1",
+        "chainsaw": "0.1.0"
+      }
+    },
     "binary-extensions": {
       "version": "1.11.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz",
@@ -1619,7 +1559,7 @@
     "bn.js": {
       "version": "4.11.8",
       "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+      "integrity": "sha1-LN4J617jQfSEdGuwMJsyU7GxRC8=",
       "dev": true
     },
     "boolbase": {
@@ -1666,7 +1606,7 @@
     "browserify-aes": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "integrity": "sha1-Mmc0ZC9APavDADIJhTu3CtQo70g=",
       "dev": true,
       "requires": {
         "buffer-xor": "1.0.3",
@@ -1680,7 +1620,7 @@
     "browserify-cipher": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "integrity": "sha1-jWR0wbhwv9q807z8wZNKEOlPFfA=",
       "dev": true,
       "requires": {
         "browserify-aes": "1.2.0",
@@ -1727,7 +1667,7 @@
     "browserify-zlib": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "integrity": "sha1-KGlFnZqjviRf6P4sofRuLn9U1z8=",
       "dev": true,
       "requires": {
         "pako": "1.0.6"
@@ -1736,7 +1676,7 @@
     "browserslist": {
       "version": "3.2.8",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz",
-      "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==",
+      "integrity": "sha1-sABTYdZHHw9ZUnl6dvyYXx+Xj8Y=",
       "dev": true,
       "requires": {
         "caniuse-lite": "1.0.30000862",
@@ -1762,12 +1702,6 @@
         }
       }
     },
-    "buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true
-    },
     "buffer-equal": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
@@ -1780,6 +1714,11 @@
       "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
       "dev": true
     },
+    "buffers": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
+      "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s="
+    },
     "builtin-modules": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
@@ -1794,7 +1733,7 @@
     "cacache": {
       "version": "10.0.4",
       "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz",
-      "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
+      "integrity": "sha1-ZFI2eZnv+dQYiu/ZoU6dfGomNGA=",
       "dev": true,
       "requires": {
         "bluebird": "3.5.1",
@@ -1825,7 +1764,7 @@
         "y18n": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-          "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+          "integrity": "sha1-le+U+F7MgdAHwmThkKEg8KPIVms=",
           "dev": true
         }
       }
@@ -1945,6 +1884,14 @@
         }
       }
     },
+    "chainsaw": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+      "integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=",
+      "requires": {
+        "traverse": "0.3.9"
+      }
+    },
     "chalk": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
@@ -2009,10 +1956,15 @@
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
       "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE="
     },
+    "chromium-pickle-js": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz",
+      "integrity": "sha1-BKEGZywYsIWrd02YPfo+oTjyIgU="
+    },
     "cipher-base": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "integrity": "sha1-h2Dk7MJy9MNjUy+SbYdKriwTl94=",
       "dev": true,
       "requires": {
         "inherits": "2.0.3",
@@ -2022,13 +1974,13 @@
     "circular-json": {
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
+      "integrity": "sha1-gVyZ6oT2gJUp0vRXkb34JxE1LWY=",
       "dev": true
     },
     "clap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.3.tgz",
-      "integrity": "sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==",
+      "integrity": "sha1-TzZ0WzIAhJJVf0ZBLWbVDLmbzlE=",
       "dev": true,
       "requires": {
         "chalk": "1.1.3"
@@ -2135,7 +2087,7 @@
     "cli-spinners": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.1.tgz",
-      "integrity": "sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg==",
+      "integrity": "sha1-ACwZkJEtDVlYDJO9NsBW3pnkJZo=",
       "dev": true
     },
     "cli-width": {
@@ -2169,7 +2121,7 @@
     "clone-deep": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz",
-      "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==",
+      "integrity": "sha1-ANs6Hhc2VnMNEYjD1qztbX6pdxM=",
       "dev": true,
       "requires": {
         "for-own": "1.0.0",
@@ -2311,7 +2263,7 @@
     "color-convert": {
       "version": "1.9.2",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz",
-      "integrity": "sha512-3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg==",
+      "integrity": "sha1-SYgbj7pn3xKpa98/VsCqueeRMUc=",
       "dev": true,
       "requires": {
         "color-name": "1.1.1"
@@ -2372,8 +2324,7 @@
     "commander": {
       "version": "2.16.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz",
-      "integrity": "sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew==",
-      "dev": true
+      "integrity": "sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew=="
     },
     "commondir": {
       "version": "1.0.1",
@@ -2387,56 +2338,6 @@
       "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
       "dev": true
     },
-    "compress-commons": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-1.2.2.tgz",
-      "integrity": "sha1-UkqfEJA/OoEzibAiXSfEi7dRiQ8=",
-      "dev": true,
-      "requires": {
-        "buffer-crc32": "0.2.13",
-        "crc32-stream": "2.0.0",
-        "normalize-path": "2.1.1",
-        "readable-stream": "2.3.6"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "process-nextick-args": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "2.0.0",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.1.1",
-            "util-deprecate": "1.0.2"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.1.1"
-          }
-        }
-      }
-    },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -2539,7 +2440,7 @@
     "copy-concurrently": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+      "integrity": "sha1-kilzmMrjSTf8r9bsgTnBgFHwteA=",
       "dev": true,
       "requires": {
         "aproba": "1.2.0",
@@ -2559,7 +2460,7 @@
     "copy-props": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz",
-      "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==",
+      "integrity": "sha1-k7scrfr9MdpbuKnUtB9HHsOnLf4=",
       "dev": true,
       "requires": {
         "each-props": "1.3.2",
@@ -2580,7 +2481,7 @@
     "cosmiconfig": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz",
-      "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==",
+      "integrity": "sha1-YXPOvVb6wELB9DkO33r2wHx8uJI=",
       "dev": true,
       "requires": {
         "is-directory": "0.3.1",
@@ -2600,79 +2501,10 @@
         }
       }
     },
-    "crc": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz",
-      "integrity": "sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==",
-      "dev": true,
-      "requires": {
-        "buffer": "5.2.0"
-      },
-      "dependencies": {
-        "buffer": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.0.tgz",
-          "integrity": "sha512-nUJyfChH7PMJy75eRDCCKtszSEFokUNXC1hNVSe+o+VdcgvDPLs20k3v8UXI8ruRYAJiYtyRea8mYyqPxoHWDw==",
-          "dev": true,
-          "requires": {
-            "base64-js": "1.3.0",
-            "ieee754": "1.1.12"
-          }
-        }
-      }
-    },
-    "crc32-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-2.0.0.tgz",
-      "integrity": "sha1-483TtN8xaN10494/u8t7KX/pCPQ=",
-      "dev": true,
-      "requires": {
-        "crc": "3.8.0",
-        "readable-stream": "2.3.6"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "process-nextick-args": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "2.0.0",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.1.1",
-            "util-deprecate": "1.0.2"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.1.1"
-          }
-        }
-      }
-    },
     "create-ecdh": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
-      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
+      "integrity": "sha1-yREbbzMEXEaX8UR4f5JUzcd8Rf8=",
       "dev": true,
       "requires": {
         "bn.js": "4.11.8",
@@ -2682,7 +2514,7 @@
     "create-hash": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "integrity": "sha1-iJB4rxGmN1a8+1m9IhmWvjqe8ZY=",
       "dev": true,
       "requires": {
         "cipher-base": "1.0.4",
@@ -2695,7 +2527,7 @@
     "create-hmac": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "integrity": "sha1-aRcMeLOrlXFHsriwRXLkfq0iQ/8=",
       "dev": true,
       "requires": {
         "cipher-base": "1.0.4",
@@ -2732,7 +2564,7 @@
     "crypto-browserify": {
       "version": "3.12.0",
       "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "integrity": "sha1-OWz58xN/A+S45TLFj2mCVOAPgOw=",
       "dev": true,
       "requires": {
         "browserify-cipher": "1.0.1",
@@ -2748,6 +2580,9 @@
         "randomfill": "1.0.4"
       }
     },
+    "csp-parse": {
+      "version": "github:macropodhq/csp-parse#db7d5f954b420b527d7fb452a93bb6e2fa302c5a"
+    },
     "css-color-names": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
@@ -2757,7 +2592,7 @@
     "css-loader": {
       "version": "0.28.11",
       "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.11.tgz",
-      "integrity": "sha512-wovHgjAx8ZIMGSL8pTys7edA1ClmzxHeY6n/d97gg5odgsxEgKjULPR0viqyC+FWMCL9sfqoC/QCUBo62tLvPg==",
+      "integrity": "sha1-w/mGSnAL4nEbtaJGKyOJsaOS2rc=",
       "dev": true,
       "requires": {
         "babel-code-frame": "6.26.0",
@@ -2874,6 +2709,11 @@
         "source-map": "0.5.7"
       }
     },
+    "cuint": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz",
+      "integrity": "sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs="
+    },
     "currently-unhandled": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
@@ -2957,6 +2797,20 @@
         "mimic-response": "1.0.1"
       }
     },
+    "decompress-zip": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/decompress-zip/-/decompress-zip-0.3.0.tgz",
+      "integrity": "sha1-rjvLfjTGWHmt/nfhnDD4ZgK0vbA=",
+      "requires": {
+        "binary": "0.3.0",
+        "graceful-fs": "4.1.11",
+        "mkpath": "0.1.0",
+        "nopt": "3.0.6",
+        "q": "1.5.1",
+        "readable-stream": "1.1.14",
+        "touch": "0.0.3"
+      }
+    },
     "deep-extend": {
       "version": "0.4.2",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
@@ -2976,7 +2830,7 @@
     "default-compare": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
-      "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==",
+      "integrity": "sha1-y2ETGESthNhHiPto/QFoHKd4Gi8=",
       "dev": true,
       "requires": {
         "kind-of": "5.1.0"
@@ -2985,7 +2839,7 @@
         "kind-of": {
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=",
           "dev": true
         }
       }
@@ -3101,13 +2955,13 @@
     "diff-match-patch": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.1.tgz",
-      "integrity": "sha512-A0QEhr4PxGUMEtKxd6X+JLnOTFd3BfIPSDpsc4dMvj+CbSaErDwTpoTo/nFJDMSrjxLW4BiNq+FbNisAAHhWeQ==",
+      "integrity": "sha1-1fiAIT2C+8Ek0rlREfs8Az261/o=",
       "dev": true
     },
     "diffie-hellman": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "integrity": "sha1-QOjumPVaIUlgcUaSHGPhrl89KHU=",
       "dev": true,
       "requires": {
         "bn.js": "4.11.8",
@@ -3118,7 +2972,7 @@
     "doctrine": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "integrity": "sha1-XNAfwQFiG0LEzX9dGmYkNxbT850=",
       "dev": true,
       "requires": {
         "esutils": "2.0.2"
@@ -3162,7 +3016,7 @@
     "domain-browser": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+      "integrity": "sha1-PTH1AZGmdJ3RN1p/Ui6CPULlTto=",
       "dev": true
     },
     "domelementtype": {
@@ -3267,7 +3121,7 @@
     "each-props": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz",
-      "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==",
+      "integrity": "sha1-6kWkFNFt1c+kGbGoFyDVygaJIzM=",
       "dev": true,
       "requires": {
         "is-plain-object": "2.0.4",
@@ -3286,7 +3140,7 @@
     "editorconfig": {
       "version": "0.13.3",
       "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.3.tgz",
-      "integrity": "sha512-WkjsUNVCu+ITKDj73QDvi0trvpdDWdkDyHybDGSXPfekLCqwmpD7CP7iPbvBgosNuLcI96XTDwNa75JyFl7tEQ==",
+      "integrity": "sha1-5SGeWHlR1glY/ZTqmpoAjN7/GzQ=",
       "dev": true,
       "requires": {
         "bluebird": "3.5.1",
@@ -3377,7 +3231,7 @@
     "electron-rebuild": {
       "version": "1.8.2",
       "resolved": "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-1.8.2.tgz",
-      "integrity": "sha512-EeR4dgb6NN7ybxduUWMeeLhU/EuF+FzwFZJfMJXD0bx96K+ttAieCXOn9lTO5nA9Qn3hiS7pEpk8pZ9StpGgSg==",
+      "integrity": "sha1-v/+6ZNp44bQDy3nVFQz6MzZkUUA=",
       "dev": true,
       "requires": {
         "colors": "1.3.1",
@@ -3484,7 +3338,7 @@
     "errno": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
-      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+      "integrity": "sha1-RoTXF3mtOa8Xfj8AeZb3xnyFJhg=",
       "dev": true,
       "requires": {
         "prr": "1.0.1"
@@ -3501,7 +3355,7 @@
     "es-abstract": {
       "version": "1.12.0",
       "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz",
-      "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==",
+      "integrity": "sha1-nbvdJ8aFbwABQhyhh4LXhr+KYWU=",
       "dev": true,
       "requires": {
         "es-to-primitive": "1.1.1",
@@ -3560,7 +3414,7 @@
     "es6-promise": {
       "version": "4.2.4",
       "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz",
-      "integrity": "sha512-/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ==",
+      "integrity": "sha1-3EIhwrFlGHYL2MOaUtjzVvwA7Sk=",
       "dev": true
     },
     "es6-set": {
@@ -3618,7 +3472,7 @@
     "eslint": {
       "version": "4.19.1",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz",
-      "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==",
+      "integrity": "sha1-MtHWU+HZBAiFS/spbwdux+GGowA=",
       "dev": true,
       "requires": {
         "ajv": "5.5.2",
@@ -3690,7 +3544,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -3705,7 +3559,7 @@
         "globals": {
           "version": "11.7.0",
           "resolved": "https://registry.npmjs.org/globals/-/globals-11.7.0.tgz",
-          "integrity": "sha512-K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg==",
+          "integrity": "sha1-pYP6pDBVsayncZFL9oJY4vwSVnM=",
           "dev": true
         },
         "has-flag": {
@@ -3717,7 +3571,7 @@
         "js-yaml": {
           "version": "3.12.0",
           "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
-          "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
+          "integrity": "sha1-6u1lbsg0TxD1J8a/obbiJE3hZ9E=",
           "dev": true,
           "requires": {
             "argparse": "1.0.10",
@@ -3747,7 +3601,7 @@
     "eslint-plugin-vue": {
       "version": "4.7.1",
       "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-4.7.1.tgz",
-      "integrity": "sha512-esETKhVMI7Vdli70Wt4bvAwnZBJeM0pxVX9Yb0wWKxdCJc2EADalVYK/q2FzMw8oKN0wPMdqVCKS8kmR89recA==",
+      "integrity": "sha1-yCm5/GJYLBiXtaC5Sv1E7MpRHmM=",
       "dev": true,
       "requires": {
         "vue-eslint-parser": "2.0.3"
@@ -3766,13 +3620,13 @@
     "eslint-visitor-keys": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
-      "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==",
+      "integrity": "sha1-PzGA+y4pEBdxastMnW1bXDSmqB0=",
       "dev": true
     },
     "espree": {
       "version": "3.5.4",
       "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
-      "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
+      "integrity": "sha1-sPRHGHyKi+2US4FaZgvd9d610ac=",
       "dev": true,
       "requires": {
         "acorn": "5.7.1",
@@ -3788,7 +3642,7 @@
     "esquery": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
-      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
+      "integrity": "sha1-QGxRZYsfWZGl+bYrHcJbAOPlxwg=",
       "dev": true,
       "requires": {
         "estraverse": "4.2.0"
@@ -3797,7 +3651,7 @@
     "esrecurse": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "integrity": "sha1-AHo7n9vCs7uH5IeeoZyS/b05Qs8=",
       "dev": true,
       "requires": {
         "estraverse": "4.2.0"
@@ -3849,7 +3703,7 @@
     "evp_bytestokey": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "integrity": "sha1-f8vbGY3HGVlDLv4ThCaE4FJaywI=",
       "dev": true,
       "requires": {
         "md5.js": "1.3.4",
@@ -3972,7 +3826,7 @@
         "fill-range": {
           "version": "2.2.4",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-          "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
+          "integrity": "sha1-6x53OrsFbc2N8r/favWbizqTZWU=",
           "dev": true,
           "requires": {
             "is-number": "2.1.0",
@@ -4048,7 +3902,7 @@
     "external-editor": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
-      "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
+      "integrity": "sha1-BFURz9jRM/OEZnPRBHwVTiFK09U=",
       "dev": true,
       "requires": {
         "chardet": "0.4.2",
@@ -4164,7 +4018,7 @@
     "file-type": {
       "version": "7.7.1",
       "resolved": "https://registry.npmjs.org/file-type/-/file-type-7.7.1.tgz",
-      "integrity": "sha512-bTrKkzzZI6wH+NXhyD3SOXtb2zXTw2SbwI2RxUlRcXVsnN7jNL5hJzVQLYv7FOQhxFkK4XWdAflEaWFpaLLWpQ==",
+      "integrity": "sha1-kcL17bjOcGiLm2ipDZMbu2yyH2U=",
       "dev": true
     },
     "filename-regex": {
@@ -4315,7 +4169,7 @@
     "flush-write-stream": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz",
-      "integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==",
+      "integrity": "sha1-xdWG7zivYJdlC0m8QbVfq7GfNb0=",
       "dev": true,
       "requires": {
         "inherits": "2.0.3",
@@ -5792,7 +5646,7 @@
     "glob-watcher": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.1.tgz",
-      "integrity": "sha512-fK92r2COMC199WCyGUblrZKhjra3cyVMDiypDdqg1vsSDmexnbYivK1kNR4QItiNXLKmGlqan469ks67RtNa2g==",
+      "integrity": "sha1-I5qqYhtr2EOyiP32sVX1CWPH1+o=",
       "dev": true,
       "requires": {
         "async-done": "1.3.1",
@@ -5813,7 +5667,7 @@
     "global-modules": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+      "integrity": "sha1-bXcPDrUjrHgWTXK15xqIdyZcw+o=",
       "dev": true,
       "requires": {
         "global-prefix": "1.0.2",
@@ -5959,7 +5813,7 @@
         "gulp-cli": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.0.1.tgz",
-          "integrity": "sha512-RxujJJdN8/O6IW2nPugl7YazhmrIEjmiVfPKrWt68r71UCaLKS71Hp0gpKT+F6qOUFtr7KqtifDKaAJPRVvMYQ==",
+          "integrity": "sha1-eEfiIMs2YvK+im1XK/FOF75amUs=",
           "dev": true,
           "requires": {
             "ansi-colors": "1.1.0",
@@ -6084,7 +5938,7 @@
     "gulp-copy": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/gulp-copy/-/gulp-copy-1.1.0.tgz",
-      "integrity": "sha512-OM+6ICtL2nYpzXF/qZb0eLDrIRe28MnN548Dsc60okV/evNbo0552VjtZ317x3MnCh5mGZDcTGK/hX4OwbE7xw==",
+      "integrity": "sha1-gSrQOITCT+BNkmQL7vUc/Un8RnU=",
       "dev": true,
       "requires": {
         "gulp": "3.9.1",
@@ -6436,7 +6290,7 @@
     "gulp-inject-string": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/gulp-inject-string/-/gulp-inject-string-1.1.1.tgz",
-      "integrity": "sha512-Q25r/25DMxCEknj4nqHhpDWFGvQQNcZwnheiDIOWhOqcSUtagbidEGe3HANUdokiiIjqkTVIyIg9hP64LKh5Tw==",
+      "integrity": "sha1-lOehtdQQJyDtvHSRZSosPW6MW7g=",
       "dev": true,
       "requires": {
         "event-stream": "3.3.4",
@@ -6446,7 +6300,7 @@
     "gulp-json-editor": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/gulp-json-editor/-/gulp-json-editor-2.4.2.tgz",
-      "integrity": "sha512-mUPSsibfnRT04Iy9AfrvC8kfcJZJFYt5qfr6TTQHHBZ1qviz2qqfAf7DLS2Frp33ycyZJvm6n9cwNgV00A95TA==",
+      "integrity": "sha1-YnTmEunxai2dEK6lC2TffhE/h9c=",
       "dev": true,
       "requires": {
         "deepmerge": "2.1.1",
@@ -6556,7 +6410,7 @@
     "gulp-rename": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.4.0.tgz",
-      "integrity": "sha512-swzbIGb/arEoFK89tPY58vg3Ok1bw+d35PfUNwWqdo7KM4jkmuGA78JiDNqR+JeZFaeeHnRg9N7aihX3YPmsyg==",
+      "integrity": "sha1-3hxxjnxAla6GH3KW708ySGSCQL0=",
       "dev": true
     },
     "gulp-util": {
@@ -6648,7 +6502,7 @@
     "gulp-watch": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/gulp-watch/-/gulp-watch-5.0.1.tgz",
-      "integrity": "sha512-HnTSBdzAOFIT4wmXYPDUn783TaYAq9bpaN05vuZNP5eni3z3aRx0NAKbjhhMYtcq76x4R1wf4oORDGdlrEjuog==",
+      "integrity": "sha1-g9N4dS9b+0baAj5zwX7R2nBmIV0=",
       "dev": true,
       "requires": {
         "ansi-colors": "1.1.0",
@@ -6792,7 +6646,7 @@
     "has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "integrity": "sha1-ci18v8H2qoJB8W3YFOAR4fQeh5Y=",
       "dev": true,
       "requires": {
         "function-bind": "1.1.1"
@@ -7073,7 +6927,7 @@
         "ansi-styles": {
           "version": "3.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=",
           "dev": true,
           "requires": {
             "color-convert": "1.9.2"
@@ -7082,7 +6936,7 @@
         "chalk": {
           "version": "2.4.1",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "integrity": "sha1-GMSasWoDe26wFSzIPjRxM4IVtm4=",
           "dev": true,
           "requires": {
             "ansi-styles": "3.2.1",
@@ -7099,7 +6953,7 @@
         "postcss": {
           "version": "6.0.23",
           "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+          "integrity": "sha1-YcgswyisYOZ3ZF+XkFTrmLwOMyQ=",
           "dev": true,
           "requires": {
             "chalk": "2.4.1",
@@ -7110,7 +6964,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true
         },
         "supports-color": {
@@ -7127,7 +6981,7 @@
     "ieee754": {
       "version": "1.1.12",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz",
-      "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==",
+      "integrity": "sha1-UL8k5bnIu5ivSWTJQc2wkY2ntgs=",
       "dev": true
     },
     "iferr": {
@@ -7139,7 +6993,7 @@
     "ignore": {
       "version": "3.3.10",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
-      "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
+      "integrity": "sha1-Cpf7h2mG6AgcYxFg+PnziRV/AEM=",
       "dev": true
     },
     "immediate": {
@@ -7200,7 +7054,7 @@
     "inquirer": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
-      "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
+      "integrity": "sha1-ndLyrXZdyrH/BEO0kUQqILoifck=",
       "dev": true,
       "requires": {
         "ansi-escapes": "3.1.0",
@@ -7260,7 +7114,7 @@
         "string-width": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
           "dev": true,
           "requires": {
             "is-fullwidth-code-point": "2.0.0",
@@ -7310,7 +7164,7 @@
     "is-absolute": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
+      "integrity": "sha1-OV4a6EsR8mrReV5zwXN45IowFXY=",
       "dev": true,
       "requires": {
         "is-relative": "1.0.0",
@@ -7363,7 +7217,7 @@
     "is-callable": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
-      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
+      "integrity": "sha1-HhrfIZ4e62hNaR+dagX/DTCiTXU=",
       "dev": true
     },
     "is-data-descriptor": {
@@ -7453,13 +7307,13 @@
     "is-my-ip-valid": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz",
-      "integrity": "sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==",
+      "integrity": "sha1-ezUbjo7dTTmV1NBmaA5mTZRpaCQ=",
       "dev": true
     },
     "is-my-json-valid": {
       "version": "2.19.0",
       "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.19.0.tgz",
-      "integrity": "sha512-mG0f/unGX1HZ5ep4uhRaPOS8EkAY8/j6mDRMJrutq4CqhoJWYp7qAlonIPy3TV7p3ju4TK9fo/PbnoksWmsp5Q==",
+      "integrity": "sha1-j9bkA2PNBrlj+od9REv7Xt3GIXU=",
       "dev": true,
       "requires": {
         "generate-function": "2.0.0",
@@ -7587,7 +7441,7 @@
     "is-relative": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
+      "integrity": "sha1-obtpNc6MXboei5dUubLcwCDiJg0=",
       "dev": true,
       "requires": {
         "is-unc-path": "1.0.0"
@@ -7596,7 +7450,7 @@
     "is-resolvable": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
+      "integrity": "sha1-+xj4fOH+uSUWnJpAfBkxijIG7Yg=",
       "dev": true
     },
     "is-stream": {
@@ -7628,7 +7482,7 @@
     "is-unc-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+      "integrity": "sha1-1zHoiY7QkKEsNSrS6u1Qla0yLJ0=",
       "dev": true,
       "requires": {
         "unc-path-regex": "0.1.2"
@@ -7648,14 +7502,13 @@
     "is-windows": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "integrity": "sha1-0YUOuXkezRjmGCzhKjDzlmNLsZ0=",
       "dev": true
     },
     "isarray": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-      "dev": true
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
     },
     "isexe": {
       "version": "2.0.0",
@@ -7687,7 +7540,7 @@
     "js-beautify": {
       "version": "1.7.5",
       "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.7.5.tgz",
-      "integrity": "sha512-9OhfAqGOrD7hoQBLJMTA+BKuKmoEtTJXzZ7WDF/9gvjtey1koVLuZqIY6c51aPDjbNdNtIXAkiWKVhziawE9Og==",
+      "integrity": "sha1-adllHvYNu2SfZVJ7U2dJUBOKeRk=",
       "dev": true,
       "requires": {
         "config-chain": "1.1.11",
@@ -7727,7 +7580,7 @@
     "json-loader": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz",
-      "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
+      "integrity": "sha1-3KFKcCNf+C8KyaOr62DTN6NlGF0=",
       "dev": true
     },
     "json-schema": {
@@ -7820,7 +7673,6 @@
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
       "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
-      "dev": true,
       "requires": {
         "graceful-fs": "4.1.11"
       }
@@ -7828,7 +7680,7 @@
     "known-css-properties": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.3.0.tgz",
-      "integrity": "sha512-QMQcnKAiQccfQTqtBh/qwquGZ2XK/DXND1jrcN9M8gMMy99Gwla7GQjndVUsEqIaRyP6bsFRuhwRj5poafBGJQ==",
+      "integrity": "sha1-o9E1u/xg7oxurPL35+by1HVeSaQ=",
       "dev": true
     },
     "last-run": {
@@ -8130,7 +7982,7 @@
     "lodash.merge": {
       "version": "4.6.1",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz",
-      "integrity": "sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==",
+      "integrity": "sha1-rcJdnLmbk5HFliTzefu6YNcRHVQ=",
       "dev": true
     },
     "lodash.mergewith": {
@@ -8192,7 +8044,7 @@
     "log-symbols": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
-      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
+      "integrity": "sha1-V0Dhxdbw39pK2TI7UzIQfva0xAo=",
       "dev": true,
       "requires": {
         "chalk": "2.4.1"
@@ -8274,7 +8126,7 @@
     "make-dir": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+      "integrity": "sha1-ecEDO4BRW9bSTsmTPoYMp17ifww=",
       "dev": true,
       "requires": {
         "pify": "3.0.0"
@@ -8283,7 +8135,7 @@
     "make-iterator": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
+      "integrity": "sha1-KbM/MSqo9UfEpeSQ9Wr87JkTOtY=",
       "dev": true,
       "requires": {
         "kind-of": "6.0.2"
@@ -8330,7 +8182,7 @@
     "material-colors": {
       "version": "1.2.6",
       "resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz",
-      "integrity": "sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==",
+      "integrity": "sha1-bRlYhxEmmSzuzHL0vMTY8BCGX0Y=",
       "dev": true
     },
     "math-expression-evaluator": {
@@ -8466,7 +8318,7 @@
     "miller-rabin": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "integrity": "sha1-8IA1HIZbDcViqEYpZtqlNUPHik0=",
       "dev": true,
       "requires": {
         "bn.js": "4.11.8",
@@ -8489,7 +8341,7 @@
     "mimic-fn": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+      "integrity": "sha1-ggyGo5M0ZA6ZUWkovQP8qIBX0CI=",
       "dev": true
     },
     "mimic-response": {
@@ -8500,7 +8352,7 @@
     "minimalistic-assert": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "integrity": "sha1-LhlN4ERibUoQ5/f7wAznPoPk1cc=",
       "dev": true
     },
     "minimalistic-crypto-utils": {
@@ -8525,7 +8377,7 @@
     "mississippi": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz",
-      "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==",
+      "integrity": "sha1-NEKlCPr8KFAEhv7qmUCWduTuWm8=",
       "dev": true,
       "requires": {
         "concat-stream": "1.6.0",
@@ -8555,7 +8407,7 @@
         "pump": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+          "integrity": "sha1-Ejma3W5M91Jtlzy8i1zi4pCLOQk=",
           "dev": true,
           "requires": {
             "end-of-stream": "1.4.1",
@@ -8651,6 +8503,43 @@
         "minimist": "0.0.8"
       }
     },
+    "mkpath": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz",
+      "integrity": "sha1-dVSm+Nhxg0zJe1RisSLEwSTW3pE="
+    },
+    "mksnapshot": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/mksnapshot/-/mksnapshot-0.3.1.tgz",
+      "integrity": "sha1-JQHAVldDbXQs6Vik/5LHfkDdN+Y=",
+      "requires": {
+        "decompress-zip": "0.3.0",
+        "fs-extra": "0.26.7",
+        "request": "2.87.0"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "0.26.7",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz",
+          "integrity": "sha1-muH92UiXeY7at20JGM9C0MMYT6k=",
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "jsonfile": "2.4.0",
+            "klaw": "1.3.1",
+            "path-is-absolute": "1.0.1",
+            "rimraf": "2.6.2"
+          }
+        },
+        "jsonfile": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+          "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
+          "requires": {
+            "graceful-fs": "4.1.11"
+          }
+        }
+      }
+    },
     "move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
@@ -8727,7 +8616,7 @@
     "natives": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.4.tgz",
-      "integrity": "sha512-Q29yeg9aFKwhLVdkTAejM/HvYG0Y1Am1+HUkFQGn5k2j8GS+v60TVmZh6nujpEAj/qql+wGUrlryO8bF+b1jEg==",
+      "integrity": "sha1-Lw8iT8mn3VNAfHZnyEz42+dz3lg=",
       "dev": true
     },
     "natural-compare": {
@@ -8764,7 +8653,7 @@
     "no-case": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
-      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
+      "integrity": "sha1-YLgTOWvjmz8SiKTB7V0efSi0ZKw=",
       "dev": true,
       "requires": {
         "lower-case": "1.1.4"
@@ -8939,7 +8828,7 @@
     "node-libs-browser": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz",
-      "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==",
+      "integrity": "sha1-X5QmPUBPbkR2fXJpAf/wVHjWAN8=",
       "dev": true,
       "requires": {
         "assert": "1.4.1",
@@ -9293,7 +9182,7 @@
     "object.assign": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "integrity": "sha1-lovxEA15Vrs8oIbwBvhGs7xACNo=",
       "dev": true,
       "requires": {
         "define-properties": "1.1.2",
@@ -9305,7 +9194,7 @@
         "object-keys": {
           "version": "1.0.12",
           "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz",
-          "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==",
+          "integrity": "sha1-CcU4VTd1dTEMymL1W7M0q/97PtI=",
           "dev": true
         }
       }
@@ -9416,7 +9305,7 @@
     "ora": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/ora/-/ora-1.4.0.tgz",
-      "integrity": "sha512-iMK1DOQxzzh2MBlVsU42G80mnrvUhqsMh74phHtDlrcTZPK0pH6o7l7DRshK+0YsxDyEuaOkziVdvM3T0QTzpw==",
+      "integrity": "sha1-iERYIVs6XUCXWSKF+TMhu3p54uU=",
       "dev": true,
       "requires": {
         "chalk": "2.4.1",
@@ -9582,7 +9471,7 @@
     "p-limit": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "integrity": "sha1-uGvV8MJWkJEcdZD8v8IBDVSzzLg=",
       "dev": true,
       "requires": {
         "p-try": "1.0.0"
@@ -9600,7 +9489,7 @@
     "p-map": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
-      "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
+      "integrity": "sha1-5OlPMR6rvIYzoeeZCBZfyiYkG2s=",
       "dev": true
     },
     "p-try": {
@@ -9612,7 +9501,7 @@
     "pako": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz",
-      "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==",
+      "integrity": "sha1-AQEhG6pwxLykoPY/Igbpe3368lg=",
       "dev": true
     },
     "parallel-transform": {
@@ -9676,7 +9565,7 @@
     "parse-asn1": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",
-      "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
+      "integrity": "sha1-9r8pOBgzK9DatU77Fgh3JHRebKg=",
       "dev": true,
       "requires": {
         "asn1.js": "4.10.1",
@@ -9831,7 +9720,7 @@
     "pbkdf2": {
       "version": "3.0.16",
       "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz",
-      "integrity": "sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==",
+      "integrity": "sha1-dAQgjsawG2LYW/g4U6gGT42cKlw=",
       "dev": true,
       "requires": {
         "create-hash": "1.2.0",
@@ -9935,7 +9824,7 @@
     "pluralize": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
-      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
+      "integrity": "sha1-KYuJ34uTsCIdv0Ia0rGx6iP8Z3c=",
       "dev": true
     },
     "popper.js": {
@@ -9953,7 +9842,7 @@
     "postcss": {
       "version": "5.2.18",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-      "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+      "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
       "dev": true,
       "requires": {
         "chalk": "1.1.3",
@@ -10054,7 +9943,7 @@
     "postcss-filter-plugins": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.3.tgz",
-      "integrity": "sha512-T53GVFsdinJhgwm7rg1BzbeBRomOg9y5MBVhGcsV0CxurUdVj1UlPdKtn7aqYA/c/QVkzKMjq2bSV5dKG5+AwQ==",
+      "integrity": "sha1-giRf34IzcEFkXkdxFNjlk6oYuOw=",
       "dev": true,
       "requires": {
         "postcss": "5.2.18"
@@ -10226,7 +10115,7 @@
         "postcss": {
           "version": "6.0.23",
           "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+          "integrity": "sha1-YcgswyisYOZ3ZF+XkFTrmLwOMyQ=",
           "dev": true,
           "requires": {
             "chalk": "2.4.1",
@@ -10237,7 +10126,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true
         },
         "supports-color": {
@@ -10290,7 +10179,7 @@
         "postcss": {
           "version": "6.0.23",
           "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+          "integrity": "sha1-YcgswyisYOZ3ZF+XkFTrmLwOMyQ=",
           "dev": true,
           "requires": {
             "chalk": "2.4.1",
@@ -10301,7 +10190,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true
         },
         "supports-color": {
@@ -10354,7 +10243,7 @@
         "postcss": {
           "version": "6.0.23",
           "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+          "integrity": "sha1-YcgswyisYOZ3ZF+XkFTrmLwOMyQ=",
           "dev": true,
           "requires": {
             "chalk": "2.4.1",
@@ -10365,7 +10254,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true
         },
         "supports-color": {
@@ -10418,7 +10307,7 @@
         "postcss": {
           "version": "6.0.23",
           "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+          "integrity": "sha1-YcgswyisYOZ3ZF+XkFTrmLwOMyQ=",
           "dev": true,
           "requires": {
             "chalk": "2.4.1",
@@ -10429,7 +10318,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true
         },
         "supports-color": {
@@ -10703,7 +10592,7 @@
     "public-encrypt": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz",
-      "integrity": "sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==",
+      "integrity": "sha1-RuuRByBr9zSJ+LhbadkTNMZhCZQ=",
       "dev": true,
       "requires": {
         "bn.js": "4.11.8",
@@ -10716,7 +10605,7 @@
     "pump": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "integrity": "sha1-tKIRaBW94vTh6mAjVOjHVWUQemQ=",
       "dev": true,
       "requires": {
         "end-of-stream": "1.4.1",
@@ -10774,8 +10663,7 @@
     "q": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-      "dev": true
+      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc="
     },
     "qs": {
       "version": "6.5.2",
@@ -10826,7 +10714,7 @@
     "randombytes": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
-      "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
+      "integrity": "sha1-0wLFIpSFiISKjTAMkytEwkIx2oA=",
       "dev": true,
       "requires": {
         "safe-buffer": "5.1.1"
@@ -10835,7 +10723,7 @@
     "randomfill": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "integrity": "sha1-ySGW/IarQr6YPxvzF3giSTHWFFg=",
       "dev": true,
       "requires": {
         "randombytes": "2.0.6",
@@ -10902,7 +10790,6 @@
       "version": "1.1.14",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
       "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-      "dev": true,
       "requires": {
         "core-util-is": "1.0.2",
         "inherits": "2.0.3",
@@ -11053,7 +10940,7 @@
     "regex-cache": {
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
+      "integrity": "sha1-db3FiioUls7EihKDW8VMjVYjNt0=",
       "dev": true,
       "requires": {
         "is-equal-shallow": "0.1.3"
@@ -11071,7 +10958,7 @@
     "regexpp": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz",
-      "integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==",
+      "integrity": "sha1-DjUW3Qt5BPQT0tQZPc5GGMOmias=",
       "dev": true
     },
     "regexpu-core": {
@@ -11117,7 +11004,7 @@
     "remove-bom-buffer": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",
-      "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
+      "integrity": "sha1-wr8eN3Ug0yT2I4kuM8EMrCwlK1M=",
       "dev": true,
       "requires": {
         "is-buffer": "1.1.6",
@@ -11396,7 +11283,7 @@
     "ripemd160": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "integrity": "sha1-ocGm9iR1FXe6XQeRTLyShQWFiQw=",
       "dev": true,
       "requires": {
         "hash-base": "3.0.4",
@@ -11439,7 +11326,7 @@
     "rxjs": {
       "version": "5.5.11",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.11.tgz",
-      "integrity": "sha512-3bjO7UwWfA2CV7lmwYMBzj4fQ6Cq+ftHc2MvUe+WMS7wcdJ1LosDWmdjPQanYp2dBRj572p7PeU81JUxHKOcBA==",
+      "integrity": "sha1-9zMCfKQ+O+xrmURzvkq5itQ87Yc=",
       "dev": true,
       "requires": {
         "symbol-observable": "1.0.1"
@@ -11453,7 +11340,7 @@
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=",
       "dev": true
     },
     "sass-graph": {
@@ -11605,7 +11492,7 @@
         "globule": {
           "version": "1.2.1",
           "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
-          "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
+          "integrity": "sha1-Xf+xsZHyLSB5epNptJ6rTpg5aW0=",
           "dev": true,
           "requires": {
             "glob": "7.1.2",
@@ -11765,7 +11652,7 @@
     "sass-loader": {
       "version": "6.0.7",
       "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-6.0.7.tgz",
-      "integrity": "sha512-JoiyD00Yo1o61OJsoP2s2kb19L1/Y2p3QFcCdWdF6oomBGKVYuZyqHWemRBfQ2uGYsk+CH3eCguXNfpjzlcpaA==",
+      "integrity": "sha1-3S/bPn7v9KU/NbpqxAhxVIg1PQA=",
       "dev": true,
       "requires": {
         "clone-deep": "2.0.2",
@@ -11778,7 +11665,7 @@
     "sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk=",
       "dev": true
     },
     "schema-utils": {
@@ -11865,7 +11752,7 @@
     "serialize-javascript": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.5.0.tgz",
-      "integrity": "sha512-Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==",
+      "integrity": "sha1-GqM2FiyIqJDdrVOEuuvJOmVRYf4=",
       "dev": true
     },
     "set-blocking": {
@@ -11909,7 +11796,7 @@
     "sha.js": {
       "version": "2.4.11",
       "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "integrity": "sha1-N6XPC4HsvGlD3hCbopYNGyZYSuc=",
       "dev": true,
       "requires": {
         "inherits": "2.0.3",
@@ -11919,7 +11806,7 @@
     "shallow-clone": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz",
-      "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==",
+      "integrity": "sha1-RIDNBuiC72iyrYij6lSDLixItXE=",
       "dev": true,
       "requires": {
         "is-extendable": "0.1.1",
@@ -11930,7 +11817,7 @@
         "kind-of": {
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=",
           "dev": true
         }
       }
@@ -12000,7 +11887,7 @@
     "slice-ansi": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
-      "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
+      "integrity": "sha1-BE8aSdiEL/MHqta1Be0Xi9lQE00=",
       "dev": true,
       "requires": {
         "is-fullwidth-code-point": "2.0.0"
@@ -12141,7 +12028,7 @@
     "source-list-map": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz",
-      "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==",
+      "integrity": "sha1-qqR0A/eyRakvvJfqCPJQ1gh+0IU=",
       "dev": true
     },
     "source-map": {
@@ -12166,7 +12053,7 @@
     "source-map-support": {
       "version": "0.4.18",
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
-      "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
+      "integrity": "sha1-Aoam3ovkJkEzhZTpfM6nXwosWF8=",
       "dev": true,
       "requires": {
         "source-map": "0.5.7"
@@ -12187,7 +12074,7 @@
     "spawn-rx": {
       "version": "2.0.12",
       "resolved": "https://registry.npmjs.org/spawn-rx/-/spawn-rx-2.0.12.tgz",
-      "integrity": "sha512-gOPXiQQFQ9lTOLuys0iMn3jfxxv9c7zzwhbYLOEbQGvEShHVJ5sSR1oD3Daj88os7jKArDYT7rbOKdvNhe7iEg==",
+      "integrity": "sha1-tihSlEmUJgib7qDDwewy1/xXo3Y=",
       "dev": true,
       "requires": {
         "debug": "2.6.9",
@@ -12282,7 +12169,7 @@
     "ssri": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz",
-      "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==",
+      "integrity": "sha1-ujhyycbTOgcEp9cf8EXl7EiZnQY=",
       "dev": true,
       "requires": {
         "safe-buffer": "5.1.1"
@@ -12480,7 +12367,7 @@
     "stream-consume": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz",
-      "integrity": "sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg==",
+      "integrity": "sha1-0721mMK9CugrjKx6xQsRB6eZbEg=",
       "dev": true
     },
     "stream-each": {
@@ -12496,13 +12383,13 @@
     "stream-exhaust": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
-      "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
+      "integrity": "sha1-rNrI2lnvK8HheiwMz2wyDRIOVV0=",
       "dev": true
     },
     "stream-http": {
       "version": "2.8.3",
       "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
-      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+      "integrity": "sha1-stJCRpKIpaJ+xP6JM6z2I95lFPw=",
       "dev": true,
       "requires": {
         "builtin-status-codes": "3.0.0",
@@ -12581,8 +12468,7 @@
     "string_decoder": {
       "version": "0.10.31",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-      "dev": true
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
     },
     "stringstream": {
       "version": "0.0.5",
@@ -12730,7 +12616,7 @@
     "table": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
-      "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
+      "integrity": "sha1-ozRHN1OR52atNNNIbm4q7chNLjY=",
       "dev": true,
       "requires": {
         "ajv": "5.5.2",
@@ -12812,7 +12698,7 @@
     "tapable": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.0.0.tgz",
-      "integrity": "sha512-dQRhbNQkRnaqauC7WqSJ21EEksgT0fYZX2lqXzGkpo8JNig9zGZTYoMGvyI2nWmXlE2VSVXVDu7wLVGu/mQEsg==",
+      "integrity": "sha1-y7Y52QAu7ZxrWXXrIFmNeTbx+fI=",
       "dev": true
     },
     "tar": {
@@ -13015,7 +12901,7 @@
     "timers-browserify": {
       "version": "2.0.10",
       "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
-      "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
+      "integrity": "sha1-HSjj0qrfHVpZlsTp+VYBzQU0gK4=",
       "dev": true,
       "requires": {
         "setimmediate": "1.0.5"
@@ -13030,7 +12916,7 @@
     "tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=",
       "dev": true,
       "requires": {
         "os-tmpdir": "1.0.2"
@@ -13236,6 +13122,24 @@
       "integrity": "sha1-LmhELZ9k7HILjMieZEOsbKqVACk=",
       "dev": true
     },
+    "touch": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/touch/-/touch-0.0.3.tgz",
+      "integrity": "sha1-Ua7z1ElXHU8oel2Hyci0kYGg2x0=",
+      "requires": {
+        "nopt": "1.0.10"
+      },
+      "dependencies": {
+        "nopt": {
+          "version": "1.0.10",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
+          "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
+          "requires": {
+            "abbrev": "1.1.1"
+          }
+        }
+      }
+    },
     "tough-cookie": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
@@ -13244,6 +13148,11 @@
         "punycode": "1.4.1"
       }
     },
+    "traverse": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
+      "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk="
+    },
     "trim-newlines": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
@@ -13549,7 +13458,7 @@
     "uri-js": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=",
       "dev": true,
       "requires": {
         "punycode": "2.1.1"
@@ -13558,7 +13467,7 @@
         "punycode": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+          "integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew=",
           "dev": true
         }
       }
@@ -13675,7 +13584,7 @@
     "util": {
       "version": "0.10.4",
       "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
-      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+      "integrity": "sha1-OqASW/5mikZy3liFfTrOJ+y3aQE=",
       "dev": true,
       "requires": {
         "inherits": "2.0.3"
@@ -13689,7 +13598,7 @@
     "util.promisify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
-      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
+      "integrity": "sha1-RA9xZaRZyaFtwUXrjnLzVocJcDA=",
       "dev": true,
       "requires": {
         "define-properties": "1.1.2",
@@ -13721,7 +13630,7 @@
     "v8flags": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.1.tgz",
-      "integrity": "sha512-iw/1ViSEaff8NJ3HLyEjawk/8hjJib3E7pvG4pddVXfUg1983s3VGsiClDjhK64MQVDGqc1Q8r18S4VKQZS9EQ==",
+      "integrity": "sha1-QiWaFGHAg5fjf+HU8c+1nK2FoFM=",
       "dev": true,
       "requires": {
         "homedir-polyfill": "1.0.1"
@@ -13745,7 +13654,7 @@
     "vendors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.2.tgz",
-      "integrity": "sha512-w/hry/368nO21AN9QljsaIhb9ZiZtZARoVH5f3CsFbawdLdayCgKRPup7CggujvySMxx0I91NOyxdVENohprLQ==",
+      "integrity": "sha1-f8te759WI7FWvOqJ7DfWNnbyGAE=",
       "dev": true
     },
     "verror": {
@@ -13805,7 +13714,7 @@
     "vinyl-fs": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
-      "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==",
+      "integrity": "sha1-yFhJQF9nQo/qu71cXb3WT0fTG8c=",
       "dev": true,
       "requires": {
         "fs-mkdirp-stream": "1.0.0",
@@ -13983,13 +13892,13 @@
     "vue": {
       "version": "2.5.17",
       "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.17.tgz",
-      "integrity": "sha512-mFbcWoDIJi0w0Za4emyLiW72Jae0yjANHbCVquMKijcavBGypqlF7zHRgMa5k4sesdv7hv2rB4JPdZfR+TPfhQ==",
+      "integrity": "sha1-D4eJrXGL5oyhhyYpgy7VM1icato=",
       "dev": true
     },
     "vue-codemirror": {
       "version": "4.0.5",
       "resolved": "https://registry.npmjs.org/vue-codemirror/-/vue-codemirror-4.0.5.tgz",
-      "integrity": "sha512-VeLTG6/c/8+q46XT7Uoeiiwtb18+USSEY7uajG3dtfWS4tkA/R8PDKUdTwI1xJh7rnAMMtZ8tlQGASUoA5Yebw==",
+      "integrity": "sha1-OnhNRU+/sXznabn8kPEOmGhofss=",
       "dev": true,
       "requires": {
         "codemirror": "5.39.2",
@@ -14010,13 +13919,13 @@
     "vue-context-menu": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/vue-context-menu/-/vue-context-menu-2.0.6.tgz",
-      "integrity": "sha512-wTyyjWbrGq/Rc1iivHl9ryI0IcsodRgg46CAGCm6knADDsTj5qJzo2pPDfi6y2nQreg8llJC2lGGts88tMX1sQ==",
+      "integrity": "sha1-GFEHzTrlHyXFMmaidRAI+n2k804=",
       "dev": true
     },
     "vue-eslint-parser": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz",
-      "integrity": "sha512-ZezcU71Owm84xVF6gfurBQUGg8WQ+WZGxgDEQu1IHFBZNx7BFZg3L1yHxrCBNNwbwFtE1GuvfJKMtb6Xuwc/Bw==",
+      "integrity": "sha1-wmjJbG2Uz+PZOKX3WTlZsMozYNE=",
       "dev": true,
       "requires": {
         "debug": "3.1.0",
@@ -14030,7 +13939,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -14041,7 +13950,7 @@
     "vue-hot-reload-api": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.0.tgz",
-      "integrity": "sha512-2j/t+wIbyVMP5NvctQoSUvLkYKoWAAk2QlQiilrM2a6/ulzFgdcLUJfTvs4XQ/3eZhHiBmmEojbjmM4AzZj8JA==",
+      "integrity": "sha1-l5dhQkBdE9jvrhVHSeiMTjWM+SY=",
       "dev": true
     },
     "vue-loader": {
@@ -14138,13 +14047,13 @@
     "vue-resize": {
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-0.4.4.tgz",
-      "integrity": "sha512-Lb/cnE2N9Y42ZJPw8wpjkpuX5a9ReerWNGcQRcbNCwfCnkHG6++FurNNmLIdU8dcCTH4c5rtTPdxBqFoRMK2cQ==",
+      "integrity": "sha1-3um43RsYnn4/bsR/hsYGlKJBuxc=",
       "dev": true
     },
     "vue-style-loader": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-3.1.2.tgz",
-      "integrity": "sha512-ICtVdK/p+qXWpdSs2alWtsXt9YnDoYjQe0w5616j9+/EhjoxZkbun34uWgsMFnC1MhrMMwaWiImz3K2jK1Yp2Q==",
+      "integrity": "sha1-a2atNJmPyVIMLx5NX6QJFkHBWXo=",
       "dev": true,
       "requires": {
         "hash-sum": "1.0.2",
@@ -14154,7 +14063,7 @@
     "vue-template-compiler": {
       "version": "2.5.17",
       "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.17.tgz",
-      "integrity": "sha512-63uI4syCwtGR5IJvZM0LN5tVsahrelomHtCxvRkZPJ/Tf3ADm1U1wG6KWycK3qCfqR+ygM5vewUvmJ0REAYksg==",
+      "integrity": "sha1-UqSgeMMn3rk3SCpQmuhcBvNGw8s=",
       "dev": true,
       "requires": {
         "de-indent": "1.0.2",
@@ -14164,13 +14073,13 @@
     "vue-template-es2015-compiler": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz",
-      "integrity": "sha512-x3LV3wdmmERhVCYy3quqA57NJW7F3i6faas++pJQWtknWT+n7k30F4TVdHvCLn48peTJFRvCpxs3UuFPqgeELg==",
+      "integrity": "sha1-3EJpcTMwLOMBdSQ1amxht7abShg=",
       "dev": true
     },
     "watchpack": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
-      "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
+      "integrity": "sha1-S8EsLr6KonenHx0/FNaFx7RGzQA=",
       "dev": true,
       "requires": {
         "chokidar": "2.0.2",
@@ -14181,7 +14090,7 @@
     "webpack": {
       "version": "3.12.0",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.12.0.tgz",
-      "integrity": "sha512-Sw7MdIIOv/nkzPzee4o0EdvCuPmxT98+vVpIvwtcwcF1Q4SDSNp92vwcKc4REe7NItH9f1S4ra9FuQ7yuYZ8bQ==",
+      "integrity": "sha1-P540NgNwYC/PY56Xk520hvTsDXQ=",
       "dev": true,
       "requires": {
         "acorn": "5.7.1",
@@ -14282,7 +14191,7 @@
         "os-locale": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
-          "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
+          "integrity": "sha1-QrwpAKa1uL0XN2yOiCtlr8zyS/I=",
           "dev": true,
           "requires": {
             "execa": "0.7.0",
@@ -14497,7 +14406,7 @@
     "webpack-sources": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.1.0.tgz",
-      "integrity": "sha512-aqYp18kPphgoO5c/+NaUvEeACtZjMESmDChuD3NBciVpah3XpMEU9VAAtIaB1BsfJWWTSdv8Vv1m3T0aRk2dUw==",
+      "integrity": "sha1-oQHrrlnWUHNU1x2AE5UKOot6WlQ=",
       "dev": true,
       "requires": {
         "source-list-map": "2.0.0",
@@ -14507,7 +14416,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true
         }
       }
@@ -14559,7 +14468,7 @@
     "worker-farm": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz",
-      "integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==",
+      "integrity": "sha1-rsxAWXb6talVJhgIRvDboojzpKA=",
       "dev": true,
       "requires": {
         "errno": "0.1.7"
@@ -14657,56 +14566,6 @@
       "requires": {
         "fd-slicer": "1.0.1"
       }
-    },
-    "zip-stream": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-1.2.0.tgz",
-      "integrity": "sha1-qLxF9MG0lpnGuQGYuqyqzbzUugQ=",
-      "dev": true,
-      "requires": {
-        "archiver-utils": "1.3.0",
-        "compress-commons": "1.2.2",
-        "lodash": "4.17.10",
-        "readable-stream": "2.3.6"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "process-nextick-args": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "2.0.0",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.1.1",
-            "util-deprecate": "1.0.2"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.1.1"
-          }
-        }
-      }
     }
   }
 }
diff --git a/package.json b/package.json
index 6ea13aba..362817fc 100644
--- a/package.json
+++ b/package.json
@@ -21,11 +21,11 @@
     "fs-extra": "^7.0.0",
     "keytar": "4.2.1",
     "nedb": "^1.8.0",
-    "node-sass": "^4.9.2"
+    "node-sass": "^4.9.2",
+    "asar": "^0.14.3"
   },
   "devDependencies": {
     "aes256": "^1.0.4",
-    "archiver": "^2.1.1",
     "babel-core": "^6.26.3",
     "babel-loader": "^7.1.5",
     "babel-preset-env": "^1.7.0",

From 5c160d75a6dc61a16660a4c18b9cbc618ce5e067 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Mon, 27 Aug 2018 17:32:21 +0300
Subject: [PATCH 03/29] add a packed test plugin

---
 tests/ext/plugins/Packed Test.bd | Bin 0 -> 867 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 tests/ext/plugins/Packed Test.bd

diff --git a/tests/ext/plugins/Packed Test.bd b/tests/ext/plugins/Packed Test.bd
new file mode 100644
index 0000000000000000000000000000000000000000..cd755564ec288ba1baf706324aea58344b6f30da
GIT binary patch
literal 867
zcmb7COH0E*5bnWK!T&JK#TH^|jjgew;8i>biU&nBW+&-tnhm=fEtdRuXOl|S2dGQ-
zFf-p{GP7H~UQh6S;CsV&jj7DZ;CzjVDpHw^o{TD7XyhB=e1C5iph{Ci7Uwv|IzU+n
zS~08xg<<G{n1Xd(v-Wl$_%I<=IEPKxrUWOjjFV>)yOxZ_panP8B3`mJ;6+o1tFQIA
zvJ0iT0l4j0j_Fyr&>j2`JCpL+_%>~w5ki_oX>l)`rlLt0Md9HznjK80v;AoNBPWw~
zQ9a&QhV<_S_ElO-`a4?U=l<(1yz>Y0LfS~T7MP62enF5)v@C5~{1{l7SD7rJnQN<9
zZ%DX|rIYEFxZP*dr4m(6BU+V8TLZ^1xM(B-I4xxW*Hj3lhj4u2CfqEQAB(ZDhI5r=
zq@iXGLy!8cohDo90+Kv7254oOZ=jX*cch9-8*4il`boEzR&|uCY_Q`!0@x6ChDY6?
d9Dd_xbwyr<f2@N!sw)3yrOLlMxi;94zjuI9*Gd2Y

literal 0
HcmV?d00001


From 2913a85368416e0892a4719693b3f416c7b11fb0 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Mon, 27 Aug 2018 19:16:30 +0300
Subject: [PATCH 04/29] Packed content loading

---
 client/src/modules/contentmanager.js | 67 +++++++++++++++++++++++-----
 client/src/modules/globals.js        |  5 +++
 client/src/modules/pluginmanager.js  |  7 ++-
 3 files changed, 68 insertions(+), 11 deletions(-)

diff --git a/client/src/modules/contentmanager.js b/client/src/modules/contentmanager.js
index da815d57..4452ed37 100644
--- a/client/src/modules/contentmanager.js
+++ b/client/src/modules/contentmanager.js
@@ -8,13 +8,16 @@
  * LICENSE file in the root directory of this source tree.
 */
 
+import asar from 'asar';
+import path, { dirname } from 'path';
+import rimraf from 'rimraf';
+
 import Content from './content';
 import Globals from './globals';
 import Database from './database';
 import { Utils, FileUtils, ClientLogger as Logger } from 'common';
 import { SettingsSet, ErrorEvent } from 'structs';
 import { Modals } from 'ui';
-import path from 'path';
 import Combokeys from 'combokeys';
 
 /**
@@ -77,12 +80,20 @@ export default class {
             const directories = await FileUtils.listDirectory(this.contentPath);
 
             for (const dir of directories) {
-                try {
-                    await FileUtils.directoryExists(path.join(this.contentPath, dir));
-                } catch (err) { continue; }
+                const packed = dir.endsWith('.bd');
+
+                if (!packed) {
+                    try {
+                        await FileUtils.directoryExists(path.join(this.contentPath, dir));
+                    } catch (err) { continue; }
+                }
 
                 try {
-                    await this.preloadContent(dir);
+                    if (packed) {
+                        await this.preloadPackedContent(dir);
+                    } else {
+                        await this.preloadContent(dir);
+                    }
                 } catch (err) {
                     this.errors.push(new ErrorEvent({
                         module: this.moduleName,
@@ -173,6 +184,33 @@ export default class {
         }
     }
 
+    static async preloadPackedContent(pkg, reload = false, index) {
+        try {
+            const packagePath = path.join(this.contentPath, pkg);
+            await FileUtils.fileExists(packagePath);
+
+            const config = JSON.parse(asar.extractFile(packagePath, 'config.json').toString());
+            const unpackedPath = path.join(Globals.getPath('tmp'), config.info.name);
+
+            asar.extractAll(packagePath, unpackedPath);
+            const content = await this.preloadContent({
+                config,
+                contentPath: unpackedPath,
+                packagePath: packagePath,
+                pkg,
+                packed: true
+            }, reload, index);
+
+            rimraf(unpackedPath, err => {
+                if (err) throw err;
+            });
+
+            return content;
+        } catch (err) {
+            throw err;
+        }
+    }
+
     /**
      * Common loading procedure for loading content before passing it to the actual loader
      * @param {any} dirName Base directory for content
@@ -181,7 +219,8 @@ export default class {
      */
     static async preloadContent(dirName, reload = false, index) {
         try {
-            const contentPath = path.join(this.contentPath, dirName);
+            const packed = typeof dirName === 'object' && dirName.packed;
+            const contentPath = packed ? dirName.contentPath : path.join(this.contentPath, dirName);
 
             await FileUtils.directoryExists(contentPath);
 
@@ -189,7 +228,7 @@ export default class {
                 throw { 'message': `Attempted to load already loaded user content: ${path}` };
 
             const configPath = path.resolve(contentPath, 'config.json');
-            const readConfig = await FileUtils.readJsonFromFile(configPath);
+            const readConfig = packed ? dirName.config : await FileUtils.readJsonFromFile(configPath);
             const mainPath = path.join(contentPath, readConfig.main || 'index.js');
 
             const defaultConfig = new SettingsSet({
@@ -213,7 +252,7 @@ export default class {
                 }
             } catch (err) {
                 // We don't care if this fails it either means that user config doesn't exist or there's something wrong with it so we revert to default config
-                Logger.warn(this.moduleName, [`Failed reading config for ${this.contentType} ${readConfig.info.name} in ${dirName}`, err]);
+                Logger.warn(this.moduleName, [`Failed reading config for ${this.contentType} ${readConfig.info.name} in ${packed ? dirName.pkg : dirName}`, err]);
             }
 
             userConfig.config = defaultConfig.clone({ settings: userConfig.config });
@@ -243,7 +282,7 @@ export default class {
                 mainPath
             };
 
-            const content = await this.loadContent(paths, configs, readConfig.info, readConfig.main, readConfig.dependencies, readConfig.permissions, readConfig.mainExport);
+            const content = await this.loadContent(paths, configs, readConfig.info, readConfig.main, readConfig.dependencies, readConfig.permissions, readConfig.mainExport, packed ? dirName : false);
             if (!content) return undefined;
             if (!reload && this.getContentById(content.id))
                 throw {message: `A ${this.contentType} with the ID ${content.id} already exists.`};
@@ -310,7 +349,15 @@ export default class {
             if (this.unloadContentHook) this.unloadContentHook(content);
 
             if (reload) {
-                const newcontent = await this.preloadContent(content.dirName, true, index);
+                let newcontent;
+                if (content.packed) {
+                    newcontent = await this.preloadPackedContent(content.packed.pkg, true, index);
+                } else {
+                    newcontent = await this.preloadContent(content.dirName, true, index);
+                }
+                console.debug('enwcontent', newcontent);
+                //const newcontent = await (content.packed ? this.preloadPackedContent(content.packed.pkg, true, index) : this.preloadContent(content.dirName, true, index));
+
                 if (newcontent.enabled) {
                     newcontent.userConfig.enabled = false;
                     newcontent.start(false);
diff --git a/client/src/modules/globals.js b/client/src/modules/globals.js
index 3b0b5b3b..7c40a19a 100644
--- a/client/src/modules/globals.js
+++ b/client/src/modules/globals.js
@@ -8,6 +8,7 @@
  * LICENSE file in the root directory of this source tree.
 */
 
+import path from 'path';
 import sparkplug from 'sparkplug';
 import { ClientIPC } from 'common';
 import Module from './module';
@@ -35,6 +36,10 @@ export default new class extends Module {
 
     async first() {
         const config = await ClientIPC.send('getConfig');
+        config.paths.push({
+            id: 'tmp',
+            path: path.join(config.paths.find(p => p.id === 'base').path, 'tmp')
+        });
         this.setState({ config });
 
         // This is for Discord to stop error reporting :3
diff --git a/client/src/modules/pluginmanager.js b/client/src/modules/pluginmanager.js
index e1c0d04b..6facad27 100644
--- a/client/src/modules/pluginmanager.js
+++ b/client/src/modules/pluginmanager.js
@@ -74,7 +74,7 @@ export default class extends ContentManager {
     static get refreshPlugins() { return this.refreshContent }
 
     static get loadContent() { return this.loadPlugin }
-    static async loadPlugin(paths, configs, info, main, dependencies, permissions, mainExport) {
+    static async loadPlugin(paths, configs, info, main, dependencies, permissions, mainExport, packed = false) {
         if (permissions && permissions.length > 0) {
             for (const perm of permissions) {
                 Logger.log(this.moduleName, `Permission: ${Permissions.permissionText(perm).HEADER} - ${Permissions.permissionText(perm).BODY}`);
@@ -117,6 +117,11 @@ export default class extends ContentManager {
             }
         });
 
+        if (packed) instance.packed = {
+            packagePath: packed.packagePath,
+            pkg: packed.pkg
+        };
+
         if (instance.enabled && this.loaded) {
             instance.userConfig.enabled = false;
             instance.start(false);

From cfbafffe460b7aaa1a8d82ff64e61bba24940600 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Mon, 27 Aug 2018 19:17:33 +0300
Subject: [PATCH 05/29] add option for unsafe content

---
 client/src/data/user.settings.default.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/client/src/data/user.settings.default.json b/client/src/data/user.settings.default.json
index 5c6388bf..3c164406 100644
--- a/client/src/data/user.settings.default.json
+++ b/client/src/data/user.settings.default.json
@@ -34,6 +34,13 @@
                         "hint": "Adds some of BetterDiscord's internal modules to `global._bd`.",
                         "value": false
                     },
+                    {
+                        "id": "unsafe-content",
+                        "type": "bool",
+                        "text": "Allow unverified content",
+                        "hint": "Allow loading unverified plugins/themes",
+                        "value": "false"
+                    },
                     {
                         "id": "debugger-keybind",
                         "type": "keybind",

From 6b3cb712c784cea307ec1058e777bd4815ffd0bc Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Mon, 27 Aug 2018 19:36:06 +0300
Subject: [PATCH 06/29] Block any nonpacked content by default if unsafe is not
 allowed

---
 client/src/modules/contentmanager.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/client/src/modules/contentmanager.js b/client/src/modules/contentmanager.js
index 4452ed37..dc69de60 100644
--- a/client/src/modules/contentmanager.js
+++ b/client/src/modules/contentmanager.js
@@ -19,6 +19,7 @@ import { Utils, FileUtils, ClientLogger as Logger } from 'common';
 import { SettingsSet, ErrorEvent } from 'structs';
 import { Modals } from 'ui';
 import Combokeys from 'combokeys';
+import Settings from './settings';
 
 /**
  * Base class for managing external content
@@ -131,6 +132,8 @@ export default class {
             const directories = await FileUtils.listDirectory(this.contentPath);
 
             for (const dir of directories) {
+                const packed = dir.endsWith('.bd');
+
                 // If content is already loaded this should resolve
                 if (this.getContentByDirName(dir)) continue;
 
@@ -219,7 +222,14 @@ export default class {
      */
     static async preloadContent(dirName, reload = false, index) {
         try {
+            const unsafeAllowed = Settings.getSetting('core', 'advanced', 'unsafe-content').value;
             const packed = typeof dirName === 'object' && dirName.packed;
+
+            // Block any unpacked content as they can't be verified
+            if (!packed && !unsafeAllowed) {
+                throw 'Blocked unsafe content';
+            }
+
             const contentPath = packed ? dirName.contentPath : path.join(this.contentPath, dirName);
 
             await FileUtils.directoryExists(contentPath);

From cb35b14311a831c681f0cdb8cf909da828480717 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Mon, 27 Aug 2018 19:37:55 +0300
Subject: [PATCH 07/29] Remove debugs

---
 client/src/modules/contentmanager.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/client/src/modules/contentmanager.js b/client/src/modules/contentmanager.js
index dc69de60..7c76fee8 100644
--- a/client/src/modules/contentmanager.js
+++ b/client/src/modules/contentmanager.js
@@ -365,8 +365,6 @@ export default class {
                 } else {
                     newcontent = await this.preloadContent(content.dirName, true, index);
                 }
-                console.debug('enwcontent', newcontent);
-                //const newcontent = await (content.packed ? this.preloadPackedContent(content.packed.pkg, true, index) : this.preloadContent(content.dirName, true, index));
 
                 if (newcontent.enabled) {
                     newcontent.userConfig.enabled = false;

From 2cd94fcd5f89d20a9b180902493228edfc5e2799 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Mon, 27 Aug 2018 19:39:29 +0300
Subject: [PATCH 08/29] Remove package plugin button if plugin is already
 packaged

---
 client/src/ui/components/bd/PluginCard.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/ui/components/bd/PluginCard.vue b/client/src/ui/components/bd/PluginCard.vue
index 9a371ce8..f8cfe65d 100644
--- a/client/src/ui/components/bd/PluginCard.vue
+++ b/client/src/ui/components/bd/PluginCard.vue
@@ -12,7 +12,7 @@
     <Card :item="plugin">
         <SettingSwitch v-if="plugin.type === 'plugin'" slot="toggle" :value="plugin.enabled" @input="$emit('toggle-plugin')" />
         <ButtonGroup slot="controls">
-            <Button v-if="devmode" v-tooltip="'Package Plugin'" @click="package"><MiBoxDownload size="18"/></Button>
+            <Button v-if="devmode && !plugin.packed" v-tooltip="'Package Plugin'" @click="package"><MiBoxDownload size="18"/></Button>
             <Button v-tooltip="'Settings (shift + click to open settings without cloning the set)'" v-if="plugin.hasSettings" @click="$emit('show-settings', $event.shiftKey)"><MiSettings size="18" /></Button>
             <Button v-tooltip="'Reload'" @click="$emit('reload-plugin')"><MiRefresh size="18" /></Button>
             <Button v-tooltip="'Edit'" @click="editPlugin"><MiPencil size="18" /></Button>

From 1009c62ea037cb7799f57060a715c3a750df1116 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Mon, 27 Aug 2018 19:41:52 +0300
Subject: [PATCH 09/29] duplicate asar external

---
 client/webpack.config.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/webpack.config.js b/client/webpack.config.js
index 0747c803..8f856b63 100644
--- a/client/webpack.config.js
+++ b/client/webpack.config.js
@@ -40,7 +40,6 @@ module.exports = {
         net: 'require("net")',
         request: 'require(require("path").join(require("electron").remote.app.getAppPath(), "node_modules", "request"))',
         sparkplug: 'require("../../core/dist/sparkplug")',
-        asar: 'require("asar")',
         'node-crypto': 'require("crypto")'
     },
     resolve: {

From 2093c472b59f1ebefe620c6df43d9ab34143c9ab Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Mon, 27 Aug 2018 20:17:07 +0300
Subject: [PATCH 10/29] Move unsafe-content under security

---
 client/src/data/user.settings.default.json | 14 +++++++-------
 client/src/modules/contentmanager.js       |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/client/src/data/user.settings.default.json b/client/src/data/user.settings.default.json
index 3c164406..7acf30aa 100644
--- a/client/src/data/user.settings.default.json
+++ b/client/src/data/user.settings.default.json
@@ -34,13 +34,6 @@
                         "hint": "Adds some of BetterDiscord's internal modules to `global._bd`.",
                         "value": false
                     },
-                    {
-                        "id": "unsafe-content",
-                        "type": "bool",
-                        "text": "Allow unverified content",
-                        "hint": "Allow loading unverified plugins/themes",
-                        "value": "false"
-                    },
                     {
                         "id": "debugger-keybind",
                         "type": "keybind",
@@ -229,6 +222,13 @@
             {
                 "id": "default",
                 "settings": [
+                    {
+                        "id": "unsafe-content",
+                        "type": "bool",
+                        "text": "Allow unverified content",
+                        "hint": "Allow loading unverified plugins/themes",
+                        "value": "false"
+                    },
                     {
                         "id": "tracking-protection",
                         "type": "bool",
diff --git a/client/src/modules/contentmanager.js b/client/src/modules/contentmanager.js
index 7c76fee8..91daa296 100644
--- a/client/src/modules/contentmanager.js
+++ b/client/src/modules/contentmanager.js
@@ -222,7 +222,7 @@ export default class {
      */
     static async preloadContent(dirName, reload = false, index) {
         try {
-            const unsafeAllowed = Settings.getSetting('core', 'advanced', 'unsafe-content').value;
+            const unsafeAllowed = Settings.getSetting('security', 'default', 'unsafe-content').value;
             const packed = typeof dirName === 'object' && dirName.packed;
 
             // Block any unpacked content as they can't be verified

From 76d54f0a957835fe8442595825f86fe541532f86 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Tue, 28 Aug 2018 18:08:56 +0300
Subject: [PATCH 11/29] Fix plugin loading for packed plugins

---
 client/src/modules/contentmanager.js | 34 ++++++++++------------------
 client/src/modules/pluginmanager.js  |  8 ++++---
 2 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/client/src/modules/contentmanager.js b/client/src/modules/contentmanager.js
index 91daa296..7a0076bb 100644
--- a/client/src/modules/contentmanager.js
+++ b/client/src/modules/contentmanager.js
@@ -190,25 +190,22 @@ export default class {
     static async preloadPackedContent(pkg, reload = false, index) {
         try {
             const packagePath = path.join(this.contentPath, pkg);
+            const packageName = pkg.replace('.bd', '');
             await FileUtils.fileExists(packagePath);
 
             const config = JSON.parse(asar.extractFile(packagePath, 'config.json').toString());
-            const unpackedPath = path.join(Globals.getPath('tmp'), config.info.name);
+            const unpackedPath = path.join(Globals.getPath('tmp'), packageName);
 
             asar.extractAll(packagePath, unpackedPath);
-            const content = await this.preloadContent({
+            return this.preloadContent({
                 config,
                 contentPath: unpackedPath,
                 packagePath: packagePath,
                 pkg,
+                packageName,
                 packed: true
             }, reload, index);
 
-            rimraf(unpackedPath, err => {
-                if (err) throw err;
-            });
-
-            return content;
         } catch (err) {
             throw err;
         }
@@ -295,13 +292,19 @@ export default class {
             const content = await this.loadContent(paths, configs, readConfig.info, readConfig.main, readConfig.dependencies, readConfig.permissions, readConfig.mainExport, packed ? dirName : false);
             if (!content) return undefined;
             if (!reload && this.getContentById(content.id))
-                throw {message: `A ${this.contentType} with the ID ${content.id} already exists.`};
+                throw { message: `A ${this.contentType} with the ID ${content.id} already exists.` };
 
             if (reload) this.localContent.splice(index, 1, content);
             else this.localContent.push(content);
             return content;
         } catch (err) {
             throw err;
+        } finally {
+            if (typeof dirName === 'object' && dirName.packed) {
+                rimraf(dirName.contentPath, err => {
+                    if (err) Logger.err(err);
+                });
+            }
         }
     }
 
@@ -358,20 +361,7 @@ export default class {
 
             if (this.unloadContentHook) this.unloadContentHook(content);
 
-            if (reload) {
-                let newcontent;
-                if (content.packed) {
-                    newcontent = await this.preloadPackedContent(content.packed.pkg, true, index);
-                } else {
-                    newcontent = await this.preloadContent(content.dirName, true, index);
-                }
-
-                if (newcontent.enabled) {
-                    newcontent.userConfig.enabled = false;
-                    newcontent.start(false);
-                }
-                return newcontent;
-            }
+            if (reload) return content.packed ? this.preloadPackedContent(content.packed.pkg, true, index) : this.preloadContent(content.dirName, true, index);
 
             this.localContent.splice(index, 1);
         } catch (err) {
diff --git a/client/src/modules/pluginmanager.js b/client/src/modules/pluginmanager.js
index 6facad27..3778412f 100644
--- a/client/src/modules/pluginmanager.js
+++ b/client/src/modules/pluginmanager.js
@@ -112,15 +112,17 @@ export default class extends ContentManager {
             configs, info, main,
             paths: {
                 contentPath: paths.contentPath,
-                dirName: paths.dirName,
+                dirName: packed ? packed.packageName : paths.dirName,
                 mainPath: paths.mainPath
             }
         });
 
         if (packed) instance.packed = {
+            pkg: packed.pkg,
+            packageName: packed.packageName,
             packagePath: packed.packagePath,
-            pkg: packed.pkg
-        };
+            packed: true
+        }; else instance.packed = false;
 
         if (instance.enabled && this.loaded) {
             instance.userConfig.enabled = false;

From cff425f916c5631cd518fa1c5e71dae5a6967d0c Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Wed, 29 Aug 2018 06:19:18 +0300
Subject: [PATCH 12/29] Package installer & install modal

---
 client/src/modules/modulemanager.js           |   4 +-
 client/src/modules/packageinstaller.js        |  60 ++++++++++
 client/src/modules/reactcomponents.js         |   9 +-
 client/src/styles/partials/modals/index.scss  |   1 +
 .../styles/partials/modals/install-modal.scss | 112 ++++++++++++++++++
 .../ui/components/bd/modals/InstallModal.vue  |  51 ++++++++
 client/src/ui/components/common/Modal.vue     |   4 +-
 client/src/ui/modals.js                       |  14 +++
 8 files changed, 248 insertions(+), 7 deletions(-)
 create mode 100644 client/src/modules/packageinstaller.js
 create mode 100644 client/src/styles/partials/modals/install-modal.scss
 create mode 100644 client/src/ui/components/bd/modals/InstallModal.vue

diff --git a/client/src/modules/modulemanager.js b/client/src/modules/modulemanager.js
index 962b7e93..28f1b011 100644
--- a/client/src/modules/modulemanager.js
+++ b/client/src/modules/modulemanager.js
@@ -12,6 +12,7 @@ import { ClientLogger as Logger } from 'common';
 import { SocketProxy, EventHook, CssEditor } from 'modules';
 import { ProfileBadges, ClassNormaliser } from 'ui';
 import Updater from './updater';
+import PackageInstaller from './packageinstaller';
 
 /**
  * Module Manager initializes all modules when everything is ready
@@ -28,7 +29,8 @@ export default class {
             new SocketProxy(),
             new EventHook(),
             CssEditor,
-            Updater
+            Updater,
+            new PackageInstaller()
         ]);
     }
 
diff --git a/client/src/modules/packageinstaller.js b/client/src/modules/packageinstaller.js
new file mode 100644
index 00000000..5d1a563f
--- /dev/null
+++ b/client/src/modules/packageinstaller.js
@@ -0,0 +1,60 @@
+import EventListener from './eventlistener';
+import asar from 'asar';
+
+import { Modals } from 'ui';
+import { Utils } from 'common';
+
+export default class extends EventListener {
+
+    get eventBindings() {
+        return [
+            { id: 'install-pkg', callback: this.installPackage }
+        ];
+    }
+
+    async installPackage(pkg, upload) {
+        try {
+            const config = JSON.parse(asar.extractFile(pkg.path, 'config.json').toString());
+            const { info, main } = config;
+
+            let icon = null;
+            if (info.icon && info.icon_type) {
+                const extractIcon = asar.extractFile(pkg.path, info.icon);
+                icon = `data:${info.icon_type};base64,${Utils.arrayBufferToBase64(extractIcon)}`;
+            }
+            if (icon) config.iconEncoded = icon;
+            const isPlugin = info.type && info.type === 'plugin' || main.endsWith('.js');
+
+            /*
+            config.permissions = [
+                {
+                    HEADER: 'Test Permission Header',
+                    BODY: 'Test Permission Body'
+                },
+                {
+                    HEADER: 'Test Permission Header',
+                    BODY: 'Test Permission Body'
+                },
+                {
+                    HEADER: 'Test Permission Header',
+                    BODY: 'Test Permission Body'
+                },
+                {
+                    HEADER: 'Test Permission Header',
+                    BODY: 'Test Permission Body'
+                }
+            ];
+            */
+            // Show install modal
+            const modalResult = await Modals.installModal(`Install BetterDiscord ${isPlugin ? 'Plugin' : 'Theme'}`, config).promise;
+
+            if (modalResult === 0) {
+                // Upload it instead
+            }
+
+            console.log(modalResult);
+
+        } catch (err) {}
+    }
+
+}
diff --git a/client/src/modules/reactcomponents.js b/client/src/modules/reactcomponents.js
index c43849eb..30e2161a 100644
--- a/client/src/modules/reactcomponents.js
+++ b/client/src/modules/reactcomponents.js
@@ -15,6 +15,7 @@ import { Utils, Filters, ClientLogger as Logger } from 'common';
 import { MonkeyPatch } from './patcher';
 import Reflection from './reflection/index';
 import DiscordApi from './discordapi';
+import Events from './events';
 
 class Helpers {
     static get plannedActions() {
@@ -506,17 +507,17 @@ export class ReactAutoPatcher {
 
         const reflect = Reflection.DOM(selector);
         const stateNode = reflect.getComponentStateNode(this.UploadArea);
-        const callback = function(e) {
+        const callback = function (e) {
             if (!e.dataTransfer.files.length || !e.dataTransfer.files[0].name.endsWith('.bd')) return;
             e.preventDefault();
             e.stopPropagation();
             e.stopImmediatePropagation();
             stateNode.clearDragging();
-            Modals.confirm('Function not ready', `You tried to install "${e.dataTransfer.files[0].path}", but installing .bd files isn't ready yet.`)
-            // Possibly something like Events.emit('install-file', e.dataTransfer.files[0]);
+
+            Events.emit('install-pkg', e.dataTransfer.files[0], DiscordApi.currentChannel.id);
         };
 
-        // Remove their handler, add ours, then readd theirs to give ours priority to stop theirs when we get a .bd file.
+        // Remove their handler, add ours, then read theirs to give ours priority to stop theirs when we get a .bd file.
         reflect.element.removeEventListener('drop', stateNode.handleDrop);
         reflect.element.addEventListener('drop', callback);
         reflect.element.addEventListener('drop', stateNode.handleDrop);
diff --git a/client/src/styles/partials/modals/index.scss b/client/src/styles/partials/modals/index.scss
index 723202c8..51d3a225 100644
--- a/client/src/styles/partials/modals/index.scss
+++ b/client/src/styles/partials/modals/index.scss
@@ -8,3 +8,4 @@
 @import './settings-modal';
 @import './permission-modal';
 @import './input-modal';
+@import './install-modal';
diff --git a/client/src/styles/partials/modals/install-modal.scss b/client/src/styles/partials/modals/install-modal.scss
new file mode 100644
index 00000000..4b082e34
--- /dev/null
+++ b/client/src/styles/partials/modals/install-modal.scss
@@ -0,0 +1,112 @@
+.bd-installModal {
+
+    .bd-modalInner {
+        min-width: 520px;
+        min-height: 200px;
+
+        .bd-modalBody {
+            flex-grow: 1;
+            padding: 0;
+
+            .bd-installModalBody {
+                display: flex;
+                flex-direction: column;
+                flex-grow: 1;
+
+                .bd-installModalTop {
+                    padding: 0 15px;
+                    display: flex;
+                    height: 100px;
+
+                    span {
+                        font-weight: 700;
+                    }
+
+                    .bd-installModalIcon {
+                        background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgMTAwIDEzMCIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMTAwIDEzMDsiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+LnN0MHtmaWxsOiNGNEY2RkM7fS5zdDF7ZmlsbDpub25lO3N0cm9rZTojMzYzOTNFO3N0cm9rZS13aWR0aDoyO30uc3Qye29wYWNpdHk6MC42O2ZpbGw6bm9uZTtzdHJva2U6IzM2MzkzRTtzdHJva2Utd2lkdGg6MjtlbmFibGUtYmFja2dyb3VuZDpuZXcgICAgO308L3N0eWxlPjxwYXRoIGNsYXNzPSJzdDAiIGQ9Ik0xNSwxOWMwLTMuMywyLjctNiw2LTZoNDRjNC43LDAsMjAsMTUuMywyMCwyMHY3NGMwLDMuMy0yLjcsNi02LDZIMjFjLTMuMywwLTYtMi43LTYtNlYxOXoiLz48cGF0aCBjbGFzcz0ic3QxIiBkPSJNMTUsMTljMC0zLjMsMi43LTYsNi02aDQ0YzQuNywwLDIwLDE1LjMsMjAsMjB2NzRjMCwzLjMtMi43LDYtNiw2SDIxYy0zLjMsMC02LTIuNy02LTZWMTl6Ii8+PHBhdGggY2xhc3M9InN0MCIgZD0iTTY2LDE2YzAtMy4zLDEuOS00LjEsNC4yLTEuOGwxMy41LDEzLjVjMi4zLDIuMywxLjYsNC4yLTEuOCw0LjJINjljLTEuNywwLTMtMS4zLTMtM1YxNkw2NiwxNnoiLz48cGF0aCBjbGFzcz0ic3QxIiBkPSJNNjYsMTZjMC0zLjMsMS45LTQuMSw0LjItMS44bDEzLjUsMTMuNWMyLjMsMi4zLDEuNiw0LjItMS44LDQuMkg2OWMtMS43LDAtMy0xLjMtMy0zVjE2TDY2LDE2eiIvPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik02MSwxN0gyM2MtMi44LDAtNSwyLjItNSw1djciLz48cGF0aCBjbGFzcz0ic3QyIiBkPSJNNjksMTl2Ny41YzAsMS40LDEuMSwyLjUsMi41LDIuNUg3NCIvPjwvc3ZnPg==);
+                        background-size: 100% 100%;
+                        flex-shrink: 0;
+                        width: 100px;
+                        height: 130px;
+                        position: fixed;
+                        border-radius: 3px;
+                        margin-top: -30px;
+                        display: flex;
+                        align-content: center;
+                        justify-content: center;
+                        align-items: center;
+                        justify-items: center;
+
+                        .bd-installModalCi {
+                            width: 40px;
+                            height: 40px;
+                        }
+
+                        svg {
+                            fill: #36393e;
+                            width: 40px;
+                            height: 40px;
+                        }
+                    }
+
+                    .bd-installModalInfo {
+                        display: flex;
+                        flex-grow: 1;
+                        flex-direction: column;
+                        padding: 15px 10px;
+                        margin-left: 100px;
+                    }
+
+                    .bd-installModalDesc {
+                        margin-top: 5px;
+                    }
+                }
+
+
+                .bd-installModalBottom {
+                    padding: 0 15px;
+                    flex-grow: 1;
+
+                    .bd-permScope {
+                        &:last-child {
+                            .bd-permInner {
+                                border: none;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        .bd-installModalFooter {
+            display: flex;
+            justify-content: flex-end;
+            padding: 10px;
+            background: rgba(0, 0, 0, .1);
+
+            .bd-button {
+                font-size: 16px;
+                padding: 10px;
+                border-radius: 3px;
+                min-width: 100px;
+                background: #fff;
+                background: #3ecc9c;
+                transition: opacity .2s ease-in-out;
+
+                &:hover {
+                    opacity: .8;
+                }
+
+                &:first-child {
+                    background: transparent;
+                    transition: none;
+
+                    &:hover {
+                        opacity: 1;
+                        text-decoration: underline;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/client/src/ui/components/bd/modals/InstallModal.vue b/client/src/ui/components/bd/modals/InstallModal.vue
new file mode 100644
index 00000000..d3b4eaf5
--- /dev/null
+++ b/client/src/ui/components/bd/modals/InstallModal.vue
@@ -0,0 +1,51 @@
+<template>
+    <Modal class="bd-installModal" :headertext="modal.title" :closing="modal.closing" @close="modal.close" :noheader="true">
+        <div slot="body" class="bd-installModalBody">
+            <div class="bd-installModalTop">
+                <div class="bd-installModalIcon">
+                    <div v-if="modal.config.iconEncoded" class="bd-installModalCi" :style="{backgroundImage: `url(${modal.config.iconEncoded})`}"/>
+                    <MiExtension v-else/>
+                </div>
+                <div class="bd-installModalInfo">
+                    <span>{{modal.config.info.name}} v{{modal.config.info.version.toString()}} by {{modal.config.info.authors.map(a => a.name).join(', ')}}</span>
+                    <div class="bd-installModalDesc">
+                        {{modal.config.info.description}}
+                    </div>
+                </div>
+            </div>
+            <div class="bd-installModalBottom">
+                <div v-for="(perm, i) in modal.config.permissions" :key="`perm-${i}`" class="bd-permScope">
+                    <div class="bd-permAllow">
+                        <div class="bd-permCheck">
+                            <div class="bd-permCheckInner"></div>
+                        </div>
+                        <div class="bd-permInner">
+                            <div class="bd-permName">{{perm.HEADER}}</div>
+                            <div class="bd-permDesc">{{perm.BODY}}</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div slot="footer" class="bd-installModalFooter">
+            <div class="bd-button bd-ok" @click="modal.confirm(0); modal.close();">Upload</div>
+            <div class="bd-button bd-ok" @click="modal.confirm(); modal.close();">Install</div>
+        </div>
+    </Modal>
+</template>
+<script>
+    // Imports
+    import { Modal, MiExtension } from '../../common';
+
+    export default {
+        data() {
+            return {
+                installing: false
+            }
+        },
+        props: ['modal'],
+        components: {
+            Modal, MiExtension
+        }
+    }
+</script>
diff --git a/client/src/ui/components/common/Modal.vue b/client/src/ui/components/common/Modal.vue
index c06ab439..4fd0a688 100644
--- a/client/src/ui/components/common/Modal.vue
+++ b/client/src/ui/components/common/Modal.vue
@@ -11,7 +11,7 @@
 <template>
     <div :class="['bd-modal', {'bd-modalOut': closing, 'bd-modalScrolled': scrolled}]">
         <div class="bd-modalInner">
-            <div class="bd-modalHeader">
+            <div class="bd-modalHeader" v-if="!noheader">
                 <slot name="header">
                     <div v-if="$slots.icon" class="bd-modalIcon">
                         <slot name="icon" />
@@ -41,7 +41,7 @@
     import { MiClose } from './MaterialIcon';
 
     export default {
-        props: ['headertext', 'closing'],
+        props: ['headertext', 'closing', 'noheader'],
         components: {
             MiClose
         },
diff --git a/client/src/ui/modals.js b/client/src/ui/modals.js
index da70476d..a4b71b84 100644
--- a/client/src/ui/modals.js
+++ b/client/src/ui/modals.js
@@ -17,6 +17,7 @@ import ErrorModal from './components/bd/modals/ErrorModal.vue';
 import SettingsModal from './components/bd/modals/SettingsModal.vue';
 import PermissionModal from './components/bd/modals/PermissionModal.vue';
 import InputModal from './components/bd/modals/InputModal.vue';
+import InstallModal from './components/bd/modals/InstallModal.vue';
 
 let modals = 0;
 
@@ -190,6 +191,19 @@ export default class Modals {
         return new Modal(modal, InputModal);
     }
 
+    static installModal(title, config) {
+        return this.add(this.createInstallModal(title, config));
+    }
+
+    static createInstallModal(title, config) {
+        const modal = { title, config };
+        modal.promise = new Promise((resolve, reject) => {
+            modal.confirm = value => resolve(value);
+            modal.beforeClose = () => reject();
+        });
+        return new Modal(modal, InstallModal);
+    }
+
     /**
      * Creates a new permissions modal and adds it to the open stack.
      * The modal will have a promise property that will be set to a Promise object that is resolved or rejected if the user accepts the permissions or closes the modal.

From ddda5b3cc1afb3e5b54a232bfae40fdfe89ae1bf Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Wed, 29 Aug 2018 23:02:41 +0300
Subject: [PATCH 13/29] add checks and lint fixes

---
 client/src/builtin/24Hour.js                  |  2 +-
 client/src/modules/packageinstaller.js        |  3 +-
 .../styles/partials/modals/install-modal.scss | 10 ++++--
 .../ui/components/bd/modals/InstallModal.vue  | 33 +++++++++++++++++--
 client/src/ui/modals.js                       |  8 ++---
 5 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/client/src/builtin/24Hour.js b/client/src/builtin/24Hour.js
index 56fd33fc..e42fd45f 100644
--- a/client/src/builtin/24Hour.js
+++ b/client/src/builtin/24Hour.js
@@ -36,5 +36,5 @@ export default new class TwentyFourHour extends BuiltinModule {
         if (matched[3] === 'AM') return returnValue.replace(matched[0], `${matched[1] === '12' ? '00' : matched[1].padStart(2, '0')}:${matched[2]}`)
         return returnValue.replace(matched[0], `${parseInt(matched[1]) + 12}:${matched[2]}`)
     }
-    
+
 }
diff --git a/client/src/modules/packageinstaller.js b/client/src/modules/packageinstaller.js
index 5d1a563f..8aa1f43e 100644
--- a/client/src/modules/packageinstaller.js
+++ b/client/src/modules/packageinstaller.js
@@ -3,6 +3,7 @@ import asar from 'asar';
 
 import { Modals } from 'ui';
 import { Utils } from 'common';
+import PluginManager from './pluginmanager';
 
 export default class extends EventListener {
 
@@ -46,7 +47,7 @@ export default class extends EventListener {
             ];
             */
             // Show install modal
-            const modalResult = await Modals.installModal(`Install BetterDiscord ${isPlugin ? 'Plugin' : 'Theme'}`, config).promise;
+            const modalResult = await Modals.installModal(isPlugin ? 'plugin' : 'theme', config).promise;
 
             if (modalResult === 0) {
                 // Upload it instead
diff --git a/client/src/styles/partials/modals/install-modal.scss b/client/src/styles/partials/modals/install-modal.scss
index 4b082e34..0f676c3a 100644
--- a/client/src/styles/partials/modals/install-modal.scss
+++ b/client/src/styles/partials/modals/install-modal.scss
@@ -23,7 +23,7 @@
                     }
 
                     .bd-installModalIcon {
-                        background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgMTAwIDEzMCIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMTAwIDEzMDsiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+LnN0MHtmaWxsOiNGNEY2RkM7fS5zdDF7ZmlsbDpub25lO3N0cm9rZTojMzYzOTNFO3N0cm9rZS13aWR0aDoyO30uc3Qye29wYWNpdHk6MC42O2ZpbGw6bm9uZTtzdHJva2U6IzM2MzkzRTtzdHJva2Utd2lkdGg6MjtlbmFibGUtYmFja2dyb3VuZDpuZXcgICAgO308L3N0eWxlPjxwYXRoIGNsYXNzPSJzdDAiIGQ9Ik0xNSwxOWMwLTMuMywyLjctNiw2LTZoNDRjNC43LDAsMjAsMTUuMywyMCwyMHY3NGMwLDMuMy0yLjcsNi02LDZIMjFjLTMuMywwLTYtMi43LTYtNlYxOXoiLz48cGF0aCBjbGFzcz0ic3QxIiBkPSJNMTUsMTljMC0zLjMsMi43LTYsNi02aDQ0YzQuNywwLDIwLDE1LjMsMjAsMjB2NzRjMCwzLjMtMi43LDYtNiw2SDIxYy0zLjMsMC02LTIuNy02LTZWMTl6Ii8+PHBhdGggY2xhc3M9InN0MCIgZD0iTTY2LDE2YzAtMy4zLDEuOS00LjEsNC4yLTEuOGwxMy41LDEzLjVjMi4zLDIuMywxLjYsNC4yLTEuOCw0LjJINjljLTEuNywwLTMtMS4zLTMtM1YxNkw2NiwxNnoiLz48cGF0aCBjbGFzcz0ic3QxIiBkPSJNNjYsMTZjMC0zLjMsMS45LTQuMSw0LjItMS44bDEzLjUsMTMuNWMyLjMsMi4zLDEuNiw0LjItMS44LDQuMkg2OWMtMS43LDAtMy0xLjMtMy0zVjE2TDY2LDE2eiIvPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik02MSwxN0gyM2MtMi44LDAtNSwyLjItNSw1djciLz48cGF0aCBjbGFzcz0ic3QyIiBkPSJNNjksMTl2Ny41YzAsMS40LDEuMSwyLjUsMi41LDIuNUg3NCIvPjwvc3ZnPg==);
+                        background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgMTAwIDEzMCIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMTAwIDEzMDsiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+LnN0MHtmaWxsOiNGNEY2RkM7fS5zdDF7ZmlsbDpub25lO3N0cm9rZTojMzYzOTNFO3N0cm9rZS13aWR0aDoyO30uc3Qye29wYWNpdHk6MC42O2ZpbGw6bm9uZTtzdHJva2U6IzM2MzkzRTtzdHJva2Utd2lkdGg6MjtlbmFibGUtYmFja2dyb3VuZDpuZXcgICAgO308L3N0eWxlPjxwYXRoIGNsYXNzPSJzdDAiIGQ9Ik0xNSwxOWMwLTMuMywyLjctNiw2LTZoNDRjNC43LDAsMjAsMTUuMywyMCwyMHY3NGMwLDMuMy0yLjcsNi02LDZIMjFjLTMuMywwLTYtMi43LTYtNlYxOXoiLz48cGF0aCBjbGFzcz0ic3QxIiBkPSJNMTUsMTljMC0zLjMsMi43LTYsNi02aDQ0YzQuNywwLDIwLDE1LjMsMjAsMjB2NzRjMCwzLjMtMi43LDYtNiw2SDIxYy0zLjMsMC02LTIuNy02LTZWMTl6Ii8+PHBhdGggY2xhc3M9InN0MCIgZD0iTTY2LDE2YzAtMy4zLDEuOS00LjEsNC4yLTEuOGwxMy41LDEzLjVjMi4zLDIuMywxLjYsNC4yLTEuOCw0LjJINjljLTEuNywwLTMtMS4zLTMtM1YxNkw2NiwxNnoiLz48cGF0aCBjbGFzcz0ic3QxIiBkPSJNNjYsMTZjMC0zLjMsMS45LTQuMSw0LjItMS44bDEzLjUsMTMuNWMyLjMsMi4zLDEuNiw0LjItMS44LDQuMkg2OWMtMS43LDAtMy0xLjMtMy0zVjE2TDY2LDE2eiIvPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik02MSwxN0gyM2MtMi44LDAtNSwyLjItNSw1djciLz48cGF0aCBjbGFzcz0ic3QyIiBkPSJNNjksMTl2Ny41YzAsMS40LDEuMSwyLjUsMi41LDIuNUg3NCIvPjwvc3ZnPg==');
                         background-size: 100% 100%;
                         flex-shrink: 0;
                         width: 100px;
@@ -70,7 +70,7 @@
                     .bd-permScope {
                         &:last-child {
                             .bd-permInner {
-                                border: none;
+                                border: 0;
                             }
                         }
                     }
@@ -84,12 +84,16 @@
             padding: 10px;
             background: rgba(0, 0, 0, .1);
 
+            .bd-installModalStatus {
+                color: #fff;
+                font-weight: 600;
+            }
+
             .bd-button {
                 font-size: 16px;
                 padding: 10px;
                 border-radius: 3px;
                 min-width: 100px;
-                background: #fff;
                 background: #3ecc9c;
                 transition: opacity .2s ease-in-out;
 
diff --git a/client/src/ui/components/bd/modals/InstallModal.vue b/client/src/ui/components/bd/modals/InstallModal.vue
index d3b4eaf5..b1d72dec 100644
--- a/client/src/ui/components/bd/modals/InstallModal.vue
+++ b/client/src/ui/components/bd/modals/InstallModal.vue
@@ -27,25 +27,52 @@
                 </div>
             </div>
         </div>
-        <div slot="footer" class="bd-installModalFooter">
+        <div v-if="verifying" slot="footer" class="bd-installModalFooter">
+            <span class="bd-installModalStatus">Verifying {{this.modal.contentType}}</span>
+        </div>
+        <div v-else-if="alreadyInstalled && upToDate" slot="footer" class="bd-installModalFooter">
+            <span class="bd-installModalStatus">Up to date version already installed!</span>
+        </div>
+        <div v-else slot="footer" class="bd-installModalFooter">
             <div class="bd-button bd-ok" @click="modal.confirm(0); modal.close();">Upload</div>
-            <div class="bd-button bd-ok" @click="modal.confirm(); modal.close();">Install</div>
+            <div class="bd-button bd-ok" @click="modal.confirm(); modal.close();">{{ !alreadyInstalled ? 'Install' : 'Update' }}</div>
         </div>
     </Modal>
 </template>
 <script>
     // Imports
     import { Modal, MiExtension } from '../../common';
+    import { PluginManager, ThemeManager } from 'modules';
 
     export default {
         data() {
             return {
-                installing: false
+                installing: false,
+                verifying: true,
+                alreadyInstalled: false,
+                upToDate: true
             }
         },
         props: ['modal'],
         components: {
             Modal, MiExtension
+        },
+        mounted() {
+            const { contentType, config } = this.modal;
+            const alreadyInstalled = contentType === 'plugin' ? PluginManager.getPluginById(config.info.id) : ThemeManager.getContentById(config.info.id);
+
+            if (alreadyInstalled) {
+                this.alreadyInstalled = true;
+                if (config.version > alreadyInstalled.version) {
+                    this.upDoDate = false;
+                }
+            }
+
+            // TODO Verify
+            setTimeout(() => {
+                this.verifying = false;
+            }, 2000);
+
         }
     }
 </script>
diff --git a/client/src/ui/modals.js b/client/src/ui/modals.js
index a4b71b84..d7302ace 100644
--- a/client/src/ui/modals.js
+++ b/client/src/ui/modals.js
@@ -191,12 +191,12 @@ export default class Modals {
         return new Modal(modal, InputModal);
     }
 
-    static installModal(title, config) {
-        return this.add(this.createInstallModal(title, config));
+    static installModal(contentType, config) {
+        return this.add(this.createInstallModal(contentType, config));
     }
 
-    static createInstallModal(title, config) {
-        const modal = { title, config };
+    static createInstallModal(contentType, config) {
+        const modal = { contentType, config };
         modal.promise = new Promise((resolve, reject) => {
             modal.confirm = value => resolve(value);
             modal.beforeClose = () => reject();

From 09fb76d1480cd1943345cd78a1837f72c83b8b7e Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Wed, 29 Aug 2018 23:07:32 +0300
Subject: [PATCH 14/29] Versions should be strings

---
 tests/ext/modules/Example Module/config.json    | 2 +-
 tests/ext/plugins/Depend Error Test/config.json | 2 +-
 tests/ext/plugins/Doubleclick Edit/config.json  | 2 +-
 tests/ext/plugins/Example 2/config.json         | 2 +-
 tests/ext/plugins/Example 3/config.json         | 2 +-
 tests/ext/plugins/Example 4/config.json         | 2 +-
 tests/ext/plugins/Example/config.json           | 2 +-
 tests/ext/plugins/Patcher Test/config.json      | 2 +-
 tests/ext/plugins/Permission Test/config.json   | 2 +-
 tests/ext/plugins/Render Example/config.json    | 2 +-
 tests/ext/themes/Example/config.json            | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tests/ext/modules/Example Module/config.json b/tests/ext/modules/Example Module/config.json
index 77a56834..2c54b9c5 100644
--- a/tests/ext/modules/Example Module/config.json	
+++ b/tests/ext/modules/Example Module/config.json	
@@ -2,7 +2,7 @@
     "info": {
         "name": "Example Module",
         "authors": [ "Jiiks" ],
-        "version": 1.0,
+        "version": "1.0",
         "description": "Module Example"
     },
     "main": "index.js",
diff --git a/tests/ext/plugins/Depend Error Test/config.json b/tests/ext/plugins/Depend Error Test/config.json
index 39729839..61ab11bf 100644
--- a/tests/ext/plugins/Depend Error Test/config.json	
+++ b/tests/ext/plugins/Depend Error Test/config.json	
@@ -3,7 +3,7 @@
         "id": "depend-error",
         "name": "Depend Error",
         "authors": [ "Jiiks" ],
-        "version": 1.0,
+        "version": "1.0",
         "description": "Depend Error Plugin Description",
         "icon": "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iQ2FscXVlXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgMjAwMCAyMDAwIiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCAyMDAwIDIwMDAiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxnPjxwYXRoIGZpbGw9IiMzRTgyRTUiIGQ9Ik0xNDAyLjIsNjMxLjdjLTkuNy0zNTMuNC0yODYuMi00OTYtNjQyLjYtNDk2SDY4LjR2NzE0LjFsNDQyLDM5OFY0OTAuN2gyNTdjMjc0LjUsMCwyNzQuNSwzNDQuOSwwLDM0NC45SDU5Ny42djMyOS41aDE2OS44YzI3NC41LDAsMjc0LjUsMzQ0LjgsMCwzNDQuOGgtNjk5djM1NC45aDY5MS4yYzM1Ni4zLDAsNjMyLjgtMTQyLjYsNjQyLjYtNDk2YzAtMTYyLjYtNDQuNS0yODQuMS0xMjIuOS0zNjguNkMxMzU3LjcsOTE1LjgsMTQwMi4yLDc5NC4zLDE0MDIuMiw2MzEuN3oiLz48cGF0aCBmaWxsPSIjRkZGRkZGIiBkPSJNMTI2Mi41LDEzNS4yTDEyNjIuNSwxMzUuMmwtNzYuOCwwYzI2LjYsMTMuMyw1MS43LDI4LjEsNzUsNDQuM2M3MC43LDQ5LjEsMTI2LjEsMTExLjUsMTY0LjYsMTg1LjNjMzkuOSw3Ni42LDYxLjUsMTY1LjYsNjQuMywyNjQuNmwwLDEuMnYxLjJjMCwxNDEuMSwwLDU5Ni4xLDAsNzM3LjF2MS4ybDAsMS4yYy0yLjcsOTktMjQuMywxODgtNjQuMywyNjQuNmMtMzguNSw3My44LTkzLjgsMTM2LjItMTY0LjYsMTg1LjNjLTIyLjYsMTUuNy00Ni45LDMwLjEtNzIuNiw0My4xaDcyLjVjMzQ2LjIsMS45LDY3MS0xNzEuMiw2NzEtNTY3LjlWNzE2LjdDMTkzMy41LDMxMi4yLDE2MDguNywxMzUuMiwxMjYyLjUsMTM1LjJ6Ii8+PC9nPjwvc3ZnPg=="
     },
diff --git a/tests/ext/plugins/Doubleclick Edit/config.json b/tests/ext/plugins/Doubleclick Edit/config.json
index c6bfa681..4f34b7ba 100644
--- a/tests/ext/plugins/Doubleclick Edit/config.json	
+++ b/tests/ext/plugins/Doubleclick Edit/config.json	
@@ -10,7 +10,7 @@
                 "twitter_username": "Jiiksi"
             }
         ],
-        "version": 1.0,
+        "version": "1.0,"
         "description": "Edit messages by double clicking them. This is a v1 fix"
     },
     "main": "index.js"
diff --git a/tests/ext/plugins/Example 2/config.json b/tests/ext/plugins/Example 2/config.json
index 7dafbd76..e414f3a4 100644
--- a/tests/ext/plugins/Example 2/config.json	
+++ b/tests/ext/plugins/Example 2/config.json	
@@ -4,7 +4,7 @@
         "authors": [
             "Jiiks"
         ],
-        "version": 1.0,
+        "version": "1.0",
         "description": "Example Plugin 2 Description"
     }
 }
diff --git a/tests/ext/plugins/Example 3/config.json b/tests/ext/plugins/Example 3/config.json
index 196b38e6..ec2d1d0b 100644
--- a/tests/ext/plugins/Example 3/config.json	
+++ b/tests/ext/plugins/Example 3/config.json	
@@ -17,7 +17,7 @@
                 "twitter_username": "Jiiksi"
             }
         ],
-        "version": 1.0,
+        "version": "1.0",
         "description": "A plugin for testing BetterDiscord plugin bridge."
     },
     "main": "index.js"
diff --git a/tests/ext/plugins/Example 4/config.json b/tests/ext/plugins/Example 4/config.json
index c7f354e7..9f3b0b42 100644
--- a/tests/ext/plugins/Example 4/config.json	
+++ b/tests/ext/plugins/Example 4/config.json	
@@ -11,7 +11,7 @@
                 "twitter_username": "_samuelelliott"
             }
         ],
-        "version": 1.0,
+        "version": "1.0",
         "description": "Plugin for testing array setting events as the first example plugin has a lot of stuff in it now."
     },
     "main": "index.js",
diff --git a/tests/ext/plugins/Example/config.json b/tests/ext/plugins/Example/config.json
index 159ab529..22543194 100644
--- a/tests/ext/plugins/Example/config.json
+++ b/tests/ext/plugins/Example/config.json
@@ -22,7 +22,7 @@
             },
             "Just a string"
         ],
-        "version": 1.0,
+        "version": "1.0",
         "description": "Example Plugin Description.\n\nDescriptions are preformatted (you can use newlines).",
         "icon": "icon.svg",
         "icon_type": "image/svg+xml"
diff --git a/tests/ext/plugins/Patcher Test/config.json b/tests/ext/plugins/Patcher Test/config.json
index bcf5e5fd..7267cc66 100644
--- a/tests/ext/plugins/Patcher Test/config.json	
+++ b/tests/ext/plugins/Patcher Test/config.json	
@@ -10,7 +10,7 @@
                 "twitter_username": "Jiiksi"
             }
         ],
-        "version": 1.0,
+        "version": "1.0",
         "description": "Patcher Test Description"
     },
     "main": "index.js"
diff --git a/tests/ext/plugins/Permission Test/config.json b/tests/ext/plugins/Permission Test/config.json
index 1de44cd1..33f2ae3f 100644
--- a/tests/ext/plugins/Permission Test/config.json	
+++ b/tests/ext/plugins/Permission Test/config.json	
@@ -10,7 +10,7 @@
                 "twitter_username": "Jiiksi"
             }
         ],
-        "version": 1.0,
+        "version": "1.0",
         "description": "Permission Test Description"
     },
     "main": "index.js",
diff --git a/tests/ext/plugins/Render Example/config.json b/tests/ext/plugins/Render Example/config.json
index ea3abb01..fbc0c489 100644
--- a/tests/ext/plugins/Render Example/config.json	
+++ b/tests/ext/plugins/Render Example/config.json	
@@ -10,7 +10,7 @@
                 "twitter_username": "Jiiksi"
             }
         ],
-        "version": 1.0,
+        "version": "1.0",
         "description": "Example for rendering stuff"
     },
     "main": "index.js"
diff --git a/tests/ext/themes/Example/config.json b/tests/ext/themes/Example/config.json
index 2e657e4a..effb8b62 100644
--- a/tests/ext/themes/Example/config.json
+++ b/tests/ext/themes/Example/config.json
@@ -2,7 +2,7 @@
     "info": {
         "name": "Example Theme 1",
         "authors": [ "Jiiks" ],
-        "version": 1.0,
+        "version": "1.0",
         "description": "Example Theme 1 Description",
         "icon": "icon.svg",
         "icon_type": "image/svg+xml",

From a040a605d49c891b186837fb9aa93527cabe4f55 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Wed, 29 Aug 2018 23:09:30 +0300
Subject: [PATCH 15/29] Version is in info not in config

---
 client/src/ui/components/bd/modals/InstallModal.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/ui/components/bd/modals/InstallModal.vue b/client/src/ui/components/bd/modals/InstallModal.vue
index b1d72dec..b99378a6 100644
--- a/client/src/ui/components/bd/modals/InstallModal.vue
+++ b/client/src/ui/components/bd/modals/InstallModal.vue
@@ -63,8 +63,8 @@
 
             if (alreadyInstalled) {
                 this.alreadyInstalled = true;
-                if (config.version > alreadyInstalled.version) {
-                    this.upDoDate = false;
+                if (config.info.version > alreadyInstalled.version) {
+                    this.upToDate = false;
                 }
             }
 

From 8c060314da1a32ced2cd316e7f3131e75b3b1277 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Thu, 30 Aug 2018 05:39:23 +0300
Subject: [PATCH 16/29] Functional installer/updater. Still needs lots of work.

---
 client/src/modules/modulemanager.js           |  4 +--
 client/src/modules/modules.js                 |  1 +
 client/src/modules/packageinstaller.js        | 34 ++++++++++++++-----
 client/src/modules/reactcomponents.js         |  6 ++--
 .../ui/components/bd/modals/InstallModal.vue  | 12 +++++--
 5 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/client/src/modules/modulemanager.js b/client/src/modules/modulemanager.js
index 28f1b011..962b7e93 100644
--- a/client/src/modules/modulemanager.js
+++ b/client/src/modules/modulemanager.js
@@ -12,7 +12,6 @@ import { ClientLogger as Logger } from 'common';
 import { SocketProxy, EventHook, CssEditor } from 'modules';
 import { ProfileBadges, ClassNormaliser } from 'ui';
 import Updater from './updater';
-import PackageInstaller from './packageinstaller';
 
 /**
  * Module Manager initializes all modules when everything is ready
@@ -29,8 +28,7 @@ export default class {
             new SocketProxy(),
             new EventHook(),
             CssEditor,
-            Updater,
-            new PackageInstaller()
+            Updater
         ]);
     }
 
diff --git a/client/src/modules/modules.js b/client/src/modules/modules.js
index 8f39537f..239e89f8 100644
--- a/client/src/modules/modules.js
+++ b/client/src/modules/modules.js
@@ -27,3 +27,4 @@ export { default as Connectivity } from './connectivity';
 export { default as Security } from './security';
 export { default as Cache } from './cache';
 export { default as Reflection } from './reflection/index';
+export { default as PackageInstaller } from './packageinstaller';
diff --git a/client/src/modules/packageinstaller.js b/client/src/modules/packageinstaller.js
index 8aa1f43e..7831aa8d 100644
--- a/client/src/modules/packageinstaller.js
+++ b/client/src/modules/packageinstaller.js
@@ -1,19 +1,16 @@
 import EventListener from './eventlistener';
 import asar from 'asar';
+import fs from 'fs';
+import path from 'path';
 
 import { Modals } from 'ui';
 import { Utils } from 'common';
 import PluginManager from './pluginmanager';
+import Globals from './globals';
 
-export default class extends EventListener {
+export default class {
 
-    get eventBindings() {
-        return [
-            { id: 'install-pkg', callback: this.installPackage }
-        ];
-    }
-
-    async installPackage(pkg, upload) {
+    static async installPackageEvent(pkg, upload) {
         try {
             const config = JSON.parse(asar.extractFile(pkg.path, 'config.json').toString());
             const { info, main } = config;
@@ -26,6 +23,8 @@ export default class extends EventListener {
             if (icon) config.iconEncoded = icon;
             const isPlugin = info.type && info.type === 'plugin' || main.endsWith('.js');
 
+            config.path = pkg.path;
+
             /*
             config.permissions = [
                 {
@@ -58,4 +57,23 @@ export default class extends EventListener {
         } catch (err) {}
     }
 
+    // TODO lots of stuff
+    /**
+     * Installs or updates defined package
+     * @param {Byte[]|String} bytesOrPath byte array of binary or path to local file
+     * @param {String} name Package name
+     * @param {Boolean} update Does an older version already exist
+     */
+    static async installPackage(bytesOrPath, name, update = false) {
+        const bytes = typeof bytesOrPath === 'string' ? fs.readFileSync(bytesOrPath) : bytesOrPath;
+        const outputPath = path.join(Globals.getPath('plugins'), `${name}.bd`);
+        fs.writeFileSync(outputPath, bytes);
+
+        if (!update) {
+            return PluginManager.preloadPackedContent(`${name}.bd`);
+        }
+
+        return PluginManager.reloadContent(PluginManager.getPluginByName(name));
+    }
+
 }
diff --git a/client/src/modules/reactcomponents.js b/client/src/modules/reactcomponents.js
index 30e2161a..92f4e59e 100644
--- a/client/src/modules/reactcomponents.js
+++ b/client/src/modules/reactcomponents.js
@@ -15,7 +15,7 @@ import { Utils, Filters, ClientLogger as Logger } from 'common';
 import { MonkeyPatch } from './patcher';
 import Reflection from './reflection/index';
 import DiscordApi from './discordapi';
-import Events from './events';
+import PackageInstaller from './packageinstaller';
 
 class Helpers {
     static get plannedActions() {
@@ -514,7 +514,9 @@ export class ReactAutoPatcher {
             e.stopImmediatePropagation();
             stateNode.clearDragging();
 
-            Events.emit('install-pkg', e.dataTransfer.files[0], DiscordApi.currentChannel.id);
+            PackageInstaller.installPackageEvent(e.dataTransfer.files[0], DiscordApi.currentChannel.id);
+
+            // Events.emit('install-pkg', e.dataTransfer.files[0], DiscordApi.currentChannel.id);
         };
 
         // Remove their handler, add ours, then read theirs to give ours priority to stop theirs when we get a .bd file.
diff --git a/client/src/ui/components/bd/modals/InstallModal.vue b/client/src/ui/components/bd/modals/InstallModal.vue
index b99378a6..013ab026 100644
--- a/client/src/ui/components/bd/modals/InstallModal.vue
+++ b/client/src/ui/components/bd/modals/InstallModal.vue
@@ -35,14 +35,14 @@
         </div>
         <div v-else slot="footer" class="bd-installModalFooter">
             <div class="bd-button bd-ok" @click="modal.confirm(0); modal.close();">Upload</div>
-            <div class="bd-button bd-ok" @click="modal.confirm(); modal.close();">{{ !alreadyInstalled ? 'Install' : 'Update' }}</div>
+            <div class="bd-button bd-ok" @click="install">{{ !alreadyInstalled ? 'Install' : 'Update' }}</div>
         </div>
     </Modal>
 </template>
 <script>
     // Imports
     import { Modal, MiExtension } from '../../common';
-    import { PluginManager, ThemeManager } from 'modules';
+    import { PluginManager, ThemeManager, PackageInstaller } from 'modules';
 
     export default {
         data() {
@@ -73,6 +73,14 @@
                 this.verifying = false;
             }, 2000);
 
+        },
+        methods: {
+            async install() {
+                const installed = await PackageInstaller.installPackage(this.modal.config.path, this.modal.config.info.name, this.alreadyInstalled);
+                console.log(installed);
+                this.modal.confirm();
+                this.modal.close();
+            }
         }
     }
 </script>

From ecb0b3e9d0036a34f47dc0ce1e7fa69de96a1c4d Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Thu, 30 Aug 2018 07:05:14 +0300
Subject: [PATCH 17/29] Verify step

---
 client/src/modules/packageinstaller.js            | 15 +++++++++++++++
 .../src/ui/components/bd/modals/InstallModal.vue  | 15 +++++++++------
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/client/src/modules/packageinstaller.js b/client/src/modules/packageinstaller.js
index 7831aa8d..09212c43 100644
--- a/client/src/modules/packageinstaller.js
+++ b/client/src/modules/packageinstaller.js
@@ -7,6 +7,7 @@ import { Modals } from 'ui';
 import { Utils } from 'common';
 import PluginManager from './pluginmanager';
 import Globals from './globals';
+import Security from './security';
 
 export default class {
 
@@ -57,6 +58,19 @@ export default class {
         } catch (err) {}
     }
 
+    /**
+     * Hash and verify a package
+     * @param {Byte[]|String} bytesOrPath byte array of binary or path to local file
+     */
+    static async verifyPackage(bytesOrPath) {
+        const bytes = typeof bytesOrPath === 'string' ? fs.readFileSync(bytesOrPath) : bytesOrPath;
+        // Temporary hash to simulate response from server
+        const tempVerified = '2e3532ee366816adc37b0f478bfef35e03f96e7aeee9b115f5918ef6a4e94de8';
+        const hashBytes = Security.hash('sha256', bytes, 'hex');
+
+        return hashBytes === tempVerified;
+    }
+
     // TODO lots of stuff
     /**
      * Installs or updates defined package
@@ -66,6 +80,7 @@ export default class {
      */
     static async installPackage(bytesOrPath, name, update = false) {
         const bytes = typeof bytesOrPath === 'string' ? fs.readFileSync(bytesOrPath) : bytesOrPath;
+
         const outputPath = path.join(Globals.getPath('plugins'), `${name}.bd`);
         fs.writeFileSync(outputPath, bytes);
 
diff --git a/client/src/ui/components/bd/modals/InstallModal.vue b/client/src/ui/components/bd/modals/InstallModal.vue
index 013ab026..0ae6c92a 100644
--- a/client/src/ui/components/bd/modals/InstallModal.vue
+++ b/client/src/ui/components/bd/modals/InstallModal.vue
@@ -30,6 +30,9 @@
         <div v-if="verifying" slot="footer" class="bd-installModalFooter">
             <span class="bd-installModalStatus">Verifying {{this.modal.contentType}}</span>
         </div>
+        <div v-else-if="!verified" slot="footer" class="bd-installModalFooter">
+            <span class="bd-installModalStatus">Not verified!</span>
+        </div>
         <div v-else-if="alreadyInstalled && upToDate" slot="footer" class="bd-installModalFooter">
             <span class="bd-installModalStatus">Up to date version already installed!</span>
         </div>
@@ -67,14 +70,14 @@
                     this.upToDate = false;
                 }
             }
-
-            // TODO Verify
-            setTimeout(() => {
-                this.verifying = false;
-            }, 2000);
-
+            this.verify();
         },
         methods: {
+            async verify() {
+                const verified = await PackageInstaller.verifyPackage(this.modal.config.path);
+                this.verified = verified;
+                this.verifying = false;
+            },
             async install() {
                 const installed = await PackageInstaller.installPackage(this.modal.config.path, this.modal.config.info.name, this.alreadyInstalled);
                 console.log(installed);

From 6db016060b571df9bd34c7bc091a05dfec6558cf Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Thu, 30 Aug 2018 09:08:52 +0300
Subject: [PATCH 18/29] Small things

---
 client/src/modules/packageinstaller.js        | 46 +++++--------------
 client/src/modules/reactcomponents.js         |  2 +-
 .../styles/partials/modals/install-modal.scss | 29 ++++++++++--
 .../ui/components/bd/modals/InstallModal.vue  | 24 ++++++----
 client/src/ui/modals.js                       |  8 ++--
 5 files changed, 57 insertions(+), 52 deletions(-)

diff --git a/client/src/modules/packageinstaller.js b/client/src/modules/packageinstaller.js
index 09212c43..77e86fc7 100644
--- a/client/src/modules/packageinstaller.js
+++ b/client/src/modules/packageinstaller.js
@@ -11,7 +11,7 @@ import Security from './security';
 
 export default class {
 
-    static async installPackageEvent(pkg, upload) {
+    static async installPackageDragAndDrop(pkg, upload) {
         try {
             const config = JSON.parse(asar.extractFile(pkg.path, 'config.json').toString());
             const { info, main } = config;
@@ -21,54 +21,31 @@ export default class {
                 const extractIcon = asar.extractFile(pkg.path, info.icon);
                 icon = `data:${info.icon_type};base64,${Utils.arrayBufferToBase64(extractIcon)}`;
             }
-            if (icon) config.iconEncoded = icon;
+
             const isPlugin = info.type && info.type === 'plugin' || main.endsWith('.js');
 
-            config.path = pkg.path;
-
-            /*
-            config.permissions = [
-                {
-                    HEADER: 'Test Permission Header',
-                    BODY: 'Test Permission Body'
-                },
-                {
-                    HEADER: 'Test Permission Header',
-                    BODY: 'Test Permission Body'
-                },
-                {
-                    HEADER: 'Test Permission Header',
-                    BODY: 'Test Permission Body'
-                },
-                {
-                    HEADER: 'Test Permission Header',
-                    BODY: 'Test Permission Body'
-                }
-            ];
-            */
             // Show install modal
-            const modalResult = await Modals.installModal(isPlugin ? 'plugin' : 'theme', config).promise;
+            const modalResult = await Modals.installModal(isPlugin ? 'plugin' : 'theme', config, pkg.path, icon).promise;
 
             if (modalResult === 0) {
                 // Upload it instead
             }
 
-            console.log(modalResult);
-
         } catch (err) {}
     }
 
     /**
      * Hash and verify a package
      * @param {Byte[]|String} bytesOrPath byte array of binary or path to local file
+     * @param {String} id Package id
      */
-    static async verifyPackage(bytesOrPath) {
+    static async verifyPackage(bytesOrPath, id) {
         const bytes = typeof bytesOrPath === 'string' ? fs.readFileSync(bytesOrPath) : bytesOrPath;
         // Temporary hash to simulate response from server
-        const tempVerified = '2e3532ee366816adc37b0f478bfef35e03f96e7aeee9b115f5918ef6a4e94de8';
+        const tempVerified = ['2e3532ee366816adc37b0f478bfef35e03f96e7aeee9b115f5918ef6a4e94de8', '06a2eb4e37b926354ab80cd83207db67e544c932e9beddce545967a21f8db5aa'];
         const hashBytes = Security.hash('sha256', bytes, 'hex');
 
-        return hashBytes === tempVerified;
+        return tempVerified.includes(hashBytes);
     }
 
     // TODO lots of stuff
@@ -78,17 +55,18 @@ export default class {
      * @param {String} name Package name
      * @param {Boolean} update Does an older version already exist
      */
-    static async installPackage(bytesOrPath, name, update = false) {
+    static async installPackage(bytesOrPath, id, update = false) {
         const bytes = typeof bytesOrPath === 'string' ? fs.readFileSync(bytesOrPath) : bytesOrPath;
 
-        const outputPath = path.join(Globals.getPath('plugins'), `${name}.bd`);
+        const outputName = `${id}.bd`;
+        const outputPath = path.join(Globals.getPath('plugins'), outputName);
         fs.writeFileSync(outputPath, bytes);
 
         if (!update) {
-            return PluginManager.preloadPackedContent(`${name}.bd`);
+            return PluginManager.preloadPackedContent(outputName);
         }
 
-        return PluginManager.reloadContent(PluginManager.getPluginByName(name));
+        return PluginManager.reloadContent(PluginManager.getPluginById(id));
     }
 
 }
diff --git a/client/src/modules/reactcomponents.js b/client/src/modules/reactcomponents.js
index 92f4e59e..662d6a8a 100644
--- a/client/src/modules/reactcomponents.js
+++ b/client/src/modules/reactcomponents.js
@@ -514,7 +514,7 @@ export class ReactAutoPatcher {
             e.stopImmediatePropagation();
             stateNode.clearDragging();
 
-            PackageInstaller.installPackageEvent(e.dataTransfer.files[0], DiscordApi.currentChannel.id);
+            PackageInstaller.installPackageDragAndDrop(e.dataTransfer.files[0], DiscordApi.currentChannel.id);
 
             // Events.emit('install-pkg', e.dataTransfer.files[0], DiscordApi.currentChannel.id);
         };
diff --git a/client/src/styles/partials/modals/install-modal.scss b/client/src/styles/partials/modals/install-modal.scss
index 0f676c3a..b474ebb5 100644
--- a/client/src/styles/partials/modals/install-modal.scss
+++ b/client/src/styles/partials/modals/install-modal.scss
@@ -1,5 +1,11 @@
 .bd-installModal {
 
+    &.bd-err {
+        .bd-modalInner {
+            border: 2px solid $colerr;
+        }
+    }
+
     .bd-modalInner {
         min-width: 520px;
         min-height: 200px;
@@ -85,7 +91,17 @@
             background: rgba(0, 0, 0, .1);
 
             .bd-installModalStatus {
-                color: #fff;
+                height: 36px;
+                line-height: 36px;
+                flex-grow: 1;
+                padding: 0 25px;
+            }
+
+            .bd-installModalStatus {
+                &:not(.bd-err) {
+                    color: #fff;
+                }
+
                 font-weight: 600;
             }
 
@@ -94,14 +110,21 @@
                 padding: 10px;
                 border-radius: 3px;
                 min-width: 100px;
-                background: #3ecc9c;
                 transition: opacity .2s ease-in-out;
 
+                &.bd-ok {
+                    background: #3ecc9c;
+                }
+
+                &.bd-err {
+                    color: #fff;
+                }
+
                 &:hover {
                     opacity: .8;
                 }
 
-                &:first-child {
+                &.bd-installModalUpload {
                     background: transparent;
                     transition: none;
 
diff --git a/client/src/ui/components/bd/modals/InstallModal.vue b/client/src/ui/components/bd/modals/InstallModal.vue
index 0ae6c92a..0d2010aa 100644
--- a/client/src/ui/components/bd/modals/InstallModal.vue
+++ b/client/src/ui/components/bd/modals/InstallModal.vue
@@ -1,13 +1,13 @@
 <template>
-    <Modal class="bd-installModal" :headertext="modal.title" :closing="modal.closing" @close="modal.close" :noheader="true">
+    <Modal class="bd-installModal" :headertext="modal.title" :closing="modal.closing" @close="modal.close" :noheader="true" :class="{'bd-err': !verifying && !verified}">
         <div slot="body" class="bd-installModalBody">
             <div class="bd-installModalTop">
                 <div class="bd-installModalIcon">
-                    <div v-if="modal.config.iconEncoded" class="bd-installModalCi" :style="{backgroundImage: `url(${modal.config.iconEncoded})`}"/>
+                    <div v-if="modal.icon" class="bd-installModalCi" :style="{backgroundImage: `url(${modal.icon})`}"/>
                     <MiExtension v-else/>
                 </div>
                 <div class="bd-installModalInfo">
-                    <span>{{modal.config.info.name}} v{{modal.config.info.version.toString()}} by {{modal.config.info.authors.map(a => a.name).join(', ')}}</span>
+                    <span>{{modal.config.info.name}} v{{modal.config.info.version}} by {{modal.config.info.authors.map(a => a.name).join(', ')}}</span>
                     <div class="bd-installModalDesc">
                         {{modal.config.info.description}}
                     </div>
@@ -28,16 +28,19 @@
             </div>
         </div>
         <div v-if="verifying" slot="footer" class="bd-installModalFooter">
-            <span class="bd-installModalStatus">Verifying {{this.modal.contentType}}</span>
+            <span class="bd-installModalStatus">Verifying {{modal.contentType}}</span>
         </div>
         <div v-else-if="!verified" slot="footer" class="bd-installModalFooter">
-            <span class="bd-installModalStatus">Not verified!</span>
+            <span class="bd-installModalStatus bd-err">Not verified!</span>
+            <div class="bd-button bd-installModalUpload" @click="modal.confirm(0); modal.close();">Upload</div>
+            <div class="bd-button bd-err" @click="install" v-if="allowUnsafe">{{ !alreadyInstalled ? 'Install' : 'Update' }}</div>
         </div>
         <div v-else-if="alreadyInstalled && upToDate" slot="footer" class="bd-installModalFooter">
             <span class="bd-installModalStatus">Up to date version already installed!</span>
+            <div class="bd-button bd-installModalUpload" @click="modal.confirm(0); modal.close();">Upload</div>
         </div>
         <div v-else slot="footer" class="bd-installModalFooter">
-            <div class="bd-button bd-ok" @click="modal.confirm(0); modal.close();">Upload</div>
+            <div class="bd-button bd-installModalUpload" @click="modal.confirm(0); modal.close();">Upload</div>
             <div class="bd-button bd-ok" @click="install">{{ !alreadyInstalled ? 'Install' : 'Update' }}</div>
         </div>
     </Modal>
@@ -45,7 +48,7 @@
 <script>
     // Imports
     import { Modal, MiExtension } from '../../common';
-    import { PluginManager, ThemeManager, PackageInstaller } from 'modules';
+    import { PluginManager, ThemeManager, PackageInstaller, Settings } from 'modules';
 
     export default {
         data() {
@@ -53,7 +56,8 @@
                 installing: false,
                 verifying: true,
                 alreadyInstalled: false,
-                upToDate: true
+                upToDate: true,
+                allowUnsafe: Settings.getSetting('security', 'default', 'unsafe-content').value
             }
         },
         props: ['modal'],
@@ -74,12 +78,12 @@
         },
         methods: {
             async verify() {
-                const verified = await PackageInstaller.verifyPackage(this.modal.config.path);
+                const verified = await PackageInstaller.verifyPackage(this.modal.filePath);
                 this.verified = verified;
                 this.verifying = false;
             },
             async install() {
-                const installed = await PackageInstaller.installPackage(this.modal.config.path, this.modal.config.info.name, this.alreadyInstalled);
+                const installed = await PackageInstaller.installPackage(this.modal.filePath, this.modal.config.info.id, this.alreadyInstalled);
                 console.log(installed);
                 this.modal.confirm();
                 this.modal.close();
diff --git a/client/src/ui/modals.js b/client/src/ui/modals.js
index d7302ace..45f2c8d1 100644
--- a/client/src/ui/modals.js
+++ b/client/src/ui/modals.js
@@ -191,12 +191,12 @@ export default class Modals {
         return new Modal(modal, InputModal);
     }
 
-    static installModal(contentType, config) {
-        return this.add(this.createInstallModal(contentType, config));
+    static installModal(contentType, config, filePath, icon) {
+        return this.add(this.createInstallModal(contentType, config, filePath, icon));
     }
 
-    static createInstallModal(contentType, config) {
-        const modal = { contentType, config };
+    static createInstallModal(contentType, config, filePath, icon) {
+        const modal = { contentType, config, filePath, icon };
         modal.promise = new Promise((resolve, reject) => {
             modal.confirm = value => resolve(value);
             modal.beforeClose = () => reject();

From b48adc7a6235189ffd3b9d735ce7554f2af941e7 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Thu, 30 Aug 2018 09:23:27 +0300
Subject: [PATCH 19/29] red outline file svg for unverified

---
 .../styles/partials/modals/install-modal.scss | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/client/src/styles/partials/modals/install-modal.scss b/client/src/styles/partials/modals/install-modal.scss
index b474ebb5..d0006ef9 100644
--- a/client/src/styles/partials/modals/install-modal.scss
+++ b/client/src/styles/partials/modals/install-modal.scss
@@ -1,15 +1,13 @@
 .bd-installModal {
 
-    &.bd-err {
-        .bd-modalInner {
-            border: 2px solid $colerr;
-        }
-    }
-
     .bd-modalInner {
         min-width: 520px;
         min-height: 200px;
 
+        @at-root .bd-err#{&} {
+            border: 2px solid $colerr;
+        }
+
         .bd-modalBody {
             flex-grow: 1;
             padding: 0;
@@ -43,6 +41,10 @@
                         align-items: center;
                         justify-items: center;
 
+                        @at-root .bd-err#{&} {
+                            background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgMTAwIDEzMCIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMTAwIDEzMDsiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+LnN0MHtmaWxsOiNGNEY2RkM7fS5zdDF7ZmlsbDpub25lO3N0cm9rZTojRDg0MDQwO3N0cm9rZS13aWR0aDoyO30uc3Qye29wYWNpdHk6MC42O2ZpbGw6bm9uZTtzdHJva2U6I0Q4NDA0MDtzdHJva2Utd2lkdGg6MjtlbmFibGUtYmFja2dyb3VuZDpuZXcgICAgO308L3N0eWxlPjxwYXRoIGNsYXNzPSJzdDAiIGQ9Ik0xNSwxOWMwLTMuMywyLjctNiw2LTZoNDRjNC43LDAsMjAsMTUuMywyMCwyMHY3NGMwLDMuMy0yLjcsNi02LDZIMjFjLTMuMywwLTYtMi43LTYtNlYxOXoiLz48cGF0aCBjbGFzcz0ic3QxIiBkPSJNMTUsMTljMC0zLjMsMi43LTYsNi02aDQ0YzQuNywwLDIwLDE1LjMsMjAsMjB2NzRjMCwzLjMtMi43LDYtNiw2SDIxYy0zLjMsMC02LTIuNy02LTZWMTl6Ii8+PHBhdGggY2xhc3M9InN0MCIgZD0iTTY2LDE2YzAtMy4zLDEuOS00LjEsNC4yLTEuOGwxMy41LDEzLjVjMi4zLDIuMywxLjYsNC4yLTEuOCw0LjJINjljLTEuNywwLTMtMS4zLTMtM1YxNkw2NiwxNnoiLz48cGF0aCBjbGFzcz0ic3QxIiBkPSJNNjYsMTZjMC0zLjMsMS45LTQuMSw0LjItMS44bDEzLjUsMTMuNWMyLjMsMi4zLDEuNiw0LjItMS44LDQuMkg2OWMtMS43LDAtMy0xLjMtMy0zVjE2TDY2LDE2eiIvPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik02MSwxN0gyM2MtMi44LDAtNSwyLjItNSw1djciLz48cGF0aCBjbGFzcz0ic3QyIiBkPSJNNjksMTl2Ny41YzAsMS40LDEuMSwyLjUsMi41LDIuNUg3NCIvPjwvc3ZnPg==');
+                        }
+
                         .bd-installModalCi {
                             width: 40px;
                             height: 40px;
@@ -95,14 +97,11 @@
                 line-height: 36px;
                 flex-grow: 1;
                 padding: 0 25px;
-            }
+                font-weight: 600;
 
-            .bd-installModalStatus {
                 &:not(.bd-err) {
                     color: #fff;
                 }
-
-                font-weight: 600;
             }
 
             .bd-button {

From 96f8fe680fa9fbb65aa9166a75af22178a1f20cd Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Thu, 30 Aug 2018 09:27:16 +0300
Subject: [PATCH 20/29] add verified text

---
 client/src/styles/partials/modals/install-modal.scss | 9 +++++++--
 client/src/ui/components/bd/modals/InstallModal.vue  | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/client/src/styles/partials/modals/install-modal.scss b/client/src/styles/partials/modals/install-modal.scss
index d0006ef9..591323a7 100644
--- a/client/src/styles/partials/modals/install-modal.scss
+++ b/client/src/styles/partials/modals/install-modal.scss
@@ -98,9 +98,14 @@
                 flex-grow: 1;
                 padding: 0 25px;
                 font-weight: 600;
+                color: #fff;
 
-                &:not(.bd-err) {
-                    color: #fff;
+                &.bd-ok {
+                    color: $colok;
+                }
+
+                &.bd-err {
+                    color: $colerr;
                 }
             }
 
diff --git a/client/src/ui/components/bd/modals/InstallModal.vue b/client/src/ui/components/bd/modals/InstallModal.vue
index 0d2010aa..d694a4eb 100644
--- a/client/src/ui/components/bd/modals/InstallModal.vue
+++ b/client/src/ui/components/bd/modals/InstallModal.vue
@@ -40,6 +40,7 @@
             <div class="bd-button bd-installModalUpload" @click="modal.confirm(0); modal.close();">Upload</div>
         </div>
         <div v-else slot="footer" class="bd-installModalFooter">
+            <span class="bd-installModalStatus bd-ok">Verified!</span>
             <div class="bd-button bd-installModalUpload" @click="modal.confirm(0); modal.close();">Upload</div>
             <div class="bd-button bd-ok" @click="install">{{ !alreadyInstalled ? 'Install' : 'Update' }}</div>
         </div>

From 550d0d3c40884bb8e3c69f4097edf83ab67e59b9 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Thu, 30 Aug 2018 17:34:18 +0300
Subject: [PATCH 21/29] Move  uploadarea patcher to packageinstaller

---
 client/src/modules/packageinstaller.js | 51 +++++++++++++++++++++++---
 client/src/modules/reactcomponents.js  | 26 +------------
 2 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/client/src/modules/packageinstaller.js b/client/src/modules/packageinstaller.js
index 77e86fc7..07f1df76 100644
--- a/client/src/modules/packageinstaller.js
+++ b/client/src/modules/packageinstaller.js
@@ -8,30 +8,40 @@ import { Utils } from 'common';
 import PluginManager from './pluginmanager';
 import Globals from './globals';
 import Security from './security';
+import { ReactComponents } from './reactcomponents';
+import Reflection from './reflection';
+import DiscordApi from './discordapi';
 
-export default class {
+export default class PackageInstaller {
 
-    static async installPackageDragAndDrop(pkg, upload) {
+    /**
+     * Handler for drag and drop package install
+     * @param {String} filePath Path to local file
+     * @param {String} channelId Current channel id
+     */
+    static async dragAndDropHandler(filePath, channelId) {
         try {
-            const config = JSON.parse(asar.extractFile(pkg.path, 'config.json').toString());
+            const config = JSON.parse(asar.extractFile(filePath, 'config.json').toString());
             const { info, main } = config;
 
             let icon = null;
             if (info.icon && info.icon_type) {
-                const extractIcon = asar.extractFile(pkg.path, info.icon);
+                const extractIcon = asar.extractFile(filePath, info.icon);
                 icon = `data:${info.icon_type};base64,${Utils.arrayBufferToBase64(extractIcon)}`;
             }
 
             const isPlugin = info.type && info.type === 'plugin' || main.endsWith('.js');
 
             // Show install modal
-            const modalResult = await Modals.installModal(isPlugin ? 'plugin' : 'theme', config, pkg.path, icon).promise;
+            const modalResult = await Modals.installModal(isPlugin ? 'plugin' : 'theme', config, filePath, icon).promise;
 
             if (modalResult === 0) {
                 // Upload it instead
             }
 
-        } catch (err) {}
+        } catch (err) {
+            console.log(err);
+        }
     }
 
     /**
@@ -69,4 +79,33 @@ export default class {
         return PluginManager.reloadContent(PluginManager.getPluginById(id));
     }
 
+    /**
+     * Patches Discord upload area for .bd files
+     */
+    static async uploadAreaPatch() {
+        const { selector } = Reflection.resolve('uploadArea');
+        this.UploadArea = await ReactComponents.getComponent('UploadArea', { selector });
+
+        const reflect = Reflection.DOM(selector);
+        const stateNode = reflect.getComponentStateNode(this.UploadArea);
+        const callback = function (e) {
+            if (!e.dataTransfer.files.length || !e.dataTransfer.files[0].name.endsWith('.bd')) return;
+            e.preventDefault();
+            e.stopPropagation();
+            e.stopImmediatePropagation();
+            stateNode.clearDragging();
+
+            PackageInstaller.dragAndDropHandler(e.dataTransfer.files[0].path, DiscordApi.currentChannel.id);
+        };
+
+        // Remove their handler, add ours, then read theirs to give ours priority to stop theirs when we get a .bd file.
+        reflect.element.removeEventListener('drop', stateNode.handleDrop);
+        reflect.element.addEventListener('drop', callback);
+        reflect.element.addEventListener('drop', stateNode.handleDrop);
+
+        this.unpatchUploadArea = function () {
+            reflect.element.removeEventListener('drop', callback);
+        };
+    }
+
 }
diff --git a/client/src/modules/reactcomponents.js b/client/src/modules/reactcomponents.js
index 662d6a8a..8b71e6e9 100644
--- a/client/src/modules/reactcomponents.js
+++ b/client/src/modules/reactcomponents.js
@@ -502,30 +502,6 @@ export class ReactAutoPatcher {
     }
 
     static async patchUploadArea() {
-        const { selector } = Reflection.resolve('uploadArea');
-        this.UploadArea = await ReactComponents.getComponent('UploadArea', {selector});
-
-        const reflect = Reflection.DOM(selector);
-        const stateNode = reflect.getComponentStateNode(this.UploadArea);
-        const callback = function (e) {
-            if (!e.dataTransfer.files.length || !e.dataTransfer.files[0].name.endsWith('.bd')) return;
-            e.preventDefault();
-            e.stopPropagation();
-            e.stopImmediatePropagation();
-            stateNode.clearDragging();
-
-            PackageInstaller.installPackageDragAndDrop(e.dataTransfer.files[0], DiscordApi.currentChannel.id);
-
-            // Events.emit('install-pkg', e.dataTransfer.files[0], DiscordApi.currentChannel.id);
-        };
-
-        // Remove their handler, add ours, then read theirs to give ours priority to stop theirs when we get a .bd file.
-        reflect.element.removeEventListener('drop', stateNode.handleDrop);
-        reflect.element.addEventListener('drop', callback);
-        reflect.element.addEventListener('drop', stateNode.handleDrop);
-
-        this.unpatchUploadArea = function() {
-            reflect.element.removeEventListener('drop', callback);
-        };
+        PackageInstaller.uploadAreaPatch();
     }
 }

From 1e0f3b69fb3f87498a198eeca46ecf7367f2a79b Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Thu, 30 Aug 2018 18:30:49 +0300
Subject: [PATCH 22/29] Success modal

---
 client/src/modules/packageinstaller.js        |  25 ++--
 .../styles/partials/modals/install-modal.scss |  39 ++++++
 .../ui/components/bd/modals/InstallModal.vue  | 116 +++++++++++-------
 3 files changed, 126 insertions(+), 54 deletions(-)

diff --git a/client/src/modules/packageinstaller.js b/client/src/modules/packageinstaller.js
index 07f1df76..6871148e 100644
--- a/client/src/modules/packageinstaller.js
+++ b/client/src/modules/packageinstaller.js
@@ -66,17 +66,26 @@ export default class PackageInstaller {
      * @param {Boolean} update Does an older version already exist
      */
     static async installPackage(bytesOrPath, id, update = false) {
-        const bytes = typeof bytesOrPath === 'string' ? fs.readFileSync(bytesOrPath) : bytesOrPath;
+        try {
+            const bytes = typeof bytesOrPath === 'string' ? fs.readFileSync(bytesOrPath) : bytesOrPath;
 
-        const outputName = `${id}.bd`;
-        const outputPath = path.join(Globals.getPath('plugins'), outputName);
-        fs.writeFileSync(outputPath, bytes);
+            const outputName = `${id}.bd`;
+            const outputPath = path.join(Globals.getPath('plugins'), outputName);
+            fs.writeFileSync(outputPath, bytes);
 
-        if (!update) {
-            return PluginManager.preloadPackedContent(outputName);
+            let newContent = null;
+
+            if (!update) {
+                newContent = await PluginManager.preloadPackedContent(outputName);
+            } else {
+                newContent = await PluginManager.reloadContent(PluginManager.getPluginById(id));
+            }
+
+            return newContent;
+
+        } catch (err) {
+            throw err;
         }
-
-        return PluginManager.reloadContent(PluginManager.getPluginById(id));
     }
 
     /**
diff --git a/client/src/styles/partials/modals/install-modal.scss b/client/src/styles/partials/modals/install-modal.scss
index 591323a7..17a4a542 100644
--- a/client/src/styles/partials/modals/install-modal.scss
+++ b/client/src/styles/partials/modals/install-modal.scss
@@ -140,4 +140,43 @@
             }
         }
     }
+
+    &.bd-installModalDone {
+        .bd-modalInner {
+            min-width: 400px;
+            max-width: 400px;
+            height: 250px;
+            border: 2px solid $colok;
+
+            .bd-installModalBody {
+                display: flex;
+                flex-grow: 1;
+                align-content: center;
+                justify-content: center;
+                align-items: center;
+
+                h3 {
+                    color: $colok;
+                    font-size: 1.2em;
+                    font-weight: 700;
+                    text-align: center;
+                    padding: 20px;
+                }
+            }
+
+            .bd-materialDesignIcon {
+                svg {
+                    fill: $colok;
+                    width: 100px;
+                    height: 100px;
+                }
+            }
+
+            .bd-installModalFooter {
+                .bd-button {
+                    margin-left: 5px;
+                }
+            }
+        }
+    }
 }
diff --git a/client/src/ui/components/bd/modals/InstallModal.vue b/client/src/ui/components/bd/modals/InstallModal.vue
index d694a4eb..f20bd04d 100644
--- a/client/src/ui/components/bd/modals/InstallModal.vue
+++ b/client/src/ui/components/bd/modals/InstallModal.vue
@@ -1,54 +1,69 @@
 <template>
-    <Modal class="bd-installModal" :headertext="modal.title" :closing="modal.closing" @close="modal.close" :noheader="true" :class="{'bd-err': !verifying && !verified}">
-        <div slot="body" class="bd-installModalBody">
-            <div class="bd-installModalTop">
-                <div class="bd-installModalIcon">
-                    <div v-if="modal.icon" class="bd-installModalCi" :style="{backgroundImage: `url(${modal.icon})`}"/>
-                    <MiExtension v-else/>
-                </div>
-                <div class="bd-installModalInfo">
-                    <span>{{modal.config.info.name}} v{{modal.config.info.version}} by {{modal.config.info.authors.map(a => a.name).join(', ')}}</span>
-                    <div class="bd-installModalDesc">
-                        {{modal.config.info.description}}
+    <Modal class="bd-installModal" :headertext="modal.title" :closing="modal.closing" @close="modal.close" :noheader="true" :class="{'bd-err': !verifying && !verified, 'bd-installModalDone': installed}">
+        <template v-if="!installed && !err">
+            <div slot="body" class="bd-installModalBody">
+                <div class="bd-installModalTop">
+                    <div class="bd-installModalIcon">
+                        <div v-if="modal.icon" class="bd-installModalCi" :style="{backgroundImage: `url(${modal.icon})`}" />
+                        <MiExtension v-else />
+                    </div>
+                    <div class="bd-installModalInfo">
+                        <span>{{modal.config.info.name}} v{{modal.config.info.version}} by {{modal.config.info.authors.map(a => a.name).join(', ')}}</span>
+                        <div class="bd-installModalDesc">
+                            {{modal.config.info.description}}
+                        </div>
                     </div>
                 </div>
-            </div>
-            <div class="bd-installModalBottom">
-                <div v-for="(perm, i) in modal.config.permissions" :key="`perm-${i}`" class="bd-permScope">
-                    <div class="bd-permAllow">
-                        <div class="bd-permCheck">
-                            <div class="bd-permCheckInner"></div>
-                        </div>
-                        <div class="bd-permInner">
-                            <div class="bd-permName">{{perm.HEADER}}</div>
-                            <div class="bd-permDesc">{{perm.BODY}}</div>
+                <div class="bd-installModalBottom">
+                    <div v-for="(perm, i) in modal.config.permissions" :key="`perm-${i}`" class="bd-permScope">
+                        <div class="bd-permAllow">
+                            <div class="bd-permCheck">
+                                <div class="bd-permCheckInner"></div>
+                            </div>
+                            <div class="bd-permInner">
+                                <div class="bd-permName">{{perm.HEADER}}</div>
+                                <div class="bd-permDesc">{{perm.BODY}}</div>
+                            </div>
                         </div>
                     </div>
                 </div>
             </div>
-        </div>
-        <div v-if="verifying" slot="footer" class="bd-installModalFooter">
-            <span class="bd-installModalStatus">Verifying {{modal.contentType}}</span>
-        </div>
-        <div v-else-if="!verified" slot="footer" class="bd-installModalFooter">
-            <span class="bd-installModalStatus bd-err">Not verified!</span>
-            <div class="bd-button bd-installModalUpload" @click="modal.confirm(0); modal.close();">Upload</div>
-            <div class="bd-button bd-err" @click="install" v-if="allowUnsafe">{{ !alreadyInstalled ? 'Install' : 'Update' }}</div>
-        </div>
-        <div v-else-if="alreadyInstalled && upToDate" slot="footer" class="bd-installModalFooter">
-            <span class="bd-installModalStatus">Up to date version already installed!</span>
-            <div class="bd-button bd-installModalUpload" @click="modal.confirm(0); modal.close();">Upload</div>
-        </div>
-        <div v-else slot="footer" class="bd-installModalFooter">
-            <span class="bd-installModalStatus bd-ok">Verified!</span>
-            <div class="bd-button bd-installModalUpload" @click="modal.confirm(0); modal.close();">Upload</div>
-            <div class="bd-button bd-ok" @click="install">{{ !alreadyInstalled ? 'Install' : 'Update' }}</div>
-        </div>
+            <div v-if="verifying" slot="footer" class="bd-installModalFooter">
+                <span class="bd-installModalStatus">Verifying {{modal.contentType}}</span>
+            </div>
+            <div v-else-if="!verified" slot="footer" class="bd-installModalFooter">
+                <span class="bd-installModalStatus bd-err">Not verified!</span>
+                <div class="bd-button bd-installModalUpload" @click="modal.confirm(0); modal.close();">Upload</div>
+                <div class="bd-button bd-err" @click="install" v-if="allowUnsafe">{{ !alreadyInstalled ? 'Install' : 'Update' }}</div>
+            </div>
+            <div v-else-if="alreadyInstalled && upToDate" slot="footer" class="bd-installModalFooter">
+                <span class="bd-installModalStatus">Up to date version already installed!</span>
+                <div class="bd-button bd-installModalUpload" @click="modal.confirm(0); modal.close();">Upload</div>
+            </div>
+            <div v-else slot="footer" class="bd-installModalFooter">
+                <span class="bd-installModalStatus bd-ok">Verified!</span>
+                <div class="bd-button bd-installModalUpload" @click="modal.confirm(0); modal.close();">Upload</div>
+                <div class="bd-button bd-ok" @click="install">{{ !alreadyInstalled ? 'Install' : 'Update' }}</div>
+            </div>
+        </template>
+        <template v-else-if="err">
+            <div slot="body" class="bd-installModalBody">{{err.message}}</div>
+        </template>
+        <template v-else>
+            <div slot="body" class="bd-installModalBody">
+                <span>{{alreadyInstalled ? 'Succesfully Updated!' : 'Successfully Installed!'}}</span>
+                <MiSuccess/>
+            </div>
+            <div slot="footer" class="bd-installModalFooter">
+                <div class="bd-button bd-ok" v-if="installed.hasSettings" @click="showSettingsModal">Settings</div>
+                <div class="bd-button bd-ok" @click="modal.confirm(); modal.close();">OK</div>
+            </div>
+        </template>
     </Modal>
 </template>
 <script>
     // Imports
-    import { Modal, MiExtension } from '../../common';
+    import { Modal, MiExtension, MiSuccess } from '../../common';
     import { PluginManager, ThemeManager, PackageInstaller, Settings } from 'modules';
 
     export default {
@@ -58,12 +73,14 @@
                 verifying: true,
                 alreadyInstalled: false,
                 upToDate: true,
-                allowUnsafe: Settings.getSetting('security', 'default', 'unsafe-content').value
+                allowUnsafe: Settings.getSetting('security', 'default', 'unsafe-content').value,
+                installed: false,
+                err: null
             }
         },
         props: ['modal'],
         components: {
-            Modal, MiExtension
+            Modal, MiExtension, MiSuccess
         },
         mounted() {
             const { contentType, config } = this.modal;
@@ -84,10 +101,17 @@
                 this.verifying = false;
             },
             async install() {
-                const installed = await PackageInstaller.installPackage(this.modal.filePath, this.modal.config.info.id, this.alreadyInstalled);
-                console.log(installed);
-                this.modal.confirm();
-                this.modal.close();
+                try {
+                    const installed = await PackageInstaller.installPackage(this.modal.filePath, this.modal.config.info.id, this.alreadyInstalled);
+                    this.installed = installed;
+                    console.log(this.installed);
+                } catch (err) {
+                    console.log(err);
+                    this.err = err;
+                }
+            },
+            showSettingsModal() {
+                this.installed.showSettingsModal();
             }
         }
     }

From 307b0842148efcb20e12fa4595cf903561da0211 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Thu, 30 Aug 2018 18:32:06 +0300
Subject: [PATCH 23/29] add success circle

---
 .../src/ui/components/common/MaterialIcon.js  |  1 +
 .../common/materialicons/SuccessCircle.vue    | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 client/src/ui/components/common/materialicons/SuccessCircle.vue

diff --git a/client/src/ui/components/common/MaterialIcon.js b/client/src/ui/components/common/MaterialIcon.js
index 59dd6717..bd5c2384 100644
--- a/client/src/ui/components/common/MaterialIcon.js
+++ b/client/src/ui/components/common/MaterialIcon.js
@@ -23,3 +23,4 @@ export { default as MiImagePlus } from './materialicons/ImagePlus.vue';
 export { default as MiIcVpnKey } from './materialicons/IcVpnKey.vue';
 export { default as MiArrowLeft } from './materialicons/ArrowLeft.vue';
 export { default as MiBoxDownload } from './materialicons/BoxDownload.vue';
+export { default as MiSuccessCircle } from './materialicons/SuccessCircle.vue';
diff --git a/client/src/ui/components/common/materialicons/SuccessCircle.vue b/client/src/ui/components/common/materialicons/SuccessCircle.vue
new file mode 100644
index 00000000..829ebc7b
--- /dev/null
+++ b/client/src/ui/components/common/materialicons/SuccessCircle.vue
@@ -0,0 +1,27 @@
+/**
+ * BetterDiscord Material Design Icon
+ * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
+ * All rights reserved.
+ * https://betterdiscord.net
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * Material Design Icons
+ * Copyright (c) 2014 Google
+ * Apache 2.0 LICENSE
+ * https://www.apache.org/licenses/LICENSE-2.0.txt
+*/
+
+<template>
+    <span class="bd-materialDesignIcon">
+        <svg :width="size || 24" :height="size || 24" viewBox="0 0 24 24">
+            <path d="M 19.9994,11.9981C 19.9994,16.4161 16.4174,19.9981 11.9994,19.9981C 7.58139,19.9981 3.99939,16.4161 3.99939,11.9981C 3.99939,7.58007 7.58139,3.99807 11.9994,3.99807C 12.7634,3.99807 13.5004,4.11207 14.2004,4.31207L 15.7724,2.74007C 14.6074,2.26467 13.3354,1.99807 11.9994,1.99807C 6.47638,1.99807 1.99939,6.47507 1.99939,11.9981C 1.99939,17.5211 6.47638,21.9981 11.9994,21.9981C 17.5224,21.9981 21.9994,17.5211 21.9994,11.9981M 7.91339,10.0841L 6.49939,11.4981L 10.9994,15.9981L 20.9994,5.99807L 19.5854,4.58407L 10.9994,13.1701L 7.91339,10.0841 Z " />
+        </svg>
+    </span>
+</template>
+<script>
+    export default {
+        props: ['size']
+    }
+</script>

From 80096c5e71deab45ecb740eb2ac4baed5f5c38ad Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Thu, 30 Aug 2018 18:34:06 +0300
Subject: [PATCH 24/29] Styling

---
 client/src/ui/components/bd/modals/InstallModal.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/src/ui/components/bd/modals/InstallModal.vue b/client/src/ui/components/bd/modals/InstallModal.vue
index f20bd04d..d3bc73f6 100644
--- a/client/src/ui/components/bd/modals/InstallModal.vue
+++ b/client/src/ui/components/bd/modals/InstallModal.vue
@@ -51,8 +51,8 @@
         </template>
         <template v-else>
             <div slot="body" class="bd-installModalBody">
-                <span>{{alreadyInstalled ? 'Succesfully Updated!' : 'Successfully Installed!'}}</span>
-                <MiSuccess/>
+                <h3>{{alreadyInstalled ? 'Succesfully Updated!' : 'Successfully Installed!'}}</h3>
+                <MiSuccessCircle/>
             </div>
             <div slot="footer" class="bd-installModalFooter">
                 <div class="bd-button bd-ok" v-if="installed.hasSettings" @click="showSettingsModal">Settings</div>
@@ -63,7 +63,7 @@
 </template>
 <script>
     // Imports
-    import { Modal, MiExtension, MiSuccess } from '../../common';
+    import { Modal, MiExtension, MiSuccessCircle } from '../../common';
     import { PluginManager, ThemeManager, PackageInstaller, Settings } from 'modules';
 
     export default {
@@ -80,7 +80,7 @@
         },
         props: ['modal'],
         components: {
-            Modal, MiExtension, MiSuccess
+            Modal, MiExtension, MiSuccessCircle
         },
         mounted() {
             const { contentType, config } = this.modal;

From a93d12df0321c4c3fe25c77fe9e298aeb9a1beab Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Thu, 30 Aug 2018 21:24:09 +0300
Subject: [PATCH 25/29] add support for updating unpacked to packed and packed
 with different package name

---
 client/src/modules/packageinstaller.js        | 22 ++++++++++++++-----
 .../ui/components/bd/modals/InstallModal.vue  |  1 -
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/client/src/modules/packageinstaller.js b/client/src/modules/packageinstaller.js
index 6871148e..35e3fdb9 100644
--- a/client/src/modules/packageinstaller.js
+++ b/client/src/modules/packageinstaller.js
@@ -2,6 +2,7 @@ import EventListener from './eventlistener';
 import asar from 'asar';
 import fs from 'fs';
 import path from 'path';
+import rimraf from 'rimraf';
 
 import { Modals } from 'ui';
 import { Utils } from 'common';
@@ -75,14 +76,25 @@ export default class PackageInstaller {
 
             let newContent = null;
 
-            if (!update) {
-                newContent = await PluginManager.preloadPackedContent(outputName);
-            } else {
-                newContent = await PluginManager.reloadContent(PluginManager.getPluginById(id));
+            const oldContent = await PluginManager.reloadContent(PluginManager.getPluginById(id));
+
+            if (update && oldContent.packed && oldContent.packageName !== id) {
+                await oldContent.unload(true);
+                rimraf(oldContent.packed.packagePath, err => {
+                    if(err) console.log(err);
+                });
+                return PluginManager.preloadPackedContent(outputName);
             }
 
-            return newContent;
+            if (update && !oldContent.packed) {
+                await oldContent.unload(true);
+                rimraf(oldContent.contentPath, err => {
+                    if (err) console.log(err);
+                });
+                return PluginManager.preloadPackedContent(outputName);
+            }
 
+            return PluginManager.reloadContent(oldContent);
         } catch (err) {
             throw err;
         }
diff --git a/client/src/ui/components/bd/modals/InstallModal.vue b/client/src/ui/components/bd/modals/InstallModal.vue
index d3bc73f6..cc142956 100644
--- a/client/src/ui/components/bd/modals/InstallModal.vue
+++ b/client/src/ui/components/bd/modals/InstallModal.vue
@@ -104,7 +104,6 @@
                 try {
                     const installed = await PackageInstaller.installPackage(this.modal.filePath, this.modal.config.info.id, this.alreadyInstalled);
                     this.installed = installed;
-                    console.log(this.installed);
                 } catch (err) {
                     console.log(err);
                     this.err = err;

From 6a8c77b57868cf63984ef7aa1f38f555c015d2ac Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Fri, 31 Aug 2018 00:42:05 +0300
Subject: [PATCH 26/29] add error display

---
 client/src/modules/packageinstaller.js        |  8 ++-
 .../styles/partials/modals/install-modal.scss | 49 +++++++++++++++++++
 .../ui/components/bd/modals/InstallModal.vue  | 15 ++++--
 3 files changed, 67 insertions(+), 5 deletions(-)

diff --git a/client/src/modules/packageinstaller.js b/client/src/modules/packageinstaller.js
index 35e3fdb9..36b47b8f 100644
--- a/client/src/modules/packageinstaller.js
+++ b/client/src/modules/packageinstaller.js
@@ -67,11 +67,12 @@ export default class PackageInstaller {
      * @param {Boolean} update Does an older version already exist
      */
     static async installPackage(bytesOrPath, id, update = false) {
+        let outputPath = null;
         try {
             const bytes = typeof bytesOrPath === 'string' ? fs.readFileSync(bytesOrPath) : bytesOrPath;
 
             const outputName = `${id}.bd`;
-            const outputPath = path.join(Globals.getPath('plugins'), outputName);
+            outputPath = path.join(Globals.getPath('plugins'), outputName);
             fs.writeFileSync(outputPath, bytes);
 
             let newContent = null;
@@ -96,6 +97,11 @@ export default class PackageInstaller {
 
             return PluginManager.reloadContent(oldContent);
         } catch (err) {
+            if (outputPath) {
+                rimraf(outputPath, err => {
+                    if (err) console.log(err);
+                });
+            }
             throw err;
         }
     }
diff --git a/client/src/styles/partials/modals/install-modal.scss b/client/src/styles/partials/modals/install-modal.scss
index 17a4a542..25267b3b 100644
--- a/client/src/styles/partials/modals/install-modal.scss
+++ b/client/src/styles/partials/modals/install-modal.scss
@@ -179,4 +179,53 @@
             }
         }
     }
+
+    &.bd-installModalFail {
+        .bd-modalInner {
+            min-width: 400px;
+            max-width: 400px;
+            height: 250px;
+            border: 2px solid $colerr;
+
+            .bd-installModalBody {
+                display: flex;
+                flex-grow: 1;
+                align-content: center;
+                justify-content: center;
+                align-items: center;
+
+                h3 {
+                    color: $colerr;
+                    font-size: 1.2em;
+                    font-weight: 700;
+                    text-align: center;
+                    padding: 20px;
+                }
+            }
+
+            .bd-materialDesignIcon {
+                svg {
+                    fill: $colerr;
+                    width: 100px;
+                    height: 100px;
+                }
+            }
+
+            .bd-installModalFooter {
+
+                &.bd-installModalErrMsg {
+                    justify-content: flex-start;
+                    padding: 10px;
+                    background: rgba(0, 0, 0, .2);
+                    font-weight: 700;
+
+                    span {
+                        color: #fff;
+                        flex-grow: 1;
+                        text-align: right;
+                    }
+                }
+            }
+        }
+    }
 }
diff --git a/client/src/ui/components/bd/modals/InstallModal.vue b/client/src/ui/components/bd/modals/InstallModal.vue
index cc142956..14492007 100644
--- a/client/src/ui/components/bd/modals/InstallModal.vue
+++ b/client/src/ui/components/bd/modals/InstallModal.vue
@@ -1,5 +1,5 @@
 <template>
-    <Modal class="bd-installModal" :headertext="modal.title" :closing="modal.closing" @close="modal.close" :noheader="true" :class="{'bd-err': !verifying && !verified, 'bd-installModalDone': installed}">
+    <Modal class="bd-installModal" :headertext="modal.title" :closing="modal.closing" @close="modal.close" :noheader="true" :class="{'bd-err': !verifying && !verified, 'bd-installModalDone': installed, 'bd-installModalFail': err}">
         <template v-if="!installed && !err">
             <div slot="body" class="bd-installModalBody">
                 <div class="bd-installModalTop">
@@ -47,7 +47,14 @@
             </div>
         </template>
         <template v-else-if="err">
-            <div slot="body" class="bd-installModalBody">{{err.message}}</div>
+            <div slot="body" class="bd-installModalBody">
+                <h3>Something went wrong :(</h3>
+                <MiError />
+            </div>
+            <div slot="footer" class="bd-installModalFooter bd-installModalErrMsg">
+                {{err.message}}
+                <span>Ctrl+Shift+I</span>
+            </div>
         </template>
         <template v-else>
             <div slot="body" class="bd-installModalBody">
@@ -63,7 +70,7 @@
 </template>
 <script>
     // Imports
-    import { Modal, MiExtension, MiSuccessCircle } from '../../common';
+    import { Modal, MiExtension, MiSuccessCircle, MiError } from '../../common';
     import { PluginManager, ThemeManager, PackageInstaller, Settings } from 'modules';
 
     export default {
@@ -80,7 +87,7 @@
         },
         props: ['modal'],
         components: {
-            Modal, MiExtension, MiSuccessCircle
+            Modal, MiExtension, MiSuccessCircle, MiError
         },
         mounted() {
             const { contentType, config } = this.modal;

From 669a88c1fffecb71e64f25579bf4597a8b955ec5 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Fri, 31 Aug 2018 05:01:05 +0300
Subject: [PATCH 27/29] Fix package installer and add remote loader

---
 client/src/modules/packageinstaller.js | 40 ++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/client/src/modules/packageinstaller.js b/client/src/modules/packageinstaller.js
index 36b47b8f..a99fe271 100644
--- a/client/src/modules/packageinstaller.js
+++ b/client/src/modules/packageinstaller.js
@@ -4,6 +4,7 @@ import fs from 'fs';
 import path from 'path';
 import rimraf from 'rimraf';
 
+import { request } from 'vendor';
 import { Modals } from 'ui';
 import { Utils } from 'common';
 import PluginManager from './pluginmanager';
@@ -75,15 +76,16 @@ export default class PackageInstaller {
             outputPath = path.join(Globals.getPath('plugins'), outputName);
             fs.writeFileSync(outputPath, bytes);
 
-            let newContent = null;
-
-            const oldContent = await PluginManager.reloadContent(PluginManager.getPluginById(id));
+            if (!update) return PluginManager.preloadPackedContent(outputName);
+            
+            const oldContent = PluginManager.getPluginById(id);
 
             if (update && oldContent.packed && oldContent.packageName !== id) {
                 await oldContent.unload(true);
                 rimraf(oldContent.packed.packagePath, err => {
                     if(err) console.log(err);
                 });
+
                 return PluginManager.preloadPackedContent(outputName);
             }
 
@@ -92,6 +94,7 @@ export default class PackageInstaller {
                 rimraf(oldContent.contentPath, err => {
                     if (err) console.log(err);
                 });
+
                 return PluginManager.preloadPackedContent(outputName);
             }
 
@@ -106,6 +109,37 @@ export default class PackageInstaller {
         }
     }
 
+    /**
+     * Install package from remote location. Only github/bdapi is supoorted.
+     * @param {String} remoteLocation Remote resource location
+     */
+    static async installRemotePackage(remoteLocation) {
+        try {
+            const { hostname } = Object.assign(document.createElement('a'), { href: remoteLocation });
+            if (hostname !== 'api.github.com' && hostname !== 'secretbdapi') throw 'Invalid host!';
+
+            const options = {
+                uri: remoteLocation,
+                headers: {
+                    'User-Agent': 'BetterDiscordClient',
+                    'Accept': 'application/octet-stream'
+                }
+            };
+
+            const response = await request.get(options);
+            const outputPath = path.join(Globals.getPath('tmp'), Security.hash('sha256', response, 'hex'));
+            fs.writeFileSync(outputPath, response);
+
+            await this.dragAndDropHandler(outputPath);
+
+            rimraf(outputPath, err => {
+                if (err) console.log(err);
+            });
+        } catch (err) {
+            throw err;
+        }
+    }
+
     /**
      * Patches Discord upload area for .bd files
      */

From 5822110c8701fb78eda6c3d9c01743b87f60e692 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Fri, 31 Aug 2018 05:16:42 +0300
Subject: [PATCH 28/29] Package updater fix

---
 client/src/modules/packageinstaller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/modules/packageinstaller.js b/client/src/modules/packageinstaller.js
index a99fe271..f461dc79 100644
--- a/client/src/modules/packageinstaller.js
+++ b/client/src/modules/packageinstaller.js
@@ -80,7 +80,7 @@ export default class PackageInstaller {
             
             const oldContent = PluginManager.getPluginById(id);
 
-            if (update && oldContent.packed && oldContent.packageName !== id) {
+            if (update && oldContent.packed && oldContent.packed.packageName !== id) {
                 await oldContent.unload(true);
                 rimraf(oldContent.packed.packagePath, err => {
                     if(err) console.log(err);

From 7cf69f6993aca7513823454795133e06aec83a55 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Fri, 31 Aug 2018 08:33:23 +0300
Subject: [PATCH 29/29] lint

---
 client/src/modules/packageinstaller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/modules/packageinstaller.js b/client/src/modules/packageinstaller.js
index f461dc79..2267dec6 100644
--- a/client/src/modules/packageinstaller.js
+++ b/client/src/modules/packageinstaller.js
@@ -77,7 +77,7 @@ export default class PackageInstaller {
             fs.writeFileSync(outputPath, bytes);
 
             if (!update) return PluginManager.preloadPackedContent(outputName);
-            
+
             const oldContent = PluginManager.getPluginById(id);
 
             if (update && oldContent.packed && oldContent.packed.packageName !== id) {