Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -925,6 +925,7 @@ workflows:
- fail-fast
- unit-test:
name: Unit Test (PR)
resource_class: xlarge
nx_run: affected --base=main --head=$CIRCLE_SHA1
workflow: test_pull_request
requires:
Expand Down
1 change: 0 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ updates:
- '@mozilla/fxa-devs'
ignore:
- dependency-name: 'jest-watch-typeahead' # To be removed after react-scripts update
- dependency-name: 'esbuild' # See FXA-5948
- dependency-name: 'mailparser' # Used as a test helper only, see #FXA-5351
- dependency-name: '*'
update-types: ['version-update:semver-patch']
Expand Down
35 changes: 31 additions & 4 deletions apps/payments/next/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,25 +52,52 @@
"command": "pm2 delete apps/payments/next/pm2.config.js"
},
"l10n-merge": {
"cache": true,
"command": "yarn grunt --gruntfile='apps/payments/next/Gruntfile.js' merge-ftl",
"dependsOn": ["l10n-prime"]
"dependsOn": ["l10n-prime"],
"inputs": ["{projectRoot}/gruntfile.js", "{projectRoot}/app/**/en.ftl"],
"outputs": [
"{projectRoot}/public/locales/en/payments-next.ftl"
]
},
"l10n-prime": {
"command": "./_scripts/l10n/prime.sh apps/payments/next"
},
"l10n-bundle": {
"cache": true,
"dependsOn": ["l10n-merge"],
"command": "./_scripts/l10n/bundle.sh apps/payments/next branding,react,payments-next"
"command": "./_scripts/l10n/bundle.sh apps/payments/next branding,react,payments-next",
"inputs": [
"{projectRoot}/public/locales/**/branding.ftl",
"{projectRoot}/public/locales/**/react.ftl",
"{projectRoot}/public/locales/**/payments.ftl",
"{projectRoot}/public/locales/**/payments-next.ftl",
"{projectRoot}/public/locales/**/react.ftl"
],
"outputs": [
"{projectRoot}/public/locales/**/main.ftl"
]
},
"watchers": {
"command": "yarn grunt --gruntfile='apps/payments/next/Gruntfile.js' watchers"
},
"glean-generate": {
"cache": true,
"dependsOn": ["glean-lint"],
"command": "yarn glean translate libs/shared/metrics/glean/src/registry/subplat-backend-metrics.yaml -f typescript_server -o libs/payments/metrics/src/lib/glean/__generated__"
"command": "yarn glean translate libs/shared/metrics/glean/src/registry/subplat-backend-metrics.yaml -f typescript_server -o libs/payments/metrics/src/lib/glean/__generated__",
"inputs": [
"{workspaceRoot}/libs/shared/metrics/glean/src/registry/subplat-backend-metrics.yaml"
],
"outputs": [
"{workspaceRoot}/libs/payments/metrics/src/lib/glean/__generated__"
]
},
"glean-lint": {
"command": "yarn glean glinter libs/shared/metrics/glean/src/registry/subplat-backend-metrics.yaml"
"cache": true,
"command": "yarn glean glinter libs/shared/metrics/glean/src/registry/subplat-backend-metrics.yaml",
"inputs": [
"{workspaceRoot}/libs/shared/metrics/glean/src/registry/subplat-backend-metrics.yaml"
]
}
},
"tags": ["app", "payments", "type:sp3"]
Expand Down
7 changes: 1 addition & 6 deletions libs/accounts/email-renderer/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
{
"name": "@fxa/accounts/email-renderer",
"version": "0.0.1",
"dependencies": {},
"type": "commonjs",
"main": "./index.cjs",
"types": "./index.d.ts",
"private": true
"version": "0.0.1"
}
12 changes: 10 additions & 2 deletions libs/accounts/email-renderer/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
}
},
"build-ts": {
"executor": "@nx/esbuild:esbuild",
"executor": "@nx/js:tsc",
"outputs": ["{options.outputPath}"],
"dependsOn": ["l10n-prime"],
"options": {
Expand All @@ -31,11 +31,18 @@
"libs/accounts/email-renderer/src/**/*.txt",
"libs/accounts/email-renderer/src/**/*.mjml"
],
"format": ["cjs"]
"generatePackageJson": true
}
},
"build-css": {
"cache": true,
"executor": "nx:run-commands",
"inputs": [
"{projectRoot}/src/**/*.scss"
],
"outputs": [
"{projectRoot}/src/css"
],
"options": {
"commands": [
"ts-node libs/accounts/email-renderer/src/sass-compile-files.ts"
Expand Down Expand Up @@ -125,6 +132,7 @@
]
},
"l10n-merge": {
"cache": true,
"dependsOn": ["l10n-prime"],
"executor": "nx:run-commands",
"options": {
Expand Down
7 changes: 1 addition & 6 deletions libs/accounts/email-sender/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
{
"name": "@fxa/accounts/email-sender",
"version": "0.0.1",
"dependencies": {},
"type": "commonjs",
"main": "./index.cjs",
"types": "./index.d.ts",
"private": true
"version": "0.0.1"
}
11 changes: 9 additions & 2 deletions libs/accounts/email-sender/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,21 @@
"tags": ["scope:shared:lib"],
"targets": {
"build": {
"executor": "@nx/esbuild:esbuild",
"dependsOn": ["build-ts"],
"executor": "nx:run-commands",
"options": {
"command": "echo Build complete"
}
},
"build-ts": {
"executor": "@nx/js:tsc",
"outputs": ["{options.outputPath}"],
"options": {
"outputPath": "dist/libs/accounts/email-sender",
"main": "libs/accounts/email-sender/src/index.ts",
"tsConfig": "libs/accounts/email-sender/tsconfig.lib.json",
"assets": ["libs/accounts/email-sender/*.md"],
"format": ["cjs"]
"generatePackageJson": true
}
},
"test-unit": {
Expand Down
7 changes: 1 addition & 6 deletions libs/accounts/errors/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
{
"name": "@fxa/accounts/errors",
"version": "0.0.1",
"dependencies": {},
"type": "commonjs",
"main": "./index.cjs",
"types": "./index.d.ts",
"private": true
"version": "0.0.1"
}
20 changes: 16 additions & 4 deletions libs/accounts/errors/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,26 @@
"tags": ["scope:shared:lib"],
"targets": {
"build": {
"executor": "@nx/esbuild:esbuild",
"dependsOn": ["build-ts"],
"executor": "nx:run-commands",
"options": {
"command": "echo Build complete"
}
},
"build-ts": {
"executor": "@nx/js:tsc",
"outputs": ["{options.outputPath}"],
"options": {
"outputPath": "dist/libs/accounts/errors",
"main": "libs/accounts/errors/src/index.ts",
"outputPath": "dist/libs/accounts/errors",
"tsConfig": "libs/accounts/errors/tsconfig.lib.json",
"assets": ["libs/accounts/errors/*.md"],
"format": ["cjs"]
"assets": [
{
"glob": "libs/accounts/errors/*.md",
"input": ".",
"output": "."
}
]
}
},
"test-unit": {
Expand Down
2 changes: 2 additions & 0 deletions libs/accounts/errors/tsconfig.lib.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"rootDir": "../../..",
"module": "commonjs",
"outDir": "../../../dist/out-tsc",
"declaration": true,
"types": ["node"]
Expand Down
7 changes: 1 addition & 6 deletions libs/accounts/oauth/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
{
"name": "@fxa/accounts/oauth",
"version": "0.0.1",
"private": true,
"type": "commonjs",
"main": "./index.cjs",
"types": "./index.d.ts",
"dependencies": {}
"version": "0.0.1"
}
11 changes: 9 additions & 2 deletions libs/accounts/oauth/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,21 @@
"tags": [],
"targets": {
"build": {
"executor": "@nx/esbuild:esbuild",
"dependsOn": ["build-ts"],
"executor": "nx:run-commands",
"options": {
"command": "echo Build complete"
}
},
"build-ts": {
"executor": "@nx/js:tsc",
"outputs": ["{options.outputPath}"],
"options": {
"outputPath": "dist/libs/accounts/oauth",
"main": "libs/accounts/oauth/src/index.ts",
"tsConfig": "libs/accounts/oauth/tsconfig.lib.json",
"assets": ["libs/accounts/oauth/*.md"],
"format": ["cjs"]
"generatePackageJson": true
}
},
"test": {
Expand Down
7 changes: 1 addition & 6 deletions libs/accounts/passkey/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
{
"name": "@fxa/accounts/passkey",
"version": "0.0.1",
"private": true,
"type": "commonjs",
"main": "./index.cjs",
"types": "./index.d.ts",
"dependencies": {}
"version": "0.0.1"
}
13 changes: 9 additions & 4 deletions libs/accounts/passkey/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,20 @@
"tags": ["scope:shared:lib"],
"targets": {
"build": {
"executor": "@nx/esbuild:esbuild",
"dependsOn": ["build-ts"],
"executor": "nx:run-commands",
"options": {
"command": "echo Build complete"
}
},
"build-ts": {
"executor": "@nx/js:tsc",
"outputs": ["{options.outputPath}"],
"options": {
"outputPath": "dist/libs/accounts/passkey",
"main": "libs/accounts/passkey/src/index.ts",
"tsConfig": "libs/accounts/passkey/tsconfig.lib.json",
"assets": ["libs/accounts/passkey/*.md"],
"format": ["cjs"],
"declaration": true
"assets": ["libs/accounts/passkey/*.md"]
}
},
"test-unit": {
Expand Down
1 change: 1 addition & 0 deletions libs/accounts/passkey/tsconfig.lib.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"rootDir": "../../..",
"outDir": "../../../dist/out-tsc",
"declaration": true,
"types": ["node"]
Expand Down
7 changes: 1 addition & 6 deletions libs/accounts/rate-limit/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
{
"name": "@fxa/accounts/rate-limit",
"version": "0.0.1",
"dependencies": {},
"type": "commonjs",
"main": "./index.cjs",
"types": "./index.d.ts",
"private": true
"version": "0.0.1"
}
11 changes: 9 additions & 2 deletions libs/accounts/rate-limit/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,21 @@
"tags": ["scope:shared:lib"],
"targets": {
"build": {
"executor": "@nx/esbuild:esbuild",
"dependsOn": ["build-ts"],
"executor": "nx:run-commands",
"options": {
"command": "echo Build complete"
}
},
"build-ts": {
"executor": "@nx/js:tsc",
"outputs": ["{options.outputPath}"],
"options": {
"outputPath": "dist/libs/accounts/rate-limit",
"main": "libs/accounts/rate-limit/src/index.ts",
"tsConfig": "libs/accounts/rate-limit/tsconfig.lib.json",
"assets": ["libs/accounts/rate-limit/*.md"],
"format": ["cjs"]
"generatePackageJson": true
}
},
"test-unit": {
Expand Down
6 changes: 1 addition & 5 deletions libs/accounts/recovery-phone/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
{
"name": "@fxa/accounts/recovery-phone",
"version": "0.0.1",
"dependencies": {},
"type": "commonjs",
"main": "./index.cjs",
"private": true
"version": "0.0.1"
}
11 changes: 9 additions & 2 deletions libs/accounts/recovery-phone/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,21 @@
"tags": ["scope:shared:lib"],
"targets": {
"build": {
"executor": "@nx/esbuild:esbuild",
"dependsOn": ["build-ts"],
"executor": "nx:run-commands",
"options": {
"command": "echo Build complete"
}
},
"build-ts": {
"executor": "@nx/js:tsc",
"outputs": ["{options.outputPath}"],
"options": {
"outputPath": "dist/libs/accounts/recovery-phone",
"main": "libs/accounts/recovery-phone/src/index.ts",
"tsConfig": "libs/accounts/recovery-phone/tsconfig.lib.json",
"assets": ["libs/accounts/recovery-phone/*.md"],
"format": ["cjs"]
"generatePackageJson": true
}
},
"test-unit": {
Expand Down
21 changes: 9 additions & 12 deletions libs/accounts/two-factor/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,21 @@
"tags": ["scope:shared:lib"],
"targets": {
"build": {
"executor": "@nx/esbuild:esbuild",
"dependsOn": ["build-ts"],
"executor": "nx:run-commands",
"options": {
"command": "echo Build complete"
}
},
"build-ts": {
"executor": "@nx/js:tsc",
"outputs": ["{options.outputPath}"],
"defaultConfiguration": "production",
"options": {
"outputPath": "dist/libs/accounts/two-factor",
"tsConfig": "libs/accounts/two-factor/tsconfig.lib.json",
"packageJson": "libs/accounts/two-factor/package.json",
"main": "libs/accounts/two-factor/src/index.ts",
"assets": ["libs/accounts/two-factor/*.md"],
"platform": "node"
},
"configurations": {
"development": {
"minify": false
},
"production": {
"minify": true
}
"assets": ["libs/accounts/two-factor/*.md"]
}
},
"test-unit": {
Expand Down
Loading
Loading