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

build: upgrade to Angular v11, CDK v11, and TypeScript 4.0 #1305

Merged
merged 1 commit into from
Nov 12, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,29 +28,29 @@
"postinstall": "ngcc --properties es2015 browser module main --no-async --create-ivy-entry-points"
},
"version": "10.0.0-beta.32",
"requiredAngularVersion": ">=10.0.0-rc.0",
"requiredAngularVersion": ">=11.0.0",
"dependencies": {
"@angular/cdk": "^10.0.0-rc.2",
"@angular/common": "^10.0.0-rc.6",
"@angular/compiler": "^10.0.0-rc.6",
"@angular/core": "^10.0.0-rc.6",
"@angular/platform-browser": "^10.0.0-rc.6",
"@angular/cdk": "^11.0.0",
"@angular/common": "^11.0.0",
"@angular/compiler": "^11.0.0",
"@angular/core": "^11.0.0",
"@angular/platform-browser": "^11.0.0",
"core-js": "^2.5.7",
"karma-parallel": "^0.3.1",
"rxjs": "^6.5.1",
"systemjs": "0.19.43",
"tsickle": "^0.38.1",
"tsickle": "^0.39.1",
"tslib": "^2.0.0",
"zone.js": "~0.10.3"
"zone.js": "~0.11.3"
},
"devDependencies": {
"@angular/animations": "^10.0.0-rc.6",
"@angular/compiler-cli": "^10.0.0-rc.6",
"@angular/forms": "^10.0.0-rc.6",
"@angular/material": "^10.0.0-rc.2",
"@angular/platform-browser-dynamic": "^10.0.0-rc.6",
"@angular/platform-server": "^10.0.0-rc.6",
"@angular/router": "^10.0.0-rc.6",
"@angular/animations": "^11.0.0",
"@angular/compiler-cli": "^11.0.0",
"@angular/forms": "^11.0.0",
"@angular/material": "^11.0.0",
"@angular/platform-browser-dynamic": "^11.0.0",
"@angular/platform-server": "^11.0.0",
"@angular/router": "^11.0.0",
"@firebase/app-types": "^0.3.2",
"@types/chalk": "^0.4.31",
"@types/fs-extra": "^4.0.5",
Expand Down Expand Up @@ -120,7 +120,7 @@
"ts-node": "^3.0.4",
"tsconfig-paths": "^2.3.0",
"tslint": "^5.11.0",
"typescript": "~3.9.2",
"typescript": "~4.0.5",
"uglify-js": "^2.8.14"
},
"// 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",
Expand Down
6 changes: 3 additions & 3 deletions src/apps/demo-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
"zone.js": "file:../../../node_modules/zone.js"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.1000.0-rc.0",
"@angular/cli": "^10.0.0-rc.0",
"@angular-devkit/build-angular": "~0.1100.0",
"@angular/cli": "^11.0.0",
"@angular/compiler-cli": "file:../../../node_modules/@angular/compiler-cli",
"@angular/language-service": "^10.0.0-rc.0",
"@angular/language-service": "^11.0.0",
"@types/jasmine": "~2.8.3",
"@types/jasminewd2": "~2.0.2",
"@types/node": "^12.12.11",
Expand Down
6 changes: 3 additions & 3 deletions src/apps/hello-world/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
"zone.js": "file:../../../node_modules/zone.js"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.1000.0-rc.0",
"@angular/cli": "^10.0.0-rc.0",
"@angular-devkit/build-angular": "~0.1100.0",
"@angular/cli": "^11.0.0",
"@angular/compiler-cli": "file:../../../node_modules/@angular/compiler-cli",
"@angular/language-service": "^10.0.0-rc.0",
"@angular/language-service": "^11.0.0",
"typescript": "file:../../../node_modules/typescript"
}
}
8 changes: 4 additions & 4 deletions src/apps/universal-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@
"@angular/platform-browser-dynamic": "file:../../../node_modules/@angular/platform-browser-dynamic",
"@angular/platform-server": "file:../../../node_modules/@angular/platform-server",
"@angular/router": "file:../../../node_modules/@angular/router",
"@nguniversal/express-engine": "^10.0.0-next.0",
"@nguniversal/express-engine": "^11.0.0",
"express": "^4.16.2",
"rxjs": "file:../../../node_modules/rxjs",
"tslib": "file:../../../node_modules/tslib",
"zone.js": "file:../../../node_modules/zone.js"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.1000.0-rc.0",
"@angular/cli": "~10.0.0-rc.0",
"@angular-devkit/build-angular": "~0.1100.0",
"@angular/cli": "~11.0.0",
"@angular/compiler-cli": "file:../../../node_modules/@angular/compiler-cli",
"@angular/language-service": "~10.0.0-rc.0",
"@angular/language-service": "~11.0.0",
"@types/express": "^4.17.0",
"@types/node": "file:../../../node_modules/@types/node",
"@types/jasmine": "~2.8.8",
Expand Down
18 changes: 9 additions & 9 deletions src/lib/extended/class/class.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ describe('binding to CSS class list', () => {

detectChangesAndExpectClassName('foo');

delete getComponent().objExpr;
getComponent().objExpr = {};
detectChangesAndExpectClassName('');

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

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

delete getComponent().strExpr;
getComponent().strExpr = '';
detectChangesAndExpectClassName('');
}));

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

delete getComponent().strExpr;
getComponent().strExpr = '';
detectChangesAndExpectClassName('foo');
}));

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

delete getComponent().objExpr;
getComponent().objExpr = {};
detectChangesAndExpectClassName('init foo');
}));

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

delete getComponent().objExpr;
getComponent().objExpr = {};
detectChangesAndExpectClassName(`init foo`);
}));

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

delete getComponent().objExpr;
getComponent().objExpr = {};
detectChangesAndExpectClassName(`init foo`);
}));

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

delete cmp.objExpr;
cmp.objExpr = {};
detectChangesAndExpectClassName('init baz');
}));
});
Expand Down
2 changes: 1 addition & 1 deletion src/lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"tslib": "^2.0.0"
},
"peerDependencies": {
"@angular/cdk": "^10.0.0-rc.0",
"@angular/cdk": "^11.0.0",
"@angular/core": "0.0.0-NG",
"@angular/common": "0.0.0-NG",
"@angular/platform-browser": "0.0.0-NG",
Expand Down
Loading