From f2fb4c85cf0955573f3ca62027d4f1256c1cfaa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leosvel=20P=C3=A9rez=20Espinosa?= Date: Mon, 20 Mar 2023 09:45:28 +0000 Subject: [PATCH] fix(angular): fix wrong tsconfig option name in webpack-dev-server implementation (#15765) --- .../webpack-dev-server.impl.ts | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/packages/angular/src/builders/webpack-dev-server/webpack-dev-server.impl.ts b/packages/angular/src/builders/webpack-dev-server/webpack-dev-server.impl.ts index f2a5c6bd62..60554c9131 100644 --- a/packages/angular/src/builders/webpack-dev-server/webpack-dev-server.impl.ts +++ b/packages/angular/src/builders/webpack-dev-server/webpack-dev-server.impl.ts @@ -19,6 +19,13 @@ import { from } from 'rxjs'; import { switchMap } from 'rxjs/operators'; import { getRootTsConfigPath } from 'nx/src/utils/typescript'; +type BuildTargetOptions = { + tsConfig: string; + buildLibsFromSource?: boolean; + customWebpackConfig?: { path?: string }; + indexFileTransformer?: string; +}; + export function executeWebpackDevServerBuilder( rawOptions: Schema, context: import('@angular-devkit/architect').BuilderContext @@ -38,7 +45,7 @@ export function executeWebpackDevServerBuilder( const buildTarget = browserTargetProjectConfiguration.targets[parsedBrowserTarget.target]; - const buildTargetOptions = { + const buildTargetOptions: BuildTargetOptions = { ...buildTarget.options, ...(parsedBrowserTarget.configuration ? buildTarget.configurations[parsedBrowserTarget.configuration] @@ -83,13 +90,9 @@ export function executeWebpackDevServerBuilder( let dependencies: DependentBuildableProjectNode[]; if (!buildLibsFromSource) { const { tsConfigPath, dependencies: foundDependencies } = - createTmpTsConfigForBuildableLibs( - buildTargetOptions.buildTargetTsConfigPath, - context, - { - target: parsedBrowserTarget.target, - } - ); + createTmpTsConfigForBuildableLibs(buildTargetOptions.tsConfig, context, { + target: parsedBrowserTarget.target, + }); dependencies = foundDependencies; // We can't just pass the tsconfig path in memory to the angular builder