Merge branch 'develop' into 17191/onboarding-unit-tests

MetaMask · Mar 11, 2023 · 6b9c367 · 6b9c367
2 parents c1df571 + 5d5fa24
commit 6b9c367
Show file tree

Hide file tree

Showing 30 changed files with 783 additions and 333 deletions.
diff --git a/.depcheckrc.yml b/.depcheckrc.yml
@@ -46,6 +46,8 @@ ignores:
   - '@storybook/builder-webpack5'
   - '@storybook/manager-webpack5'
   - 'storybook-dark-mode'
+  - '@whitespace/storybook-addon-html'
+  - 'react-syntax-highlighter'
   - 'style-loader'
   - 'css-loader'
   - 'sass-loader'

diff --git a/.storybook/main.js b/.storybook/main.js
@@ -23,6 +23,7 @@ module.exports = {
     '@storybook/addon-knobs',
     './i18n-party-addon/register.js',
     'storybook-dark-mode',
+    '@whitespace/storybook-addon-html'
   ],
   staticDirs: ['../app', './images'],
   // Uses babel.config.js settings and prevents "Missing class properties transform" error

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json
@@ -4302,18 +4302,13 @@
       "packages": {
         "react-markdown>remark-parse>mdast-util-from-markdown>mdast-util-to-string": true,
         "react-markdown>remark-parse>mdast-util-from-markdown>micromark": true,
-        "react-markdown>remark-parse>mdast-util-from-markdown>parse-entities": true,
-        "react-markdown>vfile>unist-util-stringify-position": true
+        "react-markdown>vfile>unist-util-stringify-position": true,
+        "react-syntax-highlighter>refractor>parse-entities": true
       }
     },
     "react-markdown>remark-parse>mdast-util-from-markdown>micromark": {
       "packages": {
-        "react-markdown>remark-parse>mdast-util-from-markdown>parse-entities": true
-      }
-    },
-    "react-markdown>remark-parse>mdast-util-from-markdown>parse-entities": {
-      "globals": {
-        "document.createElement": true
+        "react-syntax-highlighter>refractor>parse-entities": true
       }
     },
     "react-markdown>remark-rehype": {
@@ -4532,6 +4527,11 @@
         "react": true
       }
     },
+    "react-syntax-highlighter>refractor>parse-entities": {
+      "globals": {
+        "document.createElement": true
+      }
+    },
     "react-tippy": {
       "globals": {
         "Element": true,

diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
@@ -4302,18 +4302,13 @@
       "packages": {
         "react-markdown>remark-parse>mdast-util-from-markdown>mdast-util-to-string": true,
         "react-markdown>remark-parse>mdast-util-from-markdown>micromark": true,
-        "react-markdown>remark-parse>mdast-util-from-markdown>parse-entities": true,
-        "react-markdown>vfile>unist-util-stringify-position": true
+        "react-markdown>vfile>unist-util-stringify-position": true,
+        "react-syntax-highlighter>refractor>parse-entities": true
       }
     },
     "react-markdown>remark-parse>mdast-util-from-markdown>micromark": {
       "packages": {
-        "react-markdown>remark-parse>mdast-util-from-markdown>parse-entities": true
-      }
-    },
-    "react-markdown>remark-parse>mdast-util-from-markdown>parse-entities": {
-      "globals": {
-        "document.createElement": true
+        "react-syntax-highlighter>refractor>parse-entities": true
       }
     },
     "react-markdown>remark-rehype": {
@@ -4532,6 +4527,11 @@
         "react": true
       }
     },
+    "react-syntax-highlighter>refractor>parse-entities": {
+      "globals": {
+        "document.createElement": true
+      }
+    },
     "react-tippy": {
       "globals": {
         "Element": true,

diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json
@@ -6562,22 +6562,6 @@
         "define": true
       }
     },
-    "react-markdown>remark-parse>mdast-util-from-markdown>parse-entities": {
-      "packages": {
-        "react-markdown>remark-parse>mdast-util-from-markdown>parse-entities>character-entities": true,
-        "react-markdown>remark-parse>mdast-util-from-markdown>parse-entities>character-entities-legacy": true,
-        "react-markdown>remark-parse>mdast-util-from-markdown>parse-entities>character-reference-invalid": true,
-        "react-markdown>remark-parse>mdast-util-from-markdown>parse-entities>is-alphanumerical": true,
-        "react-markdown>remark-parse>mdast-util-from-markdown>parse-entities>is-hexadecimal": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>is-decimal": true
-      }
-    },
-    "react-markdown>remark-parse>mdast-util-from-markdown>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
-      }
-    },
     "react-markdown>unified": {
       "packages": {
         "jsdom>request>extend": true,
@@ -6620,6 +6604,22 @@
         "react-markdown>vfile>unist-util-stringify-position": true
       }
     },
+    "react-syntax-highlighter>refractor>parse-entities": {
+      "packages": {
+        "react-syntax-highlighter>refractor>parse-entities>character-entities": true,
+        "react-syntax-highlighter>refractor>parse-entities>character-entities-legacy": true,
+        "react-syntax-highlighter>refractor>parse-entities>character-reference-invalid": true,
+        "react-syntax-highlighter>refractor>parse-entities>is-alphanumerical": true,
+        "react-syntax-highlighter>refractor>parse-entities>is-decimal": true,
+        "react-syntax-highlighter>refractor>parse-entities>is-hexadecimal": true
+      }
+    },
+    "react-syntax-highlighter>refractor>parse-entities>is-alphanumerical": {
+      "packages": {
+        "react-syntax-highlighter>refractor>parse-entities>is-decimal": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>is-alphabetical": true
+      }
+    },
     "readable-stream": {
       "builtin": {
         "events.EventEmitter": true,
@@ -6964,11 +6964,11 @@
     },
     "stylelint>@stylelint/postcss-markdown>remark>remark-parse": {
       "packages": {
-        "react-markdown>remark-parse>mdast-util-from-markdown>parse-entities": true,
+        "react-syntax-highlighter>refractor>parse-entities": true,
+        "react-syntax-highlighter>refractor>parse-entities>is-decimal": 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,
-        "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>is-word-character": true,
         "stylelint>@stylelint/postcss-markdown>remark>remark-parse>markdown-escapes": true,
@@ -6995,9 +6995,9 @@
     },
     "stylelint>@stylelint/postcss-markdown>remark>remark-stringify": {
       "packages": {
-        "react-markdown>remark-parse>mdast-util-from-markdown>parse-entities": true,
+        "react-syntax-highlighter>refractor>parse-entities": true,
+        "react-syntax-highlighter>refractor>parse-entities>is-decimal": 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>repeat-string": true,
@@ -7023,10 +7023,10 @@
     },
     "stylelint>@stylelint/postcss-markdown>remark>remark-stringify>stringify-entities": {
       "packages": {
-        "react-markdown>remark-parse>mdast-util-from-markdown>parse-entities>character-entities-legacy": true,
-        "react-markdown>remark-parse>mdast-util-from-markdown>parse-entities>is-alphanumerical": true,
-        "react-markdown>remark-parse>mdast-util-from-markdown>parse-entities>is-hexadecimal": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>is-decimal": true,
+        "react-syntax-highlighter>refractor>parse-entities>character-entities-legacy": true,
+        "react-syntax-highlighter>refractor>parse-entities>is-alphanumerical": true,
+        "react-syntax-highlighter>refractor>parse-entities>is-decimal": true,
+        "react-syntax-highlighter>refractor>parse-entities>is-hexadecimal": true,
         "stylelint>@stylelint/postcss-markdown>remark>remark-stringify>stringify-entities>character-entities-html4": true
       }
     },

diff --git a/package.json b/package.json
@@ -421,6 +421,7 @@
     "@types/yargs": "^17.0.8",
     "@typescript-eslint/eslint-plugin": "^5.30.7",
     "@typescript-eslint/parser": "^5.30.7",
+    "@whitespace/storybook-addon-html": "^5.1.1",
     "addons-linter": "^5.2.0",
     "babelify": "^10.0.0",
     "bify-module-groups": "^2.0.0",
@@ -504,6 +505,7 @@
     "pumpify": "^2.0.1",
     "randomcolor": "^0.5.4",
     "react-devtools": "^4.11.0",
+    "react-syntax-highlighter": "^15.5.0",
     "read-installed": "^4.0.3",
     "redux-mock-store": "^1.5.4",
     "remote-redux-devtools": "^0.5.16",