From 480eb3eeff60d495b395e29c70a2e012bfa40bd0 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 24 Apr 2023 13:04:06 -0400
Subject: [PATCH] fix(@angular-devkit/build-angular): use preserveSymlinks
 option for tsconfigs in esbuild builder

When using the esbuild-based browser application builder, the tsconfig path will now be properly
converted to the realpath when the `preserveSymlinks` option is disabled (the default). This ensures
that TypeScript source files will be properly matched with the bundler's resolved paths when symlinks
are used and the `preserveSymlinks` option is not enabled. This is needed to properly support the use
of bazel with rules_js.
---
 .../browser-esbuild/angular/compiler-plugin.ts     | 14 +++++++++++++-
 .../src/builders/browser-esbuild/index.ts          |  1 +
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/builders/browser-esbuild/angular/compiler-plugin.ts b/packages/angular_devkit/build_angular/src/builders/browser-esbuild/angular/compiler-plugin.ts
index 8a1980363f..46f0d4eba3 100644
--- a/packages/angular_devkit/build_angular/src/builders/browser-esbuild/angular/compiler-plugin.ts
+++ b/packages/angular_devkit/build_angular/src/builders/browser-esbuild/angular/compiler-plugin.ts
@@ -16,6 +16,7 @@ import type {
   PluginBuild,
 } from 'esbuild';
 import * as assert from 'node:assert';
+import { realpath } from 'node:fs/promises';
 import { platform } from 'node:os';
 import * as path from 'node:path';
 import { pathToFileURL } from 'node:url';
@@ -167,6 +168,16 @@ export function createCompilerPlugin(
     async setup(build: PluginBuild): Promise<void> {
       let setupWarnings: PartialMessage[] | undefined = [];
 
+      const preserveSymlinks = build.initialOptions.preserveSymlinks;
+      let tsconfigPath = pluginOptions.tsconfig;
+      if (!preserveSymlinks) {
+        // Use the real path of the tsconfig if not preserving symlinks.
+        // This ensures the TS source file paths are based on the real path of the configuration.
+        try {
+          tsconfigPath = await realpath(tsconfigPath);
+        } catch {}
+      }
+
       // Initialize a worker pool for JavaScript transformations
       const javascriptTransformer = new JavaScriptTransformer(pluginOptions, maxWorkers);
 
@@ -251,7 +262,7 @@ export function createCompilerPlugin(
         const {
           affectedFiles,
           compilerOptions: { allowJs },
-        } = await compilation.initialize(pluginOptions.tsconfig, hostOptions, (compilerOptions) => {
+        } = await compilation.initialize(tsconfigPath, hostOptions, (compilerOptions) => {
           if (
             compilerOptions.target === undefined ||
             compilerOptions.target < ts.ScriptTarget.ES2022
@@ -285,6 +296,7 @@ export function createCompilerPlugin(
             inlineSourceMap: pluginOptions.sourcemap,
             mapRoot: undefined,
             sourceRoot: undefined,
+            preserveSymlinks,
           };
         });
         shouldTsIgnoreJs = !allowJs;
diff --git a/packages/angular_devkit/build_angular/src/builders/browser-esbuild/index.ts b/packages/angular_devkit/build_angular/src/builders/browser-esbuild/index.ts
index c96708f492..e3c56f69bb 100644
--- a/packages/angular_devkit/build_angular/src/builders/browser-esbuild/index.ts
+++ b/packages/angular_devkit/build_angular/src/builders/browser-esbuild/index.ts
@@ -395,6 +395,7 @@ function createCodeBundleOptions(
           externalDependencies,
           target,
           inlineStyleLanguage,
+          preserveSymlinks,
           browsers,
           tailwindConfiguration,
         },