From dff05dcbde8fd2ba75c99db478c61ec02e6285c7 Mon Sep 17 00:00:00 2001
From: Matthias Stemmler <matthias.stemmler@tngtech.com>
Date: Fri, 18 Mar 2022 21:21:56 +0100
Subject: [PATCH] fix(web): fix handling of buildLibsFromSource: false in
 dev-server executor (#9326)

* modify buildOptions.tsConfig before creating Webpack config
* do not join buildOptions.tsConfig to root path as it is already an absolute path
---
 .../executors/dev-server/dev-server.impl.ts   | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/packages/web/src/executors/dev-server/dev-server.impl.ts b/packages/web/src/executors/dev-server/dev-server.impl.ts
index 3d18d5080e78d..147f9309eddb4 100644
--- a/packages/web/src/executors/dev-server/dev-server.impl.ts
+++ b/packages/web/src/executors/dev-server/dev-server.impl.ts
@@ -1,7 +1,6 @@
 import * as webpack from 'webpack';
 import {
   ExecutorContext,
-  joinPathFragments,
   parseTargetString,
   readTargetOptions,
 } from '@nrwl/devkit';
@@ -51,6 +50,23 @@ export default async function* devServerExecutor(
     context.root,
     sourceRoot
   );
+
+  if (!buildOptions.buildLibsFromSource) {
+    const { target, dependencies } = calculateProjectDependencies(
+      readCachedProjectGraph(),
+      context.root,
+      context.projectName,
+      'build', // should be generalized
+      context.configurationName
+    );
+    buildOptions.tsConfig = createTmpTsConfig(
+      buildOptions.tsConfig,
+      context.root,
+      target.data.root,
+      dependencies
+    );
+  }
+
   let webpackConfig = getDevServerConfig(
     context.root,
     projectRoot,
@@ -71,22 +87,6 @@ export default async function* devServerExecutor(
     });
   }
 
-  if (!buildOptions.buildLibsFromSource) {
-    const { target, dependencies } = calculateProjectDependencies(
-      readCachedProjectGraph(),
-      context.root,
-      context.projectName,
-      'build', // should be generalized
-      context.configurationName
-    );
-    buildOptions.tsConfig = createTmpTsConfig(
-      joinPathFragments(context.root, buildOptions.tsConfig),
-      context.root,
-      target.data.root,
-      dependencies
-    );
-  }
-
   return yield* eachValueFrom(
     runWebpackDevServer(webpackConfig, webpack, WebpackDevServer).pipe(
       tap(({ stats }) => {