Add more detailed error message around platform creation failure

Author: clbond

examples/cli/package.json

@@ -24,6 +24,8 @@
     "@angular/platform-browser-dynamic": "4.2.2",
     "@angular/router": "4.2.2",
     "@angular/tsc-wrapped": "4.2.2",
+    "@types/node": "^6.0.60",
+    "codelyzer": "^2.0.0",
     "angular-ssr": "latest",
     "classlist.js": "^1.1.20150312",
     "core-js": "^2.4.1",
@@ -32,15 +34,13 @@
     "live-server": "^1.2.0",
     "preboot": "^4.5.2",
     "reflect-metadata": "^0.1.10",
-    "rxjs": "^5.1.0",
+    "rxjs": "^5.4.1",
+    "ts-node": "^2.0.0",
+    "tslint": "^4.5.0",
+    "typescript": "2.3.2",
     "web-animations-js": "^2.2.2",
     "zone.js": "^0.8.4"
   },
   "devDependencies": {
-    "@types/node": "~6.0.60",
-    "codelyzer": "~2.0.0",
-    "ts-node": "~2.0.0",
-    "tslint": "~4.5.0",
-    "typescript": "~2.2.0"
   }
 }

examples/demand-express/app/blog/service.ts

@@ -10,7 +10,7 @@ import {Blog} from './model';
 export class BlogService {
   constructor(private http: Http) {}
 
-  load(locale: string): Observable<ArrayLike<Blog>> {
+  load(locale: string): Observable<Array<Blog>> {
     return this.http.get('https://raw.githubusercontent.com/clbond/angular-ssr/master/examples/demand-express/mock-content.json').map(r => r.json()).map(c => c[locale]);
   }
-}
+}

examples/demand-express/app/locale/service.ts

@@ -16,7 +16,7 @@ export class LocaleService {
     if (locale) {
       this.update(locale);
     }
-    return this.subject;
+    return Observable.from(this.subject);
   }
 
   private update(value: string) {

examples/demand-express/package.json

@@ -53,7 +53,7 @@
     "to-string-loader": "^1.1.5",
     "ts-loader": "^2.0.3",
     "ts-node": "^3.0.2",
-    "typescript": "^2.2.1",
+    "typescript": "2.3.2",
     "webpack": "^2.2.1",
     "zone.js": "^0.8.5"
   }

examples/demand-express/server/http.ts

@@ -15,7 +15,7 @@ export const configure = (http: express.Application): void => {
 };
 
 export const listen = (http: express.Application): Promise<number> => {
-  const port = process.env.PORT || 8080;
+  const port: number = process.env.PORT ? parseInt(process.env.PORT, 10) : 8080;
 
   return new Promise<number>((resolve, reject) => {
     http.listen(port, err => {
@@ -35,4 +35,4 @@ export const absoluteUri = (request: express.Request): string => {
     host: request.get('host'),
     pathname: request.originalUrl
   });
-};
+};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-ssr",
-  "version": "0.10.23",
+  "version": "0.10.29",
   "description": "Angular server-side rendering implementation",
   "main": "build/index.js",
   "typings": "build/index.d.ts",
@@ -66,9 +66,9 @@
     "@angular/tsc-wrapped": ">=4.2.2 <5.0.0",
     "@angular/service-worker": ">=1.0.0 || >=1.0.0-beta.8",
     "reflect-metadata": ">=0.1.10",
-    "rxjs": ">=5.0.1",
+    "rxjs": "^5.4.1",
     "zone.js": ">=0.8",
-    "typescript": ">=2.3.2",
+    "typescript": "~2.3.2",
     "webpack": ">=2.3.0"
   },
   "dependencies": {
@@ -88,10 +88,11 @@
     "npm-run-all": "^4.0.2",
     "preboot": "^4.5.2",
     "rimraf": "2.5.4",
-    "rxjs": ">=5.0.1",
+    "rxjs": "^5.4.1",
     "scoped-logger": "^0.0.19",
     "source-map-support": ">=0.1.0",
     "symbol-observable": "^1.0.4",
+    "typescript": "2.3.2",
     "xhr2": "^0.1.4"
   },
   "devDependencies": {
@@ -114,7 +115,6 @@
     "reflect-metadata": ">=0.1.10",
     "ts-jest": "^20.0.4",
     "tslint": "4.4.2",
-    "typescript": ">=2.3.2",
     "webpack": ">=2.4.1",
     "zone.js": ">=0.8.9"
   },
@@ -147,7 +147,9 @@
     ],
     "verbose": true,
     "cacheDirectory": ".jest-cache",
-    "coveragePathIgnorePatterns": [".*\\.(shim\\.ngstyle|ngfactory)\\.ts"],
+    "coveragePathIgnorePatterns": [
+      ".*\\.(shim\\.ngstyle|ngfactory)\\.ts"
+    ],
     "globals": {
       "__TS_CONFIG__": "tsconfig.json"
     }

source/application/builder/impl/application.ts

@@ -87,7 +87,7 @@ export class ApplicationImpl<V, M> implements Application<V> {
 
     Promise.all(promises).then(() => subject.complete());
 
-    return subject;
+    return Observable.from(subject);
   }
 
   private async renderVariant(operation: RenderVariantOperation<V>): Promise<Snapshot<V>> {

source/application/compiler/webpack/compiler.ts

@@ -1,5 +1,7 @@
 import webpack = require('webpack');
 
+import chalk = require('chalk');
+
 import {sep} from 'path';
 
 import {createProgram} from 'typescript';
@@ -19,7 +21,16 @@ export class WebpackCompiler implements ApplicationCompiler {
   constructor(private project: Project, private loader: ConfigurationLoader) {}
 
   createPlatform(providers: Array<Provider>) {
-    return createJitPlatform(providers) as ServerPlatform;
+    try {
+      return createJitPlatform(providers) as ServerPlatform;
+    }
+    catch (exception) {
+      console.error(chalk.red(`Platform creation failed: this happens when you try to use ${chalk.green('@ngtools/webpack')} during an ng-render build`));
+      console.error(`Please verify that you are using a regular TypeScript loader, eg ${chalk.green("['ts-loader', 'angular2-template-loader', 'angular-router-loader']")}`);
+      console.error('This may not be related to your issue, but this a typical cause of this particular exception.');
+
+      throw new CompilerException('Failed to create platform instance', exception);
+    }
   }
 
   compile(): Promise<ModuleLoader> {

source/platform/http/pending-requests.ts

@@ -15,6 +15,6 @@ export class PendingRequests {
   }
 
   requestsPending(): Observable<number> {
-    return this.subject;
+    return Observable.from(this.subject);
   }
 }

source/platform/platform.ts

@@ -4,6 +4,7 @@ import {
   CompilerOptions,
   Injectable,
   Injector,
+  Inject,
   NgModuleFactory,
   NgModuleRef,
   NgZone,
@@ -24,7 +25,7 @@ export class ServerPlatform implements PlatformRef {
 
   private destroyers = new Array<() => void>();
 
-  constructor(public injector: Injector) {}
+  constructor(@Inject(Injector) public injector: Injector) {}
 
   compileModule<M>(moduleType: Type<M>, compilerOptions: CompilerOptions | Array<CompilerOptions> = []): Promise<NgModuleFactory<M>> {
     const compiler = this.getCompiler(compilerOptions);
@@ -100,8 +101,3 @@ export class ServerPlatform implements PlatformRef {
     destroyers.forEach(handler => handler());
   }
 }
-
-Object.assign(ServerPlatform, {
-  decorators: [{type: Injectable}],
-  ctorParameters: () => [{type: Injector}]
-});