Skip to content

Commit eb506f1

Browse files
chore: upgrade to Angular 15
Closes #319
2 parents 53b29ca + bff8acb commit eb506f1

21 files changed

+109
-129
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
with:
2727
node-version: ${{ matrix.node-version }}
2828
- name: install
29-
run: npm install
29+
run: npm install --legacy-peer-deps
3030
- name: build
3131
run: npm run build -- --skip-nx-cache
3232
- name: test

apps/example-app-karma/.browserslistrc

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

apps/example-app-karma/project.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"name": "example-app-karma",
23
"$schema": "../../node_modules/nx/schemas/project-schema.json",
34
"projectType": "application",
45
"sourceRoot": "apps/example-app-karma/src",

apps/example-app-karma/src/test.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,5 @@ beforeEach(() => {
99
jasmine.addMatchers(JasmineDOM);
1010
});
1111

12-
declare const require: any;
13-
1412
// First, initialize the Angular testing environment.
1513
getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {});
16-
// Then we find all the tests.
17-
const context = require.context('./', true, /\.spec\.ts$/);
18-
// And load the modules.
19-
context.keys().map(context);

apps/example-app-karma/tsconfig.app.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
"compilerOptions": {
44
"outDir": "../../dist/out-tsc",
55
"types": [],
6-
"allowJs": true
6+
"allowJs": true,
7+
"target": "ES2022",
8+
"useDefineForClassFields": false
79
},
810
"files": ["src/main.ts", "src/polyfills.ts"],
911
"include": ["src/**/*.d.ts"],

apps/example-app-karma/tsconfig.spec.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
"extends": "./tsconfig.json",
33
"compilerOptions": {
44
"outDir": "./out-tsc/spec",
5-
"types": ["jasmine", "node", "@testing-library/jasmine-dom"]
5+
"types": ["jasmine", "node", "@testing-library/jasmine-dom"],
6+
"target": "ES2022",
7+
"useDefineForClassFields": false
68
},
79
"files": ["src/test.ts", "src/polyfills.ts"],
810
"include": ["**/*.spec.ts", "**/*.d.ts"]

apps/example-app/.browserslistrc

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

apps/example-app/project.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"name": "example-app",
23
"$schema": "../../node_modules/nx/schemas/project-schema.json",
34
"projectType": "application",
45
"sourceRoot": "apps/example-app/src",
@@ -75,7 +76,7 @@
7576
"options": {
7677
"jestConfig": "apps/example-app/jest.config.ts"
7778
},
78-
"outputs": ["coverage/"]
79+
"outputs": ["{workspaceRoot}/coverage/"]
7980
}
8081
},
8182
"tags": []

apps/example-app/src/app/app-routing.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ export const routes: Routes = [
9595
];
9696

9797
@NgModule({
98-
imports: [RouterModule.forRoot(routes, { relativeLinkResolution: 'legacy' })],
98+
imports: [RouterModule.forRoot(routes, {})],
9999
exports: [RouterModule],
100100
})
101101
export class AppRoutingModule {}

apps/example-app/src/app/app.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { StoreModule } from '@ngrx/store';
77
import { AppRoutingModule } from './app-routing.module';
88
import { MaterialModule } from './material.module';
99
import { MatIconModule } from '@angular/material/icon';
10-
import { MatListModule } from '@angular/material/list';
10+
import { MatLegacyListModule as MatListModule } from '@angular/material/legacy-list';
1111
import { MatSidenavModule } from '@angular/material/sidenav';
1212
import { MatToolbarModule } from '@angular/material/toolbar';
1313

0 commit comments

Comments
 (0)