From e7412dd51c9593fb5b5b533d779999852aa9a6cc Mon Sep 17 00:00:00 2001
From: Alan Agius <17563226+alan-agius4@users.noreply.github.com>
Date: Wed, 28 Jan 2026 12:16:21 +0000
Subject: [PATCH 1/4] wip

---
 .github/workflows/pr.yml                          |  2 +-
 .../cli/src/command-builder/utilities/prettier.ts | 15 +++++++--------
 .../files/{.prettierrc => .prettierrc.template}   |  0
 3 files changed, 8 insertions(+), 9 deletions(-)
 rename packages/schematics/angular/workspace/files/{.prettierrc => .prettierrc.template} (100%)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 237245a329c2..05c86a86c1de 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -170,7 +170,7 @@ jobs:
           test_target_name: e2e.esbuild_node24
         env:
           E2E_SHARD_TOTAL: 1
-          TESTBRIDGE_TEST_ONLY: tests/basic/{build,rebuild,serve}.ts
+          TESTBRIDGE_TEST_ONLY: tests/commands/add/add-tailwindcss.ts
 
   e2e-package-managers:
     needs: build
diff --git a/packages/angular/cli/src/command-builder/utilities/prettier.ts b/packages/angular/cli/src/command-builder/utilities/prettier.ts
index 6183b316eff5..aeee11144caf 100644
--- a/packages/angular/cli/src/command-builder/utilities/prettier.ts
+++ b/packages/angular/cli/src/command-builder/utilities/prettier.ts
@@ -55,6 +55,7 @@ export async function formatFiles(cwd: string, files: Set<string>): Promise<void
     }
   }
 
+  console.log({ prettierCliPath });
   if (!prettierCliPath) {
     return;
   }
@@ -70,12 +71,10 @@ export async function formatFiles(cwd: string, files: Set<string>): Promise<void
     return;
   }
 
-  await execFileAsync(
-    prettierCliPath,
-    ['--write', '--no-error-on-unmatched-pattern', ...filesToFormat],
-    {
-      cwd,
-      shell: platform() === 'win32',
-    },
-  );
+  console.log({ filesToFormat, cwd });
+
+  await execFileAsync(prettierCliPath, ['--write', ...filesToFormat], {
+    cwd,
+    shell: platform() === 'win32',
+  });
 }
diff --git a/packages/schematics/angular/workspace/files/.prettierrc b/packages/schematics/angular/workspace/files/.prettierrc.template
similarity index 100%
rename from packages/schematics/angular/workspace/files/.prettierrc
rename to packages/schematics/angular/workspace/files/.prettierrc.template

From ec386cfdbabd962b02301786d1bd6cd344a53a1d Mon Sep 17 00:00:00 2001
From: Alan Agius <17563226+alan-agius4@users.noreply.github.com>
Date: Wed, 28 Jan 2026 12:33:46 +0000
Subject: [PATCH 2/4] wip!

---
 .../angular/cli/src/command-builder/utilities/prettier.ts   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/angular/cli/src/command-builder/utilities/prettier.ts b/packages/angular/cli/src/command-builder/utilities/prettier.ts
index aeee11144caf..2749fea8469b 100644
--- a/packages/angular/cli/src/command-builder/utilities/prettier.ts
+++ b/packages/angular/cli/src/command-builder/utilities/prettier.ts
@@ -63,7 +63,7 @@ export async function formatFiles(cwd: string, files: Set<string>): Promise<void
   const filesToFormat: string[] = [];
   for (const file of files) {
     if (fileTypes.has(extname(file))) {
-      filesToFormat.push(file);
+      filesToFormat.push(`"${file}"`);
     }
   }
 
@@ -73,8 +73,10 @@ export async function formatFiles(cwd: string, files: Set<string>): Promise<void
 
   console.log({ filesToFormat, cwd });
 
-  await execFileAsync(prettierCliPath, ['--write', ...filesToFormat], {
+  const x = await execFileAsync(prettierCliPath, ['--write', ...filesToFormat], {
     cwd,
     shell: platform() === 'win32',
   });
+
+  console.log({ x });
 }

From c0b8c80cbfc8bb1a48cf563510d1fb651f81fd28 Mon Sep 17 00:00:00 2001
From: Alan Agius <17563226+alan-agius4@users.noreply.github.com>
Date: Wed, 28 Jan 2026 12:35:53 +0000
Subject: [PATCH 3/4] wip!

---
 .../angular/cli/src/command-builder/utilities/prettier.ts  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/angular/cli/src/command-builder/utilities/prettier.ts b/packages/angular/cli/src/command-builder/utilities/prettier.ts
index 2749fea8469b..29007094e135 100644
--- a/packages/angular/cli/src/command-builder/utilities/prettier.ts
+++ b/packages/angular/cli/src/command-builder/utilities/prettier.ts
@@ -73,6 +73,13 @@ export async function formatFiles(cwd: string, files: Set<string>): Promise<void
 
   console.log({ filesToFormat, cwd });
 
+  console.log(
+    await execFileAsync(prettierCliPath, ['--check', ...filesToFormat], {
+      cwd,
+      shell: platform() === 'win32',
+    }),
+  );
+  
   const x = await execFileAsync(prettierCliPath, ['--write', ...filesToFormat], {
     cwd,
     shell: platform() === 'win32',

From 7488b9f4fdf31b130def989bd07fe9b363ee09eb Mon Sep 17 00:00:00 2001
From: Alan Agius <17563226+alan-agius4@users.noreply.github.com>
Date: Wed, 28 Jan 2026 13:02:42 +0000
Subject: [PATCH 4/4] wip!

---
 .../src/command-builder/utilities/prettier.ts | 20 ++++---------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/packages/angular/cli/src/command-builder/utilities/prettier.ts b/packages/angular/cli/src/command-builder/utilities/prettier.ts
index 29007094e135..0596375b3990 100644
--- a/packages/angular/cli/src/command-builder/utilities/prettier.ts
+++ b/packages/angular/cli/src/command-builder/utilities/prettier.ts
@@ -9,7 +9,6 @@
 import { execFile } from 'node:child_process';
 import { readFile } from 'node:fs/promises';
 import { createRequire } from 'node:module';
-import { platform } from 'node:os';
 import { dirname, extname, join } from 'node:path';
 import { promisify } from 'node:util';
 
@@ -48,6 +47,7 @@ export async function formatFiles(cwd: string, files: Set<string>): Promise<void
       const prettierPackageJson = JSON.parse(await readFile(prettierPath, 'utf-8')) as {
         bin: string;
       };
+
       prettierCliPath = join(dirname(prettierPath), prettierPackageJson.bin);
     } catch {
       // Prettier is not installed.
@@ -55,7 +55,6 @@ export async function formatFiles(cwd: string, files: Set<string>): Promise<void
     }
   }
 
-  console.log({ prettierCliPath });
   if (!prettierCliPath) {
     return;
   }
@@ -63,7 +62,7 @@ export async function formatFiles(cwd: string, files: Set<string>): Promise<void
   const filesToFormat: string[] = [];
   for (const file of files) {
     if (fileTypes.has(extname(file))) {
-      filesToFormat.push(`"${file}"`);
+      filesToFormat.push(file);
     }
   }
 
@@ -71,19 +70,8 @@ export async function formatFiles(cwd: string, files: Set<string>): Promise<void
     return;
   }
 
-  console.log({ filesToFormat, cwd });
-
-  console.log(
-    await execFileAsync(prettierCliPath, ['--check', ...filesToFormat], {
-      cwd,
-      shell: platform() === 'win32',
-    }),
-  );
-  
-  const x = await execFileAsync(prettierCliPath, ['--write', ...filesToFormat], {
+  await execFileAsync(process.execPath, [prettierCliPath, '--write', ...filesToFormat], {
     cwd,
-    shell: platform() === 'win32',
+    shell: false,
   });
-
-  console.log({ x });
 }