8000 chore: upgr nx & ng versions · rx-angular/rx-angular@0c66ade · GitHub
[go: up one dir, main page]

Skip to content

Commit 0c66ade

Browse files
committed
chore: upgr nx & ng versions
1 parent a59ea31 commit 0c66ade

16 files changed

+3961
-1845
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,5 @@ Thumbs.db
5555
.nx/cache
5656
.nx/workspace-data
5757
migrations.json
58+
.cursor/rules/nx-rules.mdc
59+
.github/instructions/nx.instructions.md

apps/demos/project.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
"name": "demos",
33
"$schema": "../../node_modules/nx/schemas/project-schema.json",
44
"projectType": "application",
5+
"sourceRoot": "apps/demos/src",
6+
"prefix": "rxa",
7+
"tags": ["type:app"],
58
"generators": {
69
"@schematics/angular:component": {
710
"style": "css"
811
}
912
},
10-
"sourceRoot": "apps/demos/src",
11-
"prefix": "rxa",
1213
"targets": {
1314
"build": {
1415
"executor": "@angular-devkit/build-angular:browser-esbuild",
@@ -116,7 +117,8 @@
116117
"buildTarget": "demos:build:development",
117118
"open": true
118119
}
119-
}
120+
},
121+
"continuous": true
120122
},
121123
"extract-i18n": {
122124
"executor": "@angular-devkit/build-angular:extract-i18n",
@@ -131,6 +133,5 @@
131133
},
132134
"outputs": ["{workspaceRoot}/coverage/apps/demos"]
133135
}
134-
},
135-
"tags": ["type:app"]
136+
}
136137
}

apps/ssr-isr/.eslintrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
"prefix": "app",
2525
"style": "kebab-case"
2626
}
27-
]
27+
],
28+
"@angular-eslint/prefer-standalone": "off"
2829
}
2930
},
3031
{

apps/ssr-isr/cypress.config.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,10 @@ import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';
22
import { defineConfig } from 'cypress';
33

44
export default defineConfig({
5-
e2e: nxE2EPreset(__filename, { cypressDir: 'cypress' }),
5+
e2e: {
6+
...nxE2EPreset(__filename, { cypressDir: 'cypress' }),
7+
// Please ensure you use `cy.origin()` when navigating between domains and remove this option.
8+
// See https://docs.cypress.io/app/references/migration-guide#Changes-to-cyorigin
9+
injectDocumentDomain: true,
10+
},
611
});

apps/ssr-isr/project.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@
6161
"buildTarget": "ssr-isr:build:development"
6262
}
6363
},
64-
"defaultConfiguration": "development"
64+
"defaultConfiguration": "development",
65+
"continuous": true
6566
},
6667
"extract-i18n": {
6768
"executor": "@angular-devkit/build-angular:extract-i18n",

apps/ssr/.eslintrc.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@
1717
{
1818
"files": ["*.cy.{ts,js,tsx,jsx}", "cypress/**/*.{ts,js,tsx,jsx}"],
1919
"rules": {}
20+
},
21+
{
22+
"files": ["*.ts"],
23+
"rules": {
24+
"@angular-eslint/prefer-standalone": "off"
25+
}
2026
}
2127
]
2228
}

apps/ssr/cypress.config.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,10 @@ import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';
22
import { defineConfig } from 'cypress';
33

44
export default defineConfig({
5-
e2e: nxE2EPreset(__filename, { cypressDir: 'cypress' }),
5+
e2e: {
6+
...nxE2EPreset(__filename, { cypressDir: 'cypress' }),
7+
// Please ensure you use `cy.origin()` when navigating between domains and remove this option.
8+
// See https://docs.cypress.io/app/references/migration-guide#Changes-to-cyorigin
9+
injectDocumentDomain: true,
10+
},
611
});

apps/ssr/project.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"projectType": "application",
55
"sourceRoot": "apps/ssr/src",
66
"prefix": "rx-angular",
7+
"tags": ["type:app"],
78
"targets": {
89
"build": {
910
"executor": "@angular-devkit/build-angular:browser",
@@ -62,7 +63,8 @@
6263
"production": {
6364
"buildTarget": "ssr:build:production"
6465
}
65-
}
66+
},
67+
"continuous": true
6668
},
6769
"extract-i18n": {
6870
"executor": "@angular-devkit/build-angular:extract-i18n",
@@ -111,7 +113,8 @@
111113
"browserTarget": "ssr:build:production",
112114
"serverTarget": "ssr:server:production"
113115
}
114-
}
116+
},
117+
"continuous": true
115118
},
116119
"e2e": {
117120
"executor": "@nx/cypress:cypress",
@@ -130,6 +133,5 @@
130133
"executor": "@nx/eslint:lint",
131134
"outputs": ["{options.outputFile}"]
132135
}
133-
},
134-
"tags": ["type:app"]
136+
}
135137
}

libs/cdk/.eslintrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
"style": "kebab-case"
2626
}
2727
],
28-
"@typescript-eslint/no-non-null-assertion": "warn"
28+
"@typescript-eslint/no-non-null-assertion": "warn",
29+
"@angular-eslint/prefer-standalone": "off"
2930
}
3031
},
3132
{

libs/isr/.eslintrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"files": ["*.ts"],
77
"extends": ["plugin:@nx/angular"],
88
"rules": {
9-
"@typescript-eslint/no-non-null-assertion": "warn"
9+
"@typescript-eslint/no-non-null-assertion": "warn",
10+
"@angular-eslint/prefer-standalone": "off"
1011
}
1112
}
1213
]

libs/state/.eslintrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
"prefix": "rx",
2525
"style": "kebab-case"
2626
}
27-
]
27+
],
28+
"@angular-eslint/prefer-standalone": "off"
2829
}
2930
},
3031
{

libs/template/.eslintrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
}
2222
],
2323
"@angular-eslint/no-input-rename": "off",
24-
"@typescript-eslint/no-non-null-assertion": "off"
24+
"@typescript-eslint/no-non-null-assertion": "off",
25+
"@angular-eslint/prefer-standalone": "off"
2526
}
2627
},
2728
{

libs/template/cypress.config.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ export default defineConfig({
77
defaultCommandTimeout: 10000,
88
specPattern: ['**/*.cy.ts'],
99
viewportHeight: 600,
10+
// Please ensure you use `cy.origin()` when navigating between domains and remove this option.
11+
// See https://docs.cypress.io/app/references/migration-guide#Changes-to-cyorigin
12+
injectDocumentDomain: true,
1013
},
1114
viewportHeight: 600,
1215
});

nx.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,5 @@
104104
}
105105
},
106106
"nxCloudAccessToken": "OTg2OGFkNmMtNzA5Zi00MjBiLWFhMmQtOGYwNTQ1MjM1ZjQ3fHJlYWQtd3JpdGU=",
107-
"parallel": 1,
108-
"useLegacyCache": true
107+
"parallel": 1
109108
}

package.json

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,20 @@
3939
"libs/**"
4040
],
4141
"dependencies": {
42-
"@angular/animations": "19.0.0",
43-
"@angular/cdk": "19.0.0",
44-
"@angular/cdk-experimental": "19.0.0",
45-
"@angular/common": "19.0.0",
46-
"@angular/compiler": "19.0.0",
47-
"@angular/core": "19.0.0",
48-
"@angular/forms": "19.0.0",
49-
"@angular/material": "19.0.0",
50-
"@angular/platform-browser": "19.0.0",
51-
"@angular/platform-browser-dynamic": "19.0.0",
52-
"@angular/platform-server": "19.0.0",
53-
"@angular/router": "19.0.0",
54-
"@angular/ssr": "19.0.0",
55-
"@typescript-eslint/utils": "7.18.0",
42+
"@angular/animations": "19.2.13",
43+
"@angular/cdk": "19.2.17",
44+
"@angular/cdk-experimental": "19.2.17",
45+
"@angular/common": "19.2.13",
46+
"@angular/compiler": "19.2.13",
47+
"@angular/core": "19.2.13",
48+
"@angular/forms": "19.2.13",
49+
"@angular/material": "19.2.17",
50+
"@angular/platform-browser": "19.2.13",
51+
"@angular/platform-browser-dynamic": "19.2.13",
52+
"@angular/platform-server": "19.2.13",
53+
"@angular/router": "19.2.13",
54+
"@angular/ssr": "19.2.13",
55+
"@typescript-eslint/utils": "8.33.0",
5656
"bootstrap": "^5.2.3",
5757
"eslint-plugin-unused-imports": "^4.1.4",
5858
"ngx-skeleton-loader": "^7.0.0",
@@ -65,69 +65,69 @@
6565
"zone.js": "0.14.10"
6666
},
6767
"devDependencies": {
68-
"@angular-devkit/build-angular": "19.0.0",
69-
"@angular-devkit/core": "19.0.0",
70-
"@angular-devkit/schematics": "19.0.0",
71-
"@angular-eslint/eslint-plugin": "19.0.2",
72-
"@angular-eslint/eslint-plugin-template": "19.0.2",
73-
"@angular-eslint/template-parser": "19.0.2",
74-
"@angular/build": "19.0.0",
75-
"@angular/cli": "~19.0.0",
76-
"@angular/compiler-cli": "19.0.0",
77-
"@angular/language-service": "19.0.0",
68+
"@angular-devkit/build-angular": "19.2.13",
69+
"@angular-devkit/core": "19.2.13",
70+
"@angular-devkit/schematics": "19.2.13",
71+
"@angular-eslint/eslint-plugin": "19.6.0",
72+
"@angular-eslint/eslint-plugin-template": "19.6.0",
73+
"@angular-eslint/template-parser": "19.6.0",
74+
"@angular/build": "19.2.13",
75+
"@angular/cli": "~19.2.0",
76+
"@angular/compiler-cli": "19.2.13",
77+
"@angular/language-service": "19.2.13",
7878
"@commitlint/cli": "^19.2.1",
7979
"@commitlint/config-angular": "^19.1.0",
8080
"@jscutlery/semver": "^5.5.1",
8181
"@nx-plus/docusaurus": "patch:@nx-plus/docusaurus@npm%3A14.1.0#~/.yarn/patches/@nx-plus-docusaurus-npm-14.1.0-b526e34c01.patch",
82-
"@nx/angular": "20.1.0",
83-
"@nx/cypress": "20.1.0",
84-
"@nx/eslint": "20.1.0",
85-
"@nx/eslint-plugin": "20.1.0",
86-
"@nx/jest": "20.1.0",
87-
"@nx/js": "20.1.0",
88-
"@nx/node": "20.1.0",
89-
"@nx/workspace": "20.1.0",
90-
"@schematics/angular": "19.0.0",
82+
"@nx/angular": "21.1.2",
83+
"@nx/cypress": "21.1.2",
84+
"@nx/eslint": "21.1.2",
85+
"@nx/eslint-plugin": "21.1.2",
86+
"@nx/jest": "21.1.2",
87+
"@nx/js": "21.1.2",
88+
"@nx/node": "21.1.2",
89+
"@nx/workspace": "21.1.2",
90+
10000 "@schematics/angular": "19.2.13",
9191
"@swc-node/register": "1.9.2",
9292
"@swc/core": "1.5.7",
9393
"@types/benchmark": "^2.1.0",
94-
"@types/express": "4.17.14",
94+
"@types/express": "4.17.22",
9595
"@types/jest": "29.5.14",
9696
"@types/klaw-sync": "^6.0.0",
9797
"@types/lodash": "^4.14.196",
9898
"@types/node": "^18.16.9",
99-
"@typescript-eslint/eslint-plugin": "8.15.0",
100-
"@typescript-eslint/parser": "8.15.0",
99+
"@typescript-eslint/eslint-plugin": "8.33.0",
100+
"@typescript-eslint/parser": "8.33.0",
101101
"autoprefixer": "^10.4.0",
102102
"benchmark": "^2.1.4",
103103
"browser-sync": "^3.0.0",
104104
"cpx": "^1.5.0",
105-
"cypress": "13.16.0",
105+
"cypress": "14.4.0",
106106
"eslint": "^8.57.1",
107-
"eslint-config-prettier": "^9.1.0",
107+
"eslint-config-prettier": "10.1.5",
108108
"eslint-plugin-cypress": "^4.1.0",
109109
"eslint-plugin-simple-import-sort": "^12.0.0",
110-
"express": "4.18.2",
110+
"express": "4.21.2",
111111
"husky": "^9.0.11",
112112
"jest": "29.7.0",
113113
"jest-environment-jsdom": "29.7.0",
114-
"jest-preset-angular": "14.1.0",
114+
"jest-preset-angular": "14.4.2",
115115
"jsonc-eslint-parser": "^2.1.0",
116116
"klaw-sync": "^6.0.0",
117117
"lint-staged": "^12.0.3",
118118
"lodash": "^4.17.21",
119119
"markdown-link-check": "^3.11.2",
120120
"ng-morph": "^4.8.4",
121-
"ng-packagr": "19.0.1",
122-
"nx": "20.1.0",
121+
"ng-packagr": "19.2.2",
122+
"nx": "21.1.2",
123123
"postcss": "^8.4.6",
124124
"postcss-import": "14.1.0",
125125
"postcss-preset-env": "7.5.0",
126126
"postcss-url": "10.1.3",
127127
"prettier": "3.2.5",
128128
"ts-jest": "29.1.0",
129129
"ts-node": "10.9.1",
130-
"typescript": "5.5.4"
130+
"typescript": "5.7.3"
131131
},
132132
"packageManager": "yarn@4.9.1"
133133
}

0 commit comments

Comments
 (0)
0