Resolve some issues which prevented the CLI app from working properly on new "ng new" projects

Author: clbond

.gitignore

@@ -4,6 +4,8 @@ node_modules
 
 yarn-error.log
 
+nohup.out
+
 **/*.orig
 **/*.rej
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-ssr",
-  "version": "0.0.0",
+  "version": "0.0.5",
   "description": "Angular server-side rendering implementation",
   "main": "build/index.js",
   "typings": "build/index.d.ts",
@@ -48,9 +48,9 @@
     "@angular/platform-browser": ">=2.3.1 <4.0.0",
     "@angular/router": ">=3.4 <4.0.0",
     "@angular/tsc-wrapped": ">=0.5 <1.0.0",
-    "reflect-metadata": "^0.1",
+    "reflect-metadata": ">0.0.0",
     "zone.js": "^0.7",
-    "typescript": "^2.2.0"
+    "typescript": "~2.0.0"
   },
   "optionalPeerDependencies": {
     "@ngrx/store": "^2.2.1"
@@ -73,7 +73,7 @@
     "rxjs": "5.1.0",
     "scoped-logger": "^0.0.19",
     "source-map-support": "0.4.11",
-    "typescript": "2.2.0"
+    "typescript": "~2.2.0"
   },
   "devDependencies": {
     "@angular/common": ">=2.3.1 <4.0.0",
@@ -123,5 +123,8 @@
     "source",
     "tsconfig.json",
     "tslint.json"
-  ]
+  ],
+  "publishConfig": {
+    "registry": "http://localhost:4873/"
+  }
 }

source/application/compiler/build.ts

@@ -15,7 +15,7 @@ export class ApplicationBuild implements Disposable {
       return;
     }
 
-    for (const sourceFile of sourceFiles) {
+    for (const sourceFile of sourceFiles.filter(sf => sf != null)) {
       const array = this.sourceArray(sourceFile.fileName);
       array.push(filename);
     }

source/application/compiler/factory.ts

@@ -17,6 +17,9 @@ export const getCompilableProgram = (project: Project): CompilableProgram => {
 
   const {parsed, ngOptions} = tsc.readConfiguration(project.tsconfig, project.basePath);
 
+  parsed.options.declaration = true;
+
+  ngOptions.declaration = true;
   ngOptions.basePath = project.basePath;
   ngOptions.generateCodeForLibraries = true;
 
@@ -35,7 +38,7 @@ export const getCompilableProgram = (project: Project): CompilableProgram => {
 
 export const adjustOptions = (baseOptions?: CompilerOptions): CompilerOptions => {
   return Object.assign({}, baseOptions, {
-    declaration: false,
+    declaration: true,
     module: ModuleKind.CommonJS,
     moduleResolution: ModuleResolutionKind.NodeJs,
     noEmitHelpers: false,

source/bin/options.ts

@@ -49,7 +49,13 @@ export const commandLineToOptions = (): CommandLineOptions => {
     throw new ConfigurationException(`HTML template document does not exist: ${options['template']}`);
   }
 
-  const output = pathFromString(options['output']);
+  let outputString = options['output'];
+
+  if (/^(\\|\/)/.test(outputString) === false) {
+    outputString = join(process.cwd(), outputString);
+  }
+
+  const output = pathFromString(outputString);
 
   return {output, project, templateDocument: template.content()};
 };

source/bin/render.ts

@@ -1,3 +1,5 @@
+import 'reflect-metadata';
+
 import '../dependencies';
 
 import {ApplicationRenderer, ApplicationFromSource} from '../application';

source/dependencies.ts

@@ -1,6 +1,4 @@
-import 'reflect-metadata';
-
 import 'zone.js/dist/zone-node';
 import 'zone.js/dist/long-stack-trace-zone';
 
-import './runtime';
+import './runtime';

source/exception.ts

@@ -2,13 +2,13 @@ import {EOL} from 'os';
 
 export class Exception extends Error {
   constructor(msg: string, public innerException?: Error) {
-    super(innerException ? `${msg} -> ${innerException.toString()}` : msg);
+    super(innerException ? `${msg} -> ${innerException.stack}` : msg);
  }
 }
 
 export class AggregateException extends Exception {
   constructor(public exceptions: Array<Exception | Error>) {
-    super(`Multiple exceptions occurred (${exceptions.length}) [${exceptions.map(e => e.toString()).join(', ')}]`);
+    super(`Multiple exceptions occurred (${exceptions.length}) [${exceptions.map(e => e.stack).join(', ')}]`);
   }
 
   get stack(): string {

source/platform/location/location.ts

@@ -1,5 +1,3 @@
-import 'reflect-metadata';
-
 import {
   Inject,
   Injectable,

source/transpile/transpilers.ts

@@ -64,7 +64,12 @@ export const transformRequires = (source: string): string =>
 export const transformImports = (source: string): string =>
   source.replace(/from ['"]@angular\/([^\/'"]+)['"]/g, 'from "@angular/$1/index"');
 
-export const debundleImport = (moduleId: string): string => moduleId.replace(/@angular\/([^\/]+)$/, '@angular/$1/index');
+export const debundleImport = (moduleId: string): string => {
+  if (moduleId.endsWith('.js')) {
+    return moduleId.replace(/@angular\/([^\/]+)\/bundles\/([^\/]+).umd.js/, '@angular/$1/index.js');
+  }
+  return moduleId.replace(/@angular\/([^\/]+)$/, '@angular/$1/index');
+};
 
 export const transpile = (transpilers: Array<TranspileDescriptor>, module: NodeModule, basePath?: string): string => {
   for (const transpiler of transpilers) {
@@ -78,6 +83,10 @@ export const transpile = (transpilers: Array<TranspileDescriptor>, module: NodeM
       }
     }
 
+    if (transpiler.moduleTranslator) {
+      module.filename = require.resolve(transpiler.moduleTranslator(module.id || module.filename));
+    }
+
     const file = fileFromString(module.filename);
 
     const content = file.content();