Skip to content
This repository was archived by the owner on Jan 6, 2025. It is now read-only.

Commit 4a61736

Browse files
CaerusKaruCaerusKaru
authored
build: upgrade to Angular v11, CDK v11, and TypeScript 4.0 (#1305)
1 parent 0621f58 commit 4a61736

File tree

7 files changed

+215
-96
lines changed

7 files changed

+215
-96
lines changed

‎package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,29 +28,29 @@
2828
"postinstall": "ngcc --properties es2015 browser module main --no-async --create-ivy-entry-points"
2929
},
3030
"version": "10.0.0-beta.32",
31-
"requiredAngularVersion": ">=10.0.0-rc.0",
31+
"requiredAngularVersion": ">=11.0.0",
3232
"dependencies": {
33-
"@angular/cdk": "^10.0.0-rc.2",
34-
"@angular/common": "^10.0.0-rc.6",
35-
"@angular/compiler": "^10.0.0-rc.6",
36-
"@angular/core": "^10.0.0-rc.6",
37-
"@angular/platform-browser": "^10.0.0-rc.6",
33+
"@angular/cdk": "^11.0.0",
34+
"@angular/common": "^11.0.0",
35+
"@angular/compiler": "^11.0.0",
36+
"@angular/core": "^11.0.0",
37+
"@angular/platform-browser": "^11.0.0",
3838
"core-js": "^2.5.7",
3939
"karma-parallel": "^0.3.1",
4040
"rxjs": "^6.5.1",
4141
"systemjs": "0.19.43",
42-
"tsickle": "^0.38.1",
42+
"tsickle": "^0.39.1",
4343
"tslib": "^2.0.0",
44-
"zone.js": "~0.10.3"
44+
"zone.js": "~0.11.3"
4545
},
4646
"devDependencies": {
47-
"@angular/animations": "^10.0.0-rc.6",
48-
"@angular/compiler-cli": "^10.0.0-rc.6",
49-
"@angular/forms": "^10.0.0-rc.6",
50-
"@angular/material": "^10.0.0-rc.2",
51-
"@angular/platform-browser-dynamic": "^10.0.0-rc.6",
52-
"@angular/platform-server": "^10.0.0-rc.6",
53-
"@angular/router": "^10.0.0-rc.6",
47+
"@angular/animations": "^11.0.0",
48+
"@angular/compiler-cli": "^11.0.0",
49+
"@angular/forms": "^11.0.0",
50+
"@angular/material": "^11.0.0",
51+
"@angular/platform-browser-dynamic": "^11.0.0",
52+
"@angular/platform-server": "^11.0.0",
53+
"@angular/router": "^11.0.0",
5454
"@firebase/app-types": "^0.3.2",
5555
"@types/chalk": "^0.4.31",
5656
"@types/fs-extra": "^4.0.5",
@@ -120,7 +120,7 @@
120120
"ts-node": "^3.0.4",
121121
"tsconfig-paths": "^2.3.0",
122122
"tslint": "^5.11.0",
123-
"typescript": "~3.9.2",
123+
"typescript": "~4.0.5",
124124
"uglify-js": "^2.8.14"
125125
},
126126
"// Gulp": "Overwrite graceful-fs to a version that does not rely on the 'natives' package. This fixes gulp for >= 10.13, more information: angular/angular#28213",

‎src/apps/demo-app/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
"zone.js": "file:../../../node_modules/zone.js"
3131
},
3232
"devDependencies": {
33-
"@angular-devkit/build-angular": "~0.1000.0-rc.0",
34-
"@angular/cli": "^10.0.0-rc.0",
33+
"@angular-devkit/build-angular": "~0.1100.0",
34+
"@angular/cli": "^11.0.0",
3535
"@angular/compiler-cli": "file:../../../node_modules/@angular/compiler-cli",
36-
"@angular/language-service": "^10.0.0-rc.0",
36+
"@angular/language-service": "^11.0.0",
3737
"@types/jasmine": "~2.8.3",
3838
"@types/jasminewd2": "~2.0.2",
3939
"@types/node": "^12.12.11",

‎src/apps/hello-world/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
"zone.js": "file:../../../node_modules/zone.js"
2626
},
2727
"devDependencies": {
28-
"@angular-devkit/build-angular": "~0.1000.0-rc.0",
29-
"@angular/cli": "^10.0.0-rc.0",
28+
"@angular-devkit/build-angular": "~0.1100.0",
29+
"@angular/cli": "^11.0.0",
3030
"@angular/compiler-cli": "file:../../../node_modules/@angular/compiler-cli",
31-
"@angular/language-service": "^10.0.0-rc.0",
31+
"@angular/language-service": "^11.0.0",
3232
"typescript": "file:../../../node_modules/typescript"
3333
}
3434
}

‎src/apps/universal-app/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@
2424
"@angular/platform-browser-dynamic": "file:../../../node_modules/@angular/platform-browser-dynamic",
2525
"@angular/platform-server": "file:../../../node_modules/@angular/platform-server",
2626
"@angular/router": "file:../../../node_modules/@angular/router",
27-
"@nguniversal/express-engine": "^10.0.0-next.0",
27+
"@nguniversal/express-engine": "^11.0.0",
2828
"express": "^4.16.2",
2929
"rxjs": "file:../../../node_modules/rxjs",
3030
"tslib": "file:../../../node_modules/tslib",
3131
"zone.js": "file:../../../node_modules/zone.js"
3232
},
3333
"devDependencies": {
34-
"@angular-devkit/build-angular": "~0.1000.0-rc.0",
35-
"@angular/cli": "~10.0.0-rc.0",
34+
"@angular-devkit/build-angular": "~0.1100.0",
35+
"@angular/cli": "~11.0.0",
3636
"@angular/compiler-cli": "file:../../../node_modules/@angular/compiler-cli",
37-
"@angular/language-service": "~10.0.0-rc.0",
37+
"@angular/language-service": "~11.0.0",
3838
"@types/express": "^4.17.0",
3939
"@types/node": "file:../../../node_modules/@types/node",
4040
"@types/jasmine": "~2.8.8",

‎src/lib/extended/class/class.spec.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ describe('binding to CSS class list', () => {
394394

395395
detectChangesAndExpectClassName('foo');
396396

397-
delete getComponent().objExpr;
397+
getComponent().objExpr = {};
398398
detectChangesAndExpectClassName('');
399399

400400
getComponent().objExpr = {'foo': false, 'bar': true};
@@ -527,20 +527,20 @@ describe('binding to CSS class list', () => {
527527
detectChangesAndExpectClassName('baz');
528528
}));
529529

530-
it('should remove active classes when switching from string to null', fakeAsync(() => {
530+
it('should remove active classes when switching from string to blank', fakeAsync(() => {
531531
fixture = createTestComponent(`<div [ngClass]="strExpr"></div>`);
532532
detectChangesAndExpectClassName('foo');
533533

534-
delete getComponent().strExpr;
534+
getComponent().strExpr = '';
535535
detectChangesAndExpectClassName('');
536536
}));
537537

538-
it('should take initial classes into account when switching from string to null',
538+
it('should take initial classes into account when switching from string to empty',
539539
fakeAsync(() => {
540540
fixture = createTestComponent(`<div class="foo" [ngClass]="strExpr"></div>`);
541541
detectChangesAndExpectClassName('foo');
542542

543-
delete getComponent().strExpr;
543+
getComponent().strExpr = '';
544544
detectChangesAndExpectClassName('foo');
545545
}));
546546

@@ -564,7 +564,7 @@ describe('binding to CSS class list', () => {
564564
objExpr['foo'] = false;
565565
detectChangesAndExpectClassName('init bar');
566566

567-
delete getComponent().objExpr;
567+
getComponent().objExpr = {};
568568
detectChangesAndExpectClassName('init foo');
569569
}));
570570

@@ -578,7 +578,7 @@ describe('binding to CSS class list', () => {
578578
objExpr['foo'] = false;
579579
detectChangesAndExpectClassName(`init bar`);
580580

581-
delete getComponent().objExpr;
581+
getComponent().objExpr = {};
582582
detectChangesAndExpectClassName(`init foo`);
583583
}));
584584

@@ -593,7 +593,7 @@ describe('binding to CSS class list', () => {
593593
objExpr['foo'] = false;
594594
detectChangesAndExpectClassName(`init bar`);
595595

596-
delete getComponent().objExpr;
596+
getComponent().objExpr = {};
597597
detectChangesAndExpectClassName(`init foo`);
598598
}));
599599

@@ -629,7 +629,7 @@ describe('binding to CSS class list', () => {
629629
cmp.strExpr = 'baz';
630630
detectChangesAndExpectClassName('init bar baz foo');
631631

632-
delete cmp.objExpr;
632+
cmp.objExpr = {};
633633
detectChangesAndExpectClassName('init baz');
634634
}));
635635
});

‎src/lib/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"tslib": "^2.0.0"
2727
},
2828
"peerDependencies": {
29-
"@angular/cdk": "^10.0.0-rc.0",
29+
"@angular/cdk": "^11.0.0",
3030
"@angular/core": "0.0.0-NG",
3131
"@angular/common": "0.0.0-NG",
3232
"@angular/platform-browser": "0.0.0-NG",

0 commit comments

Comments
 (0)