Skip to content

Commit 2cf33ad

Browse files
timdeschryvertimdeschryver
committed
build: update to Angular 18
1 parent 3d396c0 commit 2cf33ad

File tree

8 files changed

+215
-130
lines changed

8 files changed

+215
-130
lines changed

‎.eslintrc.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,18 @@
2424
{
2525
"files": ["*.ts", "*.tsx"],
2626
"extends": ["plugin:@nx/typescript"],
27-
"rules": {}
27+
"rules": {
28+
"@typescript-eslint/no-extra-semi": "error",
29+
"no-extra-semi": "off"
30+
}
2831
},
2932
{
3033
"files": ["*.js", "*.jsx"],
3134
"extends": ["plugin:@nx/javascript"],
32-
"rules": {}
35+
"rules": {
36+
"@typescript-eslint/no-extra-semi": "error",
37+
"no-extra-semi": "off"
38+
}
3339
},
3440
{
3541
"files": ["*.ts"],

‎apps/example-app-karma/project.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"projectType": "application",
55
"sourceRoot": "apps/example-app-karma/src",
66
"prefix": "app",
7+
"tags": [],
78
"generators": {},
89
"targets": {
910
"build": {
@@ -52,8 +53,7 @@
5253
"defaultConfiguration": "development"
5354
},
5455
"lint": {
55-
"executor": "@nx/eslint:lint",
56-
"outputs": ["{options.outputFile}"]
56+
"executor": "@nx/eslint:lint"
5757
},
5858
"test": {
5959
"executor": "@angular-devkit/build-angular:karma",
@@ -63,6 +63,5 @@
6363
"karmaConfig": "apps/example-app-karma/karma.conf.js"
6464
}
6565
}
66-
},
67-
"tags": []
66+
}
6867
}

‎apps/example-app/project.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"projectType": "application",
55
"sourceRoot": "apps/example-app/src",
66
"prefix": "app",
7+
"tags": [],
78
"generators": {},
89
"targets": {
910
"build": {
@@ -59,8 +60,7 @@
5960
}
6061
},
6162
"lint": {
62-
"executor": "@nx/eslint:lint",
63-
"outputs": ["{options.outputFile}"]
63+
"executor": "@nx/eslint:lint"
6464
},
6565
"test": {
6666
"executor": "@nx/jest:jest",
@@ -70,6 +70,5 @@
7070
},
7171
"outputs": ["{workspaceRoot}/coverage/"]
7272
}
73-
},
74-
"tags": []
73+
}
7574
}

‎decorate-angular-cli.js

Lines changed: 0 additions & 70 deletions
This file was deleted.

‎migrations.json

Lines changed: 153 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,153 @@
1+
{
2+
"migrations": [
3+
{
4+
"cli": "nx",
5+
"version": "17.3.0-beta.6",
6+
"description": "Updates the nx wrapper.",
7+
"implementation": "./src/migrations/update-17-3-0/update-nxw",
8+
"package": "nx",
9+
"name": "17.3.0-update-nx-wrapper"
10+
},
11+
{
12+
"cli": "nx",
13+
"version": "18.0.0-beta.2",
14+
"description": "Updates nx.json to disabled adding plugins when generating projects in an existing Nx workspace",
15+
"implementation": "./src/migrations/update-18-0-0/disable-crystal-for-existing-workspaces",
16+
"x-repair-skip": true,
17+
"package": "nx",
18+
"name": "18.0.0-disable-adding-plugins-for-existing-workspaces"
19+
},
20+
{
21+
"version": "18.1.0-beta.3",
22+
"description": "Moves affected.defaultBase to defaultBase in `nx.json`",
23+
"implementation": "./src/migrations/update-17-2-0/move-default-base",
24+
"package": "nx",
25+
"name": "move-default-base-to-nx-json-root"
26+
},
27+
{
28+
"cli": "nx",
29+
"version": "19.1.0-beta.6",
30+
"description": "Migrate no-extra-semi rules into user config, out of nx extendable configs",
31+
"implementation": "./src/migrations/update-19-1-0-migrate-no-extra-semi/migrate-no-extra-semi",
32+
"package": "@nx/eslint-plugin",
33+
"name": "update-19-1-0-rename-no-extra-semi"
34+
},
35+
{
36+
"version": "17.2.9",
37+
"description": "Move executor options to target defaults",
38+
"implementation": "./src/migrations/update-17-2-9/move-options-to-target-defaults",
39+
"package": "@nx/eslint",
40+
"name": "move-options-to-target-defaults"
41+
},
42+
{
43+
"cli": "nx",
44+
"version": "17.3.0-beta.10",
45+
"requires": {
46+
"@angular/core": ">=17.1.0"
47+
},
48+
"description": "Update the @angular/cli package version to ~17.1.0.",
49+
"factory": "./src/migrations/update-17-3-0/update-angular-cli",
50+
"package": "@nx/angular",
51+
"name": "update-angular-cli-version-17-1-0"
52+
},
53+
{
54+
"cli": "nx",
55+
"version": "17.3.0-beta.10",
56+
"requires": {
57+
"@angular/core": ">=17.1.0"
58+
},
59+
"description": "Add 'browser-sync' as dev dependency when '@angular-devkit/build-angular:ssr-dev-server' or '@nx/angular:module-federation-dev-ssr' is used.",
60+
"factory": "./src/migrations/update-17-3-0/add-browser-sync-dependency",
61+
"package": "@nx/angular",
62+
"name": "add-browser-sync-dependency"
63+
},
64+
{
65+
"cli": "nx",
66+
"version": "17.3.0-beta.10",
67+
"requires": {
68+
"@angular/core": ">=17.1.0"
69+
},
70+
"description": "Add 'autoprefixer' as dev dependency when '@nx/angular:ng-packagr-lite' or '@nx/angular:package` is used.",
71+
"factory": "./src/migrations/update-17-3-0/add-autoprefixer-dependency",
72+
"package": "@nx/angular",
73+
"name": "add-autoprefixer-dependency"
74+
},
75+
{
76+
"cli": "nx",
77+
"version": "18.0.0-beta.0",
78+
"description": "Add NX_MF_DEV_SERVER_STATIC_REMOTES to inputs for task hashing when '@nx/angular:webpack-browser' is used for Module Federation.",
79+
"factory": "./src/migrations/update-18-0-0/add-mf-env-var-to-target-defaults",
80+
"package": "@nx/angular",
81+
"name": "add-module-federation-env-var-to-target-defaults"
82+
},
83+
{
84+
"cli": "nx",
85+
"version": "18.1.0-beta.1",
86+
"requires": {
87+
"@angular/core": ">=17.2.0"
88+
},
89+
"description": "Update the @angular/cli package version to ~17.2.0.",
90+
"factory": "./src/migrations/update-18-1-0/update-angular-cli",
91+
"package": "@nx/angular",
92+
"name": "update-angular-cli-version-17-2-0"
93+
},
94+
{
95+
"cli": "nx",
96+
"version": "18.1.1-beta.0",
97+
"description": "Ensure targetDefaults inputs for task hashing when '@nx/angular:webpack-browser' is used are correct for Module Federation.",
98+
"factory": "./src/migrations/update-18-1-1/fix-target-defaults-inputs",
99+
"package": "@nx/angular",
100+
"name": "fix-target-defaults-for-webpack-browser"
101+
},
102+
{
103+
"cli": "nx",
104+
"version": "18.2.0-beta.0",
105+
"requires": {
106+
"@angular/core": ">=17.3.0"
107+
},
108+
"description": "Update the @angular/cli package version to ~17.3.0.",
109+
"factory": "./src/migrations/update-18-2-0/update-angular-cli",
110+
"package": "@nx/angular",
111+
"name": "update-angular-cli-version-17-3-0"
112+
},
113+
{
114+
"cli": "nx",
115+
"version": "19.1.0-beta.2",
116+
"requires": {
117+
"@angular/core": ">=18.0.0"
118+
},
119+
"description": "Update the @angular/cli package version to ~18.0.0.",
120+
"factory": "./src/migrations/update-19-1-0/update-angular-cli",
121+
"package": "@nx/angular",
122+
"name": "update-angular-cli-version-18-0-0"
123+
},
124+
{
125+
"version": "18.0.0",
126+
"description": "Updates two-way bindings that have an invalid expression to use the longform expression instead.",
127+
"factory": "./migrations/invalid-two-way-bindings/bundle",
128+
"package": "@angular/core",
129+
"name": "invalid-two-way-bindings"
130+
},
131+
{
132+
"version": "18.0.0",
133+
"description": "Replace deprecated HTTP related modules with provider functions",
134+
"factory": "./migrations/http-providers/bundle",
135+
"package": "@angular/core",
136+
"name": "migration-http-providers"
137+
},
138+
{
139+
"version": "18.0.0-0",
140+
"description": "Updates Angular Material to v18",
141+
"factory": "./ng-update/index_bundled#updateToV18",
142+
"package": "@angular/material",
143+
"name": "migration-v18"
144+
},
145+
{
146+
"version": "18.0.0-0",
147+
"description": "Updates the Angular CDK to v18",
148+
"factory": "./ng-update/index#updateToV18",
149+
"package": "@angular/cdk",
150+
"name": "migration-v18"
151+
}
152+
]
153+
}

‎nx.json

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
{
2-
"affected": {
3-
"defaultBase": "main"
4-
},
52
"workspaceLayout": {
63
"appsDir": "apps",
74
"libsDir": "projects"
@@ -71,10 +68,6 @@
7168
"inputs": ["default", "^production"],
7269
"cache": true
7370
},
74-
"lint": {
75-
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
76-
"cache": true
77-
},
7871
"@nx/jest:jest": {
7972
"inputs": ["default", "^production"],
8073
"cache": true,
@@ -87,6 +80,10 @@
8780
"codeCoverage": true
8881
}
8982
}
83+
},
84+
"@nx/eslint:lint": {
85+
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
86+
"cache": true
9087
}
9188
},
9289
"namedInputs": {
@@ -104,5 +101,7 @@
104101
]
105102
},
106103
"nxCloudAccessToken": "M2Q4YjlkNjMtMzY1NC00ZjkwLTk1ZjgtZjg5Y2VkMzFjM2FifHJlYWQtd3JpdGU=",
107-
"parallel": 3
104+
"parallel": 3,
105+
"useInferencePlugins": false,
106+
"defaultBase": "main"
108107
}

0 commit comments

Comments
 (0)