Skip to content

Commit 3ac17b9

Browse files
committed
upgrade to Angular 11 and Node 14
1 parent ef998f5 commit 3ac17b9

10 files changed

+3566
-3278
lines changed

angular.json

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
"optimization": true,
3838
"outputHashing": "all",
3939
"sourceMap": false,
40-
"extractCss": true,
4140
"namedChunks": false,
4241
"aot": true,
4342
"extractLicenses": true,

e2e/tsconfig.e2e.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../tsconfig.base.json",
2+
"extends": "../tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../out-tsc/e2e",
55
"baseUrl": "./",

package-lock.json

+3,515-3,209
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+22-22
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
1313
},
1414
"private": true,
1515
"dependencies": {
16-
"@angular/animations": "10.0.2",
17-
"@angular/cdk": "^10.0.1",
18-
"@angular/common": "10.0.2",
19-
"@angular/compiler": "10.0.2",
20-
"@angular/core": "10.0.2",
21-
"@angular/forms": "10.0.2",
22-
"@angular/material": "^10.0.1",
23-
"@angular/material-moment-adapter": "10.0.1",
24-
"@angular/platform-browser": "10.0.2",
25-
"@angular/platform-browser-dynamic": "10.0.2",
26-
"@angular/router": "10.0.2",
16+
"@angular/animations": "11.0.0",
17+
"@angular/cdk": "^11.0.0",
18+
"@angular/common": "11.0.0",
19+
"@angular/compiler": "11.0.0",
20+
"@angular/core": "11.0.0",
21+
"@angular/forms": "11.0.0",
22+
"@angular/material": "^11.0.0",
23+
"@angular/material-moment-adapter": "11.0.0",
24+
"@angular/platform-browser": "11.0.0",
25+
"@angular/platform-browser-dynamic": "11.0.0",
26+
"@angular/router": "11.0.0",
2727
"core-js": "^2.4.1",
2828
"express": "^4.16.2",
2929
"moment": "^2.22.2",
@@ -32,27 +32,27 @@
3232
"zone.js": "~0.10.3"
3333
},
3434
"devDependencies": {
35-
"@angular-devkit/build-angular": "~0.1000.1",
36-
"@angular-devkit/schematics": "^10.0.1",
37-
"@angular/cli": "^10.0.1",
38-
"@angular/compiler-cli": "10.0.2",
39-
"@angular/language-service": "10.0.2",
35+
"@angular-devkit/build-angular": "^0.1100.1",
36+
"@angular-devkit/schematics": "^11.0.1",
37+
"@angular/cli": "^11.0.1",
38+
"@angular/compiler-cli": "11.0.0",
39+
"@angular/language-service": "11.0.0",
4040
"@types/express": "^4.0.39",
41-
"@types/jasmine": "~2.5.53",
41+
"@types/jasmine": "~3.6.0",
4242
"@types/jasminewd2": "~2.0.2",
4343
"@types/node": "^12.11.1",
44-
"codelyzer": "^5.1.2",
45-
"jasmine-core": "~3.5.0",
44+
"codelyzer": "^6.0.0",
45+
"jasmine-core": "~3.6.0",
4646
"jasmine-spec-reporter": "~5.0.0",
47-
"karma": "~5.0.0",
47+
"karma": "~5.1.1",
4848
"karma-chrome-launcher": "~3.1.0",
4949
"karma-cli": "~1.0.1",
5050
"karma-coverage-istanbul-reporter": "~3.0.2",
51-
"karma-jasmine": "~3.3.0",
51+
"karma-jasmine": "~4.0.0",
5252
"karma-jasmine-html-reporter": "^1.5.0",
5353
"protractor": "~7.0.0",
5454
"ts-node": "~3.2.0",
5555
"tslint": "~6.1.0",
56-
"typescript": "3.9.6"
56+
"typescript": "4.0.5"
5757
}
5858
}

src/app/app-routing.module.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const routes: Routes = [
2929
];
3030

3131
@NgModule({
32-
imports: [RouterModule.forRoot(routes)],
32+
imports: [RouterModule.forRoot(routes, { relativeLinkResolution: 'legacy' })],
3333
exports: [RouterModule]
3434
})
3535
export class AppRoutingModule { }

src/app/app.component.spec.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { TestBed, async } from '@angular/core/testing';
1+
import { TestBed, waitForAsync } from '@angular/core/testing';
22
import { RouterTestingModule } from '@angular/router/testing';
33
import { AppComponent } from './app.component';
44
describe('AppComponent', () => {
5-
beforeEach(async(() => {
5+
beforeEach(waitForAsync(() => {
66
TestBed.configureTestingModule({
77
imports: [
88
RouterTestingModule
@@ -12,17 +12,17 @@ describe('AppComponent', () => {
1212
],
1313
}).compileComponents();
1414
}));
15-
it('should create the app', async(() => {
15+
it('should create the app', waitForAsync(() => {
1616
const fixture = TestBed.createComponent(AppComponent);
1717
const app = fixture.debugElement.componentInstance;
1818
expect(app).toBeTruthy();
1919
}));
20-
it(`should have as title 'app'`, async(() => {
20+
it(`should have as title 'app'`, waitForAsync(() => {
2121
const fixture = TestBed.createComponent(AppComponent);
2222
const app = fixture.debugElement.componentInstance;
2323
expect(app.title).toEqual('app');
2424
}));
25-
it('should render title in a h1 tag', async(() => {
25+
it('should render title in a h1 tag', waitForAsync(() => {
2626
const fixture = TestBed.createComponent(AppComponent);
2727
fixture.detectChanges();
2828
const compiled = fixture.debugElement.nativeElement;

src/tsconfig.app.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../tsconfig.base.json",
2+
"extends": "../tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../out-tsc/app",
55
"baseUrl": "./",

src/tsconfig.spec.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../tsconfig.base.json",
2+
"extends": "../tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../out-tsc/spec",
55
"baseUrl": "./",

tsconfig.base.json

-21
This file was deleted.

tsconfig.json

+20-16
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
1-
/*
2-
This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
3-
It is not intended to be used to perform a compilation.
4-
5-
To learn more about this file see: https://angular.io/config/solution-tsconfig.
6-
*/
71
{
8-
"files": [],
9-
"references": [
10-
{
11-
"path": "./src/tsconfig.app.json"
12-
},
13-
{
14-
"path": "./src/tsconfig.spec.json"
15-
}
16-
]
17-
}
2+
"compileOnSave": false,
3+
"compilerOptions": {
4+
"module": "es2020",
5+
"outDir": "./dist/out-tsc",
6+
"sourceMap": true,
7+
"declaration": false,
8+
"moduleResolution": "node",
9+
"emitDecoratorMetadata": true,
10+
"experimentalDecorators": true,
11+
"target": "es2015",
12+
"typeRoots": [
13+
"node_modules/@types"
14+
],
15+
"lib": [
16+
"es2017",
17+
"dom",
18+
"ES2017.object"
19+
]
20+
}
21+
}

0 commit comments

Comments
 (0)