Merge pull request #2627 from micalevisk/fix-issue-2421

fix: propagate errors raised when loading the webpack configuration file

Author: kamilmysliwiec

actions/build.action.ts

@@ -22,6 +22,7 @@ import {
 } from '../lib/configuration/defaults';
 import { FileSystemReader } from '../lib/readers';
 import { ERROR_PREFIX } from '../lib/ui';
+import { isModuleAvailable } from '../lib/utils/is-module-available';
 import { AbstractAction } from './abstract.action';
 import webpack = require('webpack');
 
@@ -261,13 +262,10 @@ export class BuildAction extends AbstractAction {
     webpackRef: typeof webpack,
   ) => webpack.Configuration {
     const pathToWebpackFile = join(process.cwd(), webpackPath);
-    try {
-      return require(pathToWebpackFile);
-    } catch (err) {
-      if (webpackPath !== defaultPath) {
-        throw err;
-      }
+    const isWebpackFileAvailable = isModuleAvailable(pathToWebpackFile);
+    if (!isWebpackFileAvailable && webpackPath === defaultPath) {
       return ({}) => ({});
     }
+    return require(pathToWebpackFile);
   }
 }

lib/compiler/assets-manager.ts

@@ -60,10 +60,13 @@ export class AssetsManager {
 
       const filesToCopy = assets.map<AssetEntry>((item) => {
         let includePath = typeof item === 'string' ? item : item.include!;
-        let excludePath = typeof item !== 'string' && item.exclude ? item.exclude : undefined;
+        let excludePath =
+          typeof item !== 'string' && item.exclude ? item.exclude : undefined;
 
         includePath = join(sourceRoot, includePath).replace(/\\/g, '/');
-        excludePath = excludePath ? join(sourceRoot, excludePath).replace(/\\/g, '/') : undefined;
+        excludePath = excludePath
+          ? join(sourceRoot, excludePath).replace(/\\/g, '/')
+          : undefined;
 
         return {
           outDir: typeof item !== 'string' ? item.outDir || outDir : outDir,

lib/utils/is-module-available.ts

@@ -0,0 +1,8 @@
+export function isModuleAvailable(path: string): boolean {
+  try {
+    require.resolve(path);
+    return true;
+  } catch {
+    return false;
+  }
+}