Skip to content

Commit b1bff03

Browse files
feat: update Angular packages to v14 RC (#91)
BREAKING CHANGES: The minimum version of Angular has been updated BEFORE: The minimum version of Angular required is 13.x AFTER: The minimum version of Angular required is 14.x
1 parent a55b46d commit b1bff03

27 files changed

+2234
-2515
lines changed

angular.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"test": {
7676
"builder": "@nrwl/jest:jest",
7777
"options": {
78-
"jestConfig": "apps/example-app/jest.config.js",
78+
"jestConfig": "apps/example-app/jest.config.ts",
7979
"passWithNoTests": true
8080
},
8181
"outputs": ["coverage/apps/example-app"]
@@ -179,7 +179,7 @@
179179
"test": {
180180
"builder": "@nrwl/jest:jest",
181181
"options": {
182-
"jestConfig": "apps/recursive-routes/jest.config.js",
182+
"jestConfig": "apps/recursive-routes/jest.config.ts",
183183
"passWithNoTests": true
184184
},
185185
"outputs": ["coverage/apps/recursive-routes"]
@@ -283,7 +283,7 @@
283283
"test": {
284284
"builder": "@nrwl/jest:jest",
285285
"options": {
286-
"jestConfig": "apps/responsive-app/jest.config.js",
286+
"jestConfig": "apps/responsive-app/jest.config.ts",
287287
"passWithNoTests": true
288288
},
289289
"outputs": ["coverage/apps/responsive-app"]
@@ -387,7 +387,7 @@
387387
"test": {
388388
"builder": "@nrwl/jest:jest",
389389
"options": {
390-
"jestConfig": "apps/route-restrictions/jest.config.js",
390+
"jestConfig": "apps/route-restrictions/jest.config.ts",
391391
"passWithNoTests": true
392392
},
393393
"outputs": ["coverage/apps/route-restrictions"]
@@ -456,7 +456,7 @@
456456
"test": {
457457
"builder": "@nrwl/jest:jest",
458458
"options": {
459-
"jestConfig": "libs/router/jest.config.js",
459+
"jestConfig": "libs/router/jest.config.ts",
460460
"setupFile": "libs/router/src/test-setup.ts",
461461
"passWithNoTests": true
462462
},

apps/example-app/jest.config.js renamed to apps/example-app/jest.config.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
module.exports = {
1+
/* eslint-disable */
2+
export default {
23
preset: '../../jest.preset.js',
34
coverageDirectory: '../../coverage/apps/example-app',
45

apps/example-app/src/app/auth/components/login-form.component.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
2-
import { FormGroup, FormControl } from '@angular/forms';
2+
import { UntypedFormGroup, UntypedFormControl } from '@angular/forms';
33
import { Credentials } from '@example-app/auth/models';
44

55
@Component({
@@ -90,9 +90,9 @@ export class LoginFormComponent implements OnInit {
9090

9191
@Output() submitted = new EventEmitter<Credentials>();
9292

93-
form: FormGroup = new FormGroup({
94-
username: new FormControl('ngrx'),
95-
password: new FormControl(''),
93+
form: UntypedFormGroup = new UntypedFormGroup({
94+
username: new UntypedFormControl('ngrx'),
95+
password: new UntypedFormControl(''),
9696
});
9797

9898
constructor() {}

apps/example-app/tsconfig.app.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
"outDir": "../../dist/out-tsc",
55
"types": []
66
},
7-
"files": ["src/main.ts", "src/polyfills.ts"]
7+
"files": ["src/main.ts", "src/polyfills.ts"],
8+
"exclude": ["jest.config.ts"]
89
}

apps/example-app/tsconfig.editor.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
"include": ["**/*.ts"],
44
"compilerOptions": {
55
"types": ["jest", "node"]
6-
}
6+
},
7+
"exclude": ["jest.config.ts"]
78
}

apps/example-app/tsconfig.spec.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
"types": ["jest", "node"]
77
},
88
"files": ["src/test-setup.ts"],
9-
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
9+
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts", "jest.config.ts"]
1010
}

apps/recursive-routes/jest.config.js renamed to apps/recursive-routes/jest.config.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
module.exports = {
1+
/* eslint-disable */
2+
export default {
23
preset: '../../jest.preset.js',
34
coverageDirectory: '../../coverage/apps/recursive-routes',
45

apps/recursive-routes/tsconfig.app.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
"outDir": "../../dist/out-tsc",
55
"types": []
66
},
7-
"files": ["src/main.ts", "src/polyfills.ts"]
7+
"files": ["src/main.ts", "src/polyfills.ts"],
8+
"exclude": ["jest.config.ts"]
89
}

apps/recursive-routes/tsconfig.editor.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
"include": ["**/*.ts"],
44
"compilerOptions": {
55
"types": ["jest", "node"]
6-
}
6+
},
7+
"exclude": ["jest.config.ts"]
78
}

apps/recursive-routes/tsconfig.spec.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
"types": ["jest", "node"]
77
},
88
"files": ["src/test-setup.ts"],
9-
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
9+
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts", "jest.config.ts"]
1010
}

apps/responsive-app/jest.config.js renamed to apps/responsive-app/jest.config.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
module.exports = {
1+
/* eslint-disable */
2+
export default {
23
preset: '../../jest.preset.js',
34
coverageDirectory: '../../coverage/apps/responsive-app',
45

apps/responsive-app/tsconfig.app.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
"outDir": "../../dist/out-tsc",
55
"types": []
66
},
7-
"files": ["src/main.ts", "src/polyfills.ts"]
7+
"files": ["src/main.ts", "src/polyfills.ts"],
8+
"exclude": ["jest.config.ts"]
89
}

apps/responsive-app/tsconfig.editor.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
"include": ["**/*.ts"],
44
"compilerOptions": {
55
"types": ["jest", "node"]
6-
}
6+
},
7+
"exclude": ["jest.config.ts"]
78
}

apps/responsive-app/tsconfig.spec.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
"types": ["jest", "node"]
77
},
88
"files": ["src/test-setup.ts"],
9-
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
9+
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts", "jest.config.ts"]
1010
}

apps/route-restrictions/jest.config.js renamed to apps/route-restrictions/jest.config.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
module.exports = {
1+
/* eslint-disable */
2+
export default {
23
preset: '../../jest.preset.js',
34
coverageDirectory: '../../coverage/apps/route-restrictions',
45

apps/route-restrictions/tsconfig.app.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
"outDir": "../../dist/out-tsc",
55
"types": []
66
},
7-
"files": ["src/main.ts", "src/polyfills.ts"]
7+
"files": ["src/main.ts", "src/polyfills.ts"],
8+
"exclude": ["jest.config.ts"]
89
}

apps/route-restrictions/tsconfig.editor.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
"include": ["**/*.ts"],
44
"compilerOptions": {
55
"types": ["jest", "node"]
6-
}
6+
},
7+
"exclude": ["jest.config.ts"]
78
}

apps/route-restrictions/tsconfig.spec.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
"types": ["jest", "node"]
77
},
88
"files": ["src/test-setup.ts"],
9-
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
9+
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts", "jest.config.ts"]
1010
}
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
const { getJestProjects } = require('@nrwl/jest');
22

3-
module.exports = { projects: getJestProjects() };
3+
export default { projects: getJestProjects() };

jest.preset.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const nxPreset = require('@nrwl/jest/preset');
1+
const nxPreset = require('@nrwl/jest/preset').default;
22
module.exports = {
33
...nxPreset,
44
};

libs/router/jest.config.js renamed to libs/router/jest.config.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
module.exports = {
1+
/* eslint-disable */
2+
export default {
23
displayName: 'router',
34
preset: '../../jest.preset.js',
45
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],

libs/router/tsconfig.lib.json

+6-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
"strictMetadataEmit": true,
1414
"enableResourceInlining": true
1515
},
16-
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "**/*.test.ts"],
16+
"exclude": [
17+
"src/test-setup.ts",
18+
"**/*.spec.ts",
19+
"**/*.test.ts",
20+
"jest.config.ts"
21+
],
1722
"include": ["**/*.ts"]
1823
}

libs/router/tsconfig.spec.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
"types": ["jest", "node"]
77
},
88
"files": ["src/test-setup.ts"],
9-
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
9+
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts", "jest.config.ts"]
1010
}

0 commit comments

Comments
 (0)