fix: retrieve builder opts by builder context

nestjs · Jul 3, 2023 · be12359 · be12359
1 parent ee4427d
commit be12359
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/lib/compiler/helpers/get-tsc-config.path.ts b/lib/compiler/helpers/get-tsc-config.path.ts
@@ -1,5 +1,5 @@
 import { Input } from '../../../commands';
-import { Configuration, TscBuilderOptions } from '../../configuration';
+import { Builder, Configuration } from '../../configuration';
 import { getDefaultTsconfigPath } from '../../utils/get-default-tsconfig-path';
 import { getValueOrDefault } from './get-value-or-default';
 
@@ -26,11 +26,16 @@ export function getTscConfigPath(
     return tsconfigPath;
   }
 
-  tsconfigPath = getValueOrDefault<TscBuilderOptions['configPath']>(
+  const builder = getValueOrDefault<Builder>(
     configuration,
-    'compilerOptions.builder.options.configPath',
+    'compilerOptions.builder',
     appName,
   );
 
+  tsconfigPath =
+    typeof builder === 'object' && builder?.type === 'tsc'
+      ? builder.options?.configPath
+      : undefined;
+
   return tsconfigPath ?? getDefaultTsconfigPath();
 }
diff --git a/lib/compiler/helpers/get-webpack-config-path.ts b/lib/compiler/helpers/get-webpack-config-path.ts
@@ -1,5 +1,5 @@
 import { Input } from '../../../commands';
-import { Configuration, WebpackBuilderOptions } from '../../configuration';
+import { Builder, Configuration } from '../../configuration';
 import { getValueOrDefault } from './get-value-or-default';
 
 /**
@@ -25,11 +25,15 @@ export function getWebpackConfigPath(
     return webpackPath;
   }
 
-  webpackPath = getValueOrDefault<WebpackBuilderOptions['configPath']>(
+  const builder = getValueOrDefault<Builder>(
     configuration,
-    'compilerOptions.builder.options.configPath',
+    'compilerOptions.builder',
     appName,
   );
 
+  webpackPath =
+    typeof builder === 'object' && builder?.type === 'webpack'
+      ? builder.options?.configPath
+      : undefined;
   return webpackPath;
 }