diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index 0375c114ce9c..9cb16c81169d 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -760,6 +760,11 @@ "react-redux>react-is": true } }, + "@metamask/design-system-react>@metamask-previews/design-system-shared": { + "packages": { + "@metamask/utils": true + } + }, "@metamask/abi-utils": { "packages": { "@metamask/superstruct": true, @@ -1095,7 +1100,7 @@ "console.warn": true }, "packages": { - "@metamask/design-system-react>@metamask/design-system-shared": true, + "@metamask/design-system-react>@metamask-previews/design-system-shared": true, "@metamask/jazzicon": true, "@metamask/design-system-react>@radix-ui/react-slot": true, "@metamask/design-system-react>blo": true, @@ -1103,11 +1108,6 @@ "@metamask/design-system-react>tailwind-merge": true } }, - "@metamask/design-system-react>@metamask/design-system-shared": { - "packages": { - "@metamask/utils": true - } - }, "@metamask/eip-5792-middleware": { "packages": { "@metamask/keyring-controller": true, diff --git a/lavamoat/browserify/experimental/policy.json b/lavamoat/browserify/experimental/policy.json index 0375c114ce9c..9cb16c81169d 100644 --- a/lavamoat/browserify/experimental/policy.json +++ b/lavamoat/browserify/experimental/policy.json @@ -760,6 +760,11 @@ "react-redux>react-is": true } }, + "@metamask/design-system-react>@metamask-previews/design-system-shared": { + "packages": { + "@metamask/utils": true + } + }, "@metamask/abi-utils": { "packages": { "@metamask/superstruct": true, @@ -1095,7 +1100,7 @@ "console.warn": true }, "packages": { - "@metamask/design-system-react>@metamask/design-system-shared": true, + "@metamask/design-system-react>@metamask-previews/design-system-shared": true, "@metamask/jazzicon": true, "@metamask/design-system-react>@radix-ui/react-slot": true, "@metamask/design-system-react>blo": true, @@ -1103,11 +1108,6 @@ "@metamask/design-system-react>tailwind-merge": true } }, - "@metamask/design-system-react>@metamask/design-system-shared": { - "packages": { - "@metamask/utils": true - } - }, "@metamask/eip-5792-middleware": { "packages": { "@metamask/keyring-controller": true, diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index 0375c114ce9c..9cb16c81169d 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -760,6 +760,11 @@ "react-redux>react-is": true } }, + "@metamask/design-system-react>@metamask-previews/design-system-shared": { + "packages": { + "@metamask/utils": true + } + }, "@metamask/abi-utils": { "packages": { "@metamask/superstruct": true, @@ -1095,7 +1100,7 @@ "console.warn": true }, "packages": { - "@metamask/design-system-react>@metamask/design-system-shared": true, + "@metamask/design-system-react>@metamask-previews/design-system-shared": true, "@metamask/jazzicon": true, "@metamask/design-system-react>@radix-ui/react-slot": true, "@metamask/design-system-react>blo": true, @@ -1103,11 +1108,6 @@ "@metamask/design-system-react>tailwind-merge": true } }, - "@metamask/design-system-react>@metamask/design-system-shared": { - "packages": { - "@metamask/utils": true - } - }, "@metamask/eip-5792-middleware": { "packages": { "@metamask/keyring-controller": true, diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index 0375c114ce9c..9cb16c81169d 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -760,6 +760,11 @@ "react-redux>react-is": true } }, + "@metamask/design-system-react>@metamask-previews/design-system-shared": { + "packages": { + "@metamask/utils": true + } + }, "@metamask/abi-utils": { "packages": { "@metamask/superstruct": true, @@ -1095,7 +1100,7 @@ "console.warn": true }, "packages": { - "@metamask/design-system-react>@metamask/design-system-shared": true, + "@metamask/design-system-react>@metamask-previews/design-system-shared": true, "@metamask/jazzicon": true, "@metamask/design-system-react>@radix-ui/react-slot": true, "@metamask/design-system-react>blo": true, @@ -1103,11 +1108,6 @@ "@metamask/design-system-react>tailwind-merge": true } }, - "@metamask/design-system-react>@metamask/design-system-shared": { - "packages": { - "@metamask/utils": true - } - }, "@metamask/eip-5792-middleware": { "packages": { "@metamask/keyring-controller": true, diff --git a/lavamoat/webpack/mv2/beta/policy.json b/lavamoat/webpack/mv2/beta/policy.json index 5f9f5e55f2a7..072edae05c15 100644 --- a/lavamoat/webpack/mv2/beta/policy.json +++ b/lavamoat/webpack/mv2/beta/policy.json @@ -759,6 +759,11 @@ "@babel/runtime": true } }, + "@metamask/design-system-react>@metamask-previews/design-system-shared": { + "packages": { + "@metamask/utils": true + } + }, "@metamask/abi-utils": { "packages": { "@metamask/superstruct": true, @@ -1099,7 +1104,7 @@ "console.warn": true }, "packages": { - "@metamask/design-system-react>@metamask/design-system-shared": true, + "@metamask/design-system-react>@metamask-previews/design-system-shared": true, "@metamask/jazzicon": true, "@metamask/design-system-react>@radix-ui/react-slot": true, "@metamask/design-system-react>blo": true, @@ -1107,11 +1112,6 @@ "@metamask/design-system-react>tailwind-merge": true } }, - "@metamask/design-system-react>@metamask/design-system-shared": { - "packages": { - "@metamask/utils": true - } - }, "@metamask/eip-5792-middleware": { "packages": { "@metamask/keyring-controller": true, diff --git a/lavamoat/webpack/mv2/experimental/policy.json b/lavamoat/webpack/mv2/experimental/policy.json index 5f9f5e55f2a7..072edae05c15 100644 --- a/lavamoat/webpack/mv2/experimental/policy.json +++ b/lavamoat/webpack/mv2/experimental/policy.json @@ -759,6 +759,11 @@ "@babel/runtime": true } }, + "@metamask/design-system-react>@metamask-previews/design-system-shared": { + "packages": { + "@metamask/utils": true + } + }, "@metamask/abi-utils": { "packages": { "@metamask/superstruct": true, @@ -1099,7 +1104,7 @@ "console.warn": true }, "packages": { - "@metamask/design-system-react>@metamask/design-system-shared": true, + "@metamask/design-system-react>@metamask-previews/design-system-shared": true, "@metamask/jazzicon": true, "@metamask/design-system-react>@radix-ui/react-slot": true, "@metamask/design-system-react>blo": true, @@ -1107,11 +1112,6 @@ "@metamask/design-system-react>tailwind-merge": true } }, - "@metamask/design-system-react>@metamask/design-system-shared": { - "packages": { - "@metamask/utils": true - } - }, "@metamask/eip-5792-middleware": { "packages": { "@metamask/keyring-controller": true, diff --git a/lavamoat/webpack/mv2/flask/policy.json b/lavamoat/webpack/mv2/flask/policy.json index 5f9f5e55f2a7..072edae05c15 100644 --- a/lavamoat/webpack/mv2/flask/policy.json +++ b/lavamoat/webpack/mv2/flask/policy.json @@ -759,6 +759,11 @@ "@babel/runtime": true } }, + "@metamask/design-system-react>@metamask-previews/design-system-shared": { + "packages": { + "@metamask/utils": true + } + }, "@metamask/abi-utils": { "packages": { "@metamask/superstruct": true, @@ -1099,7 +1104,7 @@ "console.warn": true }, "packages": { - "@metamask/design-system-react>@metamask/design-system-shared": true, + "@metamask/design-system-react>@metamask-previews/design-system-shared": true, "@metamask/jazzicon": true, "@metamask/design-system-react>@radix-ui/react-slot": true, "@metamask/design-system-react>blo": true, @@ -1107,11 +1112,6 @@ "@metamask/design-system-react>tailwind-merge": true } }, - "@metamask/design-system-react>@metamask/design-system-shared": { - "packages": { - "@metamask/utils": true - } - }, "@metamask/eip-5792-middleware": { "packages": { "@metamask/keyring-controller": true, diff --git a/lavamoat/webpack/mv2/main/policy.json b/lavamoat/webpack/mv2/main/policy.json index 5f9f5e55f2a7..072edae05c15 100644 --- a/lavamoat/webpack/mv2/main/policy.json +++ b/lavamoat/webpack/mv2/main/policy.json @@ -759,6 +759,11 @@ "@babel/runtime": true } }, + "@metamask/design-system-react>@metamask-previews/design-system-shared": { + "packages": { + "@metamask/utils": true + } + }, "@metamask/abi-utils": { "packages": { "@metamask/superstruct": true, @@ -1099,7 +1104,7 @@ "console.warn": true }, "packages": { - "@metamask/design-system-react>@metamask/design-system-shared": true, + "@metamask/design-system-react>@metamask-previews/design-system-shared": true, "@metamask/jazzicon": true, "@metamask/design-system-react>@radix-ui/react-slot": true, "@metamask/design-system-react>blo": true, @@ -1107,11 +1112,6 @@ "@metamask/design-system-react>tailwind-merge": true } }, - "@metamask/design-system-react>@metamask/design-system-shared": { - "packages": { - "@metamask/utils": true - } - }, "@metamask/eip-5792-middleware": { "packages": { "@metamask/keyring-controller": true, diff --git a/lavamoat/webpack/mv3/beta/policy.json b/lavamoat/webpack/mv3/beta/policy.json index 37475b294207..3de4fcd5618d 100644 --- a/lavamoat/webpack/mv3/beta/policy.json +++ b/lavamoat/webpack/mv3/beta/policy.json @@ -636,6 +636,11 @@ "@babel/runtime": true } }, + "@metamask/design-system-react>@metamask-previews/design-system-shared": { + "packages": { + "@metamask/utils": true + } + }, "@metamask/abi-utils": { "packages": { "@metamask/superstruct": true, @@ -770,7 +775,7 @@ "console.warn": true }, "packages": { - "@metamask/design-system-react>@metamask/design-system-shared": true, + "@metamask/design-system-react>@metamask-previews/design-system-shared": true, "@metamask/jazzicon": true, "@metamask/design-system-react>@radix-ui/react-slot": true, "@metamask/design-system-react>blo": true, @@ -778,11 +783,6 @@ "@metamask/design-system-react>tailwind-merge": true } }, - "@metamask/design-system-react>@metamask/design-system-shared": { - "packages": { - "@metamask/utils": true - } - }, "@metamask/eth-token-tracker>@metamask/eth-block-tracker": { "globals": { "clearTimeout": true, diff --git a/lavamoat/webpack/mv3/experimental/policy.json b/lavamoat/webpack/mv3/experimental/policy.json index 37475b294207..3de4fcd5618d 100644 --- a/lavamoat/webpack/mv3/experimental/policy.json +++ b/lavamoat/webpack/mv3/experimental/policy.json @@ -636,6 +636,11 @@ "@babel/runtime": true } }, + "@metamask/design-system-react>@metamask-previews/design-system-shared": { + "packages": { + "@metamask/utils": true + } + }, "@metamask/abi-utils": { "packages": { "@metamask/superstruct": true, @@ -770,7 +775,7 @@ "console.warn": true }, "packages": { - "@metamask/design-system-react>@metamask/design-system-shared": true, + "@metamask/design-system-react>@metamask-previews/design-system-shared": true, "@metamask/jazzicon": true, "@metamask/design-system-react>@radix-ui/react-slot": true, "@metamask/design-system-react>blo": true, @@ -778,11 +783,6 @@ "@metamask/design-system-react>tailwind-merge": true } }, - "@metamask/design-system-react>@metamask/design-system-shared": { - "packages": { - "@metamask/utils": true - } - }, "@metamask/eth-token-tracker>@metamask/eth-block-tracker": { "globals": { "clearTimeout": true, diff --git a/lavamoat/webpack/mv3/flask/policy.json b/lavamoat/webpack/mv3/flask/policy.json index 37475b294207..3de4fcd5618d 100644 --- a/lavamoat/webpack/mv3/flask/policy.json +++ b/lavamoat/webpack/mv3/flask/policy.json @@ -636,6 +636,11 @@ "@babel/runtime": true } }, + "@metamask/design-system-react>@metamask-previews/design-system-shared": { + "packages": { + "@metamask/utils": true + } + }, "@metamask/abi-utils": { "packages": { "@metamask/superstruct": true, @@ -770,7 +775,7 @@ "console.warn": true }, "packages": { - "@metamask/design-system-react>@metamask/design-system-shared": true, + "@metamask/design-system-react>@metamask-previews/design-system-shared": true, "@metamask/jazzicon": true, "@metamask/design-system-react>@radix-ui/react-slot": true, "@metamask/design-system-react>blo": true, @@ -778,11 +783,6 @@ "@metamask/design-system-react>tailwind-merge": true } }, - "@metamask/design-system-react>@metamask/design-system-shared": { - "packages": { - "@metamask/utils": true - } - }, "@metamask/eth-token-tracker>@metamask/eth-block-tracker": { "globals": { "clearTimeout": true, diff --git a/lavamoat/webpack/mv3/main/policy.json b/lavamoat/webpack/mv3/main/policy.json index 37475b294207..3de4fcd5618d 100644 --- a/lavamoat/webpack/mv3/main/policy.json +++ b/lavamoat/webpack/mv3/main/policy.json @@ -636,6 +636,11 @@ "@babel/runtime": true } }, + "@metamask/design-system-react>@metamask-previews/design-system-shared": { + "packages": { + "@metamask/utils": true + } + }, "@metamask/abi-utils": { "packages": { "@metamask/superstruct": true, @@ -770,7 +775,7 @@ "console.warn": true }, "packages": { - "@metamask/design-system-react>@metamask/design-system-shared": true, + "@metamask/design-system-react>@metamask-previews/design-system-shared": true, "@metamask/jazzicon": true, "@metamask/design-system-react>@radix-ui/react-slot": true, "@metamask/design-system-react>blo": true, @@ -778,11 +783,6 @@ "@metamask/design-system-react>tailwind-merge": true } }, - "@metamask/design-system-react>@metamask/design-system-shared": { - "packages": { - "@metamask/utils": true - } - }, "@metamask/eth-token-tracker>@metamask/eth-block-tracker": { "globals": { "clearTimeout": true, diff --git a/package.json b/package.json index fa91fbb5ba3c..661646f9e987 100644 --- a/package.json +++ b/package.json @@ -158,6 +158,10 @@ "yarn-binary:hydrate": "corepack hydrate .yarn/yarn-corepack.tgz --activate" }, "resolutions": { + "@metamask/design-system-react": "npm:@metamask-previews/design-system-react@0.14.0-preview.4ce710b", + "@metamask/design-system-shared": "npm:@metamask-previews/design-system-shared@0.7.0-preview.4ce710b", + "@metamask/design-system-tailwind-preset": "npm:@metamask-previews/design-system-tailwind-preset@0.6.1-preview.4ce710b", + "@metamask/design-tokens": "npm:@metamask-previews/design-tokens@8.3.0-preview.4ce710b", "@unrs/resolver-binding-wasm32-wasi": "npm:npm-empty-package@1.0.0", "jest-clean-console-reporter/chalk": "^4.1.2", "napi-postinstall": "npm:npm-empty-package@1.0.0", @@ -318,9 +322,9 @@ "@metamask/delegation-controller": "^2.0.2", "@metamask/delegation-core": "^0.2.0-rc.1", "@metamask/delegation-deployments": "^1.0.0", - "@metamask/design-system-react": "^0.12.0", - "@metamask/design-system-tailwind-preset": "^0.6.1", - "@metamask/design-tokens": "^8.2.2", + "@metamask/design-system-react": "npm:@metamask-previews/design-system-react@0.14.0-preview.4ce710b", + "@metamask/design-system-tailwind-preset": "npm:@metamask-previews/design-system-tailwind-preset@0.6.1-preview.4ce710b", + "@metamask/design-tokens": "npm:@metamask-previews/design-tokens@8.3.0-preview.4ce710b", "@metamask/eip-5792-middleware": "3.0.3", "@metamask/eip-7702-internal-rpc-middleware": "^0.1.0", "@metamask/ens-controller": "^19.1.0", diff --git a/ui/pages/create-password-form/__snapshots__/create-password-form.test.tsx.snap b/ui/pages/create-password-form/__snapshots__/create-password-form.test.tsx.snap index 299934819d1f..f3f66369bb8d 100644 --- a/ui/pages/create-password-form/__snapshots__/create-password-form.test.tsx.snap +++ b/ui/pages/create-password-form/__snapshots__/create-password-form.test.tsx.snap @@ -149,12 +149,12 @@ exports[`CreatePasswordForm renders match snapshot 1`] = ` >