@stencil/vitest 1.5.0 → 1.6.1

package/dist/bin/__tests__/stencil-test.spec.js

@@ -213,8 +213,8 @@ export default {
             writeFileSync(join(testDir, 'vitest.config.ts'), vitestConfig);
             writeFileSync(join(testDir, 'package.json'), JSON.stringify({ name: 'test', type: 'module' }));
             const result = await runCLIInDir(testDir, ['--watch', '--verbose'], 2000);
-            // Should add watch ignore patterns
-            expect(result.stdout).toMatch(/Added.*watch ignore patterns/);
+            // Should add watch ignore patterns (screenshot and test file patterns)
+            expect(result.stdout).toMatch(/Added.*screenshot patterns and.*test file patterns/);
         });
         it('should merge user watchIgnoredRegex with screenshot patterns', async () => {
             const stencilConfig = `
@@ -250,6 +250,143 @@ export default {
             }
         });
     });
+    describe('test file ignore patterns', () => {
+        it('should extract test file patterns from vitest config include', async () => {
+            const stencilConfig = `
+export const config = {
+  namespace: 'test',
+  outputTargets: [{ type: 'dist' }]
+};
+`;
+            writeFileSync(join(testDir, 'stencil.config.ts'), stencilConfig);
+            const vitestConfig = `
+export default {
+  test: {
+    include: ['**/*.spec.ts', '**/*.test.ts']
+  }
+};
+`;
+            writeFileSync(join(testDir, 'vitest.config.ts'), vitestConfig);
+            writeFileSync(join(testDir, 'package.json'), JSON.stringify({ name: 'test', type: 'module' }));
+            const result = await runCLIInDir(testDir, ['--watch', '--verbose'], 2000);
+            // Should extract test file patterns
+            expect(result.stdout).toMatch(/Extracted.*test file patterns/);
+        });
+        it('should extract test file patterns from project-level include', async () => {
+            const stencilConfig = `
+export const config = {
+  namespace: 'test',
+  outputTargets: [{ type: 'dist' }]
+};
+`;
+            writeFileSync(join(testDir, 'stencil.config.ts'), stencilConfig);
+            const vitestConfig = `
+export default {
+  test: {
+    projects: [
+      {
+        test: {
+          include: ['src/**/*.unit.ts']
+        }
+      },
+      {
+        test: {
+          include: ['e2e/**/*.e2e.ts']
+        }
+      }
+    ]
+  }
+};
+`;
+            writeFileSync(join(testDir, 'vitest.config.ts'), vitestConfig);
+            writeFileSync(join(testDir, 'package.json'), JSON.stringify({ name: 'test', type: 'module' }));
+            const result = await runCLIInDir(testDir, ['--watch', '--verbose'], 2000);
+            // Should extract test file patterns from projects
+            expect(result.stdout).toMatch(/Extracted.*test file patterns/);
+        });
+        it('should include test file patterns in temporary config', async () => {
+            const stencilConfig = `
+export const config = {
+  namespace: 'test',
+  outputTargets: [{ type: 'dist' }]
+};
+`;
+            writeFileSync(join(testDir, 'stencil.config.ts'), stencilConfig);
+            const vitestConfig = `
+export default {
+  test: {
+    include: ['**/*.mytest.ts']
+  }
+};
+`;
+            writeFileSync(join(testDir, 'vitest.config.ts'), vitestConfig);
+            writeFileSync(join(testDir, 'package.json'), JSON.stringify({ name: 'test', type: 'module' }));
+            const result = await runCLIInDir(testDir, ['--watch', '--verbose'], 3000);
+            // Check that temp config was created with test file patterns
+            expect(result.stdout).toMatch(/Created temporary/);
+            const tempConfigs = require('fs')
+                .readdirSync(testDir)
+                .filter((f) => f.startsWith('.stencil-test-'));
+            if (tempConfigs.length > 0) {
+                const tempConfigContent = require('fs').readFileSync(join(testDir, tempConfigs[0]), 'utf-8');
+                // Should have test file pattern converted to regex
+                expect(tempConfigContent).toMatch(/mytest/);
+            }
+        });
+        it('should use default test file patterns when no include specified', async () => {
+            const stencilConfig = `
+export const config = {
+  namespace: 'test',
+  outputTargets: [{ type: 'dist' }]
+};
+`;
+            writeFileSync(join(testDir, 'stencil.config.ts'), stencilConfig);
+            const vitestConfig = `
+export default {
+  test: {
+    projects: []
+  }
+};
+`;
+            writeFileSync(join(testDir, 'vitest.config.ts'), vitestConfig);
+            writeFileSync(join(testDir, 'package.json'), JSON.stringify({ name: 'test', type: 'module' }));
+            const result = await runCLIInDir(testDir, ['--watch', '--verbose'], 3000);
+            // Check that temp config was created
+            expect(result.stdout).toMatch(/Created temporary/);
+            const tempConfigs = require('fs')
+                .readdirSync(testDir)
+                .filter((f) => f.startsWith('.stencil-test-'));
+            if (tempConfigs.length > 0) {
+                const tempConfigContent = require('fs').readFileSync(join(testDir, tempConfigs[0]), 'utf-8');
+                // Should have default test file patterns (.spec. and .test.)
+                // The patterns are written as regex literals with escaped dots (e.g., /\.spec\.[jt]sx?$/)
+                expect(tempConfigContent).toContain('spec');
+                expect(tempConfigContent).toContain('test');
+                expect(tempConfigContent).toContain('[jt]sx');
+            }
+        });
+        it('should report both screenshot and test file pattern counts', async () => {
+            const stencilConfig = `
+export const config = {
+  namespace: 'test',
+  outputTargets: [{ type: 'dist' }]
+};
+`;
+            writeFileSync(join(testDir, 'stencil.config.ts'), stencilConfig);
+            const vitestConfig = `
+export default {
+  test: {
+    include: ['**/*.spec.ts']
+  }
+};
+`;
+            writeFileSync(join(testDir, 'vitest.config.ts'), vitestConfig);
+            writeFileSync(join(testDir, 'package.json'), JSON.stringify({ name: 'test', type: 'module' }));
+            const result = await runCLIInDir(testDir, ['--watch', '--verbose'], 2000);
+            // Should report both screenshot and test file pattern counts
+            expect(result.stdout).toMatch(/Added.*screenshot patterns and.*test file patterns/);
+        });
+    });
     describe('temp file cleanup', () => {
         it('should cleanup temporary config on exit', async () => {
             const stencilConfig = `

package/dist/bin/stencil-test.js

@@ -265,31 +265,98 @@ function handleStencilOutput(data) {
     }
 }
 /**
- * Extracts screenshot directory patterns from vitest config to ignore in Stencil watch
+ * Resolves the vitest config path from custom path or default locations
  */
-async function getScreenshotPatternsFromVitestConfig(customVitestConfig) {
-    const patterns = [];
+function resolveVitestConfigPath(customVitestConfig) {
+    // Use custom config if provided via --config flag
+    if (customVitestConfig) {
+        const resolvedPath = join(cwd, customVitestConfig);
+        if (existsSync(resolvedPath)) {
+            return resolvedPath;
+        }
+        if (verbose) {
+            log(`Specified vitest config not found: ${customVitestConfig}, falling back to defaults`);
+        }
+    }
+    // Look for vitest.config.ts/js in common locations
+    const possibleConfigs = [
+        join(cwd, 'vitest.config.ts'),
+        join(cwd, 'vitest.config.js'),
+        join(cwd, 'vitest.config.mjs'),
+    ];
+    return possibleConfigs.find(existsSync);
+}
+/**
+ * Loads and parses the vitest config file
+ */
+async function loadVitestConfig(vitestConfigPath) {
+    const jiti = createJiti(cwd, { interopDefault: true });
+    const vitestConfig = await jiti.import(vitestConfigPath);
+    return vitestConfig?.default || vitestConfig;
+}
+/**
+ * Converts a glob pattern to a RegExp for use in watchIgnoredRegex
+ */
+function globToRegex(glob) {
+    // Escape special regex characters except glob wildcards
+    let pattern = glob
+        .replace(/[.+^${}()|[\]\\]/g, '\\$&') // Escape regex special chars
+        .replace(/\*\*/g, '<<GLOBSTAR>>') // Placeholder for **
+        .replace(/\*/g, '[^/]*') // * matches anything except /
+        .replace(/<<GLOBSTAR>>/g, '.*') // ** matches anything including /
+        .replace(/\?/g, '.'); // ? matches single char
+    return new RegExp(pattern);
+}
+/**
+ * Extracts test file include patterns from vitest config to ignore in Stencil watch
+ */
+async function getTestFilePatternsFromVitestConfig(customVitestConfig) {
+    const defaultPatterns = [/\.spec\.[jt]sx?$/, /\.test\.[jt]sx?$/];
     try {
-        let vitestConfigPath;
-        // Use custom config if provided via --config flag
-        if (customVitestConfig) {
-            const resolvedPath = join(cwd, customVitestConfig);
-            if (existsSync(resolvedPath)) {
-                vitestConfigPath = resolvedPath;
-            }
-            else if (verbose) {
-                log(`Specified vitest config not found: ${customVitestConfig}, falling back to defaults`);
+        const vitestConfigPath = resolveVitestConfigPath(customVitestConfig);
+        if (!vitestConfigPath) {
+            return defaultPatterns;
+        }
+        if (verbose) {
+            log(`Loading test file patterns from ${vitestConfigPath}`);
+        }
+        const configObj = await loadVitestConfig(vitestConfigPath);
+        const testConfig = configObj?.test || configObj;
+        // Extract include patterns from various possible locations
+        const includePatterns = [];
+        // Root level include
+        if (testConfig?.include) {
+            includePatterns.push(...(Array.isArray(testConfig.include) ? testConfig.include : [testConfig.include]));
+        }
+        // Check projects for include patterns
+        const projects = testConfig?.projects || [];
+        for (const project of projects) {
+            const projectTest = project?.test || project;
+            if (projectTest?.include) {
+                includePatterns.push(...(Array.isArray(projectTest.include) ? projectTest.include : [projectTest.include]));
             }
         }
-        // Look for vitest.config.ts/js in common locations if no custom config
-        if (!vitestConfigPath) {
-            const possibleConfigs = [
-                join(cwd, 'vitest.config.ts'),
-                join(cwd, 'vitest.config.js'),
-                join(cwd, 'vitest.config.mjs'),
-            ];
-            vitestConfigPath = possibleConfigs.find(existsSync);
+        // Convert glob patterns to RegExp
+        const patterns = includePatterns.map(globToRegex);
+        if (verbose && patterns.length > 0) {
+            log(`Extracted ${patterns.length} test file patterns from vitest config`);
+        }
+        return patterns.length > 0 ? patterns : defaultPatterns;
+    }
+    catch (error) {
+        if (verbose) {
+            log(`Failed to parse vitest config for test patterns: ${error instanceof Error ? error.message : String(error)}`);
         }
+        return defaultPatterns;
+    }
+}
+/**
+ * Extracts screenshot directory patterns from vitest config to ignore in Stencil watch
+ */
+async function getScreenshotPatternsFromVitestConfig(customVitestConfig) {
+    const patterns = [];
+    try {
+        const vitestConfigPath = resolveVitestConfigPath(customVitestConfig);
         if (!vitestConfigPath) {
             if (verbose) {
                 log('No vitest config found, using default screenshot patterns');
@@ -300,9 +367,7 @@ async function getScreenshotPatternsFromVitestConfig(customVitestConfig) {
         if (verbose) {
             log(`Loading vitest config from ${vitestConfigPath}`);
         }
-        // Use jiti to load TypeScript/ESM config
-        const jiti = createJiti(cwd, { interopDefault: true });
-        const vitestConfig = await jiti.import(vitestConfigPath);
+        const vitestConfig = await loadVitestConfig(vitestConfigPath);
         // Extract screenshot directory from browser test config
         const projects = vitestConfig?.default?.test?.projects || vitestConfig?.test?.projects || [];
         const customScreenshotDirs = new Set();
@@ -341,7 +406,7 @@ async function getScreenshotPatternsFromVitestConfig(customVitestConfig) {
 }
 /**
  * Creates a temporary stencil config that extends the user's config
- * and adds watchIgnoredRegex patterns for screenshots
+ * and adds watchIgnoredRegex patterns for screenshots and test files
  */
 async function createTemporaryStencilConfig(userSpecifiedConfig, vitestConfigPath) {
     try {
@@ -374,8 +439,11 @@ async function createTemporaryStencilConfig(userSpecifiedConfig, vitestConfigPat
                 return null;
             }
         }
-        // Get screenshot patterns to ignore
-        const screenshotPatterns = await getScreenshotPatternsFromVitestConfig(vitestConfigPath);
+        // Get patterns to ignore from vitest config
+        const [screenshotPatterns, testFilePatterns] = await Promise.all([
+            getScreenshotPatternsFromVitestConfig(vitestConfigPath),
+            getTestFilePatternsFromVitestConfig(vitestConfigPath),
+        ]);
         // Load the user's config using jiti
         const jiti = createJiti(cwd, { interopDefault: true });
         const userConfig = await jiti.import(userConfigPath);
@@ -384,7 +452,7 @@ async function createTemporaryStencilConfig(userSpecifiedConfig, vitestConfigPat
         // Merge with watchIgnoredRegex
         const mergedConfig = {
             ...actualConfig,
-            watchIgnoredRegex: [...(actualConfig?.watchIgnoredRegex || []), ...screenshotPatterns],
+            watchIgnoredRegex: [...(actualConfig?.watchIgnoredRegex || []), ...screenshotPatterns, ...testFilePatterns],
         };
         // Create temp file as sibling of stencil.config so tsconfig.json can be found
         // Stencil looks for tsconfig.json relative to the config file location
@@ -415,7 +483,7 @@ async function createTemporaryStencilConfig(userSpecifiedConfig, vitestConfigPat
         writeFileSync(tempConfigPath, tempConfigContent, 'utf-8');
         if (verbose) {
             log(`Created temporary stencil config at ${tempConfigPath}`);
-            log(`Added ${screenshotPatterns.length} watch ignore patterns`);
+            log(`Added ${screenshotPatterns.length} screenshot patterns and ${testFilePatterns.length} test file patterns to watch ignore`);
         }
         return tempConfigPath;
     }
@@ -490,7 +558,7 @@ process.on('SIGTERM', () => cleanup());
         if (tempStencilConfigPath) {
             stencilArgs.push('--config', tempStencilConfigPath);
             if (verbose) {
-                log('Using temporary config with screenshot ignore patterns');
+                log('Using temporary config with watch ignore patterns for screenshots and test files');
             }
         }
         else if (args.stencilConfig) {

package/dist/config.js

@@ -162,6 +162,16 @@ function applyStencilDefaults(config, stencilConfig) {
     if (!result.server.watch) {
         result.server.watch = {};
     }
+    // Ignore source map files to prevent unnecessary test re-runs
+    // Stencil may touch .map files without changing content, triggering Vite's watcher
+    if (!result.server.watch.ignored) {
+        result.server.watch.ignored = [];
+    }
+    const ignoredArray = Array.isArray(result.server.watch.ignored)
+        ? result.server.watch.ignored
+        : [result.server.watch.ignored];
+    const mapIgnorePatterns = ['**/*.map', '**/*.map.js'];
+    result.server.watch.ignored = [...new Set([...ignoredArray, ...mapIgnorePatterns])];
     // Ensure test config exists
     if (!result.test) {
         result.test = {};

package/package.json

@@ -4,7 +4,7 @@
     "type": "git",
     "url": "https://github.com/stenciljs/vitest"
   },
-  "version": "1.5.0",
+  "version": "1.6.1",
   "description": "First-class testing utilities for Stencil design systems with Vitest",
   "license": "MIT",
   "type": "module",
@@ -97,7 +97,7 @@
   "dependencies": {
     "jiti": "^2.6.1",
     "local-pkg": "^1.1.2",
-    "vitest-environment-stencil": "1.5.0"
+    "vitest-environment-stencil": "1.6.1"
   },
   "devDependencies": {
     "@eslint/js": "^9.39.2",