Skip to content

Commit b1197a0

Browse files
authored
Cascading/main 14.0.0 next (#3818)
## Proposed change <!-- Please include a summary of the changes and the related issue. Please also include relevant motivation and context. --> ## 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 -->
2 parents 9cc1d24 + 095620a commit b1197a0

File tree

92 files changed

+5347
-3262
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+5347
-3262
lines changed

.github/workflows/e2e-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ jobs:
4040
- run: yarn playwright install
4141
- name: Run e2e tests
4242
run: |
43-
npx --yes http-server apps/showcase/dist/browser -p 8080 -s &
44-
npx --yes wait-on $PLAYWRIGHT_TARGET_URL -t 5000
43+
yarn http-server apps/showcase/dist/browser -p 8080 -s &
44+
yarn wait-on $PLAYWRIGHT_TARGET_URL -t 5000
4545
yarn test-e2e
4646
shell: bash
4747
env:

.github/workflows/it-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ jobs:
109109
chmod a+rwx -R ./.verdaccio/storage
110110
yarn verdaccio:start-persistent
111111
elif [ "$RUNNER_OS" == "Windows" ]; then
112-
npx --yes verdaccio --config $GITHUB_WORKSPACE\\.verdaccio\\conf\\config-without-docker.yaml --listen http://127.0.0.1:4873 &
113-
npx --yes wait-on http://127.0.0.1:4873 -t 180000
112+
yarn verdaccio --config $GITHUB_WORKSPACE\\.verdaccio\\conf\\config-without-docker.yaml --listen http://127.0.0.1:4873 &
113+
yarn wait-on http://127.0.0.1:4873 -t 180000
114114
fi
115115
yarn verdaccio:login
116116
shell: bash

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
9292
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
9393
with:
94-
node-version: 22
94+
node-version: 24
9595
- name: New Version
9696
if: github.event_name != 'merge_group'
9797
id: newVersion

.github/workflows/publish.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,6 @@ jobs:
7474
- uses: ./tools/github-actions/download-build-output
7575
- uses: ./tools/github-actions/setup
7676
timeout-minutes: 30
77-
with:
78-
#TODO Remove when migrate to Node 24
79-
npm-version: '11.5'
8077
- run: yarn set:version ${{ inputs.version }}
8178
- name: Get tag name
8279
id: get-npm-tag
Lines changed: 191 additions & 191 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ packageExtensions:
3030
"@types/express-serve-static-core": ^5.0.0
3131
"ioredis": ^5.3.2
3232

33-
yarnPath: .yarn/releases/yarn-4.11.0.cjs
33+
yarnPath: .yarn/releases/yarn-4.12.0.cjs

apps/chrome-devtools/package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
"dist/"
3030
],
3131
"devDependencies": {
32-
"@angular-devkit/build-angular": "~20.3.11",
33-
"@angular-devkit/schematics": "~20.3.11",
34-
"@angular/cli": "~20.3.11",
35-
"@angular/compiler": "~20.3.13",
36-
"@angular/compiler-cli": "~20.3.13",
32+
"@angular-devkit/build-angular": "~20.3.13",
33+
"@angular-devkit/schematics": "~20.3.13",
34+
"@angular/cli": "~20.3.13",
35+
"@angular/compiler": "~20.3.15",
36+
"@angular/compiler-cli": "~20.3.15",
3737
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
3838
"@nx/eslint-plugin": "~21.6.0",
3939
"@nx/jest": "~21.6.0",
@@ -45,7 +45,7 @@
4545
"@o3r/rules-engine": "workspace:~",
4646
"@o3r/test-helpers": "workspace:~",
4747
"@playwright/test": "~1.57.0",
48-
"@schematics/angular": "~20.3.11",
48+
"@schematics/angular": "~20.3.13",
4949
"@stylistic/eslint-plugin": "~5.6.0",
5050
"@types/chrome": "^0.1.0",
5151
"@types/jest": "~30.0.0",
@@ -90,14 +90,14 @@
9090
"@agnos-ui/angular-bootstrap": "~0.9.0",
9191
"@agnos-ui/core-bootstrap": "~0.9.0",
9292
"@amadeus-it-group/tansu": "~2.0.0",
93-
"@angular/animations": "~20.3.13",
94-
"@angular/common": "~20.3.13",
95-
"@angular/core": "~20.3.13",
96-
"@angular/forms": "~20.3.13",
97-
"@angular/localize": "~20.3.13",
98-
"@angular/platform-browser": "~20.3.13",
99-
"@angular/platform-browser-dynamic": "~20.3.13",
100-
"@angular/router": "~20.3.13",
93+
"@angular/animations": "~20.3.15",
94+
"@angular/common": "~20.3.15",
95+
"@angular/core": "~20.3.15",
96+
"@angular/forms": "~20.3.15",
97+
"@angular/localize": "~20.3.15",
98+
"@angular/platform-browser": "~20.3.15",
99+
"@angular/platform-browser-dynamic": "~20.3.15",
100+
"@angular/router": "~20.3.15",
101101
"@design-factory/design-factory": "~20.0.0",
102102
"@ng-bootstrap/ng-bootstrap": "^19.0.0",
103103
"@ng-select/ng-select": "~20.0.0",

apps/github-cascading-app/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
},
2424
"devDependencies": {
2525
"@actions/github": "^6.0.0",
26-
"@angular-devkit/schematics": "~20.3.11",
27-
"@angular/animations": "~20.3.13",
28-
"@angular/common": "~20.3.13",
29-
"@angular/compiler": "~20.3.13",
30-
"@angular/compiler-cli": "~20.3.13",
31-
"@angular/core": "~20.3.13",
32-
"@angular/platform-browser": "~20.3.13",
33-
"@angular/platform-browser-dynamic": "~20.3.13",
26+
"@angular-devkit/schematics": "~20.3.13",
27+
"@angular/animations": "~20.3.15",
28+
"@angular/common": "~20.3.15",
29+
"@angular/compiler": "~20.3.15",
30+
"@angular/compiler-cli": "~20.3.15",
31+
"@angular/core": "~20.3.15",
32+
"@angular/platform-browser": "~20.3.15",
33+
"@angular/platform-browser-dynamic": "~20.3.15",
3434
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
3535
"@nx/eslint": "~21.6.0",
3636
"@nx/eslint-plugin": "~21.6.0",
@@ -43,7 +43,7 @@
4343
"@types/ejs": "^3.1.2",
4444
"@types/express-serve-static-core": "^5.0.0",
4545
"@types/jest": "~30.0.0",
46-
"@types/node": "~22.18.0",
46+
"@types/node": "~24.10.0",
4747
"@types/semver": "^7.3.13",
4848
"@typescript-eslint/parser": "~8.47.0",
4949
"angular-eslint": "~20.6.0",

apps/palette-generator/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
"@o3r/build-helpers": "workspace:~",
2727
"@o3r/eslint-plugin": "workspace:~",
2828
"@o3r/test-helpers": "workspace:~",
29-
"@schematics/angular": "~20.3.11",
29+
"@schematics/angular": "~20.3.13",
3030
"@stylistic/eslint-plugin": "~5.6.0",
3131
"@types/jest": "~30.0.0",
32-
"@types/node": "~22.18.0",
32+
"@types/node": "~24.10.0",
3333
"@typescript-eslint/parser": "~8.47.0",
3434
"angular-eslint": "~20.6.0",
3535
"cpy-cli": "^6.0.0",

apps/showcase/package.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@
3333
"@ama-sdk/core": "workspace:~",
3434
"@ama-sdk/schematics": "workspace:~",
3535
"@amadeus-it-group/tansu": "~2.0.0",
36-
"@angular/animations": "~20.3.13",
36+
"@angular/animations": "~20.3.15",
3737
"@angular/cdk": "~20.2.14",
38-
"@angular/common": "~20.3.13",
39-
"@angular/compiler": "~20.3.13",
40-
"@angular/core": "~20.3.13",
41-
"@angular/forms": "~20.3.13",
42-
"@angular/localize": "~20.3.13",
43-
"@angular/platform-browser": "~20.3.13",
44-
"@angular/platform-browser-dynamic": "~20.3.13",
45-
"@angular/router": "~20.3.13",
38+
"@angular/common": "~20.3.15",
39+
"@angular/compiler": "~20.3.15",
40+
"@angular/core": "~20.3.15",
41+
"@angular/forms": "~20.3.15",
42+
"@angular/localize": "~20.3.15",
43+
"@angular/platform-browser": "~20.3.15",
44+
"@angular/platform-browser-dynamic": "~20.3.15",
45+
"@angular/router": "~20.3.15",
4646
"@commitlint/types": "^19.0.0",
4747
"@design-factory/design-factory": "~20.0.0",
4848
"@formatjs/intl-numberformat": "~8.15.0",
@@ -106,12 +106,12 @@
106106
},
107107
"devDependencies": {
108108
"@amadeus-it-group/kassette": "^1.7.0",
109-
"@angular-devkit/architect": "~0.2003.11",
110-
"@angular-devkit/build-angular": "~20.3.11",
111-
"@angular-devkit/core": "~20.3.11",
112-
"@angular-devkit/schematics": "~20.3.11",
113-
"@angular/cli": "~20.3.11",
114-
"@angular/compiler-cli": "~20.3.13",
109+
"@angular-devkit/architect": "0.2003.13",
110+
"@angular-devkit/build-angular": "~20.3.13",
111+
"@angular-devkit/core": "~20.3.13",
112+
"@angular-devkit/schematics": "~20.3.13",
113+
"@angular/cli": "~20.3.13",
114+
"@angular/compiler-cli": "~20.3.15",
115115
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
116116
"@nx/eslint-plugin": "~21.6.0",
117117
"@o3r-training/training-sdk": "workspace:~",
@@ -123,11 +123,11 @@
123123
"@o3r/test-helpers": "workspace:~",
124124
"@o3r/testing": "workspace:~",
125125
"@playwright/test": "~1.57.0",
126-
"@schematics/angular": "~20.3.11",
126+
"@schematics/angular": "~20.3.13",
127127
"@stylistic/eslint-plugin": "~5.6.0",
128128
"@types/bootstrap": "^5.2.10",
129129
"@types/jest": "~30.0.0",
130-
"@types/node": "~22.18.0",
130+
"@types/node": "~24.10.0",
131131
"@typescript-eslint/parser": "~8.47.0",
132132
"@webcontainer/api": "~1.6.0",
133133
"angular-eslint": "~20.6.0",

0 commit comments

Comments
 (0)