Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build(aio): upgrade to 5.2.0-rc.0 #21351

Closed
wants to merge 5 commits into from
Closed

build(aio): upgrade to 5.2.0-rc.0 #21351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
08826e2
build(aio): upgrade to angular@5.2.0-rc.0
IgorMinar Jan 6, 2018
7f71d3d
ci(aio): track sizes of all js files
IgorMinar Jan 6, 2018
0906a03
build(aio): upgrade to angular@5.2.0
IgorMinar Jan 10, 2018
e6ba1d4
build(aio): turn on namedChunks option to make debugging, profiling a…
IgorMinar Jan 10, 2018
4d022ce
fix(aio): preserve static Observable methods
gkalpak Jan 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions aio/.angular-cli.json
View file
Open in desktop
Expand Up @@ -62,6 +62,9 @@
"styleExt": "scss",
"component": {
"inlineStyle": true
},
"build": {
"namedChunks": true
}
}
}
22 changes: 11 additions & 11 deletions aio/package.json
View file
Open in desktop
Expand Up @@ -65,18 +65,18 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^5.1.0-beta.2",
"@angular/animations": "^5.2.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",
"@angular/compiler": "^5.2.0",
"@angular/core": "^5.2.0",
"@angular/forms": "^5.2.0",
"@angular/http": "^5.2.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",
"@angular/platform-browser-dynamic": "^5.2.0",
"@angular/platform-server": "^5.2.0",
"@angular/router": "^5.2.0",
"@angular/service-worker": "^1.0.0-beta.16",
"classlist.js": "^1.1.20150312",
"core-js": "^2.4.1",
Expand All @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions aio/scripts/_payload-limits.json
View file
Open in desktop
Expand Up @@ -2,17 +2,17 @@
"aio": {
"master": {
"gzip7": {
"inline": 941,
"inline": 961,
"main": 115381,
"polyfills": 12962
},
"gzip9": {
"inline": 941,
"inline": 961,
"main": 115186,
"polyfills": 12958
},
"uncompressed": {
"inline": 1558,
"inline": 1602,
"main": 453905,
"polyfills": 40264
}
Expand Down
2 changes: 1 addition & 1 deletion aio/scripts/payload.sh
View file
Open in desktop
Expand Up @@ -8,5 +8,5 @@ readonly parentDir=$(dirname $thisDir)
# Track payload size functions
source ../scripts/ci/payload-size.sh

trackPayloadSize "aio" "dist/*.bundle.js" true true "${thisDir}/_payload-limits.json"
trackPayloadSize "aio" "dist/*.js" true true "${thisDir}/_payload-limits.json"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we define limits for non-bundle JS files?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this didn't do what I thought it would do. I'll take the commit out.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wanted to track the size without imposing any limit.


3 changes: 2 additions & 1 deletion aio/src/app/embedded/code/code-tabs.component.spec.ts
View file
Open in desktop
Expand Up @@ -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', () => {
Expand Down
14 changes: 7 additions & 7 deletions aio/src/app/search/search.service.ts
View file
Open in desktop
Expand Up @@ -7,9 +7,10 @@ can be found in the LICENSE file at http://angular.io/license
import { NgZone, Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { ReplaySubject } from 'rxjs/ReplaySubject';
import 'rxjs/add/observable/race';
import 'rxjs/add/observable/timer';
import { race } from 'rxjs/observable/race';
import { timer } from 'rxjs/observable/timer';
import 'rxjs/add/operator/concatMap';
import 'rxjs/add/operator/first';
import 'rxjs/add/operator/publishReplay';
import { WebWorkerClient } from 'app/shared/web-worker';
import { SearchResults } from 'app/search/interfaces';
Expand All @@ -30,11 +31,10 @@ export class SearchService {
* @param initDelay the number of milliseconds to wait before we load the WebWorker and generate the search index
*/
initWorker(workerUrl: string, initDelay: number) {
const ready = this.ready = Observable
// Wait for the initDelay or the first search
.race<any>(
Observable.timer(initDelay),
(this.searchesSubject as Observable<string>).first()
// Wait for the initDelay or the first search
const ready = this.ready = race<any>(
timer(initDelay),
(this.searchesSubject.asObservable()).first()
)
.concatMap(() => {
// Create the worker and load the index
Expand Down
74 changes: 37 additions & 37 deletions aio/yarn.lock
View file
Open in desktop
Expand Up @@ -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":
version "5.2.0"
resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-5.2.0.tgz#a3ce02c01b074f0de7c2c23c1f08b4a00f0bec5f"
dependencies:
tslib "^1.7.1"

Expand Down Expand Up @@ -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":
version "5.2.0"
resolved "https://registry.yarnpkg.com/@angular/common/-/common-5.2.0.tgz#d184fb90763da1d1bab1f6c4f41dd80c79e47506"
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":
version "5.2.0"
resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-5.2.0.tgz#3798795b97e60b47fdc0a150e062dedb4ac39467"
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":
version "5.2.0"
resolved "https://registry.yarnpkg.com/@angular/core/-/core-5.2.0.tgz#f91bf83de3e0defd621adcc007c25d7cd5a85af1"
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":
version "5.2.0"
resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-5.2.0.tgz#b5fb6b9ba97334bca0e3202d7fee6b9162cbc824"
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":
version "5.2.0"
resolved "https://registry.yarnpkg.com/@angular/http/-/http-5.2.0.tgz#ebffff97e6c7baa3609a2d68e982bf990b1c72dc"
dependencies:
tslib "^1.7.1"

Expand All @@ -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":
version "5.2.0"
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.2.0.tgz#6d3e074363606b559c3319d2433d1c08ccaefbad"
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":
version "5.2.0"
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-5.2.0.tgz#89cbc8abf54171ecf3dd9a40970b4982eecc9f73"
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":
version "5.2.0"
resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-5.2.0.tgz#33fa4c310fc48ee77eb94109db45b2af6c37444e"
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":
version "5.2.0"
resolved "https://registry.yarnpkg.com/@angular/router/-/router-5.2.0.tgz#0a43f1c6add592c9cb0b9846fc157fc5b23ee73d"
dependencies:
tslib "^1.7.1"

Expand Down Expand Up @@ -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"
Expand Down