diff --git a/packages/fxa-content-server/app/scripts/models/password_strength/password_strength_balloon.js b/packages/fxa-content-server/app/scripts/models/password_strength/password_strength_balloon.js index b40cf037447..dc80d73fec5 100644 --- a/packages/fxa-content-server/app/scripts/models/password_strength/password_strength_balloon.js +++ b/packages/fxa-content-server/app/scripts/models/password_strength/password_strength_balloon.js @@ -59,7 +59,7 @@ export default class PasswordStrengthBalloonModel extends Model { _getCommonPasswordList() { return import( - /* webpackChunkName: "fxa-common-password-list" */ 'fxa-common-password-list' + /* webpackChunkName: "common-password-list" */ '@fxa/vendored/common-password-list' ); } diff --git a/packages/fxa-content-server/package.json b/packages/fxa-content-server/package.json index 01d278e1501..a45d2ff774d 100644 --- a/packages/fxa-content-server/package.json +++ b/packages/fxa-content-server/package.json @@ -57,7 +57,6 @@ "fast-text-encoding": "^1.0.4", "fxa-auth-client": "workspace:*", "fxa-auth-server": "workspace:*", - "fxa-common-password-list": "0.0.4", "fxa-geodb": "workspace:*", "fxa-mustache-loader": "0.0.2", "fxa-pairing-channel": "1.0.2", diff --git a/packages/fxa-content-server/webpack.config.js b/packages/fxa-content-server/webpack.config.js index 9ad8b29f2b2..74b37c7ea2f 100644 --- a/packages/fxa-content-server/webpack.config.js +++ b/packages/fxa-content-server/webpack.config.js @@ -82,6 +82,14 @@ const webpackConfig = { uuid: require.resolve('node-uuid/uuid'), vat: require.resolve('node-vat/vat'), 'fxa-auth-client/browser': require.resolve('fxa-auth-client/browser'), + '@fxa/vendored/common-password-list': path.resolve( + __dirname, + '../../libs/vendored/common-password-list/src/index.ts' + ), + '@fxa/vendored/incremental-encoder': path.resolve( + __dirname, + '../../libs/vendored/incremental-encoder/src/index.ts' + ), }, }, diff --git a/packages/fxa-settings/package.json b/packages/fxa-settings/package.json index b0ef998d87a..326888ef796 100644 --- a/packages/fxa-settings/package.json +++ b/packages/fxa-settings/package.json @@ -81,7 +81,9 @@ "@fxa/shared/metrics/glean": "/../../libs/shared/metrics/glean/src/index.ts", "^@fxa/shared/assets(.*)$": "/../../libs/shared/assets/src$1", "@fxa/accounts/errors": "/../../libs/accounts/errors/src/index.ts", - "@fxa/accounts/oauth": "/../../libs/accounts/oauth/src/index.ts" + "@fxa/accounts/oauth": "/../../libs/accounts/oauth/src/index.ts", + "@fxa/vendored/common-password-list": "/../../libs/vendored/common-password-list/src/index.ts", + "@fxa/vendored/incremental-encoder": "/../../libs/vendored/incremental-encoder/src/index.ts" }, "moduleFileExtensions": [ "web.js", @@ -155,7 +157,6 @@ "file-saver": "^2.0.5", "fs-extra": "^11.2.0", "fxa-auth-client": "workspace:*", - "fxa-common-password-list": "^0.0.4", "fxa-react": "workspace:*", "html-webpack-plugin": "^5.6.0", "identity-obj-proxy": "^3.0.0", diff --git a/packages/fxa-settings/src/components/FormPassword/index.tsx b/packages/fxa-settings/src/components/FormPassword/index.tsx index 83d5081fe2e..13d02ccbd40 100644 --- a/packages/fxa-settings/src/components/FormPassword/index.tsx +++ b/packages/fxa-settings/src/components/FormPassword/index.tsx @@ -195,11 +195,12 @@ export const FormPassword = ({ return !passwordValidator.isSameAsEmail(value.toLowerCase()); }, uncommon: async (value: string) => { - // @ts-ignore - const list = await import('fxa-common-password-list'); + const { test: isCommon } = await import( + '@fxa/vendored/common-password-list' + ); const input = value.toLowerCase(); return ( - !list.test(input) && !passwordValidator.isBanned(input) + !isCommon(input) && !passwordValidator.isBanned(input) ); }, }, diff --git a/packages/fxa-settings/src/components/FormPasswordWithInlineCriteria/index.tsx b/packages/fxa-settings/src/components/FormPasswordWithInlineCriteria/index.tsx index 44cf912b769..2ce67c8cdfd 100644 --- a/packages/fxa-settings/src/components/FormPasswordWithInlineCriteria/index.tsx +++ b/packages/fxa-settings/src/components/FormPasswordWithInlineCriteria/index.tsx @@ -289,11 +289,12 @@ export const FormPasswordWithInlineCriteria = ({ ); }, uncommon: async (value: string) => { - // @ts-ignore - const list = await import('fxa-common-password-list'); + const { test: isCommon } = await import( + '@fxa/vendored/common-password-list' + ); const input = value.toLowerCase(); return ( - !list.test(input) && !passwordValidator.isBanned(input) + !isCommon(input) && !passwordValidator.isBanned(input) ); }, }, diff --git a/yarn.lock b/yarn.lock index 8b6caf41833..b6039205fcd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -36481,15 +36481,6 @@ __metadata: languageName: unknown linkType: soft -"fxa-common-password-list@npm:0.0.4, fxa-common-password-list@npm:^0.0.4": - version: 0.0.4 - resolution: "fxa-common-password-list@npm:0.0.4" - dependencies: - incremental-encoder: "npm:0.0.1" - checksum: 10c0/ec639effd2d14e5394fbaee29ccec032eab2bf43b15cea33732a0b158ea49733288c26a6dcaa9b7d028ff2c8cf17f48baa4e35e0a77dbf8d27551f0ec7c8b348 - languageName: node - linkType: hard - "fxa-content-server@workspace:*, fxa-content-server@workspace:packages/fxa-content-server": version: 0.0.0-use.local resolution: "fxa-content-server@workspace:packages/fxa-content-server" @@ -36534,7 +36525,6 @@ __metadata: firefox-profile: "npm:4.7.0" fxa-auth-client: "workspace:*" fxa-auth-server: "workspace:*" - fxa-common-password-list: "npm:0.0.4" fxa-geodb: "workspace:*" fxa-mustache-loader: "npm:0.0.2" fxa-pairing-channel: "npm:1.0.2" @@ -37048,7 +37038,6 @@ __metadata: file-saver: "npm:^2.0.5" fs-extra: "npm:^11.2.0" fxa-auth-client: "workspace:*" - fxa-common-password-list: "npm:^0.0.4" fxa-react: "workspace:*" fxa-shared: "workspace:*" grunt: "npm:^1.6.1" @@ -40061,13 +40050,6 @@ __metadata: languageName: node linkType: hard -"incremental-encoder@npm:0.0.1": - version: 0.0.1 - resolution: "incremental-encoder@npm:0.0.1" - checksum: 10c0/646032c1ff35ee8556e55d6fbf817fcb172147f4442f5ed786f6b8845cb05e7cc0633ef3c22e57cbf758ac328aac69215d4126f093118e206047ef2a98a4fc66 - languageName: node - linkType: hard - "indent-string@npm:^4.0.0": version: 4.0.0 resolution: "indent-string@npm:4.0.0"