fix(build): fix path error when appConfig has no main

Author: filipesilva

packages/angular-cli/models/webpack-build-common.ts

@@ -35,16 +35,17 @@ export function getWebpackCommonConfig(
 ) {
 
   const appRoot = path.resolve(projectRoot, appConfig.root);
-  const appMain = path.resolve(appRoot, appConfig.main);
   const nodeModules = path.resolve(projectRoot, 'node_modules');
 
   let extraPlugins: any[] = [];
   let extraRules: any[] = [];
   let lazyChunks: string[] = [];
 
-  let entryPoints: { [key: string]: string[] } = {
-    main: [appMain]
-  };
+  let entryPoints: { [key: string]: string[] } = {};
+
+  if (appConfig.main) {
+    entryPoints['main'] = [path.resolve(appRoot, appConfig.main)];
+  }
 
   // process global scripts
   if (appConfig.scripts && appConfig.scripts.length > 0) {

packages/angular-cli/models/webpack-config.ts

@@ -34,14 +34,14 @@ export class NgCliWebpackConfig {
     progress = true,
     deployUrl?: string
   ) {
-    const config: CliConfig = CliConfig.fromProject();
-    const appConfig = config.config.apps[0];
+    const appConfig = CliConfig.fromProject().config.apps[0];
+    const projectRoot = this.ngCliProject.root;
 
     appConfig.outDir = outputDir || appConfig.outDir;
     appConfig.deployUrl = deployUrl || appConfig.deployUrl;
 
     let baseConfig = getWebpackCommonConfig(
-      this.ngCliProject.root,
+      projectRoot,
       environment,
       appConfig,
       baseHref,
@@ -50,28 +50,28 @@ export class NgCliWebpackConfig {
       verbose,
       progress
     );
-    let targetConfigPartial = this.getTargetConfig(
-      this.ngCliProject.root, appConfig, sourcemap, verbose
-    );
-    const typescriptConfigPartial = isAoT
-      ? getWebpackAotConfigPartial(this.ngCliProject.root, appConfig, i18nFile, i18nFormat, locale)
-      : getWebpackNonAotConfigPartial(this.ngCliProject.root, appConfig);
+    let targetConfigPartial = this.getTargetConfig(projectRoot, appConfig, sourcemap, verbose);
 
     if (appConfig.mobile) {
-      let mobileConfigPartial = getWebpackMobileConfigPartial(this.ngCliProject.root, appConfig);
-      let mobileProdConfigPartial = getWebpackMobileProdConfigPartial(this.ngCliProject.root,
-                                                                      appConfig);
+      let mobileConfigPartial = getWebpackMobileConfigPartial(projectRoot, appConfig);
+      let mobileProdConfigPartial = getWebpackMobileProdConfigPartial(projectRoot, appConfig);
       baseConfig = webpackMerge(baseConfig, mobileConfigPartial);
       if (this.target == 'production') {
         targetConfigPartial = webpackMerge(targetConfigPartial, mobileProdConfigPartial);
       }
     }
 
-    this.config = webpackMerge(
-      baseConfig,
-      targetConfigPartial,
-      typescriptConfigPartial
-    );
+    let config = webpackMerge(baseConfig, targetConfigPartial);
+
+    if (appConfig.main) {
+      const typescriptConfigPartial = isAoT
+        ? getWebpackAotConfigPartial(projectRoot, appConfig, i18nFile, i18nFormat, locale)
+        : getWebpackNonAotConfigPartial(projectRoot, appConfig);
+
+      config = webpackMerge(config, typescriptConfigPartial);
+    }
+
+    this.config = config;
   }
 
   getTargetConfig(projectRoot: string, appConfig: any, sourcemap: boolean, verbose: boolean): any {

tests/e2e/tests/misc/minimal-config.ts

@@ -1,4 +1,4 @@
-import { writeFile } from '../../utils/fs';
+import { writeFile, writeMultipleFiles } from '../../utils/fs';
 import { ng } from '../../utils/process';
 
 
@@ -10,5 +10,15 @@ export default function () {
         main: 'main.ts'
       }]
     })))
+    .then(() => ng('build'))
+    .then(() => writeMultipleFiles({
+      './src/script.js': 'console.log(\'hello\')',
+      'angular-cli.json': JSON.stringify({
+        apps: [{
+          root: 'src',
+          scripts: ['./script.js']
+        }]
+      }),
+    }))
     .then(() => ng('build'));
 }