diff --git a/aio/content/examples/component-interaction/src/app/astronaut.component.ts b/aio/content/examples/component-interaction/src/app/astronaut.component.ts index b12497fee4..9bd4c9d78c 100644 --- a/aio/content/examples/component-interaction/src/app/astronaut.component.ts +++ b/aio/content/examples/component-interaction/src/app/astronaut.component.ts @@ -2,7 +2,7 @@ import { Component, Input, OnDestroy } from '@angular/core'; import { MissionService } from './mission.service'; -import { Subscription } from 'rxjs/Subscription'; +import { Subscription } from 'rxjs'; @Component({ selector: 'app-astronaut', diff --git a/aio/content/examples/component-interaction/src/app/mission.service.ts b/aio/content/examples/component-interaction/src/app/mission.service.ts index 25c86866b0..e8f4a42667 100644 --- a/aio/content/examples/component-interaction/src/app/mission.service.ts +++ b/aio/content/examples/component-interaction/src/app/mission.service.ts @@ -1,6 +1,6 @@ // #docregion import { Injectable } from '@angular/core'; -import { Subject } from 'rxjs/Subject'; +import { Subject } from 'rxjs'; @Injectable() export class MissionService { diff --git a/aio/content/examples/hierarchical-dependency-injection/src/app/heroes-list.component.ts b/aio/content/examples/hierarchical-dependency-injection/src/app/heroes-list.component.ts index 65525fd494..7e598a8038 100644 --- a/aio/content/examples/hierarchical-dependency-injection/src/app/heroes-list.component.ts +++ b/aio/content/examples/hierarchical-dependency-injection/src/app/heroes-list.component.ts @@ -1,6 +1,6 @@ // #docregion import { Component } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; import { Hero, HeroTaxReturn } from './hero'; import { HeroesService } from './heroes.service'; diff --git a/aio/content/examples/hierarchical-dependency-injection/src/app/heroes.service.ts b/aio/content/examples/hierarchical-dependency-injection/src/app/heroes.service.ts index 85b33c89a0..c4d08c7b8f 100644 --- a/aio/content/examples/hierarchical-dependency-injection/src/app/heroes.service.ts +++ b/aio/content/examples/hierarchical-dependency-injection/src/app/heroes.service.ts @@ -1,7 +1,6 @@ import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; -import { Observer } from 'rxjs/Observer'; +import { Observable, Observer } from 'rxjs'; import { Hero, HeroTaxReturn } from './hero'; diff --git a/aio/content/examples/hierarchical-dependency-injection/src/app/villains-list.component.ts b/aio/content/examples/hierarchical-dependency-injection/src/app/villains-list.component.ts index c62117f7bc..aa70bdf3cb 100644 --- a/aio/content/examples/hierarchical-dependency-injection/src/app/villains-list.component.ts +++ b/aio/content/examples/hierarchical-dependency-injection/src/app/villains-list.component.ts @@ -1,6 +1,6 @@ // #docregion import { Component } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; import { Villain, VillainsService } from './villains.service'; diff --git a/aio/content/examples/hierarchical-dependency-injection/src/app/villains.service.ts b/aio/content/examples/hierarchical-dependency-injection/src/app/villains.service.ts index 3d480c20af..a8605bd11d 100644 --- a/aio/content/examples/hierarchical-dependency-injection/src/app/villains.service.ts +++ b/aio/content/examples/hierarchical-dependency-injection/src/app/villains.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; -import { of } from 'rxjs/observable/of'; +import { of } from 'rxjs'; export interface Villain { id: number; name: string; } diff --git a/aio/content/examples/http/src/app/config/config.component.ts b/aio/content/examples/http/src/app/config/config.component.ts index f372c81b79..c082e81030 100644 --- a/aio/content/examples/http/src/app/config/config.component.ts +++ b/aio/content/examples/http/src/app/config/config.component.ts @@ -30,7 +30,7 @@ export class ConfigComponent { this.configService.getConfig() // #enddocregion v1, v2 .subscribe( - data => this.config = { ...data }, // success path + (data: Config) => this.config = { ...data }, // success path error => this.error = error // error path ); } @@ -39,7 +39,7 @@ export class ConfigComponent { showConfig_v1() { this.configService.getConfig_1() // #docregion v1, v1_callback - .subscribe(data => this.config = { + .subscribe((data: Config) => this.config = { heroesUrl: data['heroesUrl'], textfile: data['textfile'] }); @@ -51,7 +51,7 @@ export class ConfigComponent { this.configService.getConfig() // #docregion v2, v2_callback // clone the data object, using its known Config shape - .subscribe(data => this.config = { ...data }); + .subscribe((data: Config) => this.config = { ...data }); // #enddocregion v2_callback } // #enddocregion v2 diff --git a/aio/content/examples/http/src/app/config/config.service.ts b/aio/content/examples/http/src/app/config/config.service.ts index aaa2285d9a..4dd71c69ab 100644 --- a/aio/content/examples/http/src/app/config/config.service.ts +++ b/aio/content/examples/http/src/app/config/config.service.ts @@ -6,8 +6,7 @@ import { HttpClient } from '@angular/common/http'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; // #docregion rxjs-imports -import { Observable } from 'rxjs/Observable'; -import { ErrorObservable } from 'rxjs/observable/ErrorObservable'; +import { Observable, throwError } from 'rxjs'; import { catchError, retry } from 'rxjs/operators'; // #enddocregion rxjs-imports @@ -82,8 +81,8 @@ export class ConfigService { `Backend returned code ${error.status}, ` + `body was: ${error.error}`); } - // return an ErrorObservable with a user-facing error message - return new ErrorObservable( + // return an observable with a user-facing error message + return throwError( 'Something bad happened; please try again later.'); }; // #enddocregion handleError diff --git a/aio/content/examples/http/src/app/heroes/heroes.service.ts b/aio/content/examples/http/src/app/heroes/heroes.service.ts index 8e989ef09c..a0c079027f 100644 --- a/aio/content/examples/http/src/app/heroes/heroes.service.ts +++ b/aio/content/examples/http/src/app/heroes/heroes.service.ts @@ -6,8 +6,7 @@ import { HttpHeaders } from '@angular/common/http'; // #enddocregion http-options -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; +import { Observable } from 'rxjs'; import { catchError } from 'rxjs/operators'; import { Hero } from './hero'; diff --git a/aio/content/examples/http/src/app/http-error-handler.service.ts b/aio/content/examples/http/src/app/http-error-handler.service.ts index 72a849b265..c7d0926fbd 100644 --- a/aio/content/examples/http/src/app/http-error-handler.service.ts +++ b/aio/content/examples/http/src/app/http-error-handler.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@angular/core'; import { HttpErrorResponse } from '@angular/common/http'; -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; +import { Observable, of } from 'rxjs'; import { MessageService } from './message.service'; diff --git a/aio/content/examples/http/src/app/http-interceptors/auth-interceptor.ts b/aio/content/examples/http/src/app/http-interceptors/auth-interceptor.ts index db472a25a9..85fb760450 100644 --- a/aio/content/examples/http/src/app/http-interceptors/auth-interceptor.ts +++ b/aio/content/examples/http/src/app/http-interceptors/auth-interceptor.ts @@ -4,8 +4,6 @@ import { HttpEvent, HttpInterceptor, HttpHandler, HttpRequest } from '@angular/common/http'; -import { Observable } from 'rxjs/Observable'; - // #docregion import { AuthService } from '../auth.service'; diff --git a/aio/content/examples/http/src/app/http-interceptors/caching-interceptor.ts b/aio/content/examples/http/src/app/http-interceptors/caching-interceptor.ts index 2079a85442..5ebb631ac2 100644 --- a/aio/content/examples/http/src/app/http-interceptors/caching-interceptor.ts +++ b/aio/content/examples/http/src/app/http-interceptors/caching-interceptor.ts @@ -5,8 +5,7 @@ import { HttpInterceptor, HttpHandler } from '@angular/common/http'; -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; +import { Observable, of } from 'rxjs'; import { startWith, tap } from 'rxjs/operators'; import { RequestCache } from '../request-cache.service'; diff --git a/aio/content/examples/http/src/app/http-interceptors/ensure-https-interceptor.ts b/aio/content/examples/http/src/app/http-interceptors/ensure-https-interceptor.ts index 70b0bdb085..ad6c9f6281 100644 --- a/aio/content/examples/http/src/app/http-interceptors/ensure-https-interceptor.ts +++ b/aio/content/examples/http/src/app/http-interceptors/ensure-https-interceptor.ts @@ -3,7 +3,7 @@ import { HttpEvent, HttpInterceptor, HttpHandler, HttpRequest } from '@angular/common/http'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; @Injectable() export class EnsureHttpsInterceptor implements HttpInterceptor { diff --git a/aio/content/examples/http/src/app/http-interceptors/logging-interceptor.ts b/aio/content/examples/http/src/app/http-interceptors/logging-interceptor.ts index 63cb7cc92c..d5fc1bb65c 100644 --- a/aio/content/examples/http/src/app/http-interceptors/logging-interceptor.ts +++ b/aio/content/examples/http/src/app/http-interceptors/logging-interceptor.ts @@ -4,7 +4,6 @@ import { HttpRequest, HttpResponse } from '@angular/common/http'; -import { Observable } from 'rxjs/Observable'; // #docregion excerpt import { finalize, tap } from 'rxjs/operators'; import { MessageService } from '../message.service'; diff --git a/aio/content/examples/http/src/app/http-interceptors/noop-interceptor.ts b/aio/content/examples/http/src/app/http-interceptors/noop-interceptor.ts index 2bd0244cfc..51d4020804 100644 --- a/aio/content/examples/http/src/app/http-interceptors/noop-interceptor.ts +++ b/aio/content/examples/http/src/app/http-interceptors/noop-interceptor.ts @@ -3,7 +3,7 @@ import { HttpEvent, HttpInterceptor, HttpHandler, HttpRequest } from '@angular/common/http'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; /** Pass untouched request through to the next request handler. */ @Injectable() diff --git a/aio/content/examples/http/src/app/http-interceptors/trim-name-interceptor.ts b/aio/content/examples/http/src/app/http-interceptors/trim-name-interceptor.ts index 87705da2f9..23858ebdd2 100644 --- a/aio/content/examples/http/src/app/http-interceptors/trim-name-interceptor.ts +++ b/aio/content/examples/http/src/app/http-interceptors/trim-name-interceptor.ts @@ -3,7 +3,7 @@ import { HttpEvent, HttpInterceptor, HttpHandler, HttpRequest } from '@angular/common/http'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; @Injectable() export class TrimNameInterceptor implements HttpInterceptor { diff --git a/aio/content/examples/http/src/app/http-interceptors/upload-interceptor.ts b/aio/content/examples/http/src/app/http-interceptors/upload-interceptor.ts index 1ad1891898..6acb5d0cdb 100644 --- a/aio/content/examples/http/src/app/http-interceptors/upload-interceptor.ts +++ b/aio/content/examples/http/src/app/http-interceptors/upload-interceptor.ts @@ -5,8 +5,7 @@ import { HttpEventType, HttpProgressEvent } from '@angular/common/http'; -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; +import { Observable } from 'rxjs'; /** Simulate server replying to file upload request */ @Injectable() diff --git a/aio/content/examples/http/src/app/package-search/package-search.component.ts b/aio/content/examples/http/src/app/package-search/package-search.component.ts index 8a42bd9b44..f020da50c2 100644 --- a/aio/content/examples/http/src/app/package-search/package-search.component.ts +++ b/aio/content/examples/http/src/app/package-search/package-search.component.ts @@ -1,7 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; -import { Subject } from 'rxjs/Subject'; +import { Observable, Subject } from 'rxjs'; import { debounceTime, distinctUntilChanged, switchMap } from 'rxjs/operators'; import { NpmPackageInfo, PackageSearchService } from './package-search.service'; diff --git a/aio/content/examples/http/src/app/package-search/package-search.service.ts b/aio/content/examples/http/src/app/package-search/package-search.service.ts index 19d37f8259..b026e03e06 100644 --- a/aio/content/examples/http/src/app/package-search/package-search.service.ts +++ b/aio/content/examples/http/src/app/package-search/package-search.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@angular/core'; import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; +import { Observable, of } from 'rxjs'; import { catchError, map } from 'rxjs/operators'; import { HttpErrorHandler, HandleError } from '../http-error-handler.service'; diff --git a/aio/content/examples/http/src/app/uploader/uploader.service.ts b/aio/content/examples/http/src/app/uploader/uploader.service.ts index 115791a947..8bc659f26f 100644 --- a/aio/content/examples/http/src/app/uploader/uploader.service.ts +++ b/aio/content/examples/http/src/app/uploader/uploader.service.ts @@ -4,7 +4,7 @@ import { HttpRequest, HttpResponse, HttpErrorResponse } from '@angular/common/http'; -import { of } from 'rxjs/observable/of'; +import { of } from 'rxjs'; import { catchError, last, map, tap } from 'rxjs/operators'; import { MessageService } from '../message.service'; diff --git a/aio/content/examples/ngmodule-faq/src/app/contact/contact.service.ts b/aio/content/examples/ngmodule-faq/src/app/contact/contact.service.ts index 37c7e17a71..ff21a65bce 100644 --- a/aio/content/examples/ngmodule-faq/src/app/contact/contact.service.ts +++ b/aio/content/examples/ngmodule-faq/src/app/contact/contact.service.ts @@ -2,8 +2,7 @@ // #docregion import { Injectable, OnDestroy } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; +import { Observable, of } from 'rxjs'; import { delay } from 'rxjs/operators'; export class Contact { diff --git a/aio/content/examples/ngmodule-faq/src/app/crisis/crisis-list.component.ts b/aio/content/examples/ngmodule-faq/src/app/crisis/crisis-list.component.ts index f6665780f9..858f749416 100644 --- a/aio/content/examples/ngmodule-faq/src/app/crisis/crisis-list.component.ts +++ b/aio/content/examples/ngmodule-faq/src/app/crisis/crisis-list.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; import { Crisis, CrisisService } from './crisis.service'; diff --git a/aio/content/examples/ngmodule-faq/src/app/crisis/crisis.service.ts b/aio/content/examples/ngmodule-faq/src/app/crisis/crisis.service.ts index a95bf5f7a1..f91eb995ea 100644 --- a/aio/content/examples/ngmodule-faq/src/app/crisis/crisis.service.ts +++ b/aio/content/examples/ngmodule-faq/src/app/crisis/crisis.service.ts @@ -1,7 +1,6 @@ import { Injectable, OnDestroy } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; +import { Observable, of } from 'rxjs'; import { delay } from 'rxjs/operators'; export class Crisis { diff --git a/aio/content/examples/ngmodule-faq/src/app/hero/hero-list.component.ts b/aio/content/examples/ngmodule-faq/src/app/hero/hero-list.component.ts index d6856b4512..8ac492403e 100644 --- a/aio/content/examples/ngmodule-faq/src/app/hero/hero-list.component.ts +++ b/aio/content/examples/ngmodule-faq/src/app/hero/hero-list.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; import { Hero, HeroService } from './hero.service'; diff --git a/aio/content/examples/ngmodule-faq/src/app/hero/hero.service.ts b/aio/content/examples/ngmodule-faq/src/app/hero/hero.service.ts index f54fc8d171..da3677845f 100644 --- a/aio/content/examples/ngmodule-faq/src/app/hero/hero.service.ts +++ b/aio/content/examples/ngmodule-faq/src/app/hero/hero.service.ts @@ -1,7 +1,6 @@ import { Injectable, OnDestroy } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; +import { Observable, of } from 'rxjs'; import { delay } from 'rxjs/operators'; export class Hero { diff --git a/aio/content/examples/ngmodules/src/app/contact/contact.service.ts b/aio/content/examples/ngmodules/src/app/contact/contact.service.ts index a72ca4aa7c..a140538ad9 100644 --- a/aio/content/examples/ngmodules/src/app/contact/contact.service.ts +++ b/aio/content/examples/ngmodules/src/app/contact/contact.service.ts @@ -1,8 +1,7 @@ import { Injectable, OnDestroy } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; -import { delay } from 'rxjs/operator/delay'; +import { Observable, of } from 'rxjs'; +import { delay } from 'rxjs/operators'; export class Contact { constructor(public id: number, public name: string) { } @@ -24,12 +23,12 @@ export class ContactService implements OnDestroy { ngOnDestroy() { console.log('ContactService instance destroyed.'); } getContacts(): Observable { - return delay.call(of(CONTACTS), FETCH_LATENCY); + return of(CONTACTS).pipe(delay(FETCH_LATENCY)); } getContact(id: number | string): Observable { const contact$ = of(CONTACTS.find(contact => contact.id === +id)); - return delay.call(contact$, FETCH_LATENCY); + return contact$.pipe(delay(FETCH_LATENCY)); } } diff --git a/aio/content/examples/ngmodules/src/app/customers/customers-list.component.ts b/aio/content/examples/ngmodules/src/app/customers/customers-list.component.ts index 42cf434763..d29ef6dcfd 100644 --- a/aio/content/examples/ngmodules/src/app/customers/customers-list.component.ts +++ b/aio/content/examples/ngmodules/src/app/customers/customers-list.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; import { Customer, CustomersService } from './customers.service'; diff --git a/aio/content/examples/ngmodules/src/app/customers/customers.service.ts b/aio/content/examples/ngmodules/src/app/customers/customers.service.ts index 2eed780658..0e4d50960b 100644 --- a/aio/content/examples/ngmodules/src/app/customers/customers.service.ts +++ b/aio/content/examples/ngmodules/src/app/customers/customers.service.ts @@ -1,8 +1,7 @@ import { Injectable, OnDestroy } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; -import { delay } from 'rxjs/operator/delay'; +import { Observable, of } from 'rxjs'; +import { delay } from 'rxjs/operators'; export class Customer { constructor(public id: number, public name: string) { } @@ -27,11 +26,11 @@ export class CustomersService implements OnDestroy { ngOnDestroy() { console.log('CustomersService instance destroyed.'); } getCustomers(): Observable { - return delay.call(of(CUSTOMERS), FETCH_LATENCY); + return of(CUSTOMERS).pipe(delay(FETCH_LATENCY)); } getCustomer(id: number | string): Observable { const customer$ = of(CUSTOMERS.find(customer => customer.id === +id)); - return delay.call(customer$, FETCH_LATENCY); + return customer$.pipe(delay(FETCH_LATENCY)); } } diff --git a/aio/content/examples/ngmodules/src/app/items/items-list.component.ts b/aio/content/examples/ngmodules/src/app/items/items-list.component.ts index 2c74ff7f47..c4859c93cb 100644 --- a/aio/content/examples/ngmodules/src/app/items/items-list.component.ts +++ b/aio/content/examples/ngmodules/src/app/items/items-list.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { Observable }from 'rxjs/Observable'; +import { Observable }from 'rxjs'; import { Item, ItemService } from './items.service'; diff --git a/aio/content/examples/ngmodules/src/app/items/items.module.ts b/aio/content/examples/ngmodules/src/app/items/items.module.ts index b0f2b3f289..bc749b582a 100644 --- a/aio/content/examples/ngmodules/src/app/items/items.module.ts +++ b/aio/content/examples/ngmodules/src/app/items/items.module.ts @@ -1,6 +1,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { ItemsComponent } from './items.component'; import { ItemsListComponent } from './items-list.component'; import { ItemsDetailComponent } from './items-detail.component'; import { ItemService } from './items.service'; @@ -8,7 +9,7 @@ import { ItemsRoutingModule } from './items-routing.module'; @NgModule({ imports: [ CommonModule, ItemsRoutingModule ], - declarations: [ ItemsDetailComponent, ItemsListComponent ], + declarations: [ ItemsComponent, ItemsDetailComponent, ItemsListComponent ], providers: [ ItemService ] }) export class ItemsModule {} diff --git a/aio/content/examples/ngmodules/src/app/items/items.service.ts b/aio/content/examples/ngmodules/src/app/items/items.service.ts index 57b39e4ed3..39968b452f 100644 --- a/aio/content/examples/ngmodules/src/app/items/items.service.ts +++ b/aio/content/examples/ngmodules/src/app/items/items.service.ts @@ -1,8 +1,7 @@ import { Injectable, OnDestroy } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; -import { delay } from 'rxjs/operator/delay'; +import { Observable, of } from 'rxjs'; +import { delay } from 'rxjs/operators'; export class Item { constructor(public id: number, public name: string) { } @@ -25,12 +24,12 @@ export class ItemService implements OnDestroy { ngOnDestroy() { console.log('ItemService instance destroyed.'); } getItems(): Observable { - return delay.call(of(ITEMS), FETCH_LATENCY); + return of(ITEMS).pipe(delay(FETCH_LATENCY)); } getItem(id: number | string): Observable { const item$ = of(ITEMS.find(item => item.id === +id)); - return delay.call(item$, FETCH_LATENCY); + return item$.pipe(delay(FETCH_LATENCY)); } } diff --git a/aio/content/examples/observables-in-angular/src/main.ts b/aio/content/examples/observables-in-angular/src/main.ts index 462dca8029..c5e95560f5 100644 --- a/aio/content/examples/observables-in-angular/src/main.ts +++ b/aio/content/examples/observables-in-angular/src/main.ts @@ -1,6 +1,6 @@ import { Component, Output, OnInit, EventEmitter, NgModule } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; // #docregion eventemitter diff --git a/aio/content/examples/observables/src/creating.ts b/aio/content/examples/observables/src/creating.ts index ba77c4485c..83003b99bf 100644 --- a/aio/content/examples/observables/src/creating.ts +++ b/aio/content/examples/observables/src/creating.ts @@ -1,5 +1,5 @@ -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; // #docregion subscriber diff --git a/aio/content/examples/observables/src/geolocation.ts b/aio/content/examples/observables/src/geolocation.ts index c76a94e4f1..7210a51e1d 100644 --- a/aio/content/examples/observables/src/geolocation.ts +++ b/aio/content/examples/observables/src/geolocation.ts @@ -1,4 +1,4 @@ -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; // #docregion diff --git a/aio/content/examples/observables/src/multicasting.ts b/aio/content/examples/observables/src/multicasting.ts index ec40f27450..449f7b73c7 100644 --- a/aio/content/examples/observables/src/multicasting.ts +++ b/aio/content/examples/observables/src/multicasting.ts @@ -1,5 +1,5 @@ -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; // #docregion delay_sequence diff --git a/aio/content/examples/observables/src/subscribing.ts b/aio/content/examples/observables/src/subscribing.ts index 9b6c9ca2f1..4712580b33 100644 --- a/aio/content/examples/observables/src/subscribing.ts +++ b/aio/content/examples/observables/src/subscribing.ts @@ -1,6 +1,5 @@ -import { Observable } from 'rxjs/Observable'; -import 'rxjs/add/observable/of'; +import { Observable, of } from 'rxjs'; // #docregion observer diff --git a/aio/content/examples/pipes/src/app/app.module.ts b/aio/content/examples/pipes/src/app/app.module.ts index 89a3a29505..325a32e4b2 100644 --- a/aio/content/examples/pipes/src/app/app.module.ts +++ b/aio/content/examples/pipes/src/app/app.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { FormsModule } from '@angular/forms'; -import { HttpModule } from '@angular/http'; +import { HttpClientModule } from '@angular//common/http'; import { AppComponent } from './app.component'; import { @@ -26,7 +26,7 @@ import { ExponentialStrengthPipe } from './exponential-strength.pipe'; imports: [ BrowserModule, FormsModule, - HttpModule + HttpClientModule ], declarations: [ AppComponent, diff --git a/aio/content/examples/pipes/src/app/fetch-json.pipe.ts b/aio/content/examples/pipes/src/app/fetch-json.pipe.ts index 4d56e865f3..9fcdf341e1 100644 --- a/aio/content/examples/pipes/src/app/fetch-json.pipe.ts +++ b/aio/content/examples/pipes/src/app/fetch-json.pipe.ts @@ -1,9 +1,6 @@ // #docregion import { Pipe, PipeTransform } from '@angular/core'; -import { Http } from '@angular/http'; - -import 'rxjs/add/operator/map'; - +import { HttpClient } from '@angular/common/http'; // #docregion pipe-metadata @Pipe({ name: 'fetch', @@ -14,15 +11,13 @@ export class FetchJsonPipe implements PipeTransform { private cachedData: any = null; private cachedUrl = ''; - constructor(private http: Http) { } + constructor(private http: HttpClient) { } transform(url: string): any { if (url !== this.cachedUrl) { this.cachedData = null; this.cachedUrl = url; - this.http.get(url) - .map( result => result.json() ) - .subscribe( result => this.cachedData = result ); + this.http.get(url).subscribe( result => this.cachedData = result ); } return this.cachedData; diff --git a/aio/content/examples/pipes/src/app/hero-async-message.component.ts b/aio/content/examples/pipes/src/app/hero-async-message.component.ts index 3435b3e1cc..558e916f53 100644 --- a/aio/content/examples/pipes/src/app/hero-async-message.component.ts +++ b/aio/content/examples/pipes/src/app/hero-async-message.component.ts @@ -1,10 +1,8 @@ // #docregion import { Component } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; -import 'rxjs/add/observable/interval'; -import 'rxjs/add/operator/map'; -import 'rxjs/add/operator/take'; +import { Observable, interval } from 'rxjs'; +import { map, take } from 'rxjs/operators'; @Component({ selector: 'app-hero-message', @@ -25,14 +23,17 @@ export class HeroAsyncMessageComponent { constructor() { this.resend(); } resend() { - this.message$ = Observable.interval(500) - .map(i => this.messages[i]) - .take(this.messages.length); + this.message$ = interval(500).pipe( + map(i => this.messages[i]), + take(this.messages.length) + ); } } // #enddocregion // Alternative message$ formula: -// this.message$ = Observable.fromArray(this.messages) -// .map(message => Observable.timer(500).map(() => message)) -// .concatAll(); +// this.message$ = fromArray(this.messages).pipe( +// map(message => timer(500), +// map(() => message)), +// concatAll() +// ); diff --git a/aio/content/examples/practical-observable-usage/src/backoff.ts b/aio/content/examples/practical-observable-usage/src/backoff.ts index a7174a200a..97b53845f1 100644 --- a/aio/content/examples/practical-observable-usage/src/backoff.ts +++ b/aio/content/examples/practical-observable-usage/src/backoff.ts @@ -1,9 +1,7 @@ -import { ajax } from 'rxjs/observable/dom/ajax'; -import { range } from 'rxjs/observable/range'; -import { timer } from 'rxjs/observable/timer'; -import { pipe } from 'rxjs/util/pipe'; -import { retryWhen, zip, map, mergeMap } from 'rxjs/operators'; +import { pipe, range, timer, zip } from 'rxjs'; +import { ajax } from 'rxjs/ajax'; +import { retryWhen, map, mergeMap } from 'rxjs/operators'; function backoff(maxTries, ms) { return pipe( diff --git a/aio/content/examples/practical-observable-usage/src/typeahead.ts b/aio/content/examples/practical-observable-usage/src/typeahead.ts index 5badfcab6b..4bde2c66d0 100644 --- a/aio/content/examples/practical-observable-usage/src/typeahead.ts +++ b/aio/content/examples/practical-observable-usage/src/typeahead.ts @@ -1,6 +1,6 @@ -import { fromEvent } from 'rxjs/observable/fromEvent'; -import { ajax } from 'rxjs/observable/dom/ajax'; +import { fromEvent } from 'rxjs'; +import { ajax } from 'rxjs/ajax'; import { map, filter, debounceTime, distinctUntilChanged, switchMap } from 'rxjs/operators'; const searchBox = document.getElementById('search-box'); diff --git a/aio/content/examples/reactive-forms/src/app/demo.component.ts b/aio/content/examples/reactive-forms/src/app/demo.component.ts index 65763e4bd3..71658e7b6b 100644 --- a/aio/content/examples/reactive-forms/src/app/demo.component.ts +++ b/aio/content/examples/reactive-forms/src/app/demo.component.ts @@ -1,6 +1,7 @@ /* tslint:disable:member-ordering */ import { Component } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; +import { finalize } from 'rxjs/operators'; import { Hero } from './data-model'; import { HeroService } from './hero.service'; @@ -33,8 +34,9 @@ export class DemoComponent { getHeroes() { this.isLoading = true; - this.heroes = this.heroService.getHeroes() - .finally(() => this.isLoading = false); + this.heroes = this.heroService.getHeroes().pipe( + finalize(() => this.isLoading = false) + ); this.selectedHero = undefined; } diff --git a/aio/content/examples/reactive-forms/src/app/hero-list/hero-list.component.ts b/aio/content/examples/reactive-forms/src/app/hero-list/hero-list.component.ts index 409d42eb07..c310fb8dd8 100644 --- a/aio/content/examples/reactive-forms/src/app/hero-list/hero-list.component.ts +++ b/aio/content/examples/reactive-forms/src/app/hero-list/hero-list.component.ts @@ -1,7 +1,7 @@ // #docregion import { Component, OnInit } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; -import 'rxjs/add/operator/finally'; +import { Observable } from 'rxjs'; +import { finalize } from 'rxjs/operators'; import { Hero } from '../data-model'; import { HeroService } from '../hero.service'; @@ -24,7 +24,7 @@ export class HeroListComponent implements OnInit { this.isLoading = true; this.heroes = this.heroService.getHeroes() // Todo: error handling - .finally(() => this.isLoading = false); + .pipe(finalize(() => this.isLoading = false)); this.selectedHero = undefined; } diff --git a/aio/content/examples/reactive-forms/src/app/hero.service.ts b/aio/content/examples/reactive-forms/src/app/hero.service.ts index 6600586de7..ff1caf064a 100644 --- a/aio/content/examples/reactive-forms/src/app/hero.service.ts +++ b/aio/content/examples/reactive-forms/src/app/hero.service.ts @@ -1,9 +1,8 @@ // #docregion import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; -import 'rxjs/add/operator/delay'; +import { Observable, of } from 'rxjs'; +import { delay } from 'rxjs/operators'; import { Hero, heroes } from './data-model'; @@ -14,13 +13,13 @@ export class HeroService { // Fake server get; assume nothing can go wrong getHeroes(): Observable { - return of(heroes).delay(this.delayMs); // simulate latency with delay + return of(heroes).pipe(delay(this.delayMs)); // simulate latency with delay } // Fake server update; assume nothing can go wrong updateHero(hero: Hero): Observable { const oldHero = heroes.find(h => h.id === hero.id); const newHero = Object.assign(oldHero, hero); // Demo: mutate cached hero - return of(newHero).delay(this.delayMs); // simulate latency with delay + return of(newHero).pipe(delay(this.delayMs)); // simulate latency with delay } } diff --git a/aio/content/examples/router/src/app/admin/admin-dashboard.component.2.ts b/aio/content/examples/router/src/app/admin/admin-dashboard.component.2.ts index ca9ec37bb9..19406bea9b 100644 --- a/aio/content/examples/router/src/app/admin/admin-dashboard.component.2.ts +++ b/aio/content/examples/router/src/app/admin/admin-dashboard.component.2.ts @@ -1,8 +1,8 @@ // #docregion import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; -import 'rxjs/add/operator/map'; +import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; @Component({ template: ` @@ -23,11 +23,11 @@ export class AdminDashboardComponent implements OnInit { // Capture the session ID if available this.sessionId = this.route .queryParamMap - .map(params => params.get('session_id') || 'None'); + .pipe(map(params => params.get('session_id') || 'None')); // Capture the fragment if available this.token = this.route .fragment - .map(fragment => fragment || 'None'); + .pipe(map(fragment => fragment || 'None')); } } diff --git a/aio/content/examples/router/src/app/admin/admin-dashboard.component.ts b/aio/content/examples/router/src/app/admin/admin-dashboard.component.ts index 1602319c08..11be8fd029 100644 --- a/aio/content/examples/router/src/app/admin/admin-dashboard.component.ts +++ b/aio/content/examples/router/src/app/admin/admin-dashboard.component.ts @@ -1,11 +1,11 @@ // #docregion import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; import { SelectivePreloadingStrategy } from '../selective-preloading-strategy'; -import 'rxjs/add/operator/map'; @Component({ template: ` @@ -37,11 +37,11 @@ export class AdminDashboardComponent implements OnInit { // Capture the session ID if available this.sessionId = this.route .queryParamMap - .map(params => params.get('session_id') || 'None'); + .pipe(map(params => params.get('session_id') || 'None')); // Capture the fragment if available this.token = this.route .fragment - .map(fragment => fragment || 'None'); + .pipe(map(fragment => fragment || 'None')); } } diff --git a/aio/content/examples/router/src/app/auth.service.ts b/aio/content/examples/router/src/app/auth.service.ts index 908a4ae18b..9978541065 100644 --- a/aio/content/examples/router/src/app/auth.service.ts +++ b/aio/content/examples/router/src/app/auth.service.ts @@ -1,10 +1,8 @@ // #docregion import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; -import 'rxjs/add/observable/of'; -import 'rxjs/add/operator/do'; -import 'rxjs/add/operator/delay'; +import { Observable, of } from 'rxjs'; +import { tap, delay } from 'rxjs/operators'; @Injectable() export class AuthService { @@ -14,7 +12,10 @@ export class AuthService { redirectUrl: string; login(): Observable { - return Observable.of(true).delay(1000).do(val => this.isLoggedIn = true); + return of(true).pipe( + delay(1000), + tap(val => this.isLoggedIn = true) + ); } logout(): void { diff --git a/aio/content/examples/router/src/app/can-deactivate-guard.service.1.ts b/aio/content/examples/router/src/app/can-deactivate-guard.service.1.ts index e296aa6aa5..35af6226fb 100644 --- a/aio/content/examples/router/src/app/can-deactivate-guard.service.1.ts +++ b/aio/content/examples/router/src/app/can-deactivate-guard.service.1.ts @@ -1,6 +1,6 @@ // #docregion import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; import { CanDeactivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router'; diff --git a/aio/content/examples/router/src/app/can-deactivate-guard.service.ts b/aio/content/examples/router/src/app/can-deactivate-guard.service.ts index 44da69f9c7..e001d95ed9 100644 --- a/aio/content/examples/router/src/app/can-deactivate-guard.service.ts +++ b/aio/content/examples/router/src/app/can-deactivate-guard.service.ts @@ -1,7 +1,7 @@ // #docregion import { Injectable } from '@angular/core'; import { CanDeactivate } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; export interface CanComponentDeactivate { canDeactivate: () => Observable | Promise | boolean; diff --git a/aio/content/examples/router/src/app/crisis-center/crisis-detail-resolver.service.ts b/aio/content/examples/router/src/app/crisis-center/crisis-detail-resolver.service.ts index bf2ab4a8ce..a861c3bb97 100644 --- a/aio/content/examples/router/src/app/crisis-center/crisis-detail-resolver.service.ts +++ b/aio/content/examples/router/src/app/crisis-center/crisis-detail-resolver.service.ts @@ -1,10 +1,9 @@ // #docregion -import 'rxjs/add/operator/map'; -import 'rxjs/add/operator/take'; import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; import { Router, Resolve, RouterStateSnapshot, ActivatedRouteSnapshot } from '@angular/router'; +import { Observable } from 'rxjs'; +import { map, take } from 'rxjs/operators'; import { Crisis, CrisisService } from './crisis.service'; @@ -15,13 +14,16 @@ export class CrisisDetailResolver implements Resolve { resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { let id = route.paramMap.get('id'); - return this.cs.getCrisis(id).take(1).map(crisis => { - if (crisis) { - return crisis; - } else { // id not found - this.router.navigate(['/crisis-center']); - return null; - } - }); + return this.cs.getCrisis(id).pipe( + take(1), + map(crisis => { + if (crisis) { + return crisis; + } else { // id not found + this.router.navigate(['/crisis-center']); + return null; + } + }) + ); } } diff --git a/aio/content/examples/router/src/app/crisis-center/crisis-detail.component.1.ts b/aio/content/examples/router/src/app/crisis-center/crisis-detail.component.1.ts index 1785572ff4..45e8d9c95b 100644 --- a/aio/content/examples/router/src/app/crisis-center/crisis-detail.component.1.ts +++ b/aio/content/examples/router/src/app/crisis-center/crisis-detail.component.1.ts @@ -1,9 +1,9 @@ // #docplaster // #docregion -import 'rxjs/add/operator/switchMap'; import { Component, OnInit, HostBinding } from '@angular/core'; import { ActivatedRoute, Router, ParamMap } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; +import { switchMap } from 'rxjs/operators'; import { slideInDownAnimation } from '../animations'; import { Crisis, CrisisService } from './crisis.service'; @@ -46,8 +46,9 @@ export class CrisisDetailComponent implements OnInit { // #docregion ngOnInit ngOnInit() { this.route.paramMap - .switchMap((params: ParamMap) => - this.service.getCrisis(params.get('id'))) + .pipe( + switchMap((params: ParamMap) => + this.service.getCrisis(params.get('id')))) .subscribe((crisis: Crisis) => { if (crisis) { this.editName = crisis.name; diff --git a/aio/content/examples/router/src/app/crisis-center/crisis-detail.component.ts b/aio/content/examples/router/src/app/crisis-center/crisis-detail.component.ts index 5913ce90f0..2b5150686c 100644 --- a/aio/content/examples/router/src/app/crisis-center/crisis-detail.component.ts +++ b/aio/content/examples/router/src/app/crisis-center/crisis-detail.component.ts @@ -2,7 +2,7 @@ // #docregion import { Component, OnInit, HostBinding } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; import { slideInDownAnimation } from '../animations'; import { Crisis } from './crisis.service'; diff --git a/aio/content/examples/router/src/app/crisis-center/crisis-list.component.1.ts b/aio/content/examples/router/src/app/crisis-center/crisis-list.component.1.ts index 4e971f4f6f..5bd95158bb 100644 --- a/aio/content/examples/router/src/app/crisis-center/crisis-list.component.1.ts +++ b/aio/content/examples/router/src/app/crisis-center/crisis-list.component.1.ts @@ -1,10 +1,10 @@ -import 'rxjs/add/operator/switchMap'; import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, ParamMap } from '@angular/router'; import { Crisis, CrisisService } from './crisis.service'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; +import { switchMap } from 'rxjs/operators'; @Component({ // #docregion relative-navigation-router-link @@ -34,10 +34,11 @@ export class CrisisListComponent implements OnInit { ngOnInit() { - this.crises$ = this.route.paramMap - .switchMap((params: ParamMap) => { + this.crises$ = this.route.paramMap.pipe( + switchMap((params: ParamMap) => { this.selectedId = +params.get('id'); return this.service.getCrises(); - }); + }) + ); } } diff --git a/aio/content/examples/router/src/app/crisis-center/crisis-list.component.ts b/aio/content/examples/router/src/app/crisis-center/crisis-list.component.ts index 79c4c3ba11..3219f10212 100644 --- a/aio/content/examples/router/src/app/crisis-center/crisis-list.component.ts +++ b/aio/content/examples/router/src/app/crisis-center/crisis-list.component.ts @@ -1,10 +1,10 @@ // #docregion -import 'rxjs/add/operator/switchMap'; import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, ParamMap } from '@angular/router'; import { Crisis, CrisisService } from './crisis.service'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; +import { switchMap } from 'rxjs/operators'; @Component({ template: ` @@ -32,10 +32,11 @@ export class CrisisListComponent implements OnInit { // #enddocregion ctor ngOnInit() { - this.crises$ = this.route.paramMap - .switchMap((params: ParamMap) => { + this.crises$ = this.route.paramMap.pipe( + switchMap((params: ParamMap) => { this.selectedId = +params.get('id'); return this.service.getCrises(); - }); + }) + ); } } diff --git a/aio/content/examples/router/src/app/crisis-center/crisis.service.ts b/aio/content/examples/router/src/app/crisis-center/crisis.service.ts index 3845057b5e..72b51316c7 100644 --- a/aio/content/examples/router/src/app/crisis-center/crisis.service.ts +++ b/aio/content/examples/router/src/app/crisis-center/crisis.service.ts @@ -1,8 +1,7 @@ // #docplaster // #docregion , mock-crises -import 'rxjs/add/observable/of'; -import 'rxjs/add/operator/map'; -import { BehaviorSubject } from 'rxjs/BehaviorSubject'; +import { BehaviorSubject } from 'rxjs'; +import { map } from 'rxjs/operators'; export class Crisis { constructor(public id: number, public name: string) { } @@ -26,8 +25,9 @@ export class CrisisService { getCrises() { return this.crises$; } getCrisis(id: number | string) { - return this.getCrises() - .map(crises => crises.find(crisis => crisis.id === +id)); + return this.getCrises().pipe( + map(crises => crises.find(crisis => crisis.id === +id)) + ); } // #enddocregion diff --git a/aio/content/examples/router/src/app/dialog.service.ts b/aio/content/examples/router/src/app/dialog.service.ts index 2588d340d6..d9f7f1e163 100644 --- a/aio/content/examples/router/src/app/dialog.service.ts +++ b/aio/content/examples/router/src/app/dialog.service.ts @@ -1,7 +1,6 @@ // #docregion -import 'rxjs/add/observable/of'; import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; +import { Observable, of } from 'rxjs'; /** * Async modal dialog service @@ -17,6 +16,6 @@ export class DialogService { confirm(message?: string): Observable { const confirmation = window.confirm(message || 'Is it OK?'); - return Observable.of(confirmation); + return of(confirmation); }; } diff --git a/aio/content/examples/router/src/app/heroes/hero-detail.component.1.ts b/aio/content/examples/router/src/app/heroes/hero-detail.component.1.ts index 1a539a5bcc..511b12d8a7 100644 --- a/aio/content/examples/router/src/app/heroes/hero-detail.component.1.ts +++ b/aio/content/examples/router/src/app/heroes/hero-detail.component.1.ts @@ -1,10 +1,10 @@ // #docplaster // #docregion // #docregion rxjs-operator-import -import 'rxjs/add/operator/switchMap'; +import { switchMap } from 'rxjs/operators'; // #enddocregion rxjs-operator-import import { Component, OnInit } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; // #docregion imports import { Router, ActivatedRoute, ParamMap } from '@angular/router'; // #enddocregion imports @@ -41,9 +41,10 @@ export class HeroDetailComponent implements OnInit { // #docregion ngOnInit ngOnInit() { - this.hero$ = this.route.paramMap - .switchMap((params: ParamMap) => - this.service.getHero(params.get('id'))); + this.hero$ = this.route.paramMap.pipe( + switchMap((params: ParamMap) => + this.service.getHero(params.get('id'))) + ); } // #enddocregion ngOnInit diff --git a/aio/content/examples/router/src/app/heroes/hero-detail.component.2.ts b/aio/content/examples/router/src/app/heroes/hero-detail.component.2.ts index ec5afae365..0affccda9a 100644 --- a/aio/content/examples/router/src/app/heroes/hero-detail.component.2.ts +++ b/aio/content/examples/router/src/app/heroes/hero-detail.component.2.ts @@ -2,7 +2,7 @@ // #docregion import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; import { Hero, HeroService } from './hero.service'; diff --git a/aio/content/examples/router/src/app/heroes/hero-detail.component.ts b/aio/content/examples/router/src/app/heroes/hero-detail.component.ts index d908ddff26..2170686864 100644 --- a/aio/content/examples/router/src/app/heroes/hero-detail.component.ts +++ b/aio/content/examples/router/src/app/heroes/hero-detail.component.ts @@ -1,11 +1,11 @@ // #docplaster // #docregion // #docregion rxjs-operator-import -import 'rxjs/add/operator/switchMap'; +import { switchMap } from 'rxjs/operators'; // #enddocregion rxjs-operator-import import { Component, OnInit, HostBinding } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; import { Router, ActivatedRoute, ParamMap } from '@angular/router'; +import { Observable } from 'rxjs'; import { slideInDownAnimation } from '../animations'; @@ -48,9 +48,10 @@ export class HeroDetailComponent implements OnInit { // #docregion ngOnInit ngOnInit() { - this.hero$ = this.route.paramMap - .switchMap((params: ParamMap) => - this.service.getHero(params.get('id'))); + this.hero$ = this.route.paramMap.pipe( + switchMap((params: ParamMap) => + this.service.getHero(params.get('id'))) + ); } // #enddocregion ngOnInit diff --git a/aio/content/examples/router/src/app/heroes/hero-list.component.1.ts b/aio/content/examples/router/src/app/heroes/hero-list.component.1.ts index 4ba93662e3..8744772f06 100644 --- a/aio/content/examples/router/src/app/heroes/hero-list.component.1.ts +++ b/aio/content/examples/router/src/app/heroes/hero-list.component.1.ts @@ -3,7 +3,7 @@ // TODO SOMEDAY: Feature Componetized like HeroCenter import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; import { Hero, HeroService } from './hero.service'; diff --git a/aio/content/examples/router/src/app/heroes/hero-list.component.ts b/aio/content/examples/router/src/app/heroes/hero-list.component.ts index 6bb3edd87e..803aa73436 100644 --- a/aio/content/examples/router/src/app/heroes/hero-list.component.ts +++ b/aio/content/examples/router/src/app/heroes/hero-list.component.ts @@ -2,8 +2,8 @@ // #docregion // TODO SOMEDAY: Feature Componetized like CrisisCenter // #docregion rxjs-imports -import 'rxjs/add/operator/switchMap'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; +import { switchMap } from 'rxjs/operators'; // #enddocregion rxjs-imports import { Component, OnInit } from '@angular/core'; // #docregion import-router @@ -41,12 +41,13 @@ export class HeroListComponent implements OnInit { ) {} ngOnInit() { - this.heroes$ = this.route.paramMap - .switchMap((params: ParamMap) => { + this.heroes$ = this.route.paramMap.pipe( + switchMap((params: ParamMap) => { // (+) before `params.get()` turns the string into a number this.selectedId = +params.get('id'); return this.service.getHeroes(); - }); + }) + ); } // #enddocregion ctor // #docregion ctor diff --git a/aio/content/examples/router/src/app/heroes/hero.service.ts b/aio/content/examples/router/src/app/heroes/hero.service.ts index 2494476643..51518a4ae0 100644 --- a/aio/content/examples/router/src/app/heroes/hero.service.ts +++ b/aio/content/examples/router/src/app/heroes/hero.service.ts @@ -1,8 +1,7 @@ // #docregion -import 'rxjs/add/observable/of'; -import 'rxjs/add/operator/map'; import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; +import { of } from 'rxjs'; +import { map } from 'rxjs/operators'; export class Hero { constructor(public id: number, public name: string) { } @@ -19,11 +18,12 @@ const HEROES = [ @Injectable() export class HeroService { - getHeroes() { return Observable.of(HEROES); } + getHeroes() { return of(HEROES); } getHero(id: number | string) { - return this.getHeroes() + return this.getHeroes().pipe( // (+) before `id` turns the string into a number - .map(heroes => heroes.find(hero => hero.id === +id)); + map(heroes => heroes.find(hero => hero.id === +id)) + ); } } diff --git a/aio/content/examples/router/src/app/selective-preloading-strategy.ts b/aio/content/examples/router/src/app/selective-preloading-strategy.ts index 395f1056ef..c2192ec12b 100644 --- a/aio/content/examples/router/src/app/selective-preloading-strategy.ts +++ b/aio/content/examples/router/src/app/selective-preloading-strategy.ts @@ -1,8 +1,7 @@ // #docregion -import 'rxjs/add/observable/of'; import { Injectable } from '@angular/core'; import { PreloadingStrategy, Route } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; +import { Observable, of } from 'rxjs'; @Injectable() export class SelectivePreloadingStrategy implements PreloadingStrategy { @@ -18,7 +17,7 @@ export class SelectivePreloadingStrategy implements PreloadingStrategy { return load(); } else { - return Observable.of(null); + return of(null); } } } diff --git a/aio/content/examples/rx-library/src/error-handling.ts b/aio/content/examples/rx-library/src/error-handling.ts index 13af36d2cd..c7b6c2dc9f 100644 --- a/aio/content/examples/rx-library/src/error-handling.ts +++ b/aio/content/examples/rx-library/src/error-handling.ts @@ -1,10 +1,9 @@ -import { Observable } from 'rxjs/Observable'; -import 'rxjs/add/observable/of'; +import { of } from 'rxjs'; // #docregion -import { ajax } from 'rxjs/observable/dom/ajax'; +import { ajax } from 'rxjs/ajax'; import { map, catchError } from 'rxjs/operators'; // Return "response" from the API. If an error happens, // return an empty array. @@ -15,7 +14,7 @@ const apiData = ajax('/api/data').pipe( } return res.response; }), - catchError(err => Observable.of([])) + catchError(err => of([])) ); apiData.subscribe({ diff --git a/aio/content/examples/rx-library/src/naming-convention.ts b/aio/content/examples/rx-library/src/naming-convention.ts index a9510a5b73..1e337b293a 100644 --- a/aio/content/examples/rx-library/src/naming-convention.ts +++ b/aio/content/examples/rx-library/src/naming-convention.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; @Component({ selector: 'app-stopwatch', diff --git a/aio/content/examples/rx-library/src/operators.1.ts b/aio/content/examples/rx-library/src/operators.1.ts index f33b88f2a8..d9ea72920a 100644 --- a/aio/content/examples/rx-library/src/operators.1.ts +++ b/aio/content/examples/rx-library/src/operators.1.ts @@ -1,12 +1,10 @@ -import { Observable } from 'rxjs/Observable'; -import 'rxjs/add/observable/of'; +import { of, pipe } from 'rxjs'; // #docregion -import { pipe } from 'rxjs/util/pipe'; import { filter, map } from 'rxjs/operators'; -const nums = Observable.of(1, 2, 3, 4, 5); +const nums = of(1, 2, 3, 4, 5); // Create a function that accepts an Observable. const squareOddVals = pipe( diff --git a/aio/content/examples/rx-library/src/operators.2.ts b/aio/content/examples/rx-library/src/operators.2.ts index 4e38c8eb6d..4c8ccf37b7 100644 --- a/aio/content/examples/rx-library/src/operators.2.ts +++ b/aio/content/examples/rx-library/src/operators.2.ts @@ -1,12 +1,10 @@ -import { Observable } from 'rxjs/Observable'; -import 'rxjs/add/observable/of'; +import { Observable, of } from 'rxjs'; // #docregion -import { filter } from 'rxjs/operators/filter'; -import { map } from 'rxjs/operators/map'; +import { filter, map } from 'rxjs/operators'; -const squareOdd = Observable.of(1, 2, 3, 4, 5) +const squareOdd = of(1, 2, 3, 4, 5) .pipe( filter(n => n % 2), map(n => n * n) diff --git a/aio/content/examples/rx-library/src/operators.ts b/aio/content/examples/rx-library/src/operators.ts index 530c018e78..461482a4bc 100644 --- a/aio/content/examples/rx-library/src/operators.ts +++ b/aio/content/examples/rx-library/src/operators.ts @@ -1,12 +1,11 @@ -import { Observable } from 'rxjs/Observable'; -import 'rxjs/add/observable/of'; +import { Observable, of } from 'rxjs'; // #docregion import { map } from 'rxjs/operators'; -const nums = Observable.of(1, 2, 3); +const nums = of(1, 2, 3); const squareValues = map((val: number) => val * val); const squaredNums = squareValues(nums); diff --git a/aio/content/examples/rx-library/src/retry-on-error.ts b/aio/content/examples/rx-library/src/retry-on-error.ts index aad18b761c..b1a5389c1b 100644 --- a/aio/content/examples/rx-library/src/retry-on-error.ts +++ b/aio/content/examples/rx-library/src/retry-on-error.ts @@ -1,11 +1,10 @@ -import { Observable } from 'rxjs/Observable'; -import 'rxjs/add/observable/of'; +import { Observable, of } from 'rxjs'; // #docregion -import { ajax } from 'rxjs/observable/dom/ajax'; +import { ajax } from 'rxjs/ajax'; import { map, retry, catchError } from 'rxjs/operators'; const apiData = ajax('/api/data').pipe( @@ -16,7 +15,7 @@ const apiData = ajax('/api/data').pipe( } return res.response; }), - catchError(err => Observable.of([])) + catchError(err => of([])) ); apiData.subscribe({ diff --git a/aio/content/examples/rx-library/src/simple-creation.ts b/aio/content/examples/rx-library/src/simple-creation.ts index 49da15fac5..810e398e85 100644 --- a/aio/content/examples/rx-library/src/simple-creation.ts +++ b/aio/content/examples/rx-library/src/simple-creation.ts @@ -1,7 +1,7 @@ // #docregion promise -import { fromPromise } from 'rxjs/observable/fromPromise'; +import { fromPromise } from 'rxjs'; // Create an Observable out of a promise const data = fromPromise(fetch('/api/endpoint')); @@ -16,7 +16,7 @@ data.subscribe({ // #docregion interval -import { interval } from 'rxjs/observable/interval'; +import { interval } from 'rxjs'; // Create an Observable that will publish a value on an interval const secondsCounter = interval(1000); @@ -29,7 +29,7 @@ secondsCounter.subscribe(n => // #docregion event -import { fromEvent } from 'rxjs/observable/fromEvent'; +import { fromEvent } from 'rxjs'; const el = document.getElementById('my-element'); @@ -53,7 +53,7 @@ const subscription = mouseMoves.subscribe((evt: MouseEvent) => { // #docregion ajax -import { ajax } from 'rxjs/observable/dom/ajax'; +import { ajax } from 'rxjs/ajax'; // Create an Observable that will create an AJAX request const apiData = ajax('/api/data'); diff --git a/aio/content/examples/service-worker-getting-started/src/app/check-for-update.service.ts b/aio/content/examples/service-worker-getting-started/src/app/check-for-update.service.ts index ed717fe384..194b555ace 100755 --- a/aio/content/examples/service-worker-getting-started/src/app/check-for-update.service.ts +++ b/aio/content/examples/service-worker-getting-started/src/app/check-for-update.service.ts @@ -3,7 +3,7 @@ import { SwUpdate } from '@angular/service-worker'; // #docregion sw-check-update -import { interval } from 'rxjs/observable/interval'; +import { interval } from 'rxjs'; @Injectable() export class CheckForUpdateService { diff --git a/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.avoid.ts b/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.avoid.ts index 8287c567a7..3b983f5bda 100644 --- a/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.avoid.ts +++ b/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.avoid.ts @@ -5,6 +5,7 @@ import { ExceptionService, SpinnerService, ToastService } from '../../core'; import { Http } from '@angular/http'; import { Injectable } from '@angular/core'; +import { map } from 'rxjs/operators'; import { Hero } from './hero.model'; // #enddocregion example @@ -19,13 +20,13 @@ export class HeroService { ) { } getHero(id: number) { - return this.http.get(`api/heroes/${id}`) - .map(response => response.json().data as Hero); + return this.http.get(`api/heroes/${id}`).pipe( + map(response => response.json().data as Hero)); } getHeroes() { - return this.http.get(`api/heroes`) - .map(response => response.json().data as Hero[]); + return this.http.get(`api/heroes`).pipe( + map(response => response.json().data as Hero[])); } } diff --git a/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.ts b/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.ts index 523f6c8c78..0a50c11bb4 100644 --- a/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.ts +++ b/aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.ts @@ -2,6 +2,7 @@ // #docregion example import { Injectable } from '@angular/core'; import { Http } from '@angular/http'; +import { map } from 'rxjs/operators'; import { Hero } from './hero.model'; import { ExceptionService, SpinnerService, ToastService } from '../../core'; @@ -19,13 +20,13 @@ export class HeroService { ) { } getHero(id: number) { - return this.http.get(`api/heroes/${id}`) - .map(response => response.json() as Hero); + return this.http.get(`api/heroes/${id}`).pipe( + map(response => response.json() as Hero)); } getHeroes() { - return this.http.get(`api/heroes`) - .map(response => response.json() as Hero[]); + return this.http.get(`api/heroes`).pipe( + map(response => response.json() as Hero[])); } } diff --git a/aio/content/examples/styleguide/src/04-11/app/core/spinner/spinner.component.ts b/aio/content/examples/styleguide/src/04-11/app/core/spinner/spinner.component.ts index de24167a2b..cb8a416102 100644 --- a/aio/content/examples/styleguide/src/04-11/app/core/spinner/spinner.component.ts +++ b/aio/content/examples/styleguide/src/04-11/app/core/spinner/spinner.component.ts @@ -1,6 +1,6 @@ // #docregion import { Component, OnDestroy, OnInit } from '@angular/core'; -import { Subscription } from 'rxjs/Subscription'; +import { Subscription } from 'rxjs'; import { LoggerService } from '../logger.service'; import { SpinnerState, SpinnerService } from './spinner.service'; diff --git a/aio/content/examples/styleguide/src/04-11/app/core/spinner/spinner.service.ts b/aio/content/examples/styleguide/src/04-11/app/core/spinner/spinner.service.ts index 85e366c43e..e092d4bfda 100644 --- a/aio/content/examples/styleguide/src/04-11/app/core/spinner/spinner.service.ts +++ b/aio/content/examples/styleguide/src/04-11/app/core/spinner/spinner.service.ts @@ -1,6 +1,6 @@ // #docregion import { Injectable } from '@angular/core'; -import { Subject } from 'rxjs/Subject'; +import { Subject } from 'rxjs'; export interface SpinnerState { show: boolean; diff --git a/aio/content/examples/styleguide/src/05-04/app/heroes/heroes.component.avoid.ts b/aio/content/examples/styleguide/src/05-04/app/heroes/heroes.component.avoid.ts index 0ceb37032d..8bce611048 100644 --- a/aio/content/examples/styleguide/src/05-04/app/heroes/heroes.component.avoid.ts +++ b/aio/content/examples/styleguide/src/05-04/app/heroes/heroes.component.avoid.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; import { Hero, HeroService } from './shared'; diff --git a/aio/content/examples/styleguide/src/05-04/app/heroes/heroes.component.ts b/aio/content/examples/styleguide/src/05-04/app/heroes/heroes.component.ts index c19bc997ae..b85c5b70ab 100644 --- a/aio/content/examples/styleguide/src/05-04/app/heroes/heroes.component.ts +++ b/aio/content/examples/styleguide/src/05-04/app/heroes/heroes.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; import { Hero, HeroService } from './shared'; diff --git a/aio/content/examples/styleguide/src/05-04/app/heroes/shared/hero.service.ts b/aio/content/examples/styleguide/src/05-04/app/heroes/shared/hero.service.ts index 9d388780a6..a12fdf487e 100644 --- a/aio/content/examples/styleguide/src/05-04/app/heroes/shared/hero.service.ts +++ b/aio/content/examples/styleguide/src/05-04/app/heroes/shared/hero.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; import { Http } from '@angular/http'; -import { Observable } from 'rxjs/Observable'; -import 'rxjs/add/operator/map'; +import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; import { Hero } from './hero.model'; @@ -12,7 +12,8 @@ export class HeroService { constructor(private http: Http) {} getHeroes(): Observable { - return this.http.get('api/heroes') - .map(resp => resp.json().data as Hero[]); + return this.http.get('api/heroes').pipe( + map(resp => resp.json().data as Hero[]) + ); } } diff --git a/aio/content/examples/styleguide/src/05-15/app/heroes/hero-list/hero-list.component.avoid.ts b/aio/content/examples/styleguide/src/05-15/app/heroes/hero-list/hero-list.component.avoid.ts index c323ba2b1c..8f9334b468 100644 --- a/aio/content/examples/styleguide/src/05-15/app/heroes/hero-list/hero-list.component.avoid.ts +++ b/aio/content/examples/styleguide/src/05-15/app/heroes/hero-list/hero-list.component.avoid.ts @@ -4,10 +4,8 @@ import { OnInit } from '@angular/core'; import { Http, Response } from '@angular/http'; -import { Observable } from 'rxjs/Observable'; -import 'rxjs/add/operator/catch'; -import 'rxjs/add/operator/finally'; -import 'rxjs/add/operator/map'; +import { Observable } from 'rxjs'; +import { catchError, finalize, map } from 'rxjs/operators'; import { Hero } from '../shared/hero.model'; @@ -18,11 +16,11 @@ export class HeroListComponent implements OnInit { constructor(private http: Http) {} getHeroes() { this.heroes = []; - this.http.get(heroesUrl) - .map((response: Response) => response.json().data) - .catch(this.catchBadResponse) - .finally(() => this.hideSpinner()) - .subscribe((heroes: Hero[]) => this.heroes = heroes); + this.http.get(heroesUrl).pipe( + map((response: Response) => response.json().data), + catchError(this.catchBadResponse), + finalize(() => this.hideSpinner()) + ).subscribe((heroes: Hero[]) => this.heroes = heroes); } ngOnInit() { this.getHeroes(); diff --git a/aio/content/examples/styleguide/src/05-15/app/heroes/shared/hero.service.ts b/aio/content/examples/styleguide/src/05-15/app/heroes/shared/hero.service.ts index 72d07bbed4..3f8e476766 100644 --- a/aio/content/examples/styleguide/src/05-15/app/heroes/shared/hero.service.ts +++ b/aio/content/examples/styleguide/src/05-15/app/heroes/shared/hero.service.ts @@ -1,8 +1,7 @@ // #docregion import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; -import 'rxjs/add/observable/of'; +import { of } from 'rxjs'; import { Hero } from './hero.model'; @@ -10,6 +9,6 @@ import { Hero } from './hero.model'; export class HeroService { getHeroes() { let heroes: Hero[] = []; - return Observable.of(heroes); + return of(heroes); } } diff --git a/aio/content/examples/styleguide/src/07-01/app/heroes/shared/hero.service.ts b/aio/content/examples/styleguide/src/07-01/app/heroes/shared/hero.service.ts index c9a42755ad..b44a72967e 100644 --- a/aio/content/examples/styleguide/src/07-01/app/heroes/shared/hero.service.ts +++ b/aio/content/examples/styleguide/src/07-01/app/heroes/shared/hero.service.ts @@ -1,6 +1,7 @@ // #docregion import { Injectable } from '@angular/core'; import { Http, Response } from '@angular/http'; +import { map } from 'rxjs/operators'; import { Hero } from './hero.model'; @@ -10,8 +11,8 @@ export class HeroService { constructor(private http: Http) { } getHeroes() { - return this.http.get('api/heroes') - .map((response: Response) => response.json()); + return this.http.get('api/heroes').pipe( + map((response: Response) => response.json())); } } // #enddocregion example diff --git a/aio/content/examples/styleguide/src/07-03/app/heroes/shared/hero.service.ts b/aio/content/examples/styleguide/src/07-03/app/heroes/shared/hero.service.ts index 72d07bbed4..4e2f993250 100644 --- a/aio/content/examples/styleguide/src/07-03/app/heroes/shared/hero.service.ts +++ b/aio/content/examples/styleguide/src/07-03/app/heroes/shared/hero.service.ts @@ -1,8 +1,7 @@ // #docregion import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; -import 'rxjs/add/observable/of'; +import { Observable, of } from 'rxjs'; import { Hero } from './hero.model'; @@ -10,6 +9,6 @@ import { Hero } from './hero.model'; export class HeroService { getHeroes() { let heroes: Hero[] = []; - return Observable.of(heroes); + return of(heroes); } } diff --git a/aio/content/examples/styleguide/src/07-04/app/heroes/shared/hero.service.ts b/aio/content/examples/styleguide/src/07-04/app/heroes/shared/hero.service.ts index 72d07bbed4..3f8e476766 100644 --- a/aio/content/examples/styleguide/src/07-04/app/heroes/shared/hero.service.ts +++ b/aio/content/examples/styleguide/src/07-04/app/heroes/shared/hero.service.ts @@ -1,8 +1,7 @@ // #docregion import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; -import 'rxjs/add/observable/of'; +import { of } from 'rxjs'; import { Hero } from './hero.model'; @@ -10,6 +9,6 @@ import { Hero } from './hero.model'; export class HeroService { getHeroes() { let heroes: Hero[] = []; - return Observable.of(heroes); + return of(heroes); } } diff --git a/aio/content/examples/styleguide/src/main.ts b/aio/content/examples/styleguide/src/main.ts index 54fbb1b43f..049f9792a4 100644 --- a/aio/content/examples/styleguide/src/main.ts +++ b/aio/content/examples/styleguide/src/main.ts @@ -1,6 +1,5 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { AppModule } from './app/app.module'; -import 'rxjs/add/operator/map'; platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/aio/content/examples/testing/src/app/demo/async-helper.spec.ts b/aio/content/examples/testing/src/app/demo/async-helper.spec.ts index 4ca986badb..9bf42ed33f 100644 --- a/aio/content/examples/testing/src/app/demo/async-helper.spec.ts +++ b/aio/content/examples/testing/src/app/demo/async-helper.spec.ts @@ -1,7 +1,7 @@ // tslint:disable-next-line:no-unused-variable import { async, fakeAsync, tick } from '@angular/core/testing'; -import { of } from 'rxjs/observable/of'; +import { of } from 'rxjs'; import { delay } from 'rxjs/operators'; describe('Angular async helper', () => { diff --git a/aio/content/examples/testing/src/app/demo/demo.ts b/aio/content/examples/testing/src/app/demo/demo.ts index 32649feaa6..674bc14a57 100644 --- a/aio/content/examples/testing/src/app/demo/demo.ts +++ b/aio/content/examples/testing/src/app/demo/demo.ts @@ -6,7 +6,7 @@ import { Component, ContentChildren, Directive, EventEmitter, Pipe, PipeTransform, SimpleChange } from '@angular/core'; -import { of } from 'rxjs/observable/of'; +import { of } from 'rxjs'; import { delay } from 'rxjs/operators'; ////////// The App: Services and Components for the tests. ////////////// diff --git a/aio/content/examples/testing/src/app/hero/hero-detail.service.ts b/aio/content/examples/testing/src/app/hero/hero-detail.service.ts index fc875f2df7..022dba86ae 100644 --- a/aio/content/examples/testing/src/app/hero/hero-detail.service.ts +++ b/aio/content/examples/testing/src/app/hero/hero-detail.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { Hero } from '../model/hero'; diff --git a/aio/content/examples/testing/src/app/hero/hero-list.component.ts b/aio/content/examples/testing/src/app/hero/hero-list.component.ts index e28d4b5c48..04403380f2 100644 --- a/aio/content/examples/testing/src/app/hero/hero-list.component.ts +++ b/aio/content/examples/testing/src/app/hero/hero-list.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; import { Hero } from '../model/hero'; import { HeroService } from '../model/hero.service'; diff --git a/aio/content/examples/testing/src/app/model/hero.service.ts b/aio/content/examples/testing/src/app/model/hero.service.ts index ac55cde5fc..e5b5d04ee5 100644 --- a/aio/content/examples/testing/src/app/model/hero.service.ts +++ b/aio/content/examples/testing/src/app/model/hero.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@angular/core'; import { HttpClient, HttpHeaders, HttpErrorResponse } from '@angular/common/http'; -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; +import { Observable } from 'rxjs'; import { catchError, map, tap } from 'rxjs/operators'; import { Hero } from './hero'; diff --git a/aio/content/examples/testing/src/app/model/http-hero.service.spec.ts b/aio/content/examples/testing/src/app/model/http-hero.service.spec.ts index 6973d01c15..54b23e1851 100644 --- a/aio/content/examples/testing/src/app/model/http-hero.service.spec.ts +++ b/aio/content/examples/testing/src/app/model/http-hero.service.spec.ts @@ -14,9 +14,7 @@ import { HttpModule, Http, XHRBackend, Response, ResponseOptions } from '@angular/http'; -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; -import { catchError, tap } from 'rxjs/operators'; +import { of } from 'rxjs'; import { Hero } from './hero'; import { HttpHeroService } from './http-hero.service'; diff --git a/aio/content/examples/testing/src/app/model/http-hero.service.ts b/aio/content/examples/testing/src/app/model/http-hero.service.ts index 11a08f3de3..4c6b79be79 100644 --- a/aio/content/examples/testing/src/app/model/http-hero.service.ts +++ b/aio/content/examples/testing/src/app/model/http-hero.service.ts @@ -6,9 +6,9 @@ import { Http, Response } from '@angular/http'; import { Headers, RequestOptions } from '@angular/http'; import { Hero } from './hero'; -import { Observable } from 'rxjs/Observable'; -import { ErrorObservable } from 'rxjs/observable/ErrorObservable'; -import { catchError, map, tap } from 'rxjs/operators'; +import { Observable } from 'rxjs'; +import { throwError } from 'rxjs'; +import { catchError, map } from 'rxjs/operators'; @Injectable() export class HttpHeroService { @@ -64,6 +64,6 @@ export class HttpHeroService { // In a real world app, we might send the error to remote logging infrastructure let errMsg = error.message || 'Server error'; console.error(errMsg); // log to console instead - return new ErrorObservable(errMsg); + return throwError(errMsg); } } diff --git a/aio/content/examples/testing/src/app/model/testing/test-hero.service.ts b/aio/content/examples/testing/src/app/model/testing/test-hero.service.ts index 14ad8453d6..ecdea31d23 100644 --- a/aio/content/examples/testing/src/app/model/testing/test-hero.service.ts +++ b/aio/content/examples/testing/src/app/model/testing/test-hero.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; import { asyncData } from '../../../testing'; import { map } from 'rxjs/operators'; diff --git a/aio/content/examples/testing/src/app/twain/twain.component.marbles.spec.ts b/aio/content/examples/testing/src/app/twain/twain.component.marbles.spec.ts index 7e2926001d..f508fd2e82 100644 --- a/aio/content/examples/testing/src/app/twain/twain.component.marbles.spec.ts +++ b/aio/content/examples/testing/src/app/twain/twain.component.marbles.spec.ts @@ -5,12 +5,6 @@ import { async, fakeAsync, ComponentFixture, TestBed, tick } from '@angular/core import { cold, getTestScheduler } from 'jasmine-marbles'; // #enddocregion import-marbles -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; - -import { ErrorObservable } from 'rxjs/observable/ErrorObservable'; -import { last } from 'rxjs/operators'; - import { TwainService } from './twain.service'; import { TwainComponent } from './twain.component'; diff --git a/aio/content/examples/testing/src/app/twain/twain.component.spec.ts b/aio/content/examples/testing/src/app/twain/twain.component.spec.ts index ae71da68f5..60159d9ad6 100644 --- a/aio/content/examples/testing/src/app/twain/twain.component.spec.ts +++ b/aio/content/examples/testing/src/app/twain/twain.component.spec.ts @@ -3,10 +3,8 @@ import { async, fakeAsync, ComponentFixture, TestBed, tick } from '@angular/core import { asyncData, asyncError } from '../../testing'; -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; +import { of, throwError } from 'rxjs'; -import { ErrorObservable } from 'rxjs/observable/ErrorObservable'; import { last } from 'rxjs/operators'; import { TwainService } from './twain.service'; @@ -75,7 +73,7 @@ describe('TwainComponent', () => { it('should display error when TwainService fails', fakeAsync(() => { // tell spy to return an error observable getQuoteSpy.and.returnValue( - new ErrorObservable('TwainService test failure')); + throwError('TwainService test failure')); fixture.detectChanges(); // onInit() // sync spy errors immediately after init diff --git a/aio/content/examples/testing/src/app/twain/twain.component.ts b/aio/content/examples/testing/src/app/twain/twain.component.ts index 6e40b6dd54..152e172911 100644 --- a/aio/content/examples/testing/src/app/twain/twain.component.ts +++ b/aio/content/examples/testing/src/app/twain/twain.component.ts @@ -1,8 +1,7 @@ // #docregion import { Component, OnInit } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; +import { Observable, of } from 'rxjs'; import { catchError, startWith } from 'rxjs/operators'; import { TwainService } from './twain.service'; diff --git a/aio/content/examples/testing/src/app/twain/twain.service.ts b/aio/content/examples/testing/src/app/twain/twain.service.ts index da4386f5b1..f211a65a7d 100644 --- a/aio/content/examples/testing/src/app/twain/twain.service.ts +++ b/aio/content/examples/testing/src/app/twain/twain.service.ts @@ -2,9 +2,7 @@ import { Injectable } from '@angular/core'; import { HttpClient, HttpErrorResponse } from '@angular/common/http'; -import { Observable } from 'rxjs/Observable'; -import { ErrorObservable } from 'rxjs/observable/ErrorObservable'; -import { of } from 'rxjs/observable/of'; +import { Observable, of, throwError } from 'rxjs'; import { concat, map, retryWhen, switchMap, take, tap } from 'rxjs/operators'; import { Quote } from './quote'; @@ -35,11 +33,11 @@ export class TwainService { } // Some other HTTP error. console.error(error); - return new ErrorObservable('Cannot get Twain quotes from the server'); + return throwError('Cannot get Twain quotes from the server'); }), take(2), // If a second retry value, then didn't find id:1 and triggers the following error - concat(new ErrorObservable('There are no Twain quotes')) // didn't find id:1 + concat(throwError('There are no Twain quotes')) // didn't find id:1 )) ); } diff --git a/aio/content/examples/testing/src/testing/activated-route-stub.ts b/aio/content/examples/testing/src/testing/activated-route-stub.ts index 04fb7cb92b..7c646f3d19 100644 --- a/aio/content/examples/testing/src/testing/activated-route-stub.ts +++ b/aio/content/examples/testing/src/testing/activated-route-stub.ts @@ -2,8 +2,8 @@ export { ActivatedRoute } from '@angular/router'; // #docregion activated-route-stub -import { ReplaySubject } from 'rxjs/ReplaySubject'; import { convertToParamMap, ParamMap, Params } from '@angular/router'; +import { ReplaySubject } from 'rxjs'; /** * An ActivateRoute test double with a `paramMap` observable. diff --git a/aio/content/examples/testing/src/testing/async-observable-helpers.ts b/aio/content/examples/testing/src/testing/async-observable-helpers.ts index 3282bcbe37..efcbdb19d6 100644 --- a/aio/content/examples/testing/src/testing/async-observable-helpers.ts +++ b/aio/content/examples/testing/src/testing/async-observable-helpers.ts @@ -10,8 +10,7 @@ * * Using `asap` scheduler - as in `of(value, asap)` - doesn't work either. */ -import { Observable } from 'rxjs/Observable'; -import { defer } from 'rxjs/observable/defer'; +import { defer } from 'rxjs'; // #docregion async-data /** Create async observable that emits-once and completes diff --git a/aio/content/examples/toh-pt4/src/app/hero.service.ts b/aio/content/examples/toh-pt4/src/app/hero.service.ts index b7b2d15068..c93a3ff215 100644 --- a/aio/content/examples/toh-pt4/src/app/hero.service.ts +++ b/aio/content/examples/toh-pt4/src/app/hero.service.ts @@ -3,8 +3,7 @@ import { Injectable } from '@angular/core'; // #docregion import-observable -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; +import { Observable, of } from 'rxjs'; // #enddocregion import-observable // #docregion import-heroes diff --git a/aio/content/examples/toh-pt4/src/app/heroes/heroes.component.1.ts b/aio/content/examples/toh-pt4/src/app/heroes/heroes.component.1.ts index 28de0d1f0a..909955f097 100644 --- a/aio/content/examples/toh-pt4/src/app/heroes/heroes.component.1.ts +++ b/aio/content/examples/toh-pt4/src/app/heroes/heroes.component.1.ts @@ -1,6 +1,6 @@ import { Hero } from '../hero'; import { HeroService } from '../hero.service'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; class DummyHeroesComponent { diff --git a/aio/content/examples/toh-pt5/src/app/hero.service.ts b/aio/content/examples/toh-pt5/src/app/hero.service.ts index 71f8571983..8b90d0a2f0 100644 --- a/aio/content/examples/toh-pt5/src/app/hero.service.ts +++ b/aio/content/examples/toh-pt5/src/app/hero.service.ts @@ -1,7 +1,6 @@ import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; +import { Observable, of } from 'rxjs'; import { Hero } from './hero'; import { HEROES } from './mock-heroes'; diff --git a/aio/content/examples/toh-pt6/src/app/hero-search/hero-search.component.ts b/aio/content/examples/toh-pt6/src/app/hero-search/hero-search.component.ts index b218e9e30c..5819e824ec 100644 --- a/aio/content/examples/toh-pt6/src/app/hero-search/hero-search.component.ts +++ b/aio/content/examples/toh-pt6/src/app/hero-search/hero-search.component.ts @@ -3,9 +3,7 @@ import { Component, OnInit } from '@angular/core'; // #docregion rxjs-imports -import { Observable } from 'rxjs/Observable'; -import { Subject } from 'rxjs/Subject'; -import { of } from 'rxjs/observable/of'; +import { Observable, Subject } from 'rxjs'; import { debounceTime, distinctUntilChanged, switchMap diff --git a/aio/content/examples/toh-pt6/src/app/hero.service.ts b/aio/content/examples/toh-pt6/src/app/hero.service.ts index b1d2c222da..b569c7052d 100644 --- a/aio/content/examples/toh-pt6/src/app/hero.service.ts +++ b/aio/content/examples/toh-pt6/src/app/hero.service.ts @@ -5,8 +5,7 @@ import { Injectable } from '@angular/core'; import { HttpClient, HttpHeaders } from '@angular/common/http'; // #enddocregion import-httpclient -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; +import { Observable, of } from 'rxjs'; // #docregion import-rxjs-operators import { catchError, map, tap } from 'rxjs/operators'; // #enddocregion import-rxjs-operators diff --git a/aio/content/examples/universal/src/app/hero-search/hero-search.component.ts b/aio/content/examples/universal/src/app/hero-search/hero-search.component.ts index 5ce425a446..75d0907cf5 100644 --- a/aio/content/examples/universal/src/app/hero-search/hero-search.component.ts +++ b/aio/content/examples/universal/src/app/hero-search/hero-search.component.ts @@ -1,8 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; -import { Subject } from 'rxjs/Subject'; -import { of } from 'rxjs/observable/of'; +import { Observable, Subject } from 'rxjs'; import { debounceTime, distinctUntilChanged, switchMap diff --git a/aio/content/examples/universal/src/app/hero.service.ts b/aio/content/examples/universal/src/app/hero.service.ts index e05e284559..ef490ecff6 100644 --- a/aio/content/examples/universal/src/app/hero.service.ts +++ b/aio/content/examples/universal/src/app/hero.service.ts @@ -2,8 +2,7 @@ import { Injectable, Inject, Optional } from '@angular/core'; import { APP_BASE_HREF } from '@angular/common'; import { HttpClient, HttpHeaders }from '@angular/common/http'; -import { Observable } from 'rxjs/Observable'; -import { of } from 'rxjs/observable/of'; +import { Observable, of } from 'rxjs'; import { catchError, map, tap } from 'rxjs/operators'; import { Hero } from './hero'; diff --git a/aio/content/examples/upgrade-module/src/systemjs.config.1.js b/aio/content/examples/upgrade-module/src/systemjs.config.1.js index a8c57d1792..b5d925be85 100644 --- a/aio/content/examples/upgrade-module/src/systemjs.config.1.js +++ b/aio/content/examples/upgrade-module/src/systemjs.config.1.js @@ -26,18 +26,21 @@ // #enddocregion upgrade-static-umd // other libraries - 'rxjs': 'npm:rxjs', + 'rxjs': 'npm:rxjs', 'angular-in-memory-web-api': 'npm:angular-in-memory-web-api/bundles/in-memory-web-api.umd.js' }, // packages tells the System loader how to load when no filename and/or no extension packages: { - app: { - main: './main.js', - defaultExtension: 'js' - }, - rxjs: { - defaultExtension: 'js' - } + 'app': { main: './main.js', defaultExtension: 'js' }, + 'rxjs/ajax': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs/operators': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs/testing': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs/websocket': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs/ajax': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs/operators': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs/testing': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs/websocket': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs': { main: 'index.js', defaultExtension: 'js' }, } }); })(this); diff --git a/aio/content/examples/upgrade-phonecat-2-hybrid/app/core/phone/phone.service.ts b/aio/content/examples/upgrade-phonecat-2-hybrid/app/core/phone/phone.service.ts index bc06b84a37..22ff7d7ce5 100644 --- a/aio/content/examples/upgrade-phonecat-2-hybrid/app/core/phone/phone.service.ts +++ b/aio/content/examples/upgrade-phonecat-2-hybrid/app/core/phone/phone.service.ts @@ -1,15 +1,14 @@ // #docregion import { Injectable } from '@angular/core'; import { Http, Response } from '@angular/http'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; // #docregion downgrade-injectable declare var angular: angular.IAngularStatic; import { downgradeInjectable } from '@angular/upgrade/static'; // #enddocregion downgrade-injectable -import 'rxjs/add/operator/map'; - // #docregion phonedata-interface export interface PhoneData { name: string; @@ -25,12 +24,14 @@ export class Phone { // #enddocregion classdef, downgrade-injectable constructor(private http: Http) { } query(): Observable { - return this.http.get(`phones/phones.json`) - .map((res: Response) => res.json()); + return this.http.get(`phones/phones.json`).pipe( + map((res: Response) => res.json()) + ); } get(id: string): Observable { - return this.http.get(`phones/${id}.json`) - .map((res: Response) => res.json()); + return this.http.get(`phones/${id}.json`).pipe( + map((res: Response) => res.json()) + ); } // #docregion classdef, downgrade-injectable } diff --git a/aio/content/examples/upgrade-phonecat-2-hybrid/app/phone-detail/phone-detail.component.spec.ts b/aio/content/examples/upgrade-phonecat-2-hybrid/app/phone-detail/phone-detail.component.spec.ts index 32539d6020..260794b98b 100644 --- a/aio/content/examples/upgrade-phonecat-2-hybrid/app/phone-detail/phone-detail.component.spec.ts +++ b/aio/content/examples/upgrade-phonecat-2-hybrid/app/phone-detail/phone-detail.component.spec.ts @@ -3,7 +3,7 @@ import { ActivatedRoute } from '@angular/router'; // #enddocregion activatedroute -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; import { async, TestBed } from '@angular/core/testing'; diff --git a/aio/content/examples/upgrade-phonecat-2-hybrid/app/phone-list/phone-list.component.spec.ts b/aio/content/examples/upgrade-phonecat-2-hybrid/app/phone-list/phone-list.component.spec.ts index b4f56a128e..db77d7c844 100644 --- a/aio/content/examples/upgrade-phonecat-2-hybrid/app/phone-list/phone-list.component.spec.ts +++ b/aio/content/examples/upgrade-phonecat-2-hybrid/app/phone-list/phone-list.component.spec.ts @@ -2,7 +2,7 @@ // #docregion import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { SpyLocation } from '@angular/common/testing'; diff --git a/aio/content/examples/upgrade-phonecat-2-hybrid/systemjs.config.1.js b/aio/content/examples/upgrade-phonecat-2-hybrid/systemjs.config.1.js index 199067dc0a..8cde9dab12 100644 --- a/aio/content/examples/upgrade-phonecat-2-hybrid/systemjs.config.1.js +++ b/aio/content/examples/upgrade-phonecat-2-hybrid/systemjs.config.1.js @@ -28,11 +28,12 @@ // #enddocregion paths // other libraries - 'rxjs': 'npm:rxjs', + 'rxjs': 'npm:rxjs', 'angular-in-memory-web-api': 'npm:angular-in-memory-web-api', // #docregion paths }, // #enddocregion paths + // packages tells the System loader how to load when no filename and/or no extension packages: { 'app': { @@ -44,13 +45,15 @@ } } }, - rxjs: { - defaultExtension: 'js' - }, 'angular-in-memory-web-api': { main: './index.js', defaultExtension: 'js' - } + }, + 'rxjs/ajax': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs/operators': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs/testing': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs/websocket': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs': { main: 'index.js', defaultExtension: 'js' }, } }); })(this); diff --git a/aio/content/examples/upgrade-phonecat-3-final/app/core/phone/phone.service.ts b/aio/content/examples/upgrade-phonecat-3-final/app/core/phone/phone.service.ts index 99d8c38a87..df2cac0d9d 100644 --- a/aio/content/examples/upgrade-phonecat-3-final/app/core/phone/phone.service.ts +++ b/aio/content/examples/upgrade-phonecat-3-final/app/core/phone/phone.service.ts @@ -1,9 +1,8 @@ // #docregion import { Injectable } from '@angular/core'; import { Http, Response } from '@angular/http'; -import { Observable } from 'rxjs/Observable'; - -import 'rxjs/add/operator/map'; +import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; export interface PhoneData { name: string; @@ -15,11 +14,13 @@ export interface PhoneData { export class Phone { constructor(private http: Http) { } query(): Observable { - return this.http.get(`phones/phones.json`) - .map((res: Response) => res.json()); + return this.http.get(`phones/phones.json`).pipe( + map((res: Response) => res.json()) + ); } get(id: string): Observable { - return this.http.get(`phones/${id}.json`) - .map((res: Response) => res.json()); + return this.http.get(`phones/${id}.json`).pipe( + map((res: Response) => res.json()) + ); } } diff --git a/aio/content/examples/upgrade-phonecat-3-final/app/phone-detail/phone-detail.component.spec.ts b/aio/content/examples/upgrade-phonecat-3-final/app/phone-detail/phone-detail.component.spec.ts index 32539d6020..260794b98b 100644 --- a/aio/content/examples/upgrade-phonecat-3-final/app/phone-detail/phone-detail.component.spec.ts +++ b/aio/content/examples/upgrade-phonecat-3-final/app/phone-detail/phone-detail.component.spec.ts @@ -3,7 +3,7 @@ import { ActivatedRoute } from '@angular/router'; // #enddocregion activatedroute -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; import { async, TestBed } from '@angular/core/testing'; diff --git a/aio/content/examples/upgrade-phonecat-3-final/app/phone-list/phone-list.component.spec.ts b/aio/content/examples/upgrade-phonecat-3-final/app/phone-list/phone-list.component.spec.ts index a953228318..244c898461 100644 --- a/aio/content/examples/upgrade-phonecat-3-final/app/phone-list/phone-list.component.spec.ts +++ b/aio/content/examples/upgrade-phonecat-3-final/app/phone-list/phone-list.component.spec.ts @@ -2,7 +2,7 @@ // #docregion routestuff import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; +import { Observable } from 'rxjs'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { SpyLocation } from '@angular/common/testing'; diff --git a/aio/content/examples/upgrade-phonecat-3-final/systemjs.config.1.js b/aio/content/examples/upgrade-phonecat-3-final/systemjs.config.1.js index c48bb7ca39..a6e82c8737 100644 --- a/aio/content/examples/upgrade-phonecat-3-final/systemjs.config.1.js +++ b/aio/content/examples/upgrade-phonecat-3-final/systemjs.config.1.js @@ -27,7 +27,7 @@ '@angular/upgrade/static': 'npm:@angular/upgrade/bundles/upgrade-static.umd.js', // other libraries - 'rxjs': 'npm:rxjs', + 'rxjs': 'npm:rxjs', 'angular-in-memory-web-api': 'npm:angular-in-memory-web-api', // #docregion paths }, @@ -43,13 +43,15 @@ } } }, - rxjs: { - defaultExtension: 'js' - }, 'angular-in-memory-web-api': { main: './index.js', defaultExtension: 'js' - } + }, + 'rxjs/ajax': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs/operators': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs/testing': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs/websocket': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs': { main: 'index.js', defaultExtension: 'js' }, } }); })(this); diff --git a/aio/content/examples/webpack/src/vendor.ts b/aio/content/examples/webpack/src/vendor.ts index 8ffd09240a..8193b33e4f 100644 --- a/aio/content/examples/webpack/src/vendor.ts +++ b/aio/content/examples/webpack/src/vendor.ts @@ -1,3 +1,6 @@ +// TODO(i): this no longer works. we need to review this example and if absolutely necessary rewrite it to use the +// rxjs-compat package + // #docregion // Angular import '@angular/platform-browser'; diff --git a/aio/tools/examples/shared/boilerplate/cli/tsconfig.json b/aio/tools/examples/shared/boilerplate/cli/tsconfig.json index a6c016bf38..403c230e19 100644 --- a/aio/tools/examples/shared/boilerplate/cli/tsconfig.json +++ b/aio/tools/examples/shared/boilerplate/cli/tsconfig.json @@ -8,6 +8,7 @@ "emitDecoratorMetadata": true, "experimentalDecorators": true, "target": "es5", + "skipLibCheck": true, "typeRoots": [ "node_modules/@types" ], diff --git a/aio/tools/examples/shared/boilerplate/systemjs/src/systemjs.config.js b/aio/tools/examples/shared/boilerplate/systemjs/src/systemjs.config.js index 30d4e549ee..43ccdcdfa9 100644 --- a/aio/tools/examples/shared/boilerplate/systemjs/src/systemjs.config.js +++ b/aio/tools/examples/shared/boilerplate/systemjs/src/systemjs.config.js @@ -46,9 +46,11 @@ } } }, - rxjs: { - defaultExtension: 'js' - } + 'rxjs/ajax': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs/operators': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs/testing': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs/websocket': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs': { main: 'index.js', defaultExtension: 'js' }, } }); })(this); diff --git a/aio/tools/examples/shared/boilerplate/systemjs/src/systemjs.config.web.build.js b/aio/tools/examples/shared/boilerplate/systemjs/src/systemjs.config.web.build.js index 2c514b8c38..e1fbdf49b3 100644 --- a/aio/tools/examples/shared/boilerplate/systemjs/src/systemjs.config.web.build.js +++ b/aio/tools/examples/shared/boilerplate/systemjs/src/systemjs.config.web.build.js @@ -85,9 +85,11 @@ } } }, - rxjs: { - defaultExtension: 'js' - } + 'rxjs/ajax': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs/operators': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs/testing': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs/websocket': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs': { main: 'index.js', defaultExtension: 'js' }, } }); diff --git a/aio/tools/examples/shared/boilerplate/systemjs/src/systemjs.config.web.js b/aio/tools/examples/shared/boilerplate/systemjs/src/systemjs.config.web.js index d312a14a21..f8169ffa1a 100644 --- a/aio/tools/examples/shared/boilerplate/systemjs/src/systemjs.config.web.js +++ b/aio/tools/examples/shared/boilerplate/systemjs/src/systemjs.config.web.js @@ -71,9 +71,11 @@ } } }, - rxjs: { - defaultExtension: 'js' - } + 'rxjs/ajax': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs/operators': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs/testing': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs/websocket': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs': { main: 'index.js', defaultExtension: 'js' }, } }); diff --git a/integration/bazel/yarn.lock b/integration/bazel/yarn.lock index f820ad15aa..4f1084e706 100644 --- a/integration/bazel/yarn.lock +++ b/integration/bazel/yarn.lock @@ -3,27 +3,26 @@ "@angular/animations@file:../../dist/packages-dist/animations": - version "6.0.0-beta.4-7f6fcc1cc" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/bazel@file:../../dist/packages-dist/bazel": - version "6.0.0-beta.4-7f6fcc1cc" + version "6.0.0-beta.7-8203e0365a" dependencies: + "@bazel/typescript" "^0.11.1" "@types/node" "6.0.84" "@types/shelljs" "0.7.7" protobufjs "5.0.0" - rollup "0.47.4" shelljs "0.7.8" - uglify-js "2.8.29" "@angular/common@file:../../dist/packages-dist/common": - version "6.0.0-beta.4-7f6fcc1cc" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli": - version "6.0.0-beta.4-7f6fcc1cc" + version "6.0.0-beta.7-8203e0365a" dependencies: chokidar "^1.4.2" minimist "^1.2.0" @@ -31,19 +30,23 @@ tsickle "^0.27.2" "@angular/compiler@file:../../dist/packages-dist/compiler": - version "6.0.0-beta.4-7f6fcc1cc" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/core@file:../../dist/packages-dist/core": - version "6.0.0-beta.4-7f6fcc1cc" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/platform-browser@file:../../dist/packages-dist/platform-browser": - version "6.0.0-beta.4-7f6fcc1cc" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" + +"@bazel/typescript@^0.11.1": + version "0.11.1" + resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.11.1.tgz#54409d6ed1f43e71fce047fb4e229f9cc8a5ff68" "@types/events@*": version "1.1.0" @@ -91,14 +94,6 @@ ajv@^4.9.1: co "^4.6.0" json-stable-stringify "^1.0.1" -align-text@^0.1.1, align-text@^0.1.3: - version "0.1.4" - resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117" - dependencies: - kind-of "^3.0.2" - longest "^1.0.1" - repeat-string "^1.5.2" - ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" @@ -217,10 +212,6 @@ bytebuffer@~5: dependencies: long "~3" -camelcase@^1.0.2: - version "1.2.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39" - camelcase@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" @@ -229,13 +220,6 @@ caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" -center-align@^0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad" - dependencies: - align-text "^0.1.3" - lazy-cache "^1.0.3" - chokidar@^1.4.2: version "1.7.0" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" @@ -251,14 +235,6 @@ chokidar@^1.4.2: optionalDependencies: fsevents "^1.0.0" -cliui@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1" - dependencies: - center-align "^0.1.1" - right-align "^0.1.1" - wordwrap "0.0.2" - cliui@^3.0.3: version "3.2.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" @@ -315,7 +291,7 @@ debug@^2.2.0: dependencies: ms "2.0.0" -decamelize@^1.0.0, decamelize@^1.1.1: +decamelize@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -672,10 +648,6 @@ kind-of@^4.0.0: dependencies: is-buffer "^1.1.5" -lazy-cache@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" - lcid@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" @@ -686,10 +658,6 @@ long@~3: version "3.2.0" resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b" -longest@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" - micromatch@^2.1.5: version "2.3.11" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" @@ -978,26 +946,16 @@ resolve@^1.1.6: dependencies: path-parse "^1.0.5" -right-align@^0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef" - dependencies: - align-text "^0.1.1" - rimraf@2, rimraf@^2.5.1, rimraf@^2.6.1: version "2.6.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" dependencies: glob "^7.0.5" -rollup@0.47.4: - version "0.47.4" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.47.4.tgz#e3a55de83a78221d232ce29619a8d68189ae845e" - "rxjs@file:../../node_modules/rxjs": - version "5.5.5" + version "6.0.0-alpha.4" dependencies: - symbol-observable "1.0.1" + tslib "^1.9.0" safe-buffer@^5.0.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.1" @@ -1043,10 +1001,6 @@ source-map@^0.6.0: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" -source-map@~0.5.1: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - sshpk@^1.7.0: version "1.13.1" resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3" @@ -1089,10 +1043,6 @@ strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" -symbol-observable@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4" - tar-pack@^3.4.0: version "3.4.1" resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f" @@ -1129,9 +1079,9 @@ tsickle@^0.27.2: source-map "^0.6.0" source-map-support "^0.5.0" -tslib@^1.7.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.8.1.tgz#6946af2d1d651a7b1863b531d6e5afa41aa44eac" +tslib@^1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8" tunnel-agent@^0.6.0: version "0.6.0" @@ -1144,20 +1094,7 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0: resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" "typescript@file:../../node_modules/typescript": - version "2.6.2" - -uglify-js@2.8.29: - version "2.8.29" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd" - dependencies: - source-map "~0.5.1" - yargs "~3.10.0" - optionalDependencies: - uglify-to-browserify "~1.0.0" - -uglify-to-browserify@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" + version "2.7.2" uid-number@^0.0.6: version "0.0.6" @@ -1185,18 +1122,10 @@ wide-align@^1.1.0: dependencies: string-width "^1.0.2" -window-size@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d" - window-size@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876" -wordwrap@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" - wrap-ansi@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" @@ -1224,14 +1153,5 @@ yargs@^3.10.0: window-size "^0.1.4" y18n "^3.2.0" -yargs@~3.10.0: - version "3.10.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1" - dependencies: - camelcase "^1.0.2" - cliui "^2.1.0" - decamelize "^1.0.0" - window-size "0.1.0" - "zone.js@file:../../node_modules/zone.js": - version "0.8.17" + version "0.8.20" diff --git a/integration/cli-hello-world/package.json b/integration/cli-hello-world/package.json index df910112c6..4d89fed09c 100644 --- a/integration/cli-hello-world/package.json +++ b/integration/cli-hello-world/package.json @@ -23,9 +23,9 @@ "@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", - "core-js": "^2.4.1", - "rxjs": "^5.5.6", - "zone.js": "^0.8.19" + "core-js": "file:../../node_modules/core-js", + "rxjs": "file:../../node_modules/rxjs", + "zone.js": "file:../../node_modules/zone.js" }, "devDependencies": { "@angular/cli": "1.6.6", diff --git a/integration/cli-hello-world/yarn.lock b/integration/cli-hello-world/yarn.lock index beee8bca08..68014b08c7 100644 --- a/integration/cli-hello-world/yarn.lock +++ b/integration/cli-hello-world/yarn.lock @@ -28,7 +28,7 @@ rxjs "^5.5.6" "@angular/animations@file:../../dist/packages-dist/animations": - version "6.0.0-beta.7-2027ec8895" + version "6.0.0-beta.7-54970933bb" dependencies: tslib "^1.9.0" @@ -97,12 +97,12 @@ node-sass "^4.7.2" "@angular/common@file:../../dist/packages-dist/common": - version "6.0.0-beta.7-2027ec8895" + version "6.0.0-beta.7-54970933bb" dependencies: tslib "^1.9.0" "@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli": - version "6.0.0-beta.7-2027ec8895" + version "6.0.0-beta.7-54970933bb" dependencies: chokidar "^1.4.2" minimist "^1.2.0" @@ -110,40 +110,40 @@ tsickle "^0.27.2" "@angular/compiler@file:../../dist/packages-dist/compiler": - version "6.0.0-beta.7-2027ec8895" + version "6.0.0-beta.7-54970933bb" dependencies: tslib "^1.9.0" "@angular/core@file:../../dist/packages-dist/core": - version "6.0.0-beta.7-2027ec8895" + version "6.0.0-beta.7-54970933bb" dependencies: tslib "^1.9.0" "@angular/forms@file:../../dist/packages-dist/forms": - version "6.0.0-beta.7-2027ec8895" + version "6.0.0-beta.7-54970933bb" dependencies: tslib "^1.9.0" "@angular/http@file:../../dist/packages-dist/http": - version "6.0.0-beta.7-2027ec8895" + version "6.0.0-beta.7-54970933bb" dependencies: tslib "^1.9.0" "@angular/language-service@file:../../dist/packages-dist/language-service": - version "6.0.0-beta.7-2027ec8895" + version "6.0.0-beta.7-54970933bb" "@angular/platform-browser-dynamic@file:../../dist/packages-dist/platform-browser-dynamic": - version "6.0.0-beta.7-2027ec8895" + version "6.0.0-beta.7-54970933bb" dependencies: tslib "^1.9.0" "@angular/platform-browser@file:../../dist/packages-dist/platform-browser": - version "6.0.0-beta.7-2027ec8895" + version "6.0.0-beta.7-54970933bb" dependencies: tslib "^1.9.0" "@angular/router@file:../../dist/packages-dist/router": - version "6.0.0-beta.7-2027ec8895" + version "6.0.0-beta.7-54970933bb" dependencies: tslib "^1.9.0" @@ -1496,10 +1496,13 @@ copy-webpack-plugin@^4.1.1: pify "^3.0.0" serialize-javascript "^1.4.0" -core-js@^2.2.0, core-js@^2.4.0, core-js@^2.4.1: +core-js@^2.2.0, core-js@^2.4.0: version "2.5.3" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e" +"core-js@file:../../node_modules/core-js": + version "2.5.1" + core-object@^3.1.0: version "3.1.5" resolved "https://registry.yarnpkg.com/core-object/-/core-object-3.1.5.tgz#fa627b87502adc98045e44678e9a8ec3b9c0d2a9" @@ -5946,6 +5949,11 @@ rxjs@^5.5.6: dependencies: symbol-observable "1.0.1" +"rxjs@file:../../node_modules/rxjs": + version "6.0.0-alpha.3" + dependencies: + tslib "^1.9.0" + safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" @@ -7540,6 +7548,5 @@ yn@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a" -zone.js@^0.8.19: +"zone.js@file:../../node_modules/zone.js": version "0.8.20" - resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.20.tgz#a218c48db09464b19ff6fc8f0d4bb5b1046e185d" diff --git a/integration/dynamic-compiler/rollup.config.js b/integration/dynamic-compiler/rollup.config.js index 99a80d844a..0df72458fd 100644 --- a/integration/dynamic-compiler/rollup.config.js +++ b/integration/dynamic-compiler/rollup.config.js @@ -1,5 +1,4 @@ import nodeResolve from 'rollup-plugin-node-resolve'; -import commonjs from 'rollup-plugin-commonjs'; export default { entry: 'dist/src/main.js', @@ -7,11 +6,6 @@ export default { treeshake: true, moduleName: 'main', plugins: [ - commonjs({ - include: 'node_modules/**' - }), - nodeResolve({ - jsnext: true, main: true, module: true - }) + nodeResolve() ] }; diff --git a/integration/dynamic-compiler/rollup.lazy.config.js b/integration/dynamic-compiler/rollup.lazy.config.js index d44ea0dd83..85b82b9214 100644 --- a/integration/dynamic-compiler/rollup.lazy.config.js +++ b/integration/dynamic-compiler/rollup.lazy.config.js @@ -9,11 +9,6 @@ export default { treeshake: true, moduleName: 'lazy', plugins: [ - commonjs({ - include: 'node_modules/**' - }), - nodeResolve({ - jsnext: true, main: true, module: true - }) + nodeResolve() ] }; diff --git a/integration/dynamic-compiler/yarn.lock b/integration/dynamic-compiler/yarn.lock index 6383783109..2363e21a0e 100644 --- a/integration/dynamic-compiler/yarn.lock +++ b/integration/dynamic-compiler/yarn.lock @@ -3,48 +3,48 @@ "@angular/animations@file:../../dist/packages-dist/animations": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-54970933bb" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/common@file:../../dist/packages-dist/common": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-54970933bb" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-54970933bb" dependencies: chokidar "^1.4.2" minimist "^1.2.0" reflect-metadata "^0.1.2" - tsickle "^0.26.0" + tsickle "^0.27.2" "@angular/compiler@file:../../dist/packages-dist/compiler": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-54970933bb" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/core@file:../../dist/packages-dist/core": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-54970933bb" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/platform-browser-dynamic@file:../../dist/packages-dist/platform-browser-dynamic": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-54970933bb" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/platform-browser@file:../../dist/packages-dist/platform-browser": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-54970933bb" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/platform-server@file:../../dist/packages-dist/platform-server": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-54970933bb" dependencies: - domino "^1.0.29" - tslib "^1.7.1" + domino "^2.0.1" + tslib "^1.9.0" xhr2 "^0.1.4" "@types/jasmine@file:../../node_modules/@types/jasmine": @@ -609,9 +609,9 @@ dev-ip@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/dev-ip/-/dev-ip-1.0.1.tgz#a76a3ed1855be7a012bb8ac16cb80f3c00dc28f0" -domino@^1.0.29: - version "1.0.30" - resolved "https://registry.yarnpkg.com/domino/-/domino-1.0.30.tgz#54a4154ecae968616680f8feba3cedff355c71f4" +domino@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/domino/-/domino-2.0.1.tgz#9e1d63215d0fe8dcb8202bff07effa1a216db504" easy-extender@2.3.2: version "2.3.2" @@ -1881,9 +1881,7 @@ rx@4.1.0: resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782" "rxjs@file:../../node_modules/rxjs": - version "5.5.5" - dependencies: - symbol-observable "1.0.1" + version "6.0.0-alpha.3" safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.1" @@ -2046,7 +2044,13 @@ socket.io@2.0.4: socket.io-client "2.0.4" socket.io-parser "~3.1.1" -source-map-support@^0.4.2, source-map-support@~0.4.0: +source-map-support@^0.5.0: + version "0.5.3" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.3.tgz#2b3d5fff298cfa4d1afd7d4352d569e9a0158e76" + dependencies: + source-map "^0.6.0" + +source-map-support@~0.4.0: version "0.4.18" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" dependencies: @@ -2056,6 +2060,10 @@ source-map@^0.5.6: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" +source-map@^0.6.0: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + spawn-command@^0.0.2-1: version "0.0.2" resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2.tgz#9544e1a43ca045f8531aac1a48cb29bdae62338e" @@ -2157,10 +2165,6 @@ supports-color@^3.2.3: dependencies: has-flag "^1.0.0" -symbol-observable@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4" - "systemjs@file:../../node_modules/systemjs": version "0.18.10" dependencies: @@ -2219,18 +2223,18 @@ tree-kill@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36" -tsickle@^0.26.0: - version "0.26.0" - resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.26.0.tgz#40b30a2dd6abcb33b182e37596674bd1cfe4039c" +tsickle@^0.27.2: + version "0.27.2" + resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.27.2.tgz#f33d46d046f73dd5c155a37922e422816e878736" dependencies: minimist "^1.2.0" mkdirp "^0.5.1" - source-map "^0.5.6" - source-map-support "^0.4.2" + source-map "^0.6.0" + source-map-support "^0.5.0" -tslib@^1.7.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.8.1.tgz#6946af2d1d651a7b1863b531d6e5afa41aa44eac" +tslib@^1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8" tunnel-agent@^0.6.0: version "0.6.0" @@ -2450,4 +2454,4 @@ yeast@0.1.2: resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" "zone.js@file:../../node_modules/zone.js": - version "0.8.17" + version "0.8.20" diff --git a/integration/hello_world__closure/yarn.lock b/integration/hello_world__closure/yarn.lock index f4ea17e9c8..8780b56d3a 100644 --- a/integration/hello_world__closure/yarn.lock +++ b/integration/hello_world__closure/yarn.lock @@ -3,43 +3,43 @@ "@angular/animations@file:../../dist/packages-dist/animations": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/common@file:../../dist/packages-dist/common": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: chokidar "^1.4.2" minimist "^1.2.0" reflect-metadata "^0.1.2" - tsickle "^0.26.0" + tsickle "^0.27.2" "@angular/compiler@file:../../dist/packages-dist/compiler": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/core@file:../../dist/packages-dist/core": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/platform-browser@file:../../dist/packages-dist/platform-browser": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/platform-server@file:../../dist/packages-dist/platform-server": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - domino "^1.0.29" - tslib "^1.7.1" + domino "^2.0.1" + tslib "^1.9.0" xhr2 "^0.1.4" "@types/jasmine@2.5.41": @@ -612,9 +612,9 @@ dev-ip@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/dev-ip/-/dev-ip-1.0.1.tgz#a76a3ed1855be7a012bb8ac16cb80f3c00dc28f0" -domino@^1.0.29: - version "1.0.30" - resolved "https://registry.yarnpkg.com/domino/-/domino-1.0.30.tgz#54a4154ecae968616680f8feba3cedff355c71f4" +domino@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/domino/-/domino-2.0.1.tgz#9e1d63215d0fe8dcb8202bff07effa1a216db504" easy-extender@2.3.2: version "2.3.2" @@ -1835,9 +1835,9 @@ rx@4.1.0: resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782" "rxjs@file:../../node_modules/rxjs": - version "5.5.5" + version "6.0.0-alpha.4" dependencies: - symbol-observable "1.0.1" + tslib "^1.9.0" safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.1" @@ -2000,7 +2000,13 @@ socket.io@2.0.4: socket.io-client "2.0.4" socket.io-parser "~3.1.1" -source-map-support@^0.4.2, source-map-support@~0.4.0: +source-map-support@^0.5.0: + version "0.5.3" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.3.tgz#2b3d5fff298cfa4d1afd7d4352d569e9a0158e76" + dependencies: + source-map "^0.6.0" + +source-map-support@~0.4.0: version "0.4.18" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" dependencies: @@ -2010,6 +2016,10 @@ source-map@^0.5.1, source-map@^0.5.6: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" +source-map@^0.6.0: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + spawn-command@^0.0.2-1: version "0.0.2" resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2.tgz#9544e1a43ca045f8531aac1a48cb29bdae62338e" @@ -2111,10 +2121,6 @@ supports-color@^3.2.3: dependencies: has-flag "^1.0.0" -symbol-observable@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4" - tar-pack@^3.4.0: version "3.4.1" resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f" @@ -2174,18 +2180,18 @@ tree-kill@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36" -tsickle@^0.26.0: - version "0.26.0" - resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.26.0.tgz#40b30a2dd6abcb33b182e37596674bd1cfe4039c" +tsickle@^0.27.2: + version "0.27.2" + resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.27.2.tgz#f33d46d046f73dd5c155a37922e422816e878736" dependencies: minimist "^1.2.0" mkdirp "^0.5.1" - source-map "^0.5.6" - source-map-support "^0.4.2" + source-map "^0.6.0" + source-map-support "^0.5.0" -tslib@^1.7.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.8.1.tgz#6946af2d1d651a7b1863b531d6e5afa41aa44eac" +tslib@^1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8" tunnel-agent@^0.6.0: version "0.6.0" @@ -2198,7 +2204,7 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0: resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" "typescript@file:../../node_modules/typescript": - version "2.6.2" + version "2.7.2" ua-parser-js@0.7.12: version "0.7.12" @@ -2418,4 +2424,4 @@ yeast@0.1.2: resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" "zone.js@file:../../node_modules/zone.js": - version "0.8.17" + version "0.8.20" diff --git a/integration/hello_world__render3__cli/package.json b/integration/hello_world__render3__cli/package.json index 8cc62a9150..0bad584713 100644 --- a/integration/hello_world__render3__cli/package.json +++ b/integration/hello_world__render3__cli/package.json @@ -21,13 +21,13 @@ "@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", - "core-js": "2.4.1", - "rxjs": "5.5.6", - "zone.js": "0.8.19" + "core-js": "file:../../node_modules/core-js", + "rxjs": "file:../../node_modules/rxjs", + "zone.js": "file:../../node_modules/zone.js" }, "devDependencies": { "@angular/cli": "1.7.0-beta.2", "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli", - "typescript": "2.6.2" + "typescript": "file:../../node_modules/typescript" } } diff --git a/integration/hello_world__render3__cli/yarn.lock b/integration/hello_world__render3__cli/yarn.lock new file mode 100644 index 0000000000..0c1b66eb99 --- /dev/null +++ b/integration/hello_world__render3__cli/yarn.lock @@ -0,0 +1,5984 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@angular-devkit/build-optimizer@~0.0.42": + version "0.0.42" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.0.42.tgz#402b0dda4883db91e2381c3ddc55888408a7894e" + dependencies: + loader-utils "^1.1.0" + source-map "^0.5.6" + typescript "~2.6.2" + webpack-sources "^1.0.1" + +"@angular-devkit/core@~0.0.29": + version "0.0.29" + resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-0.0.29.tgz#6fb319b45a62eff172318cbe256fdb24ef20af2b" + dependencies: + ajv "~5.5.1" + chokidar "^1.7.0" + rxjs "^5.5.6" + source-map "^0.5.6" + +"@angular-devkit/schematics@~0.0.52": + version "0.0.52" + resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.0.52.tgz#cbd2f42778b50d6422a254ffaec05ad4ef3cb6c0" + dependencies: + "@ngtools/json-schema" "^1.1.0" + rxjs "^5.5.6" + +"@angular/animations@file:../../dist/packages-dist/animations": + version "6.0.0-beta.7-8203e0365a" + dependencies: + tslib "^1.9.0" + +"@angular/cli@1.7.0-beta.2": + version "1.7.0-beta.2" + resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-1.7.0-beta.2.tgz#c7fc3f209f8983de8ede476a8776882e52a50b1b" + dependencies: + "@angular-devkit/build-optimizer" "~0.0.42" + "@angular-devkit/core" "~0.0.29" + "@angular-devkit/schematics" "~0.0.52" + "@ngtools/json-schema" "1.1.0" + "@ngtools/webpack" "1.10.0-beta.2" + "@schematics/angular" "~0.1.17" + "@schematics/package-update" "0.0.7" + autoprefixer "^7.2.3" + cache-loader "^1.2.0" + chalk "~2.2.0" + circular-dependency-plugin "^4.2.1" + clean-css "^4.1.9" + common-tags "^1.3.1" + copy-webpack-plugin "^4.1.1" + core-object "^3.1.0" + css-loader "^0.28.1" + denodeify "^1.2.1" + ember-cli-string-utils "^1.0.0" + exports-loader "^0.6.3" + extract-text-webpack-plugin "^3.0.2" + file-loader "^1.1.5" + fs-extra "^4.0.0" + glob "^7.0.3" + html-webpack-plugin "^2.29.0" + istanbul-instrumenter-loader "^3.0.0" + karma-source-map-support "^1.2.0" + less "^2.7.2" + less-loader "^4.0.5" + license-webpack-plugin "^1.0.0" + loader-utils "1.1.0" + lodash "^4.11.1" + memory-fs "^0.4.1" + minimatch "^3.0.4" + node-modules-path "^1.0.0" + nopt "^4.0.1" + opn "~5.1.0" + portfinder "~1.0.12" + postcss-import "^11.0.0" + postcss-loader "^2.0.10" + postcss-url "^7.1.2" + raw-loader "^0.5.1" + resolve "^1.1.7" + rxjs "^5.5.6" + sass-loader "^6.0.6" + semver "^5.1.0" + silent-error "^1.0.0" + source-map-loader "^0.2.0" + source-map-support "^0.4.1" + style-loader "^0.19.1" + stylus "^0.54.5" + stylus-loader "^3.0.1" + uglifyjs-webpack-plugin "^1.1.5" + url-loader "^0.6.2" + webpack "~3.10.0" + webpack-dev-middleware "~1.12.0" + webpack-dev-server "~2.11.0" + webpack-merge "^4.1.0" + webpack-sources "^1.0.0" + webpack-subresource-integrity "^1.0.1" + optionalDependencies: + node-sass "^4.7.2" + +"@angular/common@file:../../dist/packages-dist/common": + version "6.0.0-beta.7-8203e0365a" + dependencies: + tslib "^1.9.0" + +"@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli": + version "6.0.0-beta.7-8203e0365a" + dependencies: + chokidar "^1.4.2" + minimist "^1.2.0" + reflect-metadata "^0.1.2" + tsickle "^0.27.2" + +"@angular/compiler@file:../../dist/packages-dist/compiler": + version "6.0.0-beta.7-8203e0365a" + dependencies: + tslib "^1.9.0" + +"@angular/core@file:../../dist/packages-dist/core": + version "6.0.0-beta.7-8203e0365a" + dependencies: + tslib "^1.9.0" + +"@angular/forms@file:../../dist/packages-dist/forms": + version "6.0.0-beta.7-8203e0365a" + dependencies: + tslib "^1.9.0" + +"@angular/http@file:../../dist/packages-dist/http": + version "6.0.0-beta.7-8203e0365a" + dependencies: + tslib "^1.9.0" + +"@angular/platform-browser-dynamic@file:../../dist/packages-dist/platform-browser-dynamic": + version "6.0.0-beta.7-8203e0365a" + dependencies: + tslib "^1.9.0" + +"@angular/platform-browser@file:../../dist/packages-dist/platform-browser": + version "6.0.0-beta.7-8203e0365a" + dependencies: + tslib "^1.9.0" + +"@angular/router@file:../../dist/packages-dist/router": + version "6.0.0-beta.7-8203e0365a" + dependencies: + tslib "^1.9.0" + +"@ngtools/json-schema@1.1.0", "@ngtools/json-schema@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@ngtools/json-schema/-/json-schema-1.1.0.tgz#c3a0c544d62392acc2813a42c8a0dc6f58f86922" + +"@ngtools/webpack@1.10.0-beta.2": + version "1.10.0-beta.2" + resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-1.10.0-beta.2.tgz#4f02ddc7fff1bc687ca34dc785e9c2e0224164fe" + dependencies: + chalk "~2.2.0" + enhanced-resolve "^3.1.0" + loader-utils "^1.0.2" + magic-string "^0.22.3" + semver "^5.3.0" + source-map "^0.5.6" + tree-kill "^1.0.0" + webpack-sources "^1.1.0" + +"@schematics/angular@~0.1.17": + version "0.1.17" + resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-0.1.17.tgz#084a7cbe2de6f94a856bd08d95c9d35ef8905e2b" + dependencies: + typescript "~2.6.2" + +"@schematics/package-update@0.0.7": + version "0.0.7" + resolved "https://registry.yarnpkg.com/@schematics/package-update/-/package-update-0.0.7.tgz#6eb449f03d8182b3b55c8a709534d32f111c0d3a" + dependencies: + rxjs "^5.5.6" + semver "^5.3.0" + semver-intersect "^1.1.2" + +abbrev@1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" + +accepts@~1.3.4: + version "1.3.5" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2" + dependencies: + mime-types "~2.1.18" + negotiator "0.6.1" + +acorn-dynamic-import@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4" + dependencies: + acorn "^4.0.3" + +acorn@^4.0.3: + version "4.0.13" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" + +acorn@^5.0.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.0.tgz#1abb587fbf051f94e3de20e6b26ef910b1828298" + +ajv-keywords@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762" + +ajv-keywords@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.1.0.tgz#ac2b27939c543e95d2c06e7f7f5c27be4aa543be" + +ajv@^4.9.1: + version "4.11.8" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536" + dependencies: + co "^4.6.0" + json-stable-stringify "^1.0.1" + +ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5, ajv@~5.5.1: + version "5.5.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" + dependencies: + co "^4.6.0" + fast-deep-equal "^1.0.0" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.3.0" + +ajv@^6.1.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.2.0.tgz#afac295bbaa0152449e522742e4547c1ae9328d2" + dependencies: + fast-deep-equal "^1.0.0" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.3.0" + +align-text@^0.1.1, align-text@^0.1.3: + version "0.1.4" + resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117" + dependencies: + kind-of "^3.0.2" + longest "^1.0.1" + repeat-string "^1.5.2" + +alphanum-sort@^1.0.1, alphanum-sort@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" + +amdefine@>=0.0.4: + version "1.0.1" + resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" + +ansi-html@0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e" + +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + +ansi-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" + +ansi-styles@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" + +ansi-styles@^3.1.0, ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + dependencies: + color-convert "^1.9.0" + +anymatch@^1.3.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a" + dependencies: + micromatch "^2.1.5" + normalize-path "^2.0.0" + +anymatch@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" + dependencies: + micromatch "^3.1.4" + normalize-path "^2.1.1" + +aproba@^1.0.3, aproba@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" + +are-we-there-yet@~1.1.2: + version "1.1.4" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d" + dependencies: + delegates "^1.0.0" + readable-stream "^2.0.6" + +argparse@^1.0.7: + version "1.0.10" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" + dependencies: + sprintf-js "~1.0.2" + +arr-diff@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf" + dependencies: + arr-flatten "^1.0.1" + +arr-diff@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" + +arr-flatten@^1.0.1, arr-flatten@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" + +arr-union@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" + +array-find-index@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" + +array-flatten@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" + +array-flatten@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.1.tgz#426bb9da84090c1838d812c8150af20a8331e296" + +array-includes@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d" + dependencies: + define-properties "^1.1.2" + es-abstract "^1.7.0" + +array-union@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" + dependencies: + array-uniq "^1.0.1" + +array-uniq@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" + +array-unique@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" + +array-unique@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" + +arrify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" + +asap@~2.0.3: + version "2.0.6" + resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" + +asn1.js@^4.0.0: + version "4.10.1" + resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0" + dependencies: + bn.js "^4.0.0" + inherits "^2.0.1" + minimalistic-assert "^1.0.0" + +asn1@~0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86" + +assert-plus@1.0.0, assert-plus@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" + +assert-plus@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234" + +assert@^1.1.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91" + dependencies: + util "0.10.3" + +assign-symbols@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" + +async-each@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" + +async-foreach@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542" + +async@^1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" + +async@^2.1.2, async@^2.1.5, async@^2.4.1, async@^2.5.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4" + dependencies: + lodash "^4.14.0" + +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + +atob@^2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/atob/-/atob-2.0.3.tgz#19c7a760473774468f20b2d2d03372ad7d4cbf5d" + +autoprefixer@^6.3.1: + version "6.7.7" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014" + dependencies: + browserslist "^1.7.6" + caniuse-db "^1.0.30000634" + normalize-range "^0.1.2" + num2fraction "^1.2.2" + postcss "^5.2.16" + postcss-value-parser "^3.2.3" + +autoprefixer@^7.2.3: + version "7.2.6" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.6.tgz#256672f86f7c735da849c4f07d008abb056067dc" + dependencies: + browserslist "^2.11.3" + caniuse-lite "^1.0.30000805" + normalize-range "^0.1.2" + num2fraction "^1.2.2" + postcss "^6.0.17" + postcss-value-parser "^3.2.3" + +aws-sign2@~0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f" + +aws-sign2@~0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" + +aws4@^1.2.1, aws4@^1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e" + +babel-code-frame@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" + dependencies: + chalk "^1.1.3" + esutils "^2.0.2" + js-tokens "^3.0.2" + +babel-generator@^6.18.0: + version "6.26.1" + resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90" + dependencies: + babel-messages "^6.23.0" + babel-runtime "^6.26.0" + babel-types "^6.26.0" + detect-indent "^4.0.0" + jsesc "^1.3.0" + lodash "^4.17.4" + source-map "^0.5.7" + trim-right "^1.0.1" + +babel-messages@^6.23.0: + version "6.23.0" + resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" + dependencies: + babel-runtime "^6.22.0" + +babel-runtime@^6.22.0, babel-runtime@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" + dependencies: + core-js "^2.4.0" + regenerator-runtime "^0.11.0" + +babel-template@^6.16.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02" + dependencies: + babel-runtime "^6.26.0" + babel-traverse "^6.26.0" + babel-types "^6.26.0" + babylon "^6.18.0" + lodash "^4.17.4" + +babel-traverse@^6.18.0, babel-traverse@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee" + dependencies: + babel-code-frame "^6.26.0" + babel-messages "^6.23.0" + babel-runtime "^6.26.0" + babel-types "^6.26.0" + babylon "^6.18.0" + debug "^2.6.8" + globals "^9.18.0" + invariant "^2.2.2" + lodash "^4.17.4" + +babel-types@^6.18.0, babel-types@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" + dependencies: + babel-runtime "^6.26.0" + esutils "^2.0.2" + lodash "^4.17.4" + to-fast-properties "^1.0.3" + +babylon@^6.18.0: + version "6.18.0" + resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" + +balanced-match@^0.4.2: + version "0.4.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838" + +balanced-match@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" + +base64-js@^1.0.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.3.tgz#fb13668233d9614cf5fb4bce95a9ba4096cdf801" + +base@^0.11.1: + version "0.11.2" + resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" + dependencies: + cache-base "^1.0.1" + class-utils "^0.3.5" + component-emitter "^1.2.1" + define-property "^1.0.0" + isobject "^3.0.1" + mixin-deep "^1.2.0" + pascalcase "^0.1.1" + +batch@0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" + +bcrypt-pbkdf@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d" + dependencies: + tweetnacl "^0.14.3" + +big.js@^3.1.3: + version "3.2.0" + resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e" + +binary-extensions@^1.0.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205" + +block-stream@*: + version "0.0.9" + resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" + dependencies: + inherits "~2.0.0" + +bluebird@^3.4.7, bluebird@^3.5.1: + version "3.5.1" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9" + +bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: + version "4.11.8" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f" + +body-parser@1.18.2: + version "1.18.2" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454" + dependencies: + bytes "3.0.0" + content-type "~1.0.4" + debug "2.6.9" + depd "~1.1.1" + http-errors "~1.6.2" + iconv-lite "0.4.19" + on-finished "~2.3.0" + qs "6.5.1" + raw-body "2.3.2" + type-is "~1.6.15" + +bonjour@^3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5" + dependencies: + array-flatten "^2.1.0" + deep-equal "^1.0.1" + dns-equal "^1.0.0" + dns-txt "^2.0.2" + multicast-dns "^6.0.1" + multicast-dns-service-types "^1.1.0" + +boolbase@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" + +boom@2.x.x: + version "2.10.1" + resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f" + dependencies: + hoek "2.x.x" + +boom@4.x.x: + version "4.3.1" + resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31" + dependencies: + hoek "4.x.x" + +boom@5.x.x: + version "5.2.0" + resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02" + dependencies: + hoek "4.x.x" + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +braces@^1.8.2: + version "1.8.5" + resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7" + dependencies: + expand-range "^1.8.1" + preserve "^0.2.0" + repeat-element "^1.1.2" + +braces@^2.3.0, braces@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.1.tgz#7086c913b4e5a08dbe37ac0ee6a2500c4ba691bb" + dependencies: + arr-flatten "^1.1.0" + array-unique "^0.3.2" + define-property "^1.0.0" + extend-shallow "^2.0.1" + fill-range "^4.0.0" + isobject "^3.0.1" + kind-of "^6.0.2" + repeat-element "^1.1.2" + snapdragon "^0.8.1" + snapdragon-node "^2.0.1" + split-string "^3.0.2" + to-regex "^3.0.1" + +brorand@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" + +browserify-aes@^1.0.0, browserify-aes@^1.0.4: + version "1.1.1" + resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.1.1.tgz#38b7ab55edb806ff2dcda1a7f1620773a477c49f" + dependencies: + buffer-xor "^1.0.3" + cipher-base "^1.0.0" + create-hash "^1.1.0" + evp_bytestokey "^1.0.3" + inherits "^2.0.1" + safe-buffer "^5.0.1" + +browserify-cipher@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.0.tgz#9988244874bf5ed4e28da95666dcd66ac8fc363a" + dependencies: + browserify-aes "^1.0.4" + browserify-des "^1.0.0" + evp_bytestokey "^1.0.0" + +browserify-des@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.0.tgz#daa277717470922ed2fe18594118a175439721dd" + dependencies: + cipher-base "^1.0.1" + des.js "^1.0.0" + inherits "^2.0.1" + +browserify-rsa@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524" + dependencies: + bn.js "^4.1.0" + randombytes "^2.0.1" + +browserify-sign@^4.0.0: + version "4.0.4" + resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298" + dependencies: + bn.js "^4.1.1" + browserify-rsa "^4.0.0" + create-hash "^1.1.0" + create-hmac "^1.1.2" + elliptic "^6.0.0" + inherits "^2.0.1" + parse-asn1 "^5.0.0" + +browserify-zlib@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f" + dependencies: + pako "~1.0.5" + +browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6: + version "1.7.7" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9" + dependencies: + caniuse-db "^1.0.30000639" + electron-to-chromium "^1.2.7" + +browserslist@^2.11.3: + version "2.11.3" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2" + dependencies: + caniuse-lite "^1.0.30000792" + electron-to-chromium "^1.3.30" + +buffer-indexof@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c" + +buffer-xor@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" + +buffer@^4.3.0: + version "4.9.1" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298" + dependencies: + base64-js "^1.0.2" + ieee754 "^1.1.4" + isarray "^1.0.0" + +builtin-modules@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" + +builtin-status-codes@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" + +bytes@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" + +cacache@^10.0.1: + version "10.0.4" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460" + dependencies: + bluebird "^3.5.1" + chownr "^1.0.1" + glob "^7.1.2" + graceful-fs "^4.1.11" + lru-cache "^4.1.1" + mississippi "^2.0.0" + mkdirp "^0.5.1" + move-concurrently "^1.0.1" + promise-inflight "^1.0.1" + rimraf "^2.6.2" + ssri "^5.2.4" + unique-filename "^1.1.0" + y18n "^4.0.0" + +cache-base@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" + dependencies: + collection-visit "^1.0.0" + component-emitter "^1.2.1" + get-value "^2.0.6" + has-value "^1.0.0" + isobject "^3.0.1" + set-value "^2.0.0" + to-object-path "^0.3.0" + union-value "^1.0.0" + unset-value "^1.0.0" + +cache-loader@^1.2.0: + version "1.2.2" + resolved "https://registry.yarnpkg.com/cache-loader/-/cache-loader-1.2.2.tgz#6d5c38ded959a09cc5d58190ab5af6f73bd353f5" + dependencies: + loader-utils "^1.1.0" + mkdirp "^0.5.1" + neo-async "^2.5.0" + schema-utils "^0.4.2" + +camel-case@3.0.x: + version "3.0.0" + resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73" + dependencies: + no-case "^2.2.0" + upper-case "^1.1.1" + +camelcase-keys@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7" + dependencies: + camelcase "^2.0.0" + map-obj "^1.0.0" + +camelcase@^1.0.2: + version "1.2.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39" + +camelcase@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" + +camelcase@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" + +camelcase@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" + +caniuse-api@^1.5.2: + version "1.6.1" + resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c" + dependencies: + browserslist "^1.3.6" + caniuse-db "^1.0.30000529" + lodash.memoize "^4.1.2" + lodash.uniq "^4.5.0" + +caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: + version "1.0.30000810" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000810.tgz#bd25830c41efab64339a2e381f49677343c84509" + +caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805: + version "1.0.30000810" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000810.tgz#47585fffce0e9f3593a6feea4673b945424351d9" + +caseless@~0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7" + +caseless@~0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" + +center-align@^0.1.1: + version "0.1.3" + resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad" + dependencies: + align-text "^0.1.3" + lazy-cache "^1.0.3" + +chalk@^1.1.1, chalk@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" + dependencies: + ansi-styles "^2.2.1" + escape-string-regexp "^1.0.2" + has-ansi "^2.0.0" + strip-ansi "^3.0.0" + supports-color "^2.0.0" + +chalk@^2.0.0, chalk@^2.3.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65" + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +chalk@~2.2.0: + version "2.2.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.2.2.tgz#4403f5cf18f35c05f51fbdf152bf588f956cf7cb" + dependencies: + ansi-styles "^3.1.0" + escape-string-regexp "^1.0.5" + supports-color "^4.0.0" + +chokidar@^1.4.2, chokidar@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" + dependencies: + anymatch "^1.3.0" + async-each "^1.0.0" + glob-parent "^2.0.0" + inherits "^2.0.1" + is-binary-path "^1.0.0" + is-glob "^2.0.0" + path-is-absolute "^1.0.0" + readdirp "^2.0.0" + optionalDependencies: + fsevents "^1.0.0" + +chokidar@^2.0.0, chokidar@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.2.tgz#4dc65139eeb2714977735b6a35d06e97b494dfd7" + dependencies: + anymatch "^2.0.0" + async-each "^1.0.0" + braces "^2.3.0" + glob-parent "^3.1.0" + inherits "^2.0.1" + is-binary-path "^1.0.0" + is-glob "^4.0.0" + normalize-path "^2.1.1" + path-is-absolute "^1.0.0" + readdirp "^2.0.0" + upath "^1.0.0" + optionalDependencies: + fsevents "^1.0.0" + +chownr@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181" + +cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" + dependencies: + inherits "^2.0.1" + safe-buffer "^5.0.1" + +circular-dependency-plugin@^4.2.1: + version "4.4.0" + resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-4.4.0.tgz#f8a1a746a3f6c8e57f4dae9b54d991cd2a582f5d" + +clap@^1.0.9: + version "1.2.3" + resolved "https://registry.yarnpkg.com/clap/-/clap-1.2.3.tgz#4f36745b32008492557f46412d66d50cb99bce51" + dependencies: + chalk "^1.1.3" + +class-utils@^0.3.5: + version "0.3.6" + resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" + dependencies: + arr-union "^3.1.0" + define-property "^0.2.5" + isobject "^3.0.0" + static-extend "^0.1.1" + +clean-css@4.1.x, clean-css@^4.1.9: + version "4.1.9" + resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.9.tgz#35cee8ae7687a49b98034f70de00c4edd3826301" + dependencies: + source-map "0.5.x" + +cliui@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1" + dependencies: + center-align "^0.1.1" + right-align "^0.1.1" + wordwrap "0.0.2" + +cliui@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" + dependencies: + string-width "^1.0.1" + strip-ansi "^3.0.1" + wrap-ansi "^2.0.0" + +clone-deep@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-0.3.0.tgz#348c61ae9cdbe0edfe053d91ff4cc521d790ede8" + dependencies: + for-own "^1.0.0" + is-plain-object "^2.0.1" + kind-of "^3.2.2" + shallow-clone "^0.1.2" + +clone@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.3.tgz#298d7e2231660f40c003c2ed3140decf3f53085f" + +clone@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb" + +co@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" + +coa@~1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.4.tgz#a9ef153660d6a86a8bdec0289a5c684d217432fd" + dependencies: + q "^1.1.2" + +code-point-at@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + +collection-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" + dependencies: + map-visit "^1.0.0" + object-visit "^1.0.0" + +color-convert@^1.3.0, color-convert@^1.9.0: + version "1.9.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed" + dependencies: + color-name "^1.1.1" + +color-name@^1.0.0, color-name@^1.1.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + +color-string@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991" + dependencies: + color-name "^1.0.0" + +color@^0.11.0: + version "0.11.4" + resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764" + dependencies: + clone "^1.0.2" + color-convert "^1.3.0" + color-string "^0.3.0" + +colormin@^1.0.5: + version "1.1.2" + resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133" + dependencies: + color "^0.11.0" + css-color-names "0.0.4" + has "^1.0.1" + +colors@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63" + +combined-stream@1.0.6, combined-stream@^1.0.5, combined-stream@~1.0.5: + version "1.0.6" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818" + dependencies: + delayed-stream "~1.0.0" + +commander@2.14.x, commander@^2.9.0, commander@~2.14.1: + version "2.14.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa" + +commander@~2.13.0: + version "2.13.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c" + +common-tags@^1.3.1: + version "1.7.2" + resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.7.2.tgz#24d9768c63d253a56ecff93845b44b4df1d52771" + dependencies: + babel-runtime "^6.26.0" + +commondir@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" + +component-emitter@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" + +compressible@~2.0.13: + version "2.0.13" + resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.13.tgz#0d1020ab924b2fdb4d6279875c7d6daba6baa7a9" + dependencies: + mime-db ">= 1.33.0 < 2" + +compression@^1.5.2: + version "1.7.2" + resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.2.tgz#aaffbcd6aaf854b44ebb280353d5ad1651f59a69" + dependencies: + accepts "~1.3.4" + bytes "3.0.0" + compressible "~2.0.13" + debug "2.6.9" + on-headers "~1.0.1" + safe-buffer "5.1.1" + vary "~1.1.2" + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + +concat-stream@^1.5.0: + version "1.6.1" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.1.tgz#261b8f518301f1d834e36342b9fea095d2620a26" + dependencies: + inherits "^2.0.3" + readable-stream "^2.2.2" + typedarray "^0.0.6" + +connect-history-api-fallback@^1.3.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a" + +console-browserify@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10" + dependencies: + date-now "^0.1.4" + +console-control-strings@^1.0.0, console-control-strings@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + +constants-browserify@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" + +content-disposition@0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4" + +content-type@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" + +convert-source-map@^1.5.0: + version "1.5.1" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5" + +cookie-signature@1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" + +cookie@0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb" + +copy-concurrently@^1.0.0: + version "1.0.5" + resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0" + dependencies: + aproba "^1.1.1" + fs-write-stream-atomic "^1.0.8" + iferr "^0.1.5" + mkdirp "^0.5.1" + rimraf "^2.5.4" + run-queue "^1.0.0" + +copy-descriptor@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" + +copy-webpack-plugin@^4.1.1: + version "4.5.0" + resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.5.0.tgz#9cb012163317666ea47479d2a8c57daca3557da5" + dependencies: + cacache "^10.0.1" + find-cache-dir "^1.0.0" + globby "^7.1.1" + is-glob "^4.0.0" + loader-utils "^1.1.0" + minimatch "^3.0.4" + p-limit "^1.0.0" + serialize-javascript "^1.4.0" + +core-js@^2.4.0: + version "2.5.3" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e" + +"core-js@file:../../node_modules/core-js": + version "2.5.1" + +core-object@^3.1.0: + version "3.1.5" + resolved "https://registry.yarnpkg.com/core-object/-/core-object-3.1.5.tgz#fa627b87502adc98045e44678e9a8ec3b9c0d2a9" + dependencies: + chalk "^2.0.0" + +core-util-is@1.0.2, core-util-is@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + +cosmiconfig@^2.1.0, cosmiconfig@^2.1.1: + version "2.2.2" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-2.2.2.tgz#6173cebd56fac042c1f4390edf7af6c07c7cb892" + dependencies: + is-directory "^0.3.1" + js-yaml "^3.4.3" + minimist "^1.2.0" + object-assign "^4.1.0" + os-homedir "^1.0.1" + parse-json "^2.2.0" + require-from-string "^1.1.0" + +create-ecdh@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.0.tgz#888c723596cdf7612f6498233eebd7a35301737d" + dependencies: + bn.js "^4.1.0" + elliptic "^6.0.0" + +create-hash@^1.1.0, create-hash@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.3.tgz#606042ac8b9262750f483caddab0f5819172d8fd" + dependencies: + cipher-base "^1.0.1" + inherits "^2.0.1" + ripemd160 "^2.0.0" + sha.js "^2.4.0" + +create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: + version "1.1.6" + resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.6.tgz#acb9e221a4e17bdb076e90657c42b93e3726cf06" + dependencies: + cipher-base "^1.0.3" + create-hash "^1.1.0" + inherits "^2.0.1" + ripemd160 "^2.0.0" + safe-buffer "^5.0.1" + sha.js "^2.4.8" + +cross-spawn@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982" + dependencies: + lru-cache "^4.0.1" + which "^1.2.9" + +cross-spawn@^5.0.1: + version "5.1.0" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" + dependencies: + lru-cache "^4.0.1" + shebang-command "^1.2.0" + which "^1.2.9" + +cryptiles@2.x.x: + version "2.0.5" + resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8" + dependencies: + boom "2.x.x" + +cryptiles@3.x.x: + version "3.1.2" + resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe" + dependencies: + boom "5.x.x" + +crypto-browserify@^3.11.0: + version "3.12.0" + resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" + dependencies: + browserify-cipher "^1.0.0" + browserify-sign "^4.0.0" + create-ecdh "^4.0.0" + create-hash "^1.1.0" + create-hmac "^1.1.0" + diffie-hellman "^5.0.0" + inherits "^2.0.1" + pbkdf2 "^3.0.3" + public-encrypt "^4.0.0" + randombytes "^2.0.0" + randomfill "^1.0.3" + +css-color-names@0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0" + +css-loader@^0.28.1: + version "0.28.10" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.10.tgz#40282e79230f7bcb4e483efa631d670b735ebf42" + dependencies: + babel-code-frame "^6.26.0" + css-selector-tokenizer "^0.7.0" + cssnano "^3.10.0" + icss-utils "^2.1.0" + loader-utils "^1.0.2" + lodash.camelcase "^4.3.0" + object-assign "^4.1.1" + postcss "^5.0.6" + postcss-modules-extract-imports "^1.2.0" + postcss-modules-local-by-default "^1.2.0" + postcss-modules-scope "^1.1.0" + postcss-modules-values "^1.3.0" + postcss-value-parser "^3.3.0" + source-list-map "^2.0.0" + +css-parse@1.7.x: + version "1.7.0" + resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b" + +css-select@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858" + dependencies: + boolbase "~1.0.0" + css-what "2.1" + domutils "1.5.1" + nth-check "~1.0.1" + +css-selector-tokenizer@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86" + dependencies: + cssesc "^0.1.0" + fastparse "^1.1.1" + regexpu-core "^1.0.0" + +css-what@2.1: + version "2.1.0" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd" + +cssesc@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4" + +cssnano@^3.10.0: + version "3.10.0" + resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38" + dependencies: + autoprefixer "^6.3.1" + decamelize "^1.1.2" + defined "^1.0.0" + has "^1.0.1" + object-assign "^4.0.1" + postcss "^5.0.14" + postcss-calc "^5.2.0" + postcss-colormin "^2.1.8" + postcss-convert-values "^2.3.4" + postcss-discard-comments "^2.0.4" + postcss-discard-duplicates "^2.0.1" + postcss-discard-empty "^2.0.1" + postcss-discard-overridden "^0.1.1" + postcss-discard-unused "^2.2.1" + postcss-filter-plugins "^2.0.0" + postcss-merge-idents "^2.1.5" + postcss-merge-longhand "^2.0.1" + postcss-merge-rules "^2.0.3" + postcss-minify-font-values "^1.0.2" + postcss-minify-gradients "^1.0.1" + postcss-minify-params "^1.0.4" + postcss-minify-selectors "^2.0.4" + postcss-normalize-charset "^1.1.0" + postcss-normalize-url "^3.0.7" + postcss-ordered-values "^2.1.0" + postcss-reduce-idents "^2.2.2" + postcss-reduce-initial "^1.0.0" + postcss-reduce-transforms "^1.0.3" + postcss-svgo "^2.1.1" + postcss-unique-selectors "^2.0.2" + postcss-value-parser "^3.2.3" + postcss-zindex "^2.0.1" + +csso@~2.3.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/csso/-/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85" + dependencies: + clap "^1.0.9" + source-map "^0.5.3" + +cuint@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b" + +currently-unhandled@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" + dependencies: + array-find-index "^1.0.1" + +cyclist@~0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640" + +d@1: + version "1.0.0" + resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f" + dependencies: + es5-ext "^0.10.9" + +dashdash@^1.12.0: + version "1.14.1" + resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" + dependencies: + assert-plus "^1.0.0" + +date-now@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" + +debug@*, debug@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" + dependencies: + ms "2.0.0" + +debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.6, debug@^2.6.8: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + dependencies: + ms "2.0.0" + +decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2: + version "1.2.0" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" + +decode-uri-component@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" + +deep-equal@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5" + +deep-extend@~0.4.0: + version "0.4.2" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f" + +define-properties@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94" + dependencies: + foreach "^2.0.5" + object-keys "^1.0.8" + +define-property@^0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" + dependencies: + is-descriptor "^0.1.0" + +define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" + dependencies: + is-descriptor "^1.0.0" + +define-property@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" + dependencies: + is-descriptor "^1.0.2" + isobject "^3.0.1" + +defined@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" + +del@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5" + dependencies: + globby "^6.1.0" + is-path-cwd "^1.0.0" + is-path-in-cwd "^1.0.0" + p-map "^1.1.1" + pify "^3.0.0" + rimraf "^2.2.8" + +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + +denodeify@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/denodeify/-/denodeify-1.2.1.tgz#3a36287f5034e699e7577901052c2e6c94251631" + +depd@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359" + +depd@~1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + +des.js@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc" + dependencies: + inherits "^2.0.1" + minimalistic-assert "^1.0.0" + +destroy@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" + +detect-indent@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208" + dependencies: + repeating "^2.0.0" + +detect-libc@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + +detect-node@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.3.tgz#a2033c09cc8e158d37748fbde7507832bd6ce127" + +diffie-hellman@^5.0.0: + version "5.0.2" + resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e" + dependencies: + bn.js "^4.1.0" + miller-rabin "^4.0.0" + randombytes "^2.0.0" + +dir-glob@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034" + dependencies: + arrify "^1.0.1" + path-type "^3.0.0" + +dns-equal@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" + +dns-packet@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a" + dependencies: + ip "^1.1.0" + safe-buffer "^5.0.1" + +dns-txt@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6" + dependencies: + buffer-indexof "^1.0.0" + +dom-converter@~0.1: + version "0.1.4" + resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.1.4.tgz#a45ef5727b890c9bffe6d7c876e7b19cb0e17f3b" + dependencies: + utila "~0.3" + +dom-serializer@0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82" + dependencies: + domelementtype "~1.1.1" + entities "~1.1.1" + +domain-browser@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" + +domelementtype@1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2" + +domelementtype@~1.1.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b" + +domhandler@2.1: + version "2.1.0" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.1.0.tgz#d2646f5e57f6c3bab11cf6cb05d3c0acf7412594" + dependencies: + domelementtype "1" + +domutils@1.1: + version "1.1.6" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.1.6.tgz#bddc3de099b9a2efacc51c623f28f416ecc57485" + dependencies: + domelementtype "1" + +domutils@1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf" + dependencies: + dom-serializer "0" + domelementtype "1" + +duplexify@^3.4.2, duplexify@^3.5.3: + version "3.5.4" + resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.4.tgz#4bb46c1796eabebeec4ca9a2e66b808cb7a3d8b4" + dependencies: + end-of-stream "^1.0.0" + inherits "^2.0.1" + readable-stream "^2.0.0" + stream-shift "^1.0.0" + +ecc-jsbn@~0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505" + dependencies: + jsbn "~0.1.0" + +ee-first@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" + +ejs@^2.5.7: + version "2.5.7" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a" + +electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30: + version "1.3.34" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.34.tgz#d93498f40391bb0c16a603d8241b9951404157ed" + +elliptic@^6.0.0: + version "6.4.0" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df" + dependencies: + bn.js "^4.4.0" + brorand "^1.0.1" + hash.js "^1.0.0" + hmac-drbg "^1.0.0" + inherits "^2.0.1" + minimalistic-assert "^1.0.0" + minimalistic-crypto-utils "^1.0.0" + +ember-cli-string-utils@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/ember-cli-string-utils/-/ember-cli-string-utils-1.1.0.tgz#39b677fc2805f55173735376fcef278eaa4452a1" + +emojis-list@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" + +encodeurl@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + +end-of-stream@^1.0.0, end-of-stream@^1.1.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43" + dependencies: + once "^1.4.0" + +enhanced-resolve@^3.1.0, enhanced-resolve@^3.4.0: + version "3.4.1" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e" + dependencies: + graceful-fs "^4.1.2" + memory-fs "^0.4.0" + object-assign "^4.0.1" + tapable "^0.2.7" + +entities@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0" + +errno@^0.1.1, errno@^0.1.3, errno@~0.1.7: + version "0.1.7" + resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618" + dependencies: + prr "~1.0.1" + +error-ex@^1.2.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc" + dependencies: + is-arrayish "^0.2.1" + +es-abstract@^1.7.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.10.0.tgz#1ecb36c197842a00d8ee4c2dfd8646bb97d60864" + dependencies: + es-to-primitive "^1.1.1" + function-bind "^1.1.1" + has "^1.0.1" + is-callable "^1.1.3" + is-regex "^1.0.4" + +es-to-primitive@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d" + dependencies: + is-callable "^1.1.1" + is-date-object "^1.0.1" + is-symbol "^1.0.1" + +es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14: + version "0.10.39" + resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.39.tgz#fca21b67559277ca4ac1a1ed7048b107b6f76d87" + dependencies: + es6-iterator "~2.0.3" + es6-symbol "~3.1.1" + +es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" + dependencies: + d "1" + es5-ext "^0.10.35" + es6-symbol "^3.1.1" + +es6-map@^0.1.3: + version "0.1.5" + resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0" + dependencies: + d "1" + es5-ext "~0.10.14" + es6-iterator "~2.0.1" + es6-set "~0.1.5" + es6-symbol "~3.1.1" + event-emitter "~0.3.5" + +es6-set@~0.1.5: + version "0.1.5" + resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1" + dependencies: + d "1" + es5-ext "~0.10.14" + es6-iterator "~2.0.1" + es6-symbol "3.1.1" + event-emitter "~0.3.5" + +es6-symbol@3.1.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77" + dependencies: + d "1" + es5-ext "~0.10.14" + +es6-weak-map@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f" + dependencies: + d "1" + es5-ext "^0.10.14" + es6-iterator "^2.0.1" + es6-symbol "^3.1.1" + +escape-html@~1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" + +escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + +escope@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3" + dependencies: + es6-map "^0.1.3" + es6-weak-map "^2.0.1" + esrecurse "^4.1.0" + estraverse "^4.1.1" + +esprima@^2.6.0: + version "2.7.3" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581" + +esprima@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804" + +esrecurse@^4.1.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf" + dependencies: + estraverse "^4.1.0" + +estraverse@^4.1.0, estraverse@^4.1.1: + version "4.2.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" + +esutils@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" + +etag@~1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + +event-emitter@~0.3.5: + version "0.3.5" + resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39" + dependencies: + d "1" + es5-ext "~0.10.14" + +eventemitter3@1.x.x: + version "1.2.0" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508" + +events@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" + +eventsource@0.1.6: + version "0.1.6" + resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-0.1.6.tgz#0acede849ed7dd1ccc32c811bb11b944d4f29232" + dependencies: + original ">=0.0.5" + +evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02" + dependencies: + md5.js "^1.3.4" + safe-buffer "^5.1.1" + +execa@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" + dependencies: + cross-spawn "^5.0.1" + get-stream "^3.0.0" + is-stream "^1.1.0" + npm-run-path "^2.0.0" + p-finally "^1.0.0" + signal-exit "^3.0.0" + strip-eof "^1.0.0" + +expand-brackets@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b" + dependencies: + is-posix-bracket "^0.1.0" + +expand-brackets@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" + dependencies: + debug "^2.3.3" + define-property "^0.2.5" + extend-shallow "^2.0.1" + posix-character-classes "^0.1.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +expand-range@^1.8.1: + version "1.8.2" + resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337" + dependencies: + fill-range "^2.1.0" + +exports-loader@^0.6.3: + version "0.6.4" + resolved "https://registry.yarnpkg.com/exports-loader/-/exports-loader-0.6.4.tgz#d70fc6121975b35fc12830cf52754be2740fc886" + dependencies: + loader-utils "^1.0.2" + source-map "0.5.x" + +express@^4.16.2: + version "4.16.2" + resolved "https://registry.yarnpkg.com/express/-/express-4.16.2.tgz#e35c6dfe2d64b7dca0a5cd4f21781be3299e076c" + dependencies: + accepts "~1.3.4" + array-flatten "1.1.1" + body-parser "1.18.2" + content-disposition "0.5.2" + content-type "~1.0.4" + cookie "0.3.1" + cookie-signature "1.0.6" + debug "2.6.9" + depd "~1.1.1" + encodeurl "~1.0.1" + escape-html "~1.0.3" + etag "~1.8.1" + finalhandler "1.1.0" + fresh "0.5.2" + merge-descriptors "1.0.1" + methods "~1.1.2" + on-finished "~2.3.0" + parseurl "~1.3.2" + path-to-regexp "0.1.7" + proxy-addr "~2.0.2" + qs "6.5.1" + range-parser "~1.2.0" + safe-buffer "5.1.1" + send "0.16.1" + serve-static "1.13.1" + setprototypeof "1.1.0" + statuses "~1.3.1" + type-is "~1.6.15" + utils-merge "1.0.1" + vary "~1.1.2" + +extend-shallow@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" + dependencies: + is-extendable "^0.1.0" + +extend-shallow@^3.0.0, extend-shallow@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" + dependencies: + assign-symbols "^1.0.0" + is-extendable "^1.0.1" + +extend@~3.0.0, extend@~3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444" + +extglob@^0.3.1: + version "0.3.2" + resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1" + dependencies: + is-extglob "^1.0.0" + +extglob@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" + dependencies: + array-unique "^0.3.2" + define-property "^1.0.0" + expand-brackets "^2.1.4" + extend-shallow "^2.0.1" + fragment-cache "^0.2.1" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +extract-text-webpack-plugin@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz#5f043eaa02f9750a9258b78c0a6e0dc1408fb2f7" + dependencies: + async "^2.4.1" + loader-utils "^1.1.0" + schema-utils "^0.3.0" + webpack-sources "^1.0.1" + +extsprintf@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" + +extsprintf@^1.2.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" + +fast-deep-equal@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614" + +fast-json-stable-stringify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" + +fastparse@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8" + +faye-websocket@^0.10.0: + version "0.10.0" + resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4" + dependencies: + websocket-driver ">=0.5.1" + +faye-websocket@~0.11.0: + version "0.11.1" + resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz#f0efe18c4f56e4f40afc7e06c719fd5ee6188f38" + dependencies: + websocket-driver ">=0.5.1" + +file-loader@^1.1.5: + version "1.1.11" + resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.11.tgz#6fe886449b0f2a936e43cabaac0cdbfb369506f8" + dependencies: + loader-utils "^1.0.2" + schema-utils "^0.4.5" + +filename-regex@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" + +fill-range@^2.1.0: + version "2.2.3" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723" + dependencies: + is-number "^2.1.0" + isobject "^2.0.0" + randomatic "^1.1.3" + repeat-element "^1.1.2" + repeat-string "^1.5.2" + +fill-range@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" + dependencies: + extend-shallow "^2.0.1" + is-number "^3.0.0" + repeat-string "^1.6.1" + to-regex-range "^2.1.0" + +finalhandler@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5" + dependencies: + debug "2.6.9" + encodeurl "~1.0.1" + escape-html "~1.0.3" + on-finished "~2.3.0" + parseurl "~1.3.2" + statuses "~1.3.1" + unpipe "~1.0.0" + +find-cache-dir@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f" + dependencies: + commondir "^1.0.1" + make-dir "^1.0.0" + pkg-dir "^2.0.0" + +find-up@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" + dependencies: + path-exists "^2.0.0" + pinkie-promise "^2.0.0" + +find-up@^2.0.0, find-up@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" + dependencies: + locate-path "^2.0.0" + +flatten@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782" + +flush-write-stream@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.2.tgz#c81b90d8746766f1a609a46809946c45dd8ae417" + dependencies: + inherits "^2.0.1" + readable-stream "^2.0.4" + +for-in@^0.1.3: + version "0.1.8" + resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1" + +for-in@^1.0.1, for-in@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" + +for-own@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce" + dependencies: + for-in "^1.0.1" + +for-own@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b" + dependencies: + for-in "^1.0.1" + +foreach@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99" + +forever-agent@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" + +form-data@~2.1.1: + version "2.1.4" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1" + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.5" + mime-types "^2.1.12" + +form-data@~2.3.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099" + dependencies: + asynckit "^0.4.0" + combined-stream "1.0.6" + mime-types "^2.1.12" + +forwarded@~0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" + +fragment-cache@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" + dependencies: + map-cache "^0.2.2" + +fresh@0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" + +from2@^2.1.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af" + dependencies: + inherits "^2.0.1" + readable-stream "^2.0.0" + +fs-extra@^4.0.0: + version "4.0.3" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" + dependencies: + graceful-fs "^4.1.2" + jsonfile "^4.0.0" + universalify "^0.1.0" + +fs-write-stream-atomic@^1.0.8: + version "1.0.10" + resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9" + dependencies: + graceful-fs "^4.1.2" + iferr "^0.1.5" + imurmurhash "^0.1.4" + readable-stream "1 || 2" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + +fsevents@^1.0.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8" + dependencies: + nan "^2.3.0" + node-pre-gyp "^0.6.39" + +fstream-ignore@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105" + dependencies: + fstream "^1.0.0" + inherits "2" + minimatch "^3.0.0" + +fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2: + version "1.0.11" + resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171" + dependencies: + graceful-fs "^4.1.2" + inherits "~2.0.0" + mkdirp ">=0.5 0" + rimraf "2" + +function-bind@^1.0.2, function-bind@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + +gauge@~2.7.3: + version "2.7.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" + dependencies: + aproba "^1.0.3" + console-control-strings "^1.0.0" + has-unicode "^2.0.0" + object-assign "^4.1.0" + signal-exit "^3.0.0" + string-width "^1.0.1" + strip-ansi "^3.0.1" + wide-align "^1.1.0" + +gaze@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.2.tgz#847224677adb8870d679257ed3388fdb61e40105" + dependencies: + globule "^1.0.0" + +generate-function@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74" + +generate-object-property@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0" + dependencies: + is-property "^1.0.0" + +get-caller-file@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5" + +get-stdin@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" + +get-stream@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" + +get-value@^2.0.3, get-value@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" + +getpass@^0.1.1: + version "0.1.7" + resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" + dependencies: + assert-plus "^1.0.0" + +glob-base@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" + dependencies: + glob-parent "^2.0.0" + is-glob "^2.0.0" + +glob-parent@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28" + dependencies: + is-glob "^2.0.0" + +glob-parent@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" + dependencies: + is-glob "^3.1.0" + path-dirname "^1.0.0" + +glob@7.0.x: + version "7.0.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a" + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.2" + once "^1.3.0" + path-is-absolute "^1.0.0" + +glob@^6.0.4: + version "6.0.4" + resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22" + dependencies: + inflight "^1.0.4" + inherits "2" + minimatch "2 || 3" + once "^1.3.0" + path-is-absolute "^1.0.0" + +glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.2, glob@~7.1.1: + version "7.1.2" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +globals@^9.18.0: + version "9.18.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" + +globby@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c" + dependencies: + array-union "^1.0.1" + glob "^7.0.3" + object-assign "^4.0.1" + pify "^2.0.0" + pinkie-promise "^2.0.0" + +globby@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680" + dependencies: + array-union "^1.0.1" + dir-glob "^2.0.0" + glob "^7.1.2" + ignore "^3.3.5" + pify "^3.0.0" + slash "^1.0.0" + +globule@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.0.tgz#1dc49c6822dd9e8a2fa00ba2a295006e8664bd09" + dependencies: + glob "~7.1.1" + lodash "~4.17.4" + minimatch "~3.0.2" + +graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6: + version "4.1.11" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" + +handle-thing@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4" + +har-schema@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e" + +har-schema@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" + +har-validator@~2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d" + dependencies: + chalk "^1.1.1" + commander "^2.9.0" + is-my-json-valid "^2.12.4" + pinkie-promise "^2.0.0" + +har-validator@~4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a" + dependencies: + ajv "^4.9.1" + har-schema "^1.0.5" + +har-validator@~5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd" + dependencies: + ajv "^5.1.0" + har-schema "^2.0.0" + +has-ansi@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" + dependencies: + ansi-regex "^2.0.0" + +has-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa" + +has-flag@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51" + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + +has-unicode@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + +has-value@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" + dependencies: + get-value "^2.0.3" + has-values "^0.1.4" + isobject "^2.0.0" + +has-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" + dependencies: + get-value "^2.0.6" + has-values "^1.0.0" + isobject "^3.0.0" + +has-values@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" + +has-values@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" + dependencies: + is-number "^3.0.0" + kind-of "^4.0.0" + +has@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28" + dependencies: + function-bind "^1.0.2" + +hash-base@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-2.0.2.tgz#66ea1d856db4e8a5470cadf6fce23ae5244ef2e1" + dependencies: + inherits "^2.0.1" + +hash-base@^3.0.0: + version "3.0.4" + resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918" + dependencies: + inherits "^2.0.1" + safe-buffer "^5.0.1" + +hash.js@^1.0.0, hash.js@^1.0.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.3.tgz#340dedbe6290187151c1ea1d777a3448935df846" + dependencies: + inherits "^2.0.3" + minimalistic-assert "^1.0.0" + +hawk@3.1.3, hawk@~3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4" + dependencies: + boom "2.x.x" + cryptiles "2.x.x" + hoek "2.x.x" + sntp "1.x.x" + +hawk@~6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038" + dependencies: + boom "4.x.x" + cryptiles "3.x.x" + hoek "4.x.x" + sntp "2.x.x" + +he@1.1.x: + version "1.1.1" + resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd" + +hmac-drbg@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" + dependencies: + hash.js "^1.0.3" + minimalistic-assert "^1.0.0" + minimalistic-crypto-utils "^1.0.1" + +hoek@2.x.x: + version "2.16.3" + resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed" + +hoek@4.x.x: + version "4.2.1" + resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb" + +hosted-git-info@^2.1.4: + version "2.5.0" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c" + +hpack.js@^2.1.6: + version "2.1.6" + resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2" + dependencies: + inherits "^2.0.1" + obuf "^1.0.0" + readable-stream "^2.0.1" + wbuf "^1.1.0" + +html-comment-regex@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e" + +html-entities@^1.2.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f" + +html-minifier@^3.2.3: + version "3.5.9" + resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.9.tgz#74424014b872598d4bb0e20ac420926ec61024b6" + dependencies: + camel-case "3.0.x" + clean-css "4.1.x" + commander "2.14.x" + he "1.1.x" + ncname "1.0.x" + param-case "2.1.x" + relateurl "0.2.x" + uglify-js "3.3.x" + +html-webpack-plugin@^2.29.0: + version "2.30.1" + resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-2.30.1.tgz#7f9c421b7ea91ec460f56527d78df484ee7537d5" + dependencies: + bluebird "^3.4.7" + html-minifier "^3.2.3" + loader-utils "^0.2.16" + lodash "^4.17.3" + pretty-error "^2.0.2" + toposort "^1.0.0" + +htmlparser2@~3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.3.0.tgz#cc70d05a59f6542e43f0e685c982e14c924a9efe" + dependencies: + domelementtype "1" + domhandler "2.1" + domutils "1.1" + readable-stream "1.0" + +http-deceiver@^1.2.7: + version "1.2.7" + resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" + +http-errors@1.6.2, http-errors@~1.6.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736" + dependencies: + depd "1.1.1" + inherits "2.0.3" + setprototypeof "1.0.3" + statuses ">= 1.3.1 < 2" + +http-parser-js@>=0.4.0: + version "0.4.10" + resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz#92c9c1374c35085f75db359ec56cc257cbb93fa4" + +http-proxy-middleware@~0.17.4: + version "0.17.4" + resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz#642e8848851d66f09d4f124912846dbaeb41b833" + dependencies: + http-proxy "^1.16.2" + is-glob "^3.1.0" + lodash "^4.17.2" + micromatch "^2.3.11" + +http-proxy@^1.16.2: + version "1.16.2" + resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.16.2.tgz#06dff292952bf64dbe8471fa9df73066d4f37742" + dependencies: + eventemitter3 "1.x.x" + requires-port "1.x.x" + +http-signature@~1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf" + dependencies: + assert-plus "^0.2.0" + jsprim "^1.2.2" + sshpk "^1.7.0" + +http-signature@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" + dependencies: + assert-plus "^1.0.0" + jsprim "^1.2.2" + sshpk "^1.7.0" + +https-browserify@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" + +iconv-lite@0.4.19: + version "0.4.19" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b" + +icss-replace-symbols@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded" + +icss-utils@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962" + dependencies: + postcss "^6.0.1" + +ieee754@^1.1.4: + version "1.1.8" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4" + +iferr@^0.1.5: + version "0.1.5" + resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" + +ignore@^3.3.5: + version "3.3.7" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021" + +image-size@~0.5.0: + version "0.5.5" + resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c" + +import-local@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc" + dependencies: + pkg-dir "^2.0.0" + resolve-cwd "^2.0.0" + +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + +in-publish@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51" + +indent-string@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80" + dependencies: + repeating "^2.0.0" + +indexes-of@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" + +indexof@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d" + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + +inherits@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" + +ini@~1.3.0: + version "1.3.5" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" + +internal-ip@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-1.2.0.tgz#ae9fbf93b984878785d50a8de1b356956058cf5c" + dependencies: + meow "^3.3.0" + +interpret@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614" + +invariant@^2.2.2: + version "2.2.3" + resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.3.tgz#1a827dfde7dcbd7c323f0ca826be8fa7c5e9d688" + dependencies: + loose-envify "^1.0.0" + +invert-kv@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" + +ip@^1.1.0, ip@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" + +ipaddr.js@1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.6.0.tgz#e3fa357b773da619f26e95f049d055c72796f86b" + +is-absolute-url@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6" + +is-accessor-descriptor@^0.1.6: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" + dependencies: + kind-of "^3.0.2" + +is-accessor-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" + dependencies: + kind-of "^6.0.0" + +is-arrayish@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + +is-binary-path@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" + dependencies: + binary-extensions "^1.0.0" + +is-buffer@^1.0.2, is-buffer@^1.1.5: + version "1.1.6" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" + +is-builtin-module@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe" + dependencies: + builtin-modules "^1.0.0" + +is-callable@^1.1.1, is-callable@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2" + +is-data-descriptor@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" + dependencies: + kind-of "^3.0.2" + +is-data-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" + dependencies: + kind-of "^6.0.0" + +is-date-object@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16" + +is-descriptor@^0.1.0: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" + dependencies: + is-accessor-descriptor "^0.1.6" + is-data-descriptor "^0.1.4" + kind-of "^5.0.0" + +is-descriptor@^1.0.0, is-descriptor@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" + dependencies: + is-accessor-descriptor "^1.0.0" + is-data-descriptor "^1.0.0" + kind-of "^6.0.2" + +is-directory@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" + +is-dotfile@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" + +is-equal-shallow@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534" + dependencies: + is-primitive "^2.0.0" + +is-extendable@^0.1.0, is-extendable@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" + +is-extendable@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" + dependencies: + is-plain-object "^2.0.4" + +is-extglob@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" + +is-extglob@^2.1.0, is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + +is-finite@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa" + dependencies: + number-is-nan "^1.0.0" + +is-fullwidth-code-point@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + dependencies: + number-is-nan "^1.0.0" + +is-fullwidth-code-point@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + +is-glob@^2.0.0, is-glob@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" + dependencies: + is-extglob "^1.0.0" + +is-glob@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" + dependencies: + is-extglob "^2.1.0" + +is-glob@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0" + dependencies: + is-extglob "^2.1.1" + +is-my-ip-valid@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824" + +is-my-json-valid@^2.12.4: + version "2.17.2" + resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz#6b2103a288e94ef3de5cf15d29dd85fc4b78d65c" + dependencies: + generate-function "^2.0.0" + generate-object-property "^1.1.0" + is-my-ip-valid "^1.0.0" + jsonpointer "^4.0.0" + xtend "^4.0.0" + +is-number@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" + dependencies: + kind-of "^3.0.2" + +is-number@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" + dependencies: + kind-of "^3.0.2" + +is-number@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff" + +is-odd@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-2.0.0.tgz#7646624671fd7ea558ccd9a2795182f2958f1b24" + dependencies: + is-number "^4.0.0" + +is-path-cwd@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d" + +is-path-in-cwd@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc" + dependencies: + is-path-inside "^1.0.0" + +is-path-inside@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036" + dependencies: + path-is-inside "^1.0.1" + +is-plain-obj@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" + +is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" + dependencies: + isobject "^3.0.1" + +is-posix-bracket@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" + +is-primitive@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575" + +is-property@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84" + +is-regex@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491" + dependencies: + has "^1.0.1" + +is-stream@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" + +is-svg@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9" + dependencies: + html-comment-regex "^1.1.0" + +is-symbol@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572" + +is-typedarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + +is-utf8@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" + +is-windows@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" + +is-wsl@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" + +isarray@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" + +isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + +isobject@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" + dependencies: + isarray "1.0.0" + +isobject@^3.0.0, isobject@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + +isstream@~0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" + +istanbul-instrumenter-loader@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.0.tgz#9f553923b22360bac95e617aaba01add1f7db0b2" + dependencies: + convert-source-map "^1.5.0" + istanbul-lib-instrument "^1.7.3" + loader-utils "^1.1.0" + schema-utils "^0.3.0" + +istanbul-lib-coverage@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.2.tgz#4113c8ff6b7a40a1ef7350b01016331f63afde14" + +istanbul-lib-instrument@^1.7.3: + version "1.9.2" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.9.2.tgz#84905bf47f7e0b401d6b840da7bad67086b4aab6" + dependencies: + babel-generator "^6.18.0" + babel-template "^6.16.0" + babel-traverse "^6.18.0" + babel-types "^6.18.0" + babylon "^6.18.0" + istanbul-lib-coverage "^1.1.2" + semver "^5.3.0" + +js-base64@^2.1.8, js-base64@^2.1.9: + version "2.4.3" + resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.3.tgz#2e545ec2b0f2957f41356510205214e98fad6582" + +js-tokens@^3.0.0, js-tokens@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" + +js-yaml@^3.4.3: + version "3.10.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc" + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + +js-yaml@~3.7.0: + version "3.7.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80" + dependencies: + argparse "^1.0.7" + esprima "^2.6.0" + +jsbn@~0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" + +jsesc@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" + +jsesc@~0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" + +json-loader@^0.5.4: + version "0.5.7" + resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d" + +json-schema-traverse@^0.3.0: + version "0.3.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340" + +json-schema@0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" + +json-stable-stringify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" + dependencies: + jsonify "~0.0.0" + +json-stringify-safe@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" + +json3@^3.3.2: + version "3.3.2" + resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1" + +json5@^0.5.0, json5@^0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" + +jsonfile@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" + optionalDependencies: + graceful-fs "^4.1.6" + +jsonify@~0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" + +jsonpointer@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9" + +jsprim@^1.2.2: + version "1.4.1" + resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" + dependencies: + assert-plus "1.0.0" + extsprintf "1.3.0" + json-schema "0.2.3" + verror "1.10.0" + +karma-source-map-support@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.2.0.tgz#1bf81e7bb4b089627ab352ec4179e117c406a540" + dependencies: + source-map-support "^0.4.1" + +killable@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.0.tgz#da8b84bd47de5395878f95d64d02f2449fe05e6b" + +kind-of@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-2.0.1.tgz#018ec7a4ce7e3a86cb9141be519d24c8faa981b5" + dependencies: + is-buffer "^1.0.2" + +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0, kind-of@^3.2.2: + version "3.2.2" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" + dependencies: + is-buffer "^1.1.5" + +kind-of@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" + dependencies: + is-buffer "^1.1.5" + +kind-of@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" + +kind-of@^6.0.0, kind-of@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" + +lazy-cache@^0.2.3: + version "0.2.7" + resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-0.2.7.tgz#7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65" + +lazy-cache@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" + +lazy-cache@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-2.0.2.tgz#b9190a4f913354694840859f8a8f7084d8822264" + dependencies: + set-getter "^0.1.0" + +lcid@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" + dependencies: + invert-kv "^1.0.0" + +less-loader@^4.0.5: + version "4.0.6" + resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-4.0.6.tgz#7bcfbb9053181c18d57e213e87346958e02b2769" + dependencies: + clone "^2.1.1" + loader-utils "^1.1.0" + pify "^3.0.0" + +less@^2.7.2: + version "2.7.3" + resolved "https://registry.yarnpkg.com/less/-/less-2.7.3.tgz#cc1260f51c900a9ec0d91fb6998139e02507b63b" + optionalDependencies: + errno "^0.1.1" + graceful-fs "^4.1.2" + image-size "~0.5.0" + mime "^1.2.11" + mkdirp "^0.5.0" + promise "^7.1.1" + request "2.81.0" + source-map "^0.5.3" + +license-webpack-plugin@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-1.1.2.tgz#283519c77ef3878f467c50fcdcf9b5760bfbcd4b" + dependencies: + ejs "^2.5.7" + +load-json-file@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0" + dependencies: + graceful-fs "^4.1.2" + parse-json "^2.2.0" + pify "^2.0.0" + pinkie-promise "^2.0.0" + strip-bom "^2.0.0" + +load-json-file@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8" + dependencies: + graceful-fs "^4.1.2" + parse-json "^2.2.0" + pify "^2.0.0" + strip-bom "^3.0.0" + +loader-runner@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2" + +loader-utils@1.1.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd" + dependencies: + big.js "^3.1.3" + emojis-list "^2.0.0" + json5 "^0.5.0" + +loader-utils@^0.2.16, loader-utils@~0.2.2: + version "0.2.17" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348" + dependencies: + big.js "^3.1.3" + emojis-list "^2.0.0" + json5 "^0.5.0" + object-assign "^4.0.1" + +locate-path@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" + dependencies: + p-locate "^2.0.0" + path-exists "^3.0.0" + +lodash.assign@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" + +lodash.camelcase@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" + +lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" + +lodash.memoize@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" + +lodash.mergewith@^4.6.0: + version "4.6.1" + resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927" + +lodash.tail@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664" + +lodash.uniq@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" + +lodash@^4.0.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.4: + version "4.17.5" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511" + +loglevel@^1.4.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa" + +longest@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" + +loose-envify@^1.0.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848" + dependencies: + js-tokens "^3.0.0" + +loud-rejection@^1.0.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f" + dependencies: + currently-unhandled "^0.4.1" + signal-exit "^3.0.0" + +lower-case@^1.1.1: + version "1.1.4" + resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" + +lru-cache@^4.0.1, lru-cache@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55" + dependencies: + pseudomap "^1.0.2" + yallist "^2.1.2" + +macaddress@^0.2.8: + version "0.2.8" + resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12" + +magic-string@^0.22.3: + version "0.22.4" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.4.tgz#31039b4e40366395618c1d6cf8193c53917475ff" + dependencies: + vlq "^0.2.1" + +make-dir@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.2.0.tgz#6d6a49eead4aae296c53bbf3a1a008bd6c89469b" + dependencies: + pify "^3.0.0" + +map-cache@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" + +map-obj@^1.0.0, map-obj@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" + +map-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" + dependencies: + object-visit "^1.0.0" + +math-expression-evaluator@^1.2.14: + version "1.2.17" + resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac" + +md5.js@^1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d" + dependencies: + hash-base "^3.0.0" + inherits "^2.0.1" + +media-typer@0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" + +mem@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76" + dependencies: + mimic-fn "^1.0.0" + +memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" + dependencies: + errno "^0.1.3" + readable-stream "^2.0.1" + +meow@^3.3.0, meow@^3.7.0: + version "3.7.0" + resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" + dependencies: + camelcase-keys "^2.0.0" + decamelize "^1.1.2" + loud-rejection "^1.0.0" + map-obj "^1.0.1" + minimist "^1.1.3" + normalize-package-data "^2.3.4" + object-assign "^4.0.1" + read-pkg-up "^1.0.1" + redent "^1.0.0" + trim-newlines "^1.0.0" + +merge-descriptors@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" + +methods@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" + +micromatch@^2.1.5, micromatch@^2.3.11: + version "2.3.11" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" + dependencies: + arr-diff "^2.0.0" + array-unique "^0.2.1" + braces "^1.8.2" + expand-brackets "^0.1.4" + extglob "^0.3.1" + filename-regex "^2.0.0" + is-extglob "^1.0.0" + is-glob "^2.0.1" + kind-of "^3.0.2" + normalize-path "^2.0.1" + object.omit "^2.0.0" + parse-glob "^3.0.4" + regex-cache "^0.4.2" + +micromatch@^3.1.4: + version "3.1.9" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.9.tgz#15dc93175ae39e52e93087847096effc73efcf89" + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + braces "^2.3.1" + define-property "^2.0.2" + extend-shallow "^3.0.2" + extglob "^2.0.4" + fragment-cache "^0.2.1" + kind-of "^6.0.2" + nanomatch "^1.2.9" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +miller-rabin@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d" + dependencies: + bn.js "^4.0.0" + brorand "^1.0.1" + +"mime-db@>= 1.33.0 < 2", mime-db@~1.33.0: + version "1.33.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" + +mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.7: + version "2.1.18" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8" + dependencies: + mime-db "~1.33.0" + +mime@1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6" + +mime@^1.2.11, mime@^1.4.1, mime@^1.5.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" + +mimic-fn@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" + +minimalistic-assert@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3" + +minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" + +"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + dependencies: + brace-expansion "^1.1.7" + +minimist@0.0.8: + version "0.0.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" + +minimist@^1.1.3, minimist@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" + +mississippi@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f" + dependencies: + concat-stream "^1.5.0" + duplexify "^3.4.2" + end-of-stream "^1.1.0" + flush-write-stream "^1.0.0" + from2 "^2.1.0" + parallel-transform "^1.1.0" + pump "^2.0.1" + pumpify "^1.3.3" + stream-each "^1.1.0" + through2 "^2.0.0" + +mixin-deep@^1.2.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe" + dependencies: + for-in "^1.0.2" + is-extendable "^1.0.1" + +mixin-object@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/mixin-object/-/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e" + dependencies: + for-in "^0.1.3" + is-extendable "^0.1.1" + +mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" + dependencies: + minimist "0.0.8" + +move-concurrently@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92" + dependencies: + aproba "^1.1.1" + copy-concurrently "^1.0.0" + fs-write-stream-atomic "^1.0.8" + mkdirp "^0.5.1" + rimraf "^2.5.4" + run-queue "^1.0.3" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + +multicast-dns-service-types@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901" + +multicast-dns@^6.0.1: + version "6.2.3" + resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229" + dependencies: + dns-packet "^1.3.1" + thunky "^1.0.2" + +nan@^2.3.0, nan@^2.3.2: + version "2.9.2" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.9.2.tgz#f564d75f5f8f36a6d9456cca7a6c4fe488ab7866" + +nanomatch@^1.2.9: + version "1.2.9" + resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2" + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + define-property "^2.0.2" + extend-shallow "^3.0.2" + fragment-cache "^0.2.1" + is-odd "^2.0.0" + is-windows "^1.0.2" + kind-of "^6.0.2" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +ncname@1.0.x: + version "1.0.0" + resolved "https://registry.yarnpkg.com/ncname/-/ncname-1.0.0.tgz#5b57ad18b1ca092864ef62b0b1ed8194f383b71c" + dependencies: + xml-char-classes "^1.0.0" + +negotiator@0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" + +neo-async@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.0.tgz#76b1c823130cca26acfbaccc8fbaf0a2fa33b18f" + +no-case@^2.2.0: + version "2.3.2" + resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac" + dependencies: + lower-case "^1.1.1" + +node-forge@0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.1.tgz#9da611ea08982f4b94206b3beb4cc9665f20c300" + +node-gyp@^3.3.1: + version "3.6.2" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.6.2.tgz#9bfbe54562286284838e750eac05295853fa1c60" + dependencies: + fstream "^1.0.0" + glob "^7.0.3" + graceful-fs "^4.1.2" + minimatch "^3.0.2" + mkdirp "^0.5.0" + nopt "2 || 3" + npmlog "0 || 1 || 2 || 3 || 4" + osenv "0" + request "2" + rimraf "2" + semver "~5.3.0" + tar "^2.0.0" + which "1" + +node-libs-browser@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df" + dependencies: + assert "^1.1.1" + browserify-zlib "^0.2.0" + buffer "^4.3.0" + console-browserify "^1.1.0" + constants-browserify "^1.0.0" + crypto-browserify "^3.11.0" + domain-browser "^1.1.1" + events "^1.0.0" + https-browserify "^1.0.0" + os-browserify "^0.3.0" + path-browserify "0.0.0" + process "^0.11.10" + punycode "^1.2.4" + querystring-es3 "^0.2.0" + readable-stream "^2.3.3" + stream-browserify "^2.0.1" + stream-http "^2.7.2" + string_decoder "^1.0.0" + timers-browserify "^2.0.4" + tty-browserify "0.0.0" + url "^0.11.0" + util "^0.10.3" + vm-browserify "0.0.4" + +node-modules-path@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/node-modules-path/-/node-modules-path-1.0.1.tgz#40096b08ce7ad0ea14680863af449c7c75a5d1c8" + +node-pre-gyp@^0.6.39: + version "0.6.39" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649" + dependencies: + detect-libc "^1.0.2" + hawk "3.1.3" + mkdirp "^0.5.1" + nopt "^4.0.1" + npmlog "^4.0.2" + rc "^1.1.7" + request "2.81.0" + rimraf "^2.6.1" + semver "^5.3.0" + tar "^2.2.1" + tar-pack "^3.4.0" + +node-sass@^4.7.2: + version "4.7.2" + resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.7.2.tgz#9366778ba1469eb01438a9e8592f4262bcb6794e" + dependencies: + async-foreach "^0.1.3" + chalk "^1.1.1" + cross-spawn "^3.0.0" + gaze "^1.0.0" + get-stdin "^4.0.1" + glob "^7.0.3" + in-publish "^2.0.0" + lodash.assign "^4.2.0" + lodash.clonedeep "^4.3.2" + lodash.mergewith "^4.6.0" + meow "^3.7.0" + mkdirp "^0.5.1" + nan "^2.3.2" + node-gyp "^3.3.1" + npmlog "^4.0.0" + request "~2.79.0" + sass-graph "^2.2.4" + stdout-stream "^1.4.0" + "true-case-path" "^1.0.2" + +"nopt@2 || 3": + version "3.0.6" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" + dependencies: + abbrev "1" + +nopt@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" + dependencies: + abbrev "1" + osenv "^0.1.4" + +normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: + version "2.4.0" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" + dependencies: + hosted-git-info "^2.1.4" + is-builtin-module "^1.0.0" + semver "2 || 3 || 4 || 5" + validate-npm-package-license "^3.0.1" + +normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" + dependencies: + remove-trailing-separator "^1.0.1" + +normalize-range@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" + +normalize-url@^1.4.0: + version "1.9.1" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c" + dependencies: + object-assign "^4.0.1" + prepend-http "^1.0.0" + query-string "^4.1.0" + sort-keys "^1.0.0" + +npm-run-path@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" + dependencies: + path-key "^2.0.0" + +"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" + dependencies: + are-we-there-yet "~1.1.2" + console-control-strings "~1.1.0" + gauge "~2.7.3" + set-blocking "~2.0.0" + +nth-check@~1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4" + dependencies: + boolbase "~1.0.0" + +num2fraction@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" + +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + +oauth-sign@~0.8.1, oauth-sign@~0.8.2: + version "0.8.2" + resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" + +object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + +object-copy@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" + dependencies: + copy-descriptor "^0.1.0" + define-property "^0.2.5" + kind-of "^3.0.3" + +object-keys@^1.0.8: + version "1.0.11" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d" + +object-visit@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" + dependencies: + isobject "^3.0.0" + +object.omit@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" + dependencies: + for-own "^0.1.4" + is-extendable "^0.1.1" + +object.pick@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" + dependencies: + isobject "^3.0.1" + +obuf@^1.0.0, obuf@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.1.tgz#104124b6c602c6796881a042541d36db43a5264e" + +on-finished@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" + dependencies: + ee-first "1.1.1" + +on-headers@~1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7" + +once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + dependencies: + wrappy "1" + +opn@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/opn/-/opn-5.2.0.tgz#71fdf934d6827d676cecbea1531f95d354641225" + dependencies: + is-wsl "^1.1.0" + +opn@~5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/opn/-/opn-5.1.0.tgz#72ce2306a17dbea58ff1041853352b4a8fc77519" + dependencies: + is-wsl "^1.1.0" + +original@>=0.0.5: + version "1.0.0" + resolved "https://registry.yarnpkg.com/original/-/original-1.0.0.tgz#9147f93fa1696d04be61e01bd50baeaca656bd3b" + dependencies: + url-parse "1.0.x" + +os-browserify@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" + +os-homedir@^1.0.0, os-homedir@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" + +os-locale@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" + dependencies: + lcid "^1.0.0" + +os-locale@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2" + dependencies: + execa "^0.7.0" + lcid "^1.0.0" + mem "^1.1.0" + +os-tmpdir@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" + +osenv@0, osenv@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" + dependencies: + os-homedir "^1.0.0" + os-tmpdir "^1.0.0" + +p-finally@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" + +p-limit@^1.0.0, p-limit@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c" + dependencies: + p-try "^1.0.0" + +p-locate@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" + dependencies: + p-limit "^1.1.0" + +p-map@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b" + +p-try@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" + +pako@~1.0.5: + version "1.0.6" + resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258" + +parallel-transform@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06" + dependencies: + cyclist "~0.2.2" + inherits "^2.0.3" + readable-stream "^2.1.5" + +param-case@2.1.x: + version "2.1.1" + resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247" + dependencies: + no-case "^2.2.0" + +parse-asn1@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.0.tgz#37c4f9b7ed3ab65c74817b5f2480937fbf97c712" + dependencies: + asn1.js "^4.0.0" + browserify-aes "^1.0.0" + create-hash "^1.1.0" + evp_bytestokey "^1.0.0" + pbkdf2 "^3.0.3" + +parse-glob@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" + dependencies: + glob-base "^0.3.0" + is-dotfile "^1.0.0" + is-extglob "^1.0.0" + is-glob "^2.0.0" + +parse-json@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" + dependencies: + error-ex "^1.2.0" + +parseurl@~1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3" + +pascalcase@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" + +path-browserify@0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a" + +path-dirname@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" + +path-exists@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b" + dependencies: + pinkie-promise "^2.0.0" + +path-exists@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + +path-is-inside@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" + +path-key@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" + +path-parse@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1" + +path-to-regexp@0.1.7: + version "0.1.7" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" + +path-type@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441" + dependencies: + graceful-fs "^4.1.2" + pify "^2.0.0" + pinkie-promise "^2.0.0" + +path-type@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73" + dependencies: + pify "^2.0.0" + +path-type@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" + dependencies: + pify "^3.0.0" + +pbkdf2@^3.0.3: + version "3.0.14" + resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.14.tgz#a35e13c64799b06ce15320f459c230e68e73bade" + dependencies: + create-hash "^1.1.2" + create-hmac "^1.1.4" + ripemd160 "^2.0.1" + safe-buffer "^5.0.1" + sha.js "^2.4.8" + +performance-now@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5" + +performance-now@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" + +pify@^2.0.0, pify@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" + +pify@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" + +pinkie-promise@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" + dependencies: + pinkie "^2.0.0" + +pinkie@^2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" + +pkg-dir@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" + dependencies: + find-up "^2.1.0" + +portfinder@^1.0.9, portfinder@~1.0.12: + version "1.0.13" + resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.13.tgz#bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9" + dependencies: + async "^1.5.2" + debug "^2.2.0" + mkdirp "0.5.x" + +posix-character-classes@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" + +postcss-calc@^5.2.0: + version "5.3.1" + resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e" + dependencies: + postcss "^5.0.2" + postcss-message-helpers "^2.0.0" + reduce-css-calc "^1.2.6" + +postcss-colormin@^2.1.8: + version "2.2.2" + resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-2.2.2.tgz#6631417d5f0e909a3d7ec26b24c8a8d1e4f96e4b" + dependencies: + colormin "^1.0.5" + postcss "^5.0.13" + postcss-value-parser "^3.2.3" + +postcss-convert-values@^2.3.4: + version "2.6.1" + resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz#bbd8593c5c1fd2e3d1c322bb925dcae8dae4d62d" + dependencies: + postcss "^5.0.11" + postcss-value-parser "^3.1.2" + +postcss-discard-comments@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz#befe89fafd5b3dace5ccce51b76b81514be00e3d" + dependencies: + postcss "^5.0.14" + +postcss-discard-duplicates@^2.0.1: + version "2.1.0" + resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz#b9abf27b88ac188158a5eb12abcae20263b91932" + dependencies: + postcss "^5.0.4" + +postcss-discard-empty@^2.0.1: + version "2.1.0" + resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz#d2b4bd9d5ced5ebd8dcade7640c7d7cd7f4f92b5" + dependencies: + postcss "^5.0.14" + +postcss-discard-overridden@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz#8b1eaf554f686fb288cd874c55667b0aa3668d58" + dependencies: + postcss "^5.0.16" + +postcss-discard-unused@^2.2.1: + version "2.2.3" + resolved "https://registry.yarnpkg.com/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz#bce30b2cc591ffc634322b5fb3464b6d934f4433" + dependencies: + postcss "^5.0.14" + uniqs "^2.0.0" + +postcss-filter-plugins@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz#6d85862534d735ac420e4a85806e1f5d4286d84c" + dependencies: + postcss "^5.0.4" + uniqid "^4.0.0" + +postcss-import@^11.0.0: + version "11.1.0" + resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-11.1.0.tgz#55c9362c9192994ec68865d224419df1db2981f0" + dependencies: + postcss "^6.0.1" + postcss-value-parser "^3.2.3" + read-cache "^1.0.0" + resolve "^1.1.7" + +postcss-load-config@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a" + dependencies: + cosmiconfig "^2.1.0" + object-assign "^4.1.0" + postcss-load-options "^1.2.0" + postcss-load-plugins "^2.3.0" + +postcss-load-options@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/postcss-load-options/-/postcss-load-options-1.2.0.tgz#b098b1559ddac2df04bc0bb375f99a5cfe2b6d8c" + dependencies: + cosmiconfig "^2.1.0" + object-assign "^4.1.0" + +postcss-load-plugins@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz#745768116599aca2f009fad426b00175049d8d92" + dependencies: + cosmiconfig "^2.1.1" + object-assign "^4.1.0" + +postcss-loader@^2.0.10: + version "2.1.1" + resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.1.1.tgz#208935af3b1d65e1abb1a870a912dd12e7b36895" + dependencies: + loader-utils "^1.1.0" + postcss "^6.0.0" + postcss-load-config "^1.2.0" + schema-utils "^0.4.0" + +postcss-merge-idents@^2.1.5: + version "2.1.7" + resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270" + dependencies: + has "^1.0.1" + postcss "^5.0.10" + postcss-value-parser "^3.1.1" + +postcss-merge-longhand@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz#23d90cd127b0a77994915332739034a1a4f3d658" + dependencies: + postcss "^5.0.4" + +postcss-merge-rules@^2.0.3: + version "2.1.2" + resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz#d1df5dfaa7b1acc3be553f0e9e10e87c61b5f721" + dependencies: + browserslist "^1.5.2" + caniuse-api "^1.5.2" + postcss "^5.0.4" + postcss-selector-parser "^2.2.2" + vendors "^1.0.0" + +postcss-message-helpers@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz#a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e" + +postcss-minify-font-values@^1.0.2: + version "1.0.5" + resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz#4b58edb56641eba7c8474ab3526cafd7bbdecb69" + dependencies: + object-assign "^4.0.1" + postcss "^5.0.4" + postcss-value-parser "^3.0.2" + +postcss-minify-gradients@^1.0.1: + version "1.0.5" + resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz#5dbda11373703f83cfb4a3ea3881d8d75ff5e6e1" + dependencies: + postcss "^5.0.12" + postcss-value-parser "^3.3.0" + +postcss-minify-params@^1.0.4: + version "1.2.2" + resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz#ad2ce071373b943b3d930a3fa59a358c28d6f1f3" + dependencies: + alphanum-sort "^1.0.1" + postcss "^5.0.2" + postcss-value-parser "^3.0.2" + uniqs "^2.0.0" + +postcss-minify-selectors@^2.0.4: + version "2.1.1" + resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz#b2c6a98c0072cf91b932d1a496508114311735bf" + dependencies: + alphanum-sort "^1.0.2" + has "^1.0.1" + postcss "^5.0.14" + postcss-selector-parser "^2.0.0" + +postcss-modules-extract-imports@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85" + dependencies: + postcss "^6.0.1" + +postcss-modules-local-by-default@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069" + dependencies: + css-selector-tokenizer "^0.7.0" + postcss "^6.0.1" + +postcss-modules-scope@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90" + dependencies: + css-selector-tokenizer "^0.7.0" + postcss "^6.0.1" + +postcss-modules-values@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20" + dependencies: + icss-replace-symbols "^1.1.0" + postcss "^6.0.1" + +postcss-normalize-charset@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz#ef9ee71212d7fe759c78ed162f61ed62b5cb93f1" + dependencies: + postcss "^5.0.5" + +postcss-normalize-url@^3.0.7: + version "3.0.8" + resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz#108f74b3f2fcdaf891a2ffa3ea4592279fc78222" + dependencies: + is-absolute-url "^2.0.0" + normalize-url "^1.4.0" + postcss "^5.0.14" + postcss-value-parser "^3.2.3" + +postcss-ordered-values@^2.1.0: + version "2.2.3" + resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz#eec6c2a67b6c412a8db2042e77fe8da43f95c11d" + dependencies: + postcss "^5.0.4" + postcss-value-parser "^3.0.1" + +postcss-reduce-idents@^2.2.2: + version "2.4.0" + resolved "https://registry.yarnpkg.com/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz#c2c6d20cc958284f6abfbe63f7609bf409059ad3" + dependencies: + postcss "^5.0.4" + postcss-value-parser "^3.0.2" + +postcss-reduce-initial@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz#68f80695f045d08263a879ad240df8dd64f644ea" + dependencies: + postcss "^5.0.4" + +postcss-reduce-transforms@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz#ff76f4d8212437b31c298a42d2e1444025771ae1" + dependencies: + has "^1.0.1" + postcss "^5.0.8" + postcss-value-parser "^3.0.1" + +postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2: + version "2.2.3" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90" + dependencies: + flatten "^1.0.2" + indexes-of "^1.0.1" + uniq "^1.0.1" + +postcss-svgo@^2.1.1: + version "2.1.6" + resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d" + dependencies: + is-svg "^2.0.0" + postcss "^5.0.14" + postcss-value-parser "^3.2.3" + svgo "^0.7.0" + +postcss-unique-selectors@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz#981d57d29ddcb33e7b1dfe1fd43b8649f933ca1d" + dependencies: + alphanum-sort "^1.0.1" + postcss "^5.0.4" + uniqs "^2.0.0" + +postcss-url@^7.1.2: + version "7.3.1" + resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-7.3.1.tgz#b43ae0f0dae4cd06c831fa3aeac2d7a5b73754ed" + dependencies: + mime "^1.4.1" + minimatch "^3.0.4" + mkdirp "^0.5.0" + postcss "^6.0.1" + xxhashjs "^0.2.1" + +postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15" + +postcss-zindex@^2.0.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-2.2.0.tgz#d2109ddc055b91af67fc4cb3b025946639d2af22" + dependencies: + has "^1.0.1" + postcss "^5.0.4" + uniqs "^2.0.0" + +postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16: + version "5.2.18" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5" + dependencies: + chalk "^1.1.3" + js-base64 "^2.1.9" + source-map "^0.5.6" + supports-color "^3.2.3" + +postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.17: + version "6.0.19" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.19.tgz#76a78386f670b9d9494a655bf23ac012effd1555" + dependencies: + chalk "^2.3.1" + source-map "^0.6.1" + supports-color "^5.2.0" + +prepend-http@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" + +preserve@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" + +pretty-error@^2.0.2: + version "2.1.1" + resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3" + dependencies: + renderkid "^2.0.1" + utila "~0.4" + +process-nextick-args@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" + +process@^0.11.10: + version "0.11.10" + resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" + +promise-inflight@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" + +promise@^7.1.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" + dependencies: + asap "~2.0.3" + +proxy-addr@~2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.3.tgz#355f262505a621646b3130a728eb647e22055341" + dependencies: + forwarded "~0.1.2" + ipaddr.js "1.6.0" + +prr@~1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" + +pseudomap@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" + +public-encrypt@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6" + dependencies: + bn.js "^4.1.0" + browserify-rsa "^4.0.0" + create-hash "^1.1.0" + parse-asn1 "^5.0.0" + randombytes "^2.0.1" + +pump@^2.0.0, pump@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909" + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + +pumpify@^1.3.3: + version "1.4.0" + resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.4.0.tgz#80b7c5df7e24153d03f0e7ac8a05a5d068bd07fb" + dependencies: + duplexify "^3.5.3" + inherits "^2.0.3" + pump "^2.0.0" + +punycode@1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" + +punycode@^1.2.4, punycode@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" + +q@^1.1.2: + version "1.5.1" + resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" + +qs@6.5.1, qs@~6.5.1: + version "6.5.1" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8" + +qs@~6.3.0: + version "6.3.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c" + +qs@~6.4.0: + version "6.4.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233" + +query-string@^4.1.0: + version "4.3.4" + resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb" + dependencies: + object-assign "^4.1.0" + strict-uri-encode "^1.0.0" + +querystring-es3@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" + +querystring@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" + +querystringify@0.0.x: + version "0.0.4" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-0.0.4.tgz#0cf7f84f9463ff0ae51c4c4b142d95be37724d9c" + +querystringify@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-1.0.0.tgz#6286242112c5b712fa654e526652bf6a13ff05cb" + +randomatic@^1.1.3: + version "1.1.7" + resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c" + dependencies: + is-number "^3.0.0" + kind-of "^4.0.0" + +randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5: + version "2.0.6" + resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80" + dependencies: + safe-buffer "^5.1.0" + +randomfill@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458" + dependencies: + randombytes "^2.0.5" + safe-buffer "^5.1.0" + +range-parser@^1.0.3, range-parser@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" + +raw-body@2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz#bcd60c77d3eb93cde0050295c3f379389bc88f89" + dependencies: + bytes "3.0.0" + http-errors "1.6.2" + iconv-lite "0.4.19" + unpipe "1.0.0" + +raw-loader@^0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa" + +rc@^1.1.7: + version "1.2.5" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.5.tgz#275cd687f6e3b36cc756baa26dfee80a790301fd" + dependencies: + deep-extend "~0.4.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + +read-cache@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774" + dependencies: + pify "^2.3.0" + +read-pkg-up@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" + dependencies: + find-up "^1.0.0" + read-pkg "^1.0.0" + +read-pkg-up@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be" + dependencies: + find-up "^2.0.0" + read-pkg "^2.0.0" + +read-pkg@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28" + dependencies: + load-json-file "^1.0.0" + normalize-package-data "^2.3.2" + path-type "^1.0.0" + +read-pkg@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8" + dependencies: + load-json-file "^2.0.0" + normalize-package-data "^2.3.2" + path-type "^2.0.0" + +"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.3: + version "2.3.4" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.4.tgz#c946c3f47fa7d8eabc0b6150f4a12f69a4574071" + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.0.3" + util-deprecate "~1.0.1" + +readable-stream@1.0: + version "1.0.34" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + +readdirp@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78" + dependencies: + graceful-fs "^4.1.2" + minimatch "^3.0.2" + readable-stream "^2.0.2" + set-immediate-shim "^1.0.1" + +redent@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde" + dependencies: + indent-string "^2.1.0" + strip-indent "^1.0.1" + +reduce-css-calc@^1.2.6: + version "1.3.0" + resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716" + dependencies: + balanced-match "^0.4.2" + math-expression-evaluator "^1.2.14" + reduce-function-call "^1.0.1" + +reduce-function-call@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/reduce-function-call/-/reduce-function-call-1.0.2.tgz#5a200bf92e0e37751752fe45b0ab330fd4b6be99" + dependencies: + balanced-match "^0.4.2" + +reflect-metadata@^0.1.2: + version "0.1.12" + resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.12.tgz#311bf0c6b63cd782f228a81abe146a2bfa9c56f2" + +regenerate@^1.2.1: + version "1.3.3" + resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.3.tgz#0c336d3980553d755c39b586ae3b20aa49c82b7f" + +regenerator-runtime@^0.11.0: + version "0.11.1" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" + +regex-cache@^0.4.2: + version "0.4.4" + resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd" + dependencies: + is-equal-shallow "^0.1.3" + +regex-not@^1.0.0, regex-not@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" + dependencies: + extend-shallow "^3.0.2" + safe-regex "^1.1.0" + +regexpu-core@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b" + dependencies: + regenerate "^1.2.1" + regjsgen "^0.2.0" + regjsparser "^0.1.4" + +regjsgen@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7" + +regjsparser@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c" + dependencies: + jsesc "~0.5.0" + +relateurl@0.2.x: + version "0.2.7" + resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" + +remove-trailing-separator@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" + +renderkid@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.1.tgz#898cabfc8bede4b7b91135a3ffd323e58c0db319" + dependencies: + css-select "^1.1.0" + dom-converter "~0.1" + htmlparser2 "~3.3.0" + strip-ansi "^3.0.0" + utila "~0.3" + +repeat-element@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a" + +repeat-string@^1.5.2, repeat-string@^1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + +repeating@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" + dependencies: + is-finite "^1.0.0" + +request@2: + version "2.83.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356" + dependencies: + aws-sign2 "~0.7.0" + aws4 "^1.6.0" + caseless "~0.12.0" + combined-stream "~1.0.5" + extend "~3.0.1" + forever-agent "~0.6.1" + form-data "~2.3.1" + har-validator "~5.0.3" + hawk "~6.0.2" + http-signature "~1.2.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.17" + oauth-sign "~0.8.2" + performance-now "^2.1.0" + qs "~6.5.1" + safe-buffer "^5.1.1" + stringstream "~0.0.5" + tough-cookie "~2.3.3" + tunnel-agent "^0.6.0" + uuid "^3.1.0" + +request@2.81.0: + version "2.81.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" + dependencies: + aws-sign2 "~0.6.0" + aws4 "^1.2.1" + caseless "~0.12.0" + combined-stream "~1.0.5" + extend "~3.0.0" + forever-agent "~0.6.1" + form-data "~2.1.1" + har-validator "~4.2.1" + hawk "~3.1.3" + http-signature "~1.1.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.7" + oauth-sign "~0.8.1" + performance-now "^0.2.0" + qs "~6.4.0" + safe-buffer "^5.0.1" + stringstream "~0.0.4" + tough-cookie "~2.3.0" + tunnel-agent "^0.6.0" + uuid "^3.0.0" + +request@~2.79.0: + version "2.79.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de" + dependencies: + aws-sign2 "~0.6.0" + aws4 "^1.2.1" + caseless "~0.11.0" + combined-stream "~1.0.5" + extend "~3.0.0" + forever-agent "~0.6.1" + form-data "~2.1.1" + har-validator "~2.0.6" + hawk "~3.1.3" + http-signature "~1.1.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.7" + oauth-sign "~0.8.1" + qs "~6.3.0" + stringstream "~0.0.4" + tough-cookie "~2.3.0" + tunnel-agent "~0.4.1" + uuid "^3.0.0" + +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + +require-from-string@^1.1.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418" + +require-main-filename@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" + +requires-port@1.0.x, requires-port@1.x.x, requires-port@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + +resolve-cwd@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a" + dependencies: + resolve-from "^3.0.0" + +resolve-from@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" + +resolve-url@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" + +resolve@^1.1.7: + version "1.5.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36" + dependencies: + path-parse "^1.0.5" + +ret@~0.1.10: + version "0.1.15" + resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" + +right-align@^0.1.1: + version "0.1.3" + resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef" + dependencies: + align-text "^0.1.1" + +rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" + dependencies: + glob "^7.0.5" + +ripemd160@^2.0.0, ripemd160@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.1.tgz#0f4584295c53a3628af7e6d79aca21ce57d1c6e7" + dependencies: + hash-base "^2.0.0" + inherits "^2.0.1" + +run-queue@^1.0.0, run-queue@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47" + dependencies: + aproba "^1.1.1" + +rxjs@^5.5.6: + version "5.5.6" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.6.tgz#e31fb96d6fd2ff1fd84bcea8ae9c02d007179c02" + dependencies: + symbol-observable "1.0.1" + +"rxjs@file:../../node_modules/rxjs": + version "6.0.0-alpha.4" + dependencies: + tslib "^1.9.0" + +safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" + +safe-regex@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" + dependencies: + ret "~0.1.10" + +sass-graph@^2.2.4: + version "2.2.4" + resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49" + dependencies: + glob "^7.0.0" + lodash "^4.0.0" + scss-tokenizer "^0.2.3" + yargs "^7.0.0" + +sass-loader@^6.0.6: + version "6.0.6" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-6.0.6.tgz#e9d5e6c1f155faa32a4b26d7a9b7107c225e40f9" + dependencies: + async "^2.1.5" + clone-deep "^0.3.0" + loader-utils "^1.0.1" + lodash.tail "^4.1.1" + pify "^3.0.0" + +sax@0.5.x: + version "0.5.8" + resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1" + +sax@~1.2.1: + version "1.2.4" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" + +schema-utils@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf" + dependencies: + ajv "^5.0.0" + +schema-utils@^0.4.0, schema-utils@^0.4.2, schema-utils@^0.4.5: + version "0.4.5" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.5.tgz#21836f0608aac17b78f9e3e24daff14a5ca13a3e" + dependencies: + ajv "^6.1.0" + ajv-keywords "^3.1.0" + +scss-tokenizer@^0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1" + dependencies: + js-base64 "^2.1.8" + source-map "^0.4.2" + +select-hose@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" + +selfsigned@^1.9.1: + version "1.10.2" + resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.2.tgz#b4449580d99929b65b10a48389301a6592088758" + dependencies: + node-forge "0.7.1" + +semver-intersect@^1.1.2: + version "1.3.1" + resolved "https://registry.yarnpkg.com/semver-intersect/-/semver-intersect-1.3.1.tgz#8fa84a9e1028bd239e4530d1a3e181e698d884ba" + dependencies: + semver "^5.0.0" + +"semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.1.0, semver@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" + +semver@~5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" + +send@0.16.1: + version "0.16.1" + resolved "https://registry.yarnpkg.com/send/-/send-0.16.1.tgz#a70e1ca21d1382c11d0d9f6231deb281080d7ab3" + dependencies: + debug "2.6.9" + depd "~1.1.1" + destroy "~1.0.4" + encodeurl "~1.0.1" + escape-html "~1.0.3" + etag "~1.8.1" + fresh "0.5.2" + http-errors "~1.6.2" + mime "1.4.1" + ms "2.0.0" + on-finished "~2.3.0" + range-parser "~1.2.0" + statuses "~1.3.1" + +serialize-javascript@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.4.0.tgz#7c958514db6ac2443a8abc062dc9f7886a7f6005" + +serve-index@^1.7.2: + version "1.9.1" + resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" + dependencies: + accepts "~1.3.4" + batch "0.6.1" + debug "2.6.9" + escape-html "~1.0.3" + http-errors "~1.6.2" + mime-types "~2.1.17" + parseurl "~1.3.2" + +serve-static@1.13.1: + version "1.13.1" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.1.tgz#4c57d53404a761d8f2e7c1e8a18a47dbf278a719" + dependencies: + encodeurl "~1.0.1" + escape-html "~1.0.3" + parseurl "~1.3.2" + send "0.16.1" + +set-blocking@^2.0.0, set-blocking@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + +set-getter@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/set-getter/-/set-getter-0.1.0.tgz#d769c182c9d5a51f409145f2fba82e5e86e80376" + dependencies: + to-object-path "^0.3.0" + +set-immediate-shim@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61" + +set-value@^0.4.3: + version "0.4.3" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1" + dependencies: + extend-shallow "^2.0.1" + is-extendable "^0.1.1" + is-plain-object "^2.0.1" + to-object-path "^0.3.0" + +set-value@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274" + dependencies: + extend-shallow "^2.0.1" + is-extendable "^0.1.1" + is-plain-object "^2.0.3" + split-string "^3.0.1" + +setimmediate@^1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" + +setprototypeof@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04" + +setprototypeof@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" + +sha.js@^2.4.0, sha.js@^2.4.8: + version "2.4.10" + resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.10.tgz#b1fde5cd7d11a5626638a07c604ab909cfa31f9b" + dependencies: + inherits "^2.0.1" + safe-buffer "^5.0.1" + +shallow-clone@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-0.1.2.tgz#5909e874ba77106d73ac414cfec1ffca87d97060" + dependencies: + is-extendable "^0.1.1" + kind-of "^2.0.1" + lazy-cache "^0.2.3" + mixin-object "^2.0.1" + +shebang-command@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" + dependencies: + shebang-regex "^1.0.0" + +shebang-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" + +signal-exit@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" + +silent-error@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/silent-error/-/silent-error-1.1.0.tgz#2209706f1c850a9f1d10d0d840918b46f26e1bc9" + dependencies: + debug "^2.2.0" + +slash@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" + +snapdragon-node@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" + dependencies: + define-property "^1.0.0" + isobject "^3.0.0" + snapdragon-util "^3.0.1" + +snapdragon-util@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" + dependencies: + kind-of "^3.2.0" + +snapdragon@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.1.tgz#e12b5487faded3e3dea0ac91e9400bf75b401370" + dependencies: + base "^0.11.1" + debug "^2.2.0" + define-property "^0.2.5" + extend-shallow "^2.0.1" + map-cache "^0.2.2" + source-map "^0.5.6" + source-map-resolve "^0.5.0" + use "^2.0.0" + +sntp@1.x.x: + version "1.0.9" + resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198" + dependencies: + hoek "2.x.x" + +sntp@2.x.x: + version "2.1.0" + resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8" + dependencies: + hoek "4.x.x" + +sockjs-client@1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.1.4.tgz#5babe386b775e4cf14e7520911452654016c8b12" + dependencies: + debug "^2.6.6" + eventsource "0.1.6" + faye-websocket "~0.11.0" + inherits "^2.0.1" + json3 "^3.3.2" + url-parse "^1.1.8" + +sockjs@0.3.19: + version "0.3.19" + resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.19.tgz#d976bbe800af7bd20ae08598d582393508993c0d" + dependencies: + faye-websocket "^0.10.0" + uuid "^3.0.1" + +sort-keys@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad" + dependencies: + is-plain-obj "^1.0.0" + +source-list-map@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085" + +source-list-map@~0.1.7: + version "0.1.8" + resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106" + +source-map-loader@^0.2.0: + version "0.2.3" + resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-0.2.3.tgz#d4b0c8cd47d54edce3e6bfa0f523f452b5b0e521" + dependencies: + async "^2.5.0" + loader-utils "~0.2.2" + source-map "~0.6.1" + +source-map-resolve@^0.5.0: + version "0.5.1" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.1.tgz#7ad0f593f2281598e854df80f19aae4b92d7a11a" + dependencies: + atob "^2.0.0" + decode-uri-component "^0.2.0" + resolve-url "^0.2.1" + source-map-url "^0.4.0" + urix "^0.1.0" + +source-map-support@^0.4.1: + version "0.4.18" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" + dependencies: + source-map "^0.5.6" + +source-map-support@^0.5.0: + version "0.5.3" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.3.tgz#2b3d5fff298cfa4d1afd7d4352d569e9a0158e76" + dependencies: + 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" + +source-map@0.1.x: + version "0.1.43" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346" + dependencies: + amdefine ">=0.0.4" + +source-map@0.5.x, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + +source-map@^0.4.2, source-map@~0.4.1: + version "0.4.4" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" + dependencies: + amdefine ">=0.0.4" + +source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + +spdx-correct@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82" + dependencies: + spdx-expression-parse "^3.0.0" + spdx-license-ids "^3.0.0" + +spdx-exceptions@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9" + +spdx-expression-parse@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0" + dependencies: + spdx-exceptions "^2.1.0" + spdx-license-ids "^3.0.0" + +spdx-license-ids@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz#7a7cd28470cc6d3a1cfe6d66886f6bc430d3ac87" + +spdy-transport@^2.0.18: + version "2.0.20" + resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-2.0.20.tgz#735e72054c486b2354fe89e702256004a39ace4d" + dependencies: + debug "^2.6.8" + detect-node "^2.0.3" + hpack.js "^2.1.6" + obuf "^1.1.1" + readable-stream "^2.2.9" + safe-buffer "^5.0.1" + wbuf "^1.7.2" + +spdy@^3.4.1: + version "3.4.7" + resolved "https://registry.yarnpkg.com/spdy/-/spdy-3.4.7.tgz#42ff41ece5cc0f99a3a6c28aabb73f5c3b03acbc" + dependencies: + debug "^2.6.8" + handle-thing "^1.2.5" + http-deceiver "^1.2.7" + safe-buffer "^5.0.1" + select-hose "^2.0.0" + spdy-transport "^2.0.18" + +split-string@^3.0.1, split-string@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" + dependencies: + extend-shallow "^3.0.0" + +sprintf-js@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + +sshpk@^1.7.0: + version "1.13.1" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3" + dependencies: + asn1 "~0.2.3" + assert-plus "^1.0.0" + dashdash "^1.12.0" + getpass "^0.1.1" + optionalDependencies: + bcrypt-pbkdf "^1.0.0" + ecc-jsbn "~0.1.1" + jsbn "~0.1.0" + tweetnacl "~0.14.0" + +ssri@^5.2.4: + version "5.2.4" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.2.4.tgz#9985e14041e65fc397af96542be35724ac11da52" + dependencies: + safe-buffer "^5.1.1" + +static-extend@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" + dependencies: + define-property "^0.2.5" + object-copy "^0.1.0" + +"statuses@>= 1.3.1 < 2": + version "1.4.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087" + +statuses@~1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e" + +stdout-stream@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.0.tgz#a2c7c8587e54d9427ea9edb3ac3f2cd522df378b" + dependencies: + readable-stream "^2.0.1" + +stream-browserify@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db" + dependencies: + inherits "~2.0.1" + readable-stream "^2.0.2" + +stream-each@^1.1.0: + version "1.2.2" + resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.2.tgz#8e8c463f91da8991778765873fe4d960d8f616bd" + dependencies: + end-of-stream "^1.1.0" + stream-shift "^1.0.0" + +stream-http@^2.7.2: + version "2.8.0" + resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.0.tgz#fd86546dac9b1c91aff8fc5d287b98fafb41bc10" + dependencies: + builtin-status-codes "^3.0.0" + inherits "^2.0.1" + readable-stream "^2.3.3" + to-arraybuffer "^1.0.0" + xtend "^4.0.0" + +stream-shift@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952" + +strict-uri-encode@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" + +string-width@^1.0.1, string-width@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + dependencies: + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" + +string-width@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" + dependencies: + is-fullwidth-code-point "^2.0.0" + strip-ansi "^4.0.0" + +string_decoder@^1.0.0, string_decoder@~1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" + dependencies: + safe-buffer "~5.1.0" + +string_decoder@~0.10.x: + version "0.10.31" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + +stringstream@~0.0.4, stringstream@~0.0.5: + version "0.0.5" + resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" + +strip-ansi@^3.0.0, strip-ansi@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + dependencies: + ansi-regex "^2.0.0" + +strip-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" + dependencies: + ansi-regex "^3.0.0" + +strip-bom@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" + dependencies: + is-utf8 "^0.2.0" + +strip-bom@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" + +strip-eof@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" + +strip-indent@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2" + dependencies: + get-stdin "^4.0.1" + +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + +style-loader@^0.19.1: + version "0.19.1" + resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.19.1.tgz#591ffc80bcefe268b77c5d9ebc0505d772619f85" + dependencies: + loader-utils "^1.0.2" + schema-utils "^0.3.0" + +stylus-loader@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-3.0.2.tgz#27a706420b05a38e038e7cacb153578d450513c6" + dependencies: + loader-utils "^1.0.2" + lodash.clonedeep "^4.5.0" + when "~3.6.x" + +stylus@^0.54.5: + version "0.54.5" + resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.5.tgz#42b9560931ca7090ce8515a798ba9e6aa3d6dc79" + dependencies: + css-parse "1.7.x" + debug "*" + glob "7.0.x" + mkdirp "0.5.x" + sax "0.5.x" + source-map "0.1.x" + +supports-color@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" + +supports-color@^3.2.3: + version "3.2.3" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6" + dependencies: + has-flag "^1.0.0" + +supports-color@^4.0.0, supports-color@^4.2.1: + version "4.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b" + dependencies: + has-flag "^2.0.0" + +supports-color@^5.1.0, supports-color@^5.2.0, supports-color@^5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.3.0.tgz#5b24ac15db80fa927cf5227a4a33fd3c4c7676c0" + dependencies: + has-flag "^3.0.0" + +svgo@^0.7.0: + version "0.7.2" + resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5" + dependencies: + coa "~1.0.1" + colors "~1.1.2" + csso "~2.3.1" + js-yaml "~3.7.0" + mkdirp "~0.5.1" + sax "~1.2.1" + whet.extend "~0.9.9" + +symbol-observable@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4" + +tapable@^0.2.7: + version "0.2.8" + resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22" + +tar-pack@^3.4.0: + version "3.4.1" + resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f" + dependencies: + debug "^2.2.0" + fstream "^1.0.10" + fstream-ignore "^1.0.5" + once "^1.3.3" + readable-stream "^2.1.4" + rimraf "^2.5.1" + tar "^2.2.1" + uid-number "^0.0.6" + +tar@^2.0.0, tar@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" + dependencies: + block-stream "*" + fstream "^1.0.2" + inherits "2" + +through2@^2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be" + dependencies: + readable-stream "^2.1.5" + xtend "~4.0.1" + +thunky@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.2.tgz#a862e018e3fb1ea2ec3fce5d55605cf57f247371" + +time-stamp@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-2.0.0.tgz#95c6a44530e15ba8d6f4a3ecb8c3a3fac46da357" + +timers-browserify@^2.0.4: + version "2.0.6" + resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.6.tgz#241e76927d9ca05f4d959819022f5b3664b64bae" + dependencies: + setimmediate "^1.0.4" + +to-arraybuffer@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" + +to-fast-properties@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" + +to-object-path@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" + dependencies: + kind-of "^3.0.2" + +to-regex-range@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" + dependencies: + is-number "^3.0.0" + repeat-string "^1.6.1" + +to-regex@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" + dependencies: + define-property "^2.0.2" + extend-shallow "^3.0.2" + regex-not "^1.0.2" + safe-regex "^1.1.0" + +toposort@^1.0.0: + version "1.0.6" + resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.6.tgz#c31748e55d210effc00fdcdc7d6e68d7d7bb9cec" + +tough-cookie@~2.3.0, tough-cookie@~2.3.3: + version "2.3.4" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655" + dependencies: + punycode "^1.4.1" + +tree-kill@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36" + +trim-newlines@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" + +trim-right@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" + +"true-case-path@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.2.tgz#7ec91130924766c7f573be3020c34f8fdfd00d62" + dependencies: + glob "^6.0.4" + +tsickle@^0.27.2: + version "0.27.2" + resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.27.2.tgz#f33d46d046f73dd5c155a37922e422816e878736" + dependencies: + minimist "^1.2.0" + mkdirp "^0.5.1" + source-map "^0.6.0" + source-map-support "^0.5.0" + +tslib@^1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8" + +tty-browserify@0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" + +tunnel-agent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + dependencies: + safe-buffer "^5.0.1" + +tunnel-agent@~0.4.1: + version "0.4.3" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb" + +tweetnacl@^0.14.3, tweetnacl@~0.14.0: + version "0.14.5" + resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" + +type-is@~1.6.15: + version "1.6.16" + resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194" + dependencies: + media-typer "0.3.0" + mime-types "~2.1.18" + +typedarray@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" + +"typescript@file:../../node_modules/typescript": + version "2.7.2" + +typescript@~2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4" + +uglify-es@^3.3.4: + version "3.3.9" + resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677" + dependencies: + commander "~2.13.0" + source-map "~0.6.1" + +uglify-js@3.3.x: + version "3.3.12" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.12.tgz#efd87c16a1f4c674a8a5ede571001ef634dcc883" + dependencies: + commander "~2.14.1" + source-map "~0.6.1" + +uglify-js@^2.8.29: + version "2.8.29" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd" + dependencies: + source-map "~0.5.1" + yargs "~3.10.0" + optionalDependencies: + uglify-to-browserify "~1.0.0" + +uglify-to-browserify@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" + +uglifyjs-webpack-plugin@^0.4.6: + version "0.4.6" + resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309" + dependencies: + source-map "^0.5.6" + uglify-js "^2.8.29" + webpack-sources "^1.0.1" + +uglifyjs-webpack-plugin@^1.1.5: + version "1.2.2" + resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.2.tgz#e7516d4367afdb715c3847841eb46f94c45ca2b9" + dependencies: + cacache "^10.0.1" + find-cache-dir "^1.0.0" + schema-utils "^0.4.2" + serialize-javascript "^1.4.0" + source-map "^0.6.1" + uglify-es "^3.3.4" + webpack-sources "^1.1.0" + worker-farm "^1.5.2" + +uid-number@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81" + +union-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4" + dependencies: + arr-union "^3.1.0" + get-value "^2.0.6" + is-extendable "^0.1.1" + set-value "^0.4.3" + +uniq@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff" + +uniqid@^4.0.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/uniqid/-/uniqid-4.1.1.tgz#89220ddf6b751ae52b5f72484863528596bb84c1" + dependencies: + macaddress "^0.2.8" + +uniqs@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02" + +unique-filename@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.0.tgz#d05f2fe4032560871f30e93cbe735eea201514f3" + dependencies: + unique-slug "^2.0.0" + +unique-slug@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.0.tgz#db6676e7c7cc0629878ff196097c78855ae9f4ab" + dependencies: + imurmurhash "^0.1.4" + +universalify@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7" + +unpipe@1.0.0, unpipe@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + +unset-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" + dependencies: + has-value "^0.3.1" + isobject "^3.0.0" + +upath@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.4.tgz#ee2321ba0a786c50973db043a50b7bcba822361d" + +upper-case@^1.1.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598" + +urix@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" + +url-loader@^0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.6.2.tgz#a007a7109620e9d988d14bce677a1decb9a993f7" + dependencies: + loader-utils "^1.0.2" + mime "^1.4.1" + schema-utils "^0.3.0" + +url-parse@1.0.x: + version "1.0.5" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.0.5.tgz#0854860422afdcfefeb6c965c662d4800169927b" + dependencies: + querystringify "0.0.x" + requires-port "1.0.x" + +url-parse@^1.1.8: + version "1.2.0" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.2.0.tgz#3a19e8aaa6d023ddd27dcc44cb4fc8f7fec23986" + dependencies: + querystringify "~1.0.0" + requires-port "~1.0.0" + +url@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" + dependencies: + punycode "1.3.2" + querystring "0.2.0" + +use@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/use/-/use-2.0.2.tgz#ae28a0d72f93bf22422a18a2e379993112dec8e8" + dependencies: + define-property "^0.2.5" + isobject "^3.0.0" + lazy-cache "^2.0.2" + +util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + +util@0.10.3, util@^0.10.3: + version "0.10.3" + resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" + dependencies: + inherits "2.0.1" + +utila@~0.3: + version "0.3.3" + resolved "https://registry.yarnpkg.com/utila/-/utila-0.3.3.tgz#d7e8e7d7e309107092b05f8d9688824d633a4226" + +utila@~0.4: + version "0.4.0" + resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c" + +utils-merge@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" + +uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14" + +validate-npm-package-license@^3.0.1: + version "3.0.3" + resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338" + dependencies: + spdx-correct "^3.0.0" + spdx-expression-parse "^3.0.0" + +vary@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" + +vendors@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.1.tgz#37ad73c8ee417fb3d580e785312307d274847f22" + +verror@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" + dependencies: + assert-plus "^1.0.0" + core-util-is "1.0.2" + extsprintf "^1.2.0" + +vlq@^0.2.1: + version "0.2.3" + resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26" + +vm-browserify@0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73" + dependencies: + indexof "0.0.1" + +watchpack@^1.4.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.5.0.tgz#231e783af830a22f8966f65c4c4bacc814072eed" + dependencies: + chokidar "^2.0.2" + graceful-fs "^4.1.2" + neo-async "^2.5.0" + +wbuf@^1.1.0, wbuf@^1.7.2: + version "1.7.2" + resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.2.tgz#d697b99f1f59512df2751be42769c1580b5801fe" + dependencies: + minimalistic-assert "^1.0.0" + +webpack-core@^0.6.8: + version "0.6.9" + resolved "https://registry.yarnpkg.com/webpack-core/-/webpack-core-0.6.9.tgz#fc571588c8558da77be9efb6debdc5a3b172bdc2" + dependencies: + source-list-map "~0.1.7" + source-map "~0.4.1" + +webpack-dev-middleware@1.12.2, webpack-dev-middleware@~1.12.0: + version "1.12.2" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.2.tgz#f8fc1120ce3b4fc5680ceecb43d777966b21105e" + dependencies: + memory-fs "~0.4.1" + mime "^1.5.0" + path-is-absolute "^1.0.0" + range-parser "^1.0.3" + time-stamp "^2.0.0" + +webpack-dev-server@~2.11.0: + version "2.11.2" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.11.2.tgz#1f4f4c78bf1895378f376815910812daf79a216f" + dependencies: + ansi-html "0.0.7" + array-includes "^3.0.3" + bonjour "^3.5.0" + chokidar "^2.0.0" + compression "^1.5.2" + connect-history-api-fallback "^1.3.0" + debug "^3.1.0" + del "^3.0.0" + express "^4.16.2" + html-entities "^1.2.0" + http-proxy-middleware "~0.17.4" + import-local "^1.0.0" + internal-ip "1.2.0" + ip "^1.1.5" + killable "^1.0.0" + loglevel "^1.4.1" + opn "^5.1.0" + portfinder "^1.0.9" + selfsigned "^1.9.1" + serve-index "^1.7.2" + sockjs "0.3.19" + sockjs-client "1.1.4" + spdy "^3.4.1" + strip-ansi "^3.0.0" + supports-color "^5.1.0" + webpack-dev-middleware "1.12.2" + yargs "6.6.0" + +webpack-merge@^4.1.0: + version "4.1.2" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.2.tgz#5d372dddd3e1e5f8874f5bf5a8e929db09feb216" + dependencies: + lodash "^4.17.5" + +webpack-sources@^1.0.0, webpack-sources@^1.0.1, webpack-sources@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54" + dependencies: + source-list-map "^2.0.0" + source-map "~0.6.1" + +webpack-subresource-integrity@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.0.4.tgz#8fac8a7e8eb59fc6a16768a85c9d94ee7f9d0edb" + dependencies: + webpack-core "^0.6.8" + +webpack@~3.10.0: + version "3.10.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.10.0.tgz#5291b875078cf2abf42bdd23afe3f8f96c17d725" + dependencies: + acorn "^5.0.0" + acorn-dynamic-import "^2.0.0" + ajv "^5.1.5" + ajv-keywords "^2.0.0" + async "^2.1.2" + enhanced-resolve "^3.4.0" + escope "^3.6.0" + interpret "^1.0.0" + json-loader "^0.5.4" + json5 "^0.5.1" + loader-runner "^2.3.0" + loader-utils "^1.1.0" + memory-fs "~0.4.1" + mkdirp "~0.5.0" + node-libs-browser "^2.0.0" + source-map "^0.5.3" + supports-color "^4.2.1" + tapable "^0.2.7" + uglifyjs-webpack-plugin "^0.4.6" + watchpack "^1.4.0" + webpack-sources "^1.0.1" + yargs "^8.0.2" + +websocket-driver@>=0.5.1: + version "0.7.0" + resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb" + dependencies: + http-parser-js ">=0.4.0" + websocket-extensions ">=0.1.1" + +websocket-extensions@>=0.1.1: + version "0.1.3" + resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29" + +when@~3.6.x: + version "3.6.4" + resolved "https://registry.yarnpkg.com/when/-/when-3.6.4.tgz#473b517ec159e2b85005497a13983f095412e34e" + +whet.extend@~0.9.9: + version "0.9.9" + resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1" + +which-module@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" + +which-module@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" + +which@1, which@^1.2.9: + version "1.3.0" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a" + dependencies: + isexe "^2.0.0" + +wide-align@^1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710" + dependencies: + string-width "^1.0.2" + +window-size@0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d" + +wordwrap@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" + +worker-farm@^1.5.2: + version "1.5.4" + resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.5.4.tgz#4debbe46b40edefcc717ebde74a90b1ae1e909a1" + dependencies: + errno "~0.1.7" + xtend "~4.0.1" + +wrap-ansi@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" + dependencies: + string-width "^1.0.1" + strip-ansi "^3.0.1" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + +xml-char-classes@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/xml-char-classes/-/xml-char-classes-1.0.0.tgz#64657848a20ffc5df583a42ad8a277b4512bbc4d" + +xtend@^4.0.0, xtend@~4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" + +xxhashjs@^0.2.1: + version "0.2.2" + resolved "https://registry.yarnpkg.com/xxhashjs/-/xxhashjs-0.2.2.tgz#8a6251567621a1c46a5ae204da0249c7f8caa9d8" + dependencies: + cuint "^0.2.2" + +y18n@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" + +y18n@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" + +yallist@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" + +yargs-parser@^4.2.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c" + dependencies: + camelcase "^3.0.0" + +yargs-parser@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a" + dependencies: + camelcase "^3.0.0" + +yargs-parser@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9" + dependencies: + camelcase "^4.1.0" + +yargs@6.6.0: + version "6.6.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208" + dependencies: + camelcase "^3.0.0" + cliui "^3.2.0" + decamelize "^1.1.1" + get-caller-file "^1.0.1" + os-locale "^1.4.0" + read-pkg-up "^1.0.1" + require-directory "^2.1.1" + require-main-filename "^1.0.1" + set-blocking "^2.0.0" + string-width "^1.0.2" + which-module "^1.0.0" + y18n "^3.2.1" + yargs-parser "^4.2.0" + +yargs@^7.0.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8" + dependencies: + camelcase "^3.0.0" + cliui "^3.2.0" + decamelize "^1.1.1" + get-caller-file "^1.0.1" + os-locale "^1.4.0" + read-pkg-up "^1.0.1" + require-directory "^2.1.1" + require-main-filename "^1.0.1" + set-blocking "^2.0.0" + string-width "^1.0.2" + which-module "^1.0.0" + y18n "^3.2.1" + yargs-parser "^5.0.0" + +yargs@^8.0.2: + version "8.0.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360" + dependencies: + camelcase "^4.1.0" + cliui "^3.2.0" + decamelize "^1.1.1" + get-caller-file "^1.0.1" + os-locale "^2.0.0" + read-pkg-up "^2.0.0" + require-directory "^2.1.1" + require-main-filename "^1.0.1" + set-blocking "^2.0.0" + string-width "^2.0.0" + which-module "^2.0.0" + y18n "^3.2.1" + yargs-parser "^7.0.0" + +yargs@~3.10.0: + version "3.10.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1" + dependencies: + camelcase "^1.0.2" + cliui "^2.1.0" + decamelize "^1.0.0" + window-size "0.1.0" + +"zone.js@file:../../node_modules/zone.js": + version "0.8.20" diff --git a/integration/hello_world__render3__closure/yarn.lock b/integration/hello_world__render3__closure/yarn.lock index 1f229724ed..babaa93ef6 100644 --- a/integration/hello_world__render3__closure/yarn.lock +++ b/integration/hello_world__render3__closure/yarn.lock @@ -868,9 +868,9 @@ globby@^5.0.0: pify "^2.0.0" pinkie-promise "^2.0.0" -google-closure-compiler@20180101.0.0: - version "20180101.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20180101.0.0.tgz#d1d817dc60e008be94b61be7073aa63e92978e64" +google-closure-compiler@20171023.0.1: + version "20171023.0.1" + resolved "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20171023.0.1.tgz#8d0df115e7481902dac3019e55010b6004d29eb5" dependencies: chalk "^1.0.0" vinyl "^2.0.1" diff --git a/integration/hello_world__render3__rollup/yarn.lock b/integration/hello_world__render3__rollup/yarn.lock index 3baf68aaa4..bd77301795 100644 --- a/integration/hello_world__render3__rollup/yarn.lock +++ b/integration/hello_world__render3__rollup/yarn.lock @@ -12,43 +12,43 @@ webpack-sources "^1.0.1" "@angular/animations@file:../../dist/packages-dist/animations": - version "6.0.0-beta.3-0b1f5d2127" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/common@file:../../dist/packages-dist/common": - version "6.0.0-beta.3-0b1f5d2127" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli": - version "6.0.0-beta.3-0b1f5d2127" + version "6.0.0-beta.7-8203e0365a" dependencies: chokidar "^1.4.2" minimist "^1.2.0" reflect-metadata "^0.1.2" - tsickle "^0.26.0" + tsickle "^0.27.2" "@angular/compiler@file:../../dist/packages-dist/compiler": - version "6.0.0-beta.3-0b1f5d2127" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/core@file:../../dist/packages-dist/core": - version "6.0.0-beta.3-0b1f5d2127" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/platform-browser@file:../../dist/packages-dist/platform-browser": - version "6.0.0-beta.3-0b1f5d2127" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/platform-server@file:../../dist/packages-dist/platform-server": - version "6.0.0-beta.3-0b1f5d2127" + version "6.0.0-beta.7-8203e0365a" dependencies: - domino "^1.0.29" - tslib "^1.7.1" + domino "^2.0.1" + tslib "^1.9.0" xhr2 "^0.1.4" "@types/jasmine@2.5.41": @@ -605,9 +605,9 @@ dev-ip@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/dev-ip/-/dev-ip-1.0.1.tgz#a76a3ed1855be7a012bb8ac16cb80f3c00dc28f0" -domino@^1.0.29: - version "1.0.30" - resolved "https://registry.yarnpkg.com/domino/-/domino-1.0.30.tgz#54a4154ecae968616680f8feba3cedff355c71f4" +domino@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/domino/-/domino-2.0.1.tgz#9e1d63215d0fe8dcb8202bff07effa1a216db504" easy-extender@2.3.2: version "2.3.2" @@ -1868,9 +1868,9 @@ rx@4.1.0: resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782" "rxjs@file:../../node_modules/rxjs": - version "5.5.5" + version "6.0.0-alpha.4" dependencies: - symbol-observable "1.0.1" + tslib "^1.9.0" safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.1" @@ -2037,7 +2037,13 @@ source-list-map@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085" -source-map-support@^0.4.2, source-map-support@~0.4.0: +source-map-support@^0.5.0: + version "0.5.3" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.3.tgz#2b3d5fff298cfa4d1afd7d4352d569e9a0158e76" + dependencies: + source-map "^0.6.0" + +source-map-support@~0.4.0: version "0.4.18" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" dependencies: @@ -2047,7 +2053,7 @@ source-map@^0.5.6: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" -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" @@ -2152,10 +2158,6 @@ supports-color@^3.2.3: dependencies: has-flag "^1.0.0" -symbol-observable@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4" - tar-pack@^3.4.0: version "3.4.1" resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f" @@ -2208,16 +2210,16 @@ tree-kill@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36" -tsickle@^0.26.0: - version "0.26.0" - resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.26.0.tgz#40b30a2dd6abcb33b182e37596674bd1cfe4039c" +tsickle@^0.27.2: + version "0.27.2" + resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.27.2.tgz#f33d46d046f73dd5c155a37922e422816e878736" dependencies: minimist "^1.2.0" mkdirp "^0.5.1" - source-map "^0.5.6" - source-map-support "^0.4.2" + source-map "^0.6.0" + source-map-support "^0.5.0" -tslib@^1.7.1: +tslib@^1.9.0: version "1.9.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8" @@ -2231,8 +2233,12 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0: version "0.14.5" resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" -"typescript@file:../../node_modules/typescript", typescript@~2.6.2: +"typescript@file:../../node_modules/typescript": + version "2.7.2" + +typescript@~2.6.2: version "2.6.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4" ua-parser-js@0.7.12: version "0.7.12" diff --git a/integration/hello_world__systemjs_umd/package.json b/integration/hello_world__systemjs_umd/package.json index d8d1e7da26..6b53c8326b 100644 --- a/integration/hello_world__systemjs_umd/package.json +++ b/integration/hello_world__systemjs_umd/package.json @@ -16,7 +16,7 @@ "@angular/compiler": "file:../../dist/packages-dist/compiler", "@angular/platform-browser": "file:../../dist/packages-dist/platform-browser", "@angular/platform-browser-dynamic": "file:../../dist/packages-dist/platform-browser-dynamic", - "core-js": "2.4.1", + "core-js": "file:../../node_modules/core-js", "plugin-typescript": "8.0.0", "rxjs": "file:../../node_modules/rxjs", "systemjs": "0.20.2", diff --git a/integration/hello_world__systemjs_umd/src/systemjs.config.js b/integration/hello_world__systemjs_umd/src/systemjs.config.js index 82075dd829..9f4c143296 100644 --- a/integration/hello_world__systemjs_umd/src/systemjs.config.js +++ b/integration/hello_world__systemjs_umd/src/systemjs.config.js @@ -34,12 +34,12 @@ 'typescript': 'npm:typescript/lib/typescript.js', }, packages: { - app: { - defaultExtension: 'ts' - }, - rxjs: { - defaultExtension: 'js' - } + 'app': { defaultExtension: 'ts' }, + 'rxjs/ajax': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs/operators': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs/testing': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs/websocket': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs': { main: 'index.js', defaultExtension: 'js' }, } }); })(this); \ No newline at end of file diff --git a/integration/hello_world__systemjs_umd/yarn.lock b/integration/hello_world__systemjs_umd/yarn.lock index e4080e2595..03ca236930 100644 --- a/integration/hello_world__systemjs_umd/yarn.lock +++ b/integration/hello_world__systemjs_umd/yarn.lock @@ -3,29 +3,29 @@ "@angular/common@file:../../dist/packages-dist/common": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/compiler@file:../../dist/packages-dist/compiler": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/core@file:../../dist/packages-dist/core": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/platform-browser-dynamic@file:../../dist/packages-dist/platform-browser-dynamic": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/platform-browser@file:../../dist/packages-dist/platform-browser": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@types/jasmine@2.5.41": version "2.5.41" @@ -479,9 +479,8 @@ cookie@0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb" -core-js@2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e" +"core-js@file:../../node_modules/core-js": + version "2.5.1" core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -1788,9 +1787,9 @@ rx@4.1.0: resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782" "rxjs@file:../../node_modules/rxjs": - version "5.5.5" + version "6.0.0-alpha.4" dependencies: - symbol-observable "1.0.1" + tslib "^1.9.0" safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.1" @@ -2064,10 +2063,6 @@ supports-color@^3.2.3: dependencies: has-flag "^1.0.0" -symbol-observable@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4" - systemjs@0.20.2: version "0.20.2" resolved "https://registry.yarnpkg.com/systemjs/-/systemjs-0.20.2.tgz#9e351656489d5311b3b498d3444d4d880e29c83f" @@ -2124,9 +2119,9 @@ tree-kill@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36" -tslib@^1.7.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.8.1.tgz#6946af2d1d651a7b1863b531d6e5afa41aa44eac" +tslib@^1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8" tunnel-agent@^0.6.0: version "0.6.0" @@ -2139,7 +2134,7 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0: resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" "typescript@file:../../node_modules/typescript": - version "2.6.2" + version "2.7.2" ua-parser-js@0.7.12: version "0.7.12" @@ -2334,4 +2329,4 @@ yeast@0.1.2: resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" "zone.js@file:../../node_modules/zone.js": - version "0.8.17" + version "0.8.20" diff --git a/integration/i18n/yarn.lock b/integration/i18n/yarn.lock index 9f1585a723..3316e73583 100644 --- a/integration/i18n/yarn.lock +++ b/integration/i18n/yarn.lock @@ -3,43 +3,43 @@ "@angular/animations@file:../../dist/packages-dist/animations": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/common@file:../../dist/packages-dist/common": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: chokidar "^1.4.2" minimist "^1.2.0" reflect-metadata "^0.1.2" - tsickle "^0.26.0" + tsickle "^0.27.2" "@angular/compiler@file:../../dist/packages-dist/compiler": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/core@file:../../dist/packages-dist/core": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/platform-browser@file:../../dist/packages-dist/platform-browser": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/platform-server@file:../../dist/packages-dist/platform-server": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - domino "^1.0.29" - tslib "^1.7.1" + domino "^2.0.1" + tslib "^1.9.0" xhr2 "^0.1.4" "@types/jasmine@2.5.41": @@ -612,9 +612,9 @@ dev-ip@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/dev-ip/-/dev-ip-1.0.1.tgz#a76a3ed1855be7a012bb8ac16cb80f3c00dc28f0" -domino@^1.0.29: - version "1.0.30" - resolved "https://registry.yarnpkg.com/domino/-/domino-1.0.30.tgz#54a4154ecae968616680f8feba3cedff355c71f4" +domino@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/domino/-/domino-2.0.1.tgz#9e1d63215d0fe8dcb8202bff07effa1a216db504" easy-extender@2.3.2: version "2.3.2" @@ -1835,9 +1835,9 @@ rx@4.1.0: resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782" "rxjs@file:../../node_modules/rxjs": - version "5.5.5" + version "6.0.0-alpha.4" dependencies: - symbol-observable "1.0.1" + tslib "^1.9.0" safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.1" @@ -2000,7 +2000,13 @@ socket.io@2.0.4: socket.io-client "2.0.4" socket.io-parser "~3.1.1" -source-map-support@^0.4.2, source-map-support@~0.4.0: +source-map-support@^0.5.0: + version "0.5.3" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.3.tgz#2b3d5fff298cfa4d1afd7d4352d569e9a0158e76" + dependencies: + source-map "^0.6.0" + +source-map-support@~0.4.0: version "0.4.18" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" dependencies: @@ -2010,6 +2016,10 @@ source-map@^0.5.1, source-map@^0.5.6: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" +source-map@^0.6.0: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + spawn-command@^0.0.2-1: version "0.0.2" resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2.tgz#9544e1a43ca045f8531aac1a48cb29bdae62338e" @@ -2111,10 +2121,6 @@ supports-color@^3.2.3: dependencies: has-flag "^1.0.0" -symbol-observable@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4" - tar-pack@^3.4.0: version "3.4.1" resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f" @@ -2174,18 +2180,18 @@ tree-kill@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36" -tsickle@^0.26.0: - version "0.26.0" - resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.26.0.tgz#40b30a2dd6abcb33b182e37596674bd1cfe4039c" +tsickle@^0.27.2: + version "0.27.2" + resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.27.2.tgz#f33d46d046f73dd5c155a37922e422816e878736" dependencies: minimist "^1.2.0" mkdirp "^0.5.1" - source-map "^0.5.6" - source-map-support "^0.4.2" + source-map "^0.6.0" + source-map-support "^0.5.0" -tslib@^1.7.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.8.1.tgz#6946af2d1d651a7b1863b531d6e5afa41aa44eac" +tslib@^1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8" tunnel-agent@^0.6.0: version "0.6.0" @@ -2198,7 +2204,7 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0: resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" "typescript@file:../../node_modules/typescript": - version "2.6.2" + version "2.7.2" ua-parser-js@0.7.12: version "0.7.12" @@ -2418,4 +2424,4 @@ yeast@0.1.2: resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" "zone.js@file:../../node_modules/zone.js": - version "0.8.17" + version "0.8.20" diff --git a/integration/injectable-def/yarn.lock b/integration/injectable-def/yarn.lock new file mode 100644 index 0000000000..7eb45684c7 --- /dev/null +++ b/integration/injectable-def/yarn.lock @@ -0,0 +1,2388 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@angular/animations@file:../../dist/packages-dist/animations": + version "6.0.0-beta.7-8203e0365a" + dependencies: + tslib "^1.9.0" + +"@angular/common@file:../../dist/packages-dist/common": + version "6.0.0-beta.7-8203e0365a" + dependencies: + tslib "^1.9.0" + +"@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli": + version "6.0.0-beta.7-8203e0365a" + dependencies: + chokidar "^1.4.2" + minimist "^1.2.0" + reflect-metadata "^0.1.2" + tsickle "^0.27.2" + +"@angular/compiler@file:../../dist/packages-dist/compiler": + version "6.0.0-beta.7-8203e0365a" + dependencies: + tslib "^1.9.0" + +"@angular/core@file:../../dist/packages-dist/core": + version "6.0.0-beta.7-8203e0365a" + dependencies: + tslib "^1.9.0" + +"@angular/http@file:../../dist/packages-dist/http": + version "6.0.0-beta.7-8203e0365a" + dependencies: + tslib "^1.9.0" + +"@angular/platform-browser-dynamic@file:../../dist/packages-dist/platform-browser-dynamic": + version "6.0.0-beta.7-8203e0365a" + dependencies: + tslib "^1.9.0" + +"@angular/platform-browser@file:../../dist/packages-dist/platform-browser": + version "6.0.0-beta.7-8203e0365a" + dependencies: + tslib "^1.9.0" + +"@angular/platform-server@file:../../dist/packages-dist/platform-server": + version "6.0.0-beta.7-8203e0365a" + dependencies: + domino "^2.0.1" + tslib "^1.9.0" + xhr2 "^0.1.4" + +"@types/jasmine@2.5.41": + version "2.5.41" + resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.5.41.tgz#d5e86161a0af80d52062b310a33ed65b051a0713" + +"@types/node@^6.0.46": + version "6.0.101" + resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.101.tgz#0c5911cfb434af4a51c0a499931fe6423207d921" + +"@types/node@^9.4.0": + version "9.4.6" + resolved "https://registry.yarnpkg.com/@types/node/-/node-9.4.6.tgz#d8176d864ee48753d053783e4e463aec86b8d82e" + +"@types/q@^0.0.32": + version "0.0.32" + resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5" + +"@types/selenium-webdriver@^2.53.35", "@types/selenium-webdriver@~2.53.39": + version "2.53.43" + resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-2.53.43.tgz#2de3d718819bc20165754c4a59afb7e9833f6707" + +abbrev@1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" + +accepts@~1.3.3, accepts@~1.3.4: + version "1.3.5" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2" + dependencies: + mime-types "~2.1.18" + negotiator "0.6.1" + +adm-zip@0.4.4: + version "0.4.4" + resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.4.tgz#a61ed5ae6905c3aea58b3a657d25033091052736" + +adm-zip@^0.4.7: + version "0.4.7" + resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.7.tgz#8606c2cbf1c426ce8c8ec00174447fd49b6eafc1" + +after@0.8.2: + version "0.8.2" + resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f" + +agent-base@2: + version "2.1.1" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-2.1.1.tgz#d6de10d5af6132d5bd692427d46fc538539094c7" + dependencies: + extend "~3.0.0" + semver "~5.0.1" + +ajv@^4.9.1: + version "4.11.8" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536" + dependencies: + co "^4.6.0" + json-stable-stringify "^1.0.1" + +ajv@^5.1.0: + version "5.5.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" + dependencies: + co "^4.6.0" + fast-deep-equal "^1.0.0" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.3.0" + +ansi-regex@^0.2.0, ansi-regex@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9" + +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + +ansi-styles@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de" + +ansi-styles@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" + +anymatch@^1.3.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a" + dependencies: + micromatch "^2.1.5" + normalize-path "^2.0.0" + +aproba@^1.0.3: + version "1.2.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" + +are-we-there-yet@~1.1.2: + version "1.1.4" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d" + dependencies: + delegates "^1.0.0" + readable-stream "^2.0.6" + +arr-diff@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf" + dependencies: + arr-flatten "^1.0.1" + +arr-flatten@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" + +array-union@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" + dependencies: + array-uniq "^1.0.1" + +array-uniq@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" + +array-unique@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" + +arraybuffer.slice@~0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675" + +arrify@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" + +asn1@~0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86" + +assert-plus@1.0.0, assert-plus@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" + +assert-plus@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234" + +async-each-series@0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/async-each-series/-/async-each-series-0.1.1.tgz#7617c1917401fd8ca4a28aadce3dbae98afeb432" + +async-each@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" + +async-limiter@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8" + +async@1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" + +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + +aws-sign2@~0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f" + +aws-sign2@~0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" + +aws4@^1.2.1, aws4@^1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e" + +backo2@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947" + +balanced-match@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" + +base64-arraybuffer@0.1.5: + version "0.1.5" + resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8" + +base64id@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6" + +batch@0.5.3: + version "0.5.3" + resolved "https://registry.yarnpkg.com/batch/-/batch-0.5.3.tgz#3f3414f380321743bfc1042f9a83ff1d5824d464" + +bcrypt-pbkdf@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d" + dependencies: + tweetnacl "^0.14.3" + +better-assert@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522" + dependencies: + callsite "1.0.0" + +binary-extensions@^1.0.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205" + +blob@0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.4.tgz#bcf13052ca54463f30f9fc7e95b9a47630a94921" + +block-stream@*: + version "0.0.9" + resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" + dependencies: + inherits "~2.0.0" + +blocking-proxy@0.0.5: + version "0.0.5" + resolved "https://registry.yarnpkg.com/blocking-proxy/-/blocking-proxy-0.0.5.tgz#462905e0dcfbea970f41aa37223dda9c07b1912b" + dependencies: + minimist "^1.2.0" + +boom@2.x.x: + version "2.10.1" + resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f" + dependencies: + hoek "2.x.x" + +boom@4.x.x: + version "4.3.1" + resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31" + dependencies: + hoek "4.x.x" + +boom@5.x.x: + version "5.2.0" + resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02" + dependencies: + hoek "4.x.x" + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +braces@^1.8.2: + version "1.8.5" + resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7" + dependencies: + expand-range "^1.8.1" + preserve "^0.2.0" + repeat-element "^1.1.2" + +browser-sync-ui@v1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/browser-sync-ui/-/browser-sync-ui-1.0.1.tgz#9740527b26d1d7ace259acc0c79e5b5e37d0fdf2" + dependencies: + async-each-series "0.1.1" + connect-history-api-fallback "^1.1.0" + immutable "^3.7.6" + server-destroy "1.0.1" + socket.io-client "2.0.4" + stream-throttle "^0.1.3" + +browser-sync@^2.12.3: + version "2.23.6" + resolved "https://registry.yarnpkg.com/browser-sync/-/browser-sync-2.23.6.tgz#ed0721c92e5b98c71b7bf839b39092ac9f220650" + dependencies: + browser-sync-ui v1.0.1 + bs-recipes "1.3.4" + chokidar "1.7.0" + connect "3.5.0" + connect-history-api-fallback "^1.5.0" + dev-ip "^1.0.1" + easy-extender "2.3.2" + eazy-logger "3.0.2" + emitter-steward "^1.0.0" + etag "^1.8.1" + fresh "^0.5.2" + fs-extra "3.0.1" + http-proxy "1.15.2" + immutable "3.8.2" + localtunnel "1.8.3" + micromatch "2.3.11" + opn "4.0.2" + portscanner "2.1.1" + qs "6.2.1" + resp-modifier "6.0.2" + rx "4.1.0" + serve-index "1.8.0" + serve-static "1.12.2" + server-destroy "1.0.1" + socket.io "2.0.4" + ua-parser-js "0.7.12" + yargs "6.4.0" + +bs-recipes@1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/bs-recipes/-/bs-recipes-1.3.4.tgz#0d2d4d48a718c8c044769fdc4f89592dc8b69585" + +builtin-modules@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" + +callsite@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20" + +camelcase@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39" + +camelcase@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" + +caseless@~0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" + +chalk@0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.5.1.tgz#663b3a648b68b55d04690d49167aa837858f2174" + dependencies: + ansi-styles "^1.1.0" + escape-string-regexp "^1.0.0" + has-ansi "^0.1.0" + strip-ansi "^0.3.0" + supports-color "^0.2.0" + +chalk@^1.1.1, chalk@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" + dependencies: + ansi-styles "^2.2.1" + escape-string-regexp "^1.0.2" + has-ansi "^2.0.0" + strip-ansi "^3.0.0" + supports-color "^2.0.0" + +chokidar@1.7.0, chokidar@^1.4.2: + version "1.7.0" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" + dependencies: + anymatch "^1.3.0" + async-each "^1.0.0" + glob-parent "^2.0.0" + inherits "^2.0.1" + is-binary-path "^1.0.0" + is-glob "^2.0.0" + path-is-absolute "^1.0.0" + readdirp "^2.0.0" + optionalDependencies: + fsevents "^1.0.0" + +cliui@^3.0.3, cliui@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" + dependencies: + string-width "^1.0.1" + strip-ansi "^3.0.1" + wrap-ansi "^2.0.0" + +co@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" + +code-point-at@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + +combined-stream@1.0.6, combined-stream@^1.0.5, combined-stream@~1.0.5: + version "1.0.6" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818" + dependencies: + delayed-stream "~1.0.0" + +commander@2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.6.0.tgz#9df7e52fb2a0cb0fb89058ee80c3104225f37e1d" + +commander@^2.2.0: + version "2.14.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa" + +component-bind@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1" + +component-emitter@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" + +component-inherit@0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143" + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + +concurrently@3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-3.4.0.tgz#60662b3defde07375bae19aac0ab780ec748ba79" + dependencies: + chalk "0.5.1" + commander "2.6.0" + date-fns "^1.23.0" + lodash "^4.5.1" + rx "2.3.24" + spawn-command "^0.0.2-1" + supports-color "^3.2.3" + tree-kill "^1.1.0" + +connect-history-api-fallback@^1.1.0, connect-history-api-fallback@^1.2.0, connect-history-api-fallback@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a" + +connect-logger@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/connect-logger/-/connect-logger-0.0.1.tgz#4d999978a1d20bb4608e7cd434d741652255174b" + dependencies: + moment "*" + +connect@3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/connect/-/connect-3.5.0.tgz#b357525a0b4c1f50599cd983e1d9efeea9677198" + dependencies: + debug "~2.2.0" + finalhandler "0.5.0" + parseurl "~1.3.1" + utils-merge "1.0.0" + +console-control-strings@^1.0.0, console-control-strings@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + +cookie@0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb" + +core-util-is@1.0.2, core-util-is@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + +cryptiles@2.x.x: + version "2.0.5" + resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8" + dependencies: + boom "2.x.x" + +cryptiles@3.x.x: + version "3.1.2" + resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe" + dependencies: + boom "5.x.x" + +dashdash@^1.12.0: + version "1.14.1" + resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" + dependencies: + assert-plus "^1.0.0" + +date-fns@^1.23.0: + version "1.29.0" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.29.0.tgz#12e609cdcb935127311d04d33334e2960a2a54e6" + +debug@2, debug@^2.2.0, debug@~2.6.4, debug@~2.6.6: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + dependencies: + ms "2.0.0" + +debug@2.6.4: + version "2.6.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.4.tgz#7586a9b3c39741c0282ae33445c4e8ac74734fe0" + dependencies: + ms "0.7.3" + +debug@2.6.8: + version "2.6.8" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc" + dependencies: + ms "2.0.0" + +debug@~2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da" + dependencies: + ms "0.7.1" + +debug@~3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" + dependencies: + ms "2.0.0" + +decamelize@^1.0.0, decamelize@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" + +deep-extend@~0.4.0: + version "0.4.2" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f" + +del@^2.2.0: + version "2.2.2" + resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8" + dependencies: + globby "^5.0.0" + is-path-cwd "^1.0.0" + is-path-in-cwd "^1.0.0" + object-assign "^4.0.1" + pify "^2.0.0" + pinkie-promise "^2.0.0" + rimraf "^2.2.8" + +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + +depd@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359" + +depd@~1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + +destroy@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" + +detect-libc@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + +dev-ip@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/dev-ip/-/dev-ip-1.0.1.tgz#a76a3ed1855be7a012bb8ac16cb80f3c00dc28f0" + +domino@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/domino/-/domino-2.0.1.tgz#9e1d63215d0fe8dcb8202bff07effa1a216db504" + +easy-extender@2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/easy-extender/-/easy-extender-2.3.2.tgz#3d3248febe2b159607316d8f9cf491c16648221d" + dependencies: + lodash "^3.10.1" + +eazy-logger@3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/eazy-logger/-/eazy-logger-3.0.2.tgz#a325aa5e53d13a2225889b2ac4113b2b9636f4fc" + dependencies: + tfunk "^3.0.1" + +ecc-jsbn@~0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505" + dependencies: + jsbn "~0.1.0" + +ee-first@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" + +emitter-steward@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/emitter-steward/-/emitter-steward-1.0.0.tgz#f3411ade9758a7565df848b2da0cbbd1b46cbd64" + +encodeurl@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + +engine.io-client@~3.1.0: + version "3.1.5" + resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.1.5.tgz#85de17666560327ef1817978f6e3f8101ded2c47" + dependencies: + component-emitter "1.2.1" + component-inherit "0.0.3" + debug "~3.1.0" + engine.io-parser "~2.1.1" + has-cors "1.1.0" + indexof "0.0.1" + parseqs "0.0.5" + parseuri "0.0.5" + ws "~3.3.1" + xmlhttprequest-ssl "~1.5.4" + yeast "0.1.2" + +engine.io-parser@~2.1.0, engine.io-parser@~2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.2.tgz#4c0f4cff79aaeecbbdcfdea66a823c6085409196" + dependencies: + after "0.8.2" + arraybuffer.slice "~0.0.7" + base64-arraybuffer "0.1.5" + blob "0.0.4" + has-binary2 "~1.0.2" + +engine.io@~3.1.0: + version "3.1.5" + resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.1.5.tgz#0e7ef9d690eb0b35597f1d4ad02a26ca2dba3845" + dependencies: + accepts "~1.3.4" + base64id "1.0.0" + cookie "0.3.1" + debug "~3.1.0" + engine.io-parser "~2.1.0" + ws "~3.3.1" + optionalDependencies: + uws "~9.14.0" + +error-ex@^1.2.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc" + dependencies: + is-arrayish "^0.2.1" + +escape-html@~1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" + +escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + +etag@^1.8.1, etag@~1.8.0: + version "1.8.1" + resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + +eventemitter3@1.x.x: + version "1.2.0" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508" + +exit@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" + +expand-brackets@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b" + dependencies: + is-posix-bracket "^0.1.0" + +expand-range@^1.8.1: + version "1.8.2" + resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337" + dependencies: + fill-range "^2.1.0" + +extend@3, extend@~3.0.0, extend@~3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444" + +extglob@^0.3.1: + version "0.3.2" + resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1" + dependencies: + is-extglob "^1.0.0" + +extsprintf@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" + +extsprintf@^1.2.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" + +fast-deep-equal@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614" + +fast-json-stable-stringify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" + +filename-regex@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" + +fill-range@^2.1.0: + version "2.2.3" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723" + dependencies: + is-number "^2.1.0" + isobject "^2.0.0" + randomatic "^1.1.3" + repeat-element "^1.1.2" + repeat-string "^1.5.2" + +finalhandler@0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-0.5.0.tgz#e9508abece9b6dba871a6942a1d7911b91911ac7" + dependencies: + debug "~2.2.0" + escape-html "~1.0.3" + on-finished "~2.3.0" + statuses "~1.3.0" + unpipe "~1.0.0" + +find-up@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" + dependencies: + path-exists "^2.0.0" + pinkie-promise "^2.0.0" + +for-in@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" + +for-own@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce" + dependencies: + for-in "^1.0.1" + +forever-agent@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" + +form-data@~2.1.1: + version "2.1.4" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1" + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.5" + mime-types "^2.1.12" + +form-data@~2.3.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099" + dependencies: + asynckit "^0.4.0" + combined-stream "1.0.6" + mime-types "^2.1.12" + +fresh@0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.0.tgz#f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e" + +fresh@^0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" + +fs-extra@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291" + dependencies: + graceful-fs "^4.1.2" + jsonfile "^3.0.0" + universalify "^0.1.0" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + +fsevents@^1.0.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8" + dependencies: + nan "^2.3.0" + node-pre-gyp "^0.6.39" + +fstream-ignore@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105" + dependencies: + fstream "^1.0.0" + inherits "2" + minimatch "^3.0.0" + +fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2: + version "1.0.11" + resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171" + dependencies: + graceful-fs "^4.1.2" + inherits "~2.0.0" + mkdirp ">=0.5 0" + rimraf "2" + +gauge@~2.7.3: + version "2.7.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" + dependencies: + aproba "^1.0.3" + console-control-strings "^1.0.0" + has-unicode "^2.0.0" + object-assign "^4.1.0" + signal-exit "^3.0.0" + string-width "^1.0.1" + strip-ansi "^3.0.1" + wide-align "^1.1.0" + +get-caller-file@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5" + +getpass@^0.1.1: + version "0.1.7" + resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" + dependencies: + assert-plus "^1.0.0" + +glob-base@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" + dependencies: + glob-parent "^2.0.0" + is-glob "^2.0.0" + +glob-parent@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28" + dependencies: + is-glob "^2.0.0" + +glob@^7.0.3, glob@^7.0.5, glob@^7.0.6: + version "7.1.2" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +globby@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d" + dependencies: + array-union "^1.0.1" + arrify "^1.0.0" + glob "^7.0.3" + object-assign "^4.0.1" + pify "^2.0.0" + pinkie-promise "^2.0.0" + +graceful-fs@^4.1.2, graceful-fs@^4.1.6: + version "4.1.11" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" + +har-schema@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e" + +har-schema@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" + +har-validator@~4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a" + dependencies: + ajv "^4.9.1" + har-schema "^1.0.5" + +har-validator@~5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd" + dependencies: + ajv "^5.1.0" + har-schema "^2.0.0" + +has-ansi@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-0.1.0.tgz#84f265aae8c0e6a88a12d7022894b7568894c62e" + dependencies: + ansi-regex "^0.2.0" + +has-ansi@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" + dependencies: + ansi-regex "^2.0.0" + +has-binary2@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.2.tgz#e83dba49f0b9be4d026d27365350d9f03f54be98" + dependencies: + isarray "2.0.1" + +has-cors@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39" + +has-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa" + +has-unicode@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + +hawk@3.1.3, hawk@~3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4" + dependencies: + boom "2.x.x" + cryptiles "2.x.x" + hoek "2.x.x" + sntp "1.x.x" + +hawk@~6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038" + dependencies: + boom "4.x.x" + cryptiles "3.x.x" + hoek "4.x.x" + sntp "2.x.x" + +hoek@2.x.x: + version "2.16.3" + resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed" + +hoek@4.x.x: + version "4.2.1" + resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb" + +hosted-git-info@^2.1.4: + version "2.5.0" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c" + +http-errors@~1.5.0: + version "1.5.1" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.5.1.tgz#788c0d2c1de2c81b9e6e8c01843b6b97eb920750" + dependencies: + inherits "2.0.3" + setprototypeof "1.0.2" + statuses ">= 1.3.1 < 2" + +http-errors@~1.6.1: + version "1.6.2" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736" + dependencies: + depd "1.1.1" + inherits "2.0.3" + setprototypeof "1.0.3" + statuses ">= 1.3.1 < 2" + +http-proxy@1.15.2: + version "1.15.2" + resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.15.2.tgz#642fdcaffe52d3448d2bda3b0079e9409064da31" + dependencies: + eventemitter3 "1.x.x" + requires-port "1.x.x" + +http-signature@~1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf" + dependencies: + assert-plus "^0.2.0" + jsprim "^1.2.2" + sshpk "^1.7.0" + +http-signature@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" + dependencies: + assert-plus "^1.0.0" + jsprim "^1.2.2" + sshpk "^1.7.0" + +https-proxy-agent@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz#35f7da6c48ce4ddbfa264891ac593ee5ff8671e6" + dependencies: + agent-base "2" + debug "2" + extend "3" + +immutable@3.8.2, immutable@^3.7.6: + version "3.8.2" + resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3" + +indexof@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d" + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@~2.0.0, inherits@~2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + +ini@^1.3.4, ini@~1.3.0: + version "1.3.5" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" + +invert-kv@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" + +is-arrayish@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + +is-binary-path@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" + dependencies: + binary-extensions "^1.0.0" + +is-buffer@^1.1.5: + version "1.1.6" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" + +is-builtin-module@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe" + dependencies: + builtin-modules "^1.0.0" + +is-dotfile@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" + +is-equal-shallow@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534" + dependencies: + is-primitive "^2.0.0" + +is-extendable@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" + +is-extglob@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" + +is-fullwidth-code-point@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + dependencies: + number-is-nan "^1.0.0" + +is-glob@^2.0.0, is-glob@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" + dependencies: + is-extglob "^1.0.0" + +is-number-like@^1.0.3: + version "1.0.8" + resolved "https://registry.yarnpkg.com/is-number-like/-/is-number-like-1.0.8.tgz#2e129620b50891042e44e9bbbb30593e75cfbbe3" + dependencies: + lodash.isfinite "^3.3.2" + +is-number@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" + dependencies: + kind-of "^3.0.2" + +is-number@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" + dependencies: + kind-of "^3.0.2" + +is-path-cwd@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d" + +is-path-in-cwd@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc" + dependencies: + is-path-inside "^1.0.0" + +is-path-inside@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036" + dependencies: + path-is-inside "^1.0.1" + +is-posix-bracket@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" + +is-primitive@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575" + +is-typedarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + +is-utf8@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" + +isarray@1.0.0, isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + +isarray@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e" + +isobject@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" + dependencies: + isarray "1.0.0" + +isstream@~0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" + +jasmine-core@~2.99.0: + version "2.99.1" + resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.99.1.tgz#e6400df1e6b56e130b61c4bcd093daa7f6e8ca15" + +jasmine@^2.5.3: + version "2.99.0" + resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.99.0.tgz#8ca72d102e639b867c6489856e0e18a9c7aa42b7" + dependencies: + exit "^0.1.2" + glob "^7.0.6" + jasmine-core "~2.99.0" + +jasminewd2@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.2.0.tgz#e37cf0b17f199cce23bea71b2039395246b4ec4e" + +jsbn@~0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" + +json-schema-traverse@^0.3.0: + version "0.3.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340" + +json-schema@0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" + +json-stable-stringify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" + dependencies: + jsonify "~0.0.0" + +json-stringify-safe@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" + +jsonfile@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66" + optionalDependencies: + graceful-fs "^4.1.6" + +jsonify@~0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" + +jsprim@^1.2.2: + version "1.4.1" + resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" + dependencies: + assert-plus "1.0.0" + extsprintf "1.3.0" + json-schema "0.2.3" + verror "1.10.0" + +kind-of@^3.0.2: + version "3.2.2" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" + dependencies: + is-buffer "^1.1.5" + +kind-of@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" + dependencies: + is-buffer "^1.1.5" + +lcid@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" + dependencies: + invert-kv "^1.0.0" + +limiter@^1.0.5: + version "1.1.2" + resolved "https://registry.yarnpkg.com/limiter/-/limiter-1.1.2.tgz#229d8055891c8b11af9e0ee5200e8e09bb3dcbeb" + +lite-server@2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/lite-server/-/lite-server-2.2.2.tgz#4644afe6c9146d850cfa0ad9a86a94f87156499e" + dependencies: + browser-sync "^2.12.3" + connect-history-api-fallback "^1.2.0" + connect-logger "0.0.1" + lodash "^4.11.1" + minimist "1.2.0" + +load-json-file@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0" + dependencies: + graceful-fs "^4.1.2" + parse-json "^2.2.0" + pify "^2.0.0" + pinkie-promise "^2.0.0" + strip-bom "^2.0.0" + +localtunnel@1.8.3: + version "1.8.3" + resolved "https://registry.yarnpkg.com/localtunnel/-/localtunnel-1.8.3.tgz#dcc5922fd85651037d4bde24fd93248d0b24eb05" + dependencies: + debug "2.6.8" + openurl "1.1.1" + request "2.81.0" + yargs "3.29.0" + +lodash.isfinite@^3.3.2: + version "3.3.2" + resolved "https://registry.yarnpkg.com/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz#fb89b65a9a80281833f0b7478b3a5104f898ebb3" + +lodash@^3.10.1: + version "3.10.1" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" + +lodash@^4.11.1, lodash@^4.5.1: + version "4.17.5" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511" + +micromatch@2.3.11, micromatch@^2.1.5: + version "2.3.11" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" + dependencies: + arr-diff "^2.0.0" + array-unique "^0.2.1" + braces "^1.8.2" + expand-brackets "^0.1.4" + extglob "^0.3.1" + filename-regex "^2.0.0" + is-extglob "^1.0.0" + is-glob "^2.0.1" + kind-of "^3.0.2" + normalize-path "^2.0.1" + object.omit "^2.0.0" + parse-glob "^3.0.4" + regex-cache "^0.4.2" + +mime-db@~1.33.0: + version "1.33.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" + +mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.7: + version "2.1.18" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8" + dependencies: + mime-db "~1.33.0" + +mime@1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53" + +minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + dependencies: + brace-expansion "^1.1.7" + +minimist@0.0.8: + version "0.0.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" + +minimist@1.2.0, minimist@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" + +minimist@~0.0.1: + version "0.0.10" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" + +"mkdirp@>=0.5 0", mkdirp@^0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" + dependencies: + minimist "0.0.8" + +moment@*: + version "2.20.1" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd" + +ms@0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098" + +ms@0.7.3: + version "0.7.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.3.tgz#708155a5e44e33f5fd0fc53e81d0d40a91be1fff" + +ms@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-1.0.0.tgz#59adcd22edc543f7b5381862d31387b1f4bc9473" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + +nan@^2.3.0: + version "2.9.2" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.9.2.tgz#f564d75f5f8f36a6d9456cca7a6c4fe488ab7866" + +negotiator@0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" + +node-pre-gyp@^0.6.39: + version "0.6.39" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649" + dependencies: + detect-libc "^1.0.2" + hawk "3.1.3" + mkdirp "^0.5.1" + nopt "^4.0.1" + npmlog "^4.0.2" + rc "^1.1.7" + request "2.81.0" + rimraf "^2.6.1" + semver "^5.3.0" + tar "^2.2.1" + tar-pack "^3.4.0" + +nopt@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" + dependencies: + abbrev "1" + osenv "^0.1.4" + +normalize-package-data@^2.3.2: + version "2.4.0" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" + dependencies: + hosted-git-info "^2.1.4" + is-builtin-module "^1.0.0" + semver "2 || 3 || 4 || 5" + validate-npm-package-license "^3.0.1" + +normalize-path@^2.0.0, normalize-path@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" + dependencies: + remove-trailing-separator "^1.0.1" + +npmlog@^4.0.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" + dependencies: + are-we-there-yet "~1.1.2" + console-control-strings "~1.1.0" + gauge "~2.7.3" + set-blocking "~2.0.0" + +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + +oauth-sign@~0.8.1, oauth-sign@~0.8.2: + version "0.8.2" + resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" + +object-assign@^4.0.1, object-assign@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + +object-component@0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291" + +object-path@^0.9.0: + version "0.9.2" + resolved "https://registry.yarnpkg.com/object-path/-/object-path-0.9.2.tgz#0fd9a74fc5fad1ae3968b586bda5c632bd6c05a5" + +object.omit@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" + dependencies: + for-own "^0.1.4" + is-extendable "^0.1.1" + +on-finished@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" + dependencies: + ee-first "1.1.1" + +once@^1.3.0, once@^1.3.3: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + dependencies: + wrappy "1" + +openurl@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/openurl/-/openurl-1.1.1.tgz#3875b4b0ef7a52c156f0db41d4609dbb0f94b387" + +opn@4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/opn/-/opn-4.0.2.tgz#7abc22e644dff63b0a96d5ab7f2790c0f01abc95" + dependencies: + object-assign "^4.0.1" + pinkie-promise "^2.0.0" + +optimist@~0.6.0: + version "0.6.1" + resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686" + dependencies: + minimist "~0.0.1" + wordwrap "~0.0.2" + +options@>=0.0.5: + version "0.0.6" + resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f" + +os-homedir@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" + +os-locale@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" + dependencies: + lcid "^1.0.0" + +os-tmpdir@^1.0.0, os-tmpdir@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" + +osenv@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" + dependencies: + os-homedir "^1.0.0" + os-tmpdir "^1.0.0" + +parse-glob@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" + dependencies: + glob-base "^0.3.0" + is-dotfile "^1.0.0" + is-extglob "^1.0.0" + is-glob "^2.0.0" + +parse-json@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" + dependencies: + error-ex "^1.2.0" + +parseqs@0.0.5: + version "0.0.5" + resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d" + dependencies: + better-assert "~1.0.0" + +parseuri@0.0.5: + version "0.0.5" + resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a" + dependencies: + better-assert "~1.0.0" + +parseurl@~1.3.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3" + +path-exists@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b" + dependencies: + pinkie-promise "^2.0.0" + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + +path-is-inside@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" + +path-type@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441" + dependencies: + graceful-fs "^4.1.2" + pify "^2.0.0" + pinkie-promise "^2.0.0" + +performance-now@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5" + +performance-now@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" + +pify@^2.0.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" + +pinkie-promise@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" + dependencies: + pinkie "^2.0.0" + +pinkie@^2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" + +portscanner@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/portscanner/-/portscanner-2.1.1.tgz#eabb409e4de24950f5a2a516d35ae769343fbb96" + dependencies: + async "1.5.2" + is-number-like "^1.0.3" + +preserve@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" + +process-nextick-args@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" + +"protractor@file:../../node_modules/protractor": + version "5.1.2" + dependencies: + "@types/node" "^6.0.46" + "@types/q" "^0.0.32" + "@types/selenium-webdriver" "~2.53.39" + blocking-proxy "0.0.5" + chalk "^1.1.3" + glob "^7.0.3" + jasmine "^2.5.3" + jasminewd2 "^2.1.0" + optimist "~0.6.0" + q "1.4.1" + saucelabs "~1.3.0" + selenium-webdriver "3.0.1" + source-map-support "~0.4.0" + webdriver-js-extender "^1.0.0" + webdriver-manager "^12.0.6" + +punycode@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" + +q@1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e" + +q@^1.4.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" + +qs@6.2.1: + version "6.2.1" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.1.tgz#ce03c5ff0935bc1d9d69a9f14cbd18e568d67625" + +qs@~6.4.0: + version "6.4.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233" + +qs@~6.5.1: + version "6.5.1" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8" + +randomatic@^1.1.3: + version "1.1.7" + resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c" + dependencies: + is-number "^3.0.0" + kind-of "^4.0.0" + +range-parser@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" + +rc@^1.1.7: + version "1.2.5" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.5.tgz#275cd687f6e3b36cc756baa26dfee80a790301fd" + dependencies: + deep-extend "~0.4.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + +read-pkg-up@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" + dependencies: + find-up "^1.0.0" + read-pkg "^1.0.0" + +read-pkg@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28" + dependencies: + load-json-file "^1.0.0" + normalize-package-data "^2.3.2" + path-type "^1.0.0" + +readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.4: + version "2.3.4" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.4.tgz#c946c3f47fa7d8eabc0b6150f4a12f69a4574071" + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.0.3" + util-deprecate "~1.0.1" + +readdirp@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78" + dependencies: + graceful-fs "^4.1.2" + minimatch "^3.0.2" + readable-stream "^2.0.2" + set-immediate-shim "^1.0.1" + +reflect-metadata@^0.1.2: + version "0.1.12" + resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.12.tgz#311bf0c6b63cd782f228a81abe146a2bfa9c56f2" + +regex-cache@^0.4.2: + version "0.4.4" + resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd" + dependencies: + is-equal-shallow "^0.1.3" + +remove-trailing-separator@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" + +repeat-element@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a" + +repeat-string@^1.5.2: + version "1.6.1" + resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + +request@2.81.0: + version "2.81.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" + dependencies: + aws-sign2 "~0.6.0" + aws4 "^1.2.1" + caseless "~0.12.0" + combined-stream "~1.0.5" + extend "~3.0.0" + forever-agent "~0.6.1" + form-data "~2.1.1" + har-validator "~4.2.1" + hawk "~3.1.3" + http-signature "~1.1.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.7" + oauth-sign "~0.8.1" + performance-now "^0.2.0" + qs "~6.4.0" + safe-buffer "^5.0.1" + stringstream "~0.0.4" + tough-cookie "~2.3.0" + tunnel-agent "^0.6.0" + uuid "^3.0.0" + +request@^2.78.0: + version "2.83.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356" + dependencies: + aws-sign2 "~0.7.0" + aws4 "^1.6.0" + caseless "~0.12.0" + combined-stream "~1.0.5" + extend "~3.0.1" + forever-agent "~0.6.1" + form-data "~2.3.1" + har-validator "~5.0.3" + hawk "~6.0.2" + http-signature "~1.2.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.17" + oauth-sign "~0.8.2" + performance-now "^2.1.0" + qs "~6.5.1" + safe-buffer "^5.1.1" + stringstream "~0.0.5" + tough-cookie "~2.3.3" + tunnel-agent "^0.6.0" + uuid "^3.1.0" + +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + +require-main-filename@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" + +requires-port@1.x.x: + version "1.0.0" + resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + +resp-modifier@6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/resp-modifier/-/resp-modifier-6.0.2.tgz#b124de5c4fbafcba541f48ffa73970f4aa456b4f" + dependencies: + debug "^2.2.0" + minimatch "^3.0.2" + +rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1: + version "2.6.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" + dependencies: + glob "^7.0.5" + +rx@2.3.24: + version "2.3.24" + resolved "https://registry.yarnpkg.com/rx/-/rx-2.3.24.tgz#14f950a4217d7e35daa71bbcbe58eff68ea4b2b7" + +rx@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782" + +"rxjs@file:../../node_modules/rxjs": + version "6.0.0-alpha.4" + dependencies: + tslib "^1.9.0" + +safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" + +saucelabs@~1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/saucelabs/-/saucelabs-1.3.0.tgz#d240e8009df7fa87306ec4578a69ba3b5c424fee" + dependencies: + https-proxy-agent "^1.0.0" + +sax@0.6.x: + version "0.6.1" + resolved "https://registry.yarnpkg.com/sax/-/sax-0.6.1.tgz#563b19c7c1de892e09bfc4f2fc30e3c27f0952b9" + +sax@>=0.6.0: + version "1.2.4" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" + +selenium-webdriver@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-3.0.1.tgz#a2dea5da4a97f6672e89e7ca7276cefa365147a7" + dependencies: + adm-zip "^0.4.7" + rimraf "^2.5.4" + tmp "0.0.30" + xml2js "^0.4.17" + +selenium-webdriver@^2.53.2: + version "2.53.3" + resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-2.53.3.tgz#d29ff5a957dff1a1b49dc457756e4e4bfbdce085" + dependencies: + adm-zip "0.4.4" + rimraf "^2.2.8" + tmp "0.0.24" + ws "^1.0.1" + xml2js "0.4.4" + +"semver@2 || 3 || 4 || 5", semver@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" + +semver@~5.0.1: + version "5.0.3" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.0.3.tgz#77466de589cd5d3c95f138aa78bc569a3cb5d27a" + +send@0.15.2: + version "0.15.2" + resolved "https://registry.yarnpkg.com/send/-/send-0.15.2.tgz#f91fab4403bcf87e716f70ceb5db2f578bdc17d6" + dependencies: + debug "2.6.4" + depd "~1.1.0" + destroy "~1.0.4" + encodeurl "~1.0.1" + escape-html "~1.0.3" + etag "~1.8.0" + fresh "0.5.0" + http-errors "~1.6.1" + mime "1.3.4" + ms "1.0.0" + on-finished "~2.3.0" + range-parser "~1.2.0" + statuses "~1.3.1" + +serve-index@1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.8.0.tgz#7c5d96c13fb131101f93c1c5774f8516a1e78d3b" + dependencies: + accepts "~1.3.3" + batch "0.5.3" + debug "~2.2.0" + escape-html "~1.0.3" + http-errors "~1.5.0" + mime-types "~2.1.11" + parseurl "~1.3.1" + +serve-static@1.12.2: + version "1.12.2" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.12.2.tgz#e546e2726081b81b4bcec8e90808ebcdd323afba" + dependencies: + encodeurl "~1.0.1" + escape-html "~1.0.3" + parseurl "~1.3.1" + send "0.15.2" + +server-destroy@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/server-destroy/-/server-destroy-1.0.1.tgz#f13bf928e42b9c3e79383e61cc3998b5d14e6cdd" + +set-blocking@^2.0.0, set-blocking@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + +set-immediate-shim@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61" + +setprototypeof@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.2.tgz#81a552141ec104b88e89ce383103ad5c66564d08" + +setprototypeof@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04" + +signal-exit@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" + +sntp@1.x.x: + version "1.0.9" + resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198" + dependencies: + hoek "2.x.x" + +sntp@2.x.x: + version "2.1.0" + resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8" + dependencies: + hoek "4.x.x" + +socket.io-adapter@~1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz#2a805e8a14d6372124dd9159ad4502f8cb07f06b" + +socket.io-client@2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.0.4.tgz#0918a552406dc5e540b380dcd97afc4a64332f8e" + dependencies: + backo2 "1.0.2" + base64-arraybuffer "0.1.5" + component-bind "1.0.0" + component-emitter "1.2.1" + debug "~2.6.4" + engine.io-client "~3.1.0" + has-cors "1.1.0" + indexof "0.0.1" + object-component "0.0.3" + parseqs "0.0.5" + parseuri "0.0.5" + socket.io-parser "~3.1.1" + to-array "0.1.4" + +socket.io-parser@~3.1.1: + version "3.1.3" + resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.1.3.tgz#ed2da5ee79f10955036e3da413bfd7f1e4d86c8e" + dependencies: + component-emitter "1.2.1" + debug "~3.1.0" + has-binary2 "~1.0.2" + isarray "2.0.1" + +socket.io@2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.0.4.tgz#c1a4590ceff87ecf13c72652f046f716b29e6014" + dependencies: + debug "~2.6.6" + engine.io "~3.1.0" + socket.io-adapter "~1.1.0" + socket.io-client "2.0.4" + socket.io-parser "~3.1.1" + +source-map-support@^0.5.0: + version "0.5.3" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.3.tgz#2b3d5fff298cfa4d1afd7d4352d569e9a0158e76" + dependencies: + source-map "^0.6.0" + +source-map-support@~0.4.0: + version "0.4.18" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" + dependencies: + source-map "^0.5.6" + +source-map@^0.5.6: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + +source-map@^0.6.0: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + +spawn-command@^0.0.2-1: + version "0.0.2-1" + resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2-1.tgz#62f5e9466981c1b796dc5929937e11c9c6921bd0" + +spdx-correct@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82" + dependencies: + spdx-expression-parse "^3.0.0" + spdx-license-ids "^3.0.0" + +spdx-exceptions@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9" + +spdx-expression-parse@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0" + dependencies: + spdx-exceptions "^2.1.0" + spdx-license-ids "^3.0.0" + +spdx-license-ids@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz#7a7cd28470cc6d3a1cfe6d66886f6bc430d3ac87" + +sshpk@^1.7.0: + version "1.13.1" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3" + dependencies: + asn1 "~0.2.3" + assert-plus "^1.0.0" + dashdash "^1.12.0" + getpass "^0.1.1" + optionalDependencies: + bcrypt-pbkdf "^1.0.0" + ecc-jsbn "~0.1.1" + jsbn "~0.1.0" + tweetnacl "~0.14.0" + +"statuses@>= 1.3.1 < 2": + version "1.4.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087" + +statuses@~1.3.0, statuses@~1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e" + +stream-throttle@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/stream-throttle/-/stream-throttle-0.1.3.tgz#add57c8d7cc73a81630d31cd55d3961cfafba9c3" + dependencies: + commander "^2.2.0" + limiter "^1.0.5" + +string-width@^1.0.1, string-width@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + dependencies: + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" + +string_decoder@~1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" + dependencies: + safe-buffer "~5.1.0" + +stringstream@~0.0.4, stringstream@~0.0.5: + version "0.0.5" + resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" + +strip-ansi@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.3.0.tgz#25f48ea22ca79187f3174a4db8759347bb126220" + dependencies: + ansi-regex "^0.2.1" + +strip-ansi@^3.0.0, strip-ansi@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + dependencies: + ansi-regex "^2.0.0" + +strip-bom@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" + dependencies: + is-utf8 "^0.2.0" + +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + +supports-color@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a" + +supports-color@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" + +supports-color@^3.2.3: + version "3.2.3" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6" + dependencies: + has-flag "^1.0.0" + +tar-pack@^3.4.0: + version "3.4.1" + resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f" + dependencies: + debug "^2.2.0" + fstream "^1.0.10" + fstream-ignore "^1.0.5" + once "^1.3.3" + readable-stream "^2.1.4" + rimraf "^2.5.1" + tar "^2.2.1" + uid-number "^0.0.6" + +tar@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" + dependencies: + block-stream "*" + fstream "^1.0.2" + inherits "2" + +tfunk@^3.0.1: + version "3.1.0" + resolved "https://registry.yarnpkg.com/tfunk/-/tfunk-3.1.0.tgz#38e4414fc64977d87afdaa72facb6d29f82f7b5b" + dependencies: + chalk "^1.1.1" + object-path "^0.9.0" + +tmp@0.0.24: + version "0.0.24" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.24.tgz#d6a5e198d14a9835cc6f2d7c3d9e302428c8cf12" + +tmp@0.0.30: + version "0.0.30" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.30.tgz#72419d4a8be7d6ce75148fd8b324e593a711c2ed" + dependencies: + os-tmpdir "~1.0.1" + +to-array@0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890" + +tough-cookie@~2.3.0, tough-cookie@~2.3.3: + version "2.3.4" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655" + dependencies: + punycode "^1.4.1" + +tree-kill@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36" + +tsickle@^0.27.2: + version "0.27.2" + resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.27.2.tgz#f33d46d046f73dd5c155a37922e422816e878736" + dependencies: + minimist "^1.2.0" + mkdirp "^0.5.1" + source-map "^0.6.0" + source-map-support "^0.5.0" + +tslib@^1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8" + +tunnel-agent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + dependencies: + safe-buffer "^5.0.1" + +tweetnacl@^0.14.3, tweetnacl@~0.14.0: + version "0.14.5" + resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" + +"typescript@file:../../node_modules/typescript": + version "2.7.2" + +ua-parser-js@0.7.12: + version "0.7.12" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb" + +uid-number@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81" + +ultron@1.0.x: + version "1.0.2" + resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa" + +ultron@~1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c" + +universalify@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7" + +unpipe@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + +util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + +utils-merge@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.0.tgz#0294fb922bb9375153541c4f7096231f287c8af8" + +uuid@^3.0.0, uuid@^3.1.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14" + +uws@~9.14.0: + version "9.14.0" + resolved "https://registry.yarnpkg.com/uws/-/uws-9.14.0.tgz#fac8386befc33a7a3705cbd58dc47b430ca4dd95" + +validate-npm-package-license@^3.0.1: + version "3.0.3" + resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338" + dependencies: + spdx-correct "^3.0.0" + spdx-expression-parse "^3.0.0" + +verror@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" + dependencies: + assert-plus "^1.0.0" + core-util-is "1.0.2" + extsprintf "^1.2.0" + +webdriver-js-extender@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/webdriver-js-extender/-/webdriver-js-extender-1.0.0.tgz#81c533a9e33d5bfb597b4e63e2cdb25b54777515" + dependencies: + "@types/selenium-webdriver" "^2.53.35" + selenium-webdriver "^2.53.2" + +webdriver-manager@^12.0.6: + version "12.0.6" + resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.0.6.tgz#3df1a481977010b4cbf8c9d85c7a577828c0e70b" + dependencies: + adm-zip "^0.4.7" + chalk "^1.1.1" + del "^2.2.0" + glob "^7.0.3" + ini "^1.3.4" + minimist "^1.2.0" + q "^1.4.1" + request "^2.78.0" + rimraf "^2.5.2" + semver "^5.3.0" + xml2js "^0.4.17" + +which-module@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" + +wide-align@^1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710" + dependencies: + string-width "^1.0.2" + +window-size@^0.1.2: + version "0.1.4" + resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876" + +window-size@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075" + +wordwrap@~0.0.2: + version "0.0.3" + resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" + +wrap-ansi@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" + dependencies: + string-width "^1.0.1" + strip-ansi "^3.0.1" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + +ws@^1.0.1: + version "1.1.5" + resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.5.tgz#cbd9e6e75e09fc5d2c90015f21f0c40875e0dd51" + dependencies: + options ">=0.0.5" + ultron "1.0.x" + +ws@~3.3.1: + version "3.3.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2" + dependencies: + async-limiter "~1.0.0" + safe-buffer "~5.1.0" + ultron "~1.1.0" + +xhr2@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.1.4.tgz#7f87658847716db5026323812f818cadab387a5f" + +xml2js@0.4.4: + version "0.4.4" + resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.4.tgz#3111010003008ae19240eba17497b57c729c555d" + dependencies: + sax "0.6.x" + xmlbuilder ">=1.0.0" + +xml2js@^0.4.17: + version "0.4.19" + resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7" + dependencies: + sax ">=0.6.0" + xmlbuilder "~9.0.1" + +xmlbuilder@>=1.0.0, xmlbuilder@~9.0.1: + version "9.0.7" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" + +xmlhttprequest-ssl@~1.5.4: + version "1.5.5" + resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e" + +y18n@^3.2.0, y18n@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" + +yargs-parser@^4.1.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c" + dependencies: + camelcase "^3.0.0" + +yargs@3.29.0: + version "3.29.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.29.0.tgz#1aab9660eae79d8b8f675bcaeeab6ee34c2cf69c" + dependencies: + camelcase "^1.2.1" + cliui "^3.0.3" + decamelize "^1.0.0" + os-locale "^1.4.0" + window-size "^0.1.2" + y18n "^3.2.0" + +yargs@6.4.0: + version "6.4.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.4.0.tgz#816e1a866d5598ccf34e5596ddce22d92da490d4" + dependencies: + camelcase "^3.0.0" + cliui "^3.2.0" + decamelize "^1.1.1" + get-caller-file "^1.0.1" + os-locale "^1.4.0" + read-pkg-up "^1.0.1" + require-directory "^2.1.1" + require-main-filename "^1.0.1" + set-blocking "^2.0.0" + string-width "^1.0.2" + which-module "^1.0.0" + window-size "^0.2.0" + y18n "^3.2.1" + yargs-parser "^4.1.0" + +yeast@0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" + +"zone.js@file:../../node_modules/zone.js": + version "0.8.20" diff --git a/integration/language_service_plugin/yarn.lock b/integration/language_service_plugin/yarn.lock index 542189c67e..2e3bc312da 100644 --- a/integration/language_service_plugin/yarn.lock +++ b/integration/language_service_plugin/yarn.lock @@ -3,46 +3,46 @@ "@angular/animations@file:../../dist/packages-dist/animations": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/common@file:../../dist/packages-dist/common": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: chokidar "^1.4.2" minimist "^1.2.0" reflect-metadata "^0.1.2" - tsickle "^0.26.0" + tsickle "^0.27.2" "@angular/compiler@file:../../dist/packages-dist/compiler": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/core@file:../../dist/packages-dist/core": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/language-service@file:../../dist/packages-dist/language-service": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" "@angular/platform-browser@file:../../dist/packages-dist/platform-browser": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/platform-server@file:../../dist/packages-dist/platform-server": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - domino "^1.0.29" - tslib "^1.7.1" + domino "^2.0.1" + tslib "^1.9.0" xhr2 "^0.1.4" "@types/minimist@^1.2.0": @@ -248,9 +248,9 @@ detect-libc@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" -domino@^1.0.29: - version "1.0.30" - resolved "https://registry.yarnpkg.com/domino/-/domino-1.0.30.tgz#54a4154ecae968616680f8feba3cedff355c71f4" +domino@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/domino/-/domino-2.0.1.tgz#9e1d63215d0fe8dcb8202bff07effa1a216db504" ecc-jsbn@~0.1.1: version "0.1.1" @@ -831,9 +831,9 @@ rimraf@2, rimraf@^2.5.1, rimraf@^2.6.1: glob "^7.0.5" "rxjs@file:../../node_modules/rxjs": - version "5.5.5" + version "6.0.0-alpha.4" dependencies: - symbol-observable "1.0.1" + tslib "^1.9.0" safe-buffer@^5.0.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.1" @@ -861,15 +861,15 @@ sntp@1.x.x: dependencies: hoek "2.x.x" -source-map-support@^0.4.2: - version "0.4.18" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" +source-map-support@^0.5.0: + version "0.5.3" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.3.tgz#2b3d5fff298cfa4d1afd7d4352d569e9a0158e76" dependencies: - source-map "^0.5.6" + source-map "^0.6.0" -source-map@^0.5.6: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" +source-map@^0.6.0: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" sshpk@^1.7.0: version "1.13.1" @@ -913,10 +913,6 @@ strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" -symbol-observable@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4" - tar-pack@^3.4.0: version "3.4.1" resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f" @@ -944,18 +940,18 @@ tough-cookie@~2.3.0: dependencies: punycode "^1.4.1" -tsickle@^0.26.0: - version "0.26.0" - resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.26.0.tgz#40b30a2dd6abcb33b182e37596674bd1cfe4039c" +tsickle@^0.27.2: + version "0.27.2" + resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.27.2.tgz#f33d46d046f73dd5c155a37922e422816e878736" dependencies: minimist "^1.2.0" mkdirp "^0.5.1" - source-map "^0.5.6" - source-map-support "^0.4.2" + source-map "^0.6.0" + source-map-support "^0.5.0" -tslib@^1.7.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.8.1.tgz#6946af2d1d651a7b1863b531d6e5afa41aa44eac" +tslib@^1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8" tunnel-agent@^0.6.0: version "0.6.0" @@ -968,7 +964,7 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0: resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" "typescript@file:../../node_modules/typescript": - version "2.6.2" + version "2.7.2" uid-number@^0.0.6: version "0.0.6" @@ -1005,4 +1001,4 @@ xhr2@^0.1.4: resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.1.4.tgz#7f87658847716db5026323812f818cadab387a5f" "zone.js@file:../../node_modules/zone.js": - version "0.8.17" + version "0.8.20" diff --git a/integration/run_tests.sh b/integration/run_tests.sh index f096c6e760..a938347232 100755 --- a/integration/run_tests.sh +++ b/integration/run_tests.sh @@ -2,7 +2,9 @@ set -e -o pipefail -cd `dirname $0` +currentDir=$(cd $(dirname $0); pwd) +cd ${currentDir} + readonly thisDir=$(cd $(dirname $0); pwd) diff --git a/integration/typings_test_ts24/yarn.lock b/integration/typings_test_ts24/yarn.lock index e3b3dab7d2..ac2ff55269 100644 --- a/integration/typings_test_ts24/yarn.lock +++ b/integration/typings_test_ts24/yarn.lock @@ -3,84 +3,84 @@ "@angular/animations@file:../../dist/packages-dist/animations": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/common@file:../../dist/packages-dist/common": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: chokidar "^1.4.2" minimist "^1.2.0" reflect-metadata "^0.1.2" - tsickle "^0.26.0" + tsickle "^0.27.2" "@angular/compiler@file:../../dist/packages-dist/compiler": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/core@file:../../dist/packages-dist/core": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/forms@file:../../dist/packages-dist/forms": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/http@file:../../dist/packages-dist/http": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/platform-browser-dynamic@file:../../dist/packages-dist/platform-browser-dynamic": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/platform-browser@file:../../dist/packages-dist/platform-browser": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/platform-server@file:../../dist/packages-dist/platform-server": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - domino "^1.0.29" - tslib "^1.7.1" + domino "^2.0.1" + tslib "^1.9.0" xhr2 "^0.1.4" "@angular/platform-webworker-dynamic@file:../../dist/packages-dist/platform-webworker-dynamic": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/platform-webworker@file:../../dist/packages-dist/platform-webworker": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/router@file:../../dist/packages-dist/router": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/service-worker@file:../../dist/packages-dist/service-worker": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/upgrade@file:../../dist/packages-dist/upgrade": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@types/jasmine@2.5.41": version "2.5.41" @@ -281,9 +281,9 @@ detect-libc@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" -domino@^1.0.29: - version "1.0.30" - resolved "https://registry.yarnpkg.com/domino/-/domino-1.0.30.tgz#54a4154ecae968616680f8feba3cedff355c71f4" +domino@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/domino/-/domino-2.0.1.tgz#9e1d63215d0fe8dcb8202bff07effa1a216db504" ecc-jsbn@~0.1.1: version "0.1.1" @@ -864,9 +864,9 @@ rimraf@2, rimraf@^2.5.1, rimraf@^2.6.1: glob "^7.0.5" "rxjs@file:../../node_modules/rxjs": - version "5.5.5" + version "6.0.0-alpha.4" dependencies: - symbol-observable "1.0.1" + tslib "^1.9.0" safe-buffer@^5.0.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.1" @@ -894,15 +894,15 @@ sntp@1.x.x: dependencies: hoek "2.x.x" -source-map-support@^0.4.2: - version "0.4.18" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" +source-map-support@^0.5.0: + version "0.5.3" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.3.tgz#2b3d5fff298cfa4d1afd7d4352d569e9a0158e76" dependencies: - source-map "^0.5.6" + source-map "^0.6.0" -source-map@^0.5.6: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" +source-map@^0.6.0: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" sshpk@^1.7.0: version "1.13.1" @@ -946,10 +946,6 @@ strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" -symbol-observable@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4" - tar-pack@^3.4.0: version "3.4.1" resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f" @@ -977,18 +973,18 @@ tough-cookie@~2.3.0: dependencies: punycode "^1.4.1" -tsickle@^0.26.0: - version "0.26.0" - resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.26.0.tgz#40b30a2dd6abcb33b182e37596674bd1cfe4039c" +tsickle@^0.27.2: + version "0.27.2" + resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.27.2.tgz#f33d46d046f73dd5c155a37922e422816e878736" dependencies: minimist "^1.2.0" mkdirp "^0.5.1" - source-map "^0.5.6" - source-map-support "^0.4.2" + source-map "^0.6.0" + source-map-support "^0.5.0" -tslib@^1.7.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.8.1.tgz#6946af2d1d651a7b1863b531d6e5afa41aa44eac" +tslib@^1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8" tunnel-agent@^0.6.0: version "0.6.0" @@ -1039,4 +1035,4 @@ xhr2@^0.1.4: resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.1.4.tgz#7f87658847716db5026323812f818cadab387a5f" "zone.js@file:../../node_modules/zone.js": - version "0.8.17" + version "0.8.20" diff --git a/integration/typings_test_ts25/yarn.lock b/integration/typings_test_ts25/yarn.lock index 2e9c6f5b11..3b927fc419 100644 --- a/integration/typings_test_ts25/yarn.lock +++ b/integration/typings_test_ts25/yarn.lock @@ -3,84 +3,84 @@ "@angular/animations@file:../../dist/packages-dist/animations": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/common@file:../../dist/packages-dist/common": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: chokidar "^1.4.2" minimist "^1.2.0" reflect-metadata "^0.1.2" - tsickle "^0.26.0" + tsickle "^0.27.2" "@angular/compiler@file:../../dist/packages-dist/compiler": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/core@file:../../dist/packages-dist/core": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/forms@file:../../dist/packages-dist/forms": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/http@file:../../dist/packages-dist/http": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/platform-browser-dynamic@file:../../dist/packages-dist/platform-browser-dynamic": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/platform-browser@file:../../dist/packages-dist/platform-browser": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/platform-server@file:../../dist/packages-dist/platform-server": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - domino "^1.0.29" - tslib "^1.7.1" + domino "^2.0.1" + tslib "^1.9.0" xhr2 "^0.1.4" "@angular/platform-webworker-dynamic@file:../../dist/packages-dist/platform-webworker-dynamic": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/platform-webworker@file:../../dist/packages-dist/platform-webworker": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/router@file:../../dist/packages-dist/router": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/service-worker@file:../../dist/packages-dist/service-worker": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/upgrade@file:../../dist/packages-dist/upgrade": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@types/jasmine@2.5.41": version "2.5.41" @@ -281,9 +281,9 @@ detect-libc@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" -domino@^1.0.29: - version "1.0.30" - resolved "https://registry.yarnpkg.com/domino/-/domino-1.0.30.tgz#54a4154ecae968616680f8feba3cedff355c71f4" +domino@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/domino/-/domino-2.0.1.tgz#9e1d63215d0fe8dcb8202bff07effa1a216db504" ecc-jsbn@~0.1.1: version "0.1.1" @@ -864,9 +864,9 @@ rimraf@2, rimraf@^2.5.1, rimraf@^2.6.1: glob "^7.0.5" "rxjs@file:../../node_modules/rxjs": - version "5.5.5" + version "6.0.0-alpha.4" dependencies: - symbol-observable "1.0.1" + tslib "^1.9.0" safe-buffer@^5.0.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.1" @@ -894,15 +894,15 @@ sntp@1.x.x: dependencies: hoek "2.x.x" -source-map-support@^0.4.2: - version "0.4.18" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" +source-map-support@^0.5.0: + version "0.5.3" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.3.tgz#2b3d5fff298cfa4d1afd7d4352d569e9a0158e76" dependencies: - source-map "^0.5.6" + source-map "^0.6.0" -source-map@^0.5.6: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" +source-map@^0.6.0: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" sshpk@^1.7.0: version "1.13.1" @@ -946,10 +946,6 @@ strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" -symbol-observable@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4" - tar-pack@^3.4.0: version "3.4.1" resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f" @@ -977,18 +973,18 @@ tough-cookie@~2.3.0: dependencies: punycode "^1.4.1" -tsickle@^0.26.0: - version "0.26.0" - resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.26.0.tgz#40b30a2dd6abcb33b182e37596674bd1cfe4039c" +tsickle@^0.27.2: + version "0.27.2" + resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.27.2.tgz#f33d46d046f73dd5c155a37922e422816e878736" dependencies: minimist "^1.2.0" mkdirp "^0.5.1" - source-map "^0.5.6" - source-map-support "^0.4.2" + source-map "^0.6.0" + source-map-support "^0.5.0" -tslib@^1.7.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.8.1.tgz#6946af2d1d651a7b1863b531d6e5afa41aa44eac" +tslib@^1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8" tunnel-agent@^0.6.0: version "0.6.0" @@ -1039,4 +1035,4 @@ xhr2@^0.1.4: resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.1.4.tgz#7f87658847716db5026323812f818cadab387a5f" "zone.js@file:../../node_modules/zone.js": - version "0.8.17" + version "0.8.20" diff --git a/integration/typings_test_ts26/yarn.lock b/integration/typings_test_ts26/yarn.lock index bc3f1a566d..2af2de9daa 100644 --- a/integration/typings_test_ts26/yarn.lock +++ b/integration/typings_test_ts26/yarn.lock @@ -3,84 +3,84 @@ "@angular/animations@file:../../dist/packages-dist/animations": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/common@file:../../dist/packages-dist/common": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: chokidar "^1.4.2" minimist "^1.2.0" reflect-metadata "^0.1.2" - tsickle "^0.26.0" + tsickle "^0.27.2" "@angular/compiler@file:../../dist/packages-dist/compiler": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/core@file:../../dist/packages-dist/core": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/forms@file:../../dist/packages-dist/forms": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/http@file:../../dist/packages-dist/http": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/platform-browser-dynamic@file:../../dist/packages-dist/platform-browser-dynamic": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/platform-browser@file:../../dist/packages-dist/platform-browser": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/platform-server@file:../../dist/packages-dist/platform-server": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - domino "^1.0.29" - tslib "^1.7.1" + domino "^2.0.1" + tslib "^1.9.0" xhr2 "^0.1.4" "@angular/platform-webworker-dynamic@file:../../dist/packages-dist/platform-webworker-dynamic": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/platform-webworker@file:../../dist/packages-dist/platform-webworker": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/router@file:../../dist/packages-dist/router": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/service-worker@file:../../dist/packages-dist/service-worker": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@angular/upgrade@file:../../dist/packages-dist/upgrade": - version "5.2.0-e94fb16a2" + version "6.0.0-beta.7-8203e0365a" dependencies: - tslib "^1.7.1" + tslib "^1.9.0" "@types/jasmine@2.5.41": version "2.5.41" @@ -281,9 +281,9 @@ detect-libc@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" -domino@^1.0.29: - version "1.0.30" - resolved "https://registry.yarnpkg.com/domino/-/domino-1.0.30.tgz#54a4154ecae968616680f8feba3cedff355c71f4" +domino@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/domino/-/domino-2.0.1.tgz#9e1d63215d0fe8dcb8202bff07effa1a216db504" ecc-jsbn@~0.1.1: version "0.1.1" @@ -864,9 +864,9 @@ rimraf@2, rimraf@^2.5.1, rimraf@^2.6.1: glob "^7.0.5" "rxjs@file:../../node_modules/rxjs": - version "5.5.5" + version "6.0.0-alpha.4" dependencies: - symbol-observable "1.0.1" + tslib "^1.9.0" safe-buffer@^5.0.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.1" @@ -894,15 +894,15 @@ sntp@1.x.x: dependencies: hoek "2.x.x" -source-map-support@^0.4.2: - version "0.4.18" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" +source-map-support@^0.5.0: + version "0.5.3" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.3.tgz#2b3d5fff298cfa4d1afd7d4352d569e9a0158e76" dependencies: - source-map "^0.5.6" + source-map "^0.6.0" -source-map@^0.5.6: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" +source-map@^0.6.0: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" sshpk@^1.7.0: version "1.13.1" @@ -946,10 +946,6 @@ strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" -symbol-observable@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4" - tar-pack@^3.4.0: version "3.4.1" resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f" @@ -977,18 +973,18 @@ tough-cookie@~2.3.0: dependencies: punycode "^1.4.1" -tsickle@^0.26.0: - version "0.26.0" - resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.26.0.tgz#40b30a2dd6abcb33b182e37596674bd1cfe4039c" +tsickle@^0.27.2: + version "0.27.2" + resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.27.2.tgz#f33d46d046f73dd5c155a37922e422816e878736" dependencies: minimist "^1.2.0" mkdirp "^0.5.1" - source-map "^0.5.6" - source-map-support "^0.4.2" + source-map "^0.6.0" + source-map-support "^0.5.0" -tslib@^1.7.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.8.1.tgz#6946af2d1d651a7b1863b531d6e5afa41aa44eac" +tslib@^1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8" tunnel-agent@^0.6.0: version "0.6.0" @@ -1039,4 +1035,4 @@ xhr2@^0.1.4: resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.1.4.tgz#7f87658847716db5026323812f818cadab387a5f" "zone.js@file:../../node_modules/zone.js": - version "0.8.17" + version "0.8.20" diff --git a/modules/benchmarks/src/bootstrap_ng2.ts b/modules/benchmarks/src/bootstrap_ng2.ts index e7299eeb38..ff8eb4d105 100644 --- a/modules/benchmarks/src/bootstrap_ng2.ts +++ b/modules/benchmarks/src/bootstrap_ng2.ts @@ -37,12 +37,14 @@ '@angular/http': '/packages-dist/http/bundles/http.umd.js', '@angular/upgrade': '/packages-dist/upgrade/bundles/upgrade.umd.js', '@angular/router': '/packages-dist/router/bundles/router.umd.js', - '@angular/core/src/facade': '/all/@angular/core/src/facade', - 'rxjs': '/all/benchmarks/vendor/rxjs' + 'rxjs': '/all/benchmarks/vendor/rxjs', }, packages: { - '@angular/core/src/facade': {defaultExtension: 'js'}, - 'rxjs': {defaultExtension: 'js'} + 'rxjs/ajax': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/operators': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/testing': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/websocket': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs': {main: 'index.js', defaultExtension: 'js'}, } }); } else { @@ -63,7 +65,11 @@ '@angular/platform-browser': {main: 'index.js', defaultExtension: 'js'}, '@angular/platform-browser-dynamic': {main: 'index.js', defaultExtension: 'js'}, '@angular/upgrade': {main: 'index.js', defaultExtension: 'js'}, - 'rxjs': {defaultExtension: 'js'} + 'rxjs/ajax': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/operators': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/testing': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/websocket': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs': {main: 'index.js', defaultExtension: 'js'}, } }); } diff --git a/modules/benchmarks_external/src/bootstrap.ts b/modules/benchmarks_external/src/bootstrap.ts index 0ecd09c161..20fef436da 100644 --- a/modules/benchmarks_external/src/bootstrap.ts +++ b/modules/benchmarks_external/src/bootstrap.ts @@ -36,12 +36,16 @@ '@angular/upgrade': '/packages-dist/upgrade/bundles/upgrade.umd.js', '@angular/router': '/packages-dist/router/bundles/router.umd.js', '@angular/core/src/facade': '/all/@angular/core/src/facade', - 'rxjs': '/all/benchmarks/vendor/rxjs' + 'rxjs': 'node_modules/rxjs', }, packages: { 'app': {defaultExtension: 'js'}, '@angular/core/src/facade': {defaultExtension: 'js'}, - 'rxjs': {defaultExtension: 'js'} + 'rxjs/ajax': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs/operators': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs/testing': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs/websocket': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs': { main: 'index.js', defaultExtension: 'js' }, } }); } else { @@ -52,7 +56,7 @@ map: { 'index': 'index.js', '@angular': '/all/@angular', - 'rxjs': '/all/benchmarks/vendor/rxjs' + 'rxjs': 'node_modules/rxjs', }, packages: { 'app': {defaultExtension: 'js'}, @@ -64,7 +68,11 @@ '@angular/platform-browser': {main: 'index.js', defaultExtension: 'js'}, '@angular/platform-browser-dynamic': {main: 'index.js', defaultExtension: 'js'}, '@angular/upgrade': {main: 'index.js', defaultExtension: 'js'}, - 'rxjs': {defaultExtension: 'js'} + 'rxjs/ajax': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs/operators': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs/testing': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs/websocket': {main: 'index.js', defaultExtension: 'js' }, + 'rxjs': { main: 'index.js', defaultExtension: 'js' }, } }); } diff --git a/modules/playground/src/bootstrap.ts b/modules/playground/src/bootstrap.ts index c95ca8fa0f..92daa49b1d 100644 --- a/modules/playground/src/bootstrap.ts +++ b/modules/playground/src/bootstrap.ts @@ -47,7 +47,12 @@ }, packages: { 'app': {defaultExtension: 'js'}, - 'rxjs': {defaultExtension: 'js'}, + 'rxjs/ajax': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/operators': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/testing': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/websocket': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs': {main: 'index.js', defaultExtension: 'js'}, + } }); } else { @@ -58,7 +63,7 @@ map: { 'index': 'index.js', '@angular': '/all/@angular', - 'rxjs': '/all/playground/vendor/rxjs' + 'rxjs': '/all/playground/vendor/rxjs', }, packages: { 'app': {defaultExtension: 'js'}, @@ -74,7 +79,11 @@ '@angular/platform-webworker-dynamic': {main: 'index.js', defaultExtension: 'js'}, '@angular/router': {main: 'index.js', defaultExtension: 'js'}, '@angular/upgrade': {main: 'index.js', defaultExtension: 'js'}, - 'rxjs': {defaultExtension: 'js'} + 'rxjs/ajax': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/operators': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/testing': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/websocket': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs': {main: 'index.js', defaultExtension: 'js'}, } }); } diff --git a/modules/playground/src/http/app/http_comp.ts b/modules/playground/src/http/app/http_comp.ts index c30070047c..4a1be633d0 100644 --- a/modules/playground/src/http/app/http_comp.ts +++ b/modules/playground/src/http/app/http_comp.ts @@ -6,10 +6,9 @@ * found in the LICENSE file at https://angular.io/license */ -import 'rxjs/add/operator/map'; - import {Component} from '@angular/core'; import {Http, Response} from '@angular/http'; +import {map} from 'rxjs/operators'; @Component({ selector: 'http-app', @@ -26,7 +25,7 @@ export class HttpCmp { people: Object[]; constructor(http: Http) { http.get('./people.json') - .map((res: Response) => res.json()) + .pipe(map((res: Response) => res.json())) .subscribe((people: Array) => this.people = people); } } diff --git a/modules/playground/src/web_workers/animations/loader.js b/modules/playground/src/web_workers/animations/loader.js index 993c411969..7f9b18aed2 100644 --- a/modules/playground/src/web_workers/animations/loader.js +++ b/modules/playground/src/web_workers/animations/loader.js @@ -15,8 +15,9 @@ importScripts( System.config({ baseURL: '/all', - map: {'rxjs': '/all/playground/vendor/rxjs'}, - + map: { + 'rxjs': '/all/playground/vendor/rxjs', + }, packages: { '@angular/core': {main: 'index.js', defaultExtension: 'js'}, '@angular/compiler': {main: 'index.js', defaultExtension: 'js'}, @@ -25,7 +26,11 @@ System.config({ '@angular/platform-browser-dynamic': {main: 'index.js', defaultExtension: 'js'}, '@angular/platform-webworker': {main: 'index.js', defaultExtension: 'js'}, '@angular/platform-webworker-dynamic': {main: 'index.js', defaultExtension: 'js'}, - 'rxjs': {defaultExtension: 'js'}, + 'rxjs/ajax': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/operators': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/testing': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/websocket': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs': {main: 'index.js', defaultExtension: 'js'}, }, defaultJSExtensions: true diff --git a/modules/playground/src/web_workers/images/loader.js b/modules/playground/src/web_workers/images/loader.js index 19cd1453d3..374be14033 100644 --- a/modules/playground/src/web_workers/images/loader.js +++ b/modules/playground/src/web_workers/images/loader.js @@ -16,10 +16,9 @@ System.config({ baseURL: '/all', map: { - 'rxjs': '/all/playground/vendor/rxjs', 'base64-js': '/all/playground/vendor/base64-js', + 'rxjs': '/all/playground/vendor/rxjs', }, - packages: { '@angular/core': {main: 'index.js', defaultExtension: 'js'}, '@angular/compiler': {main: 'index.js', defaultExtension: 'js'}, @@ -29,8 +28,12 @@ System.config({ '@angular/platform-webworker': {main: 'index.js', defaultExtension: 'js'}, '@angular/platform-webworker-dynamic': {main: 'index.js', defaultExtension: 'js'}, '@angular/router': {main: 'index.js', defaultExtension: 'js'}, - 'rxjs': {defaultExtension: 'js'}, 'base64-js': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/ajax': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/operators': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/testing': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/websocket': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs': {main: 'index.js', defaultExtension: 'js'}, }, defaultJSExtensions: true diff --git a/modules/playground/src/web_workers/input/loader.js b/modules/playground/src/web_workers/input/loader.js index e6768680b8..13b703e219 100644 --- a/modules/playground/src/web_workers/input/loader.js +++ b/modules/playground/src/web_workers/input/loader.js @@ -15,8 +15,9 @@ importScripts( System.config({ baseURL: '/all', - map: {'rxjs': '/all/playground/vendor/rxjs'}, - + map: { + 'rxjs': '/all/playground/vendor/rxjs', + }, packages: { '@angular/core': {main: 'index.js', defaultExtension: 'js'}, '@angular/compiler': {main: 'index.js', defaultExtension: 'js'}, @@ -25,7 +26,11 @@ System.config({ '@angular/platform-browser-dynamic': {main: 'index.js', defaultExtension: 'js'}, '@angular/platform-webworker': {main: 'index.js', defaultExtension: 'js'}, '@angular/platform-webworker-dynamic': {main: 'index.js', defaultExtension: 'js'}, - 'rxjs': {defaultExtension: 'js'}, + 'rxjs/ajax': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/operators': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/testing': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/websocket': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs': {main: 'index.js', defaultExtension: 'js'}, }, defaultJSExtensions: true diff --git a/modules/playground/src/web_workers/kitchen_sink/loader.js b/modules/playground/src/web_workers/kitchen_sink/loader.js index 49afc84d6d..d5bf332e04 100644 --- a/modules/playground/src/web_workers/kitchen_sink/loader.js +++ b/modules/playground/src/web_workers/kitchen_sink/loader.js @@ -15,8 +15,9 @@ importScripts( System.config({ baseURL: '/all', - map: {'rxjs': '/all/playground/vendor/rxjs'}, - + map: { + 'rxjs': '/all/playground/vendor/rxjs', + }, packages: { '@angular/core': {main: 'index.js', defaultExtension: 'js'}, '@angular/compiler': {main: 'index.js', defaultExtension: 'js'}, @@ -26,7 +27,11 @@ System.config({ '@angular/platform-webworker': {main: 'index.js', defaultExtension: 'js'}, '@angular/platform-webworker-dynamic': {main: 'index.js', defaultExtension: 'js'}, '@angular/router': {main: 'index.js', defaultExtension: 'js'}, - 'rxjs': {defaultExtension: 'js'}, + 'rxjs/ajax': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/operators': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/testing': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/websocket': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs': {main: 'index.js', defaultExtension: 'js'}, }, defaultJSExtensions: true diff --git a/modules/playground/src/web_workers/message_broker/loader.js b/modules/playground/src/web_workers/message_broker/loader.js index d6e27f8cba..5d69da02db 100644 --- a/modules/playground/src/web_workers/message_broker/loader.js +++ b/modules/playground/src/web_workers/message_broker/loader.js @@ -15,8 +15,9 @@ importScripts( System.config({ baseURL: '/all', - map: {'rxjs': '/all/playground/vendor/rxjs'}, - + map: { + 'rxjs': '/all/playground/vendor/rxjs', + }, packages: { '@angular/core': {main: 'index.js', defaultExtension: 'js'}, '@angular/compiler': {main: 'index.js', defaultExtension: 'js'}, @@ -26,7 +27,11 @@ System.config({ '@angular/router': {main: 'index.js', defaultExtension: 'js'}, '@angular/platform-webworker': {main: 'index.js', defaultExtension: 'js'}, '@angular/platform-webworker-dynamic': {main: 'index.js', defaultExtension: 'js'}, - 'rxjs': {defaultExtension: 'js'}, + 'rxjs/ajax': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/operators': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/testing': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/websocket': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs': {main: 'index.js', defaultExtension: 'js'}, }, defaultJSExtensions: true diff --git a/modules/playground/src/web_workers/router/loader.js b/modules/playground/src/web_workers/router/loader.js index eaf32d6c57..c5123e2c3e 100644 --- a/modules/playground/src/web_workers/router/loader.js +++ b/modules/playground/src/web_workers/router/loader.js @@ -15,8 +15,9 @@ importScripts( System.config({ baseURL: '/all', - map: {'rxjs': '/all/playground/vendor/rxjs'}, - + map: { + 'rxjs': '/all/playground/vendor/rxjs', + }, packages: { '@angular/core': {main: 'index.js', defaultExtension: 'js'}, '@angular/compiler': {main: 'index.js', defaultExtension: 'js'}, @@ -26,7 +27,11 @@ System.config({ '@angular/platform-webworker': {main: 'index.js', defaultExtension: 'js'}, '@angular/platform-webworker-dynamic': {main: 'index.js', defaultExtension: 'js'}, '@angular/router': {main: 'index.js', defaultExtension: 'js'}, - 'rxjs': {defaultExtension: 'js'}, + 'rxjs/ajax': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/operators': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/testing': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/websocket': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs': {main: 'index.js', defaultExtension: 'js'}, }, defaultJSExtensions: true diff --git a/modules/playground/src/web_workers/todo/loader.js b/modules/playground/src/web_workers/todo/loader.js index f6a091b54c..f559e52ba7 100644 --- a/modules/playground/src/web_workers/todo/loader.js +++ b/modules/playground/src/web_workers/todo/loader.js @@ -15,8 +15,9 @@ importScripts( System.config({ baseURL: '/all', - map: {'rxjs': '/all/playground/vendor/rxjs'}, - + map: { + 'rxjs': '/all/playground/vendor/rxjs', + }, packages: { '@angular/core': {main: 'index.js', defaultExtension: 'js'}, '@angular/compiler': {main: 'index.js', defaultExtension: 'js'}, @@ -27,7 +28,11 @@ System.config({ '@angular/platform-webworker': {main: 'index.js', defaultExtension: 'js'}, '@angular/platform-webworker-dynamic': {main: 'index.js', defaultExtension: 'js'}, '@angular/router': {main: 'index.js', defaultExtension: 'js'}, - 'rxjs': {defaultExtension: 'js'}, + 'rxjs/ajax': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/operators': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/testing': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/websocket': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs': {main: 'index.js', defaultExtension: 'js'}, }, defaultJSExtensions: true diff --git a/package.json b/package.json index e3f3836e99..5c78fb67bf 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "dependencies": { "core-js": "^2.4.1", "reflect-metadata": "^0.1.3", - "rxjs": "5.5.6", + "rxjs": "6.0.0-alpha.4", "tslib": "^1.7.1", "zone.js": "^0.8.12" }, diff --git a/packages/animations/browser/testing/rollup.config.js b/packages/animations/browser/testing/rollup.config.js index fd07726cd8..8380bc9d35 100644 --- a/packages/animations/browser/testing/rollup.config.js +++ b/packages/animations/browser/testing/rollup.config.js @@ -13,8 +13,7 @@ const globals = { '@angular/core': 'ng.core', '@angular/animations': 'ng.animations', '@angular/animations/browser': 'ng.animations.browser', - 'rxjs/Observable': 'Rx', - 'rxjs/Subject': 'Rx', + 'rxjs': 'rxjs', }; module.exports = { diff --git a/packages/animations/rollup.config.js b/packages/animations/rollup.config.js index 74facf9618..5a1aa1f7f2 100644 --- a/packages/animations/rollup.config.js +++ b/packages/animations/rollup.config.js @@ -12,8 +12,7 @@ const sourcemaps = require('rollup-plugin-sourcemaps'); const globals = { '@angular/core': 'ng.core', '@angular/animations': 'ng.animations', - 'rxjs/Observable': 'Rx', - 'rxjs/Subject': 'Rx', + 'rxjs': 'rxjs', }; module.exports = { diff --git a/packages/bazel/src/ng_package/ng_package.bzl b/packages/bazel/src/ng_package/ng_package.bzl index 51e9e211da..485c638090 100644 --- a/packages/bazel/src/ng_package/ng_package.bzl +++ b/packages/bazel/src/ng_package/ng_package.bzl @@ -28,157 +28,9 @@ WELL_KNOWN_GLOBALS = { "@angular/platform-browser": "ng.platformBrowser", "@angular/platform-browser/testing": "ng.platformBrowser.testing", "@angular/platform-browser-dynamic": "ng.platformBrowserDynamic", + "rxjs": "rxjs", + "rxjs/operators": "rxjs.operators", } -WELL_KNOWN_GLOBALS.update({"rxjs/%s" % s: "Rx" for s in [ - "BehaviorSubject", - "ConnectableObservable", - "Observable", - "Observer", - "ReplaySubject", - "Scheduler", - "Subject", - "Subscriber", - "Subscription", - "util/EmptyError", -]}) -WELL_KNOWN_GLOBALS.update({"rxjs/observable/%s" % s: "Rx.Observable" for s in [ - "combineLatest", - "concat", - "defer", - "empty", - "forkJoin", - "from", - "fromEvent", - "fromEventPattern", - "fromPromise", - "merge", - "never", - "of", - "throw", -]}) -WELL_KNOWN_GLOBALS.update({"rxjs/operator/%s" % s: "Rx.Observable.prototype" for s in [ - "catch", - "concatAll", - "concatMap", - "do", - "every", - "first", - "filter", - "last", - "map", - "mergeAll", - "mergeMap", - "publish", - "reduce", - "share", - "startWith", - "switchMap", - "take", - "toPromise", -]}) -WELL_KNOWN_GLOBALS.update({"rxjs/operators/%s" % s: "Rx.operators" for s in [ - "audit", - "auditTime", - "bufferCount", - "buffer", - "bufferTime", - "bufferToggle", - "bufferWhen", - "catchError", - "combineAll", - "combineLatest", - "concatAll", - "concat", - "concatMap", - "concatMapTo", - "count", - "debounce", - "debounceTime", - "defaultIfEmpty", - "delay", - "delayWhen", - "dematerialize", - "distinct", - "distinctUntilChanged", - "distinctUntilKeyChanged", - "elementAt", - "every", - "exhaust", - "exhaustMap", - "expand", - "filter", - "finalize", - "findIndex", - "find", - "first", - "groupBy", - "ignoreElements", - "isEmpty", - "last", - "map", - "mapTo", - "materialize", - "max", - "mergeAll", - "merge", - "mergeMap", - "mergeMapTo", - "mergeScan", - "min", - "multicast", - "observeOn", - "onErrorResumeNext", - "pairwise", - "partition", - "pluck", - "publishBehavior", - "publish", - "publishLast", - "publishReplay", - "race", - "reduce", - "refCount", - "repeat", - "repeatWhen", - "retry", - "retryWhen", - "sample", - "sampleTime", - "scan", - "sequenceEqual", - "share", - "shareReplay", - "single", - "skip", - "skipLast", - "skipUntil", - "skipWhile", - "startWith", - "subscribeOn", - "switchAll", - "switchMap", - "switchMapTo", - "take", - "takeLast", - "takeUntil", - "takeWhile", - "tap", - "throttle", - "throttleTime", - "timeInterval", - "timeout", - "timeoutWith", - "timestamp", - "toArray", - "windowCount", - "window", - "windowTime", - "windowToggle", - "windowWhen", - "withLatestFrom", - "zipAll", - "zip", -]}) def _rollup(ctx, rollup_config, entry_point, inputs, js_output, format = "es"): diff --git a/packages/benchpress/package.json b/packages/benchpress/package.json index 8e1e378e07..8205d8ab66 100644 --- a/packages/benchpress/package.json +++ b/packages/benchpress/package.json @@ -8,7 +8,7 @@ "dependencies": { "@angular/core": "^2.0.0-rc.7", "reflect-metadata": "^0.1.2", - "rxjs": "^5.5.0", + "rxjs": "^6.0.0-alpha.3", "jpm": "1.1.4", "firefox-profile": "0.4.0", "selenium-webdriver": "^2.53.3" diff --git a/packages/common/http/rollup.config.js b/packages/common/http/rollup.config.js index 3fca396dc2..c2a589b01f 100644 --- a/packages/common/http/rollup.config.js +++ b/packages/common/http/rollup.config.js @@ -10,15 +10,8 @@ const globals = { '@angular/core': 'ng.core', '@angular/platform-browser': 'ng.platformBrowser', '@angular/common': 'ng.common', - 'rxjs/Observable': 'Rx', - 'rxjs/Observer': 'Rx', - 'rxjs/Subject': 'Rx', - - 'rxjs/observable/of': 'Rx.Observable', - - 'rxjs/operator/concatMap': 'Rx.Observable.prototype', - 'rxjs/operator/filter': 'Rx.Observable.prototype', - 'rxjs/operator/map': 'Rx.Observable.prototype', + 'rxjs': 'rxjs', + 'rxjs/operators': 'rxjs.operators', }; module.exports = { diff --git a/packages/common/http/src/backend.ts b/packages/common/http/src/backend.ts index b6471dfbf6..aeed25d2e7 100644 --- a/packages/common/http/src/backend.ts +++ b/packages/common/http/src/backend.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {Observable} from 'rxjs/Observable'; +import {Observable} from 'rxjs'; import {HttpRequest} from './request'; import {HttpEvent} from './response'; diff --git a/packages/common/http/src/client.ts b/packages/common/http/src/client.ts index 896974ddb1..59f27e938b 100644 --- a/packages/common/http/src/client.ts +++ b/packages/common/http/src/client.ts @@ -7,11 +7,8 @@ */ import {Injectable} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; -import {of } from 'rxjs/observable/of'; -import {concatMap} from 'rxjs/operator/concatMap'; -import {filter} from 'rxjs/operator/filter'; -import {map} from 'rxjs/operator/map'; +import {Observable, of } from 'rxjs'; +import {concatMap, filter, map} from 'rxjs/operators'; import {HttpHandler} from './backend'; import {HttpHeaders} from './headers'; @@ -384,7 +381,7 @@ export class HttpClient { // inside an Observable chain, which causes interceptors to be re-run on every // subscription (this also makes retries re-run the handler, including interceptors). const events$: Observable> = - concatMap.call(of (req), (req: HttpRequest) => this.handler.handle(req)); + of (req).pipe(concatMap((req: HttpRequest) => this.handler.handle(req))); // If coming via the API signature which accepts a previously constructed HttpRequest, // the only option is to get the event stream. Otherwise, return the event stream if @@ -396,8 +393,8 @@ export class HttpClient { // The requested stream contains either the full response or the body. In either // case, the first step is to filter the event stream to extract a stream of // responses(s). - const res$: Observable> = - filter.call(events$, (event: HttpEvent) => event instanceof HttpResponse); + const res$: Observable> = >>events$.pipe( + filter((event: HttpEvent) => event instanceof HttpResponse)); // Decide which stream to return. switch (options.observe || 'body') { @@ -409,33 +406,33 @@ export class HttpClient { // requested type. switch (req.responseType) { case 'arraybuffer': - return map.call(res$, (res: HttpResponse) => { + return res$.pipe(map((res: HttpResponse) => { // Validate that the body is an ArrayBuffer. if (res.body !== null && !(res.body instanceof ArrayBuffer)) { throw new Error('Response is not an ArrayBuffer.'); } return res.body; - }); + })); case 'blob': - return map.call(res$, (res: HttpResponse) => { + return res$.pipe(map((res: HttpResponse) => { // Validate that the body is a Blob. if (res.body !== null && !(res.body instanceof Blob)) { throw new Error('Response is not a Blob.'); } return res.body; - }); + })); case 'text': - return map.call(res$, (res: HttpResponse) => { + return res$.pipe(map((res: HttpResponse) => { // Validate that the body is a string. if (res.body !== null && typeof res.body !== 'string') { throw new Error('Response is not a string.'); } return res.body; - }); + })); case 'json': default: // No validation needed for JSON responses, as they can be of any type. - return map.call(res$, (res: HttpResponse) => res.body); + return res$.pipe(map((res: HttpResponse) => res.body)); } case 'response': // The response stream was requested directly, so return it. diff --git a/packages/common/http/src/interceptor.ts b/packages/common/http/src/interceptor.ts index 1e712e0da3..d4ae53245f 100644 --- a/packages/common/http/src/interceptor.ts +++ b/packages/common/http/src/interceptor.ts @@ -7,7 +7,7 @@ */ import {Injectable, InjectionToken} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; +import {Observable} from 'rxjs'; import {HttpHandler} from './backend'; import {HttpRequest} from './request'; diff --git a/packages/common/http/src/jsonp.ts b/packages/common/http/src/jsonp.ts index 1fa733ef52..12f259d207 100644 --- a/packages/common/http/src/jsonp.ts +++ b/packages/common/http/src/jsonp.ts @@ -7,9 +7,8 @@ */ import {DOCUMENT} from '@angular/common'; -import {Inject, Injectable, InjectionToken} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; -import {Observer} from 'rxjs/Observer'; +import {Inject, Injectable} from '@angular/core'; +import {Observable, Observer} from 'rxjs'; import {HttpBackend, HttpHandler} from './backend'; import {HttpRequest} from './request'; diff --git a/packages/common/http/src/module.ts b/packages/common/http/src/module.ts index b16809c760..effa7581f5 100644 --- a/packages/common/http/src/module.ts +++ b/packages/common/http/src/module.ts @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ -import {Injectable, Injector, ModuleWithProviders, NgModule, Optional} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; +import {Injectable, Injector, ModuleWithProviders, NgModule} from '@angular/core'; +import {Observable} from 'rxjs'; import {HttpBackend, HttpHandler} from './backend'; import {HttpClient} from './client'; diff --git a/packages/common/http/src/xhr.ts b/packages/common/http/src/xhr.ts index 64e2a2fde6..51027648c5 100644 --- a/packages/common/http/src/xhr.ts +++ b/packages/common/http/src/xhr.ts @@ -7,8 +7,7 @@ */ import {Injectable} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; -import {Observer} from 'rxjs/Observer'; +import {Observable, Observer} from 'rxjs'; import {HttpBackend} from './backend'; import {HttpHeaders} from './headers'; diff --git a/packages/common/http/src/xsrf.ts b/packages/common/http/src/xsrf.ts index 461e6a14e8..75930e6452 100644 --- a/packages/common/http/src/xsrf.ts +++ b/packages/common/http/src/xsrf.ts @@ -8,7 +8,7 @@ import {DOCUMENT, ɵparseCookieValue as parseCookieValue} from '@angular/common'; import {Inject, Injectable, InjectionToken, PLATFORM_ID} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; +import {Observable} from 'rxjs'; import {HttpHandler} from './backend'; import {HttpInterceptor} from './interceptor'; diff --git a/packages/common/http/test/client_spec.ts b/packages/common/http/test/client_spec.ts index 0b901222bb..145d0cff9d 100644 --- a/packages/common/http/test/client_spec.ts +++ b/packages/common/http/test/client_spec.ts @@ -6,10 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ -import 'rxjs/add/operator/toArray'; -import 'rxjs/add/operator/toPromise'; - import {ddescribe, describe, iit, it} from '@angular/core/testing/src/testing_internal'; +import {toArray} from 'rxjs/operators'; import {HttpClient} from '../src/client'; import {HttpErrorResponse, HttpEventType, HttpResponse} from '../src/response'; @@ -77,7 +75,7 @@ import {HttpClientTestingBackend} from '../testing/src/backend'; backend.expectOne('/test').flush(body); }); it('that returns a stream of events', (done: DoneFn) => { - client.get('/test', {observe: 'events'}).toArray().toPromise().then(events => { + client.get('/test', {observe: 'events'}).pipe(toArray()).toPromise().then(events => { expect(events.length).toBe(2); let x = HttpResponse; expect(events[0].type).toBe(HttpEventType.Sent); diff --git a/packages/common/http/test/jsonp_spec.ts b/packages/common/http/test/jsonp_spec.ts index a559af8d51..7571f2c93d 100644 --- a/packages/common/http/test/jsonp_spec.ts +++ b/packages/common/http/test/jsonp_spec.ts @@ -7,6 +7,7 @@ */ import {ddescribe, describe, it} from '@angular/core/testing/src/testing_internal'; +import {toArray} from 'rxjs/operators'; import {JSONP_ERR_NO_CALLBACK, JSONP_ERR_WRONG_METHOD, JSONP_ERR_WRONG_RESPONSE_TYPE, JsonpClientBackend} from '../src/jsonp'; import {HttpRequest} from '../src/request'; @@ -35,7 +36,7 @@ const SAMPLE_REQ = new HttpRequest('JSONP', '/test'); backend = new JsonpClientBackend(home, document); }); it('handles a basic request', (done: DoneFn) => { - backend.handle(SAMPLE_REQ).toArray().subscribe(events => { + backend.handle(SAMPLE_REQ).pipe(toArray()).subscribe(events => { expect(events.map(event => event.type)).toEqual([ HttpEventType.Sent, HttpEventType.Response, @@ -47,7 +48,7 @@ const SAMPLE_REQ = new HttpRequest('JSONP', '/test'); }); it('handles an error response properly', (done: DoneFn) => { const error = new Error('This is a test error'); - backend.handle(SAMPLE_REQ).toArray().subscribe(undefined, (err: HttpErrorResponse) => { + backend.handle(SAMPLE_REQ).pipe(toArray()).subscribe(undefined, (err: HttpErrorResponse) => { expect(err.status).toBe(0); expect(err.error).toBe(error); done(); diff --git a/packages/common/http/test/module_spec.ts b/packages/common/http/test/module_spec.ts index 68e91490ae..e556e7a34e 100644 --- a/packages/common/http/test/module_spec.ts +++ b/packages/common/http/test/module_spec.ts @@ -6,11 +6,10 @@ * found in the LICENSE file at https://angular.io/license */ -import 'rxjs/add/operator/map'; - import {Injectable, Injector} from '@angular/core'; import {TestBed} from '@angular/core/testing'; -import {Observable} from 'rxjs/Observable'; +import {Observable} from 'rxjs'; +import {map} from 'rxjs/operators'; import {HttpHandler} from '../src/backend'; import {HttpClient} from '../src/client'; @@ -28,14 +27,14 @@ class TestInterceptor implements HttpInterceptor { const existing = req.headers.get('Intercepted'); const next = !!existing ? existing + ',' + this.value : this.value; req = req.clone({setHeaders: {'Intercepted': next}}); - return delegate.handle(req).map(event => { + return delegate.handle(req).pipe(map(event => { if (event instanceof HttpResponse) { const existing = event.headers.get('Intercepted'); const next = !!existing ? existing + ',' + this.value : this.value; return event.clone({headers: event.headers.set('Intercepted', next)}); } return event; - }); + })); } } diff --git a/packages/common/http/test/xhr_spec.ts b/packages/common/http/test/xhr_spec.ts index c5fa3a75fc..9ff3ccb979 100644 --- a/packages/common/http/test/xhr_spec.ts +++ b/packages/common/http/test/xhr_spec.ts @@ -7,7 +7,8 @@ */ import {ddescribe, describe, iit, it} from '@angular/core/testing/src/testing_internal'; -import {Observable} from 'rxjs/Observable'; +import {Observable} from 'rxjs'; +import {toArray} from 'rxjs/operators'; import {HttpRequest} from '../src/request'; import {HttpDownloadProgressEvent, HttpErrorResponse, HttpEvent, HttpEventType, HttpHeaderResponse, HttpResponse, HttpResponseBase, HttpUploadProgressEvent} from '../src/response'; @@ -148,27 +149,29 @@ const XSSI_PREFIX = ')]}\'\n'; }); describe('progress events', () => { it('are emitted for download progress', (done: DoneFn) => { - backend.handle(TEST_POST.clone({reportProgress: true})).toArray().subscribe(events => { - expect(events.map(event => event.type)).toEqual([ - HttpEventType.Sent, - HttpEventType.ResponseHeader, - HttpEventType.DownloadProgress, - HttpEventType.DownloadProgress, - HttpEventType.Response, - ]); - const [progress1, progress2, response] = [ - events[2] as HttpDownloadProgressEvent, events[3] as HttpDownloadProgressEvent, - events[4] as HttpResponse - ]; - expect(progress1.partialText).toBe('down'); - expect(progress1.loaded).toBe(100); - expect(progress1.total).toBe(300); - expect(progress2.partialText).toBe('download'); - expect(progress2.loaded).toBe(200); - expect(progress2.total).toBe(300); - expect(response.body).toBe('downloaded'); - done(); - }); + backend.handle(TEST_POST.clone({reportProgress: true})) + .pipe(toArray()) + .subscribe(events => { + expect(events.map(event => event.type)).toEqual([ + HttpEventType.Sent, + HttpEventType.ResponseHeader, + HttpEventType.DownloadProgress, + HttpEventType.DownloadProgress, + HttpEventType.Response, + ]); + const [progress1, progress2, response] = [ + events[2] as HttpDownloadProgressEvent, events[3] as HttpDownloadProgressEvent, + events[4] as HttpResponse + ]; + expect(progress1.partialText).toBe('down'); + expect(progress1.loaded).toBe(100); + expect(progress1.total).toBe(300); + expect(progress2.partialText).toBe('download'); + expect(progress2.loaded).toBe(200); + expect(progress2.total).toBe(300); + expect(response.body).toBe('downloaded'); + done(); + }); factory.mock.responseText = 'down'; factory.mock.mockDownloadProgressEvent(100, 300); factory.mock.responseText = 'download'; @@ -176,70 +179,78 @@ const XSSI_PREFIX = ')]}\'\n'; factory.mock.mockFlush(200, 'OK', 'downloaded'); }); it('are emitted for upload progress', (done: DoneFn) => { - backend.handle(TEST_POST.clone({reportProgress: true})).toArray().subscribe(events => { - expect(events.map(event => event.type)).toEqual([ - HttpEventType.Sent, - HttpEventType.UploadProgress, - HttpEventType.UploadProgress, - HttpEventType.Response, - ]); - const [progress1, progress2] = [ - events[1] as HttpUploadProgressEvent, - events[2] as HttpUploadProgressEvent, - ]; - expect(progress1.loaded).toBe(100); - expect(progress1.total).toBe(300); - expect(progress2.loaded).toBe(200); - expect(progress2.total).toBe(300); - done(); - }); + backend.handle(TEST_POST.clone({reportProgress: true})) + .pipe(toArray()) + .subscribe(events => { + expect(events.map(event => event.type)).toEqual([ + HttpEventType.Sent, + HttpEventType.UploadProgress, + HttpEventType.UploadProgress, + HttpEventType.Response, + ]); + const [progress1, progress2] = [ + events[1] as HttpUploadProgressEvent, + events[2] as HttpUploadProgressEvent, + ]; + expect(progress1.loaded).toBe(100); + expect(progress1.total).toBe(300); + expect(progress2.loaded).toBe(200); + expect(progress2.total).toBe(300); + done(); + }); factory.mock.mockUploadProgressEvent(100, 300); factory.mock.mockUploadProgressEvent(200, 300); factory.mock.mockFlush(200, 'OK', 'Done'); }); it('are emitted when both upload and download progress are available', (done: DoneFn) => { - backend.handle(TEST_POST.clone({reportProgress: true})).toArray().subscribe(events => { - expect(events.map(event => event.type)).toEqual([ - HttpEventType.Sent, - HttpEventType.UploadProgress, - HttpEventType.ResponseHeader, - HttpEventType.DownloadProgress, - HttpEventType.Response, - ]); - done(); - }); + backend.handle(TEST_POST.clone({reportProgress: true})) + .pipe(toArray()) + .subscribe(events => { + expect(events.map(event => event.type)).toEqual([ + HttpEventType.Sent, + HttpEventType.UploadProgress, + HttpEventType.ResponseHeader, + HttpEventType.DownloadProgress, + HttpEventType.Response, + ]); + done(); + }); factory.mock.mockUploadProgressEvent(100, 300); factory.mock.mockDownloadProgressEvent(200, 300); factory.mock.mockFlush(200, 'OK', 'Done'); }); it('are emitted even if length is not computable', (done: DoneFn) => { - backend.handle(TEST_POST.clone({reportProgress: true})).toArray().subscribe(events => { - expect(events.map(event => event.type)).toEqual([ - HttpEventType.Sent, - HttpEventType.UploadProgress, - HttpEventType.ResponseHeader, - HttpEventType.DownloadProgress, - HttpEventType.Response, - ]); - done(); - }); + backend.handle(TEST_POST.clone({reportProgress: true})) + .pipe(toArray()) + .subscribe(events => { + expect(events.map(event => event.type)).toEqual([ + HttpEventType.Sent, + HttpEventType.UploadProgress, + HttpEventType.ResponseHeader, + HttpEventType.DownloadProgress, + HttpEventType.Response, + ]); + done(); + }); factory.mock.mockUploadProgressEvent(100); factory.mock.mockDownloadProgressEvent(200); factory.mock.mockFlush(200, 'OK', 'Done'); }); it('include ResponseHeader with headers and status', (done: DoneFn) => { - backend.handle(TEST_POST.clone({reportProgress: true})).toArray().subscribe(events => { - expect(events.map(event => event.type)).toEqual([ - HttpEventType.Sent, - HttpEventType.ResponseHeader, - HttpEventType.DownloadProgress, - HttpEventType.Response, - ]); - const partial = events[1] as HttpHeaderResponse; - expect(partial.headers.get('Content-Type')).toEqual('text/plain'); - expect(partial.headers.get('Test')).toEqual('Test header'); - done(); - }); + backend.handle(TEST_POST.clone({reportProgress: true})) + .pipe(toArray()) + .subscribe(events => { + expect(events.map(event => event.type)).toEqual([ + HttpEventType.Sent, + HttpEventType.ResponseHeader, + HttpEventType.DownloadProgress, + HttpEventType.Response, + ]); + const partial = events[1] as HttpHeaderResponse; + expect(partial.headers.get('Content-Type')).toEqual('text/plain'); + expect(partial.headers.get('Test')).toEqual('Test header'); + done(); + }); factory.mock.mockResponseHeaders = 'Test: Test header\nContent-Type: text/plain\n'; factory.mock.mockDownloadProgressEvent(200); factory.mock.mockFlush(200, 'OK', 'Done'); @@ -251,18 +262,20 @@ const XSSI_PREFIX = ')]}\'\n'; expect(factory.mock.listeners.progress).toBeUndefined(); }); it('do not cause headers to be re-parsed on main response', (done: DoneFn) => { - backend.handle(TEST_POST.clone({reportProgress: true})).toArray().subscribe(events => { - events - .filter( - event => event.type === HttpEventType.Response || - event.type === HttpEventType.ResponseHeader) - .map(event => event as HttpResponseBase) - .forEach(event => { - expect(event.status).toBe(203); - expect(event.headers.get('Test')).toEqual('This is a test'); - }); - done(); - }); + backend.handle(TEST_POST.clone({reportProgress: true})) + .pipe(toArray()) + .subscribe(events => { + events + .filter( + event => event.type === HttpEventType.Response || + event.type === HttpEventType.ResponseHeader) + .map(event => event as HttpResponseBase) + .forEach(event => { + expect(event.status).toBe(203); + expect(event.headers.get('Test')).toEqual('This is a test'); + }); + done(); + }); factory.mock.mockResponseHeaders = 'Test: This is a test\n'; factory.mock.status = 203; factory.mock.mockDownloadProgressEvent(100, 300); @@ -272,7 +285,7 @@ const XSSI_PREFIX = ')]}\'\n'; }); describe('gets response URL', () => { it('from XHR.responsesURL', (done: DoneFn) => { - backend.handle(TEST_POST).toArray().subscribe(events => { + backend.handle(TEST_POST).pipe(toArray()).subscribe(events => { expect(events.length).toBe(2); expect(events[1].type).toBe(HttpEventType.Response); const response = events[1] as HttpResponse; @@ -283,7 +296,7 @@ const XSSI_PREFIX = ')]}\'\n'; factory.mock.mockFlush(200, 'OK', 'Test'); }); it('from X-Request-URL header if XHR.responseURL is not present', (done: DoneFn) => { - backend.handle(TEST_POST).toArray().subscribe(events => { + backend.handle(TEST_POST).pipe(toArray()).subscribe(events => { expect(events.length).toBe(2); expect(events[1].type).toBe(HttpEventType.Response); const response = events[1] as HttpResponse; @@ -294,7 +307,7 @@ const XSSI_PREFIX = ')]}\'\n'; factory.mock.mockFlush(200, 'OK', 'Test'); }); it('falls back on Request.url if neither are available', (done: DoneFn) => { - backend.handle(TEST_POST).toArray().subscribe(events => { + backend.handle(TEST_POST).pipe(toArray()).subscribe(events => { expect(events.length).toBe(2); expect(events[1].type).toBe(HttpEventType.Response); const response = events[1] as HttpResponse; @@ -306,7 +319,7 @@ const XSSI_PREFIX = ')]}\'\n'; }); describe('corrects for quirks', () => { it('by normalizing 1223 status to 204', (done: DoneFn) => { - backend.handle(TEST_POST).toArray().subscribe(events => { + backend.handle(TEST_POST).pipe(toArray()).subscribe(events => { expect(events.length).toBe(2); expect(events[1].type).toBe(HttpEventType.Response); const response = events[1] as HttpResponse; @@ -316,7 +329,7 @@ const XSSI_PREFIX = ')]}\'\n'; factory.mock.mockFlush(1223, 'IE Special Status', 'Test'); }); it('by normalizing 0 status to 200 if a body is present', (done: DoneFn) => { - backend.handle(TEST_POST).toArray().subscribe(events => { + backend.handle(TEST_POST).pipe(toArray()).subscribe(events => { expect(events.length).toBe(2); expect(events[1].type).toBe(HttpEventType.Response); const response = events[1] as HttpResponse; @@ -326,10 +339,11 @@ const XSSI_PREFIX = ')]}\'\n'; factory.mock.mockFlush(0, 'CORS 0 status', 'Test'); }); it('by leaving 0 status as 0 if a body is not present', (done: DoneFn) => { - backend.handle(TEST_POST).toArray().subscribe(undefined, (error: HttpErrorResponse) => { - expect(error.status).toBe(0); - done(); - }); + backend.handle(TEST_POST).pipe(toArray()).subscribe( + undefined, (error: HttpErrorResponse) => { + expect(error.status).toBe(0); + done(); + }); factory.mock.mockFlush(0, 'CORS 0 status'); }); }); diff --git a/packages/common/http/testing/rollup.config.js b/packages/common/http/testing/rollup.config.js index a14bdda2f9..50ab5a54ee 100644 --- a/packages/common/http/testing/rollup.config.js +++ b/packages/common/http/testing/rollup.config.js @@ -14,12 +14,8 @@ const globals = { '@angular/platform-browser': 'ng.platformBrowser', '@angular/common': 'ng.common', '@angular/common/http': 'ng.common.http', - 'rxjs/Observable': 'Rx', - 'rxjs/Observer': 'Rx', - 'rxjs/ReplaySubject': 'Rx', - 'rxjs/Subject': 'Rx', - - 'rxjs/operator/startWith': 'Rx.Observable.prototype', + 'rxjs': 'rxjs', + 'rxjs/operators': 'rxjs.operators', }; module.exports = { diff --git a/packages/common/http/testing/src/backend.ts b/packages/common/http/testing/src/backend.ts index 1ebe458671..4021e20ab5 100644 --- a/packages/common/http/testing/src/backend.ts +++ b/packages/common/http/testing/src/backend.ts @@ -8,9 +8,7 @@ import {HttpBackend, HttpEvent, HttpEventType, HttpRequest} from '@angular/common/http'; import {Injectable} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; -import {Observer} from 'rxjs/Observer'; -import {startWith} from 'rxjs/operator/startWith'; +import {Observable, Observer} from 'rxjs'; import {HttpTestingController, RequestMatch} from './api'; import {TestRequest} from './request'; diff --git a/packages/common/http/testing/src/request.ts b/packages/common/http/testing/src/request.ts index e765fd69f5..3dba6ddf3a 100644 --- a/packages/common/http/testing/src/request.ts +++ b/packages/common/http/testing/src/request.ts @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ -import {HttpErrorResponse, HttpEvent, HttpEventType, HttpHeaders, HttpRequest, HttpResponse} from '@angular/common/http'; -import {Observer} from 'rxjs/Observer'; +import {HttpErrorResponse, HttpEvent, HttpHeaders, HttpRequest, HttpResponse} from '@angular/common/http'; +import {Observer} from 'rxjs'; /** * A mock requests that was received and is ready to be answered. diff --git a/packages/common/package.json b/packages/common/package.json index f7455482a5..8d1a1e9849 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -17,7 +17,7 @@ }, "locales": "locales", "peerDependencies": { - "rxjs": "^5.5.0", + "rxjs": "^6.0.0-alpha.3", "@angular/core": "0.0.0-PLACEHOLDER" }, "repository": { diff --git a/packages/common/rollup.config.js b/packages/common/rollup.config.js index a8bac6f111..ff83e4dbdf 100644 --- a/packages/common/rollup.config.js +++ b/packages/common/rollup.config.js @@ -11,10 +11,7 @@ const sourcemaps = require('rollup-plugin-sourcemaps'); const globals = { '@angular/core': 'ng.core', - 'rxjs/Observable': 'Rx', - 'rxjs/Observer': 'Rx', - 'rxjs/Subject': 'Rx', - 'rxjs/Subscription': 'Rx', + 'rxjs': 'rxjs', }; module.exports = { diff --git a/packages/common/src/location/location.ts b/packages/common/src/location/location.ts index c09bce6258..0d6bab27f7 100644 --- a/packages/common/src/location/location.ts +++ b/packages/common/src/location/location.ts @@ -7,7 +7,7 @@ */ import {EventEmitter, Injectable} from '@angular/core'; -import {ISubscription} from 'rxjs/Subscription'; +import {SubscriptionLike} from 'rxjs'; import {LocationStrategy} from './location_strategy'; @@ -132,7 +132,7 @@ export class Location { */ subscribe( onNext: (value: PopStateEvent) => void, onThrow?: ((exception: any) => void)|null, - onReturn?: (() => void)|null): ISubscription { + onReturn?: (() => void)|null): SubscriptionLike { return this._subject.subscribe({next: onNext, error: onThrow, complete: onReturn}); } diff --git a/packages/common/src/pipes/async_pipe.ts b/packages/common/src/pipes/async_pipe.ts index ce1f555b58..1332251df1 100644 --- a/packages/common/src/pipes/async_pipe.ts +++ b/packages/common/src/pipes/async_pipe.ts @@ -7,25 +7,24 @@ */ import {ChangeDetectorRef, EventEmitter, OnDestroy, Pipe, PipeTransform, WrappedValue, ɵisObservable, ɵisPromise} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; -import {ISubscription} from 'rxjs/Subscription'; +import {Observable, SubscriptionLike} from 'rxjs'; import {invalidPipeArgumentError} from './invalid_pipe_argument_error'; interface SubscriptionStrategy { - createSubscription(async: Observable|Promise, updateLatestValue: any): ISubscription + createSubscription(async: Observable|Promise, updateLatestValue: any): SubscriptionLike |Promise; - dispose(subscription: ISubscription|Promise): void; - onDestroy(subscription: ISubscription|Promise): void; + dispose(subscription: SubscriptionLike|Promise): void; + onDestroy(subscription: SubscriptionLike|Promise): void; } class ObservableStrategy implements SubscriptionStrategy { - createSubscription(async: Observable, updateLatestValue: any): ISubscription { + createSubscription(async: Observable, updateLatestValue: any): SubscriptionLike { return async.subscribe({next: updateLatestValue, error: (e: any) => { throw e; }}); } - dispose(subscription: ISubscription): void { subscription.unsubscribe(); } + dispose(subscription: SubscriptionLike): void { subscription.unsubscribe(); } - onDestroy(subscription: ISubscription): void { subscription.unsubscribe(); } + onDestroy(subscription: SubscriptionLike): void { subscription.unsubscribe(); } } class PromiseStrategy implements SubscriptionStrategy { @@ -71,7 +70,7 @@ export class AsyncPipe implements OnDestroy, PipeTransform { private _latestValue: any = null; private _latestReturnedValue: any = null; - private _subscription: ISubscription|Promise|null = null; + private _subscription: SubscriptionLike|Promise|null = null; private _obj: Observable|Promise|EventEmitter|null = null; private _strategy: SubscriptionStrategy = null !; diff --git a/packages/common/testing/rollup.config.js b/packages/common/testing/rollup.config.js index d5ceec256e..5022ab760e 100644 --- a/packages/common/testing/rollup.config.js +++ b/packages/common/testing/rollup.config.js @@ -12,9 +12,7 @@ const sourcemaps = require('rollup-plugin-sourcemaps'); const globals = { '@angular/core': 'ng.core', '@angular/common': 'ng.common', - 'rxjs/Observable': 'Rx', - 'rxjs/Subject': 'Rx', - 'rxjs/Subscription': 'Rx' + 'rxjs': 'rxjs', }; module.exports = { diff --git a/packages/common/testing/src/location_mock.ts b/packages/common/testing/src/location_mock.ts index 802d9978f1..f28f68731a 100644 --- a/packages/common/testing/src/location_mock.ts +++ b/packages/common/testing/src/location_mock.ts @@ -8,7 +8,7 @@ import {Location, LocationStrategy} from '@angular/common'; import {EventEmitter, Injectable} from '@angular/core'; -import {ISubscription} from 'rxjs/Subscription'; +import {SubscriptionLike} from 'rxjs'; /** @@ -113,7 +113,7 @@ export class SpyLocation implements Location { subscribe( onNext: (value: any) => void, onThrow?: ((error: any) => void)|null, - onReturn?: (() => void)|null): ISubscription { + onReturn?: (() => void)|null): SubscriptionLike { return this._subject.subscribe({next: onNext, error: onThrow, complete: onReturn}); } diff --git a/packages/compiler-cli/integrationtest/src/features.ts b/packages/compiler-cli/integrationtest/src/features.ts index 76802fc327..756cbd0b79 100644 --- a/packages/compiler-cli/integrationtest/src/features.ts +++ b/packages/compiler-cli/integrationtest/src/features.ts @@ -8,7 +8,7 @@ import * as common from '@angular/common'; import {CUSTOM_ELEMENTS_SCHEMA, Component, Directive, EventEmitter, Inject, InjectionToken, NgModule, Output, forwardRef} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; +import {Observable} from 'rxjs'; import {wrapInArray} from './funcs'; diff --git a/packages/compiler/rollup.config.js b/packages/compiler/rollup.config.js index 31a4a75c6d..a735cc2adc 100644 --- a/packages/compiler/rollup.config.js +++ b/packages/compiler/rollup.config.js @@ -11,8 +11,7 @@ const sourcemaps = require('rollup-plugin-sourcemaps'); const globals = { '@angular/core': 'ng.core', - 'rxjs/Observable': 'Rx', - 'rxjs/Subject': 'Rx', + 'rxjs': 'rxjs', }; module.exports = { diff --git a/packages/compiler/test/aot/test_util.ts b/packages/compiler/test/aot/test_util.ts index e48c7e2915..e6f3078463 100644 --- a/packages/compiler/test/aot/test_util.ts +++ b/packages/compiler/test/aot/test_util.ts @@ -60,6 +60,8 @@ export interface EmitterOptions { function calcPathsOnDisc() { const moduleFilename = module.filename.replace(/\\/g, '/'); + // TODO(i): this is suspicious because it relies on build.sh output + // which is problematic when we are running tests under bazel - review with Chuck const distIndex = moduleFilename.indexOf('/dist/all'); if (distIndex >= 0) { rootPath = moduleFilename.substr(0, distIndex); diff --git a/packages/compiler/testing/rollup.config.js b/packages/compiler/testing/rollup.config.js index cb93c1a4fb..a3a7211031 100644 --- a/packages/compiler/testing/rollup.config.js +++ b/packages/compiler/testing/rollup.config.js @@ -13,8 +13,7 @@ const globals = { '@angular/core': 'ng.core', '@angular/core/testing': 'ng.core.testing', '@angular/compiler': 'ng.compiler', - 'rxjs/Observable': 'Rx', - 'rxjs/Subject': 'Rx' + 'rxjs': 'rxjs', }; module.exports = { diff --git a/packages/core/package.json b/packages/core/package.json index e52f40d78b..f8850a5412 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -16,7 +16,7 @@ "tslib": "^1.9.0" }, "peerDependencies": { - "rxjs": "^5.5.0", + "rxjs": "^6.0.0-alpha.3", "zone.js": "^0.8.4" }, "repository": { diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 70a09e44d0..35c4334b89 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -10,12 +10,8 @@ const resolve = require('rollup-plugin-node-resolve'); const sourcemaps = require('rollup-plugin-sourcemaps'); const globals = { - 'rxjs/Observable': 'Rx', - 'rxjs/Subject': 'Rx', - 'rxjs/Observer': 'Rx', - 'rxjs/Subscription': 'Rx', - 'rxjs/observable/merge': 'Rx.Observable', - 'rxjs/operator/share': 'Rx.Observable.prototype' + 'rxjs': 'rxjs', + 'rxjs/operators': 'rxjs.operators' }; module.exports = { diff --git a/packages/core/src/application_ref.ts b/packages/core/src/application_ref.ts index 87e8bfb1ff..b844c856b7 100644 --- a/packages/core/src/application_ref.ts +++ b/packages/core/src/application_ref.ts @@ -6,11 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ -import {Observable} from 'rxjs/Observable'; -import {Observer} from 'rxjs/Observer'; -import {Subscription} from 'rxjs/Subscription'; -import {merge} from 'rxjs/observable/merge'; -import {share} from 'rxjs/operator/share'; +import {Observable, Observer, Subscription, merge} from 'rxjs'; +import {share} from 'rxjs/operators'; import {ErrorHandler} from '../src/error_handler'; import {scheduleMicroTask, stringify} from '../src/util'; @@ -445,7 +442,7 @@ export class ApplicationRef { }); (this as{isStable: Observable}).isStable = - merge(isCurrentlyStable, share.call(isStable)); + merge(isCurrentlyStable, isStable.pipe(share())); } /** diff --git a/packages/core/src/event_emitter.ts b/packages/core/src/event_emitter.ts index ae9bb4bc8b..799eaff9b3 100644 --- a/packages/core/src/event_emitter.ts +++ b/packages/core/src/event_emitter.ts @@ -6,8 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {Subject} from 'rxjs/Subject'; -import {Subscription} from 'rxjs/Subscription'; +import {Subject, Subscription} from 'rxjs'; /** * Use by directives and components to emit custom Events. diff --git a/packages/core/src/linker/query_list.ts b/packages/core/src/linker/query_list.ts index af978bbc7e..b461e93b22 100644 --- a/packages/core/src/linker/query_list.ts +++ b/packages/core/src/linker/query_list.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {Observable} from 'rxjs/Observable'; +import {Observable} from 'rxjs'; import {EventEmitter} from '../event_emitter'; import {getSymbolIterator} from '../util'; diff --git a/packages/core/src/render3/query.ts b/packages/core/src/render3/query.ts index 610d1983df..5ca0b05f51 100644 --- a/packages/core/src/render3/query.ts +++ b/packages/core/src/render3/query.ts @@ -8,7 +8,7 @@ // We are temporarily importing the existing viewEngine_from core so we can be sure we are // correctly implementing its interfaces for backwards compatibility. -import {Observable} from 'rxjs/Observable'; +import {Observable} from 'rxjs'; import {EventEmitter} from '../event_emitter'; import {QueryList as viewEngine_QueryList} from '../linker/query_list'; diff --git a/packages/core/src/util/lang.ts b/packages/core/src/util/lang.ts index 1d577314f7..3fc560f894 100644 --- a/packages/core/src/util/lang.ts +++ b/packages/core/src/util/lang.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {Observable} from 'rxjs/Observable'; +import {Observable} from 'rxjs'; /** * Determine if the argument is shaped like a Promise diff --git a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json index a92e44dd18..5f8a59d9e4 100644 --- a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json +++ b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json @@ -1,9 +1,24 @@ [ + { + "name": "Action" + }, + { + "name": "AnimationFrameAction" + }, + { + "name": "AsapAction" + }, + { + "name": "AsyncAction" + }, + { + "name": "AsyncScheduler" + }, { "name": "CLEAN_PROMISE" }, { - "name": "EMPTY$1" + "name": "EMPTY$2" }, { "name": "EMPTY_RENDERER_TYPE_ID" @@ -14,6 +29,9 @@ { "name": "INeedToExistEvenThoughtIAmNotNeeded" }, + { + "name": "Immediate" + }, { "name": "NG_HOST_SYMBOL" }, @@ -21,26 +39,65 @@ "name": "NG_PROJECT_AS_ATTR_NAME" }, { - "name": "Symbol$1" + "name": "Observable" + }, + { + "name": "QueueAction" + }, + { + "name": "SafeSubscriber" + }, + { + "name": "Scheduler" + }, + { + "name": "Subscriber" + }, + { + "name": "Subscription" }, { "name": "UNDEFINED_RENDERER_TYPE_ID" }, { - "name": "__global$1" + "name": "UnsubscriptionError" }, { - "name": "__self$1" + "name": "__extends$1" }, { - "name": "__window$1" + "name": "__extends$10" + }, + { + "name": "__extends$11" + }, + { + "name": "__extends$12" + }, + { + "name": "__extends$13" + }, + { + "name": "__extends$14" + }, + { + "name": "__extends$17" + }, + { + "name": "__extends$18" + }, + { + "name": "__extends$19" + }, + { + "name": "__extends$2" + }, + { + "name": "__extends$20" }, { "name": "_renderCompCount" }, - { - "name": "_root" - }, { "name": "appendChild" }, @@ -59,6 +116,9 @@ { "name": "componentRefresh" }, + { + "name": "config" + }, { "name": "createLNode" }, @@ -83,9 +143,15 @@ { "name": "domRendererFactory3" }, + { + "name": "empty" + }, { "name": "enterView" }, + { + "name": "errorObject" + }, { "name": "executeHooks" }, @@ -95,6 +161,9 @@ { "name": "executeInitHooks" }, + { + "name": "flattenUnsubscriptionErrors" + }, { "name": "getDirectiveInstance" }, @@ -102,7 +171,10 @@ "name": "getOrCreateTView" }, { - "name": "getSymbolObservable" + "name": "getPromiseCtor" + }, + { + "name": "getSymbolIterator$1" }, { "name": "hostElement" @@ -113,6 +185,15 @@ { "name": "invertObject" }, + { + "name": "isArray" + }, + { + "name": "isFunction" + }, + { + "name": "isObject" + }, { "name": "isProceduralRenderer" }, @@ -122,6 +203,18 @@ { "name": "locateHostElement" }, + { + "name": "nextHandle" + }, + { + "name": "noop" + }, + { + "name": "observable" + }, + { + "name": "pipeFromArray" + }, { "name": "refreshChildComponents" }, @@ -149,6 +242,12 @@ { "name": "rootDirectiveIndices" }, + { + "name": "runIfPresent" + }, + { + "name": "rxSubscriber" + }, { "name": "setHostBindings" }, @@ -159,11 +258,20 @@ "name": "stringify$1" }, { - "name": "symbolIteratorPonyfill" + "name": "tasksByHandle" }, { "name": "text" }, + { + "name": "toSubscriber" + }, + { + "name": "tryCatch" + }, + { + "name": "tryCatcher" + }, { "name": "viewAttached" } diff --git a/packages/core/test/bundling/hello_world/treeshaking_spec.ts b/packages/core/test/bundling/hello_world/treeshaking_spec.ts index de629388cf..7baae2e086 100644 --- a/packages/core/test/bundling/hello_world/treeshaking_spec.ts +++ b/packages/core/test/bundling/hello_world/treeshaking_spec.ts @@ -18,6 +18,14 @@ const PACKAGE = 'angular/packages/core/test/bundling/hello_world'; import * as domino from 'domino'; describe('treeshaking with uglify', () => { + + beforeAll(() => { + // initialize window so that when rxjs is loaded it is loaded and initialized as if it was + // loaded in a browser + // even when the test runs in node + (global as any).window = domino.createWindow('', 'http://localhost'); + }); + let content: string; const contentPath = require.resolve(path.join(PACKAGE, 'bundle.min_debug.js')); beforeAll(() => { content = fs.readFileSync(contentPath, UTF8); }); @@ -51,4 +59,4 @@ describe('treeshaking with uglify', () => { expect(document.body.textContent).toEqual('Hello World!'); })); }); -}); \ No newline at end of file +}); diff --git a/packages/core/test/bundling/injection/bundle.golden_symbols.json b/packages/core/test/bundling/injection/bundle.golden_symbols.json index 7536843059..cec5fad462 100644 --- a/packages/core/test/bundling/injection/bundle.golden_symbols.json +++ b/packages/core/test/bundling/injection/bundle.golden_symbols.json @@ -2,6 +2,21 @@ { "name": "APP_ROOT" }, + { + "name": "Action" + }, + { + "name": "AnimationFrameAction" + }, + { + "name": "AsapAction" + }, + { + "name": "AsyncAction" + }, + { + "name": "AsyncScheduler" + }, { "name": "CIRCULAR$1" }, @@ -14,6 +29,9 @@ { "name": "INJECTOR$1" }, + { + "name": "Immediate" + }, { "name": "Inject" }, @@ -29,15 +47,27 @@ { "name": "NullInjector" }, + { + "name": "Observable" + }, { "name": "Optional" }, { "name": "PARAMETERS" }, + { + "name": "QueueAction" + }, { "name": "R3Injector" }, + { + "name": "SafeSubscriber" + }, + { + "name": "Scheduler" + }, { "name": "ScopedService" }, @@ -48,7 +78,10 @@ "name": "SkipSelf" }, { - "name": "Symbol$1" + "name": "Subscriber" + }, + { + "name": "Subscription" }, { "name": "THROW_IF_NOT_FOUND" @@ -56,29 +89,56 @@ { "name": "USE_VALUE$1" }, + { + "name": "UnsubscriptionError" + }, { "name": "_THROW_IF_NOT_FOUND" }, { - "name": "__global$1" + "name": "__extends$1" + }, + { + "name": "__extends$10" + }, + { + "name": "__extends$11" + }, + { + "name": "__extends$12" + }, + { + "name": "__extends$13" + }, + { + "name": "__extends$14" + }, + { + "name": "__extends$17" + }, + { + "name": "__extends$18" + }, + { + "name": "__extends$19" + }, + { + "name": "__extends$2" + }, + { + "name": "__extends$20" }, { "name": "__read" }, - { - "name": "__self$1" - }, { "name": "__spread" }, - { - "name": "__window$1" - }, { "name": "_currentInjector" }, { - "name": "_root" + "name": "config" }, { "name": "couldBeInjectableType" @@ -95,6 +155,15 @@ { "name": "defineInjector" }, + { + "name": "empty" + }, + { + "name": "errorObject" + }, + { + "name": "flattenUnsubscriptionErrors" + }, { "name": "forwardRef" }, @@ -105,7 +174,10 @@ "name": "getNullInjector" }, { - "name": "getSymbolObservable" + "name": "getPromiseCtor" + }, + { + "name": "getSymbolIterator$1" }, { "name": "hasDeps" @@ -122,12 +194,21 @@ { "name": "injectableDefRecord" }, + { + "name": "isArray" + }, { "name": "isExistingProvider" }, { "name": "isFactoryProvider" }, + { + "name": "isFunction" + }, + { + "name": "isObject" + }, { "name": "isTypeProvider" }, @@ -143,12 +224,30 @@ { "name": "makeRecord" }, + { + "name": "nextHandle" + }, + { + "name": "noop" + }, + { + "name": "observable" + }, + { + "name": "pipeFromArray" + }, { "name": "providerToRecord" }, { "name": "resolveForwardRef" }, + { + "name": "runIfPresent" + }, + { + "name": "rxSubscriber" + }, { "name": "setCurrentInjector" }, @@ -156,6 +255,15 @@ "name": "stringify" }, { - "name": "symbolIteratorPonyfill" + "name": "tasksByHandle" + }, + { + "name": "toSubscriber" + }, + { + "name": "tryCatch" + }, + { + "name": "tryCatcher" } ] \ No newline at end of file diff --git a/packages/core/test/linker/query_integration_spec.ts b/packages/core/test/linker/query_integration_spec.ts index 792d7a577e..bf11d8aa9b 100644 --- a/packages/core/test/linker/query_integration_spec.ts +++ b/packages/core/test/linker/query_integration_spec.ts @@ -10,7 +10,7 @@ import {AfterContentChecked, AfterContentInit, AfterViewChecked, AfterViewInit, import {ComponentFixture, TestBed, async} from '@angular/core/testing'; import {expect} from '@angular/platform-browser/testing/src/matchers'; -import {Subject} from 'rxjs/Subject'; +import {Subject} from 'rxjs'; import {stringify} from '../../src/util'; diff --git a/packages/core/test/util/lang_spec.ts b/packages/core/test/util/lang_spec.ts index 3fa338d55e..73086b09cf 100644 --- a/packages/core/test/util/lang_spec.ts +++ b/packages/core/test/util/lang_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ import {isObservable, isPromise} from '@angular/core/src/util/lang'; -import {of } from 'rxjs/observable/of'; +import {of } from 'rxjs'; { describe('isPromise', () => { diff --git a/packages/core/testing/rollup.config.js b/packages/core/testing/rollup.config.js index cf837981dc..55cb635adb 100644 --- a/packages/core/testing/rollup.config.js +++ b/packages/core/testing/rollup.config.js @@ -11,8 +11,7 @@ const sourcemaps = require('rollup-plugin-sourcemaps'); const globals = { '@angular/core': 'ng.core', - 'rxjs/Observable': 'Rx', - 'rxjs/Subject': 'Rx', + 'rxjs': 'rxjs', }; module.exports = { diff --git a/packages/elements/rollup.config.js b/packages/elements/rollup.config.js index 7d65049dcd..477863d15e 100644 --- a/packages/elements/rollup.config.js +++ b/packages/elements/rollup.config.js @@ -12,10 +12,8 @@ const sourcemaps = require('rollup-plugin-sourcemaps'); const globals = { '@angular/core': 'ng.core', '@angular/platform-browser': 'ng.platformBrowser', - 'rxjs/Subscription': 'Rx', - 'rxjs/Observable': 'Rx', - 'rxjs/observable/merge': 'Rx.Observable', - 'rxjs/operator/map': 'Rx.Observable.prototype' + 'rxjs': 'rxjs', + 'rxjs/operators': 'rxjs.operators' }; module.exports = { diff --git a/packages/elements/src/component-factory-strategy.ts b/packages/elements/src/component-factory-strategy.ts index 5d52397b44..2474c0fc9e 100644 --- a/packages/elements/src/component-factory-strategy.ts +++ b/packages/elements/src/component-factory-strategy.ts @@ -7,9 +7,8 @@ */ import {ApplicationRef, ComponentFactory, ComponentFactoryResolver, ComponentRef, EventEmitter, Injector, OnChanges, SimpleChange, SimpleChanges, Type} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; -import {merge} from 'rxjs/observable/merge'; -import {map} from 'rxjs/operator/map'; +import {Observable, merge} from 'rxjs'; +import {map} from 'rxjs/operators'; import {NgElementStrategy, NgElementStrategyEvent, NgElementStrategyFactory} from './element-strategy'; import {extractProjectableNodes} from './extract-projectable-nodes'; @@ -180,7 +179,7 @@ export class ComponentNgElementStrategy implements NgElementStrategy { protected initializeOutputs(): void { const eventEmitters = this.componentFactory.outputs.map(({propName, templateName}) => { const emitter = (this.componentRef !.instance as any)[propName] as EventEmitter; - return map.call(emitter, (value: any) => ({name: templateName, value})); + return emitter.pipe(map((value: any) => ({name: templateName, value}))); }); this.events = merge(...eventEmitters); diff --git a/packages/elements/src/create-custom-element.ts b/packages/elements/src/create-custom-element.ts index 4797d2136c..e403189a21 100644 --- a/packages/elements/src/create-custom-element.ts +++ b/packages/elements/src/create-custom-element.ts @@ -7,7 +7,7 @@ */ import {Injector, Type} from '@angular/core'; -import {Subscription} from 'rxjs/Subscription'; +import {Subscription} from 'rxjs'; import {ComponentNgElementStrategyFactory} from './component-factory-strategy'; import {NgElementStrategy, NgElementStrategyFactory} from './element-strategy'; diff --git a/packages/elements/src/element-strategy.ts b/packages/elements/src/element-strategy.ts index c915075159..112cd69afc 100644 --- a/packages/elements/src/element-strategy.ts +++ b/packages/elements/src/element-strategy.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ import {ComponentFactory, Injector} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; +import {Observable} from 'rxjs'; /** * Interface for the events emitted through the NgElementStrategy. diff --git a/packages/elements/test/component-factory-strategy_spec.ts b/packages/elements/test/component-factory-strategy_spec.ts index 50e12f920e..7edfa1164f 100644 --- a/packages/elements/test/component-factory-strategy_spec.ts +++ b/packages/elements/test/component-factory-strategy_spec.ts @@ -8,7 +8,7 @@ import {ComponentFactory, ComponentRef, Injector, NgModuleRef, SimpleChange, SimpleChanges, Type} from '@angular/core'; import {fakeAsync, tick} from '@angular/core/testing'; -import {Subject} from 'rxjs/Subject'; +import {Subject} from 'rxjs'; import {ComponentNgElementStrategy, ComponentNgElementStrategyFactory} from '../src/component-factory-strategy'; import {NgElementStrategyEvent} from '../src/element-strategy'; diff --git a/packages/elements/test/create-custom-element_spec.ts b/packages/elements/test/create-custom-element_spec.ts index 43f643bbd8..dbb82d31e4 100644 --- a/packages/elements/test/create-custom-element_spec.ts +++ b/packages/elements/test/create-custom-element_spec.ts @@ -9,7 +9,7 @@ import {Component, EventEmitter, Injector, Input, NgModule, Output, destroyPlatform} from '@angular/core'; import {BrowserModule} from '@angular/platform-browser'; import {platformBrowserDynamic} from '@angular/platform-browser-dynamic'; -import {Subject} from 'rxjs/Subject'; +import {Subject} from 'rxjs'; import {NgElementConstructor, createCustomElement} from '../src/create-custom-element'; import {NgElementStrategy, NgElementStrategyEvent, NgElementStrategyFactory} from '../src/element-strategy'; diff --git a/packages/examples/_common/system-config.ts b/packages/examples/_common/system-config.ts index 590679e329..2ad12456a6 100644 --- a/packages/examples/_common/system-config.ts +++ b/packages/examples/_common/system-config.ts @@ -24,10 +24,13 @@ System.config({ '@angular/router': '/vendor/@angular/router/bundles/router.umd.js', '@angular/upgrade': '/vendor/@angular/upgrade/bundles/upgrade.umd.js', '@angular/upgrade/static': '/vendor/@angular/upgrade/bundles/upgrade-static.umd.js', - 'rxjs': '/vendor/rxjs', + 'rxjs': '/vendor/rxjs' }, packages: { - // rxjs: {format: 'cjs', exports: 'Rx' } - rxjs: {defaultExtension: 'js'} - } + 'rxjs/ajax': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/operators': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/testing': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/websocket': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs': {main: 'index.js', defaultExtension: 'js'}, + }, }); diff --git a/packages/examples/common/ngIf/ts/module.ts b/packages/examples/common/ngIf/ts/module.ts index fe2732d2ae..902ea6e528 100644 --- a/packages/examples/common/ngIf/ts/module.ts +++ b/packages/examples/common/ngIf/ts/module.ts @@ -8,7 +8,7 @@ import {Component, NgModule, OnInit, TemplateRef, ViewChild} from '@angular/core'; import {BrowserModule} from '@angular/platform-browser'; -import {Subject} from 'rxjs/Subject'; +import {Subject} from 'rxjs'; // #docregion NgIfSimple diff --git a/packages/examples/common/ngTemplateOutlet/ts/module.ts b/packages/examples/common/ngTemplateOutlet/ts/module.ts index 84f4c99092..dc14eb17be 100644 --- a/packages/examples/common/ngTemplateOutlet/ts/module.ts +++ b/packages/examples/common/ngTemplateOutlet/ts/module.ts @@ -6,9 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ -import {Component, NgModule, OnInit, TemplateRef, ViewChild} from '@angular/core'; +import {Component, NgModule} from '@angular/core'; import {BrowserModule} from '@angular/platform-browser'; -import {Subject} from 'rxjs/Subject'; // #docregion NgTemplateOutlet diff --git a/packages/examples/common/pipes/ts/async_pipe.ts b/packages/examples/common/pipes/ts/async_pipe.ts index 5480cf6b6e..31fa366d10 100644 --- a/packages/examples/common/pipes/ts/async_pipe.ts +++ b/packages/examples/common/pipes/ts/async_pipe.ts @@ -7,8 +7,7 @@ */ import {Component} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; -import {Subscriber} from 'rxjs/Subscriber'; +import {Observable, Observer} from 'rxjs'; // #docregion AsyncPipePromise @Component({ @@ -49,7 +48,7 @@ export class AsyncPromisePipeComponent { template: '
observable|async: Time: {{ time | async }}
' }) export class AsyncObservablePipeComponent { - time = new Observable((observer: Subscriber) => { + time = new Observable((observer: Observer) => { setInterval(() => observer.next(new Date().toString()), 1000); }); } diff --git a/packages/forms/package.json b/packages/forms/package.json index da90b851cc..9511de5eac 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -16,7 +16,7 @@ "tslib": "^1.9.0" }, "peerDependencies": { - "rxjs": "^5.5.0", + "rxjs": "^6.0.0-alpha.3", "@angular/core": "0.0.0-PLACEHOLDER", "@angular/common": "0.0.0-PLACEHOLDER", "@angular/platform-browser": "0.0.0-PLACEHOLDER" diff --git a/packages/forms/rollup.config.js b/packages/forms/rollup.config.js index 8a2dd2543f..d4567e15c7 100644 --- a/packages/forms/rollup.config.js +++ b/packages/forms/rollup.config.js @@ -14,11 +14,8 @@ const globals = { '@angular/common': 'ng.common', '@angular/compiler': 'ng.compiler', '@angular/platform-browser': 'ng.platformBrowser', - 'rxjs/Observable': 'Rx', - 'rxjs/Subject': 'Rx', - 'rxjs/observable/fromPromise': 'Rx.Observable', - 'rxjs/observable/forkJoin': 'Rx.Observable', - 'rxjs/operator/map': 'Rx.Observable.prototype' + 'rxjs': 'rxjs', + 'rxjs/operators': 'rxjs.operators', }; module.exports = { diff --git a/packages/forms/src/directives/abstract_control_directive.ts b/packages/forms/src/directives/abstract_control_directive.ts index 54de8b0cc6..af3da025e0 100644 --- a/packages/forms/src/directives/abstract_control_directive.ts +++ b/packages/forms/src/directives/abstract_control_directive.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {Observable} from 'rxjs/Observable'; +import {Observable} from 'rxjs'; import {AbstractControl} from '../model'; import {ValidationErrors} from './validators'; diff --git a/packages/forms/src/directives/validators.ts b/packages/forms/src/directives/validators.ts index 00882f016a..14070470cd 100644 --- a/packages/forms/src/directives/validators.ts +++ b/packages/forms/src/directives/validators.ts @@ -7,7 +7,7 @@ */ import {Directive, Input, OnChanges, SimpleChanges, StaticProvider, forwardRef} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; +import {Observable} from 'rxjs'; import {AbstractControl} from '../model'; import {NG_VALIDATORS, Validators} from '../validators'; diff --git a/packages/forms/src/model.ts b/packages/forms/src/model.ts index 0497eea645..13f2808a95 100644 --- a/packages/forms/src/model.ts +++ b/packages/forms/src/model.ts @@ -7,7 +7,7 @@ */ import {EventEmitter} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; +import {Observable} from 'rxjs'; import {composeAsyncValidators, composeValidators} from './directives/shared'; import {AsyncValidatorFn, ValidationErrors, ValidatorFn} from './directives/validators'; import {toObservable} from './validators'; diff --git a/packages/forms/src/validators.ts b/packages/forms/src/validators.ts index b4ee7d1ec3..7595e3dc6a 100644 --- a/packages/forms/src/validators.ts +++ b/packages/forms/src/validators.ts @@ -7,10 +7,8 @@ */ import {InjectionToken, ɵisObservable as isObservable, ɵisPromise as isPromise} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; -import {forkJoin} from 'rxjs/observable/forkJoin'; -import {fromPromise} from 'rxjs/observable/fromPromise'; -import {map} from 'rxjs/operator/map'; +import {Observable, forkJoin, from} from 'rxjs'; +import {map} from 'rxjs/operators'; import {AsyncValidatorFn, ValidationErrors, Validator, ValidatorFn} from './directives/validators'; import {AbstractControl, FormControl} from './model'; @@ -217,7 +215,7 @@ export class Validators { return function(control: AbstractControl) { const observables = _executeAsyncValidators(control, presentValidators).map(toObservable); - return map.call(forkJoin(observables), _mergeErrors); + return forkJoin(observables).pipe(map(_mergeErrors)); }; } } @@ -227,7 +225,7 @@ function isPresent(o: any): boolean { } export function toObservable(r: any): Observable { - const obs = isPromise(r) ? fromPromise(r) : r; + const obs = isPromise(r) ? from(r) : r; if (!(isObservable(obs))) { throw new Error(`Expected validator to return Promise or Observable.`); } diff --git a/packages/forms/test/form_array_spec.ts b/packages/forms/test/form_array_spec.ts index e0a7f5f9d0..95c608828c 100644 --- a/packages/forms/test/form_array_spec.ts +++ b/packages/forms/test/form_array_spec.ts @@ -10,7 +10,7 @@ import {fakeAsync, tick} from '@angular/core/testing'; import {AsyncTestCompleter, beforeEach, describe, inject, it} from '@angular/core/testing/src/testing_internal'; import {AbstractControl, FormArray, FormControl, FormGroup, ValidationErrors} from '@angular/forms'; import {Validators} from '@angular/forms/src/validators'; -import {of } from 'rxjs/observable/of'; +import {of } from 'rxjs'; (function() { function asyncValidator(expected: string, timeouts = {}) { diff --git a/packages/forms/test/form_builder_spec.ts b/packages/forms/test/form_builder_spec.ts index a7039d6842..bf7596eade 100644 --- a/packages/forms/test/form_builder_spec.ts +++ b/packages/forms/test/form_builder_spec.ts @@ -8,7 +8,7 @@ import {fakeAsync, tick} from '@angular/core/testing'; import {beforeEach, describe, expect, it} from '@angular/core/testing/src/testing_internal'; import {FormBuilder} from '@angular/forms'; -import {of } from 'rxjs/observable/of'; +import {of } from 'rxjs'; (function() { function syncValidator(_: any /** TODO #9100 */): any /** TODO #9100 */ { return null; } diff --git a/packages/forms/test/form_group_spec.ts b/packages/forms/test/form_group_spec.ts index d65bf2d8c2..7089f245cf 100644 --- a/packages/forms/test/form_group_spec.ts +++ b/packages/forms/test/form_group_spec.ts @@ -10,7 +10,7 @@ import {EventEmitter} from '@angular/core'; import {async, fakeAsync, tick} from '@angular/core/testing'; import {AsyncTestCompleter, beforeEach, describe, inject, it} from '@angular/core/testing/src/testing_internal'; import {AbstractControl, FormArray, FormControl, FormGroup, ValidationErrors, Validators} from '@angular/forms'; -import {of } from 'rxjs/observable/of'; +import {of } from 'rxjs'; (function() { diff --git a/packages/forms/test/reactive_integration_spec.ts b/packages/forms/test/reactive_integration_spec.ts index 81b4edef29..b1335d272c 100644 --- a/packages/forms/test/reactive_integration_spec.ts +++ b/packages/forms/test/reactive_integration_spec.ts @@ -12,9 +12,8 @@ import {AbstractControl, AsyncValidator, AsyncValidatorFn, COMPOSITION_BUFFER_MO import {By} from '@angular/platform-browser/src/dom/debug/by'; import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {dispatchEvent} from '@angular/platform-browser/testing/src/browser_util'; -import {merge} from 'rxjs/observable/merge'; -import {timer} from 'rxjs/observable/timer'; -import {_do} from 'rxjs/operator/do'; +import {merge, timer} from 'rxjs'; +import {tap} from 'rxjs/operators'; import {MyInput, MyInputForm} from './value_accessor_integration_spec'; @@ -2433,7 +2432,7 @@ function uniqLoginAsyncValidator(expectedValue: string, timeout: number = 0) { function observableValidator(resultArr: number[]): AsyncValidatorFn { return (c: AbstractControl) => { - return _do.call(timer(100), (resp: any) => resultArr.push(resp)); + return timer(100).pipe(tap((resp: any) => resultArr.push(resp))); }; } diff --git a/packages/forms/test/template_integration_spec.ts b/packages/forms/test/template_integration_spec.ts index b19bd8ae3f..fa8bca586b 100644 --- a/packages/forms/test/template_integration_spec.ts +++ b/packages/forms/test/template_integration_spec.ts @@ -6,13 +6,13 @@ * found in the LICENSE file at https://angular.io/license */ -import {Component, Directive, Type, ViewChild, forwardRef} from '@angular/core'; +import {Component, Directive, Type, forwardRef} from '@angular/core'; import {ComponentFixture, TestBed, async, fakeAsync, tick} from '@angular/core/testing'; import {AbstractControl, AsyncValidator, COMPOSITION_BUFFER_MODE, FormControl, FormsModule, NG_ASYNC_VALIDATORS, NgForm, NgModel} from '@angular/forms'; import {By} from '@angular/platform-browser/src/dom/debug/by'; import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {dispatchEvent} from '@angular/platform-browser/testing/src/browser_util'; -import {merge} from 'rxjs/observable/merge'; +import {merge} from 'rxjs'; import {NgModelCustomComp, NgModelCustomWrapper} from './value_accessor_integration_spec'; diff --git a/packages/forms/test/validators_spec.ts b/packages/forms/test/validators_spec.ts index 6102542c84..148157e2ba 100644 --- a/packages/forms/test/validators_spec.ts +++ b/packages/forms/test/validators_spec.ts @@ -11,11 +11,8 @@ import {describe, expect, it} from '@angular/core/testing/src/testing_internal'; import {AbstractControl, AsyncValidatorFn, FormArray, FormControl, Validators} from '@angular/forms'; import {normalizeAsyncValidator} from '@angular/forms/src/directives/normalize_validator'; import {AsyncValidator, ValidationErrors, ValidatorFn} from '@angular/forms/src/directives/validators'; -import {Observable} from 'rxjs/Observable'; -import {of } from 'rxjs/observable/of'; -import {timer} from 'rxjs/observable/timer'; -import {first} from 'rxjs/operator/first'; -import {map} from 'rxjs/operator/map'; +import {Observable, of , timer} from 'rxjs'; +import {first, map} from 'rxjs/operators'; (function() { function validator(key: string, error: any): ValidatorFn { @@ -333,7 +330,8 @@ import {map} from 'rxjs/operator/map'; [promiseValidator({'one': true}), promiseValidator({'two': true})]) !; let errorMap: {[key: string]: any} = undefined !; - first.call(v(new FormControl('invalid'))) + (v(new FormControl('invalid')) as Observable) + .pipe(first()) .subscribe((errors: {[key: string]: any}) => errorMap = errors); tick(); @@ -345,7 +343,8 @@ import {map} from 'rxjs/operator/map'; new AsyncValidatorDirective('expected', {'one': true}))]) !; let errorMap: {[key: string]: any} = undefined !; - first.call(v(new FormControl('invalid'))) + (v(new FormControl('invalid')) as Observable) + .pipe(first()) .subscribe((errors: {[key: string]: any}) => errorMap = errors); tick(); @@ -356,7 +355,8 @@ import {map} from 'rxjs/operator/map'; const v = Validators.composeAsync([promiseValidator({'one': true})]) !; let errorMap: {[key: string]: any} = undefined !; - first.call(v(new FormControl('expected'))) + (v(new FormControl('expected')) as Observable) + .pipe(first()) .subscribe((errors: {[key: string]: any}) => errorMap = errors); tick(); @@ -367,7 +367,8 @@ import {map} from 'rxjs/operator/map'; const v = Validators.composeAsync([promiseValidator({'one': true}), null !]) !; let errorMap: {[key: string]: any} = undefined !; - first.call(v(new FormControl('invalid'))) + (v(new FormControl('invalid')) as Observable) + .pipe(first()) .subscribe((errors: {[key: string]: any}) => errorMap = errors); tick(); @@ -391,7 +392,8 @@ import {map} from 'rxjs/operator/map'; [observableValidator({'one': true}), observableValidator({'two': true})]) !; let errorMap: {[key: string]: any} = undefined !; - first.call(v(new FormControl('invalid'))) + (v(new FormControl('invalid')) as Observable) + .pipe(first()) .subscribe((errors: {[key: string]: any}) => errorMap = errors); expect(errorMap).toEqual({'one': true, 'two': true}); @@ -402,7 +404,8 @@ import {map} from 'rxjs/operator/map'; [normalizeAsyncValidator(new AsyncValidatorDirective('expected', {'one': true}))]) !; let errorMap: {[key: string]: any} = undefined !; - first.call(v(new FormControl('invalid'))) + (v(new FormControl('invalid')) as Observable) + .pipe(first()) .subscribe((errors: {[key: string]: any}) => errorMap = errors) !; expect(errorMap).toEqual({'one': true}); @@ -412,7 +415,8 @@ import {map} from 'rxjs/operator/map'; const v = Validators.composeAsync([observableValidator({'one': true})]) !; let errorMap: {[key: string]: any} = undefined !; - first.call(v(new FormControl('expected'))) + (v(new FormControl('expected')) as Observable) + .pipe(first()) .subscribe((errors: {[key: string]: any}) => errorMap = errors); expect(errorMap).toBeNull(); @@ -422,7 +426,8 @@ import {map} from 'rxjs/operator/map'; const v = Validators.composeAsync([observableValidator({'one': true}), null !]) !; let errorMap: {[key: string]: any} = undefined !; - first.call(v(new FormControl('invalid'))) + (v(new FormControl('invalid')) as Observable) + .pipe(first()) .subscribe((errors: {[key: string]: any}) => errorMap = errors); expect(errorMap).toEqual({'one': true}); @@ -430,14 +435,15 @@ import {map} from 'rxjs/operator/map'; it('should wait for all validators before setting errors', fakeAsync(() => { function getTimerObs(time: number, errorMap: {[key: string]: any}): AsyncValidatorFn { - return (c: AbstractControl) => { return map.call(timer(time), () => errorMap); }; + return (c: AbstractControl) => { return timer(time).pipe(map(() => errorMap)); }; } const v = Validators.composeAsync( [getTimerObs(100, {one: true}), getTimerObs(200, {two: true})]) !; let errorMap: {[key: string]: any} = undefined !; - first.call(v(new FormControl('invalid'))) + (v(new FormControl('invalid')) as Observable) + .pipe(first()) .subscribe((errors: {[key: string]: any}) => errorMap = errors); tick(100); @@ -448,7 +454,6 @@ import {map} from 'rxjs/operator/map'; expect(errorMap).toEqual( {one: true, two: true}, `Expected errors to merge once all validators resolved.`); })); - }); }); diff --git a/packages/http/package.json b/packages/http/package.json index 46a157f3d2..0f7adf48e2 100644 --- a/packages/http/package.json +++ b/packages/http/package.json @@ -16,7 +16,7 @@ "tslib": "^1.9.0" }, "peerDependencies": { - "rxjs": "^5.5.0", + "rxjs": "^6.0.0-alpha.3", "@angular/core": "0.0.0-PLACEHOLDER", "@angular/platform-browser": "0.0.0-PLACEHOLDER" }, diff --git a/packages/http/rollup.config.js b/packages/http/rollup.config.js index 8d78d34e6f..2557452ef9 100644 --- a/packages/http/rollup.config.js +++ b/packages/http/rollup.config.js @@ -13,9 +13,7 @@ const globals = { '@angular/core': 'ng.core', '@angular/compiler': 'ng.compiler', '@angular/platform-browser': 'ng.platformBrowser', - 'rxjs/Observable': 'Rx', - 'rxjs/Observer': 'Rx', - 'rxjs/Subject': 'Rx' + 'rxjs': 'rxjs' }; module.exports = { diff --git a/packages/http/src/backends/jsonp_backend.ts b/packages/http/src/backends/jsonp_backend.ts index 3b88419922..1a9d846b5e 100644 --- a/packages/http/src/backends/jsonp_backend.ts +++ b/packages/http/src/backends/jsonp_backend.ts @@ -7,8 +7,7 @@ */ import {Injectable} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; -import {Observer} from 'rxjs/Observer'; +import {Observable, Observer} from 'rxjs'; import {ResponseOptions} from '../base_response_options'; import {ReadyState, RequestMethod, ResponseType} from '../enums'; diff --git a/packages/http/src/backends/xhr_backend.ts b/packages/http/src/backends/xhr_backend.ts index a7588d2201..41bf5aee83 100644 --- a/packages/http/src/backends/xhr_backend.ts +++ b/packages/http/src/backends/xhr_backend.ts @@ -8,8 +8,7 @@ import {Injectable} from '@angular/core'; import {ɵgetDOM as getDOM} from '@angular/platform-browser'; -import {Observable} from 'rxjs/Observable'; -import {Observer} from 'rxjs/Observer'; +import {Observable, Observer} from 'rxjs'; import {ResponseOptions} from '../base_response_options'; import {ContentType, ReadyState, RequestMethod, ResponseContentType, ResponseType} from '../enums'; import {Headers} from '../headers'; diff --git a/packages/http/src/http.ts b/packages/http/src/http.ts index f05c67b59c..b4d02d728e 100644 --- a/packages/http/src/http.ts +++ b/packages/http/src/http.ts @@ -7,7 +7,7 @@ */ import {Injectable} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; +import {Observable} from 'rxjs'; import {BaseRequestOptions, RequestOptions} from './base_request_options'; import {RequestMethod} from './enums'; @@ -51,7 +51,8 @@ function mergeOptions( * * ```typescript * import {Http, HTTP_PROVIDERS} from '@angular/http'; - * import 'rxjs/add/operator/map' + * import {map} from 'rxjs/operators'; + * * @Component({ * selector: 'http-app', * viewProviders: [HTTP_PROVIDERS], @@ -61,7 +62,7 @@ function mergeOptions( * constructor(http: Http) { * http.get('people.json') * // Call map on the response observable to get the parsed people object - * .map(res => res.json()) + * .pipe(map(res => res.json())) * // Subscribe to the observable to get the parsed people object and attach it to the * // component * .subscribe(people => this.people = people); diff --git a/packages/http/test/backends/mock_backend_spec.ts b/packages/http/test/backends/mock_backend_spec.ts index 06fd11e45d..ade1e47c67 100644 --- a/packages/http/test/backends/mock_backend_spec.ts +++ b/packages/http/test/backends/mock_backend_spec.ts @@ -14,7 +14,7 @@ import {Request} from '@angular/http/src/static_request'; import {Response} from '@angular/http/src/static_response'; import {MockBackend, MockConnection} from '@angular/http/testing/src/mock_backend'; import {expect} from '@angular/platform-browser/testing/src/matchers'; -import {ReplaySubject} from 'rxjs/ReplaySubject'; +import {ReplaySubject} from 'rxjs'; { describe('MockBackend', () => { diff --git a/packages/http/test/http_spec.ts b/packages/http/test/http_spec.ts index 72389b6f46..669de8b0f5 100644 --- a/packages/http/test/http_spec.ts +++ b/packages/http/test/http_spec.ts @@ -11,8 +11,7 @@ import {TestBed, getTestBed} from '@angular/core/testing'; import {AsyncTestCompleter, afterEach, beforeEach, describe, inject, it} from '@angular/core/testing/src/testing_internal'; import {stringToArrayBuffer} from '@angular/http/src/http_utils'; import {expect} from '@angular/platform-browser/testing/src/matchers'; -import {Observable} from 'rxjs/Observable'; -import {zip} from 'rxjs/observable/zip'; +import {Observable, zip} from 'rxjs'; import {BaseRequestOptions, ConnectionBackend, Http, HttpModule, JSONPBackend, Jsonp, JsonpModule, Request, RequestMethod, RequestOptions, Response, ResponseContentType, ResponseOptions, URLSearchParams, XHRBackend} from '../index'; import {MockBackend, MockConnection} from '../testing/src/mock_backend'; diff --git a/packages/http/testing/rollup.config.js b/packages/http/testing/rollup.config.js index b2a921f311..7281922084 100644 --- a/packages/http/testing/rollup.config.js +++ b/packages/http/testing/rollup.config.js @@ -14,10 +14,8 @@ const globals = { '@angular/compiler': 'ng.compiler', '@angular/platform-browser': 'ng.platformBrowser', '@angular/http': 'ng.http', - 'rxjs/Observable': 'Rx', - 'rxjs/ReplaySubject': 'Rx', - 'rxjs/Subject': 'Rx', - 'rxjs/operator/take': 'Rx.Observable.prototype' + 'rxjs': 'rxjs', + 'rxjs/operators': 'rxjs.operators', }; module.exports = { diff --git a/packages/http/testing/src/mock_backend.ts b/packages/http/testing/src/mock_backend.ts index 109865bd4f..42209f4fea 100644 --- a/packages/http/testing/src/mock_backend.ts +++ b/packages/http/testing/src/mock_backend.ts @@ -8,9 +8,8 @@ import {Injectable} from '@angular/core'; import {Connection, ConnectionBackend, ReadyState, Request, Response} from '@angular/http'; -import {ReplaySubject} from 'rxjs/ReplaySubject'; -import {Subject} from 'rxjs/Subject'; -import {take} from 'rxjs/operator/take'; +import {ReplaySubject, Subject} from 'rxjs'; +import {take} from 'rxjs/operators'; /** @@ -40,7 +39,7 @@ export class MockConnection implements Connection { response: ReplaySubject; constructor(req: Request) { - this.response = take.call(new ReplaySubject(1), 1); + this.response = new ReplaySubject(1).pipe(take(1)); this.readyState = ReadyState.Open; this.request = req; } diff --git a/packages/language-service/rollup.config.js b/packages/language-service/rollup.config.js index 011ea56e3f..fcf413351b 100644 --- a/packages/language-service/rollup.config.js +++ b/packages/language-service/rollup.config.js @@ -35,9 +35,8 @@ function resolve(id, from) { loc + packageName + '/fesm5/' + packageName + '.js'; return r; } - if (id && id.startsWith('rxjs/')) { - const resolved = `${rxjsLocation}${id.replace('rxjs', '')}.js`; - return resolved; + if (id && (id == 'rxjs' || id.startsWith('rxjs/'))) { + return `${rxjsLocation}${id.replace('rxjs', '')}/index.js`; } if (id == 'tslib') { return tslibLocation + '/tslib.es6.js'; diff --git a/packages/platform-server/rollup.config.js b/packages/platform-server/rollup.config.js index a7939241bd..81f3915684 100644 --- a/packages/platform-server/rollup.config.js +++ b/packages/platform-server/rollup.config.js @@ -20,13 +20,8 @@ const globals = { '@angular/platform-browser': 'ng.platformBrowser', '@angular/platform-browser/animations': 'ng.platformBrowser.animations', '@angular/platform-browser-dynamic': 'ng.platformBrowserDynamic', - 'rxjs/Observable': 'Rx', - 'rxjs/Observer': 'Rx', - 'rxjs/Subject': 'Rx', - 'rxjs/Subscription': 'Rx', - 'rxjs/operator/toPromise': 'Rx.Observable.prototype', - 'rxjs/operator/filter': 'Rx.Observable.prototype', - 'rxjs/operator/first': 'Rx.Observable.prototype' + 'rxjs': 'rxjs', + 'rxjs/operators': 'rxjs.operators', }; module.exports = { diff --git a/packages/platform-server/src/http.ts b/packages/platform-server/src/http.ts index b2ad9bd7b8..56e135c4b2 100644 --- a/packages/platform-server/src/http.ts +++ b/packages/platform-server/src/http.ts @@ -11,11 +11,9 @@ const xhr2: any = require('xhr2'); import {Injectable, Optional, Provider} from '@angular/core'; import {BrowserXhr, Connection, ConnectionBackend, Http, ReadyState, Request, RequestOptions, Response, XHRBackend, XSRFStrategy} from '@angular/http'; -import {HttpClient, HttpEvent, HttpRequest, HttpHandler, HttpInterceptor, HttpResponse, HTTP_INTERCEPTORS, HttpBackend, XhrFactory, ɵinterceptingHandler as interceptingHandler} from '@angular/common/http'; +import {HttpEvent, HttpRequest, HttpHandler, HttpInterceptor, HTTP_INTERCEPTORS, HttpBackend, XhrFactory, ɵinterceptingHandler as interceptingHandler} from '@angular/common/http'; -import {Observable} from 'rxjs/Observable'; -import {Observer} from 'rxjs/Observer'; -import {Subscription} from 'rxjs/Subscription'; +import {Observable, Observer, Subscription} from 'rxjs'; const isAbsoluteUrl = /^[a-zA-Z\-\+.]+:\/\//; diff --git a/packages/platform-server/src/location.ts b/packages/platform-server/src/location.ts index 34d1d71425..d7dbcb2df8 100644 --- a/packages/platform-server/src/location.ts +++ b/packages/platform-server/src/location.ts @@ -9,7 +9,7 @@ import {LocationChangeEvent, LocationChangeListener, PlatformLocation} from '@angular/common'; import {Inject, Injectable, Optional} from '@angular/core'; import {DOCUMENT, ɵgetDOM as getDOM} from '@angular/platform-browser'; -import {Subject} from 'rxjs/Subject'; +import {Subject} from 'rxjs'; import * as url from 'url'; import {INITIAL_CONFIG, PlatformConfig} from './tokens'; diff --git a/packages/platform-server/src/utils.ts b/packages/platform-server/src/utils.ts index 1ec9117889..177a32e4c9 100644 --- a/packages/platform-server/src/utils.ts +++ b/packages/platform-server/src/utils.ts @@ -8,9 +8,7 @@ import {ApplicationRef, NgModuleFactory, NgModuleRef, PlatformRef, StaticProvider, Type} from '@angular/core'; import {ɵTRANSITION_ID} from '@angular/platform-browser'; -import {filter} from 'rxjs/operator/filter'; -import {first} from 'rxjs/operator/first'; -import {toPromise} from 'rxjs/operator/toPromise'; +import {first} from 'rxjs/operators'; import {PlatformState} from './platform_state'; import {platformDynamicServer, platformServer} from './server'; @@ -42,8 +40,8 @@ function _render( the server-rendered app can be properly bootstrapped into a client app.`); } const applicationRef: ApplicationRef = moduleRef.injector.get(ApplicationRef); - return toPromise - .call(first.call(filter.call(applicationRef.isStable, (isStable: boolean) => isStable))) + return applicationRef.isStable.pipe((first((isStable: boolean) => isStable))) + .toPromise() .then(() => { const platformState = platform.injector.get(PlatformState); diff --git a/packages/platform-server/test/integration_spec.ts b/packages/platform-server/test/integration_spec.ts index a545e5925d..d0235d2361 100644 --- a/packages/platform-server/test/integration_spec.ts +++ b/packages/platform-server/test/integration_spec.ts @@ -17,10 +17,7 @@ import {MockBackend, MockConnection} from '@angular/http/testing'; import {BrowserModule, DOCUMENT, StateKey, Title, TransferState, makeStateKey} from '@angular/platform-browser'; import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {BEFORE_APP_SERIALIZED, INITIAL_CONFIG, PlatformState, ServerModule, ServerTransferStateModule, platformDynamicServer, renderModule, renderModuleFactory} from '@angular/platform-server'; -import {Subscription} from 'rxjs/Subscription'; -import {filter} from 'rxjs/operator/filter'; -import {first} from 'rxjs/operator/first'; -import {toPromise} from 'rxjs/operator/toPromise'; +import {first} from 'rxjs/operators'; @Component({selector: 'app', template: `Works!`}) class MyServerApp { @@ -476,15 +473,15 @@ class EscapedTransferStoreModule { }); afterEach(() => { expect(called).toBe(true); }); - it('using long from should work', async(() => { + it('using long form should work', async(() => { const platform = platformDynamicServer([{provide: INITIAL_CONFIG, useValue: {document: doc}}]); platform.bootstrapModule(AsyncServerModule) .then((moduleRef) => { const applicationRef: ApplicationRef = moduleRef.injector.get(ApplicationRef); - return toPromise.call(first.call( - filter.call(applicationRef.isStable, (isStable: boolean) => isStable))); + return applicationRef.isStable.pipe(first((isStable: boolean) => isStable)) + .toPromise(); }) .then((b) => { expect(platform.injector.get(PlatformState).renderToString()).toBe(expectedOutput); diff --git a/packages/platform-webworker/rollup.config.js b/packages/platform-webworker/rollup.config.js index 1448501ded..91d8e4a14d 100644 --- a/packages/platform-webworker/rollup.config.js +++ b/packages/platform-webworker/rollup.config.js @@ -13,8 +13,7 @@ const globals = { '@angular/core': 'ng.core', '@angular/common': 'ng.common', '@angular/platform-browser': 'ng.platformBrowser', - 'rxjs/Observable': 'Rx', - 'rxjs/Subject': 'Rx' + 'rxjs': 'rxjs', }; module.exports = { diff --git a/packages/router/karma-test-shim.js b/packages/router/karma-test-shim.js index 61d9c5d0c5..060ab92f1c 100644 --- a/packages/router/karma-test-shim.js +++ b/packages/router/karma-test-shim.js @@ -36,7 +36,10 @@ System.config({ }); System.config({ - map: {'rxjs': 'node_modules/rxjs', '@angular': 'dist/all/@angular'}, + map: { + '@angular': 'dist/all/@angular', + 'rxjs': 'node_modules/rxjs', + }, packages: { '@angular/core/testing': {main: 'index.js', defaultExtension: 'js'}, '@angular/core': {main: 'index.js', defaultExtension: 'js'}, @@ -50,7 +53,11 @@ System.config({ '@angular/platform-browser-dynamic': {main: 'index.js', defaultExtension: 'js'}, '@angular/router/testing': {main: 'index.js', defaultExtension: 'js'}, '@angular/router': {main: 'index.js', defaultExtension: 'js'}, - 'rxjs': {main: 'Rx.js', defaultExtension: 'js'}, + 'rxjs/ajax': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/operators': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/testing': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/websocket': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs': {main: 'index.js', defaultExtension: 'js'}, } }); diff --git a/packages/router/karma.conf.js b/packages/router/karma.conf.js index 151bf2fd50..254915abbc 100644 --- a/packages/router/karma.conf.js +++ b/packages/router/karma.conf.js @@ -35,9 +35,7 @@ module.exports = function(config) { 'node_modules/zone.js/dist/async-test.js', 'node_modules/zone.js/dist/fake-async-test.js', - // RxJs. - {pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false}, - {pattern: 'node_modules/rxjs/**/*.js.map', included: false, watched: false}, + {pattern: 'node_modules/rxjs/**/*', included: false, watched: false}, // shim {pattern: 'packages/router/karma-test-shim.js', included: true, watched: true}, diff --git a/packages/router/package.json b/packages/router/package.json index 851305b4b1..9fd6c8f564 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -31,7 +31,7 @@ "@angular/core": "0.0.0-PLACEHOLDER", "@angular/common": "0.0.0-PLACEHOLDER", "@angular/platform-browser": "0.0.0-PLACEHOLDER", - "rxjs": "^5.5.0" + "rxjs": "^6.0.0-alpha.3" }, "ng-update": { "packageGroup": "NG_UPDATE_PACKAGE_GROUP" diff --git a/packages/router/rollup.config.js b/packages/router/rollup.config.js index 57a7f9728c..4bdd65fbd9 100644 --- a/packages/router/rollup.config.js +++ b/packages/router/rollup.config.js @@ -13,31 +13,8 @@ const globals = { '@angular/core': 'ng.core', '@angular/common': 'ng.common', '@angular/platform-browser': 'ng.platformBrowser', - - 'rxjs/BehaviorSubject': 'Rx', - 'rxjs/Observable': 'Rx', - 'rxjs/Observer': 'Rx', - 'rxjs/Subject': 'Rx', - 'rxjs/Subscription': 'Rx', - 'rxjs/util/EmptyError': 'Rx', - - 'rxjs/observable/from': 'Rx.Observable', - 'rxjs/observable/fromPromise': 'Rx.Observable', - 'rxjs/observable/forkJoin': 'Rx.Observable', - 'rxjs/observable/of': 'Rx.Observable', - - 'rxjs/operator/toPromise': 'Rx.Observable.prototype', - 'rxjs/operator/map': 'Rx.Observable.prototype', - 'rxjs/operator/mergeAll': 'Rx.Observable.prototype', - 'rxjs/operator/concatAll': 'Rx.Observable.prototype', - 'rxjs/operator/mergeMap': 'Rx.Observable.prototype', - 'rxjs/operator/reduce': 'Rx.Observable.prototype', - 'rxjs/operator/every': 'Rx.Observable.prototype', - 'rxjs/operator/first': 'Rx.Observable.prototype', - 'rxjs/operator/catch': 'Rx.Observable.prototype', - 'rxjs/operator/last': 'Rx.Observable.prototype', - 'rxjs/operator/filter': 'Rx.Observable.prototype', - 'rxjs/operator/concatMap': 'Rx.Observable.prototype' + 'rxjs': 'rxjs', + 'rxjs/operators': 'rxjs.operators', }; module.exports = { diff --git a/packages/router/src/apply_redirects.ts b/packages/router/src/apply_redirects.ts index 965b046efa..81e4ba36ea 100644 --- a/packages/router/src/apply_redirects.ts +++ b/packages/router/src/apply_redirects.ts @@ -7,16 +7,8 @@ */ import {Injector, NgModuleRef} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; -import {Observer} from 'rxjs/Observer'; -import {from} from 'rxjs/observable/from'; -import {of } from 'rxjs/observable/of'; -import {_catch} from 'rxjs/operator/catch'; -import {concatAll} from 'rxjs/operator/concatAll'; -import {first} from 'rxjs/operator/first'; -import {map} from 'rxjs/operator/map'; -import {mergeMap} from 'rxjs/operator/mergeMap'; -import {EmptyError} from 'rxjs/util/EmptyError'; +import {EmptyError, Observable, Observer, from, of } from 'rxjs'; +import {catchError, concatAll, first, map, mergeMap} from 'rxjs/operators'; import {LoadedRouterConfig, Route, Routes} from './config'; import {RouterConfigLoader} from './router_config_loader'; @@ -80,10 +72,10 @@ class ApplyRedirects { apply(): Observable { const expanded$ = this.expandSegmentGroup(this.ngModule, this.config, this.urlTree.root, PRIMARY_OUTLET); - const urlTrees$ = map.call( - expanded$, (rootSegmentGroup: UrlSegmentGroup) => this.createUrlTree( - rootSegmentGroup, this.urlTree.queryParams, this.urlTree.fragment !)); - return _catch.call(urlTrees$, (e: any) => { + const urlTrees$ = expanded$.pipe( + map((rootSegmentGroup: UrlSegmentGroup) => this.createUrlTree( + rootSegmentGroup, this.urlTree.queryParams, this.urlTree.fragment !))); + return urlTrees$.pipe(catchError((e: any) => { if (e instanceof AbsoluteRedirect) { // after an absolute redirect we do not apply any more redirects! this.allowRedirects = false; @@ -96,22 +88,22 @@ class ApplyRedirects { } throw e; - }); + })); } private match(tree: UrlTree): Observable { const expanded$ = this.expandSegmentGroup(this.ngModule, this.config, tree.root, PRIMARY_OUTLET); - const mapped$ = map.call( - expanded$, (rootSegmentGroup: UrlSegmentGroup) => - this.createUrlTree(rootSegmentGroup, tree.queryParams, tree.fragment !)); - return _catch.call(mapped$, (e: any): Observable => { + const mapped$ = expanded$.pipe( + map((rootSegmentGroup: UrlSegmentGroup) => + this.createUrlTree(rootSegmentGroup, tree.queryParams, tree.fragment !))); + return mapped$.pipe(catchError((e: any): Observable => { if (e instanceof NoMatch) { throw this.noMatchError(e); } throw e; - }); + })); } private noMatchError(e: NoMatch): any { @@ -130,9 +122,8 @@ class ApplyRedirects { ngModule: NgModuleRef, routes: Route[], segmentGroup: UrlSegmentGroup, outlet: string): Observable { if (segmentGroup.segments.length === 0 && segmentGroup.hasChildren()) { - return map.call( - this.expandChildren(ngModule, routes, segmentGroup), - (children: any) => new UrlSegmentGroup([], children)); + return this.expandChildren(ngModule, routes, segmentGroup) + .pipe(map((children: any) => new UrlSegmentGroup([], children))); } return this.expandSegment(ngModule, segmentGroup, routes, segmentGroup.segments, outlet, true); @@ -151,31 +142,28 @@ class ApplyRedirects { ngModule: NgModuleRef, segmentGroup: UrlSegmentGroup, routes: Route[], segments: UrlSegment[], outlet: string, allowRedirects: boolean): Observable { - const routes$ = of (...routes); - const processedRoutes$ = map.call(routes$, (r: any) => { - const expanded$ = this.expandSegmentAgainstRoute( - ngModule, segmentGroup, routes, r, segments, outlet, allowRedirects); - return _catch.call(expanded$, (e: any) => { - if (e instanceof NoMatch) { - return of (null); - } - - throw e; - }); - }); - const concattedProcessedRoutes$ = concatAll.call(processedRoutes$); - const first$ = first.call(concattedProcessedRoutes$, (s: any) => !!s); - return _catch.call(first$, (e: any, _: any): Observable => { - if (e instanceof EmptyError || e.name === 'EmptyError') { - if (this.noLeftoversInUrl(segmentGroup, segments, outlet)) { - return of (new UrlSegmentGroup([], {})); - } - - throw new NoMatch(segmentGroup); - } - - throw e; - }); + return of (...routes).pipe( + map((r: any) => { + const expanded$ = this.expandSegmentAgainstRoute( + ngModule, segmentGroup, routes, r, segments, outlet, allowRedirects); + return expanded$.pipe(catchError((e: any) => { + if (e instanceof NoMatch) { + // TODO(i): this return type doesn't match the declared Observable - + // talk to Jason + return of (null) as any; + } + throw e; + })); + }), + concatAll(), first((s: any) => !!s), catchError((e: any, _: any) => { + if (e instanceof EmptyError || e.name === 'EmptyError') { + if (this.noLeftoversInUrl(segmentGroup, segments, outlet)) { + return of (new UrlSegmentGroup([], {})); + } + throw new NoMatch(segmentGroup); + } + throw e; + })); } private noLeftoversInUrl(segmentGroup: UrlSegmentGroup, segments: UrlSegment[], outlet: string): @@ -222,10 +210,10 @@ class ApplyRedirects { return absoluteRedirect(newTree); } - return mergeMap.call(this.lineralizeSegments(route, newTree), (newSegments: UrlSegment[]) => { + return this.lineralizeSegments(route, newTree).pipe(mergeMap((newSegments: UrlSegment[]) => { const group = new UrlSegmentGroup(newSegments, {}); return this.expandSegment(ngModule, group, routes, newSegments, outlet, false); - }); + })); } private expandRegularSegmentAgainstRouteUsingRedirect( @@ -241,11 +229,11 @@ class ApplyRedirects { return absoluteRedirect(newTree); } - return mergeMap.call(this.lineralizeSegments(route, newTree), (newSegments: UrlSegment[]) => { + return this.lineralizeSegments(route, newTree).pipe(mergeMap((newSegments: UrlSegment[]) => { return this.expandSegment( ngModule, segmentGroup, routes, newSegments.concat(segments.slice(lastChild)), outlet, false); - }); + })); } private matchSegmentAgainstRoute( @@ -253,11 +241,11 @@ class ApplyRedirects { segments: UrlSegment[]): Observable { if (route.path === '**') { if (route.loadChildren) { - return map.call( - this.configLoader.load(ngModule.injector, route), (cfg: LoadedRouterConfig) => { + return this.configLoader.load(ngModule.injector, route) + .pipe(map((cfg: LoadedRouterConfig) => { route._loadedConfig = cfg; return new UrlSegmentGroup(segments, {}); - }); + })); } return of (new UrlSegmentGroup(segments, {})); @@ -269,7 +257,7 @@ class ApplyRedirects { const rawSlicedSegments = segments.slice(lastChild); const childConfig$ = this.getChildConfig(ngModule, route); - return mergeMap.call(childConfig$, (routerConfig: LoadedRouterConfig) => { + return childConfig$.pipe(mergeMap((routerConfig: LoadedRouterConfig) => { const childModule = routerConfig.module; const childConfig = routerConfig.routes; @@ -278,8 +266,8 @@ class ApplyRedirects { if (slicedSegments.length === 0 && segmentGroup.hasChildren()) { const expanded$ = this.expandChildren(childModule, childConfig, segmentGroup); - return map.call( - expanded$, (children: any) => new UrlSegmentGroup(consumedSegments, children)); + return expanded$.pipe( + map((children: any) => new UrlSegmentGroup(consumedSegments, children))); } if (childConfig.length === 0 && slicedSegments.length === 0) { @@ -288,10 +276,10 @@ class ApplyRedirects { const expanded$ = this.expandSegment( childModule, segmentGroup, childConfig, slicedSegments, PRIMARY_OUTLET, true); - return map.call( - expanded$, (cs: UrlSegmentGroup) => - new UrlSegmentGroup(consumedSegments.concat(cs.segments), cs.children)); - }); + return expanded$.pipe( + map((cs: UrlSegmentGroup) => + new UrlSegmentGroup(consumedSegments.concat(cs.segments), cs.children))); + })); } private getChildConfig(ngModule: NgModuleRef, route: Route): Observable { @@ -306,18 +294,16 @@ class ApplyRedirects { return of (route._loadedConfig); } - return mergeMap.call(runCanLoadGuard(ngModule.injector, route), (shouldLoad: boolean) => { - + return runCanLoadGuard(ngModule.injector, route).pipe(mergeMap((shouldLoad: boolean) => { if (shouldLoad) { - return map.call( - this.configLoader.load(ngModule.injector, route), (cfg: LoadedRouterConfig) => { + return this.configLoader.load(ngModule.injector, route) + .pipe(map((cfg: LoadedRouterConfig) => { route._loadedConfig = cfg; return cfg; - }); + })); } - return canLoadFails(route); - }); + })); } return of (new LoadedRouterConfig([], ngModule)); @@ -417,10 +403,10 @@ function runCanLoadGuard(moduleInjector: Injector, route: Route): Observable { + const obs = from(canLoad).pipe(map((injectionToken: any) => { const guard = moduleInjector.get(injectionToken); return wrapIntoObservable(guard.canLoad ? guard.canLoad(route) : guard(route)); - }); + })); return andObservables(obs); } diff --git a/packages/router/src/config.ts b/packages/router/src/config.ts index bd4404b5b3..6c220759b3 100644 --- a/packages/router/src/config.ts +++ b/packages/router/src/config.ts @@ -7,7 +7,7 @@ */ import {NgModuleFactory, NgModuleRef, Type} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; +import {Observable} from 'rxjs'; import {PRIMARY_OUTLET} from './shared'; import {UrlSegment, UrlSegmentGroup} from './url_tree'; @@ -462,4 +462,4 @@ function getFullPath(parentPath: string, currentRoute: Route): string { export function copyConfig(r: Route): Route { const children = r.children && r.children.map(copyConfig); return children ? {...r, children} : {...r}; -} \ No newline at end of file +} diff --git a/packages/router/src/create_router_state.ts b/packages/router/src/create_router_state.ts index a858cf8e9a..261fc14bcf 100644 --- a/packages/router/src/create_router_state.ts +++ b/packages/router/src/create_router_state.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {BehaviorSubject} from 'rxjs/BehaviorSubject'; +import {BehaviorSubject} from 'rxjs'; import {DetachedRouteHandleInternal, RouteReuseStrategy} from './route_reuse_strategy'; import {ActivatedRoute, ActivatedRouteSnapshot, RouterState, RouterStateSnapshot} from './router_state'; @@ -74,4 +74,4 @@ function createActivatedRoute(c: ActivatedRouteSnapshot) { return new ActivatedRoute( new BehaviorSubject(c.url), new BehaviorSubject(c.params), new BehaviorSubject(c.queryParams), new BehaviorSubject(c.fragment), new BehaviorSubject(c.data), c.outlet, c.component, c); -} \ No newline at end of file +} diff --git a/packages/router/src/directives/router_link.ts b/packages/router/src/directives/router_link.ts index f2c55f3b71..abf0bcb311 100644 --- a/packages/router/src/directives/router_link.ts +++ b/packages/router/src/directives/router_link.ts @@ -8,14 +8,15 @@ import {LocationStrategy} from '@angular/common'; import {Attribute, Directive, ElementRef, HostBinding, HostListener, Input, OnChanges, OnDestroy, Renderer2, isDevMode} from '@angular/core'; -import {Subscription} from 'rxjs/Subscription'; +import {Subscription} from 'rxjs'; import {QueryParamsHandling} from '../config'; -import {NavigationEnd} from '../events'; +import {NavigationEnd, RouterEvent} from '../events'; import {Router} from '../router'; import {ActivatedRoute} from '../router_state'; import {UrlTree} from '../url_tree'; + /** * @whatItDoes Lets you link to specific parts of your app. * @@ -184,7 +185,7 @@ export class RouterLinkWithHref implements OnChanges, OnDestroy { constructor( private router: Router, private route: ActivatedRoute, private locationStrategy: LocationStrategy) { - this.subscription = router.events.subscribe(s => { + this.subscription = router.events.subscribe((s: RouterEvent) => { if (s instanceof NavigationEnd) { this.updateTargetUrlAndHref(); } diff --git a/packages/router/src/directives/router_link_active.ts b/packages/router/src/directives/router_link_active.ts index 5d548cabbc..c6f7242058 100644 --- a/packages/router/src/directives/router_link_active.ts +++ b/packages/router/src/directives/router_link_active.ts @@ -7,11 +7,14 @@ */ import {AfterContentInit, ChangeDetectorRef, ContentChildren, Directive, ElementRef, Input, OnChanges, OnDestroy, QueryList, Renderer2, SimpleChanges} from '@angular/core'; -import {Subscription} from 'rxjs/Subscription'; -import {NavigationEnd} from '../events'; +import {Subscription} from 'rxjs'; + +import {NavigationEnd, RouterEvent} from '../events'; import {Router} from '../router'; + import {RouterLink, RouterLinkWithHref} from './router_link'; + /** * @whatItDoes Lets you add a CSS class to an element when the link's route becomes active. * @@ -93,7 +96,7 @@ export class RouterLinkActive implements OnChanges, constructor( private router: Router, private element: ElementRef, private renderer: Renderer2, private cdr: ChangeDetectorRef) { - this.subscription = router.events.subscribe(s => { + this.subscription = router.events.subscribe((s: RouterEvent) => { if (s instanceof NavigationEnd) { this.update(); } diff --git a/packages/router/src/interfaces.ts b/packages/router/src/interfaces.ts index afdb0e5a14..6d3932034d 100644 --- a/packages/router/src/interfaces.ts +++ b/packages/router/src/interfaces.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {Observable} from 'rxjs/Observable'; +import {Observable} from 'rxjs'; import {Route} from './config'; import {ActivatedRouteSnapshot, RouterStateSnapshot} from './router_state'; diff --git a/packages/router/src/pre_activation.ts b/packages/router/src/pre_activation.ts index c3e9895d00..baa7bd4e2c 100644 --- a/packages/router/src/pre_activation.ts +++ b/packages/router/src/pre_activation.ts @@ -7,16 +7,8 @@ */ import {Injector} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; -import {from} from 'rxjs/observable/from'; -import {of } from 'rxjs/observable/of'; -import {concatMap} from 'rxjs/operator/concatMap'; -import {every} from 'rxjs/operator/every'; -import {first} from 'rxjs/operator/first'; -import {last} from 'rxjs/operator/last'; -import {map} from 'rxjs/operator/map'; -import {mergeMap} from 'rxjs/operator/mergeMap'; -import {reduce} from 'rxjs/operator/reduce'; +import {Observable, from, of } from 'rxjs'; +import {concatMap, every, first, last, map, mergeMap, reduce} from 'rxjs/operators'; import {LoadedRouterConfig, ResolveData, RunGuardsAndResolvers} from './config'; import {ActivationStart, ChildActivationStart, Event} from './events'; @@ -58,17 +50,17 @@ export class PreActivation { return of (true); } const canDeactivate$ = this.runCanDeactivateChecks(); - return mergeMap.call( - canDeactivate$, - (canDeactivate: boolean) => canDeactivate ? this.runCanActivateChecks() : of (false)); + return canDeactivate$.pipe(mergeMap( + (canDeactivate: boolean) => canDeactivate ? this.runCanActivateChecks() : of (false))); } resolveData(paramsInheritanceStrategy: 'emptyOnly'|'always'): Observable { if (!this.isActivating()) return of (null); - const checks$ = from(this.canActivateChecks); - const runningChecks$ = concatMap.call( - checks$, (check: CanActivate) => this.runResolve(check.route, paramsInheritanceStrategy)); - return reduce.call(runningChecks$, (_: any, __: any) => _); + return from(this.canActivateChecks) + .pipe( + concatMap( + (check: CanActivate) => this.runResolve(check.route, paramsInheritanceStrategy)), + reduce((_: any, __: any) => _)); } isDeactivating(): boolean { return this.canDeactivateChecks.length !== 0; } @@ -194,21 +186,21 @@ export class PreActivation { } private runCanDeactivateChecks(): Observable { - const checks$ = from(this.canDeactivateChecks); - const runningChecks$ = mergeMap.call( - checks$, (check: CanDeactivate) => this.runCanDeactivate(check.component, check.route)); - return every.call(runningChecks$, (result: boolean) => result === true); + return from(this.canDeactivateChecks) + .pipe( + mergeMap((check: CanDeactivate) => this.runCanDeactivate(check.component, check.route)), + every((result: boolean) => result === true)); } private runCanActivateChecks(): Observable { - const checks$ = from(this.canActivateChecks); - const runningChecks$ = concatMap.call( - checks$, - (check: CanActivate) => andObservables(from([ - this.fireChildActivationStart(check.route.parent), this.fireActivationStart(check.route), - this.runCanActivateChild(check.path), this.runCanActivate(check.route) - ]))); - return every.call(runningChecks$, (result: boolean) => result === true); + return from(this.canActivateChecks) + .pipe( + concatMap((check: CanActivate) => andObservables(from([ + this.fireChildActivationStart(check.route.parent), + this.fireActivationStart(check.route), this.runCanActivateChild(check.path), + this.runCanActivate(check.route) + ]))), + every((result: boolean) => result === true)); // this.fireChildActivationStart(check.path), } @@ -245,7 +237,7 @@ export class PreActivation { private runCanActivate(future: ActivatedRouteSnapshot): Observable { const canActivate = future.routeConfig ? future.routeConfig.canActivate : null; if (!canActivate || canActivate.length === 0) return of (true); - const obs = map.call(from(canActivate), (c: any) => { + const obs = from(canActivate).pipe(map((c: any) => { const guard = this.getToken(c, future); let observable: Observable; if (guard.canActivate) { @@ -253,8 +245,8 @@ export class PreActivation { } else { observable = wrapIntoObservable(guard(future, this.future)); } - return first.call(observable); - }); + return observable.pipe(first()); + })); return andObservables(obs); } @@ -266,8 +258,8 @@ export class PreActivation { .map(p => this.extractCanActivateChild(p)) .filter(_ => _ !== null); - return andObservables(map.call(from(canActivateChildGuards), (d: any) => { - const obs = map.call(from(d.guards), (c: any) => { + return andObservables(from(canActivateChildGuards).pipe(map((d: any) => { + const obs = from(d.guards).pipe(map((c: any) => { const guard = this.getToken(c, d.node); let observable: Observable; if (guard.canActivateChild) { @@ -275,10 +267,10 @@ export class PreActivation { } else { observable = wrapIntoObservable(guard(future, this.future)); } - return first.call(observable); - }); + return observable.pipe(first()); + })); return andObservables(obs); - })); + }))); } private extractCanActivateChild(p: ActivatedRouteSnapshot): @@ -292,7 +284,7 @@ export class PreActivation { Observable { const canDeactivate = curr && curr.routeConfig ? curr.routeConfig.canDeactivate : null; if (!canDeactivate || canDeactivate.length === 0) return of (true); - const canDeactivate$ = mergeMap.call(from(canDeactivate), (c: any) => { + const canDeactivate$ = from(canDeactivate).pipe(mergeMap((c: any) => { const guard = this.getToken(c, curr); let observable: Observable; if (guard.canDeactivate) { @@ -301,21 +293,21 @@ export class PreActivation { } else { observable = wrapIntoObservable(guard(component, curr, this.curr, this.future)); } - return first.call(observable); - }); - return every.call(canDeactivate$, (result: any) => result === true); + return observable.pipe(first()); + })); + return canDeactivate$.pipe(every((result: any) => result === true)); } private runResolve( future: ActivatedRouteSnapshot, paramsInheritanceStrategy: 'emptyOnly'|'always'): Observable { const resolve = future._resolve; - return map.call(this.resolveNode(resolve, future), (resolvedData: any): any => { + return this.resolveNode(resolve, future).pipe(map((resolvedData: any): any => { future._resolvedData = resolvedData; future.data = {...future.data, ...inheritedParamsDataResolve(future, paramsInheritanceStrategy).resolve}; return null; - }); + })); } private resolveNode(resolve: ResolveData, future: ActivatedRouteSnapshot): Observable { @@ -325,17 +317,18 @@ export class PreActivation { } if (keys.length === 1) { const key = keys[0]; - return map.call( - this.getResolver(resolve[key], future), (value: any) => { return {[key]: value}; }); + return this.getResolver(resolve[key], future).pipe(map((value: any) => { + return {[key]: value}; + })); } const data: {[k: string]: any} = {}; - const runningResolvers$ = mergeMap.call(from(keys), (key: string) => { - return map.call(this.getResolver(resolve[key], future), (value: any) => { + const runningResolvers$ = from(keys).pipe(mergeMap((key: string) => { + return this.getResolver(resolve[key], future).pipe(map((value: any) => { data[key] = value; return value; - }); - }); - return map.call(last.call(runningResolvers$), () => data); + })); + })); + return runningResolvers$.pipe(last(), map(() => data)); } private getResolver(injectionToken: any, future: ActivatedRouteSnapshot): Observable { diff --git a/packages/router/src/recognize.ts b/packages/router/src/recognize.ts index c3ce51fb58..74684f78b0 100644 --- a/packages/router/src/recognize.ts +++ b/packages/router/src/recognize.ts @@ -7,9 +7,7 @@ */ import {Type} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; -import {Observer} from 'rxjs/Observer'; -import {of } from 'rxjs/observable/of'; +import {Observable, Observer, of } from 'rxjs'; import {Data, ResolveData, Route, Routes} from './config'; import {ActivatedRouteSnapshot, ParamsInheritanceStrategy, RouterStateSnapshot, inheritedParamsDataResolve} from './router_state'; diff --git a/packages/router/src/router.ts b/packages/router/src/router.ts index 7aedb1115a..19066967c4 100644 --- a/packages/router/src/router.ts +++ b/packages/router/src/router.ts @@ -8,14 +8,8 @@ import {Location} from '@angular/common'; import {Compiler, Injector, NgModuleFactoryLoader, NgModuleRef, Type, isDevMode} from '@angular/core'; -import {BehaviorSubject} from 'rxjs/BehaviorSubject'; -import {Observable} from 'rxjs/Observable'; -import {Subject} from 'rxjs/Subject'; -import {Subscription} from 'rxjs/Subscription'; -import {of } from 'rxjs/observable/of'; -import {concatMap} from 'rxjs/operator/concatMap'; -import {map} from 'rxjs/operator/map'; -import {mergeMap} from 'rxjs/operator/mergeMap'; +import {BehaviorSubject, Observable, Subject, Subscription, of } from 'rxjs'; +import {concatMap, map, mergeMap} from 'rxjs/operators'; import {applyRedirects} from './apply_redirects'; import {LoadedRouterConfig, QueryParamsHandling, Route, Routes, copyConfig, validateConfig} from './config'; @@ -163,6 +157,9 @@ function defaultErrorHandler(error: any): any { throw error; } +type NavStreamValue = + boolean | {appliedUrl: UrlTree, snapshot: RouterStateSnapshot, shouldActivate?: boolean}; + type NavigationParams = { id: number, rawUrl: UrlTree, @@ -511,19 +508,17 @@ export class Router { } private processNavigations(): void { - concatMap - .call( - this.navigations, - (nav: NavigationParams) => { - if (nav) { - this.executeScheduledNavigation(nav); - // a failed navigation should not stop the router from processing - // further navigations => the catch - return nav.promise.catch(() => {}); - } else { - return of (null); - } - }) + this.navigations + .pipe(concatMap((nav: NavigationParams) => { + if (nav) { + this.executeScheduledNavigation(nav); + // a failed navigation should not stop the router from processing + // further navigations => the catch + return nav.promise.catch(() => {}); + } else { + return of (null); + } + })) .subscribe(() => {}); } @@ -620,98 +615,101 @@ export class Router { return new Promise((resolvePromise, rejectPromise) => { // create an observable of the url and route state snapshot // this operation do not result in any side effects - let urlAndSnapshot$: Observable<{appliedUrl: UrlTree, snapshot: RouterStateSnapshot}>; + let urlAndSnapshot$: Observable; if (!precreatedState) { const moduleInjector = this.ngModule.injector; const redirectsApplied$ = applyRedirects(moduleInjector, this.configLoader, this.urlSerializer, url, this.config); - urlAndSnapshot$ = mergeMap.call(redirectsApplied$, (appliedUrl: UrlTree) => { - return map.call( - recognize( - this.rootComponentType, this.config, appliedUrl, this.serializeUrl(appliedUrl), - this.paramsInheritanceStrategy), - (snapshot: any) => { - + urlAndSnapshot$ = redirectsApplied$.pipe(mergeMap((appliedUrl: UrlTree) => { + return recognize( + this.rootComponentType, this.config, appliedUrl, this.serializeUrl(appliedUrl), + this.paramsInheritanceStrategy) + .pipe(map((snapshot: any) => { (this.events as Subject) .next(new RoutesRecognized( id, this.serializeUrl(url), this.serializeUrl(appliedUrl), snapshot)); return {appliedUrl, snapshot}; - }); - }); + })); + })); } else { urlAndSnapshot$ = of ({appliedUrl: url, snapshot: precreatedState}); } - const beforePreactivationDone$ = mergeMap.call( - urlAndSnapshot$, (p: {appliedUrl: string, snapshot: RouterStateSnapshot}) => { - return map.call(this.hooks.beforePreactivation(p.snapshot), () => p); - }); + const beforePreactivationDone$ = + urlAndSnapshot$.pipe(mergeMap((p): Observable => { + if (typeof p === 'boolean') return of (p); + return this.hooks.beforePreactivation(p.snapshot).pipe(map(() => p)); + })); // run preactivation: guards and data resolvers let preActivation: PreActivation; - const preactivationSetup$ = map.call( - beforePreactivationDone$, - ({appliedUrl, snapshot}: {appliedUrl: string, snapshot: RouterStateSnapshot}) => { - const moduleInjector = this.ngModule.injector; - preActivation = new PreActivation( - snapshot, this.routerState.snapshot, moduleInjector, - (evt: Event) => this.triggerEvent(evt)); - preActivation.initialize(this.rootContexts); - return {appliedUrl, snapshot}; - }); + const preactivationSetup$ = beforePreactivationDone$.pipe(map((p): NavStreamValue => { + if (typeof p === 'boolean') return p; + const {appliedUrl, snapshot} = p; + const moduleInjector = this.ngModule.injector; + preActivation = new PreActivation( + snapshot, this.routerState.snapshot, moduleInjector, + (evt: Event) => this.triggerEvent(evt)); + preActivation.initialize(this.rootContexts); + return {appliedUrl, snapshot}; + })); - const preactivationCheckGuards$ = mergeMap.call( - preactivationSetup$, - ({appliedUrl, snapshot}: {appliedUrl: string, snapshot: RouterStateSnapshot}) => { - if (this.navigationId !== id) return of (false); + const preactivationCheckGuards$ = + preactivationSetup$.pipe(mergeMap((p): Observable => { + if (typeof p === 'boolean' || this.navigationId !== id) return of (false); + const {appliedUrl, snapshot} = p; - this.triggerEvent( - new GuardsCheckStart(id, this.serializeUrl(url), appliedUrl, snapshot)); + this.triggerEvent(new GuardsCheckStart( + id, this.serializeUrl(url), this.serializeUrl(appliedUrl), snapshot)); - return map.call(preActivation.checkGuards(), (shouldActivate: boolean) => { + return preActivation.checkGuards().pipe(map((shouldActivate: boolean) => { this.triggerEvent(new GuardsCheckEnd( - id, this.serializeUrl(url), appliedUrl, snapshot, shouldActivate)); + id, this.serializeUrl(url), this.serializeUrl(appliedUrl), snapshot, + shouldActivate)); return {appliedUrl: appliedUrl, snapshot: snapshot, shouldActivate: shouldActivate}; - }); - }); + })); + })); - const preactivationResolveData$ = mergeMap.call( - preactivationCheckGuards$, - (p: {appliedUrl: string, snapshot: RouterStateSnapshot, shouldActivate: boolean}) => { - if (this.navigationId !== id) return of (false); + const preactivationResolveData$ = + preactivationCheckGuards$.pipe(mergeMap((p): Observable => { + if (typeof p === 'boolean' || this.navigationId !== id) return of (false); if (p.shouldActivate && preActivation.isActivating()) { - this.triggerEvent( - new ResolveStart(id, this.serializeUrl(url), p.appliedUrl, p.snapshot)); - return map.call(preActivation.resolveData(this.paramsInheritanceStrategy), () => { - this.triggerEvent( - new ResolveEnd(id, this.serializeUrl(url), p.appliedUrl, p.snapshot)); + this.triggerEvent(new ResolveStart( + id, this.serializeUrl(url), this.serializeUrl(p.appliedUrl), p.snapshot)); + return preActivation.resolveData(this.paramsInheritanceStrategy).pipe(map(() => { + this.triggerEvent(new ResolveEnd( + id, this.serializeUrl(url), this.serializeUrl(p.appliedUrl), p.snapshot)); return p; - }); + })); } else { return of (p); } - }); + })); - const preactivationDone$ = mergeMap.call(preactivationResolveData$, (p: any) => { - return map.call(this.hooks.afterPreactivation(p.snapshot), () => p); - }); + const preactivationDone$ = + preactivationResolveData$.pipe(mergeMap((p): Observable => { + if (typeof p === 'boolean' || this.navigationId !== id) return of (false); + return this.hooks.afterPreactivation(p.snapshot).pipe(map(() => p)); + })); // create router state // this operation has side effects => route state is being affected - const routerState$ = - map.call(preactivationDone$, ({appliedUrl, snapshot, shouldActivate}: any) => { - if (shouldActivate) { - const state = createRouterState(this.routeReuseStrategy, snapshot, this.routerState); - return {appliedUrl, state, shouldActivate}; - } else { - return {appliedUrl, state: null, shouldActivate}; - } - }); + const routerState$ = preactivationDone$.pipe(map((p) => { + if (typeof p === 'boolean' || this.navigationId !== id) return false; + const {appliedUrl, snapshot, shouldActivate} = p; + if (shouldActivate) { + const state = createRouterState(this.routeReuseStrategy, snapshot, this.routerState); + return {appliedUrl, state, shouldActivate}; + } else { + return {appliedUrl, state: null, shouldActivate}; + } + })); + this.activateRoutes( routerState$, this.routerState, this.currentUrlTree, id, url, rawUrl, skipLocationChange, @@ -724,7 +722,8 @@ export class Router { * is a private method, it could be overridden to make activation asynchronous. */ private activateRoutes( - state: Observable<{appliedUrl: string, state: RouterState, shouldActivate: boolean}>, + state: Observable, storedState: RouterState, storedUrl: UrlTree, id: number, url: UrlTree, rawUrl: UrlTree, skipLocationChange: boolean, replaceUrl: boolean, resolvePromise: any, rejectPromise: any) { // applied the new router state @@ -732,12 +731,12 @@ export class Router { let navigationIsSuccessful: boolean; state - .forEach(({appliedUrl, state, shouldActivate}: any) => { - if (!shouldActivate || id !== this.navigationId) { + .forEach((p) => { + if (typeof p === 'boolean' || !p.shouldActivate || id !== this.navigationId || !p.state) { navigationIsSuccessful = false; return; } - + const {appliedUrl, state} = p; this.currentUrlTree = appliedUrl; this.rawUrlTree = this.urlHandlingStrategy.merge(this.currentUrlTree, rawUrl); diff --git a/packages/router/src/router_config_loader.ts b/packages/router/src/router_config_loader.ts index b62a3ef24b..861df08248 100644 --- a/packages/router/src/router_config_loader.ts +++ b/packages/router/src/router_config_loader.ts @@ -6,12 +6,10 @@ * found in the LICENSE file at https://angular.io/license */ -import {Compiler, InjectionToken, Injector, NgModuleFactory, NgModuleFactoryLoader, NgModuleRef} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; -import {fromPromise} from 'rxjs/observable/fromPromise'; -import {of } from 'rxjs/observable/of'; -import {map} from 'rxjs/operator/map'; -import {mergeMap} from 'rxjs/operator/mergeMap'; +import {Compiler, InjectionToken, Injector, NgModuleFactory, NgModuleFactoryLoader} from '@angular/core'; +// TODO(i): switch to fromPromise once it's expored in rxjs +import {Observable, from, of } from 'rxjs'; +import {map, mergeMap} from 'rxjs/operators'; import {LoadChildren, LoadedRouterConfig, Route, copyConfig} from './config'; import {flatten, wrapIntoObservable} from './utils/collection'; @@ -34,7 +32,7 @@ export class RouterConfigLoader { const moduleFactory$ = this.loadModuleFactory(route.loadChildren !); - return map.call(moduleFactory$, (factory: NgModuleFactory) => { + return moduleFactory$.pipe(map((factory: NgModuleFactory) => { if (this.onLoadEndListener) { this.onLoadEndListener(route); } @@ -42,20 +40,20 @@ export class RouterConfigLoader { const module = factory.create(parentInjector); return new LoadedRouterConfig(flatten(module.injector.get(ROUTES)).map(copyConfig), module); - }); + })); } private loadModuleFactory(loadChildren: LoadChildren): Observable> { if (typeof loadChildren === 'string') { - return fromPromise(this.loader.load(loadChildren)); + return from(this.loader.load(loadChildren)); } else { - return mergeMap.call(wrapIntoObservable(loadChildren()), (t: any) => { + return wrapIntoObservable(loadChildren()).pipe(mergeMap((t: any) => { if (t instanceof NgModuleFactory) { return of (t); } else { - return fromPromise(this.compiler.compileModuleAsync(t)); + return from(this.compiler.compileModuleAsync(t)); } - }); + })); } } } diff --git a/packages/router/src/router_module.ts b/packages/router/src/router_module.ts index fe6ebf7d09..418b0be4a9 100644 --- a/packages/router/src/router_module.ts +++ b/packages/router/src/router_module.ts @@ -9,13 +9,13 @@ import {APP_BASE_HREF, HashLocationStrategy, LOCATION_INITIALIZED, Location, LocationStrategy, PathLocationStrategy, PlatformLocation} from '@angular/common'; import {ANALYZE_FOR_ENTRY_COMPONENTS, APP_BOOTSTRAP_LISTENER, APP_INITIALIZER, ApplicationRef, Compiler, ComponentRef, Inject, Injectable, InjectionToken, Injector, ModuleWithProviders, NgModule, NgModuleFactoryLoader, NgProbeToken, Optional, Provider, SkipSelf, SystemJsNgModuleLoader} from '@angular/core'; import {ɵgetDOM as getDOM} from '@angular/platform-browser'; -import {Subject} from 'rxjs/Subject'; -import {of } from 'rxjs/observable/of'; +import {Subject, of } from 'rxjs'; import {Route, Routes} from './config'; import {RouterLink, RouterLinkWithHref} from './directives/router_link'; import {RouterLinkActive} from './directives/router_link_active'; import {RouterOutlet} from './directives/router_outlet'; +import {RouterEvent} from './events'; import {RouteReuseStrategy} from './route_reuse_strategy'; import {ErrorHandler, Router} from './router'; import {ROUTES} from './router_config_loader'; @@ -27,6 +27,7 @@ import {DefaultUrlSerializer, UrlSerializer} from './url_tree'; import {flatten} from './utils/collection'; + /** * @whatItDoes Contains a list of directives * @stable @@ -312,7 +313,7 @@ export function setupRouter( if (opts.enableTracing) { const dom = getDOM(); - router.events.subscribe(e => { + router.events.subscribe((e: RouterEvent) => { dom.logGroup(`Router Event: ${(e.constructor).name}`); dom.log(e.toString()); dom.log(e); diff --git a/packages/router/src/router_preloader.ts b/packages/router/src/router_preloader.ts index 49f081b437..f1191475b2 100644 --- a/packages/router/src/router_preloader.ts +++ b/packages/router/src/router_preloader.ts @@ -7,20 +7,15 @@ */ import {Compiler, Injectable, Injector, NgModuleFactoryLoader, NgModuleRef, OnDestroy} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; -import {Subscription} from 'rxjs/Subscription'; -import {from} from 'rxjs/observable/from'; -import {of } from 'rxjs/observable/of'; -import {_catch} from 'rxjs/operator/catch'; -import {concatMap} from 'rxjs/operator/concatMap'; -import {filter} from 'rxjs/operator/filter'; -import {mergeAll} from 'rxjs/operator/mergeAll'; -import {mergeMap} from 'rxjs/operator/mergeMap'; +import {Observable, Subscription, from, of } from 'rxjs'; +import {catchError, concatMap, filter, map, mergeAll, mergeMap} from 'rxjs/operators'; + import {LoadedRouterConfig, Route, Routes} from './config'; import {Event, NavigationEnd, RouteConfigLoadEnd, RouteConfigLoadStart} from './events'; import {Router} from './router'; import {RouterConfigLoader} from './router_config_loader'; + /** * @whatItDoes Provides a preloading strategy. * @@ -43,7 +38,7 @@ export abstract class PreloadingStrategy { */ export class PreloadAllModules implements PreloadingStrategy { preload(route: Route, fn: () => Observable): Observable { - return _catch.call(fn(), () => of (null)); + return fn().pipe(catchError(() => of (null))); } } @@ -87,8 +82,10 @@ export class RouterPreloader implements OnDestroy { } setUpPreloading(): void { - const navigations$ = filter.call(this.router.events, (e: Event) => e instanceof NavigationEnd); - this.subscription = concatMap.call(navigations$, () => this.preload()).subscribe(() => {}); + this.subscription = + this.router.events + .pipe(filter((e: Event) => e instanceof NavigationEnd), concatMap(() => this.preload())) + .subscribe(() => {}); } preload(): Observable { @@ -118,16 +115,16 @@ export class RouterPreloader implements OnDestroy { res.push(this.processRoutes(ngModule, route.children)); } } - return mergeAll.call(from(res)); + return from(res).pipe(mergeAll(), map((_) => void 0)); } private preloadConfig(ngModule: NgModuleRef, route: Route): Observable { return this.preloadingStrategy.preload(route, () => { const loaded$ = this.loader.load(ngModule.injector, route); - return mergeMap.call(loaded$, (config: LoadedRouterConfig) => { + return loaded$.pipe(mergeMap((config: LoadedRouterConfig) => { route._loadedConfig = config; return this.processRoutes(config.module, config.routes); - }); + })); }); } } diff --git a/packages/router/src/router_state.ts b/packages/router/src/router_state.ts index 5cab4dd2a0..934c8be3d2 100644 --- a/packages/router/src/router_state.ts +++ b/packages/router/src/router_state.ts @@ -7,9 +7,8 @@ */ import {Type} from '@angular/core'; -import {BehaviorSubject} from 'rxjs/BehaviorSubject'; -import {Observable} from 'rxjs/Observable'; -import {map} from 'rxjs/operator/map'; +import {BehaviorSubject, Observable} from 'rxjs'; +import {map} from 'rxjs/operators'; import {Data, ResolveData, Route} from './config'; import {PRIMARY_OUTLET, ParamMap, Params, convertToParamMap} from './shared'; @@ -157,7 +156,7 @@ export class ActivatedRoute { get paramMap(): Observable { if (!this._paramMap) { - this._paramMap = map.call(this.params, (p: Params): ParamMap => convertToParamMap(p)); + this._paramMap = this.params.pipe(map((p: Params): ParamMap => convertToParamMap(p))); } return this._paramMap; } @@ -165,7 +164,7 @@ export class ActivatedRoute { get queryParamMap(): Observable { if (!this._queryParamMap) { this._queryParamMap = - map.call(this.queryParams, (p: Params): ParamMap => convertToParamMap(p)); + this.queryParams.pipe(map((p: Params): ParamMap => convertToParamMap(p))); } return this._queryParamMap; } diff --git a/packages/router/src/utils/collection.ts b/packages/router/src/utils/collection.ts index a72560ae9b..2be7ff2d26 100644 --- a/packages/router/src/utils/collection.ts +++ b/packages/router/src/utils/collection.ts @@ -7,14 +7,9 @@ */ import {NgModuleFactory, ɵisObservable as isObservable, ɵisPromise as isPromise} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; -import {fromPromise} from 'rxjs/observable/fromPromise'; -import {of } from 'rxjs/observable/of'; -import {concatAll} from 'rxjs/operator/concatAll'; -import {every} from 'rxjs/operator/every'; -import * as l from 'rxjs/operator/last'; -import {map} from 'rxjs/operator/map'; -import {mergeAll} from 'rxjs/operator/mergeAll'; +import {Observable, from, of } from 'rxjs'; +import {concatAll, every, last as lastValue, map, mergeAll} from 'rxjs/operators'; + import {PRIMARY_OUTLET} from '../shared'; export function shallowEqualArrays(a: any[], b: any[]): boolean { @@ -81,7 +76,7 @@ export function waitForMap( const res: {[k: string]: B} = {}; forEach(obj, (a: A, k: string) => { - const mapped = map.call(fn(k, a), (r: B) => res[k] = r); + const mapped = fn(k, a).pipe(map((r: B) => res[k] = r)); if (k === PRIMARY_OUTLET) { waitHead.push(mapped); } else { @@ -89,9 +84,7 @@ export function waitForMap( } }); - const concat$ = concatAll.call(of (...waitHead, ...waitTail)); - const last$ = l.last.call(concat$); - return map.call(last$, () => res); + return of (...waitHead, ...waitTail).pipe(concatAll(), lastValue(), map(() => res)); } /** @@ -99,8 +92,7 @@ export function waitForMap( * input Observables return `true`. */ export function andObservables(observables: Observable>): Observable { - const merged$ = mergeAll.call(observables); - return every.call(merged$, (result: any) => result === true); + return observables.pipe(mergeAll(), every((result: any) => result === true)); } export function wrapIntoObservable(value: T | NgModuleFactory| Promise| Observable): @@ -113,7 +105,7 @@ export function wrapIntoObservable(value: T | NgModuleFactory| Promise| // Use `Promise.resolve()` to wrap promise-like instances. // Required ie when a Resolver returns a AngularJS `$q` promise to correctly trigger the // change detection. - return fromPromise(Promise.resolve(value)); + return from(Promise.resolve(value)); } return of (value as T); diff --git a/packages/router/test/apply_redirects.spec.ts b/packages/router/test/apply_redirects.spec.ts index 185ae8be81..70f9abc7f6 100644 --- a/packages/router/test/apply_redirects.spec.ts +++ b/packages/router/test/apply_redirects.spec.ts @@ -8,8 +8,7 @@ import {NgModuleRef} from '@angular/core'; import {TestBed} from '@angular/core/testing'; -import {Observable} from 'rxjs/Observable'; -import {of } from 'rxjs/observable/of'; +import {Observable, of } from 'rxjs'; import {applyRedirects} from '../src/apply_redirects'; import {LoadedRouterConfig, Routes} from '../src/config'; diff --git a/packages/router/test/create_url_tree.spec.ts b/packages/router/test/create_url_tree.spec.ts index 0208292667..6b0e40a48e 100644 --- a/packages/router/test/create_url_tree.spec.ts +++ b/packages/router/test/create_url_tree.spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {BehaviorSubject} from 'rxjs/BehaviorSubject'; +import {BehaviorSubject} from 'rxjs'; import {createUrlTree} from '../src/create_url_tree'; import {ActivatedRoute, ActivatedRouteSnapshot, advanceActivatedRoute} from '../src/router_state'; @@ -267,4 +267,4 @@ function create( new BehaviorSubject(null !), new BehaviorSubject(null !), PRIMARY_OUTLET, 'someComponent', s); advanceActivatedRoute(a); return createUrlTree(a, tree, commands, queryParams !, fragment !); -} \ No newline at end of file +} diff --git a/packages/router/test/integration.spec.ts b/packages/router/test/integration.spec.ts index 2848c4b30c..bdbfdb3f4d 100644 --- a/packages/router/test/integration.spec.ts +++ b/packages/router/test/integration.spec.ts @@ -13,11 +13,8 @@ import {ComponentFixture, TestBed, fakeAsync, inject, tick} from '@angular/core/ import {By} from '@angular/platform-browser/src/dom/debug/by'; import {expect} from '@angular/platform-browser/testing/src/matchers'; import {ActivatedRoute, ActivatedRouteSnapshot, ActivationEnd, ActivationStart, CanActivate, CanDeactivate, ChildActivationEnd, ChildActivationStart, DetachedRouteHandle, Event, GuardsCheckEnd, GuardsCheckStart, NavigationCancel, NavigationEnd, NavigationError, NavigationStart, PRIMARY_OUTLET, ParamMap, Params, PreloadAllModules, PreloadingStrategy, Resolve, ResolveEnd, ResolveStart, RouteConfigLoadEnd, RouteConfigLoadStart, RouteReuseStrategy, Router, RouterEvent, RouterModule, RouterPreloader, RouterStateSnapshot, RoutesRecognized, RunGuardsAndResolvers, UrlHandlingStrategy, UrlSegmentGroup, UrlTree} from '@angular/router'; -import {Observable} from 'rxjs/Observable'; -import {Observer} from 'rxjs/Observer'; -import {of } from 'rxjs/observable/of'; -import {map} from 'rxjs/operator/map'; -import {log} from 'util'; +import {Observable, Observer, of } from 'rxjs'; +import {map} from 'rxjs/operators'; import {forEach} from '../src/utils/collection'; import {RouterTestingModule, SpyNgModuleFactoryLoader} from '../testing'; @@ -1330,17 +1327,17 @@ describe('Integration', () => { observer = obs; return () => {}; }); - return map.call(obs$, () => log.push('resolver1')); + return obs$.pipe(map(() => log.push('resolver1'))); } }, { provide: 'resolver2', useValue: () => { - return map.call(of (null), () => { + return of (null).pipe(map(() => { log.push('resolver2'); observer.next(null); observer.complete(); - }); + })); } }, ] @@ -3967,7 +3964,7 @@ class TeamCmp { routerLink = ['.']; constructor(public route: ActivatedRoute) { - this.id = map.call(route.params, (p: any) => p['id']); + this.id = route.params.pipe(map((p: any) => p['id'])); route.params.forEach(p => { this.recordedParams.push(p); this.snapshotParams.push(route.snapshot.params); @@ -3990,7 +3987,7 @@ class UserCmp { snapshotParams: Params[] = []; constructor(route: ActivatedRoute) { - this.name = map.call(route.params, (p: any) => p['name']); + this.name = route.params.pipe(map((p: any) => p['name'])); route.params.forEach(p => { this.recordedParams.push(p); this.snapshotParams.push(route.snapshot.params); @@ -4005,11 +4002,11 @@ class WrapperCmp { @Component( {selector: 'query-cmp', template: `query: {{name | async}} fragment: {{fragment | async}}`}) class QueryParamsAndFragmentCmp { - name: Observable; + name: Observable; fragment: Observable; constructor(route: ActivatedRoute) { - this.name = map.call(route.queryParamMap, (p: ParamMap) => p.get('name')); + this.name = route.queryParamMap.pipe(map((p: ParamMap) => p.get('name'))); this.fragment = route.fragment; } } diff --git a/packages/router/test/router_state.spec.ts b/packages/router/test/router_state.spec.ts index 49518e263b..e964399af9 100644 --- a/packages/router/test/router_state.spec.ts +++ b/packages/router/test/router_state.spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {BehaviorSubject} from 'rxjs/BehaviorSubject'; +import {BehaviorSubject} from 'rxjs'; import {ActivatedRoute, ActivatedRouteSnapshot, RouterState, RouterStateSnapshot, advanceActivatedRoute, equalParamsAndUrlSegments} from '../src/router_state'; import {Params} from '../src/shared'; diff --git a/packages/service-worker/rollup.config.js b/packages/service-worker/rollup.config.js index 700c57d937..c491a87bc5 100644 --- a/packages/service-worker/rollup.config.js +++ b/packages/service-worker/rollup.config.js @@ -12,28 +12,8 @@ const sourcemaps = require('rollup-plugin-sourcemaps'); const globals = { '@angular/core': 'ng.core', '@angular/common': 'ng.common', - - 'rxjs/BehaviorSubject': 'Rx', - 'rxjs/ConnectableObservable': 'Rx', - 'rxjs/Observable': 'Rx', - 'rxjs/Subject': 'Rx', - - 'rxjs/observable/concat': 'Rx.Observable', - 'rxjs/observable/defer': 'Rx.Observable', - 'rxjs/observable/fromEvent': 'Rx.Observable', - 'rxjs/observable/merge': 'Rx.Observable', - 'rxjs/observable/never': 'Rx.Observable', - 'rxjs/observable/of': 'Rx.Observable', - 'rxjs/observable/throw': 'Rx.Observable', - - 'rxjs/operator/do': 'Rx.Observable.prototype', - 'rxjs/operator/filter': 'Rx.Observable.prototype', - 'rxjs/operator/map': 'Rx.Observable.prototype', - 'rxjs/operator/publish': 'Rx.Observable.prototype', - 'rxjs/operator/startWith': 'Rx.Observable.prototype', - 'rxjs/operator/switchMap': 'Rx.Observable.prototype', - 'rxjs/operator/take': 'Rx.Observable.prototype', - 'rxjs/operator/toPromise': 'Rx.Observable.prototype', + 'rxjs': 'rxjs', + 'rxjs/operators': 'rxjs.operators', }; module.exports = { diff --git a/packages/service-worker/src/low_level.ts b/packages/service-worker/src/low_level.ts index cae373904c..fbb201d078 100644 --- a/packages/service-worker/src/low_level.ts +++ b/packages/service-worker/src/low_level.ts @@ -7,23 +7,9 @@ */ import {isPlatformBrowser} from '@angular/common'; -import {Inject, Injectable, PLATFORM_ID} from '@angular/core'; -import {BehaviorSubject} from 'rxjs/BehaviorSubject'; -import {Observable} from 'rxjs/Observable'; -import {ConnectableObservable} from 'rxjs/observable/ConnectableObservable'; -import {concat as obs_concat} from 'rxjs/observable/concat'; -import {defer as obs_defer} from 'rxjs/observable/defer'; -import {fromEvent as obs_fromEvent} from 'rxjs/observable/fromEvent'; -import {of as obs_of} from 'rxjs/observable/of'; -import {_throw as obs_throw} from 'rxjs/observable/throw'; -import {_do as op_do} from 'rxjs/operator/do'; -import {filter as op_filter} from 'rxjs/operator/filter'; -import {map as op_map} from 'rxjs/operator/map'; -import {publish as op_publish} from 'rxjs/operator/publish'; -import {startWith as op_startWith} from 'rxjs/operator/startWith'; -import {switchMap as op_switchMap} from 'rxjs/operator/switchMap'; -import {take as op_take} from 'rxjs/operator/take'; -import {toPromise as op_toPromise} from 'rxjs/operator/toPromise'; +import {Inject, PLATFORM_ID} from '@angular/core'; +import {ConnectableObservable, Observable, concat, defer, fromEvent, of , throwError} from 'rxjs'; +import {filter, map, publish, switchMap, take, tap} from 'rxjs/operators'; export const ERR_SW_NOT_SUPPORTED = 'Service workers are disabled or not supported by this browser'; @@ -52,9 +38,7 @@ export interface UpdateActivatedEvent { export type IncomingEvent = UpdateAvailableEvent | UpdateActivatedEvent; -interface TypedEvent { - type: string; -} +export interface TypedEvent { type: string; } interface StatusEvent { type: 'STATUS'; @@ -65,7 +49,7 @@ interface StatusEvent { function errorObservable(message: string): Observable { - return obs_defer(() => obs_throw(new Error(message))); + return defer(() => throwError(new Error(message))); } /** @@ -85,7 +69,7 @@ export class NgswCommChannel { /** * @internal */ - readonly events: Observable; + readonly events: Observable; constructor( private serviceWorker: ServiceWorkerContainer|undefined, @@ -95,28 +79,27 @@ export class NgswCommChannel { this.worker = this.events = this.registration = errorObservable(ERR_SW_NOT_SUPPORTED); } else { const controllerChangeEvents = - >(obs_fromEvent(serviceWorker, 'controllerchange')); + >(fromEvent(serviceWorker, 'controllerchange')); const controllerChanges = >( - op_map.call(controllerChangeEvents, () => serviceWorker.controller)); + controllerChangeEvents.pipe(map(() => serviceWorker.controller))); const currentController = - >(obs_defer(() => obs_of(serviceWorker.controller))); + >(defer(() => of (serviceWorker.controller))); const controllerWithChanges = - >(obs_concat(currentController, controllerChanges)); + >(concat(currentController, controllerChanges)); this.worker = >( - op_filter.call(controllerWithChanges, (c: ServiceWorker) => !!c)); + controllerWithChanges.pipe(filter((c: ServiceWorker) => !!c))); this.registration = >( - op_switchMap.call(this.worker, () => serviceWorker.getRegistration())); + this.worker.pipe(switchMap(() => serviceWorker.getRegistration()))); - const rawEvents = obs_fromEvent(serviceWorker, 'message'); + const rawEvents = fromEvent(serviceWorker, 'message'); - const rawEventPayload = - >(op_map.call(rawEvents, (event: MessageEvent) => event.data)); - const eventsUnconnected = >( - op_filter.call(rawEventPayload, (event: Object) => !!event && !!(event as any)['type'])); - const events = >(op_publish.call(eventsUnconnected)); + const rawEventPayload = rawEvents.pipe(map((event: MessageEvent) => event.data)); + const eventsUnconnected = + (rawEventPayload.pipe(filter((event: Object) => !!event && !!(event as any)['type']))); + const events = eventsUnconnected.pipe(publish()) as ConnectableObservable; this.events = events; events.connect(); } @@ -126,13 +109,14 @@ export class NgswCommChannel { * @internal */ postMessage(action: string, payload: Object): Promise { - const worker = op_take.call(this.worker, 1); - const sideEffect = op_do.call(worker, (sw: ServiceWorker) => { - sw.postMessage({ - action, ...payload, - }); - }); - return >(op_toPromise.call(sideEffect).then(() => undefined)); + return this.worker + .pipe(take(1), tap((sw: ServiceWorker) => { + sw.postMessage({ + action, ...payload, + }); + })) + .toPromise() + .then(() => undefined); } /** @@ -152,34 +136,36 @@ export class NgswCommChannel { /** * @internal */ - eventsOfType(type: string): Observable { - return >( - op_filter.call(this.events, (event: T & TypedEvent) => { return event.type === type; })); + // TODO(i): the typings and casts in this method are wonky, we should revisit it and make the + // types flow correctly + eventsOfType(type: string): Observable { + return >this.events.pipe(filter((event) => { return event.type === type; })); } /** * @internal */ - nextEventOfType(type: string): Observable { - return >(op_take.call(this.eventsOfType(type), 1)); + // TODO(i): the typings and casts in this method are wonky, we should revisit it and make the + // types flow correctly + nextEventOfType(type: string): Observable { + return >(this.eventsOfType(type).pipe(take(1))); } /** * @internal */ waitForStatus(nonce: number): Promise { - const statusEventsWithNonce = >( - op_filter.call(this.eventsOfType('STATUS'), (event: StatusEvent) => event.nonce === nonce)); - const singleStatusEvent = >(op_take.call(statusEventsWithNonce, 1)); - const mapErrorAndValue = - >(op_map.call(singleStatusEvent, (event: StatusEvent) => { - if (event.status) { - return undefined; - } - throw new Error(event.error !); - })); - return op_toPromise.call(mapErrorAndValue); + return this.eventsOfType('STATUS') + .pipe( + filter((event: StatusEvent) => event.nonce === nonce), take(1), + map((event: StatusEvent) => { + if (event.status) { + return undefined; + } + throw new Error(event.error !); + })) + .toPromise(); } get isEnabled(): boolean { return !!this.serviceWorker; } -} \ No newline at end of file +} diff --git a/packages/service-worker/src/module.ts b/packages/service-worker/src/module.ts index a325762aa7..fd38a8a136 100644 --- a/packages/service-worker/src/module.ts +++ b/packages/service-worker/src/module.ts @@ -7,11 +7,9 @@ */ import {isPlatformBrowser} from '@angular/common'; -import {APP_INITIALIZER, ApplicationRef, Inject, InjectionToken, Injector, ModuleWithProviders, NgModule, PLATFORM_ID} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; -import {filter as op_filter} from 'rxjs/operator/filter'; -import {take as op_take} from 'rxjs/operator/take'; -import {toPromise as op_toPromise} from 'rxjs/operator/toPromise'; +import {APP_INITIALIZER, ApplicationRef, InjectionToken, Injector, ModuleWithProviders, NgModule, PLATFORM_ID} from '@angular/core'; +import {Observable} from 'rxjs'; +import {filter, take} from 'rxjs/operators'; import {NgswCommChannel} from './low_level'; import {SwPush} from './push'; @@ -33,10 +31,8 @@ export function ngswAppInitializer( options.enabled !== false)) { return; } - const onStable = - op_filter.call(app.isStable, (stable: boolean) => !!stable) as Observable; - const isStable = op_take.call(onStable, 1) as Observable; - const whenStable = op_toPromise.call(isStable) as Promise; + const whenStable = + app.isStable.pipe(filter((stable: boolean) => !!stable), take(1)).toPromise(); // Wait for service worker controller changes, and fire an INITIALIZE action when a new SW // becomes active. This allows the SW to initialize itself even if there is no application diff --git a/packages/service-worker/src/push.ts b/packages/service-worker/src/push.ts index 7300376433..265e01527b 100644 --- a/packages/service-worker/src/push.ts +++ b/packages/service-worker/src/push.ts @@ -7,18 +7,13 @@ */ import {Injectable} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; -import {Subject} from 'rxjs/Subject'; -import {merge as obs_merge} from 'rxjs/observable/merge'; -import {never as obs_never} from 'rxjs/observable/never'; -import {map as op_map} from 'rxjs/operator/map'; -import {switchMap as op_switchMap} from 'rxjs/operator/switchMap'; -import {take as op_take} from 'rxjs/operator/take'; -import {toPromise as op_toPromise} from 'rxjs/operator/toPromise'; +import {NEVER, Observable, Subject, merge} from 'rxjs'; +import {map, switchMap, take} from 'rxjs/operators'; import {ERR_SW_NOT_SUPPORTED, NgswCommChannel} from './low_level'; + /** * Subscribe and listen to push notifications from the Service Worker. * @@ -35,20 +30,18 @@ export class SwPush { constructor(private sw: NgswCommChannel) { if (!sw.isEnabled) { - this.messages = obs_never(); - this.subscription = obs_never(); + this.messages = NEVER; + this.subscription = NEVER; return; } - this.messages = - op_map.call(this.sw.eventsOfType('PUSH'), (message: {data: object}) => message.data); + this.messages = this.sw.eventsOfType('PUSH').pipe(map((message: any) => message.data)); - this.pushManager = >(op_map.call( - this.sw.registration, - (registration: ServiceWorkerRegistration) => { return registration.pushManager; })); + this.pushManager = this.sw.registration.pipe( + map((registration: ServiceWorkerRegistration) => { return registration.pushManager; })); - const workerDrivenSubscriptions = >(op_switchMap.call( - this.pushManager, (pm: PushManager) => pm.getSubscription().then(sub => { return sub; }))); - this.subscription = obs_merge(workerDrivenSubscriptions, this.subscriptionChanges); + const workerDrivenSubscriptions = this.pushManager.pipe( + switchMap((pm: PushManager) => pm.getSubscription().then(sub => { return sub; }))); + this.subscription = merge(workerDrivenSubscriptions, this.subscriptionChanges); } /** @@ -68,20 +61,20 @@ export class SwPush { applicationServerKey[i] = key.charCodeAt(i); } pushOptions.applicationServerKey = applicationServerKey; - const subscribe = >( - op_switchMap.call(this.pushManager, (pm: PushManager) => pm.subscribe(pushOptions))); - const subscribeOnce = op_take.call(subscribe, 1); - return (op_toPromise.call(subscribeOnce) as Promise).then(sub => { - this.subscriptionChanges.next(sub); - return sub; - }); + + return this.pushManager.pipe(switchMap((pm: PushManager) => pm.subscribe(pushOptions)), take(1)) + .toPromise() + .then(sub => { + this.subscriptionChanges.next(sub); + return sub; + }); } unsubscribe(): Promise { if (!this.sw.isEnabled) { return Promise.reject(new Error(ERR_SW_NOT_SUPPORTED)); } - const unsubscribe = op_switchMap.call(this.subscription, (sub: PushSubscription | null) => { + const unsubscribe = this.subscription.pipe(switchMap((sub: PushSubscription | null) => { if (sub !== null) { return sub.unsubscribe().then(success => { if (success) { @@ -94,8 +87,7 @@ export class SwPush { } else { throw new Error('Not subscribed to push notifications.'); } - }); - const unsubscribeOnce = op_take.call(unsubscribe, 1); - return op_toPromise.call(unsubscribeOnce) as Promise; + })); + return unsubscribe.pipe(take(1)).toPromise(); } } diff --git a/packages/service-worker/src/update.ts b/packages/service-worker/src/update.ts index d2f1a80e84..92ba165fae 100644 --- a/packages/service-worker/src/update.ts +++ b/packages/service-worker/src/update.ts @@ -7,14 +7,12 @@ */ import {Injectable} from '@angular/core'; -import {Observable} from 'rxjs/Observable'; -import {defer as obs_defer} from 'rxjs/observable/defer'; -import {never as obs_never} from 'rxjs/observable/never'; -import {map as op_map} from 'rxjs/operator/map'; +import {NEVER, Observable} from 'rxjs'; import {ERR_SW_NOT_SUPPORTED, NgswCommChannel, UpdateActivatedEvent, UpdateAvailableEvent} from './low_level'; + /** * Subscribe to update notifications from the Service Worker, trigger update * checks, and forcibly activate updates. @@ -28,12 +26,12 @@ export class SwUpdate { constructor(private sw: NgswCommChannel) { if (!sw.isEnabled) { - this.available = obs_never(); - this.activated = obs_never(); + this.available = NEVER; + this.activated = NEVER; return; } - this.available = this.sw.eventsOfType('UPDATE_AVAILABLE'); - this.activated = this.sw.eventsOfType('UPDATE_ACTIVATED'); + this.available = this.sw.eventsOfType('UPDATE_AVAILABLE'); + this.activated = this.sw.eventsOfType('UPDATE_ACTIVATED'); } /** diff --git a/packages/service-worker/test/comm_spec.ts b/packages/service-worker/test/comm_spec.ts index fcec448fd2..46400c4242 100644 --- a/packages/service-worker/test/comm_spec.ts +++ b/packages/service-worker/test/comm_spec.ts @@ -6,7 +6,6 @@ * found in the LICENSE file at https://angular.io/license */ -import 'rxjs/add/operator/toPromise'; import {TestBed} from '@angular/core/testing'; import {NgswCommChannel} from '../src/low_level'; diff --git a/packages/service-worker/test/integration_spec.ts b/packages/service-worker/test/integration_spec.ts index 8e1f846787..a7a52b420a 100644 --- a/packages/service-worker/test/integration_spec.ts +++ b/packages/service-worker/test/integration_spec.ts @@ -6,11 +6,10 @@ * found in the LICENSE file at https://angular.io/license */ -import {Observable} from 'rxjs/Observable'; -import {take} from 'rxjs/operator/take'; -import {toPromise} from 'rxjs/operator/toPromise'; +import {Observable} from 'rxjs'; +import {take} from 'rxjs/operators'; -import {NgswCommChannel, UpdateAvailableEvent} from '../src/low_level'; +import {NgswCommChannel} from '../src/low_level'; import {SwPush} from '../src/push'; import {SwUpdate} from '../src/update'; import {MockServiceWorkerContainer, MockServiceWorkerRegistration} from '../testing/mock'; @@ -28,8 +27,7 @@ const dist = new MockFileSystemBuilder().addFile('/only.txt', 'this is only').bu const distUpdate = new MockFileSystemBuilder().addFile('/only.txt', 'this is only v2').build(); function obsToSinglePromise(obs: Observable): Promise { - const takeOne = take.call(obs, 1); - return toPromise.call(takeOne); + return obs.pipe(take(1)).toPromise(); } const manifest: Manifest = { diff --git a/packages/service-worker/testing/mock.ts b/packages/service-worker/testing/mock.ts index 0d28454990..879a1f9d8b 100644 --- a/packages/service-worker/testing/mock.ts +++ b/packages/service-worker/testing/mock.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {Subject} from 'rxjs/Subject'; +import {Subject} from 'rxjs'; export class MockServiceWorkerContainer { private onControllerChange: Function[] = []; diff --git a/packages/service-worker/worker/testing/scope.ts b/packages/service-worker/worker/testing/scope.ts index f87fa0f6af..6fa37de72a 100644 --- a/packages/service-worker/worker/testing/scope.ts +++ b/packages/service-worker/worker/testing/scope.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {Subject} from 'rxjs/Subject'; +import {Subject} from 'rxjs'; import {Adapter, Context} from '../src/adapter'; import {AssetGroupConfig, Manifest} from '../src/manifest'; diff --git a/packages/upgrade/rollup.config.js b/packages/upgrade/rollup.config.js index 730b467f65..c16303ff19 100644 --- a/packages/upgrade/rollup.config.js +++ b/packages/upgrade/rollup.config.js @@ -15,11 +15,8 @@ const globals = { '@angular/compiler': 'ng.compiler', '@angular/platform-browser': 'ng.platformBrowser', '@angular/platform-browser-dynamic': 'ng.platformBrowserDynamic', - 'rxjs/Subject': 'Rx', - 'rxjs/observable/PromiseObservable': 'Rx', // this is wrong, but this stuff has changed in rxjs - // b.6 so we need to fix it when we update. - 'rxjs/operator/toPromise': 'Rx.Observable.prototype', - 'rxjs/Observable': 'Rx', + 'rxjs': 'rxjs', + 'rxjs/operators': 'rxjs.operators', }; module.exports = { diff --git a/scripts/ci/offline_compiler_test.sh b/scripts/ci/offline_compiler_test.sh index 830c076fe0..f44acfadbb 100755 --- a/scripts/ci/offline_compiler_test.sh +++ b/scripts/ci/offline_compiler_test.sh @@ -8,11 +8,12 @@ set -u -e -o pipefail # packages, then install them from the resulting .tgz files later. ANGULAR_PKGS=$(npm pack dist/packages-dist/{common,forms,core,compiler,compiler-cli,platform-{browser,server},platform-browser-dynamic,router,http,animations} | awk "{ printf \"$PWD/\"; print }") -TYPESCRIPT_VERSION=typescript@2.7.2 + PKGS=( - reflect-metadata@0.1.8 - zone.js@0.8.7 - rxjs@5.4.2 + $PWD/node_modules/typescript + $PWD/node_modules/reflect-metadata + $PWD/node_modules/rxjs + $PWD/node_modules/zone.js @types/{node@6.0.38,jasmine@2.2.33} jasmine@2.4.1 webpack@2.1.0-beta.21 @@ -33,7 +34,7 @@ cp -v package.json $TMP ( cd $TMP set -ex -o pipefail - npm install ${PKGS[*]} $TYPESCRIPT_VERSION + npm install ${PKGS[*]} npm install ${ANGULAR_PKGS[*]} ./node_modules/.bin/tsc --version diff --git a/test-main.js b/test-main.js index ce3aea78f6..17d922ea09 100644 --- a/test-main.js +++ b/test-main.js @@ -24,14 +24,11 @@ System.config({ map: { 'benchpress/*': 'dist/js/dev/es5/benchpress/*.js', '@angular': 'dist/all/@angular', - 'rxjs': 'node_modules/rxjs', 'domino': 'dist/all/@angular/empty.js', 'url': 'dist/all/@angular/empty.js', 'xhr2': 'dist/all/@angular/empty.js', '@angular/platform-server/src/domino_adapter': 'dist/all/empty.js', - 'angular2/*': 'dist/all/angular2/*.js', - 'angular2/src/alt_router/router_testing_providers': - 'dist/all/angular2/src/alt_router/router_testing_providers.js' + 'rxjs': 'node_modules/rxjs', }, packages: { '@angular/core/testing': {main: 'index.js', defaultExtension: 'js'}, @@ -66,6 +63,11 @@ System.config({ '@angular/platform-webworker': {main: 'index.js', defaultExtension: 'js'}, '@angular/platform-webworker-dynamic': {main: 'index.js', defaultExtension: 'js'}, '@angular/elements': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/ajax': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/operators': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/testing': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs/websocket': {main: 'index.js', defaultExtension: 'js'}, + 'rxjs': {main: 'index.js', defaultExtension: 'js'}, } }); diff --git a/tools/postinstall-patches.js b/tools/postinstall-patches.js index e9c844ef65..db52f068fe 100644 --- a/tools/postinstall-patches.js +++ b/tools/postinstall-patches.js @@ -6,11 +6,11 @@ * found in the LICENSE file at https://angular.io/license */ -const {set, cd, sed} = require('shelljs'); +const {set, cd, sed, rm} = require('shelljs'); const path = require('path'); const log = console.log; -log('===== about to run the postinstall.js script ====='); +log('===== about to run the postinstall-patches.js script ====='); // fail on first error set('-e'); // print commands as being executed @@ -18,12 +18,18 @@ set('-v'); // jump to project root cd(path.join(__dirname, '../')); +/* EXAMPLE PATCH: // https://github.com/ReactiveX/rxjs/pull/3302 // make node_modules/rxjs compilable with Typescript 2.7 // remove when we update to rxjs v6 log('\n# patch: reactivex/rxjs#3302 make node_modules/rxjs compilable with Typescript 2.7'); sed('-i', '(\'response\' in xhr)', '(\'response\' in (xhr as any))', 'node_modules/rxjs/src/observable/dom/AjaxObservable.ts'); +*/ +// workaround to make our closure compiler integration tests in integration/i18n pass +// https://github.com/ReactiveX/rxjs/pull/3431 +rm('-f', 'node_modules/rxjs/_esm2015/internal/umd.js'); +rm('-f', 'node_modules/rxjs/_esm5/internal/umd.js'); -log('===== finished running the postinstall.js script ====='); +log('===== finished running the postinstall-patches.js script ====='); diff --git a/tools/public_api_guard/common/common.d.ts b/tools/public_api_guard/common/common.d.ts index cebf029d7b..74e2e81370 100644 --- a/tools/public_api_guard/common/common.d.ts +++ b/tools/public_api_guard/common/common.d.ts @@ -203,7 +203,7 @@ export declare class Location { path(includeHash?: boolean): string; prepareExternalUrl(url: string): string; replaceState(path: string, query?: string, state?: any): void; - subscribe(onNext: (value: PopStateEvent) => void, onThrow?: ((exception: any) => void) | null, onReturn?: (() => void) | null): ISubscription; + subscribe(onNext: (value: PopStateEvent) => void, onThrow?: ((exception: any) => void) | null, onReturn?: (() => void) | null): SubscriptionLike; static joinWithSlash(start: string, end: string): string; static normalizeQueryParams(params: string): string; static stripTrailingSlash(url: string): string; diff --git a/tools/public_api_guard/common/testing.d.ts b/tools/public_api_guard/common/testing.d.ts index e428ab6692..e20ffe3687 100644 --- a/tools/public_api_guard/common/testing.d.ts +++ b/tools/public_api_guard/common/testing.d.ts @@ -31,5 +31,5 @@ export declare class SpyLocation implements Location { setInitialPath(url: string): void; simulateHashChange(pathname: string): void; simulateUrlPop(pathname: string): void; - subscribe(onNext: (value: any) => void, onThrow?: ((error: any) => void) | null, onReturn?: (() => void) | null): ISubscription; + subscribe(onNext: (value: any) => void, onThrow?: ((error: any) => void) | null, onReturn?: (() => void) | null): SubscriptionLike; } diff --git a/yarn.lock b/yarn.lock index 3606e83ce6..6eb3101205 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6214,11 +6214,11 @@ rx-lite@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102" -rxjs@5.5.6: - version "5.5.6" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.6.tgz#e31fb96d6fd2ff1fd84bcea8ae9c02d007179c02" +rxjs@6.0.0-alpha.4: + version "6.0.0-alpha.4" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.0.0-alpha.4.tgz#e24afa7457d95a981f081d2979c3ba69b20c8ca3" dependencies: - symbol-observable "1.0.1" + tslib "^1.9.0" safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.1" @@ -6861,10 +6861,6 @@ supports-color@^3.1.0: dependencies: has-flag "^1.0.0" -symbol-observable@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4" - systemjs@0.18.10: version "0.18.10" resolved "https://registry.yarnpkg.com/systemjs/-/systemjs-0.18.10.tgz#4e679dc5bb04dffb9882d40b19c5daa1cd182102" @@ -7136,7 +7132,7 @@ tslib@^1.0.0: version "1.7.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.7.1.tgz#bc8004164691923a79fe8378bbeb3da2017538ec" -tslib@^1.7.1, tslib@^1.8.1: +tslib@^1.7.1, tslib@^1.8.1, tslib@^1.9.0: version "1.9.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"