fixing e2e bug with aot

Author: hansl

packages/webpack/src/compiler_host.ts

@@ -116,6 +116,7 @@ export class WebpackCompilerHost implements ts.CompilerHost {
     }
 
     for (const fileName of Object.keys(this._files)) {
+      console.log(1, fileName);
       const stats = this._files[fileName];
       fs._statStorage.data[fileName] = [null, stats];
       fs._readFileStorage.data[fileName] = [null, stats.content];

packages/webpack/src/loader.ts

@@ -79,15 +79,15 @@ function _replaceBootstrap(plugin: AotPlugin, refactor: TypeScriptFileRefactor)
   allCalls
     .filter(call => bootstraps.some(bs => bs == call.expression))
     .forEach((call: ts.CallExpression) => {
-      refactor.replaceNode(call.arguments[0], entryModule.className + 'NgFactory', true);
+      refactor.replaceNode(call.arguments[0], entryModule.className + 'NgFactory');
     });
 
-  calls.forEach(call => refactor.replaceNode(call.expression, 'platformBrowser', true));
+  calls.forEach(call => refactor.replaceNode(call.expression, 'platformBrowser'));
 
   bootstraps
     .forEach((bs: ts.PropertyAccessExpression) => {
       // This changes the call.
-      refactor.replaceNode(bs.name, 'bootstrapModuleFactory', true);
+      refactor.replaceNode(bs.name, 'bootstrapModuleFactory');
     });
 
   refactor.insertImport('platformBrowser', '@angular/platform-browser');

packages/webpack/src/plugin.ts

@@ -188,7 +188,7 @@ export class AotPlugin implements Tapable {
             (_: any, cb: any) => cb(null, this._lazyRoutes));
 
           return callback(null, result);
-        });
+        }).catch((err) => callback(err));
       });
     });
 
@@ -227,11 +227,6 @@ export class AotPlugin implements Tapable {
       basePath: this.basePath
     };
 
-    // Create a new Program, based on the old one. This will trigger a resolution of all
-    // transitive modules, which include files that might just have been generated.
-    this._program = ts.createProgram(
-      this._rootFilePath, this._compilerOptions, this._compilerHost, this._program);
-
     // We need to temporarily patch the CodeGenerator until either it's patched or allows us
     // to pass in our own ReflectorHost.
     let promise = Promise.resolve();
@@ -253,6 +248,14 @@ export class AotPlugin implements Tapable {
     }
 
     this._donePromise = promise
+      .then(() => {
+        // Create a new Program, based on the old one. This will trigger a resolution of all
+        // transitive modules, which include files that might just have been generated.
+        // This needs to happen after the code generator has been created for generated files
+        // to be properly resolved.
+        this._program = ts.createProgram(
+          this._rootFilePath, this._compilerOptions, this._compilerHost, this._program);
+      })
       .then(() => {
         const diagnostics = this._program.getGlobalDiagnostics();
         if (diagnostics.length > 0) {

packages/webpack/src/refactor.ts

@@ -141,8 +141,12 @@ export class TypeScriptFileRefactor {
     this._changed = true;
   }
 
-  replaceNode(node: ts.Node, replacement: string, name = false) {
-    this._sourceString.overwrite(node.getStart(this._sourceFile), node.getEnd(), replacement, name);
+  replaceNode(node: ts.Node, replacement: string) {
+    let replaceSymbolName: boolean = node.kind === ts.SyntaxKind.Identifier;
+    this._sourceString.overwrite(node.getStart(this._sourceFile),
+                                 node.getEnd(),
+                                 replacement,
+                                 replaceSymbolName);
     this._changed = true;
   }
 

packages/webpack/src/webpack.ts

@@ -1,3 +1,5 @@
+// Declarations for (some) Webpack types. Only what's needed.
+
 export interface Request {
   request?: Request;
   relativePath: string;