diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml
index 4cad08bb78..78c15c8e71 100644
--- a/.circleci/config/base.yml
+++ b/.circleci/config/base.yml
@@ -1060,18 +1060,15 @@ steps-tests: &steps-tests
             export MOCHA_TIMEOUT=180000
             echo "Piping output to ASAN_SYMBOLIZE ($ASAN_SYMBOLIZE)"
             (cd electron && node script/yarn test --runners=main --trace-uncaught --enable-logging --files $(circleci tests glob spec-main/*-spec.ts | circleci tests split --split-by=timings)) 2>&1 | $ASAN_SYMBOLIZE
-            (cd electron && node script/yarn test --runners=remote --trace-uncaught --enable-logging --files $(circleci tests glob spec/*-spec.js | circleci tests split --split-by=timings)) 2>&1 | $ASAN_SYMBOLIZE
           else
             if [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then
               export ELECTRON_SKIP_NATIVE_MODULE_TESTS=true
               (cd electron && node script/yarn test --runners=main --trace-uncaught --enable-logging)
-              (cd electron && node script/yarn test --runners=remote --trace-uncaught --enable-logging)
             else
               if [ "$TARGET_ARCH" == "ia32" ]; then
                 npm_config_arch=x64 node electron/node_modules/dugite/script/download-git.js
               fi
               (cd electron && node script/yarn test --runners=main --trace-uncaught --enable-logging --files $(circleci tests glob spec-main/*-spec.ts | circleci tests split --split-by=timings))
-              (cd electron && node script/yarn test --runners=remote --trace-uncaught --enable-logging --files $(circleci tests glob spec/*-spec.js | circleci tests split --split-by=timings))
             fi
           fi
     - run:
@@ -1080,9 +1077,6 @@ steps-tests: &steps-tests
           cd src
 
           # Check if test results exist and are not empty.
-          if [ ! -s "junit/test-results-remote.xml" ]; then
-            exit 1
-          fi
           if [ ! -s "junit/test-results-main.xml" ]; then
             exit 1
           fi
diff --git a/.github/workflows/electron_woa_testing.yml b/.github/workflows/electron_woa_testing.yml
index 01c2b9a08c..74192bffb3 100644
--- a/.github/workflows/electron_woa_testing.yml
+++ b/.github/workflows/electron_woa_testing.yml
@@ -117,21 +117,6 @@ jobs:
         MOCHA_MULTI_REPORTERS: 'mocha-junit-reporter, tap'
         MOCHA_REPORTER: mocha-multi-reporters
         ELECTRON_SKIP_NATIVE_MODULE_TESTS: true
-    - name: Run Electron Remote based tests
-      if: ${{ success() || failure() }}
-      run: |
-        cd src
-        set npm_config_nodedir=%cd%\out\Default\gen\node_headers
-        set npm_config_arch=arm64
-        cd electron
-        node script/yarn test --runners=remote --enable-logging --disable-features=CalculateNativeWinOcclusion
-      env:
-        ELECTRON_OUT_DIR: Default
-        IGNORE_YARN_INSTALL_ERROR: 1
-        ELECTRON_TEST_RESULTS_DIR: junit
-        MOCHA_MULTI_REPORTERS: 'mocha-junit-reporter, tap'
-        MOCHA_REPORTER: mocha-multi-reporters
-        ELECTRON_SKIP_NATIVE_MODULE_TESTS: true
     - name: Verify ffmpeg
       run: |
         cd src
diff --git a/.gitignore b/.gitignore
index e2168896e2..32fed3d272 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,7 +35,7 @@ electron-api.json
 electron.d.ts
 
 # Spec hash calculation
-spec/.hash
+spec-main/.hash
 
 # Eslint Cache
 .eslintcache*
@@ -53,4 +53,4 @@ ts-gen
 # Used to accelerate builds after sync
 patches/mtime-cache.json
 
-spec/fixtures/logo.png
\ No newline at end of file
+spec-main/fixtures/logo.png
diff --git a/appveyor.yml b/appveyor.yml
index b4593261bd..0dd538cf12 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -202,7 +202,6 @@ test_script:
       }
   - cd electron
   - if "%RUN_TESTS%"=="true" ( echo Running main test suite & node script/yarn test -- --trace-uncaught --runners=main --enable-logging=file --log-file=%cd%\electron.log )
-  - if "%RUN_TESTS%"=="true" ( echo Running remote test suite & node script/yarn test -- --trace-uncaught --runners=remote --runTestFilesSeparately --enable-logging=file --log-file=%cd%\electron.log )
   - if "%RUN_TESTS%"=="true" ( echo Running native test suite & node script/yarn test -- --trace-uncaught --runners=native --enable-logging=file --log-file=%cd%\electron.log )  
   - cd ..
   - if "%RUN_TESTS%"=="true" ( echo Verifying non proprietary ffmpeg & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg )
diff --git a/build/args/native_tests.gn b/build/args/native_tests.gn
index 416b9556cc..26d6bf3dce 100644
--- a/build/args/native_tests.gn
+++ b/build/args/native_tests.gn
@@ -1,4 +1,4 @@
-root_extra_deps = [ "//electron/spec" ]
+root_extra_deps = [ "//electron/spec-chromium:spec" ]
 
 dcheck_always_on = true
 is_debug = false
diff --git a/docs/development/README.md b/docs/development/README.md
index fcf147f1ca..2fcb45e965 100644
--- a/docs/development/README.md
+++ b/docs/development/README.md
@@ -54,7 +54,7 @@ See [issues](issues.md) for more information.
 Most pull requests opened against the `electron/electron` repository include
 changes to either the C/C++ code in the `shell/` folder,
 the TypeScript code in the `lib/` folder, the documentation in `docs/`,
-or tests in the `spec/` and `spec-main/` folders.
+or tests in the `spec/` folder.
 
 See [pull requests](pull-requests.md) for more information.
 
diff --git a/docs/development/source-code-directory-structure.md b/docs/development/source-code-directory-structure.md
index a7d0105f7d..0daaf43144 100644
--- a/docs/development/source-code-directory-structure.md
+++ b/docs/development/source-code-directory-structure.md
@@ -72,8 +72,7 @@ Electron
 |       |         message loop into Chromium's message loop.
 |       └── api/ - The implementation of common APIs, and foundations of
 |                  Electron's built-in modules.
-├── spec/ - Components of Electron's test suite run in the renderer process.
-├── spec-main/ - Components of Electron's test suite run in the main process.
+├── spec/ - Components of Electron's test suite run in the main process.
 └── BUILD.gn - Building rules of Electron.
 ```
 
diff --git a/docs/development/testing.md b/docs/development/testing.md
index f170dc6c85..3a3f3ca58c 100644
--- a/docs/development/testing.md
+++ b/docs/development/testing.md
@@ -32,9 +32,6 @@ app (surprise!) that can be found in the `spec` folder. Note that it has
 its own `package.json` and that its dependencies are therefore not defined
 in the top-level `package.json`.
 
-To run only tests in a specific process, run `npm run test --runners=PROCESS`
-where `PROCESS` is one of `main` or `remote`.
-
 To run only specific tests matching a pattern, run `npm run test --
 -g=PATTERN`, replacing the `PATTERN` with a regex that matches the tests
 you would like to run. As an example: If you want to run only IPC tests, you
diff --git a/patches/chromium/disable_unload_metrics.patch b/patches/chromium/disable_unload_metrics.patch
index a5b8d7b438..df1ad9650e 100644
--- a/patches/chromium/disable_unload_metrics.patch
+++ b/patches/chromium/disable_unload_metrics.patch
@@ -15,8 +15,8 @@ Error message:
 ptype: expected 'browser' to equal 'renderer'
 Error stack trace:
 AssertionError: ptype: expected 'browser' to equal 'renderer'
-    at checkCrash (electron\spec-main\api-crash-reporter-spec.ts:39:35)
-    at Context.<anonymous> (electron\spec-main\api-crash-reporter-spec.ts:154:7)
+    at checkCrash (electron\spec\api-crash-reporter-spec.ts:39:35)
+    at Context.<anonymous> (electron\spec\api-crash-reporter-spec.ts:154:7)
     at runMicrotasks (<anonymous>)
     at processTicksAndRejections (internal/process/task_queues.js:93:5)
 
diff --git a/script/lint.js b/script/lint.js
index dba4607307..ebc3d41a59 100755
--- a/script/lint.js
+++ b/script/lint.js
@@ -23,7 +23,7 @@ process.env.PATH = `${process.env.PATH}${path.delimiter}${DEPOT_TOOLS}`;
 const IGNORELIST = new Set([
   ['shell', 'browser', 'resources', 'win', 'resource.h'],
   ['shell', 'common', 'node_includes.h'],
-  ['spec-main', 'fixtures', 'pages', 'jquery-3.6.0.min.js'],
+  ['spec', 'fixtures', 'pages', 'jquery-3.6.0.min.js'],
   ['spec', 'ts-smoke', 'electron', 'main.ts'],
   ['spec', 'ts-smoke', 'electron', 'renderer.ts'],
   ['spec', 'ts-smoke', 'runner.js']
@@ -113,8 +113,8 @@ const LINTERS = [{
   }
 }, {
   key: 'javascript',
-  roots: ['build', 'default_app', 'lib', 'npm', 'script', 'spec', 'spec-main'],
-  ignoreRoots: ['spec/node_modules', 'spec-main/node_modules'],
+  roots: ['build', 'default_app', 'lib', 'npm', 'script', 'spec'],
+  ignoreRoots: ['spec/node_modules'],
   test: filename => filename.endsWith('.js') || filename.endsWith('.ts'),
   run: async (opts, filenames) => {
     const eslint = new ESLint({
diff --git a/script/spec-runner.js b/script/spec-runner.js
index 590966f064..477a600fac 100755
--- a/script/spec-runner.js
+++ b/script/spec-runner.js
@@ -13,7 +13,7 @@ const fail = '✗'.red;
 
 const args = require('minimist')(process.argv, {
   string: ['runners', 'target'],
-  boolean: ['buildNativeTests', 'runTestFilesSeparately'],
+  boolean: ['buildNativeTests'],
   unknown: arg => unknownFlags.push(arg)
 });
 
@@ -34,7 +34,6 @@ const NPX_CMD = process.platform === 'win32' ? 'npx.cmd' : 'npx';
 
 const runners = new Map([
   ['main', { description: 'Main process specs', run: runMainProcessElectronTests }],
-  ['remote', { description: 'Remote based specs', run: runRemoteBasedElectronTests }],
   ['native', { description: 'Native specs', run: runNativeElectronTests }]
 ]);
 
@@ -60,7 +59,6 @@ async function main () {
 
   if (somethingChanged) {
     await installSpecModules(path.resolve(__dirname, '..', 'spec'));
-    await installSpecModules(path.resolve(__dirname, '..', 'spec-main'));
     await getSpecHash().then(saveSpecHash);
   }
 
@@ -154,26 +152,6 @@ const specFilter = (file) => {
   }
 };
 
-async function runTests (specDir, testName) {
-  if (args.runTestFilesSeparately) {
-    const getFiles = require('../spec/static/get-files');
-    const testFiles = await getFiles(path.resolve(__dirname, `../${specDir}`), { filter: specFilter });
-    const baseElectronDir = path.resolve(__dirname, '..');
-    unknownArgs.splice(unknownArgs.length, 0, '--files', '');
-    testFiles.sort().forEach(async (file) => {
-      unknownArgs.splice((unknownArgs.length - 1), 1, path.relative(baseElectronDir, file));
-      console.log(`Running tests for ${unknownArgs[unknownArgs.length - 1]}`);
-      await runTestUsingElectron(specDir, testName);
-    });
-  } else {
-    await runTestUsingElectron(specDir, testName);
-  }
-}
-
-async function runRemoteBasedElectronTests () {
-  await runTests('spec', 'remote');
-}
-
 async function runNativeElectronTests () {
   let testTargets = require('./native-test-targets.json');
   const outDir = `out/${utils.getOutDir()}`;
@@ -226,7 +204,7 @@ async function runNativeElectronTests () {
 }
 
 async function runMainProcessElectronTests () {
-  await runTests('spec-main', 'main');
+  await runTestUsingElectron('spec', 'main');
 }
 
 async function installSpecModules (dir) {
@@ -261,9 +239,7 @@ function getSpecHash () {
     (async () => {
       const hasher = crypto.createHash('SHA256');
       hasher.update(fs.readFileSync(path.resolve(__dirname, '../spec/package.json')));
-      hasher.update(fs.readFileSync(path.resolve(__dirname, '../spec-main/package.json')));
       hasher.update(fs.readFileSync(path.resolve(__dirname, '../spec/yarn.lock')));
-      hasher.update(fs.readFileSync(path.resolve(__dirname, '../spec-main/yarn.lock')));
       hasher.update(fs.readFileSync(path.resolve(__dirname, '../script/spec-runner.js')));
       return hasher.digest('hex');
     })(),
diff --git a/spec-main/.eslintrc b/spec-main/.eslintrc
deleted file mode 100644
index 60be8a0dac..0000000000
--- a/spec-main/.eslintrc
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "env": {
-    "browser": true,
-    "mocha": true,
-    "serviceworker": true
-  },
-  "globals": {
-    "Bindings": true,
-    "Components": true,
-    "UI": true,
-    "WebView": true
-  },
-  "plugins": [
-    "mocha"
-  ],
-  "rules": {
-    "mocha/no-exclusive-tests": "error"
-  }
-}
diff --git a/spec-main/package.json b/spec-main/package.json
deleted file mode 100644
index 1635e32313..0000000000
--- a/spec-main/package.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "name": "electron-test-main",
-  "productName": "Electron Test Main",
-  "main": "index.js",
-  "version": "0.1.0",
-  "devDependencies": {
-    "@electron-ci/echo": "file:./fixtures/native-addon/echo",
-    "@electron-ci/uv-dlopen": "file:./fixtures/native-addon/uv-dlopen/",
-    "@types/sinon": "^9.0.4",
-    "@types/ws": "^7.2.0",
-    "busboy": "^0.3.1",
-    "q": "^1.5.1",
-    "sinon": "^9.0.1",
-    "ws": "^7.4.6"
-  },
-  "dependencies": {
-    "chai-as-promised": "^7.1.1",
-    "dirty-chai": "^2.0.1",
-    "get-image-colors": "^4.0.0",
-    "pdfjs-dist": "^2.2.228"
-  }
-}
diff --git a/spec-main/yarn.lock b/spec-main/yarn.lock
deleted file mode 100644
index 070872b807..0000000000
--- a/spec-main/yarn.lock
+++ /dev/null
@@ -1,982 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@electron-ci/echo@file:./fixtures/native-addon/echo":
-  version "0.0.1"
-
-"@electron-ci/uv-dlopen@file:./fixtures/native-addon/uv-dlopen":
-  version "0.0.1"
-
-"@sinonjs/commons@^1", "@sinonjs/commons@^1.6.0", "@sinonjs/commons@^1.7.0", "@sinonjs/commons@^1.7.2":
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.0.tgz#c8d68821a854c555bba172f3b06959a0039b236d"
-  integrity sha512-wEj54PfsZ5jGSwMX68G8ZXFawcSglQSXqCftWX3ec8MDUzQdHgcKvw97awHbY0efQEL5iKUOAmmVtoYgmrSG4Q==
-  dependencies:
-    type-detect "4.0.8"
-
-"@sinonjs/fake-timers@^6.0.0", "@sinonjs/fake-timers@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz#293674fccb3262ac782c7aadfdeca86b10c75c40"
-  integrity sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==
-  dependencies:
-    "@sinonjs/commons" "^1.7.0"
-
-"@sinonjs/formatio@^5.0.1":
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-5.0.1.tgz#f13e713cb3313b1ab965901b01b0828ea6b77089"
-  integrity sha512-KaiQ5pBf1MpS09MuA0kp6KBQt2JUOQycqVG1NZXvzeaXe5LGFqAKueIS0bw4w0P9r7KuBSVdUk5QjXsUdu2CxQ==
-  dependencies:
-    "@sinonjs/commons" "^1"
-    "@sinonjs/samsam" "^5.0.2"
-
-"@sinonjs/samsam@^5.0.2", "@sinonjs/samsam@^5.0.3":
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-5.0.3.tgz#86f21bdb3d52480faf0892a480c9906aa5a52938"
-  integrity sha512-QucHkc2uMJ0pFGjJUDP3F9dq5dx8QIaqISl9QgwLOh6P9yv877uONPGXh/OH/0zmM3tW1JjuJltAZV2l7zU+uQ==
-  dependencies:
-    "@sinonjs/commons" "^1.6.0"
-    lodash.get "^4.4.2"
-    type-detect "^4.0.8"
-
-"@sinonjs/text-encoding@^0.7.1":
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5"
-  integrity sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==
-
-"@types/node@*":
-  version "13.7.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.7.0.tgz#b417deda18cf8400f278733499ad5547ed1abec4"
-  integrity sha512-GnZbirvmqZUzMgkFn70c74OQpTTUcCzlhQliTzYjQMqg+hVKcDnxdL19Ne3UdYzdMA/+W3eb646FWn/ZaT1NfQ==
-
-"@types/sinon@^9.0.4":
-  version "9.0.4"
-  resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-9.0.4.tgz#e934f904606632287a6e7f7ab0ce3f08a0dad4b1"
-  integrity sha512-sJmb32asJZY6Z2u09bl0G2wglSxDlROlAejCjsnor+LzBMz17gu8IU7vKC/vWDnv9zEq2wqADHVXFjf4eE8Gdw==
-  dependencies:
-    "@types/sinonjs__fake-timers" "*"
-
-"@types/sinonjs__fake-timers@*":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.1.tgz#681df970358c82836b42f989188d133e218c458e"
-  integrity sha512-yYezQwGWty8ziyYLdZjwxyMb0CZR49h8JALHGrxjQHWlqGgc8kLdHEgWrgL0uZ29DMvEVBDnHU2Wg36zKSIUtA==
-
-"@types/ws@^7.2.0":
-  version "7.2.1"
-  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-7.2.1.tgz#b800f2b8aee694e2b581113643e20d79dd3b8556"
-  integrity sha512-UEmRNbXFGvfs/sLncf01GuVv6U1mZP3Df0iXWx4kUlikJxbFyFADp95mDn1XDTE2mXpzzoHcKlfFcbytLq4vaA==
-  dependencies:
-    "@types/node" "*"
-
-ajv-keywords@^3.1.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
-  integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
-
-ajv@^6.1.0, ajv@^6.12.3:
-  version "6.12.6"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
-  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-asn1@~0.2.3:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"
-  integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==
-  dependencies:
-    safer-buffer "~2.1.0"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
-
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
-
-aws4@^1.8.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
-  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
-
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
-  dependencies:
-    tweetnacl "^0.14.3"
-
-big.js@^5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
-  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
-
-boolbase@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
-  integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
-
-busboy@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/busboy/-/busboy-0.3.1.tgz#170899274c5bf38aae27d5c62b71268cd585fd1b"
-  integrity sha512-y7tTxhGKXcyBxRKAni+awqx8uqaJKrSFSNFSeRG5CsWNdmy2BIK+6VGWEW7TZnIO/533mtMEA4rOevQV815YJw==
-  dependencies:
-    dicer "0.3.0"
-
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
-
-chai-as-promised@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-7.1.1.tgz#08645d825deb8696ee61725dbf590c012eb00ca0"
-  integrity sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==
-  dependencies:
-    check-error "^1.0.2"
-
-check-error@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
-  integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=
-
-cheerio@^0.22.0:
-  version "0.22.0"
-  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e"
-  integrity sha1-qbqoYKP5tZWmuBsahocxIe06Jp4=
-  dependencies:
-    css-select "~1.2.0"
-    dom-serializer "~0.1.0"
-    entities "~1.1.1"
-    htmlparser2 "^3.9.1"
-    lodash.assignin "^4.0.9"
-    lodash.bind "^4.1.4"
-    lodash.defaults "^4.0.1"
-    lodash.filter "^4.4.0"
-    lodash.flatten "^4.2.0"
-    lodash.foreach "^4.3.0"
-    lodash.map "^4.4.0"
-    lodash.merge "^4.4.0"
-    lodash.pick "^4.2.1"
-    lodash.reduce "^4.4.0"
-    lodash.reject "^4.4.0"
-    lodash.some "^4.4.0"
-
-chroma-js@^1.1.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/chroma-js/-/chroma-js-1.4.1.tgz#eb2d9c4d1ff24616be84b35119f4d26f8205f134"
-  integrity sha512-jTwQiT859RTFN/vIf7s+Vl/Z2LcMrvMv3WUFmd/4u76AdlFC0NTNgqEEFPcRiHmAswPsMiQEDZLM8vX8qXpZNQ==
-
-chroma-js@^2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/chroma-js/-/chroma-js-2.1.2.tgz#1075cb9ae25bcb2017c109394168b5cf3aa500ec"
-  integrity sha512-ri/ouYDWuxfus3UcaMxC1Tfp3IE9K5iQzxc2hSxbBRVNQFut1UuGAsZmiAf2mOUubzGJwgMSv9lHg+XqLaz1QQ==
-  dependencies:
-    cross-env "^6.0.3"
-
-combined-stream@^1.0.6, combined-stream@~1.0.6:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  dependencies:
-    delayed-stream "~1.0.0"
-
-core-util-is@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
-
-cross-env@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-6.0.3.tgz#4256b71e49b3a40637a0ce70768a6ef5c72ae941"
-  integrity sha512-+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag==
-  dependencies:
-    cross-spawn "^7.0.0"
-
-cross-spawn@^7.0.0:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
-  dependencies:
-    path-key "^3.1.0"
-    shebang-command "^2.0.0"
-    which "^2.0.1"
-
-css-select@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
-  integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=
-  dependencies:
-    boolbase "~1.0.0"
-    css-what "2.1"
-    domutils "1.5.1"
-    nth-check "~1.0.1"
-
-css-what@2.1:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
-  integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==
-
-cwise-compiler@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/cwise-compiler/-/cwise-compiler-1.1.3.tgz#f4d667410e850d3a313a7d2db7b1e505bb034cc5"
-  integrity sha1-9NZnQQ6FDToxOn0tt7HlBbsDTMU=
-  dependencies:
-    uniq "^1.0.0"
-
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
-  dependencies:
-    assert-plus "^1.0.0"
-
-data-uri-to-buffer@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-0.0.3.tgz#18ae979a6a0ca994b0625853916d2662bbae0b1a"
-  integrity sha1-GK6XmmoMqZSwYlhTkW0mYruuCxo=
-
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
-
-dicer@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/dicer/-/dicer-0.3.0.tgz#eacd98b3bfbf92e8ab5c2fdb71aaac44bb06b872"
-  integrity sha512-MdceRRWqltEG2dZqO769g27N/3PXfcKl04VhYnBlo2YhH7zPi88VebsjTKclaOyiuMaGU72hTfw3VkUitGcVCA==
-  dependencies:
-    streamsearch "0.1.2"
-
-diff@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
-  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
-
-dirty-chai@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/dirty-chai/-/dirty-chai-2.0.1.tgz#6b2162ef17f7943589da840abc96e75bda01aff3"
-  integrity sha512-ys79pWKvDMowIDEPC6Fig8d5THiC0DJ2gmTeGzVAoEH18J8OzLud0Jh7I9IWg3NSk8x2UocznUuFmfHCXYZx9w==
-
-dom-serializer@0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
-  integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==
-  dependencies:
-    domelementtype "^2.0.1"
-    entities "^2.0.0"
-
-dom-serializer@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0"
-  integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==
-  dependencies:
-    domelementtype "^1.3.0"
-    entities "^1.1.1"
-
-domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
-  integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
-
-domelementtype@^2.0.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"
-  integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==
-
-domhandler@^2.3.0:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
-  integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==
-  dependencies:
-    domelementtype "1"
-
-domutils@1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
-  integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=
-  dependencies:
-    dom-serializer "0"
-    domelementtype "1"
-
-domutils@^1.5.1:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
-  integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
-  dependencies:
-    dom-serializer "0"
-    domelementtype "1"
-
-ecc-jsbn@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
-  dependencies:
-    jsbn "~0.1.0"
-    safer-buffer "^2.1.0"
-
-emojis-list@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
-  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
-
-entities@^1.1.1, entities@~1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
-  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
-
-entities@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
-  integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
-
-extend@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
-extsprintf@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
-
-extsprintf@^1.2.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07"
-  integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==
-
-fast-deep-equal@^3.1.1:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
-  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
-
-fast-json-stable-stringify@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
-  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
-
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
-
-form-data@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
-  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
-
-get-image-colors@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/get-image-colors/-/get-image-colors-4.0.0.tgz#c8fe161c386b5ae6300d953eac6bccc05a56069d"
-  integrity sha512-qQZ5vyqgJkQp1c8ZRwKGL03oDsyBBUKiwr4GbB2T4F+tHpfQrw1PjKMQai7jcjRdC2wIHl2rV+6ZuHKttpyk7A==
-  dependencies:
-    chroma-js "^2.1.0"
-    get-pixels "^3.3.2"
-    get-rgba-palette "^2.0.1"
-    get-svg-colors "^1.5.1"
-    pify "^5.0.0"
-
-get-pixels@^3.3.2:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/get-pixels/-/get-pixels-3.3.3.tgz#71e2dfd4befb810b5478a61c6354800976ce01c7"
-  integrity sha512-5kyGBn90i9tSMUVHTqkgCHsoWoR+/lGbl4yC83Gefyr0HLIhgSWEx/2F/3YgsZ7UpYNuM6pDhDK7zebrUJ5nXg==
-  dependencies:
-    data-uri-to-buffer "0.0.3"
-    jpeg-js "^0.4.1"
-    mime-types "^2.0.1"
-    ndarray "^1.0.13"
-    ndarray-pack "^1.1.1"
-    node-bitmap "0.0.1"
-    omggif "^1.0.5"
-    parse-data-uri "^0.2.0"
-    pngjs "^3.3.3"
-    request "^2.44.0"
-    through "^2.3.4"
-
-get-rgba-palette@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/get-rgba-palette/-/get-rgba-palette-2.0.1.tgz#5ce70f75c6ef52882f54dd079e5ed68b5a2323ca"
-  integrity sha1-XOcPdcbvUogvVN0Hnl7Wi1ojI8o=
-  dependencies:
-    quantize "^1.0.1"
-
-get-svg-colors@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/get-svg-colors/-/get-svg-colors-1.5.1.tgz#59f4004f5fb4fc0b0eaaec36dce004b3b10f188b"
-  integrity sha512-G3gXrkLrlmv2gqZvs05ap/kcGbchhNtUNaoaP6dIefRcrGPqSa17dGp5ap/2yN8Xs2Wi5mWn16Ww+nFuVU8lTw==
-  dependencies:
-    cheerio "^0.22.0"
-    chroma-js "^1.1.1"
-    is-svg "^3.0.0"
-    lodash.compact "^3.0.0"
-    lodash.uniq "^4.5.0"
-
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
-  dependencies:
-    assert-plus "^1.0.0"
-
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
-
-har-validator@~5.1.3:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
-  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
-  dependencies:
-    ajv "^6.12.3"
-    har-schema "^2.0.0"
-
-has-flag@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
-  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
-
-html-comment-regex@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7"
-  integrity sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==
-
-htmlparser2@^3.9.1:
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
-  integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
-  dependencies:
-    domelementtype "^1.3.1"
-    domhandler "^2.3.0"
-    domutils "^1.5.1"
-    entities "^1.1.1"
-    inherits "^2.0.1"
-    readable-stream "^3.1.1"
-
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
-inherits@^2.0.1, inherits@^2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-iota-array@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/iota-array/-/iota-array-1.0.0.tgz#81ef57fe5d05814cd58c2483632a99c30a0e8087"
-  integrity sha1-ge9X/l0FgUzVjCSDYyqZwwoOgIc=
-
-is-buffer@^1.0.2:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
-is-svg@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-3.0.0.tgz#9321dbd29c212e5ca99c4fa9794c714bcafa2f75"
-  integrity sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==
-  dependencies:
-    html-comment-regex "^1.1.0"
-
-is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
-
-isarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
-
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
-
-jpeg-js@^0.4.1:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.4.4.tgz#a9f1c6f1f9f0fa80cdb3484ed9635054d28936aa"
-  integrity sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==
-
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
-
-json-schema-traverse@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
-
-json-schema@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
-  integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
-
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
-
-json5@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
-  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
-  dependencies:
-    minimist "^1.2.0"
-
-jsprim@^1.2.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb"
-  integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.4.0"
-    verror "1.10.0"
-
-just-extend@^4.0.2:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.1.0.tgz#7278a4027d889601640ee0ce0e5a00b992467da4"
-  integrity sha512-ApcjaOdVTJ7y4r08xI5wIqpvwS48Q0PBG4DJROcEkH1f8MdAiNFyFxz3xoL0LWAVwjrwPYZdVHHxhRHcx/uGLA==
-
-loader-utils@^1.0.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
-  integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
-  dependencies:
-    big.js "^5.2.2"
-    emojis-list "^2.0.0"
-    json5 "^1.0.1"
-
-lodash.assignin@^4.0.9:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"
-  integrity sha1-uo31+4QesKPoBEIysOJjqNxqKKI=
-
-lodash.bind@^4.1.4:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/lodash.bind/-/lodash.bind-4.2.1.tgz#7ae3017e939622ac31b7d7d7dcb1b34db1690d35"
-  integrity sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU=
-
-lodash.compact@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.compact/-/lodash.compact-3.0.1.tgz#540ce3837745975807471e16b4a2ba21e7256ca5"
-  integrity sha1-VAzjg3dFl1gHRx4WtKK6IeclbKU=
-
-lodash.defaults@^4.0.1:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
-  integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=
-
-lodash.filter@^4.4.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace"
-  integrity sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4=
-
-lodash.flatten@^4.2.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
-  integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=
-
-lodash.foreach@^4.3.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53"
-  integrity sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=
-
-lodash.get@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
-  integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
-
-lodash.map@^4.4.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
-  integrity sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=
-
-lodash.merge@^4.4.0:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
-  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
-
-lodash.pick@^4.2.1:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
-  integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=
-
-lodash.reduce@^4.4.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b"
-  integrity sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs=
-
-lodash.reject@^4.4.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.reject/-/lodash.reject-4.6.0.tgz#80d6492dc1470864bbf583533b651f42a9f52415"
-  integrity sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU=
-
-lodash.some@^4.4.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"
-  integrity sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=
-
-lodash.uniq@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
-  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
-
-mime-db@1.51.0:
-  version "1.51.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c"
-  integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==
-
-mime-types@^2.0.1, mime-types@^2.1.12, mime-types@~2.1.19:
-  version "2.1.34"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24"
-  integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==
-  dependencies:
-    mime-db "1.51.0"
-
-minimist@^1.2.0:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
-  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
-
-ndarray-pack@^1.1.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ndarray-pack/-/ndarray-pack-1.2.1.tgz#8caebeaaa24d5ecf70ff86020637977da8ee585a"
-  integrity sha1-jK6+qqJNXs9w/4YCBjeXfajuWFo=
-  dependencies:
-    cwise-compiler "^1.1.2"
-    ndarray "^1.0.13"
-
-ndarray@^1.0.13:
-  version "1.0.19"
-  resolved "https://registry.yarnpkg.com/ndarray/-/ndarray-1.0.19.tgz#6785b5f5dfa58b83e31ae5b2a058cfd1ab3f694e"
-  integrity sha512-B4JHA4vdyZU30ELBw3g7/p9bZupyew5a7tX1Y/gGeF2hafrPaQZhgrGQfsvgfYbgdFZjYwuEcnaobeM/WMW+HQ==
-  dependencies:
-    iota-array "^1.0.0"
-    is-buffer "^1.0.2"
-
-nise@^4.0.1:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/nise/-/nise-4.0.3.tgz#9f79ff02fa002ed5ffbc538ad58518fa011dc913"
-  integrity sha512-EGlhjm7/4KvmmE6B/UFsKh7eHykRl9VH+au8dduHLCyWUO/hr7+N+WtTvDUwc9zHuM1IaIJs/0lQ6Ag1jDkQSg==
-  dependencies:
-    "@sinonjs/commons" "^1.7.0"
-    "@sinonjs/fake-timers" "^6.0.0"
-    "@sinonjs/text-encoding" "^0.7.1"
-    just-extend "^4.0.2"
-    path-to-regexp "^1.7.0"
-
-node-bitmap@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/node-bitmap/-/node-bitmap-0.0.1.tgz#180eac7003e0c707618ef31368f62f84b2a69091"
-  integrity sha1-GA6scAPgxwdhjvMTaPYvhLKmkJE=
-
-node-ensure@^0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/node-ensure/-/node-ensure-0.0.0.tgz#ecae764150de99861ec5c810fd5d096b183932a7"
-  integrity sha1-7K52QVDemYYexcgQ/V0Jaxg5Mqc=
-
-nth-check@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
-  integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==
-  dependencies:
-    boolbase "~1.0.0"
-
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-
-omggif@^1.0.5:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/omggif/-/omggif-1.0.10.tgz#ddaaf90d4a42f532e9e7cb3a95ecdd47f17c7b19"
-  integrity sha512-LMJTtvgc/nugXj0Vcrrs68Mn2D1r0zf630VNtqtpI1FEO7e+O9FP4gqs9AcnBaSEeoHIPm28u6qgPR0oyEpGSw==
-
-parse-data-uri@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/parse-data-uri/-/parse-data-uri-0.2.0.tgz#bf04d851dd5c87b0ab238e5d01ace494b604b4c9"
-  integrity sha1-vwTYUd1ch7CrI45dAazklLYEtMk=
-  dependencies:
-    data-uri-to-buffer "0.0.3"
-
-path-key@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
-  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
-
-path-to-regexp@^1.7.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
-  integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==
-  dependencies:
-    isarray "0.0.1"
-
-pdfjs-dist@^2.2.228:
-  version "2.2.228"
-  resolved "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-2.2.228.tgz#777b068a0a16c96418433303807c183058b47aaa"
-  integrity sha512-W5LhYPMS2UKX0ELIa4u+CFCMoox5qQNQElt0bAK2mwz1V8jZL0rvLao+0tBujce84PK6PvWG36Nwr7agCCWFGQ==
-  dependencies:
-    node-ensure "^0.0.0"
-    worker-loader "^2.0.0"
-
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
-
-pify@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-5.0.0.tgz#1f5eca3f5e87ebec28cc6d54a0e4aaf00acc127f"
-  integrity sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==
-
-pngjs@^3.3.3:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f"
-  integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==
-
-psl@^1.1.28:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
-  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
-
-punycode@^2.1.0, punycode@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-
-q@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
-  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
-
-qs@~6.5.2:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
-  integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
-
-quantize@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/quantize/-/quantize-1.0.2.tgz#d25ac200a77b6d70f40127ca171a10e33c8546de"
-  integrity sha1-0lrCAKd7bXD0ASfKFxoQ4zyFRt4=
-
-readable-stream@^3.1.1:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
-request@^2.44.0:
-  version "2.88.2"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
-  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.3"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
-safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
-safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
-schema-utils@^0.4.0:
-  version "0.4.7"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
-  integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
-  dependencies:
-    ajv "^6.1.0"
-    ajv-keywords "^3.1.0"
-
-shebang-command@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
-  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
-  dependencies:
-    shebang-regex "^3.0.0"
-
-shebang-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
-  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
-
-sinon@^9.0.1:
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/sinon/-/sinon-9.0.2.tgz#b9017e24633f4b1c98dfb6e784a5f0509f5fd85d"
-  integrity sha512-0uF8Q/QHkizNUmbK3LRFqx5cpTttEVXudywY9Uwzy8bTfZUhljZ7ARzSxnRHWYWtVTeh4Cw+tTb3iU21FQVO9A==
-  dependencies:
-    "@sinonjs/commons" "^1.7.2"
-    "@sinonjs/fake-timers" "^6.0.1"
-    "@sinonjs/formatio" "^5.0.1"
-    "@sinonjs/samsam" "^5.0.3"
-    diff "^4.0.2"
-    nise "^4.0.1"
-    supports-color "^7.1.0"
-
-sshpk@^1.7.0:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5"
-  integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    bcrypt-pbkdf "^1.0.0"
-    dashdash "^1.12.0"
-    ecc-jsbn "~0.1.1"
-    getpass "^0.1.1"
-    jsbn "~0.1.0"
-    safer-buffer "^2.0.2"
-    tweetnacl "~0.14.0"
-
-streamsearch@0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a"
-  integrity sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo=
-
-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
-supports-color@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
-  integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
-  dependencies:
-    has-flag "^4.0.0"
-
-through@^2.3.4:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
-
-tough-cookie@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
-  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
-  dependencies:
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
-
-type-detect@4.0.8, type-detect@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
-  integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
-
-uniq@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
-  integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
-
-uri-js@^4.2.2:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
-  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
-  dependencies:
-    punycode "^2.1.0"
-
-util-deprecate@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
-
-uuid@^3.3.2:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
-  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
-
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
-which@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
-  dependencies:
-    isexe "^2.0.0"
-
-worker-loader@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/worker-loader/-/worker-loader-2.0.0.tgz#45fda3ef76aca815771a89107399ee4119b430ac"
-  integrity sha512-tnvNp4K3KQOpfRnD20m8xltE3eWh89Ye+5oj7wXEEHKac1P4oZ6p9oTj8/8ExqoSBnk9nu5Pr4nKfQ1hn2APJw==
-  dependencies:
-    loader-utils "^1.0.0"
-    schema-utils "^0.4.0"
-
-ws@^7.4.6:
-  version "7.4.6"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
-  integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
diff --git a/spec-main/.gitignore b/spec/.gitignore
similarity index 100%
rename from spec-main/.gitignore
rename to spec/.gitignore
diff --git a/spec-main/ambient.d.ts b/spec/ambient.d.ts
similarity index 100%
rename from spec-main/ambient.d.ts
rename to spec/ambient.d.ts
diff --git a/spec-main/api-app-spec.ts b/spec/api-app-spec.ts
similarity index 99%
rename from spec-main/api-app-spec.ts
rename to spec/api-app-spec.ts
index a08df928fa..574db87f90 100644
--- a/spec-main/api-app-spec.ts
+++ b/spec/api-app-spec.ts
@@ -12,7 +12,7 @@ import { closeWindow, closeAllWindows } from './window-helpers';
 import { ifdescribe, ifit, waitUntil } from './spec-helpers';
 import split = require('split')
 
-const fixturesPath = path.resolve(__dirname, '../spec/fixtures');
+const fixturesPath = path.resolve(__dirname, 'fixtures');
 
 describe('electron module', () => {
   it('does not expose internal modules to require', () => {
diff --git a/spec-main/api-auto-updater-spec.ts b/spec/api-auto-updater-spec.ts
similarity index 100%
rename from spec-main/api-auto-updater-spec.ts
rename to spec/api-auto-updater-spec.ts
diff --git a/spec-main/api-autoupdater-darwin-spec.ts b/spec/api-autoupdater-darwin-spec.ts
similarity index 100%
rename from spec-main/api-autoupdater-darwin-spec.ts
rename to spec/api-autoupdater-darwin-spec.ts
diff --git a/spec-main/api-browser-view-spec.ts b/spec/api-browser-view-spec.ts
similarity index 99%
rename from spec-main/api-browser-view-spec.ts
rename to spec/api-browser-view-spec.ts
index 3352c06e99..e71f47b735 100644
--- a/spec-main/api-browser-view-spec.ts
+++ b/spec/api-browser-view-spec.ts
@@ -7,7 +7,7 @@ import { defer, ifit, startRemoteControlApp } from './spec-helpers';
 import { areColorsSimilar, captureScreen, getPixelColor } from './screen-helpers';
 
 describe('BrowserView module', () => {
-  const fixtures = path.resolve(__dirname, '..', 'spec', 'fixtures');
+  const fixtures = path.resolve(__dirname, 'fixtures');
 
   let w: BrowserWindow;
   let view: BrowserView;
diff --git a/spec-main/api-browser-window-spec.ts b/spec/api-browser-window-spec.ts
similarity index 99%
rename from spec-main/api-browser-window-spec.ts
rename to spec/api-browser-window-spec.ts
index a0cf1f5b98..4d3463eb67 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec/api-browser-window-spec.ts
@@ -13,7 +13,7 @@ import { closeWindow, closeAllWindows } from './window-helpers';
 import { areColorsSimilar, captureScreen, CHROMA_COLOR_HEX, getPixelColor } from './screen-helpers';
 
 const features = process._linkedBinding('electron_common_features');
-const fixtures = path.resolve(__dirname, '..', 'spec', 'fixtures');
+const fixtures = path.resolve(__dirname, 'fixtures');
 const mainFixtures = path.resolve(__dirname, 'fixtures');
 
 // Is the display's scale factor possibly causing rounding of pixel coordinate
@@ -59,7 +59,7 @@ describe('BrowserWindow module', () => {
     });
 
     ifit(process.platform === 'linux')('does not crash when setting large window icons', async () => {
-      const appPath = path.join(__dirname, 'spec-main', 'fixtures', 'apps', 'xwindow-icon');
+      const appPath = path.join(fixtures, 'apps', 'xwindow-icon');
       const appProcess = childProcess.spawn(process.execPath, [appPath]);
       await new Promise((resolve) => { appProcess.once('exit', resolve); });
     });
diff --git a/spec-main/api-clipboard-spec.ts b/spec/api-clipboard-spec.ts
similarity index 100%
rename from spec-main/api-clipboard-spec.ts
rename to spec/api-clipboard-spec.ts
diff --git a/spec-main/api-content-tracing-spec.ts b/spec/api-content-tracing-spec.ts
similarity index 100%
rename from spec-main/api-content-tracing-spec.ts
rename to spec/api-content-tracing-spec.ts
diff --git a/spec-main/api-context-bridge-spec.ts b/spec/api-context-bridge-spec.ts
similarity index 100%
rename from spec-main/api-context-bridge-spec.ts
rename to spec/api-context-bridge-spec.ts
diff --git a/spec-main/api-crash-reporter-spec.ts b/spec/api-crash-reporter-spec.ts
similarity index 99%
rename from spec-main/api-crash-reporter-spec.ts
rename to spec/api-crash-reporter-spec.ts
index 85609546d8..df082327fb 100644
--- a/spec-main/api-crash-reporter-spec.ts
+++ b/spec/api-crash-reporter-spec.ts
@@ -610,7 +610,7 @@ ifdescribe(!isLinuxOnArm && !process.mas && !process.env.DISABLE_CRASH_REPORTER_
 
   describe('when not started', () => {
     it('does not prevent process from crashing', async () => {
-      const appPath = path.join(__dirname, '..', 'spec', 'fixtures', 'api', 'cookie-app');
+      const appPath = path.join(__dirname, 'fixtures', 'api', 'cookie-app');
       await runApp(appPath);
     });
   });
diff --git a/spec-main/api-debugger-spec.ts b/spec/api-debugger-spec.ts
similarity index 99%
rename from spec-main/api-debugger-spec.ts
rename to spec/api-debugger-spec.ts
index a37f45b67b..aff035a6c9 100644
--- a/spec-main/api-debugger-spec.ts
+++ b/spec/api-debugger-spec.ts
@@ -7,7 +7,7 @@ import { closeAllWindows } from './window-helpers';
 import { emittedOnce, emittedUntil } from './events-helpers';
 
 describe('debugger module', () => {
-  const fixtures = path.resolve(__dirname, '..', 'spec', 'fixtures');
+  const fixtures = path.resolve(__dirname, 'fixtures');
   let w: BrowserWindow;
 
   beforeEach(() => {
diff --git a/spec-main/api-desktop-capturer-spec.ts b/spec/api-desktop-capturer-spec.ts
similarity index 100%
rename from spec-main/api-desktop-capturer-spec.ts
rename to spec/api-desktop-capturer-spec.ts
diff --git a/spec-main/api-dialog-spec.ts b/spec/api-dialog-spec.ts
similarity index 100%
rename from spec-main/api-dialog-spec.ts
rename to spec/api-dialog-spec.ts
diff --git a/spec-main/api-global-shortcut-spec.ts b/spec/api-global-shortcut-spec.ts
similarity index 100%
rename from spec-main/api-global-shortcut-spec.ts
rename to spec/api-global-shortcut-spec.ts
diff --git a/spec-main/api-in-app-purchase-spec.ts b/spec/api-in-app-purchase-spec.ts
similarity index 100%
rename from spec-main/api-in-app-purchase-spec.ts
rename to spec/api-in-app-purchase-spec.ts
diff --git a/spec-main/api-ipc-main-spec.ts b/spec/api-ipc-main-spec.ts
similarity index 100%
rename from spec-main/api-ipc-main-spec.ts
rename to spec/api-ipc-main-spec.ts
diff --git a/spec-main/api-ipc-renderer-spec.ts b/spec/api-ipc-renderer-spec.ts
similarity index 99%
rename from spec-main/api-ipc-renderer-spec.ts
rename to spec/api-ipc-renderer-spec.ts
index 81d62bf47b..16f2d15a8a 100644
--- a/spec-main/api-ipc-renderer-spec.ts
+++ b/spec/api-ipc-renderer-spec.ts
@@ -5,7 +5,7 @@ import { emittedOnce } from './events-helpers';
 import { closeWindow } from './window-helpers';
 
 describe('ipcRenderer module', () => {
-  const fixtures = path.join(__dirname, '..', 'spec', 'fixtures');
+  const fixtures = path.join(__dirname, 'fixtures');
 
   let w: BrowserWindow;
   before(async () => {
diff --git a/spec-main/api-ipc-spec.ts b/spec/api-ipc-spec.ts
similarity index 100%
rename from spec-main/api-ipc-spec.ts
rename to spec/api-ipc-spec.ts
diff --git a/spec-main/api-menu-item-spec.ts b/spec/api-menu-item-spec.ts
similarity index 100%
rename from spec-main/api-menu-item-spec.ts
rename to spec/api-menu-item-spec.ts
diff --git a/spec-main/api-menu-spec.ts b/spec/api-menu-spec.ts
similarity index 100%
rename from spec-main/api-menu-spec.ts
rename to spec/api-menu-spec.ts
diff --git a/spec-main/api-native-image-spec.ts b/spec/api-native-image-spec.ts
similarity index 99%
rename from spec-main/api-native-image-spec.ts
rename to spec/api-native-image-spec.ts
index 57b09ec8f6..65449733a9 100644
--- a/spec-main/api-native-image-spec.ts
+++ b/spec/api-native-image-spec.ts
@@ -4,7 +4,7 @@ import { ifdescribe, ifit } from './spec-helpers';
 import * as path from 'path';
 
 describe('nativeImage module', () => {
-  const fixturesPath = path.join(__dirname, '..', 'spec', 'fixtures');
+  const fixturesPath = path.join(__dirname, 'fixtures');
 
   const imageLogo = {
     path: path.join(fixturesPath, 'assets', 'logo.png'),
diff --git a/spec-main/api-native-theme-spec.ts b/spec/api-native-theme-spec.ts
similarity index 100%
rename from spec-main/api-native-theme-spec.ts
rename to spec/api-native-theme-spec.ts
diff --git a/spec-main/api-net-log-spec.ts b/spec/api-net-log-spec.ts
similarity index 100%
rename from spec-main/api-net-log-spec.ts
rename to spec/api-net-log-spec.ts
diff --git a/spec-main/api-net-spec.ts b/spec/api-net-spec.ts
similarity index 100%
rename from spec-main/api-net-spec.ts
rename to spec/api-net-spec.ts
diff --git a/spec-main/api-notification-dbus-spec.ts b/spec/api-notification-dbus-spec.ts
similarity index 100%
rename from spec-main/api-notification-dbus-spec.ts
rename to spec/api-notification-dbus-spec.ts
diff --git a/spec-main/api-notification-spec.ts b/spec/api-notification-spec.ts
similarity index 100%
rename from spec-main/api-notification-spec.ts
rename to spec/api-notification-spec.ts
diff --git a/spec-main/api-power-monitor-spec.ts b/spec/api-power-monitor-spec.ts
similarity index 100%
rename from spec-main/api-power-monitor-spec.ts
rename to spec/api-power-monitor-spec.ts
diff --git a/spec-main/api-power-save-blocker-spec.ts b/spec/api-power-save-blocker-spec.ts
similarity index 100%
rename from spec-main/api-power-save-blocker-spec.ts
rename to spec/api-power-save-blocker-spec.ts
diff --git a/spec-main/api-process-spec.ts b/spec/api-process-spec.ts
similarity index 100%
rename from spec-main/api-process-spec.ts
rename to spec/api-process-spec.ts
diff --git a/spec-main/api-protocol-spec.ts b/spec/api-protocol-spec.ts
similarity index 99%
rename from spec-main/api-protocol-spec.ts
rename to spec/api-protocol-spec.ts
index 980c289cb1..01171676da 100644
--- a/spec-main/api-protocol-spec.ts
+++ b/spec/api-protocol-spec.ts
@@ -14,7 +14,7 @@ import { emittedOnce } from './events-helpers';
 import { WebmGenerator } from './video-helpers';
 import { delay } from './spec-helpers';
 
-const fixturesPath = path.resolve(__dirname, '..', 'spec', 'fixtures');
+const fixturesPath = path.resolve(__dirname, 'fixtures');
 
 const registerStringProtocol = protocol.registerStringProtocol;
 const registerBufferProtocol = protocol.registerBufferProtocol;
diff --git a/spec-main/api-safe-storage-spec.ts b/spec/api-safe-storage-spec.ts
similarity index 100%
rename from spec-main/api-safe-storage-spec.ts
rename to spec/api-safe-storage-spec.ts
diff --git a/spec-main/api-screen-spec.ts b/spec/api-screen-spec.ts
similarity index 100%
rename from spec-main/api-screen-spec.ts
rename to spec/api-screen-spec.ts
diff --git a/spec-main/api-service-workers-spec.ts b/spec/api-service-workers-spec.ts
similarity index 100%
rename from spec-main/api-service-workers-spec.ts
rename to spec/api-service-workers-spec.ts
diff --git a/spec-main/api-session-spec.ts b/spec/api-session-spec.ts
similarity index 99%
rename from spec-main/api-session-spec.ts
rename to spec/api-session-spec.ts
index 3631a532ca..1046b1377a 100644
--- a/spec-main/api-session-spec.ts
+++ b/spec/api-session-spec.ts
@@ -16,7 +16,7 @@ import { AddressInfo } from 'net';
 /* eslint-disable standard/no-callback-literal */
 
 describe('session module', () => {
-  const fixtures = path.resolve(__dirname, '..', 'spec', 'fixtures');
+  const fixtures = path.resolve(__dirname, 'fixtures');
   const url = 'http://127.0.0.1';
 
   describe('session.defaultSession', () => {
@@ -1139,7 +1139,7 @@ describe('session module', () => {
   describe('ses.setSSLConfig()', () => {
     it('can disable cipher suites', async () => {
       const ses = session.fromPartition('' + Math.random());
-      const fixturesPath = path.resolve(__dirname, '..', 'spec', 'fixtures');
+      const fixturesPath = path.resolve(__dirname, 'fixtures');
       const certPath = path.join(fixturesPath, 'certificates');
       const server = https.createServer({
         key: fs.readFileSync(path.join(certPath, 'server.key')),
diff --git a/spec-main/api-shell-spec.ts b/spec/api-shell-spec.ts
similarity index 98%
rename from spec-main/api-shell-spec.ts
rename to spec/api-shell-spec.ts
index f2cd1cdf8f..b30af2d62e 100644
--- a/spec-main/api-shell-spec.ts
+++ b/spec/api-shell-spec.ts
@@ -103,7 +103,7 @@ describe('shell module', () => {
       }).to.throw('Failed to read shortcut link');
     });
 
-    const fixtures = path.resolve(__dirname, '..', 'spec', 'fixtures');
+    const fixtures = path.resolve(__dirname, 'fixtures');
     it('reads all properties of a shortcut', () => {
       const shortcut = shell.readShortcutLink(path.join(fixtures, 'assets', 'shortcut.lnk'));
       expect(shortcut).to.deep.equal(shortcutOptions);
diff --git a/spec-main/api-subframe-spec.ts b/spec/api-subframe-spec.ts
similarity index 100%
rename from spec-main/api-subframe-spec.ts
rename to spec/api-subframe-spec.ts
diff --git a/spec-main/api-system-preferences-spec.ts b/spec/api-system-preferences-spec.ts
similarity index 100%
rename from spec-main/api-system-preferences-spec.ts
rename to spec/api-system-preferences-spec.ts
diff --git a/spec-main/api-touch-bar-spec.ts b/spec/api-touch-bar-spec.ts
similarity index 100%
rename from spec-main/api-touch-bar-spec.ts
rename to spec/api-touch-bar-spec.ts
diff --git a/spec-main/api-tray-spec.ts b/spec/api-tray-spec.ts
similarity index 100%
rename from spec-main/api-tray-spec.ts
rename to spec/api-tray-spec.ts
diff --git a/spec-main/api-view-spec.ts b/spec/api-view-spec.ts
similarity index 100%
rename from spec-main/api-view-spec.ts
rename to spec/api-view-spec.ts
diff --git a/spec-main/api-web-contents-spec.ts b/spec/api-web-contents-spec.ts
similarity index 99%
rename from spec-main/api-web-contents-spec.ts
rename to spec/api-web-contents-spec.ts
index e2b57a3eb7..f641705928 100644
--- a/spec-main/api-web-contents-spec.ts
+++ b/spec/api-web-contents-spec.ts
@@ -9,7 +9,7 @@ import { closeAllWindows } from './window-helpers';
 import { ifdescribe, delay, defer } from './spec-helpers';
 
 const pdfjs = require('pdfjs-dist');
-const fixturesPath = path.resolve(__dirname, '..', 'spec', 'fixtures');
+const fixturesPath = path.resolve(__dirname, 'fixtures');
 const mainFixturesPath = path.resolve(__dirname, 'fixtures');
 const features = process._linkedBinding('electron_common_features');
 
diff --git a/spec-main/api-web-contents-view-spec.ts b/spec/api-web-contents-view-spec.ts
similarity index 100%
rename from spec-main/api-web-contents-view-spec.ts
rename to spec/api-web-contents-view-spec.ts
diff --git a/spec-main/api-web-frame-main-spec.ts b/spec/api-web-frame-main-spec.ts
similarity index 99%
rename from spec-main/api-web-frame-main-spec.ts
rename to spec/api-web-frame-main-spec.ts
index 8890e1402f..46178641e5 100644
--- a/spec-main/api-web-frame-main-spec.ts
+++ b/spec/api-web-frame-main-spec.ts
@@ -9,7 +9,7 @@ import { AddressInfo } from 'net';
 import { ifit, waitUntil } from './spec-helpers';
 
 describe('webFrameMain module', () => {
-  const fixtures = path.resolve(__dirname, '..', 'spec-main', 'fixtures');
+  const fixtures = path.resolve(__dirname, 'fixtures');
   const subframesPath = path.join(fixtures, 'sub-frames');
 
   const fileUrl = (filename: string) => url.pathToFileURL(path.join(subframesPath, filename)).href;
diff --git a/spec-main/api-web-frame-spec.ts b/spec/api-web-frame-spec.ts
similarity index 99%
rename from spec-main/api-web-frame-spec.ts
rename to spec/api-web-frame-spec.ts
index 5b6b71b93f..f0a6f5a917 100644
--- a/spec-main/api-web-frame-spec.ts
+++ b/spec/api-web-frame-spec.ts
@@ -5,7 +5,7 @@ import { emittedOnce } from './events-helpers';
 import { defer } from './spec-helpers';
 
 describe('webFrame module', () => {
-  const fixtures = path.resolve(__dirname, '..', 'spec', 'fixtures');
+  const fixtures = path.resolve(__dirname, 'fixtures');
 
   it('can use executeJavaScript', async () => {
     const w = new BrowserWindow({
diff --git a/spec-main/api-web-request-spec.ts b/spec/api-web-request-spec.ts
similarity index 100%
rename from spec-main/api-web-request-spec.ts
rename to spec/api-web-request-spec.ts
diff --git a/spec-main/asar-spec.ts b/spec/asar-spec.ts
similarity index 99%
rename from spec-main/asar-spec.ts
rename to spec/asar-spec.ts
index 3b8aacc6a4..b96b65a4c0 100644
--- a/spec-main/asar-spec.ts
+++ b/spec/asar-spec.ts
@@ -11,7 +11,7 @@ import * as importedFs from 'fs';
 const features = process._linkedBinding('electron_common_features');
 
 describe('asar package', () => {
-  const fixtures = path.join(__dirname, '..', 'spec', 'fixtures');
+  const fixtures = path.join(__dirname, 'fixtures');
   const asarDir = path.join(fixtures, 'test.asar');
 
   afterEach(closeAllWindows);
@@ -141,7 +141,7 @@ function promisify (_f: Function): any {
 }
 
 describe('asar package', function () {
-  const fixtures = path.join(__dirname, '..', 'spec', 'fixtures');
+  const fixtures = path.join(__dirname, 'fixtures');
   const asarDir = path.join(fixtures, 'test.asar');
   const fs = require('fs') as typeof importedFs; // dummy, to fool typescript
 
diff --git a/spec-main/autofill-spec.ts b/spec/autofill-spec.ts
similarity index 92%
rename from spec-main/autofill-spec.ts
rename to spec/autofill-spec.ts
index 35a98ed177..4ae39e29f5 100644
--- a/spec-main/autofill-spec.ts
+++ b/spec/autofill-spec.ts
@@ -4,7 +4,7 @@ import { delay } from './spec-helpers';
 import { expect } from 'chai';
 import { closeAllWindows } from './window-helpers';
 
-const fixturesPath = path.resolve(__dirname, '..', 'spec-main', 'fixtures');
+const fixturesPath = path.resolve(__dirname, 'fixtures');
 
 describe('autofill', () => {
   afterEach(closeAllWindows);
diff --git a/spec-main/chromium-spec.ts b/spec/chromium-spec.ts
similarity index 99%
rename from spec-main/chromium-spec.ts
rename to spec/chromium-spec.ts
index 82890fa1e9..eb8970ffb3 100644
--- a/spec-main/chromium-spec.ts
+++ b/spec/chromium-spec.ts
@@ -17,7 +17,7 @@ import * as ws from 'ws';
 
 const features = process._linkedBinding('electron_common_features');
 
-const fixturesPath = path.resolve(__dirname, '..', 'spec', 'fixtures');
+const fixturesPath = path.resolve(__dirname, 'fixtures');
 
 describe('reporting api', () => {
   // TODO(nornagon): this started failing a lot on CI. Figure out why and fix
diff --git a/spec-main/crash-spec.ts b/spec/crash-spec.ts
similarity index 100%
rename from spec-main/crash-spec.ts
rename to spec/crash-spec.ts
diff --git a/spec-main/deprecate-spec.ts b/spec/deprecate-spec.ts
similarity index 100%
rename from spec-main/deprecate-spec.ts
rename to spec/deprecate-spec.ts
diff --git a/spec/events-helpers.js b/spec/events-helpers.js
deleted file mode 100644
index 507f68eb11..0000000000
--- a/spec/events-helpers.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * @fileoverview A set of helper functions to make it easier to work
- * with events in async/await manner.
- */
-
-/**
- * @param {!EventTarget} target
- * @param {string} eventName
- * @return {!Promise<!Event>}
- */
-const waitForEvent = (target, eventName) => {
-  return new Promise(resolve => {
-    target.addEventListener(eventName, resolve, { once: true });
-  });
-};
-
-/**
- * @param {!EventEmitter} emitter
- * @param {string} eventName
- * @return {!Promise<!Array>} With Event as the first item.
- */
-const emittedOnce = (emitter, eventName) => {
-  return emittedNTimes(emitter, eventName, 1).then(([result]) => result);
-};
-
-const emittedNTimes = (emitter, eventName, times) => {
-  const events = [];
-  return new Promise(resolve => {
-    const handler = (...args) => {
-      events.push(args);
-      if (events.length === times) {
-        emitter.removeListener(eventName, handler);
-        resolve(events);
-      }
-    };
-    emitter.on(eventName, handler);
-  });
-};
-
-exports.emittedOnce = emittedOnce;
-exports.emittedNTimes = emittedNTimes;
-exports.waitForEvent = waitForEvent;
diff --git a/spec-main/events-helpers.ts b/spec/events-helpers.ts
similarity index 100%
rename from spec-main/events-helpers.ts
rename to spec/events-helpers.ts
diff --git a/spec-main/extensions-spec.ts b/spec/extensions-spec.ts
similarity index 100%
rename from spec-main/extensions-spec.ts
rename to spec/extensions-spec.ts
diff --git a/spec-main/fixtures/api/beforeunload-empty-string.html b/spec/fixtures/api/beforeunload-empty-string.html
similarity index 100%
rename from spec-main/fixtures/api/beforeunload-empty-string.html
rename to spec/fixtures/api/beforeunload-empty-string.html
diff --git a/spec-main/fixtures/api/beforeunload-false-prevent3.html b/spec/fixtures/api/beforeunload-false-prevent3.html
similarity index 100%
rename from spec-main/fixtures/api/beforeunload-false-prevent3.html
rename to spec/fixtures/api/beforeunload-false-prevent3.html
diff --git a/spec-main/fixtures/api/beforeunload-false.html b/spec/fixtures/api/beforeunload-false.html
similarity index 100%
rename from spec-main/fixtures/api/beforeunload-false.html
rename to spec/fixtures/api/beforeunload-false.html
diff --git a/spec-main/fixtures/api/beforeunload-undefined.html b/spec/fixtures/api/beforeunload-undefined.html
similarity index 100%
rename from spec-main/fixtures/api/beforeunload-undefined.html
rename to spec/fixtures/api/beforeunload-undefined.html
diff --git a/spec-main/fixtures/api/context-bridge/can-bind-preload.js b/spec/fixtures/api/context-bridge/can-bind-preload.js
similarity index 100%
rename from spec-main/fixtures/api/context-bridge/can-bind-preload.js
rename to spec/fixtures/api/context-bridge/can-bind-preload.js
diff --git a/spec-main/fixtures/api/context-bridge/context-bridge-mutability/index.html b/spec/fixtures/api/context-bridge/context-bridge-mutability/index.html
similarity index 100%
rename from spec-main/fixtures/api/context-bridge/context-bridge-mutability/index.html
rename to spec/fixtures/api/context-bridge/context-bridge-mutability/index.html
diff --git a/spec-main/fixtures/api/context-bridge/context-bridge-mutability/main.js b/spec/fixtures/api/context-bridge/context-bridge-mutability/main.js
similarity index 100%
rename from spec-main/fixtures/api/context-bridge/context-bridge-mutability/main.js
rename to spec/fixtures/api/context-bridge/context-bridge-mutability/main.js
diff --git a/spec-main/fixtures/api/context-bridge/context-bridge-mutability/package.json b/spec/fixtures/api/context-bridge/context-bridge-mutability/package.json
similarity index 100%
rename from spec-main/fixtures/api/context-bridge/context-bridge-mutability/package.json
rename to spec/fixtures/api/context-bridge/context-bridge-mutability/package.json
diff --git a/spec-main/fixtures/api/context-bridge/context-bridge-mutability/preload.js b/spec/fixtures/api/context-bridge/context-bridge-mutability/preload.js
similarity index 100%
rename from spec-main/fixtures/api/context-bridge/context-bridge-mutability/preload.js
rename to spec/fixtures/api/context-bridge/context-bridge-mutability/preload.js
diff --git a/spec-main/fixtures/api/context-bridge/empty.html b/spec/fixtures/api/context-bridge/empty.html
similarity index 100%
rename from spec-main/fixtures/api/context-bridge/empty.html
rename to spec/fixtures/api/context-bridge/empty.html
diff --git a/spec-main/fixtures/api/custom-protocol-shutdown.js b/spec/fixtures/api/custom-protocol-shutdown.js
similarity index 100%
rename from spec-main/fixtures/api/custom-protocol-shutdown.js
rename to spec/fixtures/api/custom-protocol-shutdown.js
diff --git a/spec/fixtures/api/electron-main-module/app/node_modules/some-module/main2.js b/spec/fixtures/api/electron-main-module/app/node_modules/some-module/main2.js
deleted file mode 100644
index 774b4e2041..0000000000
--- a/spec/fixtures/api/electron-main-module/app/node_modules/some-module/main2.js
+++ /dev/null
@@ -1 +0,0 @@
-// Nothing to do here
diff --git a/spec/fixtures/api/electron-main-module/app/node_modules/some-module/package.json b/spec/fixtures/api/electron-main-module/app/node_modules/some-module/package.json
deleted file mode 100644
index cf8d1202f3..0000000000
--- a/spec/fixtures/api/electron-main-module/app/node_modules/some-module/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "some-module",
-  "main": "./main2.js"
-}
\ No newline at end of file
diff --git a/spec-main/fixtures/api/ipc-main-listeners/main.js b/spec/fixtures/api/ipc-main-listeners/main.js
similarity index 100%
rename from spec-main/fixtures/api/ipc-main-listeners/main.js
rename to spec/fixtures/api/ipc-main-listeners/main.js
diff --git a/spec-main/fixtures/api/ipc-main-listeners/package.json b/spec/fixtures/api/ipc-main-listeners/package.json
similarity index 100%
rename from spec-main/fixtures/api/ipc-main-listeners/package.json
rename to spec/fixtures/api/ipc-main-listeners/package.json
diff --git a/spec-main/fixtures/api/native-window-open-native-addon.html b/spec/fixtures/api/native-window-open-native-addon.html
similarity index 100%
rename from spec-main/fixtures/api/native-window-open-native-addon.html
rename to spec/fixtures/api/native-window-open-native-addon.html
diff --git a/spec-main/fixtures/api/net-log/main.js b/spec/fixtures/api/net-log/main.js
similarity index 100%
rename from spec-main/fixtures/api/net-log/main.js
rename to spec/fixtures/api/net-log/main.js
diff --git a/spec-main/fixtures/api/net-log/package.json b/spec/fixtures/api/net-log/package.json
similarity index 100%
rename from spec-main/fixtures/api/net-log/package.json
rename to spec/fixtures/api/net-log/package.json
diff --git a/spec-main/fixtures/api/new-window-preload.js b/spec/fixtures/api/new-window-preload.js
similarity index 100%
rename from spec-main/fixtures/api/new-window-preload.js
rename to spec/fixtures/api/new-window-preload.js
diff --git a/spec-main/fixtures/api/print-to-pdf.html b/spec/fixtures/api/print-to-pdf.html
similarity index 100%
rename from spec-main/fixtures/api/print-to-pdf.html
rename to spec/fixtures/api/print-to-pdf.html
diff --git a/spec-main/fixtures/api/safe-storage/decrypt-app/main.js b/spec/fixtures/api/safe-storage/decrypt-app/main.js
similarity index 100%
rename from spec-main/fixtures/api/safe-storage/decrypt-app/main.js
rename to spec/fixtures/api/safe-storage/decrypt-app/main.js
diff --git a/spec-main/fixtures/api/safe-storage/decrypt-app/package.json b/spec/fixtures/api/safe-storage/decrypt-app/package.json
similarity index 100%
rename from spec-main/fixtures/api/safe-storage/decrypt-app/package.json
rename to spec/fixtures/api/safe-storage/decrypt-app/package.json
diff --git a/spec-main/fixtures/api/safe-storage/encrypt-app/main.js b/spec/fixtures/api/safe-storage/encrypt-app/main.js
similarity index 100%
rename from spec-main/fixtures/api/safe-storage/encrypt-app/main.js
rename to spec/fixtures/api/safe-storage/encrypt-app/main.js
diff --git a/spec-main/fixtures/api/safe-storage/encrypt-app/package.json b/spec/fixtures/api/safe-storage/encrypt-app/package.json
similarity index 100%
rename from spec-main/fixtures/api/safe-storage/encrypt-app/package.json
rename to spec/fixtures/api/safe-storage/encrypt-app/package.json
diff --git a/spec-main/fixtures/api/sandbox.html b/spec/fixtures/api/sandbox.html
similarity index 100%
rename from spec-main/fixtures/api/sandbox.html
rename to spec/fixtures/api/sandbox.html
diff --git a/spec-main/fixtures/api/send-sync-message.html b/spec/fixtures/api/send-sync-message.html
similarity index 100%
rename from spec-main/fixtures/api/send-sync-message.html
rename to spec/fixtures/api/send-sync-message.html
diff --git a/spec-main/fixtures/api/service-workers/index.html b/spec/fixtures/api/service-workers/index.html
similarity index 100%
rename from spec-main/fixtures/api/service-workers/index.html
rename to spec/fixtures/api/service-workers/index.html
diff --git a/spec-main/fixtures/api/service-workers/logs.html b/spec/fixtures/api/service-workers/logs.html
similarity index 100%
rename from spec-main/fixtures/api/service-workers/logs.html
rename to spec/fixtures/api/service-workers/logs.html
diff --git a/spec-main/fixtures/api/service-workers/sw-logs.js b/spec/fixtures/api/service-workers/sw-logs.js
similarity index 100%
rename from spec-main/fixtures/api/service-workers/sw-logs.js
rename to spec/fixtures/api/service-workers/sw-logs.js
diff --git a/spec-main/fixtures/api/service-workers/sw.js b/spec/fixtures/api/service-workers/sw.js
similarity index 100%
rename from spec-main/fixtures/api/service-workers/sw.js
rename to spec/fixtures/api/service-workers/sw.js
diff --git a/spec-main/fixtures/api/test-menu-null/main.js b/spec/fixtures/api/test-menu-null/main.js
similarity index 100%
rename from spec-main/fixtures/api/test-menu-null/main.js
rename to spec/fixtures/api/test-menu-null/main.js
diff --git a/spec-main/fixtures/api/test-menu-null/package.json b/spec/fixtures/api/test-menu-null/package.json
similarity index 100%
rename from spec-main/fixtures/api/test-menu-null/package.json
rename to spec/fixtures/api/test-menu-null/package.json
diff --git a/spec-main/fixtures/api/test-menu-visibility/main.js b/spec/fixtures/api/test-menu-visibility/main.js
similarity index 100%
rename from spec-main/fixtures/api/test-menu-visibility/main.js
rename to spec/fixtures/api/test-menu-visibility/main.js
diff --git a/spec-main/fixtures/api/test-menu-visibility/package.json b/spec/fixtures/api/test-menu-visibility/package.json
similarity index 100%
rename from spec-main/fixtures/api/test-menu-visibility/package.json
rename to spec/fixtures/api/test-menu-visibility/package.json
diff --git a/spec-main/fixtures/api/webrequest.html b/spec/fixtures/api/webrequest.html
similarity index 100%
rename from spec-main/fixtures/api/webrequest.html
rename to spec/fixtures/api/webrequest.html
diff --git a/spec-main/fixtures/api/window-open-preload.js b/spec/fixtures/api/window-open-preload.js
similarity index 100%
rename from spec-main/fixtures/api/window-open-preload.js
rename to spec/fixtures/api/window-open-preload.js
diff --git a/spec-main/fixtures/apps/background-color-transparent/index.html b/spec/fixtures/apps/background-color-transparent/index.html
similarity index 100%
rename from spec-main/fixtures/apps/background-color-transparent/index.html
rename to spec/fixtures/apps/background-color-transparent/index.html
diff --git a/spec-main/fixtures/apps/background-color-transparent/main.js b/spec/fixtures/apps/background-color-transparent/main.js
similarity index 100%
rename from spec-main/fixtures/apps/background-color-transparent/main.js
rename to spec/fixtures/apps/background-color-transparent/main.js
diff --git a/spec-main/fixtures/apps/background-color-transparent/package.json b/spec/fixtures/apps/background-color-transparent/package.json
similarity index 100%
rename from spec-main/fixtures/apps/background-color-transparent/package.json
rename to spec/fixtures/apps/background-color-transparent/package.json
diff --git a/spec-main/fixtures/apps/background-color-transparent/renderer.js b/spec/fixtures/apps/background-color-transparent/renderer.js
similarity index 100%
rename from spec-main/fixtures/apps/background-color-transparent/renderer.js
rename to spec/fixtures/apps/background-color-transparent/renderer.js
diff --git a/spec-main/fixtures/apps/crash/main.js b/spec/fixtures/apps/crash/main.js
similarity index 100%
rename from spec-main/fixtures/apps/crash/main.js
rename to spec/fixtures/apps/crash/main.js
diff --git a/spec-main/fixtures/apps/crash/node-crash.js b/spec/fixtures/apps/crash/node-crash.js
similarity index 100%
rename from spec-main/fixtures/apps/crash/node-crash.js
rename to spec/fixtures/apps/crash/node-crash.js
diff --git a/spec-main/fixtures/apps/crash/package.json b/spec/fixtures/apps/crash/package.json
similarity index 100%
rename from spec-main/fixtures/apps/crash/package.json
rename to spec/fixtures/apps/crash/package.json
diff --git a/spec-main/fixtures/apps/crash/sandbox-preload.js b/spec/fixtures/apps/crash/sandbox-preload.js
similarity index 100%
rename from spec-main/fixtures/apps/crash/sandbox-preload.js
rename to spec/fixtures/apps/crash/sandbox-preload.js
diff --git a/spec-main/fixtures/apps/libuv-hang/index.html b/spec/fixtures/apps/libuv-hang/index.html
similarity index 100%
rename from spec-main/fixtures/apps/libuv-hang/index.html
rename to spec/fixtures/apps/libuv-hang/index.html
diff --git a/spec-main/fixtures/apps/libuv-hang/main.js b/spec/fixtures/apps/libuv-hang/main.js
similarity index 100%
rename from spec-main/fixtures/apps/libuv-hang/main.js
rename to spec/fixtures/apps/libuv-hang/main.js
diff --git a/spec-main/fixtures/apps/libuv-hang/preload.js b/spec/fixtures/apps/libuv-hang/preload.js
similarity index 100%
rename from spec-main/fixtures/apps/libuv-hang/preload.js
rename to spec/fixtures/apps/libuv-hang/preload.js
diff --git a/spec-main/fixtures/apps/libuv-hang/renderer.js b/spec/fixtures/apps/libuv-hang/renderer.js
similarity index 100%
rename from spec-main/fixtures/apps/libuv-hang/renderer.js
rename to spec/fixtures/apps/libuv-hang/renderer.js
diff --git a/spec-main/fixtures/apps/open-new-window-from-link/index.html b/spec/fixtures/apps/open-new-window-from-link/index.html
similarity index 100%
rename from spec-main/fixtures/apps/open-new-window-from-link/index.html
rename to spec/fixtures/apps/open-new-window-from-link/index.html
diff --git a/spec-main/fixtures/apps/open-new-window-from-link/main.js b/spec/fixtures/apps/open-new-window-from-link/main.js
similarity index 100%
rename from spec-main/fixtures/apps/open-new-window-from-link/main.js
rename to spec/fixtures/apps/open-new-window-from-link/main.js
diff --git a/spec-main/fixtures/apps/open-new-window-from-link/new-window-page.html b/spec/fixtures/apps/open-new-window-from-link/new-window-page.html
similarity index 100%
rename from spec-main/fixtures/apps/open-new-window-from-link/new-window-page.html
rename to spec/fixtures/apps/open-new-window-from-link/new-window-page.html
diff --git a/spec-main/fixtures/apps/open-new-window-from-link/package.json b/spec/fixtures/apps/open-new-window-from-link/package.json
similarity index 100%
rename from spec-main/fixtures/apps/open-new-window-from-link/package.json
rename to spec/fixtures/apps/open-new-window-from-link/package.json
diff --git a/spec-main/fixtures/apps/open-new-window-from-link/preload.js b/spec/fixtures/apps/open-new-window-from-link/preload.js
similarity index 100%
rename from spec-main/fixtures/apps/open-new-window-from-link/preload.js
rename to spec/fixtures/apps/open-new-window-from-link/preload.js
diff --git a/spec-main/fixtures/apps/remote-control/main.js b/spec/fixtures/apps/remote-control/main.js
similarity index 100%
rename from spec-main/fixtures/apps/remote-control/main.js
rename to spec/fixtures/apps/remote-control/main.js
diff --git a/spec-main/fixtures/apps/remote-control/package.json b/spec/fixtures/apps/remote-control/package.json
similarity index 100%
rename from spec-main/fixtures/apps/remote-control/package.json
rename to spec/fixtures/apps/remote-control/package.json
diff --git a/spec-main/fixtures/apps/self-module-paths/index.html b/spec/fixtures/apps/self-module-paths/index.html
similarity index 100%
rename from spec-main/fixtures/apps/self-module-paths/index.html
rename to spec/fixtures/apps/self-module-paths/index.html
diff --git a/spec-main/fixtures/apps/self-module-paths/main.js b/spec/fixtures/apps/self-module-paths/main.js
similarity index 100%
rename from spec-main/fixtures/apps/self-module-paths/main.js
rename to spec/fixtures/apps/self-module-paths/main.js
diff --git a/spec-main/fixtures/apps/self-module-paths/package.json b/spec/fixtures/apps/self-module-paths/package.json
similarity index 100%
rename from spec-main/fixtures/apps/self-module-paths/package.json
rename to spec/fixtures/apps/self-module-paths/package.json
diff --git a/spec-main/fixtures/apps/self-module-paths/renderer.js b/spec/fixtures/apps/self-module-paths/renderer.js
similarity index 100%
rename from spec-main/fixtures/apps/self-module-paths/renderer.js
rename to spec/fixtures/apps/self-module-paths/renderer.js
diff --git a/spec-main/fixtures/apps/self-module-paths/worker.js b/spec/fixtures/apps/self-module-paths/worker.js
similarity index 100%
rename from spec-main/fixtures/apps/self-module-paths/worker.js
rename to spec/fixtures/apps/self-module-paths/worker.js
diff --git a/spec-main/fixtures/apps/set-path/main.js b/spec/fixtures/apps/set-path/main.js
similarity index 100%
rename from spec-main/fixtures/apps/set-path/main.js
rename to spec/fixtures/apps/set-path/main.js
diff --git a/spec-main/fixtures/apps/set-path/package.json b/spec/fixtures/apps/set-path/package.json
similarity index 100%
rename from spec-main/fixtures/apps/set-path/package.json
rename to spec/fixtures/apps/set-path/package.json
diff --git a/spec-main/fixtures/apps/xwindow-icon/icon.png b/spec/fixtures/apps/xwindow-icon/icon.png
similarity index 100%
rename from spec-main/fixtures/apps/xwindow-icon/icon.png
rename to spec/fixtures/apps/xwindow-icon/icon.png
diff --git a/spec-main/fixtures/apps/xwindow-icon/main.js b/spec/fixtures/apps/xwindow-icon/main.js
similarity index 100%
rename from spec-main/fixtures/apps/xwindow-icon/main.js
rename to spec/fixtures/apps/xwindow-icon/main.js
diff --git a/spec-main/fixtures/apps/xwindow-icon/package.json b/spec/fixtures/apps/xwindow-icon/package.json
similarity index 100%
rename from spec-main/fixtures/apps/xwindow-icon/package.json
rename to spec/fixtures/apps/xwindow-icon/package.json
diff --git a/spec-main/fixtures/auto-update/check-with-headers/index.js b/spec/fixtures/auto-update/check-with-headers/index.js
similarity index 100%
rename from spec-main/fixtures/auto-update/check-with-headers/index.js
rename to spec/fixtures/auto-update/check-with-headers/index.js
diff --git a/spec-main/fixtures/auto-update/check-with-headers/package.json b/spec/fixtures/auto-update/check-with-headers/package.json
similarity index 100%
rename from spec-main/fixtures/auto-update/check-with-headers/package.json
rename to spec/fixtures/auto-update/check-with-headers/package.json
diff --git a/spec-main/fixtures/auto-update/check/index.js b/spec/fixtures/auto-update/check/index.js
similarity index 100%
rename from spec-main/fixtures/auto-update/check/index.js
rename to spec/fixtures/auto-update/check/index.js
diff --git a/spec-main/fixtures/auto-update/check/package.json b/spec/fixtures/auto-update/check/package.json
similarity index 100%
rename from spec-main/fixtures/auto-update/check/package.json
rename to spec/fixtures/auto-update/check/package.json
diff --git a/spec-main/fixtures/auto-update/initial/index.js b/spec/fixtures/auto-update/initial/index.js
similarity index 100%
rename from spec-main/fixtures/auto-update/initial/index.js
rename to spec/fixtures/auto-update/initial/index.js
diff --git a/spec-main/fixtures/auto-update/initial/package.json b/spec/fixtures/auto-update/initial/package.json
similarity index 100%
rename from spec-main/fixtures/auto-update/initial/package.json
rename to spec/fixtures/auto-update/initial/package.json
diff --git a/spec-main/fixtures/auto-update/update-json/index.js b/spec/fixtures/auto-update/update-json/index.js
similarity index 100%
rename from spec-main/fixtures/auto-update/update-json/index.js
rename to spec/fixtures/auto-update/update-json/index.js
diff --git a/spec-main/fixtures/auto-update/update-json/package.json b/spec/fixtures/auto-update/update-json/package.json
similarity index 100%
rename from spec-main/fixtures/auto-update/update-json/package.json
rename to spec/fixtures/auto-update/update-json/package.json
diff --git a/spec-main/fixtures/auto-update/update/index.js b/spec/fixtures/auto-update/update/index.js
similarity index 100%
rename from spec-main/fixtures/auto-update/update/index.js
rename to spec/fixtures/auto-update/update/index.js
diff --git a/spec-main/fixtures/auto-update/update/package.json b/spec/fixtures/auto-update/update/package.json
similarity index 100%
rename from spec-main/fixtures/auto-update/update/package.json
rename to spec/fixtures/auto-update/update/package.json
diff --git a/spec-main/fixtures/blank.html b/spec/fixtures/blank.html
similarity index 100%
rename from spec-main/fixtures/blank.html
rename to spec/fixtures/blank.html
diff --git a/spec-main/fixtures/blank.png b/spec/fixtures/blank.png
similarity index 100%
rename from spec-main/fixtures/blank.png
rename to spec/fixtures/blank.png
diff --git a/spec-main/fixtures/cat.pdf b/spec/fixtures/cat.pdf
similarity index 100%
rename from spec-main/fixtures/cat.pdf
rename to spec/fixtures/cat.pdf
diff --git a/spec-main/fixtures/chromium/other-window.js b/spec/fixtures/chromium/other-window.js
similarity index 100%
rename from spec-main/fixtures/chromium/other-window.js
rename to spec/fixtures/chromium/other-window.js
diff --git a/spec-main/fixtures/chromium/spellchecker.html b/spec/fixtures/chromium/spellchecker.html
similarity index 100%
rename from spec-main/fixtures/chromium/spellchecker.html
rename to spec/fixtures/chromium/spellchecker.html
diff --git a/spec-main/fixtures/chromium/visibilitystate.html b/spec/fixtures/chromium/visibilitystate.html
similarity index 100%
rename from spec-main/fixtures/chromium/visibilitystate.html
rename to spec/fixtures/chromium/visibilitystate.html
diff --git a/spec-main/fixtures/crash-cases/api-browser-destroy/index.js b/spec/fixtures/crash-cases/api-browser-destroy/index.js
similarity index 100%
rename from spec-main/fixtures/crash-cases/api-browser-destroy/index.js
rename to spec/fixtures/crash-cases/api-browser-destroy/index.js
diff --git a/spec-main/fixtures/crash-cases/early-in-memory-session-create/index.js b/spec/fixtures/crash-cases/early-in-memory-session-create/index.js
similarity index 100%
rename from spec-main/fixtures/crash-cases/early-in-memory-session-create/index.js
rename to spec/fixtures/crash-cases/early-in-memory-session-create/index.js
diff --git a/spec-main/fixtures/crash-cases/fs-promises-renderer-crash/index.html b/spec/fixtures/crash-cases/fs-promises-renderer-crash/index.html
similarity index 100%
rename from spec-main/fixtures/crash-cases/fs-promises-renderer-crash/index.html
rename to spec/fixtures/crash-cases/fs-promises-renderer-crash/index.html
diff --git a/spec-main/fixtures/crash-cases/fs-promises-renderer-crash/index.js b/spec/fixtures/crash-cases/fs-promises-renderer-crash/index.js
similarity index 100%
rename from spec-main/fixtures/crash-cases/fs-promises-renderer-crash/index.js
rename to spec/fixtures/crash-cases/fs-promises-renderer-crash/index.js
diff --git a/spec-main/fixtures/crash-cases/in-memory-session-double-free/index.js b/spec/fixtures/crash-cases/in-memory-session-double-free/index.js
similarity index 100%
rename from spec-main/fixtures/crash-cases/in-memory-session-double-free/index.js
rename to spec/fixtures/crash-cases/in-memory-session-double-free/index.js
diff --git a/spec-main/fixtures/crash-cases/js-execute-iframe/index.html b/spec/fixtures/crash-cases/js-execute-iframe/index.html
similarity index 100%
rename from spec-main/fixtures/crash-cases/js-execute-iframe/index.html
rename to spec/fixtures/crash-cases/js-execute-iframe/index.html
diff --git a/spec-main/fixtures/crash-cases/js-execute-iframe/index.js b/spec/fixtures/crash-cases/js-execute-iframe/index.js
similarity index 100%
rename from spec-main/fixtures/crash-cases/js-execute-iframe/index.js
rename to spec/fixtures/crash-cases/js-execute-iframe/index.js
diff --git a/spec-main/fixtures/crash-cases/js-execute-iframe/page2.html b/spec/fixtures/crash-cases/js-execute-iframe/page2.html
similarity index 100%
rename from spec-main/fixtures/crash-cases/js-execute-iframe/page2.html
rename to spec/fixtures/crash-cases/js-execute-iframe/page2.html
diff --git a/spec-main/fixtures/crash-cases/native-window-open-exit/index.html b/spec/fixtures/crash-cases/native-window-open-exit/index.html
similarity index 100%
rename from spec-main/fixtures/crash-cases/native-window-open-exit/index.html
rename to spec/fixtures/crash-cases/native-window-open-exit/index.html
diff --git a/spec-main/fixtures/crash-cases/native-window-open-exit/index.js b/spec/fixtures/crash-cases/native-window-open-exit/index.js
similarity index 100%
rename from spec-main/fixtures/crash-cases/native-window-open-exit/index.js
rename to spec/fixtures/crash-cases/native-window-open-exit/index.js
diff --git a/spec-main/fixtures/crash-cases/native-window-open-exit/preload.js b/spec/fixtures/crash-cases/native-window-open-exit/preload.js
similarity index 100%
rename from spec-main/fixtures/crash-cases/native-window-open-exit/preload.js
rename to spec/fixtures/crash-cases/native-window-open-exit/preload.js
diff --git a/spec-main/fixtures/crash-cases/quit-on-crashed-event/index.js b/spec/fixtures/crash-cases/quit-on-crashed-event/index.js
similarity index 100%
rename from spec-main/fixtures/crash-cases/quit-on-crashed-event/index.js
rename to spec/fixtures/crash-cases/quit-on-crashed-event/index.js
diff --git a/spec-main/fixtures/crash-cases/safe-storage/index.js b/spec/fixtures/crash-cases/safe-storage/index.js
similarity index 100%
rename from spec-main/fixtures/crash-cases/safe-storage/index.js
rename to spec/fixtures/crash-cases/safe-storage/index.js
diff --git a/spec-main/fixtures/crash-cases/setimmediate-renderer-crash/index.js b/spec/fixtures/crash-cases/setimmediate-renderer-crash/index.js
similarity index 100%
rename from spec-main/fixtures/crash-cases/setimmediate-renderer-crash/index.js
rename to spec/fixtures/crash-cases/setimmediate-renderer-crash/index.js
diff --git a/spec-main/fixtures/crash-cases/setimmediate-renderer-crash/preload.js b/spec/fixtures/crash-cases/setimmediate-renderer-crash/preload.js
similarity index 100%
rename from spec-main/fixtures/crash-cases/setimmediate-renderer-crash/preload.js
rename to spec/fixtures/crash-cases/setimmediate-renderer-crash/preload.js
diff --git a/spec-main/fixtures/crash-cases/setimmediate-window-open-crash/index.html b/spec/fixtures/crash-cases/setimmediate-window-open-crash/index.html
similarity index 100%
rename from spec-main/fixtures/crash-cases/setimmediate-window-open-crash/index.html
rename to spec/fixtures/crash-cases/setimmediate-window-open-crash/index.html
diff --git a/spec-main/fixtures/crash-cases/setimmediate-window-open-crash/index.js b/spec/fixtures/crash-cases/setimmediate-window-open-crash/index.js
similarity index 100%
rename from spec-main/fixtures/crash-cases/setimmediate-window-open-crash/index.js
rename to spec/fixtures/crash-cases/setimmediate-window-open-crash/index.js
diff --git a/spec-main/fixtures/crash-cases/transparent-window-get-background-color/index.js b/spec/fixtures/crash-cases/transparent-window-get-background-color/index.js
similarity index 100%
rename from spec-main/fixtures/crash-cases/transparent-window-get-background-color/index.js
rename to spec/fixtures/crash-cases/transparent-window-get-background-color/index.js
diff --git a/spec-main/fixtures/crash-cases/webcontents-create-leak-exit/index.js b/spec/fixtures/crash-cases/webcontents-create-leak-exit/index.js
similarity index 100%
rename from spec-main/fixtures/crash-cases/webcontents-create-leak-exit/index.js
rename to spec/fixtures/crash-cases/webcontents-create-leak-exit/index.js
diff --git a/spec-main/fixtures/crash-cases/webcontentsview-create-leak-exit/index.js b/spec/fixtures/crash-cases/webcontentsview-create-leak-exit/index.js
similarity index 100%
rename from spec-main/fixtures/crash-cases/webcontentsview-create-leak-exit/index.js
rename to spec/fixtures/crash-cases/webcontentsview-create-leak-exit/index.js
diff --git a/spec-main/fixtures/crash-cases/webview-attach-destroyed/index.js b/spec/fixtures/crash-cases/webview-attach-destroyed/index.js
similarity index 100%
rename from spec-main/fixtures/crash-cases/webview-attach-destroyed/index.js
rename to spec/fixtures/crash-cases/webview-attach-destroyed/index.js
diff --git a/spec-main/fixtures/crash-cases/webview-contents-error-on-creation/index.js b/spec/fixtures/crash-cases/webview-contents-error-on-creation/index.js
similarity index 100%
rename from spec-main/fixtures/crash-cases/webview-contents-error-on-creation/index.js
rename to spec/fixtures/crash-cases/webview-contents-error-on-creation/index.js
diff --git a/spec-main/fixtures/devtools-extensions/bad-manifest/manifest.json b/spec/fixtures/devtools-extensions/bad-manifest/manifest.json
similarity index 100%
rename from spec-main/fixtures/devtools-extensions/bad-manifest/manifest.json
rename to spec/fixtures/devtools-extensions/bad-manifest/manifest.json
diff --git a/spec-main/fixtures/devtools-extensions/foo/_locales/en/messages.json b/spec/fixtures/devtools-extensions/foo/_locales/en/messages.json
similarity index 100%
rename from spec-main/fixtures/devtools-extensions/foo/_locales/en/messages.json
rename to spec/fixtures/devtools-extensions/foo/_locales/en/messages.json
diff --git a/spec-main/fixtures/devtools-extensions/foo/devtools.js b/spec/fixtures/devtools-extensions/foo/devtools.js
similarity index 100%
rename from spec-main/fixtures/devtools-extensions/foo/devtools.js
rename to spec/fixtures/devtools-extensions/foo/devtools.js
diff --git a/spec-main/fixtures/devtools-extensions/foo/foo.html b/spec/fixtures/devtools-extensions/foo/foo.html
similarity index 100%
rename from spec-main/fixtures/devtools-extensions/foo/foo.html
rename to spec/fixtures/devtools-extensions/foo/foo.html
diff --git a/spec-main/fixtures/devtools-extensions/foo/index.html b/spec/fixtures/devtools-extensions/foo/index.html
similarity index 100%
rename from spec-main/fixtures/devtools-extensions/foo/index.html
rename to spec/fixtures/devtools-extensions/foo/index.html
diff --git a/spec-main/fixtures/devtools-extensions/foo/manifest.json b/spec/fixtures/devtools-extensions/foo/manifest.json
similarity index 100%
rename from spec-main/fixtures/devtools-extensions/foo/manifest.json
rename to spec/fixtures/devtools-extensions/foo/manifest.json
diff --git a/spec-main/fixtures/devtools-extensions/foo/panel.js b/spec/fixtures/devtools-extensions/foo/panel.js
similarity index 100%
rename from spec-main/fixtures/devtools-extensions/foo/panel.js
rename to spec/fixtures/devtools-extensions/foo/panel.js
diff --git a/spec-main/fixtures/dogs-running.txt b/spec/fixtures/dogs-running.txt
similarity index 100%
rename from spec-main/fixtures/dogs-running.txt
rename to spec/fixtures/dogs-running.txt
diff --git a/spec-main/fixtures/extensions/chrome-api/background.js b/spec/fixtures/extensions/chrome-api/background.js
similarity index 100%
rename from spec-main/fixtures/extensions/chrome-api/background.js
rename to spec/fixtures/extensions/chrome-api/background.js
diff --git a/spec-main/fixtures/extensions/chrome-api/main.js b/spec/fixtures/extensions/chrome-api/main.js
similarity index 100%
rename from spec-main/fixtures/extensions/chrome-api/main.js
rename to spec/fixtures/extensions/chrome-api/main.js
diff --git a/spec-main/fixtures/extensions/chrome-api/manifest.json b/spec/fixtures/extensions/chrome-api/manifest.json
similarity index 100%
rename from spec-main/fixtures/extensions/chrome-api/manifest.json
rename to spec/fixtures/extensions/chrome-api/manifest.json
diff --git a/spec-main/fixtures/extensions/chrome-i18n/_locales/en/messages.json b/spec/fixtures/extensions/chrome-i18n/_locales/en/messages.json
similarity index 100%
rename from spec-main/fixtures/extensions/chrome-i18n/_locales/en/messages.json
rename to spec/fixtures/extensions/chrome-i18n/_locales/en/messages.json
diff --git a/spec-main/fixtures/extensions/chrome-i18n/main.js b/spec/fixtures/extensions/chrome-i18n/main.js
similarity index 100%
rename from spec-main/fixtures/extensions/chrome-i18n/main.js
rename to spec/fixtures/extensions/chrome-i18n/main.js
diff --git a/spec-main/fixtures/extensions/chrome-i18n/manifest.json b/spec/fixtures/extensions/chrome-i18n/manifest.json
similarity index 100%
rename from spec-main/fixtures/extensions/chrome-i18n/manifest.json
rename to spec/fixtures/extensions/chrome-i18n/manifest.json
diff --git a/spec-main/fixtures/extensions/chrome-runtime/background.js b/spec/fixtures/extensions/chrome-runtime/background.js
similarity index 100%
rename from spec-main/fixtures/extensions/chrome-runtime/background.js
rename to spec/fixtures/extensions/chrome-runtime/background.js
diff --git a/spec-main/fixtures/extensions/chrome-runtime/main.js b/spec/fixtures/extensions/chrome-runtime/main.js
similarity index 100%
rename from spec-main/fixtures/extensions/chrome-runtime/main.js
rename to spec/fixtures/extensions/chrome-runtime/main.js
diff --git a/spec-main/fixtures/extensions/chrome-runtime/manifest.json b/spec/fixtures/extensions/chrome-runtime/manifest.json
similarity index 100%
rename from spec-main/fixtures/extensions/chrome-runtime/manifest.json
rename to spec/fixtures/extensions/chrome-runtime/manifest.json
diff --git a/spec-main/fixtures/extensions/chrome-storage/main.js b/spec/fixtures/extensions/chrome-storage/main.js
similarity index 100%
rename from spec-main/fixtures/extensions/chrome-storage/main.js
rename to spec/fixtures/extensions/chrome-storage/main.js
diff --git a/spec-main/fixtures/extensions/chrome-storage/manifest.json b/spec/fixtures/extensions/chrome-storage/manifest.json
similarity index 100%
rename from spec-main/fixtures/extensions/chrome-storage/manifest.json
rename to spec/fixtures/extensions/chrome-storage/manifest.json
diff --git a/spec-main/fixtures/extensions/chrome-webRequest-wss/background.js b/spec/fixtures/extensions/chrome-webRequest-wss/background.js
similarity index 100%
rename from spec-main/fixtures/extensions/chrome-webRequest-wss/background.js
rename to spec/fixtures/extensions/chrome-webRequest-wss/background.js
diff --git a/spec-main/fixtures/extensions/chrome-webRequest-wss/manifest.json b/spec/fixtures/extensions/chrome-webRequest-wss/manifest.json
similarity index 100%
rename from spec-main/fixtures/extensions/chrome-webRequest-wss/manifest.json
rename to spec/fixtures/extensions/chrome-webRequest-wss/manifest.json
diff --git a/spec-main/fixtures/extensions/chrome-webRequest/background.js b/spec/fixtures/extensions/chrome-webRequest/background.js
similarity index 100%
rename from spec-main/fixtures/extensions/chrome-webRequest/background.js
rename to spec/fixtures/extensions/chrome-webRequest/background.js
diff --git a/spec-main/fixtures/extensions/chrome-webRequest/manifest.json b/spec/fixtures/extensions/chrome-webRequest/manifest.json
similarity index 100%
rename from spec-main/fixtures/extensions/chrome-webRequest/manifest.json
rename to spec/fixtures/extensions/chrome-webRequest/manifest.json
diff --git a/spec-main/fixtures/extensions/content-script-document-end/end.js b/spec/fixtures/extensions/content-script-document-end/end.js
similarity index 100%
rename from spec-main/fixtures/extensions/content-script-document-end/end.js
rename to spec/fixtures/extensions/content-script-document-end/end.js
diff --git a/spec-main/fixtures/extensions/content-script-document-end/manifest.json b/spec/fixtures/extensions/content-script-document-end/manifest.json
similarity index 100%
rename from spec-main/fixtures/extensions/content-script-document-end/manifest.json
rename to spec/fixtures/extensions/content-script-document-end/manifest.json
diff --git a/spec-main/fixtures/extensions/content-script-document-idle/idle.js b/spec/fixtures/extensions/content-script-document-idle/idle.js
similarity index 100%
rename from spec-main/fixtures/extensions/content-script-document-idle/idle.js
rename to spec/fixtures/extensions/content-script-document-idle/idle.js
diff --git a/spec-main/fixtures/extensions/content-script-document-idle/manifest.json b/spec/fixtures/extensions/content-script-document-idle/manifest.json
similarity index 100%
rename from spec-main/fixtures/extensions/content-script-document-idle/manifest.json
rename to spec/fixtures/extensions/content-script-document-idle/manifest.json
diff --git a/spec-main/fixtures/extensions/content-script-document-start/manifest.json b/spec/fixtures/extensions/content-script-document-start/manifest.json
similarity index 100%
rename from spec-main/fixtures/extensions/content-script-document-start/manifest.json
rename to spec/fixtures/extensions/content-script-document-start/manifest.json
diff --git a/spec-main/fixtures/extensions/content-script-document-start/start.js b/spec/fixtures/extensions/content-script-document-start/start.js
similarity index 100%
rename from spec-main/fixtures/extensions/content-script-document-start/start.js
rename to spec/fixtures/extensions/content-script-document-start/start.js
diff --git a/spec-main/fixtures/extensions/content-script/all_frames-disabled.css b/spec/fixtures/extensions/content-script/all_frames-disabled.css
similarity index 100%
rename from spec-main/fixtures/extensions/content-script/all_frames-disabled.css
rename to spec/fixtures/extensions/content-script/all_frames-disabled.css
diff --git a/spec-main/fixtures/extensions/content-script/all_frames-enabled.css b/spec/fixtures/extensions/content-script/all_frames-enabled.css
similarity index 100%
rename from spec-main/fixtures/extensions/content-script/all_frames-enabled.css
rename to spec/fixtures/extensions/content-script/all_frames-enabled.css
diff --git a/spec-main/fixtures/extensions/content-script/all_frames-preload.js b/spec/fixtures/extensions/content-script/all_frames-preload.js
similarity index 100%
rename from spec-main/fixtures/extensions/content-script/all_frames-preload.js
rename to spec/fixtures/extensions/content-script/all_frames-preload.js
diff --git a/spec-main/fixtures/extensions/content-script/frame-with-frame.html b/spec/fixtures/extensions/content-script/frame-with-frame.html
similarity index 100%
rename from spec-main/fixtures/extensions/content-script/frame-with-frame.html
rename to spec/fixtures/extensions/content-script/frame-with-frame.html
diff --git a/spec-main/fixtures/extensions/content-script/frame.html b/spec/fixtures/extensions/content-script/frame.html
similarity index 100%
rename from spec-main/fixtures/extensions/content-script/frame.html
rename to spec/fixtures/extensions/content-script/frame.html
diff --git a/spec-main/fixtures/extensions/content-script/manifest.json b/spec/fixtures/extensions/content-script/manifest.json
similarity index 100%
rename from spec-main/fixtures/extensions/content-script/manifest.json
rename to spec/fixtures/extensions/content-script/manifest.json
diff --git a/spec-main/fixtures/extensions/devtools-extension/foo.html b/spec/fixtures/extensions/devtools-extension/foo.html
similarity index 100%
rename from spec-main/fixtures/extensions/devtools-extension/foo.html
rename to spec/fixtures/extensions/devtools-extension/foo.html
diff --git a/spec-main/fixtures/extensions/devtools-extension/foo.js b/spec/fixtures/extensions/devtools-extension/foo.js
similarity index 100%
rename from spec-main/fixtures/extensions/devtools-extension/foo.js
rename to spec/fixtures/extensions/devtools-extension/foo.js
diff --git a/spec-main/fixtures/extensions/devtools-extension/index.html b/spec/fixtures/extensions/devtools-extension/index.html
similarity index 100%
rename from spec-main/fixtures/extensions/devtools-extension/index.html
rename to spec/fixtures/extensions/devtools-extension/index.html
diff --git a/spec-main/fixtures/extensions/devtools-extension/index.js b/spec/fixtures/extensions/devtools-extension/index.js
similarity index 100%
rename from spec-main/fixtures/extensions/devtools-extension/index.js
rename to spec/fixtures/extensions/devtools-extension/index.js
diff --git a/spec-main/fixtures/extensions/devtools-extension/manifest.json b/spec/fixtures/extensions/devtools-extension/manifest.json
similarity index 100%
rename from spec-main/fixtures/extensions/devtools-extension/manifest.json
rename to spec/fixtures/extensions/devtools-extension/manifest.json
diff --git a/spec-main/fixtures/extensions/lazy-background-page/background.js b/spec/fixtures/extensions/lazy-background-page/background.js
similarity index 100%
rename from spec-main/fixtures/extensions/lazy-background-page/background.js
rename to spec/fixtures/extensions/lazy-background-page/background.js
diff --git a/spec-main/fixtures/extensions/lazy-background-page/content_script.js b/spec/fixtures/extensions/lazy-background-page/content_script.js
similarity index 100%
rename from spec-main/fixtures/extensions/lazy-background-page/content_script.js
rename to spec/fixtures/extensions/lazy-background-page/content_script.js
diff --git a/spec-main/fixtures/extensions/lazy-background-page/get-background-page.js b/spec/fixtures/extensions/lazy-background-page/get-background-page.js
similarity index 100%
rename from spec-main/fixtures/extensions/lazy-background-page/get-background-page.js
rename to spec/fixtures/extensions/lazy-background-page/get-background-page.js
diff --git a/spec-main/fixtures/extensions/lazy-background-page/manifest.json b/spec/fixtures/extensions/lazy-background-page/manifest.json
similarity index 100%
rename from spec-main/fixtures/extensions/lazy-background-page/manifest.json
rename to spec/fixtures/extensions/lazy-background-page/manifest.json
diff --git a/spec-main/fixtures/extensions/lazy-background-page/page-get-background.html b/spec/fixtures/extensions/lazy-background-page/page-get-background.html
similarity index 100%
rename from spec-main/fixtures/extensions/lazy-background-page/page-get-background.html
rename to spec/fixtures/extensions/lazy-background-page/page-get-background.html
diff --git a/spec-main/fixtures/extensions/lazy-background-page/page-runtime-get-background.html b/spec/fixtures/extensions/lazy-background-page/page-runtime-get-background.html
similarity index 100%
rename from spec-main/fixtures/extensions/lazy-background-page/page-runtime-get-background.html
rename to spec/fixtures/extensions/lazy-background-page/page-runtime-get-background.html
diff --git a/spec-main/fixtures/extensions/lazy-background-page/runtime-get-background-page.js b/spec/fixtures/extensions/lazy-background-page/runtime-get-background-page.js
similarity index 100%
rename from spec-main/fixtures/extensions/lazy-background-page/runtime-get-background-page.js
rename to spec/fixtures/extensions/lazy-background-page/runtime-get-background-page.js
diff --git a/spec-main/fixtures/extensions/load-error/manifest.json b/spec/fixtures/extensions/load-error/manifest.json
similarity index 100%
rename from spec-main/fixtures/extensions/load-error/manifest.json
rename to spec/fixtures/extensions/load-error/manifest.json
diff --git a/spec-main/fixtures/extensions/missing-manifest/main.js b/spec/fixtures/extensions/missing-manifest/main.js
similarity index 100%
rename from spec-main/fixtures/extensions/missing-manifest/main.js
rename to spec/fixtures/extensions/missing-manifest/main.js
diff --git a/spec-main/fixtures/extensions/mv3-service-worker/background.js b/spec/fixtures/extensions/mv3-service-worker/background.js
similarity index 100%
rename from spec-main/fixtures/extensions/mv3-service-worker/background.js
rename to spec/fixtures/extensions/mv3-service-worker/background.js
diff --git a/spec-main/fixtures/extensions/mv3-service-worker/manifest.json b/spec/fixtures/extensions/mv3-service-worker/manifest.json
similarity index 100%
rename from spec-main/fixtures/extensions/mv3-service-worker/manifest.json
rename to spec/fixtures/extensions/mv3-service-worker/manifest.json
diff --git a/spec-main/fixtures/extensions/persistent-background-page/background.js b/spec/fixtures/extensions/persistent-background-page/background.js
similarity index 100%
rename from spec-main/fixtures/extensions/persistent-background-page/background.js
rename to spec/fixtures/extensions/persistent-background-page/background.js
diff --git a/spec-main/fixtures/extensions/persistent-background-page/manifest.json b/spec/fixtures/extensions/persistent-background-page/manifest.json
similarity index 100%
rename from spec-main/fixtures/extensions/persistent-background-page/manifest.json
rename to spec/fixtures/extensions/persistent-background-page/manifest.json
diff --git a/spec-main/fixtures/extensions/red-bg/main.js b/spec/fixtures/extensions/red-bg/main.js
similarity index 100%
rename from spec-main/fixtures/extensions/red-bg/main.js
rename to spec/fixtures/extensions/red-bg/main.js
diff --git a/spec-main/fixtures/extensions/red-bg/manifest.json b/spec/fixtures/extensions/red-bg/manifest.json
similarity index 100%
rename from spec-main/fixtures/extensions/red-bg/manifest.json
rename to spec/fixtures/extensions/red-bg/manifest.json
diff --git a/spec-main/fixtures/extensions/ui-page/bare-page.html b/spec/fixtures/extensions/ui-page/bare-page.html
similarity index 100%
rename from spec-main/fixtures/extensions/ui-page/bare-page.html
rename to spec/fixtures/extensions/ui-page/bare-page.html
diff --git a/spec-main/fixtures/extensions/ui-page/manifest.json b/spec/fixtures/extensions/ui-page/manifest.json
similarity index 100%
rename from spec-main/fixtures/extensions/ui-page/manifest.json
rename to spec/fixtures/extensions/ui-page/manifest.json
diff --git a/spec-main/fixtures/extensions/ui-page/page-get-background.html b/spec/fixtures/extensions/ui-page/page-get-background.html
similarity index 100%
rename from spec-main/fixtures/extensions/ui-page/page-get-background.html
rename to spec/fixtures/extensions/ui-page/page-get-background.html
diff --git a/spec-main/fixtures/extensions/ui-page/page-script-load.html b/spec/fixtures/extensions/ui-page/page-script-load.html
similarity index 100%
rename from spec-main/fixtures/extensions/ui-page/page-script-load.html
rename to spec/fixtures/extensions/ui-page/page-script-load.html
diff --git a/spec-main/fixtures/extensions/ui-page/script.js b/spec/fixtures/extensions/ui-page/script.js
similarity index 100%
rename from spec-main/fixtures/extensions/ui-page/script.js
rename to spec/fixtures/extensions/ui-page/script.js
diff --git a/spec-main/fixtures/module/declare-buffer.js b/spec/fixtures/module/declare-buffer.js
similarity index 100%
rename from spec-main/fixtures/module/declare-buffer.js
rename to spec/fixtures/module/declare-buffer.js
diff --git a/spec-main/fixtures/module/declare-global.js b/spec/fixtures/module/declare-global.js
similarity index 100%
rename from spec-main/fixtures/module/declare-global.js
rename to spec/fixtures/module/declare-global.js
diff --git a/spec-main/fixtures/module/declare-process.js b/spec/fixtures/module/declare-process.js
similarity index 100%
rename from spec-main/fixtures/module/declare-process.js
rename to spec/fixtures/module/declare-process.js
diff --git a/spec-main/fixtures/module/echo-renamed.js b/spec/fixtures/module/echo-renamed.js
similarity index 100%
rename from spec-main/fixtures/module/echo-renamed.js
rename to spec/fixtures/module/echo-renamed.js
diff --git a/spec-main/fixtures/module/echo.js b/spec/fixtures/module/echo.js
similarity index 100%
rename from spec-main/fixtures/module/echo.js
rename to spec/fixtures/module/echo.js
diff --git a/spec-main/fixtures/module/preload-sandbox.js b/spec/fixtures/module/preload-sandbox.js
similarity index 100%
rename from spec-main/fixtures/module/preload-sandbox.js
rename to spec/fixtures/module/preload-sandbox.js
diff --git a/spec-main/fixtures/module/print-crash-parameters.js b/spec/fixtures/module/print-crash-parameters.js
similarity index 100%
rename from spec-main/fixtures/module/print-crash-parameters.js
rename to spec/fixtures/module/print-crash-parameters.js
diff --git a/spec-main/fixtures/module/test.coffee b/spec/fixtures/module/test.coffee
similarity index 100%
rename from spec-main/fixtures/module/test.coffee
rename to spec/fixtures/module/test.coffee
diff --git a/spec-main/fixtures/module/uv-dlopen.js b/spec/fixtures/module/uv-dlopen.js
similarity index 100%
rename from spec-main/fixtures/module/uv-dlopen.js
rename to spec/fixtures/module/uv-dlopen.js
diff --git a/spec-main/fixtures/native-addon/echo/binding.cc b/spec/fixtures/native-addon/echo/binding.cc
similarity index 100%
rename from spec-main/fixtures/native-addon/echo/binding.cc
rename to spec/fixtures/native-addon/echo/binding.cc
diff --git a/spec-main/fixtures/native-addon/echo/binding.gyp b/spec/fixtures/native-addon/echo/binding.gyp
similarity index 100%
rename from spec-main/fixtures/native-addon/echo/binding.gyp
rename to spec/fixtures/native-addon/echo/binding.gyp
diff --git a/spec-main/fixtures/native-addon/echo/lib/echo.js b/spec/fixtures/native-addon/echo/lib/echo.js
similarity index 100%
rename from spec-main/fixtures/native-addon/echo/lib/echo.js
rename to spec/fixtures/native-addon/echo/lib/echo.js
diff --git a/spec-main/fixtures/native-addon/echo/package.json b/spec/fixtures/native-addon/echo/package.json
similarity index 100%
rename from spec-main/fixtures/native-addon/echo/package.json
rename to spec/fixtures/native-addon/echo/package.json
diff --git a/spec-main/fixtures/native-addon/uv-dlopen/binding.gyp b/spec/fixtures/native-addon/uv-dlopen/binding.gyp
similarity index 100%
rename from spec-main/fixtures/native-addon/uv-dlopen/binding.gyp
rename to spec/fixtures/native-addon/uv-dlopen/binding.gyp
diff --git a/spec-main/fixtures/native-addon/uv-dlopen/foo.cpp b/spec/fixtures/native-addon/uv-dlopen/foo.cpp
similarity index 100%
rename from spec-main/fixtures/native-addon/uv-dlopen/foo.cpp
rename to spec/fixtures/native-addon/uv-dlopen/foo.cpp
diff --git a/spec-main/fixtures/native-addon/uv-dlopen/index.js b/spec/fixtures/native-addon/uv-dlopen/index.js
similarity index 100%
rename from spec-main/fixtures/native-addon/uv-dlopen/index.js
rename to spec/fixtures/native-addon/uv-dlopen/index.js
diff --git a/spec-main/fixtures/native-addon/uv-dlopen/main.cpp b/spec/fixtures/native-addon/uv-dlopen/main.cpp
similarity index 100%
rename from spec-main/fixtures/native-addon/uv-dlopen/main.cpp
rename to spec/fixtures/native-addon/uv-dlopen/main.cpp
diff --git a/spec-main/fixtures/native-addon/uv-dlopen/package.json b/spec/fixtures/native-addon/uv-dlopen/package.json
similarity index 100%
rename from spec-main/fixtures/native-addon/uv-dlopen/package.json
rename to spec/fixtures/native-addon/uv-dlopen/package.json
diff --git a/spec-main/fixtures/pages/datalist.html b/spec/fixtures/pages/datalist.html
similarity index 100%
rename from spec-main/fixtures/pages/datalist.html
rename to spec/fixtures/pages/datalist.html
diff --git a/spec-main/fixtures/pages/fetch.html b/spec/fixtures/pages/fetch.html
similarity index 100%
rename from spec-main/fixtures/pages/fetch.html
rename to spec/fixtures/pages/fetch.html
diff --git a/spec-main/fixtures/pages/half-background-color.html b/spec/fixtures/pages/half-background-color.html
similarity index 100%
rename from spec-main/fixtures/pages/half-background-color.html
rename to spec/fixtures/pages/half-background-color.html
diff --git a/spec-main/fixtures/pages/jquery-3.6.0.min.js b/spec/fixtures/pages/jquery-3.6.0.min.js
similarity index 100%
rename from spec-main/fixtures/pages/jquery-3.6.0.min.js
rename to spec/fixtures/pages/jquery-3.6.0.min.js
diff --git a/spec-main/fixtures/pages/jquery.html b/spec/fixtures/pages/jquery.html
similarity index 100%
rename from spec-main/fixtures/pages/jquery.html
rename to spec/fixtures/pages/jquery.html
diff --git a/spec/fixtures/pages/native-module.html b/spec/fixtures/pages/native-module.html
index 922a09aeed..a79e881abb 100644
--- a/spec/fixtures/pages/native-module.html
+++ b/spec/fixtures/pages/native-module.html
@@ -2,7 +2,7 @@
 <body>
 <script type="text/javascript" charset="utf-8">
   var path = require('path');
-  console.log(typeof require(path.join(__dirname, '..', '..', '..', 'spec-main', 'node_modules', '@electron-ci', 'echo')));
+  console.log(typeof require(path.join(__dirname, '..', '..', 'node_modules', '@electron-ci', 'echo')));
 </script>
 </body>
 </html>
diff --git a/spec-main/fixtures/pages/overlay.html b/spec/fixtures/pages/overlay.html
similarity index 100%
rename from spec-main/fixtures/pages/overlay.html
rename to spec/fixtures/pages/overlay.html
diff --git a/spec-main/fixtures/pages/pdf-in-iframe.html b/spec/fixtures/pages/pdf-in-iframe.html
similarity index 100%
rename from spec-main/fixtures/pages/pdf-in-iframe.html
rename to spec/fixtures/pages/pdf-in-iframe.html
diff --git a/spec-main/fixtures/pages/webview-devtools.html b/spec/fixtures/pages/webview-devtools.html
similarity index 100%
rename from spec-main/fixtures/pages/webview-devtools.html
rename to spec/fixtures/pages/webview-devtools.html
diff --git a/spec-main/fixtures/preload-expose-ipc.js b/spec/fixtures/preload-expose-ipc.js
similarity index 100%
rename from spec-main/fixtures/preload-expose-ipc.js
rename to spec/fixtures/preload-expose-ipc.js
diff --git a/spec-main/fixtures/release-notes/cache/electron-electron-commit-0600420bac25439fc2067d51c6aaa4ee11770577 b/spec/fixtures/release-notes/cache/electron-electron-commit-0600420bac25439fc2067d51c6aaa4ee11770577
similarity index 100%
rename from spec-main/fixtures/release-notes/cache/electron-electron-commit-0600420bac25439fc2067d51c6aaa4ee11770577
rename to spec/fixtures/release-notes/cache/electron-electron-commit-0600420bac25439fc2067d51c6aaa4ee11770577
diff --git a/spec-main/fixtures/release-notes/cache/electron-electron-commit-2955c67c4ea712fa22773ac9113709fc952bfd49 b/spec/fixtures/release-notes/cache/electron-electron-commit-2955c67c4ea712fa22773ac9113709fc952bfd49
similarity index 100%
rename from spec-main/fixtures/release-notes/cache/electron-electron-commit-2955c67c4ea712fa22773ac9113709fc952bfd49
rename to spec/fixtures/release-notes/cache/electron-electron-commit-2955c67c4ea712fa22773ac9113709fc952bfd49
diff --git a/spec-main/fixtures/release-notes/cache/electron-electron-commit-2fad53e66b1a2cb6f7dad88fe9bb62d7a461fe98 b/spec/fixtures/release-notes/cache/electron-electron-commit-2fad53e66b1a2cb6f7dad88fe9bb62d7a461fe98
similarity index 100%
rename from spec-main/fixtures/release-notes/cache/electron-electron-commit-2fad53e66b1a2cb6f7dad88fe9bb62d7a461fe98
rename to spec/fixtures/release-notes/cache/electron-electron-commit-2fad53e66b1a2cb6f7dad88fe9bb62d7a461fe98
diff --git a/spec-main/fixtures/release-notes/cache/electron-electron-commit-467409458e716c68b35fa935d556050ca6bed1c4 b/spec/fixtures/release-notes/cache/electron-electron-commit-467409458e716c68b35fa935d556050ca6bed1c4
similarity index 100%
rename from spec-main/fixtures/release-notes/cache/electron-electron-commit-467409458e716c68b35fa935d556050ca6bed1c4
rename to spec/fixtures/release-notes/cache/electron-electron-commit-467409458e716c68b35fa935d556050ca6bed1c4
diff --git a/spec-main/fixtures/release-notes/cache/electron-electron-commit-61dc1c88fd34a3e8fff80c80ed79d0455970e610 b/spec/fixtures/release-notes/cache/electron-electron-commit-61dc1c88fd34a3e8fff80c80ed79d0455970e610
similarity index 100%
rename from spec-main/fixtures/release-notes/cache/electron-electron-commit-61dc1c88fd34a3e8fff80c80ed79d0455970e610
rename to spec/fixtures/release-notes/cache/electron-electron-commit-61dc1c88fd34a3e8fff80c80ed79d0455970e610
diff --git a/spec-main/fixtures/release-notes/cache/electron-electron-commit-89eb309d0b22bd4aec058ffaf983e81e56a5c378 b/spec/fixtures/release-notes/cache/electron-electron-commit-89eb309d0b22bd4aec058ffaf983e81e56a5c378
similarity index 100%
rename from spec-main/fixtures/release-notes/cache/electron-electron-commit-89eb309d0b22bd4aec058ffaf983e81e56a5c378
rename to spec/fixtures/release-notes/cache/electron-electron-commit-89eb309d0b22bd4aec058ffaf983e81e56a5c378
diff --git a/spec-main/fixtures/release-notes/cache/electron-electron-commit-8bc0c92137f4a77dc831ca644a86a3e48b51a11e b/spec/fixtures/release-notes/cache/electron-electron-commit-8bc0c92137f4a77dc831ca644a86a3e48b51a11e
similarity index 100%
rename from spec-main/fixtures/release-notes/cache/electron-electron-commit-8bc0c92137f4a77dc831ca644a86a3e48b51a11e
rename to spec/fixtures/release-notes/cache/electron-electron-commit-8bc0c92137f4a77dc831ca644a86a3e48b51a11e
diff --git a/spec-main/fixtures/release-notes/cache/electron-electron-commit-a6ff42c190cb5caf8f3e217748e49183a951491b b/spec/fixtures/release-notes/cache/electron-electron-commit-a6ff42c190cb5caf8f3e217748e49183a951491b
similarity index 100%
rename from spec-main/fixtures/release-notes/cache/electron-electron-commit-a6ff42c190cb5caf8f3e217748e49183a951491b
rename to spec/fixtures/release-notes/cache/electron-electron-commit-a6ff42c190cb5caf8f3e217748e49183a951491b
diff --git a/spec-main/fixtures/release-notes/cache/electron-electron-issue-20214-comments b/spec/fixtures/release-notes/cache/electron-electron-issue-20214-comments
similarity index 100%
rename from spec-main/fixtures/release-notes/cache/electron-electron-issue-20214-comments
rename to spec/fixtures/release-notes/cache/electron-electron-issue-20214-comments
diff --git a/spec-main/fixtures/release-notes/cache/electron-electron-issue-21497-comments b/spec/fixtures/release-notes/cache/electron-electron-issue-21497-comments
similarity index 100%
rename from spec-main/fixtures/release-notes/cache/electron-electron-issue-21497-comments
rename to spec/fixtures/release-notes/cache/electron-electron-issue-21497-comments
diff --git a/spec-main/fixtures/release-notes/cache/electron-electron-issue-21891-comments b/spec/fixtures/release-notes/cache/electron-electron-issue-21891-comments
similarity index 100%
rename from spec-main/fixtures/release-notes/cache/electron-electron-issue-21891-comments
rename to spec/fixtures/release-notes/cache/electron-electron-issue-21891-comments
diff --git a/spec-main/fixtures/release-notes/cache/electron-electron-issue-21946-comments b/spec/fixtures/release-notes/cache/electron-electron-issue-21946-comments
similarity index 100%
rename from spec-main/fixtures/release-notes/cache/electron-electron-issue-21946-comments
rename to spec/fixtures/release-notes/cache/electron-electron-issue-21946-comments
diff --git a/spec-main/fixtures/release-notes/cache/electron-electron-issue-22750-comments b/spec/fixtures/release-notes/cache/electron-electron-issue-22750-comments
similarity index 100%
rename from spec-main/fixtures/release-notes/cache/electron-electron-issue-22750-comments
rename to spec/fixtures/release-notes/cache/electron-electron-issue-22750-comments
diff --git a/spec-main/fixtures/release-notes/cache/electron-electron-issue-22770-comments b/spec/fixtures/release-notes/cache/electron-electron-issue-22770-comments
similarity index 100%
rename from spec-main/fixtures/release-notes/cache/electron-electron-issue-22770-comments
rename to spec/fixtures/release-notes/cache/electron-electron-issue-22770-comments
diff --git a/spec-main/fixtures/release-notes/cache/electron-electron-issue-22828-comments b/spec/fixtures/release-notes/cache/electron-electron-issue-22828-comments
similarity index 100%
rename from spec-main/fixtures/release-notes/cache/electron-electron-issue-22828-comments
rename to spec/fixtures/release-notes/cache/electron-electron-issue-22828-comments
diff --git a/spec-main/fixtures/release-notes/cache/electron-electron-issue-25052-comments b/spec/fixtures/release-notes/cache/electron-electron-issue-25052-comments
similarity index 100%
rename from spec-main/fixtures/release-notes/cache/electron-electron-issue-25052-comments
rename to spec/fixtures/release-notes/cache/electron-electron-issue-25052-comments
diff --git a/spec-main/fixtures/release-notes/cache/electron-electron-issue-25216-comments b/spec/fixtures/release-notes/cache/electron-electron-issue-25216-comments
similarity index 100%
rename from spec-main/fixtures/release-notes/cache/electron-electron-issue-25216-comments
rename to spec/fixtures/release-notes/cache/electron-electron-issue-25216-comments
diff --git a/spec-main/fixtures/release-notes/cache/electron-electron-pull-20214 b/spec/fixtures/release-notes/cache/electron-electron-pull-20214
similarity index 100%
rename from spec-main/fixtures/release-notes/cache/electron-electron-pull-20214
rename to spec/fixtures/release-notes/cache/electron-electron-pull-20214
diff --git a/spec-main/fixtures/release-notes/cache/electron-electron-pull-20620 b/spec/fixtures/release-notes/cache/electron-electron-pull-20620
similarity index 100%
rename from spec-main/fixtures/release-notes/cache/electron-electron-pull-20620
rename to spec/fixtures/release-notes/cache/electron-electron-pull-20620
diff --git a/spec-main/fixtures/release-notes/cache/electron-electron-pull-21497 b/spec/fixtures/release-notes/cache/electron-electron-pull-21497
similarity index 100%
rename from spec-main/fixtures/release-notes/cache/electron-electron-pull-21497
rename to spec/fixtures/release-notes/cache/electron-electron-pull-21497
diff --git a/spec-main/fixtures/release-notes/cache/electron-electron-pull-21591 b/spec/fixtures/release-notes/cache/electron-electron-pull-21591
similarity index 100%
rename from spec-main/fixtures/release-notes/cache/electron-electron-pull-21591
rename to spec/fixtures/release-notes/cache/electron-electron-pull-21591
diff --git a/spec-main/fixtures/release-notes/cache/electron-electron-pull-21891 b/spec/fixtures/release-notes/cache/electron-electron-pull-21891
similarity index 100%
rename from spec-main/fixtures/release-notes/cache/electron-electron-pull-21891
rename to spec/fixtures/release-notes/cache/electron-electron-pull-21891
diff --git a/spec-main/fixtures/release-notes/cache/electron-electron-pull-21946 b/spec/fixtures/release-notes/cache/electron-electron-pull-21946
similarity index 100%
rename from spec-main/fixtures/release-notes/cache/electron-electron-pull-21946
rename to spec/fixtures/release-notes/cache/electron-electron-pull-21946
diff --git a/spec-main/fixtures/release-notes/cache/electron-electron-pull-22750 b/spec/fixtures/release-notes/cache/electron-electron-pull-22750
similarity index 100%
rename from spec-main/fixtures/release-notes/cache/electron-electron-pull-22750
rename to spec/fixtures/release-notes/cache/electron-electron-pull-22750
diff --git a/spec-main/fixtures/release-notes/cache/electron-electron-pull-22770 b/spec/fixtures/release-notes/cache/electron-electron-pull-22770
similarity index 100%
rename from spec-main/fixtures/release-notes/cache/electron-electron-pull-22770
rename to spec/fixtures/release-notes/cache/electron-electron-pull-22770
diff --git a/spec-main/fixtures/release-notes/cache/electron-electron-pull-22828 b/spec/fixtures/release-notes/cache/electron-electron-pull-22828
similarity index 100%
rename from spec-main/fixtures/release-notes/cache/electron-electron-pull-22828
rename to spec/fixtures/release-notes/cache/electron-electron-pull-22828
diff --git a/spec-main/fixtures/release-notes/cache/electron-electron-pull-25052 b/spec/fixtures/release-notes/cache/electron-electron-pull-25052
similarity index 100%
rename from spec-main/fixtures/release-notes/cache/electron-electron-pull-25052
rename to spec/fixtures/release-notes/cache/electron-electron-pull-25052
diff --git a/spec-main/fixtures/release-notes/cache/electron-electron-pull-25216 b/spec/fixtures/release-notes/cache/electron-electron-pull-25216
similarity index 100%
rename from spec-main/fixtures/release-notes/cache/electron-electron-pull-25216
rename to spec/fixtures/release-notes/cache/electron-electron-pull-25216
diff --git a/spec-main/fixtures/sub-frames/debug-frames.html b/spec/fixtures/sub-frames/debug-frames.html
similarity index 100%
rename from spec-main/fixtures/sub-frames/debug-frames.html
rename to spec/fixtures/sub-frames/debug-frames.html
diff --git a/spec-main/fixtures/sub-frames/frame-container-webview.html b/spec/fixtures/sub-frames/frame-container-webview.html
similarity index 100%
rename from spec-main/fixtures/sub-frames/frame-container-webview.html
rename to spec/fixtures/sub-frames/frame-container-webview.html
diff --git a/spec-main/fixtures/sub-frames/frame-container.html b/spec/fixtures/sub-frames/frame-container.html
similarity index 100%
rename from spec-main/fixtures/sub-frames/frame-container.html
rename to spec/fixtures/sub-frames/frame-container.html
diff --git a/spec-main/fixtures/sub-frames/frame-with-frame-container-webview.html b/spec/fixtures/sub-frames/frame-with-frame-container-webview.html
similarity index 100%
rename from spec-main/fixtures/sub-frames/frame-with-frame-container-webview.html
rename to spec/fixtures/sub-frames/frame-with-frame-container-webview.html
diff --git a/spec-main/fixtures/sub-frames/frame-with-frame-container.html b/spec/fixtures/sub-frames/frame-with-frame-container.html
similarity index 100%
rename from spec-main/fixtures/sub-frames/frame-with-frame-container.html
rename to spec/fixtures/sub-frames/frame-with-frame-container.html
diff --git a/spec-main/fixtures/sub-frames/frame-with-frame.html b/spec/fixtures/sub-frames/frame-with-frame.html
similarity index 100%
rename from spec-main/fixtures/sub-frames/frame-with-frame.html
rename to spec/fixtures/sub-frames/frame-with-frame.html
diff --git a/spec-main/fixtures/sub-frames/frame.html b/spec/fixtures/sub-frames/frame.html
similarity index 100%
rename from spec-main/fixtures/sub-frames/frame.html
rename to spec/fixtures/sub-frames/frame.html
diff --git a/spec-main/fixtures/sub-frames/preload.js b/spec/fixtures/sub-frames/preload.js
similarity index 100%
rename from spec-main/fixtures/sub-frames/preload.js
rename to spec/fixtures/sub-frames/preload.js
diff --git a/spec-main/fixtures/sub-frames/test.js b/spec/fixtures/sub-frames/test.js
similarity index 100%
rename from spec-main/fixtures/sub-frames/test.js
rename to spec/fixtures/sub-frames/test.js
diff --git a/spec-main/fixtures/sub-frames/webview-iframe-preload.js b/spec/fixtures/sub-frames/webview-iframe-preload.js
similarity index 100%
rename from spec-main/fixtures/sub-frames/webview-iframe-preload.js
rename to spec/fixtures/sub-frames/webview-iframe-preload.js
diff --git a/spec-main/fixtures/version-bumper/fixture_support.md b/spec/fixtures/version-bumper/fixture_support.md
similarity index 100%
rename from spec-main/fixtures/version-bumper/fixture_support.md
rename to spec/fixtures/version-bumper/fixture_support.md
diff --git a/spec-main/fixtures/webview/fullscreen/frame.html b/spec/fixtures/webview/fullscreen/frame.html
similarity index 100%
rename from spec-main/fixtures/webview/fullscreen/frame.html
rename to spec/fixtures/webview/fullscreen/frame.html
diff --git a/spec-main/fixtures/webview/fullscreen/main.html b/spec/fixtures/webview/fullscreen/main.html
similarity index 100%
rename from spec-main/fixtures/webview/fullscreen/main.html
rename to spec/fixtures/webview/fullscreen/main.html
diff --git a/spec/get-files.ts b/spec/get-files.ts
new file mode 100644
index 0000000000..240a85bd18
--- /dev/null
+++ b/spec/get-files.ts
@@ -0,0 +1,13 @@
+import * as walkdir from 'walkdir';
+
+export async function getFiles (directoryPath: string, { filter = null }: {filter?: ((file: string) => boolean) | null} = {}) {
+  const files: string[] = [];
+  const walker = walkdir(directoryPath, {
+    no_recurse: true
+  });
+  walker.on('file', (file) => {
+    if (!filter || filter(file)) { files.push(file); }
+  });
+  await new Promise((resolve) => walker.on('end', resolve));
+  return files;
+}
diff --git a/spec/global-paths.js b/spec/global-paths.js
deleted file mode 100644
index fdad3fd3dd..0000000000
--- a/spec/global-paths.js
+++ /dev/null
@@ -1,13 +0,0 @@
-const Module = require('module');
-
-module.exports = (paths) => {
-  const nodeModulePaths = Module._nodeModulePaths;
-  Module.ignoreGlobalPathsHack = false;
-  Module._nodeModulePaths = (from) => {
-    if (Module.ignoreGlobalPathsHack) {
-      return nodeModulePaths(from);
-    } else {
-      return nodeModulePaths(from).concat(paths);
-    }
-  };
-};
diff --git a/spec-main/guest-window-manager-spec.ts b/spec/guest-window-manager-spec.ts
similarity index 100%
rename from spec-main/guest-window-manager-spec.ts
rename to spec/guest-window-manager-spec.ts
diff --git a/spec-main/index.js b/spec/index.js
similarity index 88%
rename from spec-main/index.js
rename to spec/index.js
index db24801e9d..e266dff45d 100644
--- a/spec-main/index.js
+++ b/spec/index.js
@@ -1,18 +1,6 @@
 const path = require('path');
 const v8 = require('v8');
 
-module.paths.push(path.resolve(__dirname, '../spec/node_modules'));
-
-// Extra module paths which can be used to load Mocha reporters
-if (process.env.ELECTRON_TEST_EXTRA_MODULE_PATHS) {
-  for (const modulePath of process.env.ELECTRON_TEST_EXTRA_MODULE_PATHS.split(':')) {
-    module.paths.push(modulePath);
-  }
-}
-
-// Add search paths for loaded spec files
-require('../spec/global-paths')(module.paths);
-
 // We want to terminate on errors, not throw up a dialog
 process.on('uncaughtException', (err) => {
   console.error('Unhandled exception in main spec runner:', err);
@@ -117,7 +105,7 @@ app.whenReady().then(async () => {
     return true;
   };
 
-  const getFiles = require('../spec/static/get-files');
+  const { getFiles } = require('./get-files');
   const testFiles = await getFiles(__dirname, { filter });
   testFiles.sort().forEach((file) => {
     mocha.addFile(file);
@@ -141,7 +129,7 @@ app.whenReady().then(async () => {
 
   const runner = mocha.run(cb);
 }).catch((err) => {
-  console.error('An error occurred while running the spec-main spec runner');
+  console.error('An error occurred while running the spec runner');
   console.error(err);
   process.exit(1);
 });
diff --git a/spec-main/internal-spec.ts b/spec/internal-spec.ts
similarity index 100%
rename from spec-main/internal-spec.ts
rename to spec/internal-spec.ts
diff --git a/spec-main/logging-spec.ts b/spec/logging-spec.ts
similarity index 100%
rename from spec-main/logging-spec.ts
rename to spec/logging-spec.ts
diff --git a/spec-main/modules-spec.ts b/spec/modules-spec.ts
similarity index 97%
rename from spec-main/modules-spec.ts
rename to spec/modules-spec.ts
index a83797961f..ce00a077f8 100644
--- a/spec-main/modules-spec.ts
+++ b/spec/modules-spec.ts
@@ -112,15 +112,6 @@ describe('modules support', () => {
   });
 
   describe('Module._nodeModulePaths', () => {
-    // Work around the hack in spec/global-paths.
-    beforeEach(() => {
-      Module.ignoreGlobalPathsHack = true;
-    });
-
-    afterEach(() => {
-      Module.ignoreGlobalPathsHack = false;
-    });
-
     describe('when the path is inside the resources path', () => {
       it('does not include paths outside of the resources path', () => {
         let modulePath = process.resourcesPath;
diff --git a/spec-main/node-spec.ts b/spec/node-spec.ts
similarity index 99%
rename from spec-main/node-spec.ts
rename to spec/node-spec.ts
index a7e00247ea..d30b1f8a5b 100644
--- a/spec-main/node-spec.ts
+++ b/spec/node-spec.ts
@@ -12,7 +12,7 @@ const features = process._linkedBinding('electron_common_features');
 const mainFixturesPath = path.resolve(__dirname, 'fixtures');
 
 describe('node feature', () => {
-  const fixtures = path.join(__dirname, '..', 'spec', 'fixtures');
+  const fixtures = path.join(__dirname, 'fixtures');
 
   describe('child_process', () => {
     describe('child_process.fork', () => {
diff --git a/spec/package.json b/spec/package.json
index d14f50aac7..fd7ea280d5 100644
--- a/spec/package.json
+++ b/spec/package.json
@@ -1,22 +1,32 @@
 {
-  "name": "electron-test",
-  "productName": "Electron Test",
-  "main": "static/main.js",
+  "name": "electron-test-main",
+  "productName": "Electron Test Main",
+  "main": "index.js",
   "version": "0.1.0",
   "devDependencies": {
+    "@electron-ci/echo": "file:./fixtures/native-addon/echo",
+    "@electron-ci/uv-dlopen": "file:./fixtures/native-addon/uv-dlopen/",
+    "@types/sinon": "^9.0.4",
+    "@types/ws": "^7.2.0",
     "basic-auth": "^2.0.1",
+    "busboy": "^0.3.1",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "coffeescript": "^2.4.1",
     "dbus-native": "github:nornagon/dbus-native#master",
     "dirty-chai": "^2.0.1",
+    "get-image-colors": "^4.0.0",
     "graceful-fs": "^4.1.15",
     "is-valid-window": "0.0.5",
     "mkdirp": "^0.5.1",
     "mocha": "^5.2.0",
+    "mocha-appveyor-reporter": "^0.4.2",
     "mocha-junit-reporter": "^1.18.0",
     "mocha-multi-reporters": "^1.1.7",
+    "pdfjs-dist": "^2.2.228",
+    "q": "^1.5.1",
     "send": "^0.16.2",
+    "sinon": "^9.0.1",
     "split": "^1.0.1",
     "temp": "^0.9.0",
     "uuid": "^3.3.3",
@@ -25,9 +35,6 @@
     "ws": "^7.4.6",
     "yargs": "^16.0.3"
   },
-  "dependencies": {
-    "mocha-appveyor-reporter": "^0.4.2"
-  },
   "resolutions": {
     "nan": "github:jkleinsc/nan#remove_accessor_signature"
   }
diff --git a/spec-main/pipe-transport.ts b/spec/pipe-transport.ts
similarity index 100%
rename from spec-main/pipe-transport.ts
rename to spec/pipe-transport.ts
diff --git a/spec-main/release-notes-spec.ts b/spec/release-notes-spec.ts
similarity index 100%
rename from spec-main/release-notes-spec.ts
rename to spec/release-notes-spec.ts
diff --git a/spec-main/screen-helpers.ts b/spec/screen-helpers.ts
similarity index 97%
rename from spec-main/screen-helpers.ts
rename to spec/screen-helpers.ts
index ea9d69e0f1..7a1f7d4a97 100644
--- a/spec-main/screen-helpers.ts
+++ b/spec/screen-helpers.ts
@@ -2,7 +2,7 @@ import * as path from 'path';
 import * as fs from 'fs';
 import { screen, desktopCapturer, NativeImage } from 'electron';
 
-const fixtures = path.resolve(__dirname, '..', 'spec', 'fixtures');
+const fixtures = path.resolve(__dirname, 'fixtures');
 
 /** Chroma key green. */
 export const CHROMA_COLOR_HEX = '#00b140';
diff --git a/spec-main/security-warnings-spec.ts b/spec/security-warnings-spec.ts
similarity index 98%
rename from spec-main/security-warnings-spec.ts
rename to spec/security-warnings-spec.ts
index 22b9697591..3f279ab770 100644
--- a/spec-main/security-warnings-spec.ts
+++ b/spec/security-warnings-spec.ts
@@ -29,7 +29,7 @@ describe('security warnings', () => {
     // Create HTTP Server
     server = http.createServer((request, response) => {
       const uri = url.parse(request.url!).pathname!;
-      let filename = path.join(__dirname, '..', 'spec', 'fixtures', 'pages', uri);
+      let filename = path.join(__dirname, 'fixtures', 'pages', uri);
 
       fs.stat(filename, (error, stats) => {
         if (error) {
diff --git a/spec/spec-helpers.js b/spec/spec-helpers.js
deleted file mode 100644
index 893049a095..0000000000
--- a/spec/spec-helpers.js
+++ /dev/null
@@ -1,4 +0,0 @@
-exports.ifit = (condition) => (condition ? it : it.skip);
-exports.ifdescribe = (condition) => (condition ? describe : describe.skip);
-
-exports.delay = (time = 0) => new Promise(resolve => setTimeout(resolve, time));
diff --git a/spec-main/spec-helpers.ts b/spec/spec-helpers.ts
similarity index 100%
rename from spec-main/spec-helpers.ts
rename to spec/spec-helpers.ts
diff --git a/spec-main/spellchecker-spec.ts b/spec/spellchecker-spec.ts
similarity index 99%
rename from spec-main/spellchecker-spec.ts
rename to spec/spellchecker-spec.ts
index 3cc0581587..f5159cfe4d 100644
--- a/spec-main/spellchecker-spec.ts
+++ b/spec/spellchecker-spec.ts
@@ -62,7 +62,7 @@ ifdescribe(features.isBuiltinSpellCheckerEnabled())('spellchecker', function ()
   });
   after(() => server.close());
 
-  const fixtures = path.resolve(__dirname, '../spec/fixtures');
+  const fixtures = path.resolve(__dirname, 'fixtures');
   const preload = path.join(fixtures, 'module', 'preload-electron.js');
 
   const generateSpecs = (description: string, sandbox: boolean) => {
diff --git a/spec/static/get-files.js b/spec/static/get-files.js
deleted file mode 100644
index 9857d9742e..0000000000
--- a/spec/static/get-files.js
+++ /dev/null
@@ -1,15 +0,0 @@
-async function getFiles (directoryPath, { filter = null } = {}) {
-  const files = [];
-  const walker = require('walkdir').walk(directoryPath, {
-    no_recurse: true
-  });
-  walker.on('file', (file) => {
-    if (!filter || filter(file)) {
-      files.push(file);
-    }
-  });
-  await new Promise((resolve) => walker.on('end', resolve));
-  return files;
-}
-
-module.exports = getFiles;
diff --git a/spec/static/index.html b/spec/static/index.html
deleted file mode 100644
index f69432535a..0000000000
--- a/spec/static/index.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<body>
-<script type="text/javascript" charset="utf-8">
-(async function() {
-  // Deprecated APIs are still supported and should be tested.
-  process.throwDeprecation = false
-
-  const path = require('path')
-  const electron = require('electron')
-  const { ipcRenderer } = electron
-
-  // Extra module paths which can be used to load Mocha reporters
-  if (process.env.ELECTRON_TEST_EXTRA_MODULE_PATHS) {
-    for (const modulePath of process.env.ELECTRON_TEST_EXTRA_MODULE_PATHS.split(':')) {
-      module.paths.push(modulePath);
-    }
-  }
-
-  // Add search paths for loaded spec files
-  require('../global-paths')(module.paths);
-
-  // Set up chai-as-promised here first to avoid conflicts
-  // It must be loaded first or really strange things happen inside
-  // chai that cause test failures
-  // DO NOT MOVE, REMOVE OR EDIT THIS LINE
-  require('chai').use(require('chai-as-promised'))
-
-  // Redirect all output to browser.
-  const fakeConsole = {}
-  for (const k in console) {
-    if (console.hasOwnProperty(k) && k !== 'assert') {
-      fakeConsole[k] = (...args) => ipcRenderer.send('console-call', k, args)
-    }
-  }
-  global.__defineGetter__('console', function () {
-    return fakeConsole
-  })
-
-  const Mocha = require('mocha')
-  const mochaOptions = {}
-  if (process.env.MOCHA_REPORTER) {
-    mochaOptions.reporter = process.env.MOCHA_REPORTER
-  }
-  if (process.env.MOCHA_MULTI_REPORTERS) {
-    mochaOptions.reporterOptions = {
-      reporterEnabled: process.env.MOCHA_MULTI_REPORTERS
-    }
-  }
-  const mocha = new Mocha(mochaOptions)
-
-  if (!process.env.MOCHA_REPORTER) {
-    mocha.ui('bdd').reporter('tap')
-  }
-
-  const mochaTimeout = process.env.MOCHA_TIMEOUT || 30000
-  mocha.timeout(mochaTimeout)
-
-  const query = Mocha.utils.parseQuery(window.location.search || '')
-  if (query.grep) mocha.grep(query.grep)
-  if (query.invert) mocha.invert()
-
-  const filter = (file) => {
-    if (!/-spec\.js$/.test(file)) {
-      return false
-    }
-
-    // This allows you to run specific modules only:
-    // npm run test -match=menu
-    const moduleMatch = process.env.npm_config_match
-      ? new RegExp(process.env.npm_config_match, 'g')
-      : null
-    if (moduleMatch && !moduleMatch.test(file)) {
-      return false
-    }
-
-    const files = query.files ? query.files.split(',') : undefined
-    const baseElectronDir = path.resolve(__dirname, '..', '..')
-    if (files && !files.includes(path.relative(baseElectronDir, file))) {
-      return false
-    }
-
-    return true
-  }
-
-  const getFiles = require('./get-files')
-  const testFiles = await getFiles(path.dirname(__dirname), { filter })
-  testFiles.sort().forEach((file) => {
-    mocha.addFile(file)
-  })
-
-  // Set up chai in the correct order
-  const chai = require('chai')
-  chai.use(require('chai-as-promised'))
-  chai.use(require('dirty-chai'))
-
-  // Show full object diff
-  // https://github.com/chaijs/chai/issues/469
-  chai.config.truncateThreshold = 0;
-
-  const runner = mocha.run(() => {
-    // Ensure the callback is called after runner is defined
-    setTimeout(() => {
-      ipcRenderer.send('process.exit', runner.failures)
-    }, 0)
-  })
-})()
-</script>
-</body>
diff --git a/spec/static/main.js b/spec/static/main.js
deleted file mode 100644
index 8a7afc6482..0000000000
--- a/spec/static/main.js
+++ /dev/null
@@ -1,172 +0,0 @@
-// Deprecated APIs are still supported and should be tested.
-process.throwDeprecation = false;
-
-const electron = require('electron');
-const { app, BrowserWindow, dialog, ipcMain, session } = electron;
-
-try {
-  require('fs').rmdirSync(app.getPath('userData'), { recursive: true });
-} catch (e) {
-  console.warn('Warning: couldn\'t clear user data directory:', e);
-}
-
-const fs = require('fs');
-const path = require('path');
-const util = require('util');
-const v8 = require('v8');
-
-const argv = require('yargs')
-  .boolean('ci')
-  .array('files')
-  .string('g').alias('g', 'grep')
-  .boolean('i').alias('i', 'invert')
-  .argv;
-
-let window = null;
-
-v8.setFlagsFromString('--expose_gc');
-app.commandLine.appendSwitch('js-flags', '--expose_gc');
-app.commandLine.appendSwitch('ignore-certificate-errors');
-app.commandLine.appendSwitch('disable-renderer-backgrounding');
-// Some ports are considered to be "unsafe" by Chromium
-// but Windows on Microsoft-hosted agents sometimes assigns one of them
-// to a Node.js server. Chromium refuses to establish a connection
-// and the whole app crashes with the "Error: net::ERR_UNSAFE_PORT" error.
-// Let's allow connections to those ports to avoid test failures.
-// Use a comma-separated list of ports as a flag value, e.g. "666,667,668".
-app.commandLine.appendSwitch('explicitly-allowed-ports', '2049');
-
-// Disable security warnings (the security warnings test will enable them)
-process.env.ELECTRON_DISABLE_SECURITY_WARNINGS = true;
-
-// Accessing stdout in the main process will result in the process.stdout
-// throwing UnknownSystemError in renderer process sometimes. This line makes
-// sure we can reproduce it in renderer process.
-// eslint-disable-next-line
-process.stdout
-
-// Access console to reproduce #3482.
-// eslint-disable-next-line
-console
-
-ipcMain.on('message', function (event, ...args) {
-  event.sender.send('message', ...args);
-});
-
-ipcMain.handle('get-modules', () => Object.keys(electron));
-ipcMain.handle('get-temp-dir', () => app.getPath('temp'));
-ipcMain.handle('ping', () => null);
-
-// Write output to file if OUTPUT_TO_FILE is defined.
-const outputToFile = process.env.OUTPUT_TO_FILE;
-const print = function (_, method, args) {
-  const output = util.format.apply(null, args);
-  if (outputToFile) {
-    fs.appendFileSync(outputToFile, output + '\n');
-  } else {
-    console[method](output);
-  }
-};
-ipcMain.on('console-call', print);
-
-ipcMain.on('process.exit', function (event, code) {
-  process.exit(code);
-});
-
-ipcMain.on('eval', function (event, script) {
-  event.returnValue = eval(script) // eslint-disable-line
-});
-
-ipcMain.on('echo', function (event, msg) {
-  event.returnValue = msg;
-});
-
-process.removeAllListeners('uncaughtException');
-process.on('uncaughtException', function (error) {
-  console.error(error, error.stack);
-  process.exit(1);
-});
-
-global.nativeModulesEnabled = !process.env.ELECTRON_SKIP_NATIVE_MODULE_TESTS;
-
-app.on('window-all-closed', function () {
-  app.quit();
-});
-
-app.on('child-process-gone', (event, details) => {
-  if (details.type === 'GPU' && details.reason !== 'clean-exit') {
-    if (details.reason === 'crashed') {
-      console.log('GPU process crashed');
-    } else {
-      console.log(`GPU process exited with code ${details.exitCode}`);
-    }
-  }
-});
-
-app.on('renderer-process-crashed', (event, contents, killed) => {
-  console.log(`webContents ${contents.id} crashed: ${contents.getURL()} (killed=${killed})`);
-});
-
-app.whenReady().then(async function () {
-  await session.defaultSession.clearCache();
-  await session.defaultSession.clearStorageData();
-  // Test if using protocol module would crash.
-  electron.protocol.registerStringProtocol('test-if-crashes', function () {});
-
-  window = new BrowserWindow({
-    title: 'Electron Tests',
-    show: false,
-    width: 800,
-    height: 600,
-    webPreferences: {
-      backgroundThrottling: false,
-      nodeIntegration: true,
-      webviewTag: true,
-      contextIsolation: false
-    }
-  });
-  window.loadFile('static/index.html', {
-    query: {
-      grep: argv.grep,
-      invert: argv.invert ? 'true' : '',
-      files: argv.files ? argv.files.join(',') : undefined
-    }
-  });
-  window.on('unresponsive', function () {
-    const chosen = dialog.showMessageBox(window, {
-      type: 'warning',
-      buttons: ['Close', 'Keep Waiting'],
-      message: 'Window is not responding',
-      detail: 'The window is not responding. Would you like to force close it or just keep waiting?'
-    });
-    if (chosen === 0) window.destroy();
-  });
-  window.webContents.on('crashed', function () {
-    console.error('Renderer process crashed');
-    process.exit(1);
-  });
-});
-
-ipcMain.on('handle-unhandled-rejection', (event, message) => {
-  suspendListeners(process, 'unhandledRejection', (error) => {
-    event.returnValue = error.message;
-  });
-  fs.readFile(__filename, () => {
-    Promise.reject(new Error(message));
-  });
-});
-
-// Suspend listeners until the next event and then restore them
-const suspendListeners = (emitter, eventName, callback) => {
-  const listeners = emitter.listeners(eventName);
-  emitter.removeAllListeners(eventName);
-  emitter.once(eventName, (...args) => {
-    emitter.removeAllListeners(eventName);
-    listeners.forEach((listener) => {
-      emitter.on(eventName, listener);
-    });
-
-    // eslint-disable-next-line standard/no-callback-literal
-    callback(...args);
-  });
-};
diff --git a/spec-main/types-spec.ts b/spec/types-spec.ts
similarity index 100%
rename from spec-main/types-spec.ts
rename to spec/types-spec.ts
diff --git a/spec-main/version-bump-spec.ts b/spec/version-bump-spec.ts
similarity index 100%
rename from spec-main/version-bump-spec.ts
rename to spec/version-bump-spec.ts
diff --git a/spec-main/video-helpers.js b/spec/video-helpers.js
similarity index 100%
rename from spec-main/video-helpers.js
rename to spec/video-helpers.js
diff --git a/spec-main/visibility-state-spec.ts b/spec/visibility-state-spec.ts
similarity index 100%
rename from spec-main/visibility-state-spec.ts
rename to spec/visibility-state-spec.ts
diff --git a/spec-main/webview-spec.ts b/spec/webview-spec.ts
similarity index 99%
rename from spec-main/webview-spec.ts
rename to spec/webview-spec.ts
index a587fe7a71..8ccb5265aa 100644
--- a/spec-main/webview-spec.ts
+++ b/spec/webview-spec.ts
@@ -53,7 +53,7 @@ async function loadWebViewAndWaitForMessage (w: WebContents, attributes: Record<
 };
 
 describe('<webview> tag', function () {
-  const fixtures = path.join(__dirname, '..', 'spec', 'fixtures');
+  const fixtures = path.join(__dirname, 'fixtures');
   const blankPageUrl = url.pathToFileURL(path.join(fixtures, 'pages', 'blank.html')).toString();
 
   function hideChildWindows (e: any, wc: WebContents) {
diff --git a/spec-main/window-helpers.ts b/spec/window-helpers.ts
similarity index 100%
rename from spec-main/window-helpers.ts
rename to spec/window-helpers.ts
diff --git a/spec/yarn.lock b/spec/yarn.lock
index 3bb7e4d164..ac0c5d3470 100644
--- a/spec/yarn.lock
+++ b/spec/yarn.lock
@@ -2,15 +2,76 @@
 # yarn lockfile v1
 
 
+"@electron-ci/echo@file:./fixtures/native-addon/echo":
+  version "0.0.1"
+
+"@electron-ci/uv-dlopen@file:./fixtures/native-addon/uv-dlopen":
+  version "0.0.1"
+
 "@nornagon/put@0.0.8":
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/@nornagon/put/-/put-0.0.8.tgz#9d497ec46c9364acc3f8b59aa3cf8ee4134ae337"
   integrity sha512-ugvXJjwF5ldtUpa7D95kruNJ41yFQDEKyF5CW4TgKJnh+W/zmlBzXXeKTyqIgwMFrkePN2JqOBqcF0M0oOunow==
 
-"@types/color-name@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
-  integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
+"@sinonjs/commons@^1", "@sinonjs/commons@^1.6.0", "@sinonjs/commons@^1.7.0", "@sinonjs/commons@^1.7.2":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.0.tgz#c8d68821a854c555bba172f3b06959a0039b236d"
+  integrity sha512-wEj54PfsZ5jGSwMX68G8ZXFawcSglQSXqCftWX3ec8MDUzQdHgcKvw97awHbY0efQEL5iKUOAmmVtoYgmrSG4Q==
+  dependencies:
+    type-detect "4.0.8"
+
+"@sinonjs/fake-timers@^6.0.0", "@sinonjs/fake-timers@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz#293674fccb3262ac782c7aadfdeca86b10c75c40"
+  integrity sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==
+  dependencies:
+    "@sinonjs/commons" "^1.7.0"
+
+"@sinonjs/formatio@^5.0.1":
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-5.0.1.tgz#f13e713cb3313b1ab965901b01b0828ea6b77089"
+  integrity sha512-KaiQ5pBf1MpS09MuA0kp6KBQt2JUOQycqVG1NZXvzeaXe5LGFqAKueIS0bw4w0P9r7KuBSVdUk5QjXsUdu2CxQ==
+  dependencies:
+    "@sinonjs/commons" "^1"
+    "@sinonjs/samsam" "^5.0.2"
+
+"@sinonjs/samsam@^5.0.2", "@sinonjs/samsam@^5.0.3":
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-5.0.3.tgz#86f21bdb3d52480faf0892a480c9906aa5a52938"
+  integrity sha512-QucHkc2uMJ0pFGjJUDP3F9dq5dx8QIaqISl9QgwLOh6P9yv877uONPGXh/OH/0zmM3tW1JjuJltAZV2l7zU+uQ==
+  dependencies:
+    "@sinonjs/commons" "^1.6.0"
+    lodash.get "^4.4.2"
+    type-detect "^4.0.8"
+
+"@sinonjs/text-encoding@^0.7.1":
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5"
+  integrity sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==
+
+"@types/node@*":
+  version "13.7.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.7.0.tgz#b417deda18cf8400f278733499ad5547ed1abec4"
+  integrity sha512-GnZbirvmqZUzMgkFn70c74OQpTTUcCzlhQliTzYjQMqg+hVKcDnxdL19Ne3UdYzdMA/+W3eb646FWn/ZaT1NfQ==
+
+"@types/sinon@^9.0.4":
+  version "9.0.4"
+  resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-9.0.4.tgz#e934f904606632287a6e7f7ab0ce3f08a0dad4b1"
+  integrity sha512-sJmb32asJZY6Z2u09bl0G2wglSxDlROlAejCjsnor+LzBMz17gu8IU7vKC/vWDnv9zEq2wqADHVXFjf4eE8Gdw==
+  dependencies:
+    "@types/sinonjs__fake-timers" "*"
+
+"@types/sinonjs__fake-timers@*":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.1.tgz#681df970358c82836b42f989188d133e218c458e"
+  integrity sha512-yYezQwGWty8ziyYLdZjwxyMb0CZR49h8JALHGrxjQHWlqGgc8kLdHEgWrgL0uZ29DMvEVBDnHU2Wg36zKSIUtA==
+
+"@types/ws@^7.2.0":
+  version "7.2.1"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-7.2.1.tgz#b800f2b8aee694e2b581113643e20d79dd3b8556"
+  integrity sha512-UEmRNbXFGvfs/sLncf01GuVv6U1mZP3Df0iXWx4kUlikJxbFyFADp95mDn1XDTE2mXpzzoHcKlfFcbytLq4vaA==
+  dependencies:
+    "@types/node" "*"
 
 abstract-socket@^2.0.0:
   version "2.1.1"
@@ -20,7 +81,12 @@ abstract-socket@^2.0.0:
     bindings "^1.2.1"
     nan "^2.12.1"
 
-ajv@^6.5.5:
+ajv-keywords@^3.1.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
+  integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
+
+ajv@^6.1.0, ajv@^6.12.3:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -35,23 +101,22 @@ ansi-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1"
   integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==
 
-ansi-regex@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
-  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+ansi-regex@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
 ansi-styles@^4.0.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
-  integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
   dependencies:
-    "@types/color-name" "^1.1.1"
     color-convert "^2.0.1"
 
 asn1@~0.2.3:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
-  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"
+  integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==
   dependencies:
     safer-buffer "~2.1.0"
 
@@ -76,14 +141,14 @@ aws-sign2@~0.7.0:
   integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
 aws4@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
-  integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
+  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
 
 balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
 basic-auth@^2.0.1:
   version "2.0.1"
@@ -99,6 +164,11 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
+big.js@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
+  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
+
 bindings@^1.2.1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
@@ -106,6 +176,11 @@ bindings@^1.2.1:
   dependencies:
     file-uri-to-path "1.0.0"
 
+boolbase@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
+  integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
+
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -119,6 +194,13 @@ browser-stdout@1.3.1:
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
   integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
 
+busboy@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/busboy/-/busboy-0.3.1.tgz#170899274c5bf38aae27d5c62b71268cd585fd1b"
+  integrity sha512-y7tTxhGKXcyBxRKAni+awqx8uqaJKrSFSNFSeRG5CsWNdmy2BIK+6VGWEW7TZnIO/533mtMEA4rOevQV815YJw==
+  dependencies:
+    dicer "0.3.0"
+
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -132,40 +214,75 @@ chai-as-promised@^7.1.1:
     check-error "^1.0.2"
 
 chai@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/chai/-/chai-4.2.0.tgz#760aa72cf20e3795e84b12877ce0e83737aa29e5"
-  integrity sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==
+  version "4.3.6"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.6.tgz#ffe4ba2d9fa9d6680cc0b370adae709ec9011e9c"
+  integrity sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q==
   dependencies:
     assertion-error "^1.1.0"
     check-error "^1.0.2"
     deep-eql "^3.0.1"
     get-func-name "^2.0.0"
-    pathval "^1.1.0"
+    loupe "^2.3.1"
+    pathval "^1.1.1"
     type-detect "^4.0.5"
 
-charenc@~0.0.1:
+charenc@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
-  integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=
+  integrity sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==
 
 check-error@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
   integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=
 
-cliui@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.1.tgz#a4cb67aad45cd83d8d05128fc9f4d8fbb887e6b3"
-  integrity sha512-rcvHOWyGyid6I1WjT/3NatKj2kDt9OdSHSXpyLXaMWFbKpGACNW8pRhhdPUq9MWUOdwn8Rz9AVETjF4105rZZQ==
+cheerio@^0.22.0:
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e"
+  integrity sha1-qbqoYKP5tZWmuBsahocxIe06Jp4=
+  dependencies:
+    css-select "~1.2.0"
+    dom-serializer "~0.1.0"
+    entities "~1.1.1"
+    htmlparser2 "^3.9.1"
+    lodash.assignin "^4.0.9"
+    lodash.bind "^4.1.4"
+    lodash.defaults "^4.0.1"
+    lodash.filter "^4.4.0"
+    lodash.flatten "^4.2.0"
+    lodash.foreach "^4.3.0"
+    lodash.map "^4.4.0"
+    lodash.merge "^4.4.0"
+    lodash.pick "^4.2.1"
+    lodash.reduce "^4.4.0"
+    lodash.reject "^4.4.0"
+    lodash.some "^4.4.0"
+
+chroma-js@^1.1.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/chroma-js/-/chroma-js-1.4.1.tgz#eb2d9c4d1ff24616be84b35119f4d26f8205f134"
+  integrity sha512-jTwQiT859RTFN/vIf7s+Vl/Z2LcMrvMv3WUFmd/4u76AdlFC0NTNgqEEFPcRiHmAswPsMiQEDZLM8vX8qXpZNQ==
+
+chroma-js@^2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/chroma-js/-/chroma-js-2.1.2.tgz#1075cb9ae25bcb2017c109394168b5cf3aa500ec"
+  integrity sha512-ri/ouYDWuxfus3UcaMxC1Tfp3IE9K5iQzxc2hSxbBRVNQFut1UuGAsZmiAf2mOUubzGJwgMSv9lHg+XqLaz1QQ==
+  dependencies:
+    cross-env "^6.0.3"
+
+cliui@^7.0.2:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
   dependencies:
     string-width "^4.2.0"
     strip-ansi "^6.0.0"
     wrap-ansi "^7.0.0"
 
 coffeescript@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-2.4.1.tgz#815fd337df0a34d49e74a98a6ebea9c3e7930f70"
-  integrity sha512-34GV1aHrsMpTaO3KfMJL40ZNuvKDR/g98THHnE9bQj8HjMaZvSrLik99WWqyMhRtbe8V5hpx5iLgdcSvM/S2wg==
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-2.7.0.tgz#a43ec03be6885d6d1454850ea70b9409c391279c"
+  integrity sha512-hzWp6TUE2d/jCcN67LrW1eh5b/rSDKQK6oD6VMLlggYVUUFexgTH9z3dNYihzX4RMhze5FTUsUmOXViJKFQR/A==
 
 color-convert@^2.0.1:
   version "2.0.1"
@@ -194,17 +311,55 @@ commander@2.15.1:
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
 core-util-is@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
-crypt@~0.0.1:
+cross-env@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-6.0.3.tgz#4256b71e49b3a40637a0ce70768a6ef5c72ae941"
+  integrity sha512-+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag==
+  dependencies:
+    cross-spawn "^7.0.0"
+
+cross-spawn@^7.0.0:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  dependencies:
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
+
+crypt@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
-  integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=
+  integrity sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==
+
+css-select@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
+  integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=
+  dependencies:
+    boolbase "~1.0.0"
+    css-what "2.1"
+    domutils "1.5.1"
+    nth-check "~1.0.1"
+
+css-what@2.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
+  integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==
+
+cwise-compiler@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/cwise-compiler/-/cwise-compiler-1.1.3.tgz#f4d667410e850d3a313a7d2db7b1e505bb034cc5"
+  integrity sha1-9NZnQQ6FDToxOn0tt7HlBbsDTMU=
+  dependencies:
+    uniq "^1.0.0"
 
 dashdash@^1.12.0:
   version "1.14.1"
@@ -213,6 +368,11 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
+data-uri-to-buffer@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-0.0.3.tgz#18ae979a6a0ca994b0625853916d2662bbae0b1a"
+  integrity sha1-GK6XmmoMqZSwYlhTkW0mYruuCxo=
+
 "dbus-native@github:nornagon/dbus-native#master":
   version "0.4.0"
   resolved "https://codeload.github.com/nornagon/dbus-native/tar.gz/b90ed62d0b5cb93909173c3e0551d9bff0602a90"
@@ -241,12 +401,12 @@ debug@3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@^3.1.0:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
-  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
+debug@^4.1.1:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
   dependencies:
-    ms "^2.1.1"
+    ms "2.1.2"
 
 deep-eql@^3.0.1:
   version "3.0.1"
@@ -263,27 +423,88 @@ delayed-stream@~1.0.0:
 depd@1.1.2, depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
+  integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
 
 destroy@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
-  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
+  integrity sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg==
+
+dicer@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/dicer/-/dicer-0.3.0.tgz#eacd98b3bfbf92e8ab5c2fdb71aaac44bb06b872"
+  integrity sha512-MdceRRWqltEG2dZqO769g27N/3PXfcKl04VhYnBlo2YhH7zPi88VebsjTKclaOyiuMaGU72hTfw3VkUitGcVCA==
+  dependencies:
+    streamsearch "0.1.2"
 
 diff@3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
   integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
 
+diff@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
+  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
+
 dirty-chai@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/dirty-chai/-/dirty-chai-2.0.1.tgz#6b2162ef17f7943589da840abc96e75bda01aff3"
   integrity sha512-ys79pWKvDMowIDEPC6Fig8d5THiC0DJ2gmTeGzVAoEH18J8OzLud0Jh7I9IWg3NSk8x2UocznUuFmfHCXYZx9w==
 
-duplexer@^0.1.1, duplexer@~0.1.1:
+dom-serializer@0:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
+  integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==
+  dependencies:
+    domelementtype "^2.0.1"
+    entities "^2.0.0"
+
+dom-serializer@~0.1.0:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
-  integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0"
+  integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==
+  dependencies:
+    domelementtype "^1.3.0"
+    entities "^1.1.1"
+
+domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
+  integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
+
+domelementtype@^2.0.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"
+  integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==
+
+domhandler@^2.3.0:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
+  integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==
+  dependencies:
+    domelementtype "1"
+
+domutils@1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
+  integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
+
+domutils@^1.5.1:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
+  integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
+
+duplexer@^0.1.1, duplexer@~0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
+  integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
 
 ecc-jsbn@~0.1.1:
   version "0.1.2"
@@ -296,37 +517,52 @@ ecc-jsbn@~0.1.1:
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
+  integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
+emojis-list@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
+  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
+
 encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
+  integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
 
-escalade@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.0.tgz#e8e2d7c7a8b76f6ee64c2181d6b8151441602d4e"
-  integrity sha512-mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig==
+entities@^1.1.1, entities@~1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
+  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
+
+entities@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
+  integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
+
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
+  integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
 
 escape-string-regexp@1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
 etag@~1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
-  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
+  integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
 
 event-stream@^4.0.0:
   version "4.0.1"
@@ -352,9 +588,9 @@ extsprintf@1.3.0:
   integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
 
 extsprintf@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07"
+  integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==
 
 fast-deep-equal@^3.1.1:
   version "3.1.3"
@@ -388,17 +624,17 @@ form-data@~2.3.2:
 fresh@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
-  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
+  integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
 
 from@^0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"
-  integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=
+  integrity sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==
 
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
 get-caller-file@^2.0.5:
   version "2.0.5"
@@ -408,7 +644,53 @@ get-caller-file@^2.0.5:
 get-func-name@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
-  integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=
+  integrity sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==
+
+get-image-colors@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/get-image-colors/-/get-image-colors-4.0.0.tgz#c8fe161c386b5ae6300d953eac6bccc05a56069d"
+  integrity sha512-qQZ5vyqgJkQp1c8ZRwKGL03oDsyBBUKiwr4GbB2T4F+tHpfQrw1PjKMQai7jcjRdC2wIHl2rV+6ZuHKttpyk7A==
+  dependencies:
+    chroma-js "^2.1.0"
+    get-pixels "^3.3.2"
+    get-rgba-palette "^2.0.1"
+    get-svg-colors "^1.5.1"
+    pify "^5.0.0"
+
+get-pixels@^3.3.2:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/get-pixels/-/get-pixels-3.3.3.tgz#71e2dfd4befb810b5478a61c6354800976ce01c7"
+  integrity sha512-5kyGBn90i9tSMUVHTqkgCHsoWoR+/lGbl4yC83Gefyr0HLIhgSWEx/2F/3YgsZ7UpYNuM6pDhDK7zebrUJ5nXg==
+  dependencies:
+    data-uri-to-buffer "0.0.3"
+    jpeg-js "^0.4.1"
+    mime-types "^2.0.1"
+    ndarray "^1.0.13"
+    ndarray-pack "^1.1.1"
+    node-bitmap "0.0.1"
+    omggif "^1.0.5"
+    parse-data-uri "^0.2.0"
+    pngjs "^3.3.3"
+    request "^2.44.0"
+    through "^2.3.4"
+
+get-rgba-palette@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/get-rgba-palette/-/get-rgba-palette-2.0.1.tgz#5ce70f75c6ef52882f54dd079e5ed68b5a2323ca"
+  integrity sha1-XOcPdcbvUogvVN0Hnl7Wi1ojI8o=
+  dependencies:
+    quantize "^1.0.1"
+
+get-svg-colors@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/get-svg-colors/-/get-svg-colors-1.5.1.tgz#59f4004f5fb4fc0b0eaaec36dce004b3b10f188b"
+  integrity sha512-G3gXrkLrlmv2gqZvs05ap/kcGbchhNtUNaoaP6dIefRcrGPqSa17dGp5ap/2yN8Xs2Wi5mWn16Ww+nFuVU8lTw==
+  dependencies:
+    cheerio "^0.22.0"
+    chroma-js "^1.1.1"
+    is-svg "^3.0.0"
+    lodash.compact "^3.0.0"
+    lodash.uniq "^4.5.0"
 
 getpass@^0.1.1:
   version "0.1.7"
@@ -430,21 +712,21 @@ glob@7.1.2:
     path-is-absolute "^1.0.0"
 
 glob@^7.1.3:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
-  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
-    minimatch "^3.0.4"
+    minimatch "^3.1.1"
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
 graceful-fs@^4.1.15:
-  version "4.1.15"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
-  integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
+  version "4.2.10"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
+  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
 
 growl@1.10.5:
   version "1.10.5"
@@ -456,33 +738,55 @@ har-schema@^2.0.0:
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
   integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
-har-validator@~5.1.0:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
-  integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
+har-validator@~5.1.0, har-validator@~5.1.3:
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
+  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
   dependencies:
-    ajv "^6.5.5"
+    ajv "^6.12.3"
     har-schema "^2.0.0"
 
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+  integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
+
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
 he@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
-  integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0=
+  integrity sha512-z/GDPjlRMNOa2XJiB4em8wJpuuBfrFOlYKTZxtpkdr1uPdibHI8rYA3MY0KDObpVyaes0e/aunid/t88ZI2EKA==
 
 hexy@^0.2.10:
   version "0.2.11"
   resolved "https://registry.yarnpkg.com/hexy/-/hexy-0.2.11.tgz#9939c25cb6f86a91302f22b8a8a72573518e25b4"
   integrity sha512-ciq6hFsSG/Bpt2DmrZJtv+56zpPdnq+NQ4ijEFrveKN0ZG1mhl/LdT1NQZ9se6ty1fACcI4d4vYqC9v8EYpH2A==
 
+html-comment-regex@^1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7"
+  integrity sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==
+
+htmlparser2@^3.9.1:
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
+  integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
+  dependencies:
+    domelementtype "^1.3.1"
+    domhandler "^2.3.0"
+    domutils "^1.5.1"
+    entities "^1.1.1"
+    inherits "^2.0.1"
+    readable-stream "^3.1.1"
+
 http-errors@~1.6.2:
   version "1.6.3"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
-  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
+  integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==
   dependencies:
     depd "~1.1.2"
     inherits "2.0.3"
@@ -501,17 +805,27 @@ http-signature@~1.2.0:
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
   dependencies:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.3:
+inherits@2, inherits@^2.0.1, inherits@^2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+inherits@2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+  integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
 
-is-buffer@~1.1.1:
+iota-array@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/iota-array/-/iota-array-1.0.0.tgz#81ef57fe5d05814cd58c2483632a99c30a0e8087"
+  integrity sha1-ge9X/l0FgUzVjCSDYyqZwwoOgIc=
+
+is-buffer@^1.0.2, is-buffer@~1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
@@ -521,6 +835,13 @@ is-fullwidth-code-point@^3.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
+is-svg@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-3.0.0.tgz#9321dbd29c212e5ca99c4fa9794c714bcafa2f75"
+  integrity sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==
+  dependencies:
+    html-comment-regex "^1.1.0"
+
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -533,11 +854,26 @@ is-valid-window@0.0.5:
   dependencies:
     nan "2.x"
 
+isarray@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
   integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
+jpeg-js@^0.4.1:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.4.4.tgz#a9f1c6f1f9f0fa80cdb3484ed9635054d28936aa"
+  integrity sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==
+
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
@@ -548,27 +884,123 @@ json-schema-traverse@^0.4.1:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
   integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
-json-schema@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
+json-schema@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
+  integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
 
 json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
+json5@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  dependencies:
+    minimist "^1.2.0"
+
 jsprim@^1.2.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb"
+  integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==
   dependencies:
     assert-plus "1.0.0"
     extsprintf "1.3.0"
-    json-schema "0.2.3"
+    json-schema "0.4.0"
     verror "1.10.0"
 
-lodash@^4.16.4:
+just-extend@^4.0.2:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.1.0.tgz#7278a4027d889601640ee0ce0e5a00b992467da4"
+  integrity sha512-ApcjaOdVTJ7y4r08xI5wIqpvwS48Q0PBG4DJROcEkH1f8MdAiNFyFxz3xoL0LWAVwjrwPYZdVHHxhRHcx/uGLA==
+
+loader-utils@^1.0.0:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
+  integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^2.0.0"
+    json5 "^1.0.1"
+
+lodash.assignin@^4.0.9:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"
+  integrity sha1-uo31+4QesKPoBEIysOJjqNxqKKI=
+
+lodash.bind@^4.1.4:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/lodash.bind/-/lodash.bind-4.2.1.tgz#7ae3017e939622ac31b7d7d7dcb1b34db1690d35"
+  integrity sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU=
+
+lodash.compact@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/lodash.compact/-/lodash.compact-3.0.1.tgz#540ce3837745975807471e16b4a2ba21e7256ca5"
+  integrity sha1-VAzjg3dFl1gHRx4WtKK6IeclbKU=
+
+lodash.defaults@^4.0.1:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
+  integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=
+
+lodash.filter@^4.4.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace"
+  integrity sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4=
+
+lodash.flatten@^4.2.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
+  integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=
+
+lodash.foreach@^4.3.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53"
+  integrity sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=
+
+lodash.get@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
+  integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
+
+lodash.map@^4.4.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
+  integrity sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=
+
+lodash.merge@^4.4.0:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
+
+lodash.pick@^4.2.1:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
+  integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=
+
+lodash.reduce@^4.4.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b"
+  integrity sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs=
+
+lodash.reject@^4.4.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.reject/-/lodash.reject-4.6.0.tgz#80d6492dc1470864bbf583533b651f42a9f52415"
+  integrity sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU=
+
+lodash.some@^4.4.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"
+  integrity sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=
+
+lodash.uniq@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
+
+lodash@^4.17.15:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -578,61 +1010,87 @@ long@^4.0.0:
   resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
   integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
 
+loupe@^2.3.1:
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.4.tgz#7e0b9bffc76f148f9be769cb1321d3dcf3cb25f3"
+  integrity sha512-OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ==
+  dependencies:
+    get-func-name "^2.0.0"
+
 map-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.0.7.tgz#8a1f07896d82b10926bd3744a2420009f88974a8"
-  integrity sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=
+  integrity sha512-C0X0KQmGm3N2ftbTGBhSyuydQ+vV1LC3f3zPvT3RXHXNZrvfPZcoXp/N5DOa8vedX/rTMm2CjTtivFg2STJMRQ==
 
 md5@^2.1.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
-  integrity sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/md5/-/md5-2.3.0.tgz#c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f"
+  integrity sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==
   dependencies:
-    charenc "~0.0.1"
-    crypt "~0.0.1"
-    is-buffer "~1.1.1"
+    charenc "0.0.2"
+    crypt "0.0.2"
+    is-buffer "~1.1.6"
 
-mime-db@1.40.0:
-  version "1.40.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
-  integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
+mime-db@1.51.0:
+  version "1.51.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c"
+  integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==
 
-mime-types@^2.1.12, mime-types@~2.1.19:
-  version "2.1.24"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
-  integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==
+mime-types@^2.0.1, mime-types@^2.1.12, mime-types@~2.1.19:
+  version "2.1.34"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24"
+  integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==
   dependencies:
-    mime-db "1.40.0"
+    mime-db "1.51.0"
 
 mime@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
   integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
 
-minimatch@3.0.4, minimatch@^3.0.4:
+minimatch@3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@^3.0.4, minimatch@^3.1.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+  dependencies:
+    brace-expansion "^1.1.7"
+
 minimist@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
+  integrity sha512-miQKw5Hv4NS1Psg2517mV4e4dYNaO3++hjAvLOAzKqZ61rH8NS1SK+vbfBWZ5PY/Me/bEWhUwqMghEW5Fb9T7Q==
+
+minimist@^1.2.0, minimist@^1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
+  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
 minimist@~0.0.1:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
+  integrity sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==
 
-mkdirp@0.5.1, mkdirp@^0.5.1, mkdirp@~0.5.1:
+mkdirp@0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
+  integrity sha512-SknJC52obPfGQPnjIkXbmA6+5H15E+fR+E4iR2oQ3zzCLbd7/ONua69R/Gw7AgkTLsRG+r5fzksYwWe1AgTyWA==
   dependencies:
     minimist "0.0.8"
 
+mkdirp@^0.5.1, mkdirp@~0.5.1:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
+  integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
+  dependencies:
+    minimist "^1.2.6"
+
 mocha-appveyor-reporter@^0.4.2:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/mocha-appveyor-reporter/-/mocha-appveyor-reporter-0.4.2.tgz#feb1dcc77ca0bd11cbda3fd72e5ff187d1e4758d"
@@ -641,9 +1099,9 @@ mocha-appveyor-reporter@^0.4.2:
     request-json "^0.6.4"
 
 mocha-junit-reporter@^1.18.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.22.0.tgz#4eee2f3318398bf424a64b7594ca7a39d924479c"
-  integrity sha512-nRBCVxzYYhOqQr2XlByLRj5MAAy7djArRkGUSx9dGc+B9NMu4yCeo74uXKALAnMhXjuLmtAL9F8WGe3wQV30IA==
+  version "1.23.3"
+  resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.23.3.tgz#941e219dd759ed732f8641e165918aa8b167c981"
+  integrity sha512-ed8LqbRj1RxZfjt/oC9t12sfrWsjZ3gNnbhV1nuj9R/Jb5/P3Xb4duv2eCfCDMYH+fEu0mqca7m4wsiVjsxsvA==
   dependencies:
     debug "^2.2.0"
     md5 "^2.1.0"
@@ -652,12 +1110,12 @@ mocha-junit-reporter@^1.18.0:
     xml "^1.0.0"
 
 mocha-multi-reporters@^1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/mocha-multi-reporters/-/mocha-multi-reporters-1.1.7.tgz#cc7f3f4d32f478520941d852abb64d9988587d82"
-  integrity sha1-zH8/TTL0eFIJQdhSq7ZNmYhYfYI=
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/mocha-multi-reporters/-/mocha-multi-reporters-1.5.1.tgz#c73486bed5519e1d59c9ce39ac7a9792600e5676"
+  integrity sha512-Yb4QJOaGLIcmB0VY7Wif5AjvLMUFAdV57D2TWEva1Y0kU/3LjKpeRVmlMIfuO1SVbauve459kgtIizADqxMWPg==
   dependencies:
-    debug "^3.1.0"
-    lodash "^4.16.4"
+    debug "^4.1.1"
+    lodash "^4.17.15"
 
 mocha@^5.2.0:
   version "5.2.0"
@@ -679,50 +1137,118 @@ mocha@^5.2.0:
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
 
-ms@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
 nan@2.x, nan@^2.12.1, "nan@github:jkleinsc/nan#remove_accessor_signature":
   version "2.16.0"
   resolved "https://codeload.github.com/jkleinsc/nan/tar.gz/6a2f95a6a2209d8aa7542fb18099fd808a802059"
 
+ndarray-pack@^1.1.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ndarray-pack/-/ndarray-pack-1.2.1.tgz#8caebeaaa24d5ecf70ff86020637977da8ee585a"
+  integrity sha1-jK6+qqJNXs9w/4YCBjeXfajuWFo=
+  dependencies:
+    cwise-compiler "^1.1.2"
+    ndarray "^1.0.13"
+
+ndarray@^1.0.13:
+  version "1.0.19"
+  resolved "https://registry.yarnpkg.com/ndarray/-/ndarray-1.0.19.tgz#6785b5f5dfa58b83e31ae5b2a058cfd1ab3f694e"
+  integrity sha512-B4JHA4vdyZU30ELBw3g7/p9bZupyew5a7tX1Y/gGeF2hafrPaQZhgrGQfsvgfYbgdFZjYwuEcnaobeM/WMW+HQ==
+  dependencies:
+    iota-array "^1.0.0"
+    is-buffer "^1.0.2"
+
+nise@^4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/nise/-/nise-4.0.3.tgz#9f79ff02fa002ed5ffbc538ad58518fa011dc913"
+  integrity sha512-EGlhjm7/4KvmmE6B/UFsKh7eHykRl9VH+au8dduHLCyWUO/hr7+N+WtTvDUwc9zHuM1IaIJs/0lQ6Ag1jDkQSg==
+  dependencies:
+    "@sinonjs/commons" "^1.7.0"
+    "@sinonjs/fake-timers" "^6.0.0"
+    "@sinonjs/text-encoding" "^0.7.1"
+    just-extend "^4.0.2"
+    path-to-regexp "^1.7.0"
+
+node-bitmap@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/node-bitmap/-/node-bitmap-0.0.1.tgz#180eac7003e0c707618ef31368f62f84b2a69091"
+  integrity sha1-GA6scAPgxwdhjvMTaPYvhLKmkJE=
+
+node-ensure@^0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/node-ensure/-/node-ensure-0.0.0.tgz#ecae764150de99861ec5c810fd5d096b183932a7"
+  integrity sha1-7K52QVDemYYexcgQ/V0Jaxg5Mqc=
+
+nth-check@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
+  integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==
+  dependencies:
+    boolbase "~1.0.0"
+
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
   integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
+omggif@^1.0.5:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/omggif/-/omggif-1.0.10.tgz#ddaaf90d4a42f532e9e7cb3a95ecdd47f17c7b19"
+  integrity sha512-LMJTtvgc/nugXj0Vcrrs68Mn2D1r0zf630VNtqtpI1FEO7e+O9FP4gqs9AcnBaSEeoHIPm28u6qgPR0oyEpGSw==
+
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
-  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
+  integrity sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==
   dependencies:
     ee-first "1.1.1"
 
 once@^1.3.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
   dependencies:
     wrappy "1"
 
 optimist@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
-  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
+  integrity sha512-snN4O4TkigujZphWLN0E//nQmm7790RYaE53DdL7ZYwee2D8DDo9/EyYiKUfN3rneWUjhJnueija3G9I2i0h3g==
   dependencies:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
 
+parse-data-uri@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/parse-data-uri/-/parse-data-uri-0.2.0.tgz#bf04d851dd5c87b0ab238e5d01ace494b604b4c9"
+  integrity sha1-vwTYUd1ch7CrI45dAazklLYEtMk=
+  dependencies:
+    data-uri-to-buffer "0.0.3"
+
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
-pathval@^1.1.0:
+path-key@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+
+path-to-regexp@^1.7.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
+  integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==
+  dependencies:
+    isarray "0.0.1"
+
+pathval@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d"
   integrity sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==
@@ -730,44 +1256,86 @@ pathval@^1.1.0:
 pause-stream@^0.0.11:
   version "0.0.11"
   resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"
-  integrity sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=
+  integrity sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==
   dependencies:
     through "~2.3"
 
+pdfjs-dist@^2.2.228:
+  version "2.2.228"
+  resolved "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-2.2.228.tgz#777b068a0a16c96418433303807c183058b47aaa"
+  integrity sha512-W5LhYPMS2UKX0ELIa4u+CFCMoox5qQNQElt0bAK2mwz1V8jZL0rvLao+0tBujce84PK6PvWG36Nwr7agCCWFGQ==
+  dependencies:
+    node-ensure "^0.0.0"
+    worker-loader "^2.0.0"
+
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
+pify@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-5.0.0.tgz#1f5eca3f5e87ebec28cc6d54a0e4aaf00acc127f"
+  integrity sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==
+
+pngjs@^3.3.3:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f"
+  integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==
+
 psl@^1.1.24:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.2.0.tgz#df12b5b1b3a30f51c329eacbdef98f3a6e136dc6"
-  integrity sha512-GEn74ZffufCmkDDLNcl3uuyF/aSD6exEyh1v/ZSdAomB82t6G9hzJVRx0jBmLDW+VfZqks3aScmMw9DszwUalA==
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
+  integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
+
+psl@^1.1.28:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
+  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
 
 punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
+  integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==
 
-punycode@^2.1.0:
+punycode@^2.1.0, punycode@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
+q@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
+  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
+
 qs@~6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
-  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
+  integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
+
+quantize@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/quantize/-/quantize-1.0.2.tgz#d25ac200a77b6d70f40127ca171a10e33c8546de"
+  integrity sha1-0lrCAKd7bXD0ASfKFxoQ4zyFRt4=
 
 range-parser@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
-  integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
+
+readable-stream@^3.1.1:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
 
 request-json@^0.6.4:
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/request-json/-/request-json-0.6.4.tgz#9eff076f105a445d5996d921b58b757ce5300a21"
-  integrity sha512-bLlMqD0RFG63ErZ/jS0wvKsIJyM2qq5j7Bw4+nubiDysCeinLrUPUmBXLmcflEYm5IO9tGlKJfRhzeDIUB8sjQ==
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/request-json/-/request-json-0.6.5.tgz#dda8c08245aca950f5f7842ae68495fd23df0ecb"
+  integrity sha512-bpJ0MZPeb3+/8ux/jM+CLRghTOQ8Oh2VuqtnrPu9ZnSIjr/77sOj/rSWfK9cPRpp3U0UWAIv7rsRvSlyRwbmsw==
   dependencies:
     depd "1.1.2"
     request "2.88.0"
@@ -798,10 +1366,36 @@ request@2.88.0:
     tunnel-agent "^0.6.0"
     uuid "^3.3.2"
 
+request@^2.44.0:
+  version "2.88.2"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.3"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.5.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
 
 rimraf@~2.6.2:
   version "2.6.3"
@@ -810,15 +1404,15 @@ rimraf@~2.6.2:
   dependencies:
     glob "^7.1.3"
 
-safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.1:
+safe-buffer@5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@^5.1.2:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
-  integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
+safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
 safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
@@ -830,6 +1424,14 @@ sax@>=0.6.0:
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
+schema-utils@^0.4.0:
+  version "0.4.7"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
+  integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
+  dependencies:
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
+
 send@^0.16.2:
   version "0.16.2"
   resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
@@ -854,6 +1456,31 @@ setprototypeof@1.1.0:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
   integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
 
+shebang-command@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+  dependencies:
+    shebang-regex "^3.0.0"
+
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+
+sinon@^9.0.1:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/sinon/-/sinon-9.0.2.tgz#b9017e24633f4b1c98dfb6e784a5f0509f5fd85d"
+  integrity sha512-0uF8Q/QHkizNUmbK3LRFqx5cpTttEVXudywY9Uwzy8bTfZUhljZ7ARzSxnRHWYWtVTeh4Cw+tTb3iU21FQVO9A==
+  dependencies:
+    "@sinonjs/commons" "^1.7.2"
+    "@sinonjs/fake-timers" "^6.0.1"
+    "@sinonjs/formatio" "^5.0.1"
+    "@sinonjs/samsam" "^5.0.3"
+    diff "^4.0.2"
+    nise "^4.0.1"
+    supports-color "^7.1.0"
+
 split@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
@@ -862,9 +1489,9 @@ split@^1.0.1:
     through "2"
 
 sshpk@^1.7.0:
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
-  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5"
+  integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
@@ -879,7 +1506,7 @@ sshpk@^1.7.0:
 "statuses@>= 1.4.0 < 2":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
-  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
+  integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
 
 statuses@~1.4.0:
   version "1.4.0"
@@ -889,33 +1516,45 @@ statuses@~1.4.0:
 stream-combiner@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.2.2.tgz#aec8cbac177b56b6f4fa479ced8c1912cee52858"
-  integrity sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=
+  integrity sha512-6yHMqgLYDzQDcAkL+tjJDC5nSNuNIx0vZtRZeiPh7Saef7VHX9H5Ijn9l2VIol2zaNYlYEX6KyuT/237A58qEQ==
   dependencies:
     duplexer "~0.1.1"
     through "~2.3.4"
 
+streamsearch@0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a"
+  integrity sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo=
+
 string-width@^4.1.0, string-width@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
-  integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
   dependencies:
     emoji-regex "^8.0.0"
     is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.0"
+    strip-ansi "^6.0.1"
+
+string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
 
 strip-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
+  integrity sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
-  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
   dependencies:
-    ansi-regex "^5.0.0"
+    ansi-regex "^5.0.1"
 
 supports-color@5.4.0:
   version "5.4.0"
@@ -924,17 +1563,25 @@ supports-color@5.4.0:
   dependencies:
     has-flag "^3.0.0"
 
-temp@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/temp/-/temp-0.9.0.tgz#61391795a11bd9738d4c4d7f55f012cb8f55edaa"
-  integrity sha512-YfUhPQCJoNQE5N+FJQcdPz63O3x3sdT4Xju69Gj4iZe0lBKOtnAMi0SLj9xKhGkcGhsxThvTJ/usxtFPo438zQ==
+supports-color@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
+  integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
   dependencies:
+    has-flag "^4.0.0"
+
+temp@^0.9.0:
+  version "0.9.4"
+  resolved "https://registry.yarnpkg.com/temp/-/temp-0.9.4.tgz#cd20a8580cb63635d0e4e9d4bd989d44286e7620"
+  integrity sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==
+  dependencies:
+    mkdirp "^0.5.1"
     rimraf "~2.6.2"
 
-through@2, through@^2.3.8, through@~2.3, through@~2.3.4:
+through@2, through@^2.3.4, through@^2.3.8, through@~2.3, through@~2.3.4:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
+  integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
 
 tough-cookie@~2.4.3:
   version "2.4.3"
@@ -944,6 +1591,14 @@ tough-cookie@~2.4.3:
     psl "^1.1.24"
     punycode "^1.4.1"
 
+tough-cookie@~2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+  dependencies:
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
@@ -956,11 +1611,16 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
   integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
-type-detect@^4.0.0, type-detect@^4.0.5:
+type-detect@4.0.8, type-detect@^4.0.0, type-detect@^4.0.5, type-detect@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
   integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
 
+uniq@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
+  integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
+
 uri-js@^4.2.2:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
@@ -968,15 +1628,15 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
-uuid@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
-  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
+util-deprecate@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
-uuid@^3.3.3:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866"
-  integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==
+uuid@^3.3.2, uuid@^3.3.3:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
 verror@1.10.0:
   version "1.10.0"
@@ -992,15 +1652,30 @@ walkdir@^0.3.2:
   resolved "https://registry.yarnpkg.com/walkdir/-/walkdir-0.3.2.tgz#ac8437a288c295656848ebc19981ebc677a5f590"
   integrity sha512-0Twghia4Z5wDGDYWURlhZmI47GvERMCsXIu0QZWVVZyW9ZjpbbZvD9Zy9M6cWiQQRRbAcYajIyKNavaZZDt1Uw==
 
+which@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
 winreg@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/winreg/-/winreg-1.2.4.tgz#ba065629b7a925130e15779108cf540990e98d1b"
-  integrity sha1-ugZWKbepJRMOFXeRCM9UCZDpjRs=
+  integrity sha512-IHpzORub7kYlb8A43Iig3reOvlcBJGX9gZ0WycHhghHtA65X0LYnMRuJs+aH1abVnMJztQkvQNlltnbPi5aGIA==
 
 wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
+  integrity sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==
+
+worker-loader@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/worker-loader/-/worker-loader-2.0.0.tgz#45fda3ef76aca815771a89107399ee4119b430ac"
+  integrity sha512-tnvNp4K3KQOpfRnD20m8xltE3eWh89Ye+5oj7wXEEHKac1P4oZ6p9oTj8/8ExqoSBnk9nu5Pr4nKfQ1hn2APJw==
+  dependencies:
+    loader-utils "^1.0.0"
+    schema-utils "^0.4.0"
 
 wrap-ansi@^7.0.0:
   version "7.0.0"
@@ -1014,7 +1689,7 @@ wrap-ansi@^7.0.0:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
 ws@^7.4.6:
   version "7.4.6"
@@ -1022,42 +1697,42 @@ ws@^7.4.6:
   integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
 
 xml2js@^0.4.17:
-  version "0.4.19"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"
-  integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==
+  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
+  integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==
   dependencies:
     sax ">=0.6.0"
-    xmlbuilder "~9.0.1"
+    xmlbuilder "~11.0.0"
 
 xml@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
-  integrity sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=
+  integrity sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw==
 
-xmlbuilder@~9.0.1:
-  version "9.0.7"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
-  integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
+xmlbuilder@~11.0.0:
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
+  integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
 
-y18n@^5.0.1:
-  version "5.0.5"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18"
-  integrity sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==
+y18n@^5.0.5:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
-yargs-parser@^20.0.0:
-  version "20.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.0.0.tgz#c65a1daaa977ad63cebdd52159147b789a4e19a9"
-  integrity sha512-8eblPHTL7ZWRkyjIZJjnGf+TijiKJSwA24svzLRVvtgoi/RZiKa9fFQTrlx0OKLnyHSdt/enrdadji6WFfESVA==
+yargs-parser@^20.2.2:
+  version "20.2.9"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
 yargs@^16.0.3:
-  version "16.0.3"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.0.3.tgz#7a919b9e43c90f80d4a142a89795e85399a7e54c"
-  integrity sha512-6+nLw8xa9uK1BOEOykaiYAJVh6/CjxWXK/q9b5FpRgNslt8s22F2xMBqVIKgCRjNgGvGPBy8Vog7WN7yh4amtA==
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
   dependencies:
-    cliui "^7.0.0"
-    escalade "^3.0.2"
+    cliui "^7.0.2"
+    escalade "^3.1.1"
     get-caller-file "^2.0.5"
     require-directory "^2.1.1"
     string-width "^4.2.0"
-    y18n "^5.0.1"
-    yargs-parser "^20.0.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
diff --git a/tsconfig.spec.json b/tsconfig.spec.json
index a5e21627eb..452690921e 100644
--- a/tsconfig.spec.json
+++ b/tsconfig.spec.json
@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "include": [
-    "spec-main",
+    "spec",
     "typings"
   ]
 }