From 585d33da7e0539b2460fe7f9b2d8169c055375dc Mon Sep 17 00:00:00 2001
From: Nicklaus McClendon <“nickmcc@google.com”>
Date: Mon, 24 Jul 2023 11:53:33 -0500
Subject: [PATCH 1/2] Dark mode + bug fixes

---
 .github/workflows/build-main.yml             |  28 +++++
 assets/scss/main.scss                        |   2 +
 assets/scss/theme.scss                       | 113 +++++++++++++++++++
 src/App.vue                                  |  31 ++++-
 src/components/CreateTask/TimeLimitInput.vue |  41 ++++++-
 src/components/UploadFileModal.vue           |  26 +++--
 src/components/UsersSelection.vue            |   4 +-
 src/i18n/en-US.json                          |   7 +-
 src/views/CreateTask.vue                     |   4 +-
 src/views/TaskStatus.vue                     |   9 ++
 10 files changed, 241 insertions(+), 24 deletions(-)
 create mode 100644 .github/workflows/build-main.yml
 create mode 100644 assets/scss/theme.scss

diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml
new file mode 100644
index 0000000..dfdf74d
--- /dev/null
+++ b/.github/workflows/build-main.yml
@@ -0,0 +1,28 @@
+name: Build master
+
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Setup Node
+      uses: actions/setup-node@v3
+      with:
+        node-version: 12
+
+    - name: Install dependencies
+      run: yarn install
+
+    - name: Build UI
+      run: yarn build
+
+    - name: Upload release package
+      uses: actions/upload-artifact@v3
+      with:
+        name: dist
+        path: dist
diff --git a/assets/scss/main.scss b/assets/scss/main.scss
index 0620c10..aa4aa3b 100644
--- a/assets/scss/main.scss
+++ b/assets/scss/main.scss
@@ -1,3 +1,5 @@
+@import "theme.scss";
+
 @import 'node_modules/bootstrap/scss/bootstrap';
 @import 'node_modules/bootstrap-vue/src/index.scss';
 
diff --git a/assets/scss/theme.scss b/assets/scss/theme.scss
new file mode 100644
index 0000000..9cd7bb5
--- /dev/null
+++ b/assets/scss/theme.scss
@@ -0,0 +1,113 @@
+:root {
+  --theme-dark-bg: #343a40;
+  --theme-border-color: #dee2e6;
+  --theme-bg-color: #fff;
+  --theme-body-color: #212529;
+  --theme-card-bg: #fff;
+  --theme-card-border-color: rgba(00, 00, 00, .125);
+  --theme-card-cap-bg: rgba(00, 00, 00, .03);
+  --theme-hr-border-color: rgba(00, 00, 00, .1);
+  --theme-input-bg: #fff;
+  --theme-input-border-color: #ced4da;
+  --theme-input-color: #495057;
+  --theme-input-disabled-bg: #e9ecef;
+  --theme-input-group-addon-bg: #e9ecef;
+  --theme-dropdown-bg: #fff;
+  --theme-dropdown-link-color: #212529;
+  --theme-table-accent-bg: rgba(00, 00, 00, .05);
+}
+
+:root[data-theme="dark"] {
+  --theme-dark-bg: rgba(00, 00, 00, .09);
+  --theme-border-color:  #343a40;
+  --theme-bg-color: #212529;
+  --theme-body-color: #fff;
+  --theme-card-bg: #212529;
+  --theme-card-border-color: rgba(00, 00, 00, .5);
+  --theme-card-cap-bg: rgba(00, 00, 00, .12);
+  --theme-hr-border-color: rgba(00, 00, 00, .4);
+  --theme-input-bg: #343a40;
+  --theme-input-border-color: rgba(00, 00, 00, .4);
+  --theme-input-color: #f8f9fa;
+  --theme-input-disabled-bg: #212529;
+  --theme-input-group-addon-bg: #111215;
+  --theme-dropdown-bg: #343a40;
+  --theme-dropdown-link-color: #fff;
+  --theme-table-accent-bg: rgba(00, 00, 00, .2);
+}
+
+// Body
+$body-bg:    var(--theme-bg-color);
+$body-color: var(--theme-body-color);
+
+// Components
+//
+// Define common padding and border radius sizes and more.
+$border-color: var(--theme-border-color);
+
+// Cards
+$card-bg:           var(--theme-card-bg);
+$card-border-color: var(--theme-card-border-color);
+$card-cap-bg:       var(--theme-card-cap-bg);
+
+// Typography
+$hr-border-color: var(--theme-hr-border-color);
+
+// Forms
+$input-bg:              var(--theme-input-bg);
+$input-border-color:    var(--theme-input-border-color);
+$input-disabled-bg:     var(--theme-input-disabled-bg);
+$input-color:           var(--theme-input-color);
+$input-group-addon-bg: var(--theme-input-group-addon-bg);
+
+// Dropdowns
+//
+// Dropdown menu container and contents.
+$dropdown-bg:         var(--theme-dropdown-bg);
+$dropdown-link-color: var(--theme-dropdown-link-color);
+
+// Tables
+//
+// Customizes the `.table` component with basic values, each used across all table variations.
+$table-accent-bg: var(--theme-table-accent-bg);
+
+// Modals
+$modal-content-bg: var(--theme-bg-color);
+
+.theme-dark {
+    background-color: var(--theme-dark-bg);
+}
+
+.multiselect {
+  .multiselect__single {
+    background: var(--theme-input-bg);
+    border-color: var(--theme-input-border-color);
+    color: var(--theme-input-color);
+  }
+
+  .multiselect__tags {
+    background: var(--theme-input-bg);
+    border-color: var(--theme-input-border-color);
+    color: var(--theme-input-color);
+  }
+
+  .multiselect__input {
+    background: var(--theme-input-bg);
+    border-color: var(--theme-input-border-color);
+    color: var(--theme-input-color);
+  }
+
+  .multiselect__content-wrapper {
+    background: var(--theme-input-bg);
+    border-color: var(--theme-input-border-color);
+    color: var(--theme-input-color);
+  }
+
+  .multiselect__spinner {
+    background: var(--theme-input-bg);
+  }
+}
+
+.page-link {
+    background: var(--theme-input-bg) !important;
+}
diff --git a/src/App.vue b/src/App.vue
index e541b9a..3dadb0b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
 <template>
   <div id="app">
-    <b-navbar toggleable="md" type="dark" variant="dark">
+    <b-navbar toggleable="md" type="dark" class="theme-dark">
       <b-nav-toggle target="nav_collapse"></b-nav-toggle>
       <b-navbar-brand to="/">{{ $t('name') }}</b-navbar-brand>
 
@@ -27,6 +27,19 @@
           </b-nav-form>
 
           <b-nav-item-dropdown :text="getAuthDetails.username" right>
+            <b-dropdown-form>
+              <b-form-checkbox
+                id="dark-mode"
+                v-model="theme"
+                name="dark-mode"
+                value="dark"
+                unchecked-value=""
+                switch
+                class="ml-2"
+              >
+                {{ $t("navbar.dark_mode") }}
+              </b-form-checkbox>
+            </b-dropdown-form>
             <b-dropdown-item to="/users/edit" exact><i class="fa fa-edit" aria-hidden="true"></i> {{ $t('shared.edit_settings') }}</b-dropdown-item>
             <b-dropdown-item @click="logout"><i class="fa fa-sign-out-alt" aria-hidden="true"></i> {{ $t('shared.logout') }}</b-dropdown-item>
           </b-nav-item-dropdown>
@@ -76,7 +89,21 @@ export default {
       'userIsLoggedIn',
       'isAdministrator',
       'getAuthDetails'
-    ])
+    ]),
+
+    theme: {
+      get: function () {
+        return localStorage.getItem('theme')
+      },
+      set: function (theme) {
+        document.documentElement.dataset.theme = theme
+        localStorage.setItem('theme', theme)
+      }
+    }
+  },
+
+  mounted () {
+    document.documentElement.dataset.theme = this.theme
   },
 
   methods: {
diff --git a/src/components/CreateTask/TimeLimitInput.vue b/src/components/CreateTask/TimeLimitInput.vue
index 34c96d4..19853ac 100644
--- a/src/components/CreateTask/TimeLimitInput.vue
+++ b/src/components/CreateTask/TimeLimitInput.vue
@@ -16,13 +16,42 @@
 </template>
 
 <script>
-import { chCompValidator } from '@/mixins'
-
 export default {
-  mixins: [chCompValidator],
-  data () {
-    return {
-      text: '172,800'
+  props: {
+    v: {
+      type: Object,
+      default: null
+    },
+
+    value: {
+      type: String,
+      default: null
+    }
+  },
+
+  computed: {
+    state () {
+      // Do we have a validator?
+      if (this.v === null) {
+        return null
+      }
+
+      // Check our validity from the parent validator
+      return this.v.$dirty ? !this.v.$invalid && !this.v.$error : null
+    },
+    internalValue: {
+      // getter
+      get: function () {
+        return this.value
+      },
+      // setter
+      set: function (newValue) {
+        this.$emit('input', newValue)
+
+        if (this.v !== null) {
+          this.v.$touch()
+        }
+      }
     }
   }
 }
diff --git a/src/components/UploadFileModal.vue b/src/components/UploadFileModal.vue
index bcc509f..d4260eb 100644
--- a/src/components/UploadFileModal.vue
+++ b/src/components/UploadFileModal.vue
@@ -36,16 +36,19 @@
 
       <!-- Display the options for a shared file if we're not a task file -->
       <template v-if="!isTaskFile">
-        <b-form-group id="isFileShared" label-for="isFileShared"
+        <b-form-group id="isFileShared" label-for="is-file-shared"
                       :description="$t('upload_modal.description_is_shared')">
-          <b-form-checkbox
-            id="isFileShared"
-            v-model="selectedOptions.isFileShared"
-            value="true"
-            unchecked-value="false"
-          >
-            {{ $t('upload_modal.is_shared')}}
-          </b-form-checkbox>
+
+        <b-form-checkbox
+          id="is-file-shared"
+          v-model="selectedOptions.isFileShared"
+          name="is-file-shared"
+          value="true"
+          unchecked-value="false"
+        >
+          {{ $t('upload_modal.is_shared')}}
+        </b-form-checkbox>
+
         </b-form-group>
 
         <b-form-group id="selectFileType" label-for="selectFileType" :label="$t('shared.file_type')">
@@ -123,7 +126,7 @@ export default {
         file_type: apitypes.ENGINE_FILE_TYPES[0],
         selectedEngineForTask: (this.isTaskFile ? apitypes.TASK_FILE_FOR_ENGINE[1] : null),
         hashcat_type: null,
-        isFileShared: 'no'
+        isFileShared: 'false'
       },
       hashcatTypeDropdown: {
         loading: false,
@@ -160,7 +163,8 @@ export default {
       this.selectedOptions = {
         file_type: apitypes.ENGINE_FILE_TYPES[0],
         selectedEngineForTask: (this.isTaskFile ? apitypes.TASK_FILE_FOR_ENGINE[1] : null),
-        hashcat_type: null
+        hashcat_type: null,
+        isFileShared: 'false'
       }
       this.uploadProgress = 0
       this.$refs.uploadFileInput.reset()
diff --git a/src/components/UsersSelection.vue b/src/components/UsersSelection.vue
index 18b3a39..275a38e 100644
--- a/src/components/UsersSelection.vue
+++ b/src/components/UsersSelection.vue
@@ -11,6 +11,7 @@
         label="username"
         id="additionalUsers"
         placeholder="Add a user"
+        v-model="internal_value"
         @open="onUsersSelectOpen"
         @input="onInput" />
       <small class="form-text text-muted">{{ $t('create_task.description_users') }}</small>
@@ -31,7 +32,8 @@ export default {
   data () {
     return {
       loading: false,
-      users: []
+      users: [],
+      internal_value: []
     }
   },
 
diff --git a/src/i18n/en-US.json b/src/i18n/en-US.json
index a21a6f8..dd2dab1 100644
--- a/src/i18n/en-US.json
+++ b/src/i18n/en-US.json
@@ -9,7 +9,8 @@
         "admin": "Admin Settings",
         "users": "Users",
         "edit_user": "Edit User",
-        "version": "Version"
+        "version": "Version",
+        "dark_mode": "Dark Mode"
     },
     "login": {
         "header": "Log In",
@@ -127,6 +128,7 @@
         "status": "Status",
         "error": "Error",
         "created_at": "Created At",
+        "timeout_at": "Timeout At",
         "language": "Language",
         "task_name": "Task Name",
         "delete": "Delete",
@@ -139,7 +141,8 @@
         "license": "License",
         "submit": "Submit",
         "please_wait": "Please wait...",
-        "disabled": "Disabled"
+        "disabled": "Disabled",
+        "never": "Never"
     },
     "upload_modal": {
         "engine": "Engine",
diff --git a/src/views/CreateTask.vue b/src/views/CreateTask.vue
index 3b4cb21..2b609bb 100644
--- a/src/views/CreateTask.vue
+++ b/src/views/CreateTask.vue
@@ -290,7 +290,7 @@ export default {
         priority: this.priority
       }
 
-      if (this.taskTimeLimit !== null) {
+      if (this.taskTimeLimit !== null && this.taskTimeLimit !== '') {
         payload.task_duration = parseInt(this.taskTimeLimit)
       }
 
@@ -428,7 +428,7 @@ export default {
       selectedDevices: [],
       additionalUsers: [],
       priority: 1,
-      taskTimeLimit: null
+      taskTimeLimit: '172800'
     }
   },
 
diff --git a/src/views/TaskStatus.vue b/src/views/TaskStatus.vue
index a845f66..ce0ce03 100644
--- a/src/views/TaskStatus.vue
+++ b/src/views/TaskStatus.vue
@@ -60,6 +60,15 @@
                     <td>{{ $t('shared.created_at') }}</td>
                     <td>{{ new Date(taskInfo.info.created_at).toString() }} </td>
                   </tr>
+                  <tr>
+                    <td>{{ $t('shared.timeout_at') }}</td>
+                    <td v-if="taskInfo.info.task_duration !== undefined && taskInfo.info.task_duration !== null && taskInfo.info.task_duration !== 0">
+                      {{ new Date(new Date(taskInfo.info.created_at).getTime() + (1000 * taskInfo.info.task_duration)).toString() }}
+                    </td>
+                    <td v-else>
+                      {{ $t('shared.never') }}
+                    </td>
+                  </tr>
                   <tr>
                     <td>{{ $t('shared.engine') }}</td>
                     <td>{{ taskInfo.info.engine }}</td>

From 8e80637d38e5e055394e0df75f0ec1ae5fa75ef7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Oct 2023 09:11:00 +0000
Subject: [PATCH 2/2] Bump fsevents from 1.2.9 to 1.2.13

Bumps [fsevents](https://github.com/fsevents/fsevents) from 1.2.9 to 1.2.13.
- [Release notes](https://github.com/fsevents/fsevents/releases)
- [Commits](https://github.com/fsevents/fsevents/compare/v1.2.9...v1.2.13)

---
updated-dependencies:
- dependency-name: fsevents
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 143 ++++++++----------------------------------------------
 1 file changed, 21 insertions(+), 122 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 346881d..90667a5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1905,6 +1905,13 @@ binary-extensions@^1.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
   integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
 
+bindings@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
+  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
+  dependencies:
+    file-uri-to-path "1.0.0"
+
 block-stream@*:
   version "0.0.9"
   resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
@@ -3076,11 +3083,6 @@ deep-equal@^1.0.1:
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
   integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=
 
-deep-extend@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
-  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
-
 deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
@@ -3176,11 +3178,6 @@ destroy@~1.0.4:
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
   integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
 
-detect-libc@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
-
 detect-node@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
@@ -4021,6 +4018,11 @@ file-loader@^3.0.1:
     loader-utils "^1.0.2"
     schema-utils "^1.0.0"
 
+file-uri-to-path@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
+  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
+
 filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
@@ -4249,13 +4251,6 @@ fs-extra@^7.0.1:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-minipass@^1.2.5:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.6.tgz#2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07"
-  integrity sha512-crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==
-  dependencies:
-    minipass "^2.2.1"
-
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
@@ -4272,12 +4267,12 @@ fs.realpath@^1.0.0:
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@^1.2.7:
-  version "1.2.9"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f"
-  integrity sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
+  integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==
   dependencies:
+    bindings "^1.5.0"
     nan "^2.12.1"
-    node-pre-gyp "^0.12.0"
 
 fstream@^1.0.0, fstream@^1.0.12:
   version "1.0.12"
@@ -4733,7 +4728,7 @@ https-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
   integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
-iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
+iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -4762,13 +4757,6 @@ iferr@^0.1.5:
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
   integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
-ignore-walk@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
-  integrity sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==
-  dependencies:
-    minimatch "^3.0.4"
-
 ignore@^3.3.3, ignore@^3.3.5:
   version "3.3.10"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
@@ -4872,11 +4860,6 @@ inherits@2.0.1:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
   integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
 
-ini@~1.3.0:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
-
 inquirer@^3.0.6:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
@@ -5920,21 +5903,6 @@ minimist@^1.1.3, minimist@^1.2.0:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
-minipass@^2.2.1, minipass@^2.3.5:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
-  integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
-  dependencies:
-    safe-buffer "^5.1.2"
-    yallist "^3.0.0"
-
-minizlib@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
-  integrity sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==
-  dependencies:
-    minipass "^2.2.1"
-
 mississippi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
@@ -6076,15 +6044,6 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
-needle@^2.2.1:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c"
-  integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==
-  dependencies:
-    debug "^3.2.6"
-    iconv-lite "^0.4.4"
-    sax "^1.2.4"
-
 negotiator@0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
@@ -6173,22 +6132,6 @@ node-libs-browser@^2.0.0:
     util "^0.11.0"
     vm-browserify "0.0.4"
 
-node-pre-gyp@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149"
-  integrity sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==
-  dependencies:
-    detect-libc "^1.0.2"
-    mkdirp "^0.5.1"
-    needle "^2.2.1"
-    nopt "^4.0.1"
-    npm-packlist "^1.1.6"
-    npmlog "^4.0.2"
-    rc "^1.2.7"
-    rimraf "^2.6.1"
-    semver "^5.3.0"
-    tar "^4"
-
 node-releases@^1.1.23:
   version "1.1.23"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.23.tgz#de7409f72de044a2fa59c097f436ba89c39997f0"
@@ -6226,14 +6169,6 @@ node-sass@^4.12.0:
   dependencies:
     abbrev "1"
 
-nopt@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
-  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
-  dependencies:
-    abbrev "1"
-    osenv "^0.1.4"
-
 normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -6280,19 +6215,6 @@ normalize-url@^3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
   integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
 
-npm-bundled@^1.0.1:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd"
-  integrity sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==
-
-npm-packlist@^1.1.6:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.1.tgz#19064cdf988da80ea3cee45533879d90192bbfbc"
-  integrity sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==
-  dependencies:
-    ignore-walk "^3.0.1"
-    npm-bundled "^1.0.1"
-
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -6300,7 +6222,7 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2:
+"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
   integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
@@ -6523,7 +6445,7 @@ os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-osenv@0, osenv@^0.1.4:
+osenv@0:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
   integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
@@ -7390,16 +7312,6 @@ raw-body@2.4.0:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-rc@^1.2.7:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
-  dependencies:
-    deep-extend "^0.6.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -7844,7 +7756,7 @@ sass-loader@^7.1.0:
     pify "^3.0.0"
     semver "^5.5.0"
 
-sax@^1.2.4, sax@~1.2.4:
+sax@~1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
@@ -8532,19 +8444,6 @@ tar@^2.0.0:
     fstream "^1.0.12"
     inherits "2"
 
-tar@^4:
-  version "4.4.10"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.10.tgz#946b2810b9a5e0b26140cf78bea6b0b0d689eba1"
-  integrity sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==
-  dependencies:
-    chownr "^1.1.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.3.5"
-    minizlib "^1.2.1"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.3"
-
 terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.2.3:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.3.0.tgz#69aa22426299f4b5b3775cbed8cb2c5d419aa1d4"
@@ -9413,7 +9312,7 @@ yallist@^2.1.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
-yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
+yallist@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
   integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==