Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade nx 18 #1316

Merged
merged 1 commit into from
Feb 7, 2024
Merged

chore: upgrade nx 18 #1316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/code-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
env:
testCmd: ${{ inputs.affected && format('test:affected --base=remotes/origin/{0}', github.base_ref || github.ref_name) || 'test'}}
NODE_OPTIONS: ${{ runner.os == 'Windows' && '--max_old_space_size=4096' || '' }}
run: yarn ${{ env.testCmd }} --output-style=stream
run: yarn ${{ env.testCmd }}
- name: Publish tests reports
if: always()
# TODO upgrade to v4 when https://github.com/AmadeusITGroup/otter/issues/1198 is fixed
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/it-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jobs:
shell: bash
- name: Test
id: it-tests
run: yarn test-int --output-style=stream
run: yarn test-int
- name: Zip generated app on failure
if: failure() && steps.it-tests.conclusion == 'failure'
run: |
Expand Down
28 changes: 14 additions & 14 deletions .yarnrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ packageExtensions:
"@design-factory/design-factory@*":
peerDependencies:
"@angular/router": ~17.0.4
"@nx/angular@~17.3.0":
"@nx/angular@^18.0.0":
dependencies:
"@angular-devkit/build-angular": ~17.0.3
"@angular-devkit/core": ~17.0.3
Expand All @@ -21,36 +21,36 @@ packageExtensions:
"@types/node": ^20.0.0
esbuild: ~0.20.0
eslint: ^8.42.0
nx: ~17.3.0
nx: ~18.0.2
rxjs: ^7.8.1
typescript: ~5.2.2
"@nx/cypress@~17.3.0":
"@nx/cypress@^18.0.0":
dependencies:
typescript: ~5.2.2
"@nx/devkit@~17.3.0":
"@nx/devkit@^18.0.0":
dependencies:
nx: ~17.3.0
nx: ~18.0.2
typescript: ~5.2.2
"@nx/eslint-plugin@~17.3.0":
"@nx/eslint-plugin@^18.0.0":
dependencies:
"@typescript-eslint/parser": ^6.11.0
eslint: ^8.42.0
"@nx/eslint@~17.3.0":
"@nx/eslint@^18.0.0":
dependencies:
nx: ~17.3.0
"@nx/jest@~17.3.0":
nx: ~18.0.2
"@nx/jest@^18.0.0":
dependencies:
nx: ~17.3.0
nx: ~18.0.2
typescript: ~5.2.2
"@nx/js@~17.3.0":
"@nx/js@^18.0.0":
dependencies:
"@types/node": ^20.0.0
nx: ~17.3.0
nx: ~18.0.2
typescript: ~5.2.2
"@nx/webpack@~17.3.0":
"@nx/webpack@^18.0.0":
dependencies:
"@types/node": ^20.0.0
nx: ~17.3.0
nx: ~18.0.2
typescript: ~5.2.2
postcss-loader@^7.2.4:
dependencies:
Expand Down
8 changes: 4 additions & 4 deletions apps/chrome-devtools/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
"@angular/cli": "~17.0.3",
"@angular/compiler": "~17.0.4",
"@angular/compiler-cli": "~17.0.4",
"@nx/eslint-plugin": "~17.3.0",
"@nx/jest": "~17.3.0",
"@nx/eslint-plugin": "~18.0.2",
"@nx/jest": "~18.0.2",
"@o3r/build-helpers": "workspace:^",
"@o3r/eslint-config-otter": "workspace:^",
"@o3r/eslint-plugin": "workspace:^",
Expand All @@ -62,15 +62,15 @@
"eslint-plugin-jest": "~27.6.0",
"eslint-plugin-jsdoc": "~48.0.0",
"eslint-plugin-prefer-arrow": "~1.2.3",
"eslint-plugin-unicorn": "^50.0.0",
"eslint-plugin-unicorn": "^51.0.0",
"globby": "^11.1.0",
"jest": "~29.7.0",
"jest-environment-jsdom": "~29.7.0",
"jest-junit": "~16.0.0",
"jest-preset-angular": "~14.0.0",
"jsonc-eslint-parser": "~2.4.0",
"minimist": "^1.2.6",
"nx": "~17.3.0",
"nx": "~18.0.2",
"rimraf": "^5.0.1",
"tsc-watch": "^6.0.0",
"typescript": "~5.2.2"
Expand Down
12 changes: 6 additions & 6 deletions apps/github-cascading-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
"@angular/core": "~17.0.4",
"@angular/platform-browser": "~17.0.4",
"@angular/platform-browser-dynamic": "~17.0.4",
"@nx/eslint": "~17.3.0",
"@nx/eslint-plugin": "~17.3.0",
"@nx/jest": "~17.3.0",
"@nx/js": "~17.3.0",
"@nx/eslint": "~18.0.2",
"@nx/eslint-plugin": "~18.0.2",
"@nx/jest": "~18.0.2",
"@nx/js": "~18.0.2",
"@o3r/eslint-config-otter": "workspace:^",
"@o3r/eslint-plugin": "workspace:^",
"@stylistic/eslint-plugin-ts": "^1.5.4",
Expand All @@ -54,14 +54,14 @@
"eslint-plugin-jest": "~27.6.0",
"eslint-plugin-jsdoc": "~48.0.0",
"eslint-plugin-prefer-arrow": "~1.2.3",
"eslint-plugin-unicorn": "^50.0.0",
"eslint-plugin-unicorn": "^51.0.0",
"jest": "~29.7.0",
"jest-environment-jsdom": "~29.7.0",
"jest-junit": "~16.0.0",
"jest-preset-angular": "~14.0.0",
"jsonc-eslint-parser": "~2.4.0",
"nock": "^13.0.5",
"nx": "~17.3.0",
"nx": "~18.0.2",
"rxjs": "^7.8.1",
"smee-client": "^2.0.0",
"ts-jest": "~29.1.1",
Expand Down
6 changes: 3 additions & 3 deletions apps/showcase/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@ngrx/store": "~17.1.0",
"@ngrx/store-devtools": "~17.1.0",
"@ngx-translate/core": "~15.0.0",
"@nx/jest": "~17.3.0",
"@nx/jest": "~18.0.2",
"@o3r/application": "workspace:^",
"@o3r/components": "workspace:^",
"@o3r/configuration": "workspace:^",
Expand Down Expand Up @@ -84,7 +84,7 @@
"@angular-eslint/template-parser": "~17.2.0",
"@angular/cli": "~17.0.3",
"@angular/compiler-cli": "~17.0.4",
"@nx/eslint-plugin": "~17.3.0",
"@nx/eslint-plugin": "~18.0.2",
"@o3r/design": "workspace:^",
"@o3r/eslint-config-otter": "workspace:^",
"@o3r/eslint-plugin": "workspace:^",
Expand All @@ -105,7 +105,7 @@
"eslint-plugin-jest": "~27.6.0",
"eslint-plugin-jsdoc": "~48.0.0",
"eslint-plugin-prefer-arrow": "~1.2.3",
"eslint-plugin-unicorn": "^50.0.0",
"eslint-plugin-unicorn": "^51.0.0",
"globby": "^11.1.0",
"jest": "~29.7.0",
"jest-environment-jsdom": "~29.7.0",
Expand Down
14 changes: 0 additions & 14 deletions apps/vscode-extension/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,6 @@ module.exports = {
],
'sourceType': 'module'
},
'overrides': [
{
'files': [
'**/package.json'
],
'rules': {
'@nx/dependency-checks': ['error', {
'buildTargets': ['build', 'compile', 'test'],
'ignoredDependencies': ['@o3r/schematics'],
'checkObsoleteDependencies': false
}]
}
}
],
'extends': [
'../../.eslintrc.js'
]
Expand Down
9 changes: 5 additions & 4 deletions apps/vscode-extension/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@
"prepare:publish": "prepare-publish ./dist"
},
"dependencies": {
"@o3r/schematics": "workspace:^",
"eslint": "^8.42.0"
},
"devDependencies": {
Expand All @@ -345,8 +346,8 @@
"@angular/core": "~17.0.4",
"@angular/platform-browser": "~17.0.4",
"@angular/platform-browser-dynamic": "~17.0.4",
"@nx/eslint-plugin": "~17.3.0",
"@nx/jest": "~17.3.0",
"@nx/eslint-plugin": "~18.0.2",
"@nx/jest": "~18.0.2",
"@o3r/build-helpers": "workspace:^",
"@o3r/core": "workspace:^",
"@o3r/eslint-plugin": "workspace:^",
Expand All @@ -364,12 +365,12 @@
"eslint-plugin-jest": "~27.6.0",
"eslint-plugin-jsdoc": "~48.0.0",
"eslint-plugin-prefer-arrow": "~1.2.3",
"eslint-plugin-unicorn": "^50.0.0",
"eslint-plugin-unicorn": "^51.0.0",
"jest": "~29.7.0",
"jest-environment-jsdom": "~29.7.0",
"jest-junit": "~16.0.0",
"jsonc-eslint-parser": "~2.4.0",
"nx": "~17.3.0",
"nx": "~18.0.2",
"rxjs": "^7.8.1",
"ts-jest": "~29.1.1",
"typescript": "~5.2.2",
Expand Down
19 changes: 10 additions & 9 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@
}
],
"resolutions": {
"@angular-eslint/builder/nx": "~17.3.0",
"@angular-eslint/builder/@nx/devkit": "~18.0.2",
"@angular-eslint/builder/nx": "~18.0.2",
"@storybook/csf-tools/@babel/traverse": "^7.23.2",
"jasmine-marbles/rxjs": "^7.8.1",
"git-url-parse": "^14.0.0",
Expand Down Expand Up @@ -176,12 +177,12 @@
"@ngrx/store": "~17.1.0",
"@ngrx/store-devtools": "~17.1.0",
"@ngx-translate/core": "~15.0.0",
"@nx/angular": "~17.3.0",
"@nx/eslint": "~17.3.0",
"@nx/eslint-plugin": "~17.3.0",
"@nx/jest": "~17.3.0",
"@nx/js": "~17.3.0",
"@nx/workspace": "~17.3.0",
"@nx/angular": "~18.0.2",
"@nx/eslint": "~18.0.2",
"@nx/eslint-plugin": "~18.0.2",
"@nx/jest": "~18.0.2",
"@nx/js": "~18.0.2",
"@nx/workspace": "~18.0.2",
"@o3r/build-helpers": "workspace:^",
"@o3r/eslint-config-otter": "workspace:^",
"@o3r/eslint-plugin": "workspace:^",
Expand Down Expand Up @@ -214,7 +215,7 @@
"eslint-plugin-jest": "~27.6.0",
"eslint-plugin-jsdoc": "~48.0.0",
"eslint-plugin-prefer-arrow": "~1.2.3",
"eslint-plugin-unicorn": "^50.0.0",
"eslint-plugin-unicorn": "^51.0.0",
"globby": "^11.1.0",
"highlight.js": "^11.8.0",
"husky": "~8.0.3",
Expand All @@ -230,7 +231,7 @@
"ng-packagr": "~17.0.0",
"ngx-highlightjs": "^10.0.0",
"npm-run-all2": "^6.0.0",
"nx": "~17.3.0",
"nx": "~18.0.2",
"postcss": "~8.4.31",
"postcss-scss": "~4.0.9",
"react": "^18.0.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/@ama-sdk/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@
"@angular-eslint/eslint-plugin": "~17.2.0",
"@angular/common": "~17.0.4",
"@angular/core": "~17.0.4",
"@nx/eslint-plugin": "~17.3.0",
"@nx/jest": "~17.3.0",
"@nx/eslint-plugin": "~18.0.2",
"@nx/jest": "~18.0.2",
"@o3r/build-helpers": "workspace:^",
"@o3r/eslint-plugin": "workspace:^",
"@o3r/test-helpers": "workspace:^",
Expand All @@ -132,7 +132,7 @@
"eslint-plugin-jest": "~27.6.0",
"eslint-plugin-jsdoc": "~48.0.0",
"eslint-plugin-prefer-arrow": "~1.2.3",
"eslint-plugin-unicorn": "^50.0.0",
"eslint-plugin-unicorn": "^51.0.0",
"globby": "^11.1.0",
"isomorphic-fetch": "~3.0.0",
"jest": "~29.7.0",
Expand All @@ -143,7 +143,7 @@
"rxjs": "^7.8.1",
"ts-jest": "~29.1.1",
"ts-node": "~10.9.1",
"type-fest": "^4.3.1",
"type-fest": "^4.10.2",
"typescript": "~5.2.2",
"zone.js": "~0.14.2"
},
Expand Down
14 changes: 0 additions & 14 deletions packages/@ama-sdk/create/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,6 @@ module.exports = {
],
'sourceType': 'module'
},
'overrides': [
{
'files': [
'**/package.json'
],
'rules': {
'@nx/dependency-checks': ['error', {
'buildTargets': ['build', 'compile', 'test'],
'ignoredDependencies': ['@o3r/test-helpers'],
'checkObsoleteDependencies': false
}]
}
}
],
'extends': [
'../../../.eslintrc.js'
]
Expand Down
14 changes: 7 additions & 7 deletions packages/@ama-sdk/create/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
"devDependencies": {
"@angular-eslint/eslint-plugin": "~17.2.0",
"@angular-eslint/eslint-plugin-template": "~17.2.0",
"@nx/eslint": "~17.3.0",
"@nx/eslint-plugin": "~17.3.0",
"@nx/jest": "~17.3.0",
"@nx/js": "~17.3.0",
"@nx/eslint": "~18.0.2",
"@nx/eslint-plugin": "~18.0.2",
"@nx/jest": "~18.0.2",
"@nx/js": "~18.0.2",
"@o3r/build-helpers": "workspace:^",
"@o3r/eslint-config-otter": "workspace:^",
"@o3r/eslint-plugin": "workspace:^",
Expand All @@ -55,18 +55,18 @@
"eslint-plugin-jest": "~27.6.0",
"eslint-plugin-jsdoc": "~48.0.0",
"eslint-plugin-prefer-arrow": "~1.2.3",
"eslint-plugin-unicorn": "^50.0.0",
"eslint-plugin-unicorn": "^51.0.0",
"jest": "~29.7.0",
"jest-junit": "~16.0.0",
"jsonc-eslint-parser": "~2.4.0",
"nx": "~17.3.0",
"nx": "~18.0.2",
"pid-from-port": "^1.1.3",
"rimraf": "^5.0.1",
"rxjs": "^7.8.1",
"semver": "^7.5.2",
"ts-jest": "~29.1.1",
"tslib": "^2.5.3",
"type-fest": "^4.3.1"
"type-fest": "^4.10.2"
},
"engines": {
"node": ">=18.0.0",
Expand Down
10 changes: 5 additions & 5 deletions packages/@ama-sdk/schematics/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@
"@angular-devkit/schematics-cli": "~17.0.3",
"@angular-eslint/eslint-plugin": "~17.2.0",
"@angular/cli": "~17.0.3",
"@nx/eslint-plugin": "~17.3.0",
"@nx/jest": "~17.3.0",
"@nx/eslint-plugin": "~18.0.2",
"@nx/jest": "~18.0.2",
"@o3r/build-helpers": "workspace:^",
"@o3r/eslint-plugin": "workspace:^",
"@o3r/schematics": "workspace:^",
Expand All @@ -97,21 +97,21 @@
"eslint-plugin-jest": "~27.6.0",
"eslint-plugin-jsdoc": "~48.0.0",
"eslint-plugin-prefer-arrow": "~1.2.3",
"eslint-plugin-unicorn": "^50.0.0",
"eslint-plugin-unicorn": "^51.0.0",
"globby": "^11.1.0",
"isomorphic-fetch": "~3.0.0",
"jest": "~29.7.0",
"jest-junit": "~16.0.0",
"jsonc-eslint-parser": "~2.4.0",
"mem-fs": "^4.0.0",
"npm-run-all2": "^6.0.0",
"nx": "~17.3.0",
"nx": "~18.0.2",
"onchange": "^7.0.2",
"pid-from-port": "^1.1.3",
"semver": "^7.5.2",
"ts-jest": "~29.1.1",
"ts-node": "~10.9.1",
"type-fest": "^4.3.1",
"type-fest": "^4.10.2",
"typescript": "~5.2.2"
},
"openApiSupportedVersion": "~6.6.0",
Expand Down
Loading
Loading