From 9f11c881992ce5aeb9c27448dd43d47cc351e560 Mon Sep 17 00:00:00 2001 From: CaerusKaru Date: Fri, 24 May 2019 17:22:57 -0500 Subject: [PATCH] build: upgrade to Angular v8 final RC w/ release fix (#1068) --- CHANGELOG.md | 5 + package.json | 26 ++-- src/apps/demo-app/package.json | 2 +- .../github-issues/split/split.directive.ts | 2 +- src/apps/hello-world/package.json | 2 +- src/apps/universal-app/package.json | 2 +- .../src/app/split/split.directive.ts | 2 +- src/lib/flex/flex/flex.spec.ts | 4 +- tools/package-tools/compile-entry-point.ts | 6 +- yarn.lock | 114 ++++++++---------- 10 files changed, 81 insertions(+), 84 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c5cb4adb..fdfa4283a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ + +# [8.0.0-beta.26](https://github.com/angular/flex-layout/compare/7.0.0-beta.24...8.0.0-beta.26) (2019-05-24) + +This release adds compatibility for Angular v8 final, which contained a breaking change from previous RCs. + # [8.0.0-beta.25](https://github.com/angular/flex-layout/compare/7.0.0-beta.24...8.0.0-beta.25) (2019-05-19) diff --git a/package.json b/package.json index c40382cbe..1079b6a0b 100644 --- a/package.json +++ b/package.json @@ -25,30 +25,30 @@ "universal:build": "gulp ci:prerender", "universal:serve": "gulp universal:serve" }, - "version": "8.0.0-beta.25", - "requiredAngularVersion": ">=8.0.0-rc.0", + "version": "8.0.0-beta.26", + "requiredAngularVersion": ">=8.0.0-rc.5", "dependencies": { "@angular/cdk": "^8.0.0-rc.1", - "@angular/common": "^8.0.0-rc.4", - "@angular/compiler": "^8.0.0-rc.4", - "@angular/core": "^8.0.0-rc.4", - "@angular/platform-browser": "^8.0.0-rc.4", + "@angular/common": "^8.0.0-rc.5", + "@angular/compiler": "^8.0.0-rc.5", + "@angular/core": "^8.0.0-rc.5", + "@angular/platform-browser": "^8.0.0-rc.5", "core-js": "^2.5.7", "karma-parallel": "^0.3.1", "rxjs": "^6.5.1", "systemjs": "0.19.43", - "tsickle": "^0.32.0", + "tsickle": "^0.35.0", "tslib": "^1.9.3", "zone.js": "~0.9.1" }, "devDependencies": { - "@angular/animations": "^8.0.0-rc.4", - "@angular/compiler-cli": "^8.0.0-rc.4", - "@angular/forms": "^8.0.0-rc.4", + "@angular/animations": "^8.0.0-rc.5", + "@angular/compiler-cli": "^8.0.0-rc.5", + "@angular/forms": "^8.0.0-rc.5", "@angular/material": "^8.0.0-rc.1", - "@angular/platform-browser-dynamic": "^8.0.0-rc.4", - "@angular/platform-server": "^8.0.0-rc.4", - "@angular/router": "^8.0.0-rc.4", + "@angular/platform-browser-dynamic": "^8.0.0-rc.5", + "@angular/platform-server": "^8.0.0-rc.5", + "@angular/router": "^8.0.0-rc.5", "@google-cloud/storage": "^1.7.0", "@types/chalk": "^0.4.31", "@types/fs-extra": "^4.0.5", diff --git a/src/apps/demo-app/package.json b/src/apps/demo-app/package.json index f6b2f1f67..2415e79b0 100644 --- a/src/apps/demo-app/package.json +++ b/src/apps/demo-app/package.json @@ -32,7 +32,7 @@ "devDependencies": { "@angular-devkit/build-angular": "~0.800.0-rc.4", "@angular/compiler-cli": "file:../../../node_modules/@angular/compiler-cli", - "@angular/language-service": "^8.0.0-rc.4", + "@angular/language-service": "^8.0.0-rc.5", "@types/jasmine": "~2.8.3", "@types/jasminewd2": "~2.0.2", "@types/node": "~6.0.60", diff --git a/src/apps/demo-app/src/app/github-issues/split/split.directive.ts b/src/apps/demo-app/src/app/github-issues/split/split.directive.ts index 03af211aa..37260abe0 100644 --- a/src/apps/demo-app/src/app/github-issues/split/split.directive.ts +++ b/src/apps/demo-app/src/app/github-issues/split/split.directive.ts @@ -23,7 +23,7 @@ import {SplitAreaDirective} from './split-area.directive'; }) export class SplitDirective implements AfterContentInit, OnDestroy { @Input('ngxSplit') direction = 'row'; - @ContentChild(SplitHandleDirective) handle: SplitHandleDirective; + @ContentChild(SplitHandleDirective, {static: true}) handle: SplitHandleDirective; @ContentChildren(SplitAreaDirective) areas: QueryList; private watcher: Subscription; diff --git a/src/apps/hello-world/package.json b/src/apps/hello-world/package.json index 7b0ca525b..74fd53021 100644 --- a/src/apps/hello-world/package.json +++ b/src/apps/hello-world/package.json @@ -31,7 +31,7 @@ "devDependencies": { "@angular-devkit/build-angular": "~0.800.0-rc.4", "@angular/compiler-cli": "file:../../../node_modules/@angular/compiler-cli", - "@angular/language-service": "^8.0.0-rc.4", + "@angular/language-service": "^8.0.0-rc.5", "typescript": "file:../../../node_modules/typescript" } } diff --git a/src/apps/universal-app/package.json b/src/apps/universal-app/package.json index cad6b2ef9..a96c1d350 100644 --- a/src/apps/universal-app/package.json +++ b/src/apps/universal-app/package.json @@ -37,7 +37,7 @@ "@angular-devkit/build-angular": "~0.800.0-rc.4", "@angular/cli": "~8.0.0-rc.4", "@angular/compiler-cli": "file:../../../node_modules/@angular/compiler-cli", - "@angular/language-service": "~8.0.0-rc.4", + "@angular/language-service": "~8.0.0-rc.5", "@types/node": "~8.9.4", "@types/jasmine": "~2.8.8", "@types/jasminewd2": "~2.0.3", diff --git a/src/apps/universal-app/src/app/split/split.directive.ts b/src/apps/universal-app/src/app/split/split.directive.ts index 55d492995..d6ebe5b1c 100644 --- a/src/apps/universal-app/src/app/split/split.directive.ts +++ b/src/apps/universal-app/src/app/split/split.directive.ts @@ -28,7 +28,7 @@ export class SplitDirective implements AfterContentInit, OnDestroy { @Input('ngxSplit') direction = 'row'; - @ContentChild(SplitHandleDirective) handle: SplitHandleDirective; + @ContentChild(SplitHandleDirective, {static: true}) handle: SplitHandleDirective; @ContentChildren(SplitAreaDirective) areas: QueryList; constructor(private elementRef: ElementRef, diff --git a/src/lib/flex/flex/flex.spec.ts b/src/lib/flex/flex/flex.spec.ts index fafb6964d..e63b7116c 100644 --- a/src/lib/flex/flex/flex.spec.ts +++ b/src/lib/flex/flex/flex.spec.ts @@ -1099,6 +1099,6 @@ class TestFlexComponent { ` }) class TestQueryWithFlexComponent { - @ViewChild(DefaultFlexDirective) flex!: DefaultFlexDirective; - @ViewChild(DefaultLayoutDirective) layout!: DefaultLayoutDirective; + @ViewChild(DefaultFlexDirective, {static: true}) flex!: DefaultFlexDirective; + @ViewChild(DefaultLayoutDirective, {static: true}) layout!: DefaultLayoutDirective; } diff --git a/tools/package-tools/compile-entry-point.ts b/tools/package-tools/compile-entry-point.ts index 5b9e0cd20..13518c7be 100644 --- a/tools/package-tools/compile-entry-point.ts +++ b/tools/package-tools/compile-entry-point.ts @@ -71,7 +71,11 @@ function addImportAs(packageName: string, outputPath: string, secondaryEntryPoin function addIdToGlob(outputPath: string, entryPointId: number): void { glob(join(outputPath, '**/*.+(js|d.ts|metadata.json)')).forEach(filePath => { let fileContent = readFileSync(filePath, 'utf-8'); - fileContent = fileContent.replace(/(ɵ[a-z]+)/g, `$1${entryPointId}`); + // We check for double ɵ to avoid mangling symbols like `ɵɵdefineInjectable`. + fileContent = fileContent.replace(/ɵ(ɵ)?[a-z]+/g, + (match, isDoubleTheta) => { + return isDoubleTheta ? match : match + entryPointId; + }); writeFileSync(filePath, fileContent, 'utf-8'); }); } diff --git a/yarn.lock b/yarn.lock index becc647f1..3b67bf9fc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@angular/animations@^8.0.0-rc.4": - version "8.0.0-rc.4" - resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.0-rc.4.tgz#616c00c3e7066591cde2a835db6262a0c739e316" - integrity sha512-682IT389P5S+YP7ZBRW+g5esjuNHea1gK+N15qmkwtasd1gxLg6qiOM1fZJn2TOsxDhhQ0IlopAfz+C17Mwn/g== +"@angular/animations@^8.0.0-rc.5": + version "8.0.0-rc.5" + resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.0-rc.5.tgz#f71f9c50a3d9655a7148556b34906778c16288b1" + integrity sha512-jQLZX0WZlO6tRsrMEiLA2/6W3dbn0E9IcOehmy9qXGGyeLYU7O8BqbaRkXi+HuSAF/gPhtJfXNtWWyOOqL5VBA== dependencies: tslib "^1.9.0" @@ -18,17 +18,17 @@ optionalDependencies: parse5 "^5.0.0" -"@angular/common@^8.0.0-rc.4": - version "8.0.0-rc.4" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.0.0-rc.4.tgz#a93c8ce0aa20a55c466c6f6f40becaedea43dda7" - integrity sha512-puPDWjEhACQzfUnL90GlwOr2lAKxFw+5WPus0e3toqwcrhRpvwWHtgrbK0Nz0Hxhi8lVG9tyWWpUXA1ACGDY7A== +"@angular/common@^8.0.0-rc.5": + version "8.0.0-rc.5" + resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.0.0-rc.5.tgz#0a3d865ce1a238937c31fbe98f41f945c0063e00" + integrity sha512-idDdAgtPsx/qDK8cc6h7n0ETjkxQqKfA5xBYo1JWbCLiihliCbHXJlKPh4clNGQEFa7J3zfFP85BFrIGazTlOg== dependencies: tslib "^1.9.0" -"@angular/compiler-cli@^8.0.0-rc.4": - version "8.0.0-rc.4" - resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.0.0-rc.4.tgz#daa462fa34e34840f24b966bead255edaee04f67" - integrity sha512-0aqViKowTzE5A/FximXDzd7CGCfhP2CNQD3rxO5Zd/US56AtrQQV4tsCR49ewzJ1IXCxGEJ51TqQfaI9TzFNVg== +"@angular/compiler-cli@^8.0.0-rc.5": + version "8.0.0-rc.5" + resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.0.0-rc.5.tgz#44e503b28c4a7571b3fecdef850ed7170517ad01" + integrity sha512-6pPTggTpKOfOz7iDKA2i8hSJvu3SOHXl6hdOghsLmfmbo2IX/nqZDeHfYsz0z5PsE3HsZxJP5fFaI+E9N9eDLA== dependencies: canonical-path "1.0.0" chokidar "^2.1.1" @@ -42,24 +42,24 @@ tslib "^1.9.0" yargs "13.1.0" -"@angular/compiler@^8.0.0-rc.4": - version "8.0.0-rc.4" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.0.0-rc.4.tgz#858db4e953147dde9fc64875bf0c9a7673539331" - integrity sha512-D9qT0iTFiXZBKyRJewipORRsaYfSQmY+0L1uqhdtHe8NA/71r+HrAn9WxwlcLBL7i3wYw3IAUiKGlOGnXY0Snw== +"@angular/compiler@^8.0.0-rc.5": + version "8.0.0-rc.5" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.0.0-rc.5.tgz#6e90eae020888ac1276e429e2f45ba856d699338" + integrity sha512-rsYaWFXRZ1FAigxcB78f+a4f79ZlaIKsIM72urraAYoqTq7N57iT5vORT80c4oja+eSIfIwnevKoPtB1XPH5iQ== dependencies: tslib "^1.9.0" -"@angular/core@^8.0.0-rc.4": - version "8.0.0-rc.4" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.0.0-rc.4.tgz#9ab4f95a2d2d09e602c776516a0db1a49281c84b" - integrity sha512-RtPYeMpHbbCVAvyRNWBx+s1FTEntwVFYcmZZ21CUIVq26O2oE43VzGKo5PQSdruSW5KTkAPoRo100Qlhwfz4mA== +"@angular/core@^8.0.0-rc.5": + version "8.0.0-rc.5" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.0.0-rc.5.tgz#cd0a375f45976076a713c1118e82526d04f4f7a7" + integrity sha512-c5IpOWfRL5t/Z+qG3+nsI6lF45DeFyF3QHjDsRWGJKb3Y17CdROY7x89nHwCw8t1alzQqwI2oiSi4AzYpA3A5Q== dependencies: tslib "^1.9.0" -"@angular/forms@^8.0.0-rc.4": - version "8.0.0-rc.4" - resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-8.0.0-rc.4.tgz#4d54f6aca8410afcd76dcbfefe3f0d52974e4790" - integrity sha512-xLAc0hHpjdM7HAOOFIOQCYFtDiUHR1D83a0S41+OpHmu6DehED5+A4OmtqZ1Rm+q6E+uCsK1Rni2xkHiozApZQ== +"@angular/forms@^8.0.0-rc.5": + version "8.0.0-rc.5" + resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-8.0.0-rc.5.tgz#4dcbbadae940ec51a9be4bc6b763e4fe8e5d8a58" + integrity sha512-PW19xDRxhlUJXRLGFtDTM2JoJjaHd+kWb8hoX438bh7Oln/VY4x2B8IUYocLInb7ZeEHPE063KdpidhmPywBhg== dependencies: tslib "^1.9.0" @@ -70,33 +70,33 @@ dependencies: tslib "^1.7.1" -"@angular/platform-browser-dynamic@^8.0.0-rc.4": - version "8.0.0-rc.4" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.0.0-rc.4.tgz#dd7859f46fff63149358580e0f97ddfc9e89fbcb" - integrity sha512-4MYeEmPtm82ibGfAMed9ixUDOSFJqpZKswf+sl8xoYqIgkIK8IvFzllI3rabCtjbYd/D3+Aqc3Cqu4OPiEUp8w== +"@angular/platform-browser-dynamic@^8.0.0-rc.5": + version "8.0.0-rc.5" + resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.0.0-rc.5.tgz#cac7c7315d9d0d5982e9e35d83f263bd9c98565b" + integrity sha512-na8AF67/arllsI2w5H2UHw1g8SK3Y2/Xdu5IIytV4aiAn+HaBjhYPJy2fw8rMhOGWVj8TWFd/NeZm2UXxM4XoQ== dependencies: tslib "^1.9.0" -"@angular/platform-browser@^8.0.0-rc.4": - version "8.0.0-rc.4" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.0.0-rc.4.tgz#e29f68b61299bac428d56b096d59b3cc6837b598" - integrity sha512-Qo7RM8qQFD0ceXMG2jWEsIUolRnphlMYflIH6ceDcNsXHdrIdRQk+ai8E+a2O7LEKWx+TGkNPQ/vZnY1NnVeeg== +"@angular/platform-browser@^8.0.0-rc.5": + version "8.0.0-rc.5" + resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.0.0-rc.5.tgz#1577aecad172c34f72b27b9b72bb9f2315754b7f" + integrity sha512-mg1WNaFeSF8lGMA4xMO9xxYCCkUWR2xB9B/RVKSsjgmgYkF05p9PzTMhoCxP45iaKbbcf0tKyCUE3a1+qu+7yA== dependencies: tslib "^1.9.0" -"@angular/platform-server@^8.0.0-rc.4": - version "8.0.0-rc.4" - resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-8.0.0-rc.4.tgz#655ab1fac5643cc357b6c47edc2ec60d9db3ee75" - integrity sha512-ALeQwD4DsA/B8BXOJB3IuMWRkQZ6PnnNa7B3nIpLSyGf1lzHViszQvNZ+dkJcTUYSMmx/x6gQ675FxFYTFCRJQ== +"@angular/platform-server@^8.0.0-rc.5": + version "8.0.0-rc.5" + resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-8.0.0-rc.5.tgz#49d321fef6f7c4e5714fd06059a2c4f11ddbe5f7" + integrity sha512-P8Swrhwu1j1JFGZ+/QR1NwegmjXlfufPzAucrTs7QZB+bEx/WyiWvcSUm4KB8IR7HW5YZy69XOzdBTXUoy1/AQ== dependencies: domino "^2.1.2" tslib "^1.9.0" xhr2 "^0.1.4" -"@angular/router@^8.0.0-rc.4": - version "8.0.0-rc.4" - resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.0.0-rc.4.tgz#fbc2a89f038c11474214f87dd0dc5196770acd3d" - integrity sha512-BlngH5RzvFGlHsFU1Tnae4CfJSu5VlRSPjjexPEzeJO56QpHMMGgLY0M74K1C4srQ6MXnObAVZBsAzBPMuCXuw== +"@angular/router@^8.0.0-rc.5": + version "8.0.0-rc.5" + resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.0.0-rc.5.tgz#e08332c55be0c1fa3dfdaf30100c698954e5a442" + integrity sha512-yFghN6hqQk1IAsc0Vq0qtFworN/tdMDNTh6vHb6qqgdGlJjKDxBY3W8sj4K+6Di98Kp7Gqc4HcUSHo4xyXB7Xg== dependencies: tslib "^1.9.0" @@ -5628,13 +5628,6 @@ jasmine-core@~2.8.0: resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e" integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4= -jasmine-diff@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/jasmine-diff/-/jasmine-diff-0.1.3.tgz#93ccc2dcc41028c5ddd4606558074839f2deeaa8" - integrity sha1-k8zC3MQQKMXd1GBlWAdIOfLe6qg= - dependencies: - diff "^3.2.0" - jasmine@2.8.0: version "2.8.0" resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.8.0.tgz#6b089c0a11576b1f16df11b80146d91d4e8b8a3e" @@ -9227,14 +9220,6 @@ source-map-support@^0.4.0, source-map-support@^0.4.15, source-map-support@~0.4.0 dependencies: source-map "^0.5.6" -source-map-support@^0.5.0: - version "0.5.11" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.11.tgz#efac2ce0800355d026326a0ca23e162aeac9a4e2" - integrity sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - source-map-url@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" @@ -9252,11 +9237,16 @@ source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.6, source-map@~0.5.1: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= -source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: +source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== +source-map@^0.7.3: + version "0.7.3" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" + integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== + source-map@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d" @@ -10124,16 +10114,14 @@ tsconfig@^6.0.0: strip-bom "^3.0.0" strip-json-comments "^2.0.0" -tsickle@^0.32.0: - version "0.32.1" - resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.32.1.tgz#f16e94ba80b32fc9ebe320dc94fbc2ca7f3521a5" - integrity sha512-JW9j+W0SaMSZGejIFZBk0AiPfnhljK3oLx5SaqxrJhjlvzFyPml5zqG1/PuScUj6yTe1muEqwk5CnDK0cOZmKw== +tsickle@^0.35.0: + version "0.35.0" + resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.35.0.tgz#59235df45937c0ec5d072c616c26d2d97fba54b9" + integrity sha512-irsZLX4293YUl9TuwNC5Fy020eLSc4bC3LfKnxnx1oq5wmZD9zSP8qvNNTiwRmf2/rxH+58JINcTARDjuvn+oQ== dependencies: - jasmine-diff "^0.1.3" minimist "^1.2.0" mkdirp "^0.5.1" - source-map "^0.6.0" - source-map-support "^0.5.0" + source-map "^0.7.3" tslib@1.9.3, tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: version "1.9.3"