chore(AppShell): update to rc.5 (#96)

Author: mgechev

app-shell/package.json

@@ -16,11 +16,11 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/common": "~2.0.0-rc.0",
-    "@angular/compiler": "~2.0.0-rc.0",
-    "@angular/core": "~2.0.0-rc.0",
-    "@angular/platform-browser": "~2.0.0-rc.0",
-    "@angular/platform-browser-dynamic": "~2.0.0-rc.0",
+    "@angular/common": "~2.0.0-rc.5",
+    "@angular/compiler": "~2.0.0-rc.5",
+    "@angular/core": "~2.0.0-rc.5",
+    "@angular/platform-browser": "~2.0.0-rc.5",
+    "@angular/platform-browser-dynamic": "~2.0.0-rc.5",
     "es6-shim": "^0.35.0",
     "reflect-metadata": "0.1.3",
     "rxjs": "5.0.0-beta.6",

app-shell/src/app/index.ts

@@ -1,13 +1,26 @@
-import { Type } from '@angular/core';
+import { Type, NgModule, ModuleWithProviders } from '@angular/core';
 import { ShellRender } from './shell-render.directive';
 import { ShellNoRender } from './shell-no-render.directive';
+import { APP_SHELL_RUNTIME_PROVIDERS, APP_SHELL_BUILD_PROVIDERS } from './is-prerender.service';
 
 export * from './is-prerender.service';
-export * from './shell-no-render.directive';
-export * from './shell-render.directive';
 export * from './shell-parser';
 
 export const APP_SHELL_DIRECTIVES: Type[] = [
   ShellRender,
   ShellNoRender
 ];
+
+@NgModule({
+  exports: APP_SHELL_DIRECTIVES,
+  declarations: APP_SHELL_DIRECTIVES
+})
+export class AppShellModule {
+  static forRoot(): ModuleWithProviders {
+    return {
+      ngModule: AppShellModule,
+      providers: [APP_SHELL_RUNTIME_PROVIDERS, APP_SHELL_BUILD_PROVIDERS]
+    };
+  }
+}
+

app-shell/src/app/is-prerender.service.spec.ts

@@ -1,8 +1,5 @@
 import {
-  beforeEachProviders,
-  it,
-  describe,
-  expect,
+  addProviders,
   inject
 } from '@angular/core/testing';
 import {
@@ -13,7 +10,9 @@ import {
 
 describe('IsPrerender Service', () => {
   describe('prerender', () => {
-    beforeEachProviders(() => [APP_SHELL_BUILD_PROVIDERS]);
+    beforeEach(() => {
+      addProviders([APP_SHELL_BUILD_PROVIDERS]);
+    });
 
     it('should be true at build time',
       inject([IS_PRERENDER], (service: boolean) => {
@@ -23,14 +22,15 @@ describe('IsPrerender Service', () => {
 
 
   describe('runtime', () => {
-    beforeEachProviders(() => [APP_SHELL_RUNTIME_PROVIDERS]);
+    beforeEach(() => {
+      addProviders([APP_SHELL_RUNTIME_PROVIDERS]);
+    });
 
     it('should be false at runtime',
       inject([IS_PRERENDER], (service: boolean) => {
       expect(service).toBeFalsy();
     }));
   });
 
-
-
 });
+

app-shell/src/app/is-prerender.service.ts

@@ -1,4 +1,4 @@
-import {OpaqueToken, provide, Provider} from '@angular/core';
+import { OpaqueToken, provide, Provider } from '@angular/core';
 
 export const IS_PRERENDER = new OpaqueToken('IsPrerender');
 

app-shell/src/app/shell-no-render.directive.spec.ts

@@ -1,12 +1,13 @@
+import {
+  ComponentFixture,
+  TestComponentBuilder
+} from '@angular/core/testing';
+
 import {
   async,
-  beforeEachProviders,
-  describe,
-  expect,
-  it,
-  inject
+  inject,
+  addProviders
 } from '@angular/core/testing';
-import {ComponentFixture, TestComponentBuilder} from '@angular/compiler/testing';
 import { provide, Component } from '@angular/core';
 import { ShellNoRender } from './shell-no-render.directive';
 import {
@@ -23,7 +24,9 @@ class TestComponent {}
 
 describe('ShellNoRender Directive', () => {
   describe('prerender', () => {
-    beforeEachProviders((): any[] => [APP_SHELL_BUILD_PROVIDERS]);
+    beforeEach(() => {
+      addProviders([APP_SHELL_BUILD_PROVIDERS]);
+    });
 
     it('should NOT render the element', async(inject([TestComponentBuilder], (tcb:TestComponentBuilder) => {
       return tcb.createAsync(TestComponent).then((fixture: ComponentFixture<TestComponent>) => {
@@ -36,7 +39,9 @@ describe('ShellNoRender Directive', () => {
 
 
   describe('runtime', () => {
-    beforeEachProviders((): any[] => [APP_SHELL_RUNTIME_PROVIDERS]);
+    beforeEach(() => {
+      addProviders([APP_SHELL_RUNTIME_PROVIDERS]);
+    });
 
     it('should render the element', async(inject([TestComponentBuilder], (tcb:TestComponentBuilder) => {
       return tcb.createAsync(TestComponent).then((fixture: ComponentFixture<TestComponent>) => {

app-shell/src/app/shell-no-render.directive.ts

@@ -1,6 +1,6 @@
 import { Directive, Inject, OnInit, ViewContainerRef, TemplateRef } from '@angular/core';
 
-import {IS_PRERENDER} from './is-prerender.service';
+import { IS_PRERENDER } from './is-prerender.service';
 
 @Directive({selector: '[shellNoRender]'})
 export class ShellNoRender implements OnInit {

app-shell/src/app/shell-parser/node-matcher/css-node-matcher.spec.ts

@@ -1,8 +1,4 @@
 import {
-  beforeEach,
-  it,
-  describe,
-  expect,
   inject
 } from '@angular/core/testing';
 import { ASTNode } from '../ast';

app-shell/src/app/shell-parser/node-matcher/css-selector/css-selector.spec.ts

@@ -1,8 +1,4 @@
 import {
-  beforeEachProviders,
-  it,
-  describe,
-  expect,
   inject
 } from '@angular/core/testing';
 import { CssSelector } from './css-selector';

app-shell/src/app/shell-parser/node-visitor/resource-inline/inline-style-resource-inline-visitor.spec.ts

@@ -1,8 +1,4 @@
 import {
-  beforeEach,
-  it,
-  describe,
-  expect,
   inject
 } from '@angular/core/testing';
 

app-shell/src/app/shell-parser/node-visitor/resource-inline/stylesheet-resource-inline-visitor.spec.ts

@@ -1,8 +1,4 @@
 import {
-  beforeEach,
-  it,
-  describe,
-  expect,
   inject
 } from '@angular/core/testing';