Bring into compatibility with Angular 4.2.2

Author: clbond

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-ssr",
-  "version": "0.10.11",
+  "version": "0.10.12",
   "description": "Angular server-side rendering implementation",
   "main": "build/index.js",
   "typings": "build/index.d.ts",
@@ -55,21 +55,21 @@
   },
   "peerDependencies": {
     "@angular/cli": ">=1.1.0",
-    "@angular/common": ">=4.0.0 <5.0.0",
-    "@angular/compiler": ">=4.0.0 <5.0.0",
-    "@angular/compiler-cli": ">=4.0.0 <5.0.0",
-    "@angular/core": ">=4.0.0 <5.0.0",
-    "@angular/forms": ">=4.0.0 <5.0.0",
-    "@angular/http": ">=4.0.0 <5.0.0",
-    "@angular/platform-browser": ">=4.0.0 <5.0.0",
-    "@angular/router": ">=4.0.0 <5.0.0",
-    "@angular/tsc-wrapped": ">=4.0.0 <5.0.0",
+    "@angular/common": ">=4.2.0 <5.0.0",
+    "@angular/compiler": ">=4.2.0 <5.0.0",
+    "@angular/compiler-cli": ">=4.2.0 <5.0.0",
+    "@angular/core": ">=4.2.0 <5.0.0",
+    "@angular/forms": ">=4.2.0 <5.0.0",
+    "@angular/http": ">=4.2.0 <5.0.0",
+    "@angular/platform-browser": ">=4.2.0 <5.0.0",
+    "@angular/router": ">=4.2.0 <5.0.0",
+    "@angular/tsc-wrapped": ">=4.2.0 <5.0.0",
     "@angular/service-worker": ">=1.0.0 || >=1.0.0-beta.8",
-    "reflect-metadata": "^0.1.10",
-    "rxjs": "^5.0.1",
-    "zone.js": "^0.8",
+    "reflect-metadata": ">=0.1.10",
+    "rxjs": ">=5.0.1",
+    "zone.js": ">=0.8",
     "typescript": ">=2.1.0",
-    "webpack": "^2.3.3"
+    "webpack": ">=2.3.0"
   },
   "dependencies": {
     "@angular/cli": ">=1.1.0",
@@ -88,7 +88,7 @@
     "npm-run-all": "^4.0.2",
     "preboot": "^4.5.2",
     "rimraf": "2.5.4",
-    "rxjs": "^5.0.1",
+    "rxjs": ">=5.0.1",
     "scoped-logger": "^0.0.19",
     "source-map-support": ">=0.1.0",
     "symbol-observable": "^1.0.4",
@@ -111,12 +111,12 @@
     "jasmine": "^2.6.0",
     "jasmine-core": "2.6.1",
     "jest": "^20.0.4",
-    "reflect-metadata": "^0.1.10",
+    "reflect-metadata": ">=0.1.10",
     "ts-jest": "^20.0.4",
     "tslint": "4.4.2",
     "typescript": ">=2.2.0",
-    "webpack": "^2.4.1",
-    "zone.js": "^0.8.9"
+    "webpack": ">=2.4.1",
+    "zone.js": ">=0.8.9"
   },
   "jest": {
     "automock": false,

source/application/compiler/ngc/compiler.ts

@@ -1,6 +1,6 @@
 import {Provider} from '@angular/core';
 
-import {AotCompiler} from '@angular/compiler';
+import {toTypeScript} from '@angular/compiler';
 
 import {MetadataWriterHost} from '@angular/tsc-wrapped';
 
@@ -35,8 +35,8 @@ import {projectToOptions, loadApplicationModule} from '../options';
 export class NgcCompiler implements ApplicationCompiler {
   constructor(private project: Project) {}
 
-  createPlatform(providers: Array<Provider>) {
-    return createStaticPlatform(providers) as ServerPlatform;
+  createPlatform(providers: Array<Provider>): ServerPlatform {
+    return createStaticPlatform(providers) as any;
   }
 
   async compile(): Promise<ModuleLoader> {
@@ -110,18 +110,22 @@ export class NgcCompiler implements ApplicationCompiler {
     return build;
   }
 
-  private async generateTemplateCode(compilerHost: CompilerHost, ngCompilerHost: AngularCompilerHost, compiler: AotCompiler, program: Program, build: Build) {
+  private async generateTemplateCode(compilerHost: CompilerHost, ngCompilerHost: AngularCompilerHost, compiler, program: Program, build: Build) {
     const filenames = program.getSourceFiles().map(sf => ngCompilerHost.getCanonicalFileName(sf.fileName));
 
-    const generatedModules = await compiler.compileAll(filenames);
+    const analyzedModules = await compiler.analyzeModulesAsync(filenames);
+
+    const generatedModules = compiler.emitAllImpls(analyzedModules);
 
     return generatedModules.map(
       generatedModule => {
         const sourceFile = program.getSourceFile(generatedModule.srcFileUrl);
 
         const emitPath = ngCompilerHost.calculateEmitPath(generatedModule.genFileUrl);
 
-        compilerHost.writeFile(emitPath, generatedModule.source, false, function () {}, [sourceFile]);
+        const source = generatedModule.source || toTypeScript(generatedModule, String());
+
+        compilerHost.writeFile(emitPath, source, false, function () {}, [sourceFile]);
 
         build.emit(emitPath, [sourceFile]);
 

source/application/compiler/ngc/tests/compiler.ts

@@ -19,14 +19,14 @@ describe('NgcCompiler', () => {
     const module = await loader.lazy({source: 'source/test/fixtures/application-basic-external', symbol: 'BasicExternalModule'});
     expect(module).not.toBeNull();
     expect(typeof module).toBe('object');
-    expect(module.constructor.name).toBe('NgModuleFactory');
+    expect(/NgModuleFactory/.test(module.constructor.name)).toBeTruthy();
   });
 
   it('can build application with lazy routes into executable NgModuleFactory', async () => {
     const module = await loader.lazy({source: 'source/test/fixtures/application-routed', symbol: 'BasicRoutedModule'});
     expect(module).not.toBeNull();
     expect(typeof module).toBe('object');
-    expect(module.constructor.name).toBe('NgModuleFactory');
+    expect(/NgModuleFactory/.test(module.constructor.name)).toBeTruthy();
   });
 
   afterEach(() => {

source/platform/application/bootstrap.ts

@@ -38,7 +38,7 @@ export const bootstrapModule = <M>(zone: NgZone, moduleRef: NgModuleRef<M>): Pro
 
     const applicationRef: ApplicationRef = moduleRef.injector.get(ApplicationRef);
 
-    const {bootstrapFactories, instance: {ngDoBootstrap}} = <any> moduleRef;
+    const {_bootstrapComponents, instance: {ngDoBootstrap}} = <any> moduleRef;
 
     const location = moduleRef.injector.get(PlatformLocation) as LocationImpl;
 
@@ -51,8 +51,8 @@ export const bootstrapModule = <M>(zone: NgZone, moduleRef: NgModuleRef<M>): Pro
     }
 
     applicationInit.donePromise.then(() => {
-      if (bootstrapFactories.length > 0) {
-        for (const component of bootstrapFactories) {
+      if (_bootstrapComponents.length > 0) {
+        for (const component of _bootstrapComponents) {
           applicationRef.bootstrap(component);
         }
         resolve();

source/platform/platform.ts

@@ -34,17 +34,17 @@ export class ServerPlatform implements PlatformRef {
   }
 
   async bootstrapModule<M>(moduleType: Type<M>, compilerOptions: CompilerOptions | Array<CompilerOptions> = [], providers?: Array<Provider>): Promise<NgModuleRef<M>> {
-    const moduleFactory = await this.compileModule(moduleType, compilerOptions);
+    const module = await this.compileModule(moduleType, compilerOptions);
 
-    return await this.bootstrapModuleFactory(moduleFactory, providers);
+    return await this.bootstrapModuleFactory(module, providers);
   }
 
-  async bootstrapModuleFactory<M>(moduleFactory: NgModuleFactory<M>, providers?: Array<Provider>, bootstrap?: (moduleRef: NgModuleRef<M>) => void | Promise<void>): Promise<NgModuleRef<M>> {
+  async bootstrapModuleFactory<M>(module: NgModuleFactory<M>, providers?: Array<Provider>, bootstrap?: (moduleRef: NgModuleRef<M>) => void | Promise<void>): Promise<NgModuleRef<M>> {
     const zone = new NgZone({enableLongStackTrace: true});
 
     const injector = createPlatformInjector(this.injector, zone, providers);
 
-    const moduleRef = createInjector(injector, moduleFactory);
+    const moduleRef = module.create(injector);
 
     const unmap = mapZoneToInjector(Zone.current, moduleRef.injector);
 
@@ -54,8 +54,6 @@ export class ServerPlatform implements PlatformRef {
       this.references.delete(moduleRef);
     });
 
-    moduleRef.create();
-
     if (typeof bootstrap === 'function') {
       await Promise.resolve(bootstrap(moduleRef));
     }
@@ -103,11 +101,3 @@ export class ServerPlatform implements PlatformRef {
     destroyers.forEach(handler => handler());
   }
 }
-
-type InstantiableModule<M> = NgModuleRef<M> & {create: () => void};
-
-// It would be great if we did not have to access this private member, but the fact is we need a reference to the
-// injector instance before create() is called on it, so that we can apply the zone mapping before any instantiation
-// of modules or components happens. Otherwise, if someone attempts to start an HTTP request from inside of a module
-// constructor it will fail with nasty messages about how there is no zone mapping.
-const createInjector = <M>(injector: Injector, moduleFactory: NgModuleFactory<M>): InstantiableModule<M> => new moduleFactory['_injectorClass'](injector);

source/snapshot/creator/preboot.ts

@@ -24,22 +24,23 @@ export const injectPreboot = <M>(moduleRef: NgModuleRef<M>, vop: RenderVariantOp
 
   const autodetect = noSeparateRoots === true && noSingleRoot === true;
   if (autodetect) {
-    const {bootstrapFactories} = moduleRef as {bootstrapFactories?};
+    const {_bootstrapComponents} = moduleRef as {_bootstrapComponents?};
 
-    if (bootstrapFactories == null || bootstrapFactories.length === 0) {
+    if (_bootstrapComponents == null || _bootstrapComponents.length === 0) {
       throw new ConfigurationException(`Cannot auto-detect preboot root because no components are defined in module 'bootstrap' properties`);
     }
 
     const selectors = c => {
-      if (c.factory == null ||
-          c.factory.selector == null ||
-          c.factory.selector.length === 0) {
+      const component = Reflect.getOwnMetadata('annotations', c).find(c => c.toString() === '@Component');
+      if (component == null ||
+          component.selector == null ||
+          component.selector.length === 0) {
         return null;
       }
-      return c.factory.selector.split(/[\s,]/g).filter(v => v);
+      return component.selector.split(/[\s,]/g).filter(v => v);
     };
 
-    preboot.appRoot = flatten<string>(bootstrapFactories.map(selectors)).filter(v => v);
+    preboot.appRoot = flatten<string>(_bootstrapComponents.map(selectors)).filter(v => v);
   }
 
   const container = moduleRef.injector.get(DocumentContainer);