Upgrading storybook from 6.3 to 6.5 fixing shell-quote vulnerability (#15684)

* Updating storybook from 6.3 to 6.5 * Some lavamoat policy overrides for eslint
2 years ago · 100fbbfaca
parent 4de0f86a15
commit 100fbbfaca
9 changed files with 1632 additions and 1331 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@ -1,8 +1,11 @@
 const path = require('path');
+
 const { version: reactVersion } = require('react/package.json');

 module.exports = {
  root: true,
+  // Suggested addition from the storybook 6.5 update
+  extends: ['plugin:storybook/recommended'],
  // Ignore files which are also in .prettierignore
  ignorePatterns: [
    'app/vendor/**',
@ -22,7 +25,6 @@ module.exports = {
     * because we do not allow a file to use two different styles for specifying
     * imports and exports (however theoretically possible it may be).
     */
-
    {
      /**
       * Modules (CommonJS module syntax)
@ -128,11 +130,9 @@ module.exports = {
        'import/namespace': 'off',
        'import/default': 'off',
        'import/no-named-as-default-member': 'off',
-
        // Disabled due to incompatibility with Record<string, unknown>.
        // See: <https://github.com/Microsoft/TypeScript/issues/15300#issuecomment-702872440>
        '@typescript-eslint/consistent-type-definitions': 'off',
-
        // Modified to include the 'ignoreRestSiblings' option.
        // TODO: Migrate this rule change back into `@metamask/eslint-config`
        '@typescript-eslint/no-unused-vars': [
@ -165,7 +165,6 @@ module.exports = {
        sourceType: 'script',
      },
    },
-
    /**
     * == Everything else ==
     *
@ -198,7 +197,10 @@ module.exports = {
        'react/jsx-boolean-value': 'error',
        'react/jsx-curly-brace-presence': [
          'error',
-          { props: 'never', children: 'never' },
+          {
+            props: 'never',
+            children: 'never',
+          },
        ],
        'react/no-deprecated': 'error',
        'react/default-props-match-prop-types': 'error',
@ -276,15 +278,20 @@ module.exports = {
        'import/named': 'off',
        'jest/no-large-snapshots': [
          'error',
-          { maxSize: 50, inlineMaxSize: 50 },
+          {
+            maxSize: 50,
+            inlineMaxSize: 50,
+          },
        ],
        'jest/no-restricted-matchers': 'off',
+
        /**
         * jest/prefer-to-be is a new rule that was disabled to reduce churn
         * when upgrading eslint. It should be considered for use and enabled
         * in a future PR if agreeable.
         */
        'jest/prefer-to-be': 'off',
+
        /**
         * jest/lowercase-name was renamed to jest/prefer-lowercase-title this
         * change was made to essentially retain the same state as the original
@ -292,7 +299,12 @@ module.exports = {
         * two lines can be deleted.
         */
        'jest/lowercase-name': 'off',
-        'jest/prefer-lowercase-title': ['error', { ignore: ['describe'] }],
+        'jest/prefer-lowercase-title': [
+          'error',
+          {
+            ignore: ['describe'],
+          },
+        ],
      },
    },
    /**
@ -301,7 +313,12 @@ module.exports = {
    {
      files: ['app/scripts/migrations/*.js', '**/*.stories.js'],
      rules: {
-        'import/no-anonymous-default-export': ['error', { allowObject: true }],
+        'import/no-anonymous-default-export': [
+          'error',
+          {
+            allowObject: true,
+          },
+        ],
      },
    },
    /**
@ -347,7 +364,13 @@ module.exports = {
    {
      files: ['ui/pages/settings/*.js'],
      rules: {
-        'sort-keys': ['error', 'asc', { natural: true }],
+        'sort-keys': [
+          'error',
+          'asc',
+          {
+            natural: true,
+          },
+        ],
      },
    },
  ],
--- a/.storybook/main.js
+++ b/.storybook/main.js
@ -16,6 +16,7 @@ module.exports = {
    './i18n-party-addon/register.js',
    'storybook-dark-mode',
  ],
+  staticDirs: ['../app', './images'],
  // Uses babel.config.js settings and prevents "Missing class properties transform" error
  babel: async (options) => ({ overrides: options.overrides }),
  webpackFinal: async (config) => {
@ -23,7 +24,9 @@ module.exports = {
    config.node = {
      __filename: true,
    };
-    config.resolve.alias['webextension-polyfill'] = require.resolve('./__mocks__/webextension-polyfill.js')
+    config.resolve.alias['webextension-polyfill'] = require.resolve(
+      './__mocks__/webextension-polyfill.js',
+    );
    config.module.strictExportPresence = true;
    config.module.rules.push({
      test: /\.scss$/,
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@ -764,7 +764,7 @@
        "3box>ipfs>ipld-raw>multihashing-async": true,
        "3box>ipfs>multicodec": true,
        "3box>ipfs>protons": true,
-        "@storybook/client-api>stable": true,
+        "@storybook/react>@storybook/store>stable": true,
        "browserify>assert": true,
        "browserify>buffer": true,
        "browserify>insert-module-globals>is-buffer": true
@ -3366,7 +3366,7 @@
        "localStorage": true
      }
    },
-    "@storybook/client-api>stable": {
+    "@storybook/react>@storybook/store>stable": {
      "globals": {
        "define": true
      }
@ -6064,9 +6064,9 @@
    "react-router-dom>react-router>mini-create-react-context": {
      "packages": {
        "@babel/runtime": true,
-        "@storybook/api>@reach/router>create-react-context>gud": true,
        "prop-types": true,
        "react": true,
+        "react-router-dom>react-router>mini-create-react-context>gud": true,
        "react-router-dom>tiny-warning": true
      }
    },
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@ -764,7 +764,7 @@
        "3box>ipfs>ipld-raw>multihashing-async": true,
        "3box>ipfs>multicodec": true,
        "3box>ipfs>protons": true,
-        "@storybook/client-api>stable": true,
+        "@storybook/react>@storybook/store>stable": true,
        "browserify>assert": true,
        "browserify>buffer": true,
        "browserify>insert-module-globals>is-buffer": true
@ -2228,7 +2228,7 @@
      },
      "packages": {
        "@babel/core>@ampproject/remapping>@jridgewell/gen-mapping": true,
-        "@babel/core>@ampproject/remapping>@jridgewell/trace-mapping": true
+        "terser>@jridgewell/source-map>@jridgewell/trace-mapping": true
      }
    },
    "@babel/core>@ampproject/remapping>@jridgewell/gen-mapping": {
@ -2236,22 +2236,8 @@
        "define": true
      },
      "packages": {
-        "@babel/core>@babel/generator>@jridgewell/gen-mapping>@jridgewell/set-array": true,
-        "@babel/core>@babel/generator>@jridgewell/gen-mapping>@jridgewell/sourcemap-codec": true
-      }
-    },
-    "@babel/core>@ampproject/remapping>@jridgewell/trace-mapping": {
-      "globals": {
-        "define": true
-      },
-      "packages": {
-        "@babel/core>@ampproject/remapping>@jridgewell/trace-mapping>@jridgewell/resolve-uri": true,
-        "@babel/core>@babel/generator>@jridgewell/gen-mapping>@jridgewell/sourcemap-codec": true
-      }
-    },
-    "@babel/core>@ampproject/remapping>@jridgewell/trace-mapping>@jridgewell/resolve-uri": {
-      "globals": {
-        "define": true
+        "terser>@jridgewell/source-map>@jridgewell/gen-mapping>@jridgewell/set-array": true,
+        "terser>@jridgewell/source-map>@jridgewell/gen-mapping>@jridgewell/sourcemap-codec": true
      }
    },
    "@babel/core>@babel/generator": {
@ -2259,34 +2245,10 @@
        "console.error": true
      },
      "packages": {
-        "@babel/core>@babel/generator>@jridgewell/gen-mapping": true,
        "@babel/core>@babel/generator>jsesc": true,
        "@babel/core>@babel/types": true,
-        "browserify>buffer": true
-      }
-    },
-    "@babel/core>@babel/generator>@jridgewell/gen-mapping": {
-      "globals": {
-        "define": true
-      },
-      "packages": {
-        "@babel/core>@ampproject/remapping>@jridgewell/trace-mapping": true,
-        "@babel/core>@babel/generator>@jridgewell/gen-mapping>@jridgewell/set-array": true,
-        "@babel/core>@babel/generator>@jridgewell/gen-mapping>@jridgewell/sourcemap-codec": true
-      }
-    },
-    "@babel/core>@babel/generator>@jridgewell/gen-mapping>@jridgewell/set-array": {
-      "globals": {
-        "define": true
-      }
-    },
-    "@babel/core>@babel/generator>@jridgewell/gen-mapping>@jridgewell/sourcemap-codec": {
-      "globals": {
-        "TextDecoder": true,
-        "define": true
-      },
-      "packages": {
-        "browserify>buffer": true
+        "browserify>buffer": true,
+        "terser>@jridgewell/source-map>@jridgewell/gen-mapping": true
      }
    },
    "@babel/core>@babel/generator>jsesc": {
@ -3912,7 +3874,7 @@
        "localStorage": true
      }
    },
-    "@storybook/client-api>stable": {
+    "@storybook/react>@storybook/store>stable": {
      "globals": {
        "define": true
      }
@ -6676,9 +6638,9 @@
    "react-router-dom>react-router>mini-create-react-context": {
      "packages": {
        "@babel/runtime": true,
-        "@storybook/api>@reach/router>create-react-context>gud": true,
        "prop-types": true,
        "react": true,
+        "react-router-dom>react-router>mini-create-react-context>gud": true,
        "react-router-dom>tiny-warning": true
      }
    },
@ -6905,6 +6867,44 @@
        "jsdom>request>is-typedarray": true
      }
    },
+    "terser>@jridgewell/source-map>@jridgewell/gen-mapping": {
+      "globals": {
+        "define": true
+      },
+      "packages": {
+        "terser>@jridgewell/source-map>@jridgewell/gen-mapping>@jridgewell/set-array": true,
+        "terser>@jridgewell/source-map>@jridgewell/gen-mapping>@jridgewell/sourcemap-codec": true,
+        "terser>@jridgewell/source-map>@jridgewell/trace-mapping": true
+      }
+    },
+    "terser>@jridgewell/source-map>@jridgewell/gen-mapping>@jridgewell/set-array": {
+      "globals": {
+        "define": true
+      }
+    },
+    "terser>@jridgewell/source-map>@jridgewell/gen-mapping>@jridgewell/sourcemap-codec": {
+      "globals": {
+        "TextDecoder": true,
+        "define": true
+      },
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "terser>@jridgewell/source-map>@jridgewell/trace-mapping": {
+      "globals": {
+        "define": true
+      },
+      "packages": {
+        "terser>@jridgewell/source-map>@jridgewell/gen-mapping>@jridgewell/sourcemap-codec": true,
+        "terser>@jridgewell/source-map>@jridgewell/trace-mapping>@jridgewell/resolve-uri": true
+      }
+    },
+    "terser>@jridgewell/source-map>@jridgewell/trace-mapping>@jridgewell/resolve-uri": {
+      "globals": {
+        "define": true
+      }
+    },
    "terser>source-map-support>buffer-from": {
      "packages": {
        "browserify>buffer": true
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@ -764,7 +764,7 @@
        "3box>ipfs>ipld-raw>multihashing-async": true,
        "3box>ipfs>multicodec": true,
        "3box>ipfs>protons": true,
-        "@storybook/client-api>stable": true,
+        "@storybook/react>@storybook/store>stable": true,
        "browserify>assert": true,
        "browserify>buffer": true,
        "browserify>insert-module-globals>is-buffer": true
@ -3366,7 +3366,7 @@
        "localStorage": true
      }
    },
-    "@storybook/client-api>stable": {
+    "@storybook/react>@storybook/store>stable": {
      "globals": {
        "define": true
      }
@ -6064,9 +6064,9 @@
    "react-router-dom>react-router>mini-create-react-context": {
      "packages": {
        "@babel/runtime": true,
-        "@storybook/api>@reach/router>create-react-context>gud": true,
        "prop-types": true,
        "react": true,
+        "react-router-dom>react-router>mini-create-react-context>gud": true,
        "react-router-dom>tiny-warning": true
      }
    },
--- a/lavamoat/build-system/policy-override.json
+++ b/lavamoat/build-system/policy-override.json
@ -91,6 +91,8 @@
      "packages": {
        "eslint-plugin-jest>@typescript-eslint/experimental-utils>@typescript-eslint/types": true,
        "eslint-plugin-jest>@typescript-eslint/utils>eslint-utils": true,
+        "eslint-plugin-jest>@typescript-eslint/utils>@typescript-eslint/types": true,
+        "eslint-plugin-jest>@typescript-eslint/utils>@typescript-eslint/scope-manager": true,
        "@typescript-eslint/parser>@typescript-eslint/types": true,
        "eslint": true,
        "@typescript-eslint/parser>@typescript-eslint/scope-manager": true,
@ -99,6 +101,36 @@
        "eslint>eslint-utils": true
      }
    },
+    "eslint-plugin-jest>@typescript-eslint/utils>@typescript-eslint/scope-manager>@typescript-eslint/visitor-keys": {
+      "builtin": {
+        "path": true
+      },
+      "packages": {
+        "eslint>eslint-visitor-keys": true
+      }
+    },
+    "@typescript-eslint/eslint-plugin>@typescript-eslint/utils": {
+      "builtin": {
+        "path": true
+      },
+      "packages": {
+        "eslint>eslint-utils": true,
+        "@typescript-eslint/parser>@typescript-eslint/types": true,
+        "eslint": true,
+        "@typescript-eslint/parser>@typescript-eslint/scope-manager": true,
+        "@babel/eslint-parser>eslint-scope": true,
+        "@typescript-eslint/utils": true
+      }
+    },
+    "eslint-plugin-jest>@typescript-eslint/utils>@typescript-eslint/scope-manager": {
+      "builtin": {
+        "path": true
+      },
+      "packages": {
+        "eslint-plugin-jest>@typescript-eslint/utils>@typescript-eslint/scope-manager>@typescript-eslint/visitor-keys": true,
+        "eslint-plugin-jest>@typescript-eslint/utils>@typescript-eslint/types": true
+      }
+    },
    "eslint-plugin-jest>@typescript-eslint/experimental-utils": {
      "builtin": {
        "path": true
@ -121,6 +153,7 @@
    "@typescript-eslint/eslint-plugin>@typescript-eslint/type-utils": {
      "packages": {
        "@typescript-eslint/eslint-plugin>@typescript-eslint/type-utils>debug": true,
+        "@typescript-eslint/eslint-plugin>@typescript-eslint/utils": true,
        "@typescript-eslint/eslint-plugin>tsutils": true,
        "eslint-plugin-jest>@typescript-eslint/utils": true,
        "eslint>debug": true,
@ -142,6 +175,7 @@
        "typescript": true,
        "eslint-plugin-jest>@typescript-eslint/utils": true,
        "@typescript-eslint/eslint-plugin>@typescript-eslint/type-utils": true,
+        "@typescript-eslint/eslint-plugin>@typescript-eslint/utils": true,
        "@typescript-eslint/parser>@typescript-eslint/scope-manager": true,
        "@typescript-eslint/eslint-plugin>tsutils": true,
        "eslint>debug": true,
--- a/lavamoat/build-system/policy.json
+++ b/lavamoat/build-system/policy.json
@ -62,7 +62,7 @@
      },
      "packages": {
        "@babel/core>@ampproject/remapping>@jridgewell/gen-mapping": true,
-        "@babel/core>@ampproject/remapping>@jridgewell/trace-mapping": true
+        "terser>@jridgewell/source-map>@jridgewell/trace-mapping": true
      }
    },
    "@babel/core>@ampproject/remapping>@jridgewell/gen-mapping": {
@ -70,22 +70,8 @@
        "define": true
      },
      "packages": {
-        "@babel/core>@babel/generator>@jridgewell/gen-mapping>@jridgewell/set-array": true,
-        "@babel/core>@babel/generator>@jridgewell/gen-mapping>@jridgewell/sourcemap-codec": true
-      }
-    },
-    "@babel/core>@ampproject/remapping>@jridgewell/trace-mapping": {
-      "globals": {
-        "define": true
-      },
-      "packages": {
-        "@babel/core>@ampproject/remapping>@jridgewell/trace-mapping>@jridgewell/resolve-uri": true,
-        "@babel/core>@babel/generator>@jridgewell/gen-mapping>@jridgewell/sourcemap-codec": true
-      }
-    },
-    "@babel/core>@ampproject/remapping>@jridgewell/trace-mapping>@jridgewell/resolve-uri": {
-      "globals": {
-        "define": true
+        "terser>@jridgewell/source-map>@jridgewell/gen-mapping>@jridgewell/set-array": true,
+        "terser>@jridgewell/source-map>@jridgewell/gen-mapping>@jridgewell/sourcemap-codec": true
      }
    },
    "@babel/core>@babel/generator": {
@ -93,31 +79,9 @@
        "console.error": true
      },
      "packages": {
-        "@babel/core>@babel/generator>@jridgewell/gen-mapping": true,
        "@babel/core>@babel/generator>jsesc": true,
-        "@babel/core>@babel/types": true
-      }
-    },
-    "@babel/core>@babel/generator>@jridgewell/gen-mapping": {
-      "globals": {
-        "define": true
-      },
-      "packages": {
-        "@babel/core>@ampproject/remapping>@jridgewell/trace-mapping": true,
-        "@babel/core>@babel/generator>@jridgewell/gen-mapping>@jridgewell/set-array": true,
-        "@babel/core>@babel/generator>@jridgewell/gen-mapping>@jridgewell/sourcemap-codec": true
-      }
-    },
-    "@babel/core>@babel/generator>@jridgewell/gen-mapping>@jridgewell/set-array": {
-      "globals": {
-        "define": true
-      }
-    },
-    "@babel/core>@babel/generator>@jridgewell/gen-mapping>@jridgewell/sourcemap-codec": {
-      "globals": {
-        "Buffer": true,
-        "TextDecoder": true,
-        "define": true
+        "@babel/core>@babel/types": true,
+        "terser>@jridgewell/source-map>@jridgewell/gen-mapping": true
      }
    },
    "@babel/core>@babel/generator>jsesc": {
@ -1092,11 +1056,6 @@
        "define": true
      }
    },
-    "@storybook/addon-essentials>@storybook/addon-docs>acorn-walk": {
-      "globals": {
-        "define": true
-      }
-    },
    "@storybook/addon-essentials>@storybook/addon-docs>remark-slug>unist-util-visit": {
      "packages": {
        "@storybook/addon-essentials>@storybook/addon-docs>remark-slug>unist-util-visit>unist-util-visit-parents": true
@ -1117,47 +1076,20 @@
        "util.deprecate": true
      }
    },
-    "@storybook/components>react-syntax-highlighter>refractor>parse-entities": {
-      "packages": {
-        "@storybook/components>react-syntax-highlighter>refractor>parse-entities>character-entities": true,
-        "@storybook/components>react-syntax-highlighter>refractor>parse-entities>character-entities-legacy": true,
-        "@storybook/components>react-syntax-highlighter>refractor>parse-entities>character-reference-invalid": true,
-        "@storybook/components>react-syntax-highlighter>refractor>parse-entities>is-alphanumerical": true,
-        "@storybook/components>react-syntax-highlighter>refractor>parse-entities>is-hexadecimal": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>is-decimal": true
-      }
-    },
-    "@storybook/components>react-syntax-highlighter>refractor>parse-entities>is-alphanumerical": {
-      "packages": {
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>is-alphabetical": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>is-decimal": true
-      }
-    },
-    "@storybook/react>@storybook/core-common>glob-base": {
-      "builtin": {
-        "path.dirname": true
-      },
-      "packages": {
-        "@storybook/react>@storybook/core-common>glob-base>glob-parent": true,
-        "@storybook/react>@storybook/core-common>glob-base>is-glob": true
-      }
-    },
-    "@storybook/react>@storybook/core-common>glob-base>glob-parent": {
-      "builtin": {
-        "path.dirname": true
-      },
-      "packages": {
-        "@storybook/react>@storybook/core-common>glob-base>is-glob": true
+    "@storybook/react>acorn-walk": {
+      "globals": {
+        "define": true
      }
    },
-    "@storybook/react>@storybook/core-common>glob-base>is-glob": {
-      "packages": {
-        "gulp-watch>anymatch>micromatch>is-extglob": true
+    "@storybook/react>webpack>json-parse-even-better-errors": {
+      "globals": {
+        "Buffer.isBuffer": true
      }
    },
    "@typescript-eslint/eslint-plugin": {
      "packages": {
        "@typescript-eslint/eslint-plugin>@typescript-eslint/type-utils": true,
+        "@typescript-eslint/eslint-plugin>@typescript-eslint/utils": true,
        "@typescript-eslint/eslint-plugin>tsutils": true,
        "@typescript-eslint/parser>@typescript-eslint/scope-manager": true,
        "eslint": true,
@ -1172,6 +1104,7 @@
    "@typescript-eslint/eslint-plugin>@typescript-eslint/type-utils": {
      "packages": {
        "@typescript-eslint/eslint-plugin>@typescript-eslint/type-utils>debug": true,
+        "@typescript-eslint/eslint-plugin>@typescript-eslint/utils": true,
        "@typescript-eslint/eslint-plugin>tsutils": true,
        "eslint-plugin-jest>@typescript-eslint/utils": true,
        "eslint>debug": true,
@ -1188,6 +1121,19 @@
        "@typescript-eslint/eslint-plugin>@typescript-eslint/type-utils>debug>ms": true
      }
    },
+    "@typescript-eslint/eslint-plugin>@typescript-eslint/utils": {
+      "builtin": {
+        "path": true
+      },
+      "packages": {
+        "@babel/eslint-parser>eslint-scope": true,
+        "@typescript-eslint/parser>@typescript-eslint/scope-manager": true,
+        "@typescript-eslint/parser>@typescript-eslint/types": true,
+        "@typescript-eslint/utils": true,
+        "eslint": true,
+        "eslint>eslint-utils": true
+      }
+    },
    "@typescript-eslint/eslint-plugin>tsutils": {
      "packages": {
        "@sentry/utils>tslib": true,
@ -1386,7 +1332,7 @@
    },
    "brfs>static-module>acorn-node": {
      "packages": {
-        "@storybook/addon-essentials>@storybook/addon-docs>acorn-walk": true,
+        "@storybook/react>acorn-walk": true,
        "brfs>static-module>acorn-node>acorn": true,
        "watchify>xtend": true
      }
@ -2080,8 +2026,8 @@
    "depcheck>cosmiconfig>parse-json": {
      "packages": {
        "@babel/code-frame": true,
+        "@storybook/react>webpack>json-parse-even-better-errors": true,
        "depcheck>cosmiconfig>parse-json>error-ex": true,
-        "depcheck>cosmiconfig>parse-json>json-parse-even-better-errors": true,
        "depcheck>cosmiconfig>parse-json>lines-and-columns": true
      }
    },
@ -2093,11 +2039,6 @@
        "depcheck>cosmiconfig>parse-json>error-ex>is-arrayish": true
      }
    },
-    "depcheck>cosmiconfig>parse-json>json-parse-even-better-errors": {
-      "globals": {
-        "Buffer.isBuffer": true
-      }
-    },
    "depcheck>cosmiconfig>yaml": {
      "globals": {
        "Buffer": true,
@ -2564,11 +2505,30 @@
        "@typescript-eslint/parser>@typescript-eslint/types": true,
        "eslint": true,
        "eslint-plugin-jest>@typescript-eslint/experimental-utils>@typescript-eslint/types": true,
+        "eslint-plugin-jest>@typescript-eslint/utils>@typescript-eslint/scope-manager": true,
+        "eslint-plugin-jest>@typescript-eslint/utils>@typescript-eslint/types": true,
        "eslint-plugin-jest>@typescript-eslint/utils>eslint-utils": true,
        "eslint>eslint-scope": true,
        "eslint>eslint-utils": true
      }
    },
+    "eslint-plugin-jest>@typescript-eslint/utils>@typescript-eslint/scope-manager": {
+      "builtin": {
+        "path": true
+      },
+      "packages": {
+        "eslint-plugin-jest>@typescript-eslint/utils>@typescript-eslint/scope-manager>@typescript-eslint/visitor-keys": true,
+        "eslint-plugin-jest>@typescript-eslint/utils>@typescript-eslint/types": true
+      }
+    },
+    "eslint-plugin-jest>@typescript-eslint/utils>@typescript-eslint/scope-manager>@typescript-eslint/visitor-keys": {
+      "builtin": {
+        "path": true
+      },
+      "packages": {
+        "eslint>eslint-visitor-keys": true
+      }
+    },
    "eslint-plugin-jest>@typescript-eslint/utils>eslint-utils": {
      "packages": {
        "eslint-plugin-jest>@typescript-eslint/utils>eslint-utils>eslint-visitor-keys": true
@ -2632,10 +2592,15 @@
    },
    "eslint-plugin-node>eslint-plugin-es": {
      "packages": {
-        "eslint-plugin-node>eslint-utils": true,
+        "eslint-plugin-node>eslint-plugin-es>eslint-utils": true,
        "eslint>regexpp": true
      }
    },
+    "eslint-plugin-node>eslint-plugin-es>eslint-utils": {
+      "packages": {
+        "eslint-plugin-node>eslint-plugin-es>eslint-utils>eslint-visitor-keys": true
+      }
+    },
    "eslint-plugin-node>eslint-utils": {
      "packages": {
        "eslint-plugin-node>eslint-utils>eslint-visitor-keys": true
@ -2864,7 +2829,7 @@
      "packages": {
        "eslint>eslint-visitor-keys": true,
        "eslint>espree>acorn-jsx": true,
-        "ts-node>acorn": true
+        "terser>acorn": true
      }
    },
    "eslint>espree>acorn-jsx": {
@ -4189,12 +4154,34 @@
    },
    "gulp-watch>anymatch>micromatch>parse-glob": {
      "packages": {
-        "@storybook/react>@storybook/core-common>glob-base": true,
        "gulp-watch>anymatch>micromatch>is-extglob": true,
+        "gulp-watch>anymatch>micromatch>parse-glob>glob-base": true,
        "gulp-watch>anymatch>micromatch>parse-glob>is-dotfile": true,
        "gulp-watch>anymatch>micromatch>parse-glob>is-glob": true
      }
    },
+    "gulp-watch>anymatch>micromatch>parse-glob>glob-base": {
+      "builtin": {
+        "path.dirname": true
+      },
+      "packages": {
+        "gulp-watch>anymatch>micromatch>parse-glob>glob-base>glob-parent": true,
+        "gulp-watch>anymatch>micromatch>parse-glob>glob-base>is-glob": true
+      }
+    },
+    "gulp-watch>anymatch>micromatch>parse-glob>glob-base>glob-parent": {
+      "builtin": {
+        "path.dirname": true
+      },
+      "packages": {
+        "gulp-watch>anymatch>micromatch>parse-glob>glob-base>is-glob": true
+      }
+    },
+    "gulp-watch>anymatch>micromatch>parse-glob>glob-base>is-glob": {
+      "packages": {
+        "gulp-watch>anymatch>micromatch>is-extglob": true
+      }
+    },
    "gulp-watch>anymatch>micromatch>parse-glob>is-glob": {
      "packages": {
        "gulp-watch>anymatch>micromatch>is-extglob": true
@ -7110,7 +7097,6 @@
    },
    "stylelint>@stylelint/postcss-markdown>remark>remark-parse": {
      "packages": {
-        "@storybook/components>react-syntax-highlighter>refractor>parse-entities": true,
        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>ccount": true,
        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>collapse-white-space": true,
        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>is-alphabetical": true,
@ -7118,6 +7104,7 @@
        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>is-whitespace-character": true,
        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>is-word-character": true,
        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>markdown-escapes": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>parse-entities": true,
        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>state-toggle": true,
        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>trim": true,
        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>trim-trailing-lines": true,
@ -7128,6 +7115,22 @@
        "webpack>micromatch>braces>fill-range>repeat-string": true
      }
    },
+    "stylelint>@stylelint/postcss-markdown>remark>remark-parse>parse-entities": {
+      "packages": {
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>is-decimal": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>parse-entities>character-entities": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>parse-entities>character-entities-legacy": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>parse-entities>character-reference-invalid": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>parse-entities>is-alphanumerical": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>parse-entities>is-hexadecimal": true
+      }
+    },
+    "stylelint>@stylelint/postcss-markdown>remark>remark-parse>parse-entities>is-alphanumerical": {
+      "packages": {
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>is-alphabetical": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>is-decimal": true
+      }
+    },
    "stylelint>@stylelint/postcss-markdown>remark>remark-parse>unherit": {
      "packages": {
        "pumpify>inherits": true,
@ -7141,11 +7144,11 @@
    },
    "stylelint>@stylelint/postcss-markdown>remark>remark-stringify": {
      "packages": {
-        "@storybook/components>react-syntax-highlighter>refractor>parse-entities": true,
        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>ccount": true,
        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>is-decimal": true,
        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>is-whitespace-character": true,
        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>markdown-escapes": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>parse-entities": true,
        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>state-toggle": true,
        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>unherit": true,
        "stylelint>@stylelint/postcss-markdown>remark>remark-stringify>is-alphanumeric": true,
@ -7169,10 +7172,10 @@
    },
    "stylelint>@stylelint/postcss-markdown>remark>remark-stringify>stringify-entities": {
      "packages": {
-        "@storybook/components>react-syntax-highlighter>refractor>parse-entities>character-entities-legacy": true,
-        "@storybook/components>react-syntax-highlighter>refractor>parse-entities>is-alphanumerical": true,
-        "@storybook/components>react-syntax-highlighter>refractor>parse-entities>is-hexadecimal": true,
        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>is-decimal": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>parse-entities>character-entities-legacy": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>parse-entities>is-alphanumerical": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>parse-entities>is-hexadecimal": true,
        "stylelint>@stylelint/postcss-markdown>remark>remark-stringify>stringify-entities>character-entities-html4": true
      }
    },
@ -7642,17 +7645,60 @@
        "console.log": true,
        "console.warn": true,
        "define": true,
-        "process.argv": true,
-        "process.exit": true,
-        "process.platform": true,
-        "process.stderr.write": true,
-        "process.stdin.on": true,
-        "process.stdin.resume": true,
-        "process.stdin.setEncoding": true
+        "process": true
      },
      "packages": {
-        "source-map": true,
-        "ts-node>acorn": true
+        "terser>@jridgewell/source-map": true,
+        "terser>acorn": true
+      }
+    },
+    "terser>@jridgewell/source-map": {
+      "globals": {
+        "Buffer": true,
+        "TextDecoder": true,
+        "define": true
+      }
+    },
+    "terser>@jridgewell/source-map>@jridgewell/gen-mapping": {
+      "globals": {
+        "define": true
+      },
+      "packages": {
+        "terser>@jridgewell/source-map>@jridgewell/gen-mapping>@jridgewell/set-array": true,
+        "terser>@jridgewell/source-map>@jridgewell/gen-mapping>@jridgewell/sourcemap-codec": true,
+        "terser>@jridgewell/source-map>@jridgewell/trace-mapping": true
+      }
+    },
+    "terser>@jridgewell/source-map>@jridgewell/gen-mapping>@jridgewell/set-array": {
+      "globals": {
+        "define": true
+      }
+    },
+    "terser>@jridgewell/source-map>@jridgewell/gen-mapping>@jridgewell/sourcemap-codec": {
+      "globals": {
+        "Buffer": true,
+        "TextDecoder": true,
+        "define": true
+      }
+    },
+    "terser>@jridgewell/source-map>@jridgewell/trace-mapping": {
+      "globals": {
+        "define": true
+      },
+      "packages": {
+        "terser>@jridgewell/source-map>@jridgewell/gen-mapping>@jridgewell/sourcemap-codec": true,
+        "terser>@jridgewell/source-map>@jridgewell/trace-mapping>@jridgewell/resolve-uri": true
+      }
+    },
+    "terser>@jridgewell/source-map>@jridgewell/trace-mapping>@jridgewell/resolve-uri": {
+      "globals": {
+        "define": true
+      }
+    },
+    "terser>acorn": {
+      "globals": {
+        "console": true,
+        "define": true
      }
    },
    "terser>source-map-support": {
@ -7700,12 +7746,6 @@
        "pumpify>inherits": true
      }
    },
-    "ts-node>acorn": {
-      "globals": {
-        "console": true,
-        "define": true
-      }
-    },
    "tsutils": {
      "packages": {
        "tslib": true,
--- a/package.json
+++ b/package.json
@ -64,9 +64,9 @@
    "devtools:redux": "remotedev --hostname=localhost --port=8000",
    "start:dev": "concurrently -k -n build,react,redux yarn:start yarn:devtools:react yarn:devtools:redux",
    "announce": "node development/announcer.js",
-    "storybook": "start-storybook -p 6006 -c .storybook -s ./app,./.storybook/images",
+    "storybook": "start-storybook -p 6006 -c .storybook",
    "storybook:test": "jest --config=./jest.stories.config.js",
-    "storybook:build": "build-storybook -c .storybook -o storybook-build -s ./app,./.storybook/images",
+    "storybook:build": "build-storybook -c .storybook -o storybook-build",
    "storybook:deploy": "storybook-to-ghpages --existing-output-dir storybook-build --remote storybook --branch master",
    "update-changelog": "auto-changelog update",
    "generate:migration": "./development/generate-migration.sh",
@ -104,7 +104,6 @@
    "netmask": "^2.0.1",
    "pubnub/superagent-proxy": "^3.0.0",
    "pull-ws": "^3.3.2",
-    "ws": "^7.4.6",
    "json-schema": "^0.4.0",
    "simple-get": "^4.0.1"
  },
@ -258,19 +257,19 @@
    "@metamask/phishing-warning": "^1.2.1",
    "@metamask/test-dapp": "^5.2.0",
    "@sentry/cli": "^1.58.0",
-    "@storybook/addon-a11y": "^6.3.12",
-    "@storybook/addon-actions": "^6.3.12",
-    "@storybook/addon-essentials": "^6.3.12",
-    "@storybook/addon-knobs": "^6.3.1",
-    "@storybook/addons": "^6.3.12",
-    "@storybook/api": "^6.3.12",
-    "@storybook/client-api": "^6.3.12",
-    "@storybook/components": "^6.3.12",
-    "@storybook/core": "^6.3.12",
-    "@storybook/core-events": "^6.3.0",
-    "@storybook/react": "^6.3.12",
-    "@storybook/storybook-deployer": "^2.8.10",
-    "@storybook/theming": "^6.3.0",
+    "@storybook/addon-a11y": "^6.5.10",
+    "@storybook/addon-actions": "^6.5.10",
+    "@storybook/addon-essentials": "^6.5.10",
+    "@storybook/addon-knobs": "^6.4.0",
+    "@storybook/addons": "^6.5.10",
+    "@storybook/api": "^6.5.10",
+    "@storybook/client-api": "^6.5.10",
+    "@storybook/components": "^6.5.10",
+    "@storybook/core": "^6.5.10",
+    "@storybook/core-events": "^6.5.10",
+    "@storybook/react": "^6.5.10",
+    "@storybook/storybook-deployer": "^2.8.12",
+    "@storybook/theming": "^6.5.10",
    "@testing-library/jest-dom": "^5.11.10",
    "@testing-library/react": "^10.4.8",
    "@testing-library/react-hooks": "^3.2.1",
@ -327,6 +326,7 @@
    "eslint-plugin-prettier": "^4.2.1",
    "eslint-plugin-react": "^7.23.1",
    "eslint-plugin-react-hooks": "^4.2.0",
+    "eslint-plugin-storybook": "^0.6.4",
    "fancy-log": "^1.3.3",
    "fast-glob": "^3.2.2",
    "fs-extra": "^8.1.0",
@ -386,7 +386,7 @@
    "source-map": "^0.7.2",
    "source-map-explorer": "^2.4.2",
    "squirrelly": "^8.0.8",
-    "storybook-dark-mode": "^1.0.9",
+    "storybook-dark-mode": "^1.1.0",
    "string.prototype.matchall": "^4.0.2",
    "style-loader": "^0.21.0",
    "stylelint": "^13.6.1",
@ -471,7 +471,9 @@
      "@keystonehq/bc-ur-registry-eth>hdkey>secp256k1": false,
      "@metamask/rpc-methods>@metamask/key-tree>secp256k1": false,
      "eth-lattice-keyring>gridplus-sdk>secp256k1": false,
-      "eth-lattice-keyring>secp256k1": false
+      "eth-lattice-keyring>secp256k1": false,
+      "@storybook/react>@pmmmwh/react-refresh-webpack-plugin>core-js-pure": false,
+      "@testing-library/jest-dom>aria-query>@babel/runtime-corejs3>core-js-pure": false
    }
  }
 }
--- a/yarn.lock
+++ b/yarn.lock