diff --git a/packages/fxa-admin-server/.vscode/launch.json b/packages/fxa-admin-server/.vscode/launch.json index de2ec3de549..5b7d029c2fd 100644 --- a/packages/fxa-admin-server/.vscode/launch.json +++ b/packages/fxa-admin-server/.vscode/launch.json @@ -11,7 +11,9 @@ "999999", "--colors", "-r", - "esbuild-register", + "ts-node/register", + "-r", + "tsconfig-paths/register", "${workspaceFolder}/src/test/**/*.spec.ts", "${workspaceFolder}/src/test/**/**/*.spec.ts", "${workspaceFolder}/src/test/**/**/**/*.spec.ts" @@ -33,7 +35,9 @@ "999999", "--colors", "-r", - "esbuild-register", + "ts-node/register", + "-r", + "tsconfig-paths/register", "${workspaceFolder}/${relativeFile}" ], "console": "integratedTerminal", diff --git a/packages/fxa-admin-server/package.json b/packages/fxa-admin-server/package.json index a6c6e106f79..62d844767ac 100644 --- a/packages/fxa-admin-server/package.json +++ b/packages/fxa-admin-server/package.json @@ -18,15 +18,15 @@ "restart": "pm2 restart pm2.config.js", "delete": "pm2 delete pm2.config.js", "test": "yarn gen-keys && yarn test-default && yarn test-e2e ", - "gen-keys": "node -r esbuild-register ./src/scripts/gen_keys.ts;", + "gen-keys": "node -r ts-node/register/transpile-only -r tsconfig-paths/register ./src/scripts/gen_keys.ts;", "test-unit": "JEST_JUNIT_OUTPUT_FILE=../../artifacts/tests/$npm_package_name/fxa-admin-server-jest-unit-results.xml jest --runInBand --coverage --detectOpenHandles --forceExit --logHeapUsage -t '^(?!.*?#integration).*' --ci --reporters=default --reporters=jest-junit", "test-integration": "JEST_JUNIT_OUTPUT_FILE=../../artifacts/tests/$npm_package_name/fxa-admin-server-jest-integration-results.xml jest --runInBand --coverage --forceExit --logHeapUsage -t '#integration' --ci --reporters=default --reporters=jest-junit", "test-default": "jest --runInBand --detectOpenHandles --forceExit -t=\"scripts/audit-tokens\"", "test-watch": "jest --watch", "test-cov": "jest --coverage", - "test-debug": "node --inspect-brk -r tsconfig-paths/register -r esbuild-register node_modules/.bin/jest --runInBand", + "test-debug": "node --inspect-brk -r tsconfig-paths/register node_modules/.bin/jest --runInBand", "test-e2e": "jest --runInBand --config ./jest-e2e.config.js --forceExit", - "email-bounce": "node -r esbuild-register ./src/scripts/email-bounce.ts" + "email-bounce": "node -r ts-node/register/transpile-only -r tsconfig-paths/register ./src/scripts/email-bounce.ts" }, "repository": { "type": "git", @@ -66,8 +66,6 @@ "audit-filter": "^0.5.0", "chance": "^1.1.8", "copyfiles": "^2.4.1", - "esbuild": "^0.17.15", - "esbuild-register": "^3.5.0", "eslint": "^8.18.0", "eslint-config-react-app": "^7.0.1", "eslint-plugin-prettier": "^5.2.3", @@ -76,6 +74,7 @@ "supertest": "^7.0.0", "tailwindcss": "3.4.3", "ts-jest": "^29.2.5", + "tsconfig-paths": "^4.2.0", "typescript": "5.5.3", "yargs": "^17.0.1" }, diff --git a/packages/fxa-admin-server/src/scripts/audit-tokens.spec.ts b/packages/fxa-admin-server/src/scripts/audit-tokens.spec.ts index e855f19edc7..ba5578e857b 100644 --- a/packages/fxa-admin-server/src/scripts/audit-tokens.spec.ts +++ b/packages/fxa-admin-server/src/scripts/audit-tokens.spec.ts @@ -118,7 +118,7 @@ describe('#integration - scripts/audit-tokens', () => { async function testScript(args: string) { // Note that logger output, directs to standard err. const { stderr, stdout } = await exec( - `NODE_ENV=development node -r esbuild-register scripts/audit-tokens.ts ${args}`, + `NODE_ENV=development node -r ts-node/register/transpile-only -r tsconfig-paths/register scripts/audit-tokens.ts ${args}`, { cwd, shell: '/bin/bash', diff --git a/packages/fxa-admin-server/src/scripts/db-helpers.ts b/packages/fxa-admin-server/src/scripts/db-helpers.ts index 899350d49f7..75b79c6e08d 100644 --- a/packages/fxa-admin-server/src/scripts/db-helpers.ts +++ b/packages/fxa-admin-server/src/scripts/db-helpers.ts @@ -118,6 +118,7 @@ export async function scaffoldDb( export async function clearDb() { await Email.knexQuery().del(); + await Account.knex().raw('DELETE FROM passkeys'); await Account.knexQuery().del(); await Device.knexQuery().del(); await SessionToken.knexQuery().del(); diff --git a/packages/fxa-admin-server/src/scripts/gen_keys.ts b/packages/fxa-admin-server/src/scripts/gen_keys.ts index 79a058be225..2b51a359bf3 100755 --- a/packages/fxa-admin-server/src/scripts/gen_keys.ts +++ b/packages/fxa-admin-server/src/scripts/gen_keys.ts @@ -1,4 +1,4 @@ -#!/usr/bin/env node -r esbuild-register +#!/usr/bin/env node -r ts-node/register/transpile-only -r tsconfig-paths/register /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/yarn.lock b/yarn.lock index fff8989e50e..3b3e0a0552e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -31749,8 +31749,6 @@ __metadata: convict-format-with-moment: "npm:^6.2.0" convict-format-with-validator: "npm:^6.2.0" copyfiles: "npm:^2.4.1" - esbuild: "npm:^0.17.15" - esbuild-register: "npm:^3.5.0" eslint: "npm:^8.18.0" eslint-config-react-app: "npm:^7.0.1" eslint-plugin-prettier: "npm:^5.2.3" @@ -31768,6 +31766,7 @@ __metadata: tailwindcss: "npm:3.4.3" ts-jest: "npm:^29.2.5" ts-morph: "npm:^24.0.0" + tsconfig-paths: "npm:^4.2.0" tslib: "npm:^2.8.1" typescript: "npm:5.5.3" yargs: "npm:^17.0.1"