From 4756d7e0675aa9a8bed11b830b66288141fa6e16 Mon Sep 17 00:00:00 2001
From: Alan Agius <alanagius@google.com>
Date: Wed, 14 Sep 2022 07:31:44 +0000
Subject: [PATCH] fix(@angular-devkit/build-angular): watch symbolic links

This commit addresses an issue which caused symbolic links not to be watched properly.

Closes #15100

(cherry picked from commit 2021e66a12fb873140d54cff82968a10e3ffa010)
---
 .../src/webpack/configs/common.ts             |  9 ++++++
 .../e2e/tests/build/rebuild-symlink.ts        | 31 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 tests/legacy-cli/e2e/tests/build/rebuild-symlink.ts

diff --git a/packages/angular_devkit/build_angular/src/webpack/configs/common.ts b/packages/angular_devkit/build_angular/src/webpack/configs/common.ts
index 17268046b483..636e9ef073da 100644
--- a/packages/angular_devkit/build_angular/src/webpack/configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/configs/common.ts
@@ -334,8 +334,17 @@ export async function getCommonConfig(wco: WebpackConfigOptions): Promise<Config
     watch: buildOptions.watch,
     watchOptions: {
       poll,
+      // The below is needed as when preserveSymlinks is enabled we disable `resolve.symlinks`.
+      followSymlinks: buildOptions.preserveSymlinks,
       ignored: poll === undefined ? undefined : '**/node_modules/**',
     },
+    snapshot: {
+      module: {
+        // Use hash of content instead of timestamp because the timestamp of the symlink will be used
+        // instead of the referenced files which causes changes in symlinks not to be picked up.
+        hash: buildOptions.preserveSymlinks,
+      },
+    },
     performance: {
       hints: false,
     },
diff --git a/tests/legacy-cli/e2e/tests/build/rebuild-symlink.ts b/tests/legacy-cli/e2e/tests/build/rebuild-symlink.ts
new file mode 100644
index 000000000000..740251f24b53
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/build/rebuild-symlink.ts
@@ -0,0 +1,31 @@
+import { symlink } from 'fs/promises';
+import { resolve } from 'path';
+import { appendToFile, expectFileToMatch, writeMultipleFiles } from '../../utils/fs';
+import { execAndWaitForOutputToMatch, waitForAnyProcessOutputToMatch } from '../../utils/process';
+import { updateJsonFile } from '../../utils/project';
+
+const buildReadyRegEx = /Build at: /;
+
+export default async function () {
+  await updateJsonFile('angular.json', (configJson) => {
+    configJson.projects['test-project'].architect.build.options.preserveSymlinks = true;
+  });
+
+  await writeMultipleFiles({
+    'src/link-source.ts': '// empty file',
+    'src/main.ts': `import './link-dest';`,
+  });
+
+  await symlink(resolve('src/link-source.ts'), resolve('src/link-dest.ts'));
+
+  await execAndWaitForOutputToMatch(
+    'ng',
+    ['build', '--watch', '--configuration=development'],
+    buildReadyRegEx,
+  );
+
+  // Trigger a rebuild
+  await appendToFile('src/link-source.ts', `console.log('foo-bar');`);
+  await waitForAnyProcessOutputToMatch(buildReadyRegEx);
+  await expectFileToMatch('dist/test-project/main.js', `console.log('foo-bar')`);
+}