From a18831292951e0d197beb2d42967384917ee4597 Mon Sep 17 00:00:00 2001 From: Pete Bacon Darwin Date: Tue, 3 Dec 2019 12:39:16 +0000 Subject: [PATCH] test(ngcc): update ngcc integration test dependencies (#34212) This commit updates `@angular/material` and `@angular/cdk` to the latest release candidate. Doing so exposed a bug in ngcc, which is fixed by the preceding commit. Also the layout of these libraries changed, so the checks in the integration test need a bit of tweaking. PR Close #34212 --- integration/ngcc/package.json | 4 ++-- integration/ngcc/test.sh | 10 +++++----- integration/ngcc/yarn.lock | 22 +++++++++------------- 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/integration/ngcc/package.json b/integration/ngcc/package.json index 6ebc68a7e3..f3cb039f52 100644 --- a/integration/ngcc/package.json +++ b/integration/ngcc/package.json @@ -4,13 +4,13 @@ "license": "MIT", "dependencies": { "@angular/animations": "file:../../dist/packages-dist/animations", - "@angular/cdk": "8.0.0", + "@angular/cdk": "9.0.0-rc.4", "@angular/common": "file:../../dist/packages-dist/common", "@angular/compiler": "file:../../dist/packages-dist/compiler", "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli", "@angular/core": "file:../../dist/packages-dist/core", "@angular/forms": "file:../../dist/packages-dist/forms", - "@angular/material": "8.0.0", + "@angular/material": "9.0.0-rc.4", "@angular/platform-browser": "file:../../dist/packages-dist/platform-browser", "@angular/platform-browser-dynamic": "file:../../dist/packages-dist/platform-browser-dynamic", "@angular/router": "file:../../dist/packages-dist/router", diff --git a/integration/ngcc/test.sh b/integration/ngcc/test.sh index 65e3f0791b..b545def610 100755 --- a/integration/ngcc/test.sh +++ b/integration/ngcc/test.sh @@ -92,18 +92,18 @@ assertSucceeded "Expected 'ngcc' to log 'Compiling'." # Did it generate a base factory call for synthesized constructors correctly? - grep "const ɵMatTable_BaseFactory = ɵngcc0.ɵɵgetInheritedFactory(MatTable);" node_modules/@angular/material/esm2015/table.js + grep "const ɵMatTable_BaseFactory = ɵngcc0.ɵɵgetInheritedFactory(MatTable);" node_modules/@angular/material/esm2015/table/table.js assertSucceeded "Expected 'ngcc' to generate a base factory for 'MatTable' in '@angular/material' (esm2015)." - grep "var ɵMatTable_BaseFactory = ɵngcc0.ɵɵgetInheritedFactory(MatTable);" node_modules/@angular/material/esm5/table.es5.js + grep "var ɵMatTable_BaseFactory = ɵngcc0.ɵɵgetInheritedFactory(MatTable);" node_modules/@angular/material/esm5/table/table.js assertSucceeded "Expected 'ngcc' to generate a base factory for 'MatTable' in '@angular/material' (esm5)." # Did it generate an abstract directive definition for undecorated classes with inputs and view queries? - grep "_MatMenuBase.ɵdir = ɵngcc0.ɵɵdefineDirective({ type: _MatMenuBase" node_modules/@angular/material/esm2015/menu.js + grep "_MatMenuBase.ɵdir = ɵngcc0.ɵɵdefineDirective({ type: _MatMenuBase" node_modules/@angular/material/esm2015/menu/menu.js assertSucceeded "Expected 'ngcc' to generate an abstract directive definition for 'MatMenuBase' in '@angular/material' (esm2015)." - grep "_MatMenuBase.ɵdir = ɵngcc0.ɵɵdefineDirective({ type: _MatMenuBase" node_modules/@angular/material/esm5/menu.es5.js + grep "_MatMenuBase.ɵdir = ɵngcc0.ɵɵdefineDirective({ type: _MatMenuBase" node_modules/@angular/material/esm5/menu/menu.js assertSucceeded "Expected 'ngcc' to generate an abstract directive definition for 'MatMenuBase' in '@angular/material' (esm5)." @@ -117,7 +117,7 @@ assertSucceeded "Expected 'ngcc' to log 'Compiling'." # Did it handle namespace imported decorators in UMD using static properties? - grep "type: core.Injectable," node_modules/@angular/cdk/bundles/cdk-a11y.umd.js + grep "type: i0.Injectable," node_modules/@angular/cdk/bundles/cdk-a11y.umd.js assertSucceeded "Expected 'ngcc' to correctly handle decorators via static properties in '@angular/cdk/a11y' (umd)." # (and ensure the @angular/cdk/a11y package is indeed using static properties) diff --git a/integration/ngcc/yarn.lock b/integration/ngcc/yarn.lock index 980460d5c8..d701229ecb 100644 --- a/integration/ngcc/yarn.lock +++ b/integration/ngcc/yarn.lock @@ -5,12 +5,10 @@ "@angular/animations@file:../../dist/packages-dist/animations": version "9.0.0-rc.1" -"@angular/cdk@8.0.0": - version "8.0.0" - resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-8.0.0.tgz#34ca95e71d71780b29b5ba07318c88c4577bdc25" - integrity sha512-2vsRWEHNARe0iRmqgzvM67gwfRy+aKvdef4Qu9L+ndSsTrrZT3tSgG8SMn1v9SfBHnx5G8mo4d1AMquXG69AuQ== - dependencies: - tslib "^1.7.1" +"@angular/cdk@9.0.0-rc.4": + version "9.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-9.0.0-rc.4.tgz#3a5921aaeb2a2019c213e9a58407b235710cc1f7" + integrity sha512-pnpVJGYWMUk8YRf9JxFxAOGE1GrROgmF979hyeFBZuIonM6qDlrBfLg5nwta61VYC9ePO1xhmWOH+equy4qsgQ== optionalDependencies: parse5 "^5.0.0" @@ -40,12 +38,10 @@ "@angular/forms@file:../../dist/packages-dist/forms": version "9.0.0-rc.1" -"@angular/material@8.0.0": - version "8.0.0" - resolved "https://registry.yarnpkg.com/@angular/material/-/material-8.0.0.tgz#21dd15c318d1e29eb4d1a2dd888ddb027897eb49" - integrity sha512-c7O7GhZd46xF2WB6T/YPam5lJkTgQLdIS53IqwZIFhL427+SEfPvejVzRnVfZCI3NdrKiWt/5VsvtQZwWzlGvw== - dependencies: - tslib "^1.7.1" +"@angular/material@9.0.0-rc.4": + version "9.0.0-rc.4" + resolved "https://registry.yarnpkg.com/@angular/material/-/material-9.0.0-rc.4.tgz#a64152453904b8cff58985af22b639ee0f5d9cc5" + integrity sha512-gg/CxwlGuMwXTRkY2DMrRb4GYmL1lksJ5cdnkCVm2locX8kH+ocht8kt6f39E8wBhHmg4jczfLnauRjU+PJ7ug== "@angular/platform-browser-dynamic@file:../../dist/packages-dist/platform-browser-dynamic": version "9.0.0-rc.1" @@ -3292,7 +3288,7 @@ tree-kill@^1.1.0: resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36" integrity sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg== -tslib@^1.7.1, tslib@^1.9.0: +tslib@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==