fix(vitest-angular): set watch mode flag when passed from CLI args (#…

…1508)
analogjs · Dec 17, 2024 · f4fbe77 · f4fbe77
1 parent aafebef
commit f4fbe77
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/packages/vite-plugin-angular/src/lib/angular-vite-plugin.ts b/packages/vite-plugin-angular/src/lib/angular-vite-plugin.ts
@@ -135,7 +135,7 @@ export function angular(options?: PluginOptions): Plugin[] {
   let nextProgram: NgtscProgram | undefined | ts.Program;
   let builderProgram: ts.EmitAndSemanticDiagnosticsBuilderProgram;
   let watchMode = false;
-  let testWatchMode = false;
+  let testWatchMode = process.env['ANALOG_VITEST_WATCH'] === 'true';
   const sourceFileCache = new SourceFileCache();
   const isTest = process.env['NODE_ENV'] === 'test' || !!process.env['VITEST'];
   const isStackBlitz = !!process.versions['webcontainer'];
@@ -214,7 +214,15 @@ export function angular(options?: PluginOptions): Plugin[] {
       },
       configResolved(config) {
         resolvedConfig = config;
-        testWatchMode = !(config.server.watch === null);
+
+        // set test watch mode
+        // - environment variable from vitest-angular
+        // - @nx/vite executor set server.watch explicitly to undefined (watch)/null (watch=false)
+        // - vite config for test.watch variable
+        testWatchMode =
+          testWatchMode ||
+          !(config.server.watch === null) ||
+          config.test?.watch === true;
       },
       configureServer(server) {
         viteServer = server;

diff --git a/packages/vitest-angular/src/lib/builders/test/vitest.impl.ts b/packages/vitest-angular/src/lib/builders/test/vitest.impl.ts
@@ -12,6 +12,7 @@ async function vitestBuilder(
 ): Promise<BuilderOutput> {
   process.env['TEST'] = 'true';
   process.env['VITEST'] = 'true';
+  process.env['ANALOG_VITEST_WATCH'] = `${options.watch === true}`;
 
   const { startVitest } = await (Function(
     'return import("vitest/node")'