fix(@ngtools/webpack): honor tsconfig#angularCompilerOptions.entryMod…

…ule before trying to resolveEntryModuleFromMain() (#4013)
angular · Jan 15, 2017 · c9ac263 · c9ac263
1 parent 5a27fdb
commit c9ac263
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/packages/@ngtools/webpack/src/plugin.ts b/packages/@ngtools/webpack/src/plugin.ts
@@ -167,13 +167,16 @@ export class AotPlugin implements Tapable {
 
     if (options.entryModule) {
       this._entryModule = options.entryModule;
-    } else {
-      if (options.mainPath) {
-        this._entryModule = resolveEntryModuleFromMain(options.mainPath, this._compilerHost,
-          this._program);
-      } else {
-        this._entryModule = (tsConfig.raw['angularCompilerOptions'] as any).entryModule;
-      }
+    } else if ((tsConfig.raw['angularCompilerOptions'] as any)
+            && (tsConfig.raw['angularCompilerOptions'] as any).entryModule) {
+      this._entryModule = path.resolve(this._basePath,
+        (tsConfig.raw['angularCompilerOptions'] as any).entryModule);
+    }
+
+    // still no _entryModule? => try to resolve from mainPath
+    if (!this._entryModule && options.mainPath) {
+      this._entryModule = resolveEntryModuleFromMain(options.mainPath, this._compilerHost,
+        this._program);
     }
 
     if (options.hasOwnProperty('i18nFile')) {