Skip to content

Commit

Permalink
chore: upgrade Nx dependencies (#2513)
Browse files Browse the repository at this point in the history
## Proposed change

Remove usages of `@nx/js:tsc` to fix an issue on Windows with Yarn PnP

## Related issues

<!--
Please make sure to follow the [contribution
guidelines](https://github.com/amadeus-digital/Otter/blob/main/CONTRIBUTING.md)
-->

*- No issue associated -*

<!-- * 🐛 Fix #issue -->
<!-- * 🐛 Fix resolves #issue -->
<!-- * 🚀 Feature #issue -->
<!-- * 🚀 Feature resolves #issue -->
<!-- * :octocat: Pull Request #issue -->
  • Loading branch information
fpaul-1A authored Dec 16, 2024
2 parents 56eae2b + 607469a commit cd1fcad
Show file tree
Hide file tree
Showing 112 changed files with 959 additions and 1,324 deletions.
1 change: 0 additions & 1 deletion .nxignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
**/src/package.json
packages/@*/*/{builders,schematics}/**/templates/**/*.ts
packages/@*/*/{builders,schematics}/**/mocks/**/*.ts
packages/@*/*/{builders,schematics}/**/index.js
packages/@*/*/build/**
!**/schematics/**/target
6 changes: 3 additions & 3 deletions apps/chrome-devtools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"@angular/compiler": "~18.2.0",
"@angular/compiler-cli": "~18.2.0",
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
"@nx/eslint-plugin": "~19.5.0",
"@nx/jest": "~19.5.0",
"@nx/eslint-plugin": "~19.8.0",
"@nx/jest": "~19.8.0",
"@o3r/build-helpers": "workspace:^",
"@o3r/eslint-config": "workspace:^",
"@o3r/eslint-plugin": "workspace:^",
Expand Down Expand Up @@ -71,7 +71,7 @@
"jest-preset-angular": "~14.2.0",
"jsonc-eslint-parser": "~2.4.0",
"minimist": "^1.2.6",
"nx": "~19.5.0",
"nx": "~19.8.0",
"rimraf": "^5.0.1",
"tsc-watch": "^6.0.4",
"typescript": "~5.5.4",
Expand Down
10 changes: 5 additions & 5 deletions apps/github-cascading-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
"@angular/platform-browser": "~18.2.0",
"@angular/platform-browser-dynamic": "~18.2.0",
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
"@nx/eslint": "~19.5.0",
"@nx/eslint-plugin": "~19.5.0",
"@nx/jest": "~19.5.0",
"@nx/js": "~19.5.0",
"@nx/eslint": "~19.8.0",
"@nx/eslint-plugin": "~19.8.0",
"@nx/jest": "~19.8.0",
"@nx/js": "~19.8.0",
"@o3r/eslint-config": "workspace:^",
"@o3r/eslint-plugin": "workspace:^",
"@stylistic/eslint-plugin": "~2.7.0",
Expand Down Expand Up @@ -63,7 +63,7 @@
"jest-junit": "~16.0.0",
"jsonc-eslint-parser": "~2.4.0",
"nock": "^13.0.5",
"nx": "~19.5.0",
"nx": "~19.8.0",
"rxjs": "^7.8.1",
"smee-client": "^2.0.0",
"ts-jest": "~29.2.0",
Expand Down
4 changes: 2 additions & 2 deletions apps/showcase/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"@ngrx/store": "~18.0.0",
"@ngrx/store-devtools": "~18.0.0",
"@ngx-translate/core": "~15.0.0",
"@nx/jest": "~19.5.0",
"@nx/jest": "~19.8.0",
"@o3r-training/showcase-sdk": "workspace:^",
"@o3r-training/training-tools": "workspace:^",
"@o3r/application": "workspace:^",
Expand Down Expand Up @@ -97,7 +97,7 @@
"@angular/cli": "~18.2.0",
"@angular/compiler-cli": "~18.2.0",
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
"@nx/eslint-plugin": "~19.5.0",
"@nx/eslint-plugin": "~19.8.0",
"@o3r/build-helpers": "workspace:^",
"@o3r/design": "workspace:^",
"@o3r/eslint-config": "workspace:^",
Expand Down
6 changes: 3 additions & 3 deletions apps/vscode-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -358,8 +358,8 @@
"@angular/platform-browser": "~18.2.0",
"@angular/platform-browser-dynamic": "~18.2.0",
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
"@nx/eslint-plugin": "~19.5.0",
"@nx/jest": "~19.5.0",
"@nx/eslint-plugin": "~19.8.0",
"@nx/jest": "~19.8.0",
"@o3r/build-helpers": "workspace:^",
"@o3r/core": "workspace:^",
"@o3r/eslint-plugin": "workspace:^",
Expand Down Expand Up @@ -391,7 +391,7 @@
"jest-junit": "~16.0.0",
"jiti": "^2.4.0",
"jsonc-eslint-parser": "~2.4.0",
"nx": "~19.5.0",
"nx": "~19.8.0",
"rxjs": "^7.8.1",
"ts-jest": "~29.2.0",
"typescript": "~5.5.4",
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -180,12 +180,12 @@
"@ngrx/store": "~18.0.0",
"@ngrx/store-devtools": "~18.0.0",
"@ngx-translate/core": "~15.0.0",
"@nx/angular": "~19.5.0",
"@nx/eslint": "~19.5.0",
"@nx/eslint-plugin": "~19.5.0",
"@nx/jest": "~19.5.0",
"@nx/js": "~19.5.0",
"@nx/workspace": "~19.5.0",
"@nx/angular": "~19.8.0",
"@nx/eslint": "~19.8.0",
"@nx/eslint-plugin": "~19.8.0",
"@nx/jest": "~19.8.0",
"@nx/js": "~19.8.0",
"@nx/workspace": "~19.8.0",
"@o3r/build-helpers": "workspace:^",
"@o3r/eslint-config": "workspace:^",
"@o3r/eslint-plugin": "workspace:^",
Expand Down Expand Up @@ -246,7 +246,7 @@
"ng-packagr": "~18.2.0",
"ngx-markdown": "^18.1.0",
"npm-run-all2": "^6.0.0",
"nx": "~19.5.0",
"nx": "~19.8.0",
"nx-cloud": "^19.1.0",
"playwright-lighthouse": "~4.0.0",
"postcss": "~8.4.31",
Expand Down
4 changes: 2 additions & 2 deletions packages/@ama-sdk/client-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@
"@angular/common": "~18.2.0",
"@angular/core": "~18.2.0",
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
"@nx/eslint-plugin": "~19.5.0",
"@nx/jest": "~19.5.0",
"@nx/eslint-plugin": "~19.8.0",
"@nx/jest": "~19.8.0",
"@o3r/build-helpers": "workspace:^",
"@o3r/eslint-plugin": "workspace:^",
"@o3r/schematics": "workspace:^",
Expand Down
13 changes: 0 additions & 13 deletions packages/@ama-sdk/client-angular/schematics/ng-add/index.js

This file was deleted.

4 changes: 2 additions & 2 deletions packages/@ama-sdk/client-beacon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
"@angular/common": "~18.2.0",
"@angular/core": "~18.2.0",
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
"@nx/eslint-plugin": "~19.5.0",
"@nx/jest": "~19.5.0",
"@nx/eslint-plugin": "~19.8.0",
"@nx/jest": "~19.8.0",
"@o3r/build-helpers": "workspace:^",
"@o3r/eslint-plugin": "workspace:^",
"@o3r/schematics": "workspace:^",
Expand Down
13 changes: 0 additions & 13 deletions packages/@ama-sdk/client-beacon/schematics/ng-add/index.js

This file was deleted.

4 changes: 2 additions & 2 deletions packages/@ama-sdk/client-fetch/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@
"@angular/common": "~18.2.0",
"@angular/core": "~18.2.0",
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
"@nx/eslint-plugin": "~19.5.0",
"@nx/jest": "~19.5.0",
"@nx/eslint-plugin": "~19.8.0",
"@nx/jest": "~19.8.0",
"@o3r/build-helpers": "workspace:^",
"@o3r/eslint-plugin": "workspace:^",
"@o3r/schematics": "workspace:^",
Expand Down
4 changes: 2 additions & 2 deletions packages/@ama-sdk/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@
"@angular/common": "~18.2.0",
"@angular/core": "~18.2.0",
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
"@nx/eslint-plugin": "~19.5.0",
"@nx/jest": "~19.5.0",
"@nx/eslint-plugin": "~19.8.0",
"@nx/jest": "~19.8.0",
"@o3r/build-helpers": "workspace:^",
"@o3r/eslint-plugin": "workspace:^",
"@o3r/schematics": "workspace:^",
Expand Down
10 changes: 5 additions & 5 deletions packages/@ama-sdk/create/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@
},
"devDependencies": {
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
"@nx/eslint": "~19.5.0",
"@nx/eslint-plugin": "~19.5.0",
"@nx/jest": "~19.5.0",
"@nx/js": "~19.5.0",
"@nx/eslint": "~19.8.0",
"@nx/eslint-plugin": "~19.8.0",
"@nx/jest": "~19.8.0",
"@nx/js": "~19.8.0",
"@o3r/build-helpers": "workspace:^",
"@o3r/eslint-config": "workspace:^",
"@o3r/eslint-plugin": "workspace:^",
Expand Down Expand Up @@ -72,7 +72,7 @@
"jest": "~29.7.0",
"jest-junit": "~16.0.0",
"jsonc-eslint-parser": "~2.4.0",
"nx": "~19.5.0",
"nx": "~19.8.0",
"pid-from-port": "^1.1.3",
"rimraf": "^5.0.1",
"rxjs": "^7.8.1",
Expand Down
6 changes: 3 additions & 3 deletions packages/@ama-sdk/schematics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@
"@angular-devkit/schematics-cli": "^18.0.5",
"@angular/cli": "~18.2.0",
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
"@nx/eslint-plugin": "~19.5.0",
"@nx/jest": "~19.5.0",
"@nx/eslint-plugin": "~19.8.0",
"@nx/jest": "~19.8.0",
"@o3r/build-helpers": "workspace:^",
"@o3r/eslint-plugin": "workspace:^",
"@o3r/schematics": "workspace:^",
Expand Down Expand Up @@ -128,7 +128,7 @@
"jsonc-eslint-parser": "~2.4.0",
"mem-fs": "^4.0.0",
"npm-run-all2": "^6.0.0",
"nx": "~19.5.0",
"nx": "~19.8.0",
"openapi-types": "^12.0.0",
"pid-from-port": "^1.1.3",
"semver": "^7.5.2",
Expand Down
6 changes: 4 additions & 2 deletions packages/@ama-sdk/swagger-builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"nx": "nx",
"ng": "yarn nx",
"build": "yarn nx build ama-sdk-swagger-builder",
"build:source": "tsc -b tsconfig.build.json --pretty && yarn cpy ./package.json src/schemas/*.json dist",
"postbuild": "patch-package-json-main",
"prepare:publish": "prepare-publish ./dist"
},
Expand All @@ -32,8 +33,8 @@
},
"devDependencies": {
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
"@nx/eslint-plugin": "~19.5.0",
"@nx/jest": "~19.5.0",
"@nx/eslint-plugin": "~19.8.0",
"@nx/jest": "~19.8.0",
"@o3r/build-helpers": "workspace:^",
"@o3r/eslint-plugin": "workspace:^",
"@stylistic/eslint-plugin": "~2.7.0",
Expand All @@ -47,6 +48,7 @@
"angular-eslint": "~18.4.0",
"concurrently": "^8.0.0",
"copyfiles": "^2.4.1",
"cpy-cli": "^5.0.0",
"eslint": "~9.14.0",
"eslint-import-resolver-node": "^0.3.9",
"eslint-import-resolver-typescript": "^3.6.3",
Expand Down
7 changes: 2 additions & 5 deletions packages/@ama-sdk/swagger-builder/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,9 @@
"dependsOn": ["compile"]
},
"compile": {
"executor": "@nx/js:tsc",
"executor": "nx:run-script",
"options": {
"main": "packages/@ama-sdk/swagger-builder/src/cli/build.ts",
"tsConfig": "packages/@ama-sdk/swagger-builder/tsconfig.build.json",
"outputPath": "packages/@ama-sdk/swagger-builder/dist",
"assets": ["packages/@ama-sdk/swagger-builder/src/schemas/*.json"]
"script": "build:source"
}
},
"lint": {
Expand Down
8 changes: 5 additions & 3 deletions packages/@ama-terasu/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"nx": "nx",
"ng": "yarn nx",
"build": "yarn nx build amaterasu-cli",
"build:source": "tsc -b tsconfig.build.json --pretty && yarn cpy ./package.json dist",
"postbuild": "patch-package-json-main",
"start": "tsc --declaration --declarationMap --watch --pretty",
"prepare:publish": "prepare-publish ./dist"
Expand All @@ -25,8 +26,8 @@
"@angular-devkit/core": "~18.2.0",
"@angular-devkit/schematics": "~18.2.0",
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
"@nx/eslint-plugin": "~19.5.0",
"@nx/jest": "~19.5.0",
"@nx/eslint-plugin": "~19.8.0",
"@nx/jest": "~19.8.0",
"@o3r/amaterasu-api-spec": "workspace:^",
"@o3r/amaterasu-dodo": "workspace:^",
"@o3r/amaterasu-otter": "workspace:^",
Expand All @@ -44,6 +45,7 @@
"@types/yargs": "^17.0.20",
"@typescript-eslint/parser": "~8.17.0",
"angular-eslint": "~18.4.0",
"cpy-cli": "^5.0.0",
"eslint": "~9.14.0",
"eslint-import-resolver-node": "^0.3.9",
"eslint-import-resolver-typescript": "^3.6.3",
Expand All @@ -61,7 +63,7 @@
"jsonschema": "~1.4.1",
"loglevel": "^1.8.0",
"minimist": "^1.2.6",
"nx": "~19.5.0",
"nx": "~19.8.0",
"rxjs": "^7.8.1",
"ts-jest": "~29.2.0",
"ts-loader": "^9.2.6",
Expand Down
7 changes: 2 additions & 5 deletions packages/@ama-terasu/cli/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,9 @@
"dependsOn": ["compile"]
},
"compile": {
"executor": "@nx/js:tsc",
"outputs": ["{projectRoot}/dist", "{projectRoot}/build/.tsbuildinfo"],
"executor": "nx:run-script",
"options": {
"main": "packages/@ama-terasu/cli/src/public_api.ts",
"tsConfig": "packages/@ama-terasu/cli/tsconfig.build.json",
"outputPath": "packages/@ama-terasu/cli/dist"
"script": "build:source"
}
},
"lint": {
Expand Down
8 changes: 5 additions & 3 deletions packages/@ama-terasu/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@
"nx": "nx",
"ng": "yarn nx",
"build": "yarn nx build amaterasu-core",
"build:source": "tsc -b tsconfig.build.json --pretty && yarn cpy ./package.json dist",
"postbuild": "patch-package-json-main",
"prepare:publish": "prepare-publish ./dist"
},
"devDependencies": {
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
"@nx/eslint-plugin": "~19.5.0",
"@nx/jest": "~19.5.0",
"@nx/eslint-plugin": "~19.8.0",
"@nx/jest": "~19.8.0",
"@o3r/build-helpers": "workspace:^",
"@o3r/eslint-plugin": "workspace:^",
"@stylistic/eslint-plugin": "~2.7.0",
Expand All @@ -27,6 +28,7 @@
"@types/yargs": "^17.0.20",
"@typescript-eslint/parser": "~8.17.0",
"angular-eslint": "~18.4.0",
"cpy-cli": "^5.0.0",
"eslint": "~9.14.0",
"eslint-import-resolver-node": "^0.3.9",
"eslint-import-resolver-typescript": "^3.6.3",
Expand All @@ -42,7 +44,7 @@
"jest-junit": "~16.0.0",
"jsonc-eslint-parser": "~2.4.0",
"loglevel": "^1.8.0",
"nx": "~19.5.0",
"nx": "~19.8.0",
"ts-jest": "~29.2.0",
"typescript": "~5.5.4",
"typescript-eslint": "~8.17.0",
Expand Down
7 changes: 2 additions & 5 deletions packages/@ama-terasu/core/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,9 @@
"dependsOn": ["compile"]
},
"compile": {
"executor": "@nx/js:tsc",
"outputs": ["{projectRoot}/dist", "{projectRoot}/build/.tsbuildinfo"],
"executor": "nx:run-script",
"options": {
"main": "packages/@ama-terasu/core/src/public_api.ts",
"tsConfig": "packages/@ama-terasu/core/tsconfig.build.json",
"outputPath": "packages/@ama-terasu/core/dist"
"script": "build:source"
}
},
"lint": {
Expand Down
Loading

0 comments on commit cd1fcad

Please sign in to comment.