Merging with latest

Author: isaacplmann

.gitignore

@@ -1,8 +1,7 @@
 node_modules
 build
 dist
-typings
+tmp
 .idea
 *.ngfactory.ts
-*.css.shim.ts
 .DS_Store

package.json

@@ -4,12 +4,13 @@
   "description": "Angular 2 AOT (Ahead Of Time) offline compilation example with Webpack",
   "main": "build/modules/main.module.js",
   "scripts": {
+    "cleanup": "rimraf src/app/**/*.ngfactory.ts src/app/**/*.shim.ts",
     "explorer": "source-map-explorer ./dist/bootstrap.bundle.js ./dist/bootstrap.bundle.js.map",
     "explorer-aot": "source-map-explorer ./dist/bootstrap.aot.bundle.js ./dist/bootstrap.aot.bundle.js.map",
     "ngc": "ngc -p ./tsconfig.aot.json",
     "serve": "http-server ./dist -a 0.0.0.0 -p 9000",
-    "start": "npm run ngc && concurrently -r \"webpack-dev-server\" \"node ./bin/ngc-watch.js\"",
-    "start-plugin": "webpack-dev-server --config webpack.aot.config.js",
+    "start": "npm run cleanup && npm run ngc && concurrently -r \"webpack-dev-server\" \"node ./bin/ngc-watch.js\"",
+    "start-plugin": "npm run cleanup && webpack-dev-server --config webpack.aot.config.js",
     "start-prod": "npm run ngc && npm run webpack-prod && npm run serve",
     "build": "npm run ngc && npm run webpack-prod",
     "deploy": "gh-pages -d dist",
@@ -45,7 +46,6 @@
     "@angular/compiler-cli": "2.2.4",
     "@angular/platform-server": "2.2.4",
     "@ngtools/webpack": "1.1.7",
-    "@types/core-js": "0.9.34",
     "@types/node": "6.0.48",
     "angular2-template-loader": "0.6.0",
     "awesome-typescript-loader": "2.2.4",
@@ -57,6 +57,7 @@
     "gh-pages": "0.12.0",
     "http-server": "0.9.0",
     "raw-loader": "0.5.1",
+    "rimraf": "2.5.4",
     "source-map-explorer": "1.3.3",
     "style-loader": "0.13.1",
     "to-string-loader": "1.1.5",

src/app/components/hello-world.component.ngfactory.ts

@@ -7,14 +7,13 @@
 
 import * as import0 from './hello-world.component';
 import * as import1 from '@angular/core/src/linker/view';
-import * as import2 from '@angular/core/src/linker/debug_context';
-import * as import3 from '@angular/core/src/render/api';
-import * as import4 from '@angular/core/src/linker/view_utils';
-import * as import5 from '@angular/core/src/metadata/view';
-import * as import6 from '@angular/core/src/linker/view_type';
-import * as import7 from '@angular/core/src/change_detection/change_detection';
-import * as import8 from '@angular/core/src/linker/component_factory';
-import * as import9 from './hello-world.style.css.shim';
+import * as import2 from '@angular/core/src/render/api';
+import * as import3 from '@angular/core/src/linker/view_utils';
+import * as import4 from '@angular/core/src/metadata/view';
+import * as import5 from '@angular/core/src/linker/view_type';
+import * as import6 from '@angular/core/src/change_detection/change_detection';
+import * as import7 from '@angular/core/src/linker/component_factory';
+import * as import8 from './hello-world.style.css.shim';
 export class Wrapper_HelloWorldComponent {
   /*private*/ _eventHandler:Function;
   context:import0.HelloWorldComponent;
@@ -42,29 +41,27 @@ export class Wrapper_HelloWorldComponent {
     this._eventHandler = _eventHandler;
   }
 }
-const nodeDebugInfos_HelloWorldComponent_Host0:import2.StaticNodeDebugInfo[] = [new import2.StaticNodeDebugInfo([import0.HelloWorldComponent],import0.HelloWorldComponent,{})];
-var renderType_HelloWorldComponent_Host:import3.RenderComponentType = import4.createRenderComponentType('',0,import5.ViewEncapsulation.None,([] as any[]),{});
-class View_HelloWorldComponent_Host0 extends import1.DebugAppView<any> {
+var renderType_HelloWorldComponent_Host:import2.RenderComponentType = import3.createRenderComponentType('',0,import4.ViewEncapsulation.None,([] as any[]),{});
+class View_HelloWorldComponent_Host0 extends import1.AppView<any> {
   _el_0:any;
   compView_0:import1.AppView<import0.HelloWorldComponent>;
   _HelloWorldComponent_0_3:Wrapper_HelloWorldComponent;
-  constructor(viewUtils:import4.ViewUtils,parentView:import1.AppView<any>,parentIndex:number,parentElement:any) {
-    super(View_HelloWorldComponent_Host0,renderType_HelloWorldComponent_Host,import6.ViewType.HOST,viewUtils,parentView,parentIndex,parentElement,import7.ChangeDetectorStatus.CheckAlways,nodeDebugInfos_HelloWorldComponent_Host0);
+  constructor(viewUtils:import3.ViewUtils,parentView:import1.AppView<any>,parentIndex:number,parentElement:any) {
+    super(View_HelloWorldComponent_Host0,renderType_HelloWorldComponent_Host,import5.ViewType.HOST,viewUtils,parentView,parentIndex,parentElement,import6.ChangeDetectorStatus.CheckAlways);
   }
-  createInternal(rootSelector:string):import8.ComponentRef<any> {
-    this._el_0 = import4.selectOrCreateRenderHostElement(this.renderer,'hello-world-app',import4.EMPTY_INLINE_ARRAY,rootSelector,this.debug(0,0,0));
+  createInternal(rootSelector:string):import7.ComponentRef<any> {
+    this._el_0 = import3.selectOrCreateRenderHostElement(this.renderer,'hello-world-app',import3.EMPTY_INLINE_ARRAY,rootSelector,(null as any));
     this.compView_0 = new View_HelloWorldComponent0(this.viewUtils,this,0,this._el_0);
     this._HelloWorldComponent_0_3 = new Wrapper_HelloWorldComponent();
     this.compView_0.create(this._HelloWorldComponent_0_3.context);
     this.init(this._el_0,((<any>this.renderer).directRenderer? (null as any): [this._el_0]),(null as any));
-    return new import8.ComponentRef_<any>(0,this,this._el_0,this._HelloWorldComponent_0_3.context);
+    return new import7.ComponentRef_<any>(0,this,this._el_0,this._HelloWorldComponent_0_3.context);
   }
   injectorGetInternal(token:any,requestNodeIndex:number,notFoundResult:any):any {
     if (((token === import0.HelloWorldComponent) && (0 === requestNodeIndex))) { return this._HelloWorldComponent_0_3.context; }
     return notFoundResult;
   }
   detectChangesInternal(throwOnChange:boolean):void {
-    this.debug(0,0,0);
     this._HelloWorldComponent_0_3.ngDoCheck(this,this._el_0,throwOnChange);
     this.compView_0.detectChanges(throwOnChange);
   }
@@ -75,27 +72,21 @@ class View_HelloWorldComponent_Host0 extends import1.DebugAppView<any> {
     cb(this._el_0,ctx);
   }
 }
-export const HelloWorldComponentNgFactory:import8.ComponentFactory<import0.HelloWorldComponent> = new import8.ComponentFactory<import0.HelloWorldComponent>('hello-world-app',View_HelloWorldComponent_Host0,import0.HelloWorldComponent);
-const styles_HelloWorldComponent:any[] = [import9.styles];
-const nodeDebugInfos_HelloWorldComponent0:import2.StaticNodeDebugInfo[] = [
-  new import2.StaticNodeDebugInfo(([] as any[]),(null as any),{}),
-  new import2.StaticNodeDebugInfo(([] as any[]),(null as any),{}),
-  new import2.StaticNodeDebugInfo(([] as any[]),(null as any),{})
-]
-;
-var renderType_HelloWorldComponent:import3.RenderComponentType = import4.createRenderComponentType('/Users/isaac/Documents/Contributions/angular2-aot-webpack/src/app/components/hello-world.template.html',0,import5.ViewEncapsulation.Emulated,styles_HelloWorldComponent,{});
-export class View_HelloWorldComponent0 extends import1.DebugAppView<import0.HelloWorldComponent> {
+export const HelloWorldComponentNgFactory:import7.ComponentFactory<import0.HelloWorldComponent> = new import7.ComponentFactory<import0.HelloWorldComponent>('hello-world-app',View_HelloWorldComponent_Host0,import0.HelloWorldComponent);
+const styles_HelloWorldComponent:any[] = [import8.styles];
+var renderType_HelloWorldComponent:import2.RenderComponentType = import3.createRenderComponentType('',0,import4.ViewEncapsulation.Emulated,styles_HelloWorldComponent,{});
+export class View_HelloWorldComponent0 extends import1.AppView<import0.HelloWorldComponent> {
   _el_0:any;
   _text_1:any;
   _text_2:any;
-  constructor(viewUtils:import4.ViewUtils,parentView:import1.AppView<any>,parentIndex:number,parentElement:any) {
-    super(View_HelloWorldComponent0,renderType_HelloWorldComponent,import6.ViewType.COMPONENT,viewUtils,parentView,parentIndex,parentElement,import7.ChangeDetectorStatus.CheckAlways,nodeDebugInfos_HelloWorldComponent0);
+  constructor(viewUtils:import3.ViewUtils,parentView:import1.AppView<any>,parentIndex:number,parentElement:any) {
+    super(View_HelloWorldComponent0,renderType_HelloWorldComponent,import5.ViewType.COMPONENT,viewUtils,parentView,parentIndex,parentElement,import6.ChangeDetectorStatus.CheckAlways);
   }
-  createInternal(rootSelector:string):import8.ComponentRef<any> {
+  createInternal(rootSelector:string):import7.ComponentRef<any> {
     const parentRenderNode:any = this.renderer.createViewRoot(this.parentElement);
-    this._el_0 = import4.createRenderElement(this.renderer,parentRenderNode,'h1',import4.EMPTY_INLINE_ARRAY,this.debug(0,0,0));
-    this._text_1 = this.renderer.createText(this._el_0,'Hello World!',this.debug(1,0,4));
-    this._text_2 = this.renderer.createText(parentRenderNode,'\n',this.debug(2,0,21));
+    this._el_0 = import3.createRenderElement(this.renderer,parentRenderNode,'h1',import3.EMPTY_INLINE_ARRAY,(null as any));
+    this._text_1 = this.renderer.createText(this._el_0,'Hello World!',(null as any));
+    this._text_2 = this.renderer.createText(parentRenderNode,'\n',(null as any));
     this.init((null as any),((<any>this.renderer).directRenderer? (null as any): [
       this._el_0,
       this._text_1,