fix(angular): resolve the index html transformer correctly for esbuil…

…d based build targets in dev-server (#21679)
nrwl · Feb 8, 2024 · db4c617 · db4c617
1 parent bf45f08
commit db4c617
Showing 1 changed file with 81 additions and 51 deletions.
diff --git a/packages/angular/src/builders/dev-server/dev-server.impl.ts b/packages/angular/src/builders/dev-server/dev-server.impl.ts
@@ -24,6 +24,7 @@ import { combineLatest, from } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 import { getInstalledAngularVersionInfo } from '../../executors/utilities/angular-version-utils';
 import {
+  loadIndexHtmlTransformer,
   loadMiddleware,
   loadPlugins,
   type PluginSpec,
@@ -182,62 +183,72 @@ export function executeDevServerBuilder(
     from(
       loadMiddleware(options.esbuildMiddleware, buildTargetOptions.tsConfig)
     ),
-  ]).pipe(
-    switchMap(([{ executeDevServerBuilder }, plugins, middleware]) =>
-      executeDevServerBuilder(
-        delegateBuilderOptions,
+    from(
+      loadIndexHtmlFileTransformer(
+        pathToIndexFileTransformer,
+        buildTargetOptions.tsConfig,
         context,
-        {
-          webpackConfiguration: isUsingWebpackBuilder
-            ? async (baseWebpackConfig) => {
-                if (!buildLibsFromSource) {
-                  const workspaceDependencies = dependencies
-                    .filter((dep) => !isNpmProject(dep.node))
-                    .map((dep) => dep.node.name);
-                  // default for `nx run-many` is --all projects
-                  // by passing an empty string for --projects, run-many will default to
-                  // run the target for all projects.
-                  // This will occur when workspaceDependencies = []
-                  if (workspaceDependencies.length > 0) {
-                    baseWebpackConfig.plugins.push(
-                      // @ts-expect-error - difference between angular and webpack plugin definitions bc of webpack versions
-                      new WebpackNxBuildCoordinationPlugin(
-                        `nx run-many --target=${
-                          parsedBuildTarget.target
-                        } --projects=${workspaceDependencies.join(',')}`
-                      )
-                    );
+        isUsingWebpackBuilder
+      )
+    ),
+  ]).pipe(
+    switchMap(
+      ([
+        { executeDevServerBuilder },
+        plugins,
+        middleware,
+        indexHtmlTransformer,
+      ]) =>
+        executeDevServerBuilder(
+          delegateBuilderOptions,
+          context,
+          {
+            webpackConfiguration: isUsingWebpackBuilder
+              ? async (baseWebpackConfig) => {
+                  if (!buildLibsFromSource) {
+                    const workspaceDependencies = dependencies
+                      .filter((dep) => !isNpmProject(dep.node))
+                      .map((dep) => dep.node.name);
+                    // default for `nx run-many` is --all projects
+                    // by passing an empty string for --projects, run-many will default to
+                    // run the target for all projects.
+                    // This will occur when workspaceDependencies = []
+                    if (workspaceDependencies.length > 0) {
+                      baseWebpackConfig.plugins.push(
+                        // @ts-expect-error - difference between angular and webpack plugin definitions bc of webpack versions
+                        new WebpackNxBuildCoordinationPlugin(
+                          `nx run-many --target=${
+                            parsedBuildTarget.target
+                          } --projects=${workspaceDependencies.join(',')}`
+                        )
+                      );
+                    }
+                  }
+
+                  if (!pathToWebpackConfig) {
+                    return baseWebpackConfig;
                   }
-                }
 
-                if (!pathToWebpackConfig) {
-                  return baseWebpackConfig;
+                  return mergeCustomWebpackConfig(
+                    baseWebpackConfig,
+                    pathToWebpackConfig,
+                    buildTargetOptions,
+                    context.target
+                  );
                 }
+              : undefined,
 
-                return mergeCustomWebpackConfig(
-                  baseWebpackConfig,
-                  pathToWebpackConfig,
-                  buildTargetOptions,
-                  context.target
-                );
-              }
-            : undefined,
-
-          ...(pathToIndexFileTransformer
-            ? {
-                indexHtml: resolveIndexHtmlTransformer(
-                  pathToIndexFileTransformer,
-                  buildTargetOptions.tsConfig,
-                  context.target
-                ),
-              }
-            : {}),
-        },
-        {
-          buildPlugins: plugins,
-          middleware,
-        }
-      )
+            ...(indexHtmlTransformer
+              ? {
+                  indexHtml: indexHtmlTransformer,
+                }
+              : {}),
+          },
+          {
+            buildPlugins: plugins,
+            middleware,
+          }
+        )
     )
   );
 }
@@ -267,6 +278,25 @@ function getDelegateBuilderOptions(
   return delegateBuilderOptions;
 }
 
+async function loadIndexHtmlFileTransformer(
+  pathToIndexFileTransformer: string | undefined,
+  tsConfig: string,
+  context: BuilderContext,
+  isUsingWebpackBuilder: boolean
+) {
+  if (!pathToIndexFileTransformer) {
+    return undefined;
+  }
+
+  return isUsingWebpackBuilder
+    ? resolveIndexHtmlTransformer(
+        pathToIndexFileTransformer,
+        tsConfig,
+        context.target
+      )
+    : await loadIndexHtmlTransformer(pathToIndexFileTransformer, tsConfig);
+}
+
 const executorToBuilderMap = new Map<string, string>([
   [
     '@nx/angular:browser-esbuild',