From 7c9ba2d6f21a0d8d945e3e8bbbd301c195cb9114 Mon Sep 17 00:00:00 2001 From: Igor Minar Date: Fri, 5 Jan 2018 19:49:50 -0800 Subject: [PATCH] build(aio): upgrade to angular@5.2.0-rc.0 (#21351) Because of c2b3792 one of the test assertions had to be adjusted (more info: https://github.com/angular/angular/pull/21351#issuecomment-356083940). PR Close #21351 --- aio/package.json | 22 +++--- .../embedded/code/code-tabs.component.spec.ts | 3 +- aio/yarn.lock | 74 +++++++++---------- 3 files changed, 50 insertions(+), 49 deletions(-) diff --git a/aio/package.json b/aio/package.json index ee321129e5..cbb67b77e8 100644 --- a/aio/package.json +++ b/aio/package.json @@ -65,18 +65,18 @@ }, "private": true, "dependencies": { - "@angular/animations": "^5.1.0-beta.2", + "@angular/animations": "^5.2.0-rc.0", "@angular/cdk": "^5.0.0-rc.1", - "@angular/common": "^5.1.0-beta.2", - "@angular/compiler": "^5.1.0-beta.2", - "@angular/core": "^5.1.0-beta.2", - "@angular/forms": "^5.1.0-beta.2", - "@angular/http": "^5.1.0-beta.2", + "@angular/common": "^5.2.0-rc.0", + "@angular/compiler": "^5.2.0-rc.0", + "@angular/core": "^5.2.0-rc.0", + "@angular/forms": "^5.2.0-rc.0", + "@angular/http": "^5.2.0-rc.0", "@angular/material": "^5.0.0-rc.1", - "@angular/platform-browser": "^5.1.0-beta.2", - "@angular/platform-browser-dynamic": "^5.1.0-beta.2", - "@angular/platform-server": "^5.1.0-beta.2", - "@angular/router": "^5.1.0-beta.2", + "@angular/platform-browser": "^5.2.0-rc.0", + "@angular/platform-browser-dynamic": "^5.2.0-rc.0", + "@angular/platform-server": "^5.2.0-rc.0", + "@angular/router": "^5.2.0-rc.0", "@angular/service-worker": "^1.0.0-beta.16", "classlist.js": "^1.1.20150312", "core-js": "^2.4.1", @@ -89,7 +89,7 @@ }, "devDependencies": { "@angular/cli": "^1.6.3", - "@angular/compiler-cli": "^5.1.0-beta.2", + "@angular/compiler-cli": "5.2", "@types/jasmine": "^2.5.52", "@types/jasminewd2": "^2.0.3", "@types/node": "~6.0.60", diff --git a/aio/src/app/embedded/code/code-tabs.component.spec.ts b/aio/src/app/embedded/code/code-tabs.component.spec.ts index 6e8993c139..dff7b5ff3a 100644 --- a/aio/src/app/embedded/code/code-tabs.component.spec.ts +++ b/aio/src/app/embedded/code/code-tabs.component.spec.ts @@ -81,7 +81,8 @@ describe('CodeTabsComponent', () => { `); const classes = labelElems.map(s => s.className); - expect(classes).toEqual(['foo-class', 'bar-class']); + expect(classes[0].split(' ')).toContain('foo-class'); + expect(classes[1].split(' ')).toContain('bar-class'); }); it('should disable ripple effect on tab labels', () => { diff --git a/aio/yarn.lock b/aio/yarn.lock index d748a785dc..1bf1f1a8ce 100644 --- a/aio/yarn.lock +++ b/aio/yarn.lock @@ -27,9 +27,9 @@ minimist "^1.2.0" rxjs "^5.5.2" -"@angular/animations@^5.1.0-beta.2": - version "5.1.0-beta.2" - resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-5.1.0-beta.2.tgz#2ed05bfa0ed22d6d1550658785e965c1fbfec5a7" +"@angular/animations@^5.2.0-rc.0": + version "5.2.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-5.2.0-rc.0.tgz#49c9fc3f14674288656a3b06230a5d2e245c2ffc" dependencies: tslib "^1.7.1" @@ -103,42 +103,42 @@ optionalDependencies: node-sass "^4.3.0" -"@angular/common@^5.1.0-beta.2": - version "5.1.0-beta.2" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-5.1.0-beta.2.tgz#027b16b8d2f63eb14d9fbc84a0a5dd91945885d6" +"@angular/common@^5.2.0-rc.0": + version "5.2.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular/common/-/common-5.2.0-rc.0.tgz#e8696fbcbe8b6cd6ebb52f69b432571df0cbba0d" dependencies: tslib "^1.7.1" -"@angular/compiler-cli@^5.1.0-beta.2": - version "5.1.0-beta.2" - resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-5.1.0-beta.2.tgz#62b63e30bdae910c322a62b76fa790dd4a6cdf53" +"@angular/compiler-cli@5.2": + version "5.2.0" + resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-5.2.0.tgz#336b6d0127c69f25637cbcd82a4b76de6f3a2cce" dependencies: chokidar "^1.4.2" minimist "^1.2.0" reflect-metadata "^0.1.2" - tsickle "^0.25.5" + tsickle "^0.26.0" -"@angular/compiler@^5.1.0-beta.2": - version "5.1.0-beta.2" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-5.1.0-beta.2.tgz#6c88c3485558dcf85144f55edb1299d99cdb3fec" +"@angular/compiler@^5.2.0-rc.0": + version "5.2.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-5.2.0-rc.0.tgz#10c4de90e5fd232ed96c59ebc111f43800aad194" dependencies: tslib "^1.7.1" -"@angular/core@^5.1.0-beta.2": - version "5.1.0-beta.2" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-5.1.0-beta.2.tgz#e94b21cae4479caed9486239b065302a97c5fd4f" +"@angular/core@^5.2.0-rc.0": + version "5.2.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-5.2.0-rc.0.tgz#580ca6566b9cf8244d897efb57cc9205f8e47a5f" dependencies: tslib "^1.7.1" -"@angular/forms@^5.1.0-beta.2": - version "5.1.0-beta.2" - resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-5.1.0-beta.2.tgz#feeee29041cce227cc50e254ebecc2f19dc529ee" +"@angular/forms@^5.2.0-rc.0": + version "5.2.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-5.2.0-rc.0.tgz#c81d423d2a55bf66f34381036a76b69b7dcdd712" dependencies: tslib "^1.7.1" -"@angular/http@^5.1.0-beta.2": - version "5.1.0-beta.2" - resolved "https://registry.yarnpkg.com/@angular/http/-/http-5.1.0-beta.2.tgz#935beaba2afea192d6a75a1c3b8d7dfd787641b0" +"@angular/http@^5.2.0-rc.0": + version "5.2.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular/http/-/http-5.2.0-rc.0.tgz#55db934731f23887d3d1fce0f5f0180f39ea2078" dependencies: tslib "^1.7.1" @@ -148,29 +148,29 @@ dependencies: tslib "^1.7.1" -"@angular/platform-browser-dynamic@^5.1.0-beta.2": - version "5.1.0-beta.2" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.1.0-beta.2.tgz#bee1d37f7300030edd855edf66311b0d493252d5" +"@angular/platform-browser-dynamic@^5.2.0-rc.0": + version "5.2.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.2.0-rc.0.tgz#88db1a229c42a83492880dd5096cf5ed68321f6c" dependencies: tslib "^1.7.1" -"@angular/platform-browser@^5.1.0-beta.2": - version "5.1.0-beta.2" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-5.1.0-beta.2.tgz#ccfca9d172f033137c83f2fbe8b702fe7204c5d5" +"@angular/platform-browser@^5.2.0-rc.0": + version "5.2.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-5.2.0-rc.0.tgz#4805c80301940785137a6f2d98002a5addd49431" dependencies: tslib "^1.7.1" -"@angular/platform-server@^5.1.0-beta.2": - version "5.1.0-beta.2" - resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-5.1.0-beta.2.tgz#a36583b274f263eeb9e1c23f6f0b83c36cc4a72a" +"@angular/platform-server@^5.2.0-rc.0": + version "5.2.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-5.2.0-rc.0.tgz#ff9880cf0184420a9b04780cde23803ab186e9de" dependencies: domino "^1.0.29" tslib "^1.7.1" xhr2 "^0.1.4" -"@angular/router@^5.1.0-beta.2": - version "5.1.0-beta.2" - resolved "https://registry.yarnpkg.com/@angular/router/-/router-5.1.0-beta.2.tgz#a22b8c0e08b81c8b0950b9a668aa893e9f1c0e4c" +"@angular/router@^5.2.0-rc.0": + version "5.2.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular/router/-/router-5.2.0-rc.0.tgz#5d6507a24eaff3f28a46f46ced5b2802aec7074f" dependencies: tslib "^1.7.1" @@ -8373,9 +8373,9 @@ tsconfig@^6.0.0: strip-bom "^3.0.0" strip-json-comments "^2.0.0" -tsickle@^0.25.5: - version "0.25.5" - resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.25.5.tgz#2891d29f97c4aab1306e06378d8496d1765a4bfe" +tsickle@^0.26.0: + version "0.26.0" + resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.26.0.tgz#40b30a2dd6abcb33b182e37596674bd1cfe4039c" dependencies: minimist "^1.2.0" mkdirp "^0.5.1"