From 640a655a9c627c825951cf80ad596959c145595f Mon Sep 17 00:00:00 2001 From: andreasonny83 Date: Sun, 2 Apr 2017 18:44:03 +0100 Subject: [PATCH] feat(CookieLawComponent): multiple components support multiple components support with attribute name; improved modularization; Angular2 version to 2.4.10; documentation updated. closes #7 --- README.md | 27 +++- demo/app.component.ts | 12 +- package.json | 12 +- src/cookie-law-element.component.ts | 122 ++++++++++++++ src/cookie-law.component.spec.ts | 240 ++++++++++++++++++++++++---- src/cookie-law.component.ts | 134 ++++------------ src/cookie-law.html | 19 ++- src/cookie-law.module.ts | 5 +- src/cookie-law.service.spec.ts | 10 ++ src/cookie-law.service.ts | 8 +- yarn.lock | 130 ++++++++------- 11 files changed, 486 insertions(+), 233 deletions(-) create mode 100644 src/cookie-law-element.component.ts diff --git a/README.md b/README.md index 53c7175..1910a66 100644 --- a/README.md +++ b/README.md @@ -163,13 +163,12 @@ to see the application running. If set to a valid absolute or relative URL, it will render an extra 'learn more' link pointing to the link. -eg. +###### Example + ```html ``` -###### Output - ![output with link](http://i.imgur.com/0nvb6sP.png) ### target @@ -201,6 +200,22 @@ Possible values are: `"bottom"` and `"top"`. ``` +### name + +| Type | Default value | +| --- | --- | +| string | "cookieLawSeen" | + +Allows you to decide which name will be used for storing the cookie in the client's browser. + +###### Example + +```html + +``` + +The previous example will generate a `myShinyCookieLaw=true` as soon as the user dismiss the banner. + ## Properties | Name | Type | Description | @@ -306,9 +321,9 @@ library starting from the version >=4. Make sure to include the `BrowserAnimationsModule` in your App module like in the following example: ```ts -import { NgModule } from '@angular/core'; +import { NgModule } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; -import { AppComponent } from './app.component'; +import { AppComponent } from './app.component'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; @@ -319,7 +334,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; ], imports: [ BrowserModule, - BrowserAnimationsModule, // BrowserAnimationsModule + BrowserAnimationsModule, // Angular 4 Only ], }) export class AppModule { } diff --git a/demo/app.component.ts b/demo/app.component.ts index c14a8ff..0f5b44f 100644 --- a/demo/app.component.ts +++ b/demo/app.component.ts @@ -25,7 +25,7 @@ import { - + Allo! This is my awesome cookie-law message. Click here for more info @@ -52,15 +52,15 @@ import { `] }) export class AppComponent implements OnInit { - @ViewChild('cookieLaw') - private cookieLawEl: any; - private cookieLawSeen: boolean; + cookieLawSeen: boolean; + + @ViewChild('cookieLaw') private cookieLawEl: any; ngOnInit() { - this.cookieLawSeen = this.cookieLawEl.cookieLawSeen; + this.cookieLawSeen = this.cookieLawEl.cookieLawSeen(); } - public dismiss(): void { + dismiss(): void { this.cookieLawEl.dismiss(); } } diff --git a/package.json b/package.json index 61e91ab..9c9c666 100644 --- a/package.json +++ b/package.json @@ -49,12 +49,12 @@ "@angular/platform-browser": ">=2.0.0" }, "devDependencies": { - "@angular/common": "2.4.7", - "@angular/compiler": "2.4.7", - "@angular/core": "2.4.7", - "@angular/platform-browser": "2.4.7", - "@angular/platform-browser-dynamic": "2.4.7", - "@angular/compiler-cli": "2.4.7", + "@angular/common": "2.4.10", + "@angular/compiler": "2.4.10", + "@angular/core": "2.4.10", + "@angular/platform-browser": "2.4.10", + "@angular/platform-browser-dynamic": "2.4.10", + "@angular/compiler-cli": "2.4.10", "@types/jasmine": "2.5.46", "@types/node": "7.0.5", "@types/selenium-webdriver": "2.53.39", diff --git a/src/cookie-law-element.component.ts b/src/cookie-law-element.component.ts new file mode 100644 index 0000000..fae47ef --- /dev/null +++ b/src/cookie-law-element.component.ts @@ -0,0 +1,122 @@ +import { + Component, + OnInit, + ViewEncapsulation, + Input, + Output, + EventEmitter, + AnimationTransitionEvent, + trigger, + state, + style, + animate, + transition, +} from '@angular/core'; + +import { + DomSanitizer, + SafeHtml, +} from '@angular/platform-browser'; + +import { + closeIcon, +} from './icons'; + +export type CookieLawPosition = 'top' | 'bottom'; +export type CookieLawAnimation = 'topIn' | 'bottomIn' | 'topOut' | 'bottomOut'; +export type CookieLawTarget = '_blank' | '_self'; + +@Component({ + selector: 'cookie-law-el', + animations: [ + trigger('state', [ + state('bottomOut', style({ transform: 'translateY(100%)' })), + state('topOut', style({ transform: 'translateY(-100%)' })), + state('*', style({ transform: 'translateY(0)' })), + + transition('void => topIn', [ + style({ transform: 'translateY(-100%)' }), + animate('1000ms ease-in-out'), + ]), + + transition('void => bottomIn', [ + style({ transform: 'translateY(100%)' }), + animate('1000ms ease-in-out'), + ]), + + transition('* => *', animate('1000ms ease-out')), + ]) + ], + styleUrls: [ './cookie-law.css' ], + templateUrl: './cookie-law.html', + encapsulation: ViewEncapsulation.None, + host: { + '[class.cookie-law]': 'true' + } +}) +export class CookieLawElementComponent implements OnInit { + animation: CookieLawAnimation; + closeSvg: SafeHtml; + currentStyles: any; + + @Input() + get learnMore() { return this._learnMore; } + set learnMore(value: string) { + this._learnMore = (value !== null && `${value}` !== 'false') ? value : null; + } + + @Input() + get target() { return this._target; } + set target(value: CookieLawTarget) { + this._target = (value !== null && `${value}` !== 'false' && + (`${value}` === '_blank' || `${value}` === '_self') + ) ? value : '_blank'; + } + + @Input() + get position() { return this._position; } + set position(value: CookieLawPosition) { + this._position = (value !== null && `${value}` !== 'false' && + (`${value}` === 'top' || `${value}` === 'bottom') + ) ? value : 'bottom'; + } + + @Output() isSeen = new EventEmitter(); + + private _learnMore: string; + private _target: CookieLawTarget; + private _position: CookieLawPosition; + + constructor( + private domSanitizer: DomSanitizer, + ) { + this.animation = 'bottomIn'; + this._position = 'bottom'; + } + + ngOnInit(): void { + this.animation = this.position === 'bottom' ? 'bottomIn' : 'topIn'; + + this.closeSvg = this.domSanitizer.bypassSecurityTrustHtml(closeIcon); + + this.currentStyles = { + 'top': this.position === 'top' ? '0' : null, + 'bottom': this.position === 'top' ? 'initial' : null, + }; + } + + afterDismissAnimation(evt: AnimationTransitionEvent): void { + if (evt.toState === 'topOut' || + evt.toState === 'bottomOut') { + this.isSeen.emit(true); + } + } + + dismiss(evt?: MouseEvent): void { + if (evt) { + evt.preventDefault(); + } + + this.animation = this.position === 'top' ? 'topOut' : 'bottomOut'; + } +} diff --git a/src/cookie-law.component.spec.ts b/src/cookie-law.component.spec.ts index 8f3829a..3e5de5c 100644 --- a/src/cookie-law.component.spec.ts +++ b/src/cookie-law.component.spec.ts @@ -12,20 +12,19 @@ import { async, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; +import { + DebugElement, + Component, +} from '@angular/core'; import { CookieLawModule, CookieLawComponent, + CookieLawElementComponent, + CookieLawService, } from './cookie-law.module'; -import { CookieLawService } from './cookie-law.service'; describe('CookieLawComponent', () => { - let comp: CookieLawComponent; - let fixture: ComponentFixture; - let de: DebugElement; - let el: HTMLElement; - let cookiesPolicyService: any; // async beforeEach @@ -48,6 +47,11 @@ describe('CookieLawComponent', () => { provide: CookieLawService, useValue: CookieLawServiceStub }], + declarations: [ + SimpleCookieLawComponent, + AttributesCookieLawComponent, + TwoCookieLawComponent, + ], imports: [ CookieLawModule, ] @@ -59,67 +63,233 @@ describe('CookieLawComponent', () => { beforeEach(() => { // CookieLawService from the root injector cookiesPolicyService = TestBed.get(CookieLawService); - - fixture = TestBed.createComponent(CookieLawComponent); - comp = fixture.componentInstance; // CookieLawComponent test instance - - // query for the element by CSS element selector - de = fixture.debugElement; - el = de.nativeElement; }); it('should render the cookie policy notification', () => { + let fixture: ComponentFixture = TestBed.createComponent(CookieLawComponent); + let comp: CookieLawComponent = fixture.debugElement.componentInstance; + fixture.detectChanges(); expect(cookiesPolicyService.seen()).toBe(false); - expect(el.textContent).toContain('By continuing to browse the site, you\'re agreeing to our use of cookies.'); + + expect(comp).toBeTruthy(); + expect(comp).not.toBeNull(); + + expect(fixture.debugElement.nativeElement.textContent) + .toContain('By continuing to browse the site, you\'re agreeing to our use of cookies.'); }); - it('dismiss the notification with mouse interaction', () => { + it('CookieLawComponent should have a `seen` attribute', () => { + let fixture: ComponentFixture = TestBed.createComponent(SimpleCookieLawComponent); + let element: DebugElement = fixture.debugElement.query(By.css('cookie-law')); + fixture.detectChanges(); + expect(element.nativeElement.getAttribute('seen')).toBe('false'); + }); - expect(cookiesPolicyService.seen()).toBe(false); - de.query(By.css('.dismiss')).nativeElement.click(); + it('CookieLawComponent should be initially visible', () => { + let fixture: ComponentFixture = TestBed.createComponent(CookieLawComponent); + let comp: CookieLawComponent = fixture.debugElement.componentInstance; fixture.detectChanges(); + expect(comp.seen).toBe(false); + expect(comp.cookieLawSeen()).toBe(false); + }); + + it('CookieLawComponent should be dismissible', () => { + let fixture: ComponentFixture = TestBed.createComponent(CookieLawComponent); + let comp: CookieLawComponent = fixture.debugElement.componentInstance; - expect(cookiesPolicyService.seen()).toBe(true); - expect(el.textContent).not.toContain('COOKIE POLICY'); + fixture.detectChanges(); + expect(comp.seen).toBe(false); + + comp.dismiss(); + comp.hasBeenDismissed(); + fixture.detectChanges(); + + expect(comp.seen).toBe(true); + expect(comp.cookieLawSeen()).toBe(true); }); - it('dismiss the notification invoking the `dismiss` method', () => { + it('CookieLawElementComponent should have a bunch of attributes', () => { + let fixture: ComponentFixture = TestBed.createComponent(CookieLawElementComponent); + let comp: CookieLawElementComponent = fixture.debugElement.componentInstance; + fixture.detectChanges(); - expect(cookiesPolicyService.seen()).toBe(false); + expect(comp.animation).toBe('bottomIn') + expect(comp.position).toBe('bottom') + expect(comp.learnMore).not.toBeDefined(); + expect(comp.target).not.toBeDefined(); + }); + + it('CookieLawElementComponent should accept attributes', () => { + let fixture: ComponentFixture = TestBed.createComponent(AttributesCookieLawComponent); + let comp: DebugElement = fixture.debugElement.query(By.css('cookie-law')); - comp.dismiss(); fixture.detectChanges(); - expect(cookiesPolicyService.seen()).toBe(true); + let el: DebugElement = fixture.debugElement.query(By.css('cookie-law-el')); + + expect(el.nativeElement.textContent) + .not.toContain(`Learn more in our privacy policy.`); + + expect(comp.nativeElement.getAttribute('seen')).toBe('false'); + expect(el.componentInstance.name).not.toBeDefined(); + expect(el.componentInstance.learnMore).not.toBeDefined(); + expect(el.componentInstance.target).toBe('_blank'); + expect(el.componentInstance.position).toBe('bottom'); + expect(el.componentInstance.animation).toBe('bottomIn'); }); - it('should hide the cookie policy notification', () => { - cookiesPolicyService._seen = true; + it('CookieLawElementComponent should renders on the top', () => { + let fixture: ComponentFixture = TestBed.createComponent(AttributesCookieLawComponent); + let app: AttributesCookieLawComponent = fixture.debugElement.componentInstance; + let comp: DebugElement = fixture.debugElement.query(By.css('cookie-law')); + + app.name = 'myCookie'; + app.position = 'top'; + fixture.detectChanges(); + let el: DebugElement = fixture.debugElement.query(By.css('cookie-law-el')); + + expect(comp.componentInstance.position).toBe('top'); + expect(el.componentInstance.position).toBe('top'); + expect(el.componentInstance.animation).toBe('topIn'); + }); + + it('CookieLawElementComponent learnMore', () => { + let fixture: ComponentFixture = TestBed.createComponent(AttributesCookieLawComponent); + let app: AttributesCookieLawComponent = fixture.debugElement.componentInstance; - expect(cookiesPolicyService.seen()).toBe(true); + app.learnMore = '/#cookies'; + app.target = '_self'; - expect(el.textContent).not.toContain('COOKIE POLICY'); + fixture.detectChanges(); + + let el: DebugElement = fixture.debugElement.query(By.css('cookie-law-el')); + + expect(el.componentInstance.target).toBe('_self'); + expect(el.nativeElement.textContent) + .toContain(`Learn more in our privacy policy.`); + + app.learnMore = 'false'; + + fixture.detectChanges(); + + expect(el.componentInstance.learnMore).toBeNull(); }); - it('cookieLawSeen should reflects cookiesPolicyService.seen', () => { - expect(cookiesPolicyService.seen()).toBe(false); + it('CookieLawElementComponent should dismiss the banner on the bottom', () => { + let fixture: ComponentFixture = TestBed.createComponent(AttributesCookieLawComponent); - comp.dismiss(); fixture.detectChanges(); - expect(cookiesPolicyService.seen()).toBe(true); + let el: DebugElement = fixture.debugElement.query(By.css('cookie-law-el')); + let comp: CookieLawElementComponent = el.componentInstance; + + let spy = spyOn(comp, 'dismiss').and.callThrough(); + + el.query(By.css('.dismiss')).nativeElement.click(); + + fixture.detectChanges(); + + expect(spy).toHaveBeenCalled(); + }); + + it('CookieLawElementComponent should dismiss the banner on the top', () => { + let fixture: ComponentFixture = TestBed.createComponent(AttributesCookieLawComponent); + let app: AttributesCookieLawComponent = fixture.debugElement.componentInstance; + + app.position = 'top'; + + fixture.detectChanges(); + + let el: DebugElement = fixture.debugElement.query(By.css('cookie-law-el')); + let comp: CookieLawElementComponent = el.componentInstance; + + let spy = spyOn(comp, 'dismiss').and.callThrough(); + + el.query(By.css('.dismiss')).nativeElement.click(); + + fixture.detectChanges(); + + expect(spy).toHaveBeenCalled(); + }); + + it('CookieLawComponent should dismiss the banner using a method', () => { + let fixture: ComponentFixture = TestBed.createComponent(AttributesCookieLawComponent); + let app: AttributesCookieLawComponent = fixture.debugElement.componentInstance; + + app.position = 'top'; + + fixture.detectChanges(); + + let parent: CookieLawComponent = fixture.debugElement.query(By.css('cookie-law')).componentInstance; + let comp: CookieLawElementComponent = fixture.debugElement.query(By.css('cookie-law-el')).componentInstance; + + let spy = spyOn(comp, 'dismiss').and.callThrough(); + + parent.dismiss(); + + fixture.detectChanges(); + + expect(spy).toHaveBeenCalled(); }); - it('should render a learn more link', () => { - comp.learnMore = 'http://www.google.com'; + it('CookieLawComponent with custom names', () => { + let fixture: ComponentFixture = TestBed.createComponent(TwoCookieLawComponent); fixture.detectChanges(); - expect(el.textContent).toContain('Learn more'); + + let cookieB: CookieLawComponent = fixture.debugElement.query(By.css('cookie-law#second')).componentInstance; + + fixture.detectChanges(); + expect(fixture.nativeElement.querySelectorAll('cookie-law#first .cookie-law').length).toBe(1); + expect(fixture.nativeElement.querySelectorAll('cookie-law#second .cookie-law').length).toBe(1); + + cookieB.hasBeenDismissed(); + fixture.detectChanges(); + + expect(fixture.nativeElement.querySelectorAll('cookie-law#first .cookie-law').length).toBe(1); + expect(fixture.nativeElement.querySelectorAll('cookie-law#second .cookie-law').length).toBe(0); }); }); + +@Component({ + template: ` + + ` +}) +class SimpleCookieLawComponent { } + +@Component({ + template: ` + + + ` +}) +class TwoCookieLawComponent { } + +@Component({ + template: ` + + ` +}) +class AttributesCookieLawComponent { + name: string; + learnMore: string; + target: string; + position: string; + + isSeen: boolean = false; + + seen(evt: any) { + this.isSeen = evt; + } +} diff --git a/src/cookie-law.component.ts b/src/cookie-law.component.ts index c1786e1..d49f91d 100644 --- a/src/cookie-law.component.ts +++ b/src/cookie-law.component.ts @@ -9,136 +9,64 @@ import { Component, OnInit, - ViewEncapsulation, + ViewChild, HostBinding, Input, Output, EventEmitter, - AnimationTransitionEvent, - trigger, - state, - style, - animate, - transition, } from '@angular/core'; -import { - DomSanitizer, - SafeHtml, -} from '@angular/platform-browser'; - import { CookieLawService, } from './cookie-law.service'; import { - closeIcon, -} from './icons'; - -export type CookieLawPosition = 'top' | 'bottom'; -export type CookieLawAnimation = 'topIn' | 'bottomIn' | 'topOut' | 'bottomOut'; -export type CookieLawTarget = '_blank' | '_self'; + CookieLawElementComponent, + CookieLawTarget, + CookieLawPosition, +} from './cookie-law-element.component'; @Component({ selector: 'cookie-law', - encapsulation: ViewEncapsulation.None, - animations: [ - trigger('state', [ - state('bottomOut', style({ transform: 'translateY(100%)' })), - state('topOut', style({ transform: 'translateY(-100%)' })), - state('*', style({ transform: 'translateY(0)' })), - - transition('void => topIn', [ - style({ transform: 'translateY(-100%)' }), - animate('1000ms ease-in-out'), - ]), - - transition('void => bottomIn', [ - style({ transform: 'translateY(100%)' }), - animate('1000ms ease-in-out'), - ]), - - transition('* => *', animate('1000ms ease-out')), - ]) - ], - styleUrls: [ './cookie-law.css' ], - templateUrl: './cookie-law.html', - host: { - '[class.cookie-law]': 'true' - } + template: ` + + `, }) export class CookieLawComponent implements OnInit { - animation: CookieLawAnimation; - closeSvg: SafeHtml; - cookieLawSeen: boolean; - currentStyles: any; - - @Input('learnMore') - get learnMore() { return this._learnMore; } - set learnMore(value: string) { - this._learnMore = (value !== null && `${value}` !== 'false') ? value : null; - } + @HostBinding('attr.seen') + seen: boolean = true; - @Input('target') - get target() { return this._target; } - set target(value: CookieLawTarget) { - this._target = (value !== null && `${value}` !== 'false' && - (`${value}` === '_blank' || `${value}` === '_self') - ) ? value : '_blank'; - } + @ViewChild(CookieLawElementComponent) + cookieLawComponent: CookieLawElementComponent; - @Input('position') - get position() { return this._position; } - set position(value: CookieLawPosition) { - this._position = (value !== null && `${value}` !== 'false' && - (`${value}` === 'top' || `${value}` === 'bottom') - ) ? value : 'bottom'; - } + @Input() name: string; + @Input() learnMore: string; + @Input() target: CookieLawTarget; + @Input() position: CookieLawPosition; @Output() isSeen = new EventEmitter(); - @HostBinding('attr.seen') - private _learnMore: string; - private _target: CookieLawTarget; - private _position: CookieLawPosition; + constructor (private _service: CookieLawService) { } - constructor( - private _service: CookieLawService, - private domSanitizer: DomSanitizer, - ) { - this.animation = 'topIn'; - this._position = 'bottom'; - this.cookieLawSeen = this._service.seen(); + ngOnInit() { + this.seen = this._service.seen(this.name); } - ngOnInit(): void { - this.animation = this.position === 'bottom' ? 'bottomIn' : 'topIn'; - - this.closeSvg = this.domSanitizer.bypassSecurityTrustHtml(closeIcon); - - if (this.cookieLawSeen) { - this.isSeen.emit(true); - } - - this.currentStyles = { - 'top': this.position === 'top' ? '0' : null, - 'bottom': this.position === 'top' ? 'initial' : null, - }; + hasBeenDismissed(): void { + this.seen = true; + this.isSeen.emit(true); } - afterDismissAnimation(evt: AnimationTransitionEvent) { - if (evt.toState === 'topOut' || - evt.toState === 'bottomOut') { - this.isSeen.emit(true); - } + cookieLawSeen(): boolean { + return this._service.seen(this.name); } - dismiss(evt?: MouseEvent): void { - if (evt) { - evt.preventDefault(); - } - - this._service.storeCookie(); - this.animation = this.position === 'top' ? 'topOut' : 'bottomOut'; + dismiss(): void { + this._service.storeCookie(this.name); + this.cookieLawComponent.dismiss(); } } diff --git a/src/cookie-law.html b/src/cookie-law.html index 4033ba1..94bd065 100644 --- a/src/cookie-law.html +++ b/src/cookie-law.html @@ -1,21 +1,20 @@
- - By continuing to browse the site, you're agreeing to our use of cookies. - - Learn more in our privacy policy. + + By continuing to browse the site, you're agreeing to our use of cookies. + + Learn more in our privacy policy. + - - +
diff --git a/src/cookie-law.module.ts b/src/cookie-law.module.ts index 92fb5cb..1b25909 100644 --- a/src/cookie-law.module.ts +++ b/src/cookie-law.module.ts @@ -9,6 +9,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { CookieLawComponent } from './cookie-law.component'; +import { CookieLawElementComponent } from './cookie-law-element.component'; import { CookieLawService } from './cookie-law.service'; @NgModule({ @@ -17,6 +18,7 @@ import { CookieLawService } from './cookie-law.service'; ], declarations: [ CookieLawComponent, + CookieLawElementComponent, ], providers: [ CookieLawService, @@ -29,5 +31,6 @@ export class CookieLawModule { } export { CookieLawComponent, - CookieLawService + CookieLawElementComponent, + CookieLawService, }; diff --git a/src/cookie-law.service.spec.ts b/src/cookie-law.service.spec.ts index abd2691..3fe54d1 100644 --- a/src/cookie-law.service.spec.ts +++ b/src/cookie-law.service.spec.ts @@ -24,5 +24,15 @@ describe('CookieLawService', () => { service.storeCookie(); expect(service.seen()).toBe(true); + expect(service.seen('cookieLawSeen')).toBe(true); + }); + + it('should stored different cookie names', () => { + service.storeCookie('testCookie'); + + expect(service.seen('fakeCookie')).toBe(false); + expect(service.seen()).toBe(false); + + expect(service.seen('testCookie')).toBe(true); }); }); diff --git a/src/cookie-law.service.ts b/src/cookie-law.service.ts index b5df8f6..ec0f543 100644 --- a/src/cookie-law.service.ts +++ b/src/cookie-law.service.ts @@ -11,12 +11,12 @@ import { Injectable } from '@angular/core'; @Injectable() export class CookieLawService { - seen(): boolean { - return this.cookieExisits('cookieLawSeen'); + seen(cookieName?: string): boolean { + return this.cookieExisits(cookieName || 'cookieLawSeen'); } - storeCookie(): void { - return this.setCookie('cookieLawSeen'); + storeCookie(cookieName?: string): void { + return this.setCookie(cookieName || 'cookieLawSeen'); } /** diff --git a/yarn.lock b/yarn.lock index fb0adfb..7eab4a4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,33 +2,33 @@ # yarn lockfile v1 -"@angular/common@2.4.7": - version "2.4.7" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-2.4.7.tgz#9316daf90e353e67187d2e0afec5521c2001bd4b" +"@angular/common@2.4.10": + version "2.4.10" + resolved "https://registry.yarnpkg.com/@angular/common/-/common-2.4.10.tgz#a3a682d2228fa30ec23dd0eb57c8e887fba26997" -"@angular/compiler-cli@2.4.7": - version "2.4.7" - resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-2.4.7.tgz#15768141816903636593f430ff9a808d98a2a762" +"@angular/compiler-cli@2.4.10": + version "2.4.10" + resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-2.4.10.tgz#c21143bfaab45231c8d2eaa82456bed3d39f91a3" dependencies: "@angular/tsc-wrapped" "0.5.2" minimist "^1.2.0" reflect-metadata "^0.1.2" -"@angular/compiler@2.4.7": - version "2.4.7" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-2.4.7.tgz#008c1f0d1409c46fbba215fe8ab0d886252c7ff0" +"@angular/compiler@2.4.10": + version "2.4.10" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-2.4.10.tgz#f51fd34820b2a02c7cb61fbcf49873c58056fb0c" -"@angular/core@2.4.7": - version "2.4.7" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-2.4.7.tgz#8bed9a2d37e81342bd41d189df88aa3e02393cfb" +"@angular/core@2.4.10": + version "2.4.10" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-2.4.10.tgz#0b8320a65065965d998645b1f5cd3cf769b441ea" -"@angular/platform-browser-dynamic@2.4.7": - version "2.4.7" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-2.4.7.tgz#9632586f9ce596186be4c124c3ea0a4a74b27b46" +"@angular/platform-browser-dynamic@2.4.10": + version "2.4.10" + resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-2.4.10.tgz#8df25dec2b06adc690cc9bc26448deccaebcd8ec" -"@angular/platform-browser@2.4.7": - version "2.4.7" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-2.4.7.tgz#19f7996a70f07b34ce8d6d0e255544e62cae75f1" +"@angular/platform-browser@2.4.10": + version "2.4.10" + resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-2.4.10.tgz#cbf25608148fb4ffef96cc5005ba5d7b3e093906" "@angular/tsc-wrapped@0.5.2": version "0.5.2" @@ -317,8 +317,8 @@ async@^0.9.0, async@~0.9.0: resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d" async@^2.0.1, async@^2.1.2: - version "2.1.5" - resolved "https://registry.yarnpkg.com/async/-/async-2.1.5.tgz#e587c68580994ac67fc56ff86d3ac56bdbe810bc" + version "2.2.0" + resolved "https://registry.yarnpkg.com/async/-/async-2.2.0.tgz#c324eba010a237e4fbd55a12dee86367d5c0ef32" dependencies: lodash "^4.14.0" @@ -593,8 +593,8 @@ browserify-rsa@^4.0.0: randombytes "^2.0.1" browserify-sign@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.0.tgz#10773910c3c206d5420a46aad8694f820b85968f" + 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" @@ -679,8 +679,8 @@ camelcase@^3.0.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" camelcase@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.0.0.tgz#8b0f90d44be5e281b903b9887349b92595ef07f2" + version "4.1.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" capture-stack-trace@^1.0.0: version "1.0.0" @@ -997,8 +997,8 @@ conventional-commit-types@^2.0.0: resolved "https://registry.yarnpkg.com/conventional-commit-types/-/conventional-commit-types-2.1.0.tgz#45d860386c9a2e6537ee91d8a1b61bd0411b3d04" convert-source-map@^1.3.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.4.0.tgz#e3dad195bf61bfe13a7a3c73e9876ec14a0268f3" + version "1.5.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5" cookie-signature@1.0.6: version "1.0.6" @@ -2218,8 +2218,8 @@ inquirer@1.2.3: through "^2.3.6" interpret@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.1.tgz#d579fb7f693b858004947af39fa0db49f795602c" + version "1.0.2" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.2.tgz#f4f623f0bb7122f15f5717c8e254b8161b5c5b2d" invariant@^2.2.0: version "2.2.2" @@ -2425,20 +2425,20 @@ istanbul-instrumenter-loader@2.0.0: loader-utils "^0.2.16" object-assign "^4.1.0" -istanbul-lib-coverage@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.1.tgz#f263efb519c051c5f1f3343034fc40e7b43ff212" +istanbul-lib-coverage@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.2.tgz#87a0c015b6910651cb3b184814dfb339337e25e1" istanbul-lib-instrument@^1.1.3: - version "1.6.2" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.6.2.tgz#dac644f358f51efd6113536d7070959a0111f73b" + version "1.7.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.0.tgz#b8e0dc25709bb44e17336ab47b7bb5c97c23f659" dependencies: babel-generator "^6.18.0" babel-template "^6.16.0" babel-traverse "^6.18.0" babel-types "^6.18.0" babylon "^6.13.0" - istanbul-lib-coverage "^1.0.0" + istanbul-lib-coverage "^1.0.2" semver "^5.3.0" istanbul@0.4.5, istanbul@^0.4.0: @@ -2647,10 +2647,10 @@ klaw@^1.0.0: graceful-fs "^4.1.9" latest-version@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.0.0.tgz#3104f008c0c391084107f85a344bc61e38970649" + version "3.1.0" + resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15" dependencies: - package-json "^3.0.0" + package-json "^4.0.0" lazy-cache@^1.0.3: version "1.0.4" @@ -2991,7 +2991,7 @@ miller-rabin@^4.0.0: version "1.27.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1" -mime-types@^2.1.11, mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.13, mime-types@~2.1.7: +mime-types@^2.1.11, mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.7: version "2.1.15" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.15.tgz#a4ebf5064094569237b8cf70046776d09fc92aed" dependencies: @@ -3152,8 +3152,10 @@ normalize-path@^1.0.0: resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379" normalize-path@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.0.1.tgz#47886ac1662760d4261b7d979d241709d3ce3f7a" + 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" "npm-package-arg@^3.0.0 || ^4.0.0": version "4.2.1" @@ -3344,9 +3346,9 @@ osenv@^0.1.0, osenv@^0.1.4: os-homedir "^1.0.0" os-tmpdir "^1.0.0" -package-json@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/package-json/-/package-json-3.1.0.tgz#ce281900fe8052150cc6709c6c006c18fdb2f379" +package-json@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.0.tgz#f3c9dc8738f5b59304d54d2cfb3f91d08fdd7998" dependencies: got "^6.7.1" registry-auth-token "^3.0.1" @@ -3653,8 +3655,8 @@ raw-loader@0.5.1: resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa" rc@^1.0.1, rc@^1.1.6, rc@^1.1.7: - version "1.1.7" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.1.7.tgz#c5ea564bb07aff9fd3a5b32e906c1d3a65940fea" + version "1.2.0" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.0.tgz#c7de973b7b46297c041366b2fd3d2363b1697c66" dependencies: deep-extend "~0.4.0" ini "~1.3.0" @@ -3676,18 +3678,7 @@ read-pkg@^1.0.0: normalize-package-data "^2.3.2" path-type "^1.0.0" -"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@~2.0.0, readable-stream@~2.0.5: - version "2.0.6" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "~1.0.0" - process-nextick-args "~1.0.6" - string_decoder "~0.10.x" - util-deprecate "~1.0.1" - -readable-stream@^2.1.0, readable-stream@^2.1.4: +"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.0, readable-stream@^2.1.4: version "2.2.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.6.tgz#8b43aed76e71483938d12a8d46c6cf1a00b1f816" dependencies: @@ -3717,6 +3708,17 @@ readable-stream@~1.1.9: isarray "0.0.1" string_decoder "~0.10.x" +readable-stream@~2.0.0, readable-stream@~2.0.5: + version "2.0.6" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e" + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "~1.0.0" + process-nextick-args "~1.0.6" + string_decoder "~0.10.x" + 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" @@ -3802,6 +3804,10 @@ remap-istanbul@0.8.4: source-map ">=0.5.6" through2 "2.0.1" +remove-trailing-separator@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz#615ebb96af559552d4bf4057c8436d486ab63cc4" + repeat-element@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a" @@ -4619,11 +4625,11 @@ type-check@~0.3.2: prelude-ls "~1.1.2" type-is@~1.6.14: - version "1.6.14" - resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.14.tgz#e219639c17ded1ca0789092dd54a03826b817cb2" + version "1.6.15" + resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410" dependencies: media-typer "0.3.0" - mime-types "~2.1.13" + mime-types "~2.1.15" typedarray@~0.0.5: version "0.0.6" @@ -4743,8 +4749,8 @@ url@^0.11.0: querystring "0.2.0" useragent@^2.1.12: - version "2.1.12" - resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.1.12.tgz#aa7da6cdc48bdc37ba86790871a7321d64edbaa2" + version "2.1.13" + resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.1.13.tgz#bba43e8aa24d5ceb83c2937473e102e21df74c10" dependencies: lru-cache "2.2.x" tmp "0.0.x"