Merge pull request #20297 from mozilla/fxa-9666

chore(settings): replace fxa-common-password-list npm package with vendor version

Author: vbudhram

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'
     );
   }
 

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",

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'
+      ),
     },
   },
 

packages/fxa-settings/package.json

@@ -81,7 +81,9 @@
       "@fxa/shared/metrics/glean": "<rootDir>/../../libs/shared/metrics/glean/src/index.ts",
       "^@fxa/shared/assets(.*)$": "<rootDir>/../../libs/shared/assets/src$1",
       "@fxa/accounts/errors": "<rootDir>/../../libs/accounts/errors/src/index.ts",
-      "@fxa/accounts/oauth": "<rootDir>/../../libs/accounts/oauth/src/index.ts"
+      "@fxa/accounts/oauth": "<rootDir>/../../libs/accounts/oauth/src/index.ts",
+      "@fxa/vendored/common-password-list": "<rootDir>/../../libs/vendored/common-password-list/src/index.ts",
+      "@fxa/vendored/incremental-encoder": "<rootDir>/../../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",

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)
                   );
                 },
               },

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)
                     );
                   },
                 },

yarn.lock

@@ -32060,15 +32060,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"
@@ -32113,7 +32104,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"
@@ -32604,7 +32594,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"
@@ -35507,13 +35496,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"