From 2c17db2ffa9a7f32f8d5ae90b04418abea6b09c2 Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Wed, 3 Jun 2026 10:59:10 +0200
Subject: [PATCH] fix(@angular/build): allow disabling Vitest isolation from
 builder

Keep the isolate builder option undefined when it is omitted so a Vitest runner config can provide its own value.

Previously, ng test --isolate worked because true was forwarded as an override, but ng test --no-isolate was normalized to false and then treated the same as an omitted option. As a result, test.isolate: true in vitest-base.config.ts stayed active.

Forward explicit false values to the Vitest project config so --no-isolate can override runnerConfig while the default still aligns with the Karma/Jasmine experience.
---
 .../build/src/builders/unit-test/options.ts   |  2 +-
 .../unit-test/runners/vitest/plugins.ts       |  6 +--
 .../unit-test/tests/options/isolate_spec.ts   | 54 +++++++++++++++++++
 3 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/packages/angular/build/src/builders/unit-test/options.ts b/packages/angular/build/src/builders/unit-test/options.ts
index 5cd04c4ca7bf..ef09958885a7 100644
--- a/packages/angular/build/src/builders/unit-test/options.ts
+++ b/packages/angular/build/src/builders/unit-test/options.ts
@@ -126,7 +126,7 @@ export async function normalizeOptions(
     watch,
     debug: options.debug ?? false,
     ui: process.env['CI'] ? false : ui,
-    isolate: isolate ?? false,
+    isolate,
     quiet: options.quiet ?? (process.env['CI'] ? false : true),
     providersFile: options.providersFile && path.join(workspaceRoot, options.providersFile),
     setupFiles: options.setupFiles
diff --git a/packages/angular/build/src/builders/unit-test/runners/vitest/plugins.ts b/packages/angular/build/src/builders/unit-test/runners/vitest/plugins.ts
index eb3d7d106ab4..c5e3764043bb 100644
--- a/packages/angular/build/src/builders/unit-test/runners/vitest/plugins.ts
+++ b/packages/angular/build/src/builders/unit-test/runners/vitest/plugins.ts
@@ -54,7 +54,7 @@ interface VitestConfigPluginOptions {
   include: string[];
   optimizeDepsInclude: string[];
   watch: boolean;
-  isolate: boolean;
+  isolate: boolean | undefined;
 }
 
 async function findTestEnvironment(
@@ -268,8 +268,8 @@ export async function createVitestConfigPlugin(
           include,
           // CLI provider browser options override, if present
           ...(browser ? { browser } : {}),
-          // Only override if the user explicitly enabled it via CLI
-          ...(options.isolate ? { isolate: true } : {}),
+          // Only override if the user explicitly set it via CLI
+          ...(options.isolate !== undefined ? { isolate: options.isolate } : {}),
           // If the user has not specified an environment, use a smart default.
           ...(!testConfig?.environment
             ? { environment: await findTestEnvironment(projectResolver) }
diff --git a/packages/angular/build/src/builders/unit-test/tests/options/isolate_spec.ts b/packages/angular/build/src/builders/unit-test/tests/options/isolate_spec.ts
index 6ca00a02d94d..a37bf597e91a 100644
--- a/packages/angular/build/src/builders/unit-test/tests/options/isolate_spec.ts
+++ b/packages/angular/build/src/builders/unit-test/tests/options/isolate_spec.ts
@@ -54,5 +54,59 @@ describeBuilder(execute, UNIT_TEST_BUILDER_INFO, (harness) => {
       const { result } = await harness.executeOnce();
       expect(result?.success).toBeTrue();
     });
+
+    it('should override isolate from the Vitest config file when set to false', async () => {
+      harness.writeFile(
+        'vitest-base.config.ts',
+        `
+          import { defineConfig } from 'vitest/config';
+
+          export default defineConfig({
+            test: {
+              fileParallelism: false,
+              isolate: true,
+              setupFiles: ['./src/setup.ts'],
+            },
+          });
+        `,
+      );
+
+      harness.writeFile(
+        'src/setup.ts',
+        `
+          const global = globalThis as typeof globalThis & { setupCount?: number };
+          global.setupCount = (global.setupCount ?? 0) + 1;
+        `,
+      );
+
+      harness.writeFile(
+        'src/app/first.spec.ts',
+        `
+          it('runs first', () => {
+            expect(true).toBe(true);
+          });
+        `,
+      );
+
+      harness.writeFile(
+        'src/app/second.spec.ts',
+        `
+          it('shares the test environment with the first spec file', () => {
+            const global = globalThis as typeof globalThis & { setupCount?: number };
+            expect(global.setupCount).toBeGreaterThan(1);
+          });
+        `,
+      );
+
+      harness.useTarget('test', {
+        ...BASE_OPTIONS,
+        runner: 'vitest' as any,
+        runnerConfig: true,
+        isolate: false,
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBeTrue();
+    });
   });
 });