fixup! perf(@angular/build): replace watchpack with @parcel/watcher and chokidar

Author: clydin

packages/angular/build/src/builders/application/execute-build.ts

@@ -104,7 +104,10 @@ export async function executeBuild(
       bundlingResult = BundlerContext.mergeResults([bundlingResult, ...typescriptResults]);
     } else {
       const target = transformSupportedBrowsersToTargets(browsers);
-      codeBundleCache = new SourceFileCache(cacheOptions.enabled ? cacheOptions.path : undefined);
+      codeBundleCache = new SourceFileCache(
+        cacheOptions.enabled ? cacheOptions.path : undefined,
+        options.workspaceRoot,
+      );
       componentStyleBundler = createComponentStyleBundler(options, target);
       if (options.templateUpdates) {
         templateUpdates = new Map<string, string>();

packages/angular/build/src/builders/application/options.ts

@@ -160,7 +160,7 @@ export async function normalizeOptions(
     options.preserveSymlinks ?? process.execArgv.includes('--preserve-symlinks');
 
   // Setup base paths based on workspace root and project information
-  const workspaceRoot = canonicalizePath(context.workspaceRoot, preserveSymlinks);
+  const workspaceRoot = canonicalizePath(context.workspaceRoot);
   const projectMetadata = await context.getProjectMetadata(projectName);
   const { projectRoot, projectSourceRoot } = getProjectRootPaths(workspaceRoot, projectMetadata);
 

packages/angular/build/src/builders/unit-test/options.ts

@@ -58,7 +58,7 @@ export async function normalizeOptions(
       : process.execArgv.includes('--preserve-symlinks');
 
   // Setup base paths based on workspace root and project information
-  const workspaceRoot = canonicalizePath(context.workspaceRoot, preserveSymlinks);
+  const workspaceRoot = canonicalizePath(context.workspaceRoot);
 
   const projectMetadata = await context.getProjectMetadata(projectName);
   const { projectRoot, projectSourceRoot } = getProjectRootPaths(workspaceRoot, projectMetadata);

packages/angular/build/src/tools/esbuild/angular/source-file-cache.ts

@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
+import { realpathSync } from 'node:fs';
 import { platform } from 'node:os';
 import * as path from 'node:path';
 import type ts from 'typescript';
@@ -18,11 +19,25 @@ export class SourceFileCache extends Map<string, ts.SourceFile> {
   readonly modifiedFiles = new Set<string>();
   readonly typeScriptFileCache = new Map<string, string | Uint8Array>();
   readonly loadResultCache = new MemoryLoadResultCache();
+  private readonly rootDir?: string;
+  private readonly realRootDir?: string;
 
   referencedFiles?: readonly string[];
 
-  constructor(readonly persistentCachePath?: string) {
+  constructor(
+    readonly persistentCachePath?: string,
+    workspaceRoot?: string,
+  ) {
     super();
+    const root = workspaceRoot ?? process.cwd();
+    try {
+      const normRoot = path.normalize(root);
+      const real = path.normalize(realpathSync(normRoot));
+      if (real !== normRoot) {
+        this.rootDir = normRoot;
+        this.realRootDir = real;
+      }
+    } catch {}
   }
 
   invalidate(files: Iterable<string>): boolean {
@@ -45,6 +60,16 @@ export class SourceFileCache extends Map<string, ts.SourceFile> {
 
       invalid = this.delete(file) || invalid;
       this.modifiedFiles.add(file);
+
+      // Invalidate the realpath variant if TypeScript stored the SourceFile under its realpath
+      // (e.g. dynamically imported modules where TS module resolution resolved symlinked root directories).
+      if (this.rootDir && this.realRootDir) {
+        if (file.startsWith(this.rootDir)) {
+          const realFile = this.realRootDir + file.slice(this.rootDir.length);
+          invalid = this.delete(realFile) || invalid;
+          this.modifiedFiles.add(realFile);
+        }
+      }
     }
 
     return invalid;

packages/angular/build/src/tools/esbuild/watcher.ts

@@ -236,7 +236,10 @@ async function createParcelWatcher(
   const queue = new WatcherQueue();
 
   const isCaseSensitive = isFileSystemCaseSensitive(options?.cwd);
-  const rootDirPosix = toPosixPathNormalized(options?.cwd ?? process.cwd());
+  const rootDir = options?.cwd ? path.resolve(options.cwd) : process.cwd();
+  const rootDirPosix = toPosixPathNormalized(rootDir);
+  const realRootDir = fs.existsSync(rootDir) ? fs.realpathSync(rootDir) : rootDir;
+  const realRootDirPosix = toPosixPathNormalized(realRootDir);
   const rootDirLookupKey = toLookupKey(rootDirPosix, isCaseSensitive);
   const extraSubscriptions = new Map<string, ParcelWatcher.AsyncSubscription>();
   const pendingSubscriptions = new Map<string, Promise<ParcelWatcher.AsyncSubscription>>();
@@ -245,7 +248,11 @@ async function createParcelWatcher(
   const handleEvents = (events: ParcelWatcher.Event[]) => {
     const changes: { type: 'added' | 'modified' | 'removed'; file: string }[] = [];
     for (const event of events) {
-      const posixPath = toPosixPathNormalized(event.path);
+      let rawPath = toPosixPath(event.path);
+      if (realRootDirPosix !== rootDirPosix && rawPath.startsWith(realRootDirPosix)) {
+        rawPath = rootDirPosix + rawPath.slice(realRootDirPosix.length);
+      }
+      const posixPath = toPosixPathNormalized(rawPath);
       const lookupKey = toLookupKey(posixPath, isCaseSensitive);
       if (!isPathWatched(lookupKey, watchedFiles)) {
         continue;
@@ -419,7 +426,10 @@ async function createChokidarWatcher(
   const watchedFiles = new Set<string>();
   const queue = new WatcherQueue();
 
-  const rootDir = options?.cwd ?? process.cwd();
+  const rootDir = options?.cwd ? path.resolve(options.cwd) : process.cwd();
+  const rootDirPosix = toPosixPathNormalized(rootDir);
+  const realRootDir = fs.existsSync(rootDir) ? fs.realpathSync(rootDir) : rootDir;
+  const realRootDirPosix = toPosixPathNormalized(realRootDir);
   const isCaseSensitive = isFileSystemCaseSensitive(rootDir);
 
   const watcher = chokidar.watch([], {
@@ -431,7 +441,11 @@ async function createChokidarWatcher(
   });
 
   const handleEvent = (type: 'added' | 'modified' | 'removed', rawPath: string) => {
-    const posixPath = toPosixPathNormalized(rawPath);
+    let normalizedPath = toPosixPath(rawPath);
+    if (realRootDirPosix !== rootDirPosix && normalizedPath.startsWith(realRootDirPosix)) {
+      normalizedPath = rootDirPosix + normalizedPath.slice(realRootDirPosix.length);
+    }
+    const posixPath = toPosixPathNormalized(normalizedPath);
     const lookupKey = toLookupKey(posixPath, isCaseSensitive);
     if (!isPathWatched(lookupKey, watchedFiles)) {
       return;

packages/angular/build/src/utils/path.ts

@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import { realpathSync } from 'node:fs';
 import { isAbsolute, posix, relative, resolve } from 'node:path';
 import { platform } from 'node:process';
 
@@ -53,17 +52,15 @@ export function isSubDirectory(parent: string, child: string): boolean {
 }
 
 /**
- * Canonicalizes a file path by normalising Windows drive-letter casing to uppercase
- * and optionally resolving symbolic links.
+ * Canonicalizes a file path by normalising Windows drive-letter casing to uppercase.
  *
  * @param pathString - The file path to canonicalize.
- * @param preserveSymlinks - If true, symbolic links will not be resolved.
  * @returns The canonicalized file path.
  */
-export function canonicalizePath(pathString: string, preserveSymlinks = false): string {
-  const resolved = preserveSymlinks ? pathString : realpathSync(pathString);
+export function canonicalizePath(pathString: string): string {
+  let resolved = toPosixPath(pathString);
   if (platform === 'win32' && /^[a-z]:/.test(resolved)) {
-    return resolved[0].toUpperCase() + resolved.slice(1);
+    resolved = resolved[0].toUpperCase() + resolved.slice(1);
   }
 
   return resolved;