@ngtools/webpack: honor tsconfig#angularCompilerOptions.entryModule before falling back to resolveEntryModuleFromMain()

Author: tsabirgaliev

packages/@ngtools/webpack/src/plugin.ts

@@ -167,13 +167,14 @@ 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 (this._angularCompilerOptions.entryModule) {
+      this._entryModule = path.resolve(this._basePath, this._angularCompilerOptions.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')) {