Skip to content

Commit

Permalink
chore: update Nx
Browse files Browse the repository at this point in the history
  • Loading branch information
beeman committed Jun 21, 2024
1 parent 78f9ba3 commit dd6fc95
Show file tree
Hide file tree
Showing 39 changed files with 13,906 additions and 10,141 deletions.
12 changes: 8 additions & 4 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@
"ignorePatterns": ["**/*"],
"plugins": ["@nx"],
"overrides": [
// Opinionated defaults, feel free to change in your own projects
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"rules": {
// Only allow function declarations and not const fn = () => {}
"func-style": ["error", "declaration"]
}
},
Expand All @@ -32,12 +30,18 @@
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nx/typescript"],
"rules": {}
"rules": {
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nx/javascript"],
"rules": {}
"rules": {
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
},
{
"files": ["*.spec.ts", "*.spec.tsx", "*.spec.js", "*.spec.jsx"],
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ testem.log
.DS_Store
Thumbs.db
.nx/cache
.nx/workspace-data
.anchor
libs/anchor/target/deploy
libs/anchor/target/debug
Expand Down
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ target
node_modules
dist
build
test-ledger
test-ledger
/.nx/workspace-data
3 changes: 1 addition & 2 deletions apps/api-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
}
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
"executor": "@nx/eslint:lint"
}
}
}
7 changes: 3 additions & 4 deletions apps/api/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "apps/api/src",
"projectType": "application",
"tags": [],
"targets": {
"build": {
"executor": "@nx/webpack:webpack",
Expand Down Expand Up @@ -39,8 +40,7 @@
}
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
"executor": "@nx/eslint:lint"
},
"test": {
"executor": "@nx/jest:jest",
Expand All @@ -49,6 +49,5 @@
"jestConfig": "apps/api/jest.config.ts"
}
}
},
"tags": []
}
}
9 changes: 4 additions & 5 deletions apps/web-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "apps/web-e2e/src",
"projectType": "application",
"tags": [],
"implicitDependencies": ["web"],
"targets": {
"e2e": {
"executor": "@nx/cypress:cypress",
Expand All @@ -21,10 +23,7 @@
}
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
"executor": "@nx/eslint:lint"
}
},
"tags": [],
"implicitDependencies": ["web"]
}
}
7 changes: 3 additions & 4 deletions apps/web/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "apps/web/src",
"projectType": "application",
"tags": [],
"targets": {
"build": {
"executor": "@nx/webpack:webpack",
Expand Down Expand Up @@ -64,8 +65,7 @@
}
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
"executor": "@nx/eslint:lint"
},
"serve-static": {
"executor": "@nx/web:file-server",
Expand All @@ -80,6 +80,5 @@
"jestConfig": "apps/web/jest.config.ts"
}
}
},
"tags": []
}
}
14 changes: 9 additions & 5 deletions libs/anchor/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/anchor/src",
"projectType": "library",
"tags": [],
"targets": {
"build": {
"executor": "@nx/rollup:rollup",
Expand All @@ -18,14 +19,18 @@
}
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
"executor": "@nx/eslint:lint"
},
"test": {
"executor": "nx:run-commands",
"options": {
"cwd": "libs/anchor",
"commands": [{ "command": "anchor test", "forwardAllArgs": false }],
"commands": [
{
"command": "anchor test",
"forwardAllArgs": false
}
],
"parallel": false
}
},
Expand All @@ -52,6 +57,5 @@
"jestConfig": "libs/anchor/jest.config.ts"
}
}
},
"tags": []
}
}
7 changes: 3 additions & 4 deletions libs/api/auth/data-access/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"$schema": "../../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/api/auth/data-access/src",
"projectType": "library",
"tags": ["api", "data-access"],
"targets": {
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
"executor": "@nx/eslint:lint"
},
"test": {
"executor": "@nx/jest:jest",
Expand All @@ -15,6 +15,5 @@
"jestConfig": "libs/api/auth/data-access/jest.config.ts"
}
}
},
"tags": ["api", "data-access"]
}
}
7 changes: 3 additions & 4 deletions libs/api/auth/feature/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"$schema": "../../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/api/auth/feature/src",
"projectType": "library",
"tags": ["api", "feature"],
"targets": {
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
"executor": "@nx/eslint:lint"
},
"test": {
"executor": "@nx/jest:jest",
Expand All @@ -15,6 +15,5 @@
"jestConfig": "libs/api/auth/feature/jest.config.ts"
}
}
},
"tags": ["api", "feature"]
}
}
7 changes: 3 additions & 4 deletions libs/api/core/data-access/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"$schema": "../../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/api/core/data-access/src",
"projectType": "library",
"tags": ["api", "data-access"],
"targets": {
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
"executor": "@nx/eslint:lint"
},
"test": {
"executor": "@nx/jest:jest",
Expand All @@ -15,6 +15,5 @@
"jestConfig": "libs/api/core/data-access/jest.config.ts"
}
}
},
"tags": ["api", "data-access"]
}
}
7 changes: 3 additions & 4 deletions libs/api/core/feature/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"$schema": "../../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/api/core/feature/src",
"projectType": "library",
"tags": ["api", "feature"],
"targets": {
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
"executor": "@nx/eslint:lint"
},
"test": {
"executor": "@nx/jest:jest",
Expand All @@ -15,6 +15,5 @@
"jestConfig": "libs/api/core/feature/jest.config.ts"
}
}
},
"tags": ["api", "feature"]
}
}
7 changes: 3 additions & 4 deletions libs/api/identity/data-access/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"$schema": "../../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/api/identity/data-access/src",
"projectType": "library",
"tags": ["api", "data-access"],
"targets": {
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
"executor": "@nx/eslint:lint"
},
"test": {
"executor": "@nx/jest:jest",
Expand All @@ -15,6 +15,5 @@
"jestConfig": "libs/api/identity/data-access/jest.config.ts"
}
}
},
"tags": ["api", "data-access"]
}
}
7 changes: 3 additions & 4 deletions libs/api/identity/feature/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"$schema": "../../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/api/identity/feature/src",
"projectType": "library",
"tags": ["api", "feature"],
"targets": {
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
"executor": "@nx/eslint:lint"
},
"test": {
"executor": "@nx/jest:jest",
Expand All @@ -15,6 +15,5 @@
"jestConfig": "libs/api/identity/feature/jest.config.ts"
}
}
},
"tags": ["api", "feature"]
}
}
7 changes: 3 additions & 4 deletions libs/api/user/data-access/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"$schema": "../../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/api/user/data-access/src",
"projectType": "library",
"tags": ["api", "data-access"],
"targets": {
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
"executor": "@nx/eslint:lint"
},
"test": {
"executor": "@nx/jest:jest",
Expand All @@ -15,6 +15,5 @@
"jestConfig": "libs/api/user/data-access/jest.config.ts"
}
}
},
"tags": ["api", "data-access"]
}
}
7 changes: 3 additions & 4 deletions libs/api/user/feature/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"$schema": "../../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/api/user/feature/src",
"projectType": "library",
"tags": ["api", "feature"],
"targets": {
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
"executor": "@nx/eslint:lint"
},
"test": {
"executor": "@nx/jest:jest",
Expand All @@ -15,6 +15,5 @@
"jestConfig": "libs/api/user/feature/jest.config.ts"
}
}
},
"tags": ["api", "feature"]
}
}
7 changes: 3 additions & 4 deletions libs/sdk/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/sdk/src",
"projectType": "library",
"tags": [],
"targets": {
"build": {
"executor": "@nx/js:tsc",
Expand All @@ -15,8 +16,7 @@
}
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
"executor": "@nx/eslint:lint"
},
"test": {
"executor": "@nx/jest:jest",
Expand All @@ -25,6 +25,5 @@
"jestConfig": "libs/sdk/jest.config.ts"
}
}
},
"tags": []
}
}
7 changes: 3 additions & 4 deletions libs/tools/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/tools/src",
"projectType": "library",
"tags": [],
"targets": {
"build": {
"executor": "@nx/js:tsc",
Expand Down Expand Up @@ -37,8 +38,7 @@
}
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
"executor": "@nx/eslint:lint"
},
"test": {
"executor": "@nx/jest:jest",
Expand All @@ -47,6 +47,5 @@
"jestConfig": "libs/tools/jest.config.ts"
}
}
},
"tags": []
}
}
Loading

0 comments on commit dd6fc95

Please sign in to comment.