npm - @rstest/browser - Versions diffs - 0.7.9 → 0.8.0 - Mend

@rstest/browser 0.7.9 → 0.8.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

package/dist/browser-container/container-static/js/{lib-react.a9c9a89b.js → lib-react.48335539.js} RENAMED Viewed

@@ -1,5 +1,5 @@
-/*! For license information please see lib-react.a9c9a89b.js.LICENSE.txt */
-/*! For license information please see lib-react.a9c9a89b.js.LICENSE.txt */ "use strict";
+/*! For license information please see lib-react.48335539.js.LICENSE.txt */
+/*! For license information please see lib-react.48335539.js.LICENSE.txt */ "use strict";
 (self.webpackChunk_rstest_browser_ui = self.webpackChunk_rstest_browser_ui || []).push([
     [
         "783"
@@ -8258,7 +8258,7 @@
         8525 (e, t, n) {
             e.exports = n(1357);
         },
-        4765 (e, t) {
+        7146 (e, t) {
             function n(e, t) {
                 var n = e.length;
                 for(e.push(t); 0 < n;){
@@ -8458,7 +8458,7 @@
             };
         },
         1099 (e, t, n) {
-            e.exports = n(4765);
+            e.exports = n(7146);
         }
     }
 ]);

package/dist/browser-container/container-static/js/lib-react.48335539.js.LICENSE.txt ADDED Viewed

	@@ -0,0 +1 @@
1	+ /! For license information please see lib-react.48335539.js.LICENSE.txt /

package/dist/browser-container/container.html CHANGED Viewed

@@ -3,11 +3,16 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <link
+      rel="icon"
+      type="image/svg+xml"
+      href="https://assets.rspack.rs/rstest/rstest-logo.svg"
+    />
     <title>Rstest Browser Test Runner</title>
     <script>
       window.__RSTEST_BROWSER_OPTIONS__ = __RSTEST_OPTIONS_PLACEHOLDER__;
     </script>
-  <script defer src="/container-static/js/lib-react.a9c9a89b.js"></script><script defer src="/container-static/js/916.5aee8d2f.js"></script><script defer src="/container-static/js/container.5ddd46c3.js"></script><link href="/container-static/css/container.dc438e35.css" rel="stylesheet"></head>
+  <script defer src="/container-static/js/lib-react.48335539.js"></script><script defer src="/container-static/js/837.e631233e.js"></script><script defer src="/container-static/js/container.93bdade7.js"></script><link href="/container-static/css/container.425b2695.css" rel="stylesheet"></head>
   <body>
     <div id="root"></div>
   </body>

package/dist/hostController.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
-import { type ListCommandResult, type Rstest } from '@rstest/core/browser';
-export declare const runBrowserController: (context: Rstest) => Promise<void>;
+import { type BrowserTestRunOptions, type BrowserTestRunResult, type ListCommandResult, type Rstest } from '@rstest/core/browser';
+export declare const runBrowserController: (context: Rstest, options?: BrowserTestRunOptions) => Promise<BrowserTestRunResult | void>;
 /**
  * Result from collecting browser tests.
  * This is the return type for listBrowserTests, designed for future extraction

package/dist/index.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
-import type { Rstest } from '@rstest/core/browser';
+import type { BrowserTestRunOptions, BrowserTestRunResult, Rstest } from '@rstest/core/browser';
 import { type ListBrowserTestsResult } from './hostController';
-export declare function runBrowserTests(context: Rstest): Promise<void>;
+export declare function runBrowserTests(context: Rstest, options?: BrowserTestRunOptions): Promise<BrowserTestRunResult | void>;
 export declare function listBrowserTests(context: Rstest): Promise<ListBrowserTestsResult>;
-export type { ListBrowserTestsResult };
+export type { BrowserTestRunOptions, BrowserTestRunResult, ListBrowserTestsResult, };

package/dist/index.js CHANGED Viewed

@@ -1639,8 +1639,8 @@ class ContainerRpcManager {
     }
     setupConnectionHandler() {
         this.wss.on('connection', (ws)=>{
-            logger.log(color.gray('[Browser UI] Container WebSocket connected'));
-            logger.log(color.gray(`[Browser UI] Current ws: ${this.ws ? 'exists' : 'null'}, new ws: ${ws ? 'exists' : 'null'}`));
+            logger.debug('[Browser UI] Container WebSocket connected');
+            logger.debug(`[Browser UI] Current ws: ${this.ws ? 'exists' : 'null'}, new ws: ${ws ? 'exists' : 'null'}`);
             this.attachWebSocket(ws);
         });
     }
@@ -1679,9 +1679,9 @@ class ContainerRpcManager {
         await this.rpc?.onTestFileUpdate(files);
     }
     async reloadTestFile(testFile, testNamePattern) {
-        logger.log(color.gray(`[Browser UI] reloadTestFile called, rpc: ${this.rpc ? 'exists' : 'null'}, ws: ${this.ws ? 'exists' : 'null'}`));
-        if (!this.rpc) return void logger.log(color.yellow('[Browser UI] RPC not available, skipping reloadTestFile'));
-        logger.log(color.gray(`[Browser UI] Calling reloadTestFile: ${testFile}`));
+        logger.debug(`[Browser UI] reloadTestFile called, rpc: ${this.rpc ? 'exists' : 'null'}, ws: ${this.ws ? 'exists' : 'null'}`);
+        if (!this.rpc) return void logger.debug('[Browser UI] RPC not available, skipping reloadTestFile');
+        logger.debug(`[Browser UI] Calling reloadTestFile: ${testFile}`);
         await this.rpc.reloadTestFile(testFile, testNamePattern);
     }
 }
@@ -1689,7 +1689,9 @@ const watchContext = {
     runtime: null,
     lastTestFiles: [],
     hooksEnabled: false,
-    cleanupRegistered: false
+    cleanupRegistered: false,
+    chunkHashes: new Map(),
+    affectedTestFiles: []
 };
 const ensureProcessExitCode = (code)=>{
     if (void 0 === process.exitCode || 0 === process.exitCode) process.exitCode = code;
@@ -1733,6 +1735,46 @@ const excludePatternsToRegExp = (patterns)=>{
     if (0 === keywords.length) return null;
     return new RegExp(`[\\\\/](${keywords.join('|')})[\\\\/]`);
 };
+const findTestFileInModules = (modules, entryTestFiles)=>{
+    if (!modules) return null;
+    for (const m of modules){
+        if (m.nameForCondition) {
+            const normalizedPath = normalize(m.nameForCondition);
+            if (entryTestFiles.has(normalizedPath)) return normalizedPath;
+        }
+        if (m.children) {
+            const found = findTestFileInModules(m.children, entryTestFiles);
+            if (found) return found;
+        }
+    }
+    return null;
+};
+const getChunkKey = (chunk)=>{
+    if (null != chunk.id) return String(chunk.id);
+    if (chunk.names && chunk.names.length > 0) return chunk.names[0];
+    if (chunk.files && chunk.files.length > 0) return chunk.files[0];
+    return null;
+};
+const getAffectedTestFiles = (chunks, entryTestFiles)=>{
+    if (!chunks) return [];
+    const affectedFiles = new Set();
+    const currentHashes = new Map();
+    for (const chunk of chunks){
+        if (!chunk.hash) continue;
+        const testFile = findTestFileInModules(chunk.modules, entryTestFiles);
+        if (!testFile) continue;
+        const chunkKey = getChunkKey(chunk);
+        if (!chunkKey) continue;
+        const prevHash = watchContext.chunkHashes.get(chunkKey);
+        currentHashes.set(chunkKey, chunk.hash);
+        if (void 0 !== prevHash && prevHash !== chunk.hash) {
+            affectedFiles.add(testFile);
+            logger.debug(`[Watch] Chunk hash changed for ${chunkKey}: ${prevHash} -> ${chunk.hash} (test: ${testFile})`);
+        }
+    }
+    watchContext.chunkHashes = currentHashes;
+    return Array.from(affectedFiles);
+};
 const getRuntimeConfigFromProject = (project)=>{
     const { testNamePattern, testTimeout, passWithNoTests, retry, globals, clearMocks, resetMocks, restoreMocks, unstubEnvs, unstubGlobals, maxConcurrency, printConsoleTrace, disableConsoleIntercept, testEnvironment, hookTimeout, isolate, coverage, snapshotFormat, env, bail, logHeapUsage, chaiConfig, includeTaskLocation } = project.normalizedConfig;
     return {
@@ -1939,8 +1981,8 @@ const createBrowserRuntime = async ({ context, manifestPath, manifestSource, tem
             plugins: userPlugins,
             server: {
                 printUrls: false,
-                port: context.normalizedConfig.browser.port,
-                strictPort: void 0 !== context.normalizedConfig.browser.port
+                port: context.normalizedConfig.browser.port ?? 4000,
+                strictPort: context.normalizedConfig.browser.strictPort
             },
             dev: {
                 client: {
@@ -1956,44 +1998,46 @@ const createBrowserRuntime = async ({ context, manifestPath, manifestSource, tem
         {
             name: 'rstest:browser-user-config',
             setup (api) {
-                api.modifyEnvironmentConfig((config, { mergeEnvironmentConfig })=>{
-                    const merged = mergeEnvironmentConfig(config, userRsbuildConfig, {
-                        source: {
-                            entry: {
-                                runner: resolveBrowserFile('client/entry.ts')
-                            }
-                        },
-                        resolve: {
-                            alias: rstestInternalAliases
-                        },
-                        output: {
-                            target: 'web',
-                            sourceMap: {
-                                js: 'source-map'
-                            }
-                        },
-                        tools: {
-                            rspack: (rspackConfig)=>{
-                                rspackConfig.mode = 'development';
-                                rspackConfig.lazyCompilation = {
-                                    imports: true,
-                                    entries: false
-                                };
-                                rspackConfig.plugins = rspackConfig.plugins || [];
-                                rspackConfig.plugins.push(virtualManifestPlugin);
-                                const browserRuntimeDir = dirname(browserRuntimePath);
-                                rspackConfig.module = rspackConfig.module || {};
-                                rspackConfig.module.rules = rspackConfig.module.rules || [];
-                                rspackConfig.module.rules.unshift({
-                                    test: /\.js$/,
-                                    include: browserRuntimeDir,
-                                    extractSourceMap: true
-                                });
-                                if (isDebug()) logger.log(`[rstest:browser] extractSourceMap rule added for: ${browserRuntimeDir}`);
+                api.modifyEnvironmentConfig({
+                    handler: (config, { mergeEnvironmentConfig })=>{
+                        const merged = mergeEnvironmentConfig(config, userRsbuildConfig, {
+                            resolve: {
+                                alias: rstestInternalAliases
+                            },
+                            output: {
+                                target: 'web',
+                                sourceMap: {
+                                    js: 'source-map'
+                                }
+                            },
+                            tools: {
+                                rspack: (rspackConfig)=>{
+                                    rspackConfig.mode = 'development';
+                                    rspackConfig.lazyCompilation = {
+                                        imports: true,
+                                        entries: false
+                                    };
+                                    rspackConfig.plugins = rspackConfig.plugins || [];
+                                    rspackConfig.plugins.push(virtualManifestPlugin);
+                                    const browserRuntimeDir = dirname(browserRuntimePath);
+                                    rspackConfig.module = rspackConfig.module || {};
+                                    rspackConfig.module.rules = rspackConfig.module.rules || [];
+                                    rspackConfig.module.rules.unshift({
+                                        test: /\.js$/,
+                                        include: browserRuntimeDir,
+                                        extractSourceMap: true
+                                    });
+                                    if (isDebug()) logger.log(`[rstest:browser] extractSourceMap rule added for: ${browserRuntimeDir}`);
+                                }
                             }
-                        }
-                    });
-                    return merged;
+                        });
+                        merged.source = merged.source || {};
+                        merged.source.entry = {
+                            runner: resolveBrowserFile('client/entry.ts')
+                        };
+                        return merged;
+                    },
+                    order: 'post'
                 });
             }
         }
@@ -2006,7 +2050,17 @@ const createBrowserRuntime = async ({ context, manifestPath, manifestSource, tem
                     if (!watchContext.hooksEnabled) return;
                     logger.log(color.cyan('\nFile changed, re-running tests...\n'));
                 });
-                api.onAfterDevCompile(async ()=>{
+                api.onAfterDevCompile(async ({ stats })=>{
+                    if (stats) {
+                        const projectEntries = await collectProjectEntries(context);
+                        const entryTestFiles = new Set(projectEntries.flatMap((entry)=>entry.testFiles.map((f)=>normalize(f))));
+                        const statsJson = stats.toJson({
+                            all: true
+                        });
+                        const affected = getAffectedTestFiles(statsJson.chunks, entryTestFiles);
+                        watchContext.affectedTestFiles = affected;
+                        if (affected.length > 0) logger.debug(`[Watch] Affected test files: ${affected.join(', ')}`);
+                    }
                     if (!watchContext.hooksEnabled) return;
                     await onTriggerRerun();
                 });
@@ -2038,7 +2092,7 @@ const createBrowserRuntime = async ({ context, manifestPath, manifestSource, tem
             res.end(html);
             return true;
         } catch (error) {
-            logger.log(color.yellow(`[Browser UI] Failed to fetch container HTML from dev server: ${String(error)}`));
+            logger.debug(`[Browser UI] Failed to fetch container HTML from dev server: ${String(error)}`);
             return false;
         }
     };
@@ -2057,7 +2111,7 @@ const createBrowserRuntime = async ({ context, manifestPath, manifestSource, tem
             res.end(buffer);
             return true;
         } catch (error) {
-            logger.log(color.yellow(`[Browser UI] Failed to proxy asset from dev server: ${String(error)}`));
+            logger.debug(`[Browser UI] Failed to proxy asset from dev server: ${String(error)}`);
             return false;
         }
     };
@@ -2080,13 +2134,13 @@ const createBrowserRuntime = async ({ context, manifestPath, manifestSource, tem
                 res.statusCode = 204;
                 res.end();
             } catch (error) {
-                logger.log(color.yellow(`[Browser UI] Failed to open editor: ${String(error)}`));
+                logger.debug(`[Browser UI] Failed to open editor: ${String(error)}`);
                 res.statusCode = 500;
                 res.end('Failed to open editor');
             }
             return;
         }
-        if ('/' === url.pathname || '/container.html' === url.pathname) {
+        if ('/' === url.pathname) {
             if (await respondWithDevServerHtml(url, res)) return;
             const html = injectedContainerHtml || containerHtmlTemplate?.replace(optionsPlaceholder, 'null');
             if (html) {
@@ -2113,11 +2167,15 @@ const createBrowserRuntime = async ({ context, manifestPath, manifestSource, tem
         next();
     });
     const { port } = await devServer.listen();
-    const wsPort = port + 1;
     const wss = new WebSocketServer({
-        port: wsPort
+        port: 0
+    });
+    await new Promise((resolve, reject)=>{
+        wss.once('listening', resolve);
+        wss.once('error', reject);
     });
-    logger.log(color.gray(`[Browser UI] WebSocket server started on port ${wsPort}`));
+    const wsPort = wss.address().port;
+    logger.debug(`[Browser UI] WebSocket server started on port ${wsPort}`);
     let browserLauncher;
     const browserName = context.normalizedConfig.browser.browser;
     try {
@@ -2156,14 +2214,15 @@ const createBrowserRuntime = async ({ context, manifestPath, manifestSource, tem
         wss
     };
 };
-const runBrowserController = async (context)=>{
+const runBrowserController = async (context, options)=>{
+    const { skipOnTestRunEnd = false } = options ?? {};
     const buildStart = Date.now();
     const containerDevServerEnv = process.env.RSTEST_CONTAINER_DEV_SERVER;
     let containerDevServer;
     let containerDistPath;
     if (containerDevServerEnv) try {
         containerDevServer = new URL(containerDevServerEnv).toString();
-        logger.log(color.gray(`[Browser UI] Using dev server for container: ${containerDevServer}`));
+        logger.debug(`[Browser UI] Using dev server for container: ${containerDevServer}`);
     } catch (error) {
         logger.error(color.red(`Invalid RSTEST_CONTAINER_DEV_SERVER value: ${String(error)}`));
         ensureProcessExitCode(1);
@@ -2289,7 +2348,10 @@ const runBrowserController = async (context)=>{
     }
     const createRpcMethods = ()=>({
             async rerunTest (testFile, testNamePattern) {
-                logger.log(color.cyan(`\nRe-running test: ${testFile}${testNamePattern ? ` (pattern: ${testNamePattern})` : ''}\n`));
+                const projectName = context.normalizedConfig.name || 'project';
+                const relativePath = relative(context.rootPath, testFile);
+                const displayPath = `<${projectName}>/${relativePath}`;
+                logger.log(color.cyan(`\nRe-running test: ${displayPath}${testNamePattern ? ` (pattern: ${testNamePattern})` : ''}\n`));
                 await rpcManager.reloadTestFile(testFile, testNamePattern);
             },
             async getTestFiles () {
@@ -2364,10 +2426,10 @@ const runBrowserController = async (context)=>{
         if (isWatchMode) runtime.rpcManager = rpcManager;
     }
     if (isNewPage) {
-        await containerPage.goto(`http://localhost:${port}/container.html`, {
+        await containerPage.goto(`http://localhost:${port}/`, {
             waitUntil: 'load'
         });
-        logger.log(color.cyan(`\nContainer page opened at http://localhost:${port}/container.html\n`));
+        logger.log(color.cyan(`\nBrowser mode opened at http://localhost:${port}/\n`));
     }
     const maxTestTimeout = Math.max(...browserProjectsForRuntime.map((p)=>p.normalizedConfig.testTimeout ?? 5000));
     const totalTimeoutMs = maxTestTimeout * allTestFiles.length + 30000;
@@ -2397,7 +2459,12 @@ const runBrowserController = async (context)=>{
             watchContext.lastTestFiles = currentTestFiles;
             await rpcManager.notifyTestFileUpdate(currentTestFiles);
         }
-        logger.log(color.cyan('Tests will be re-executed automatically\n'));
+        const affectedFiles = watchContext.affectedTestFiles;
+        watchContext.affectedTestFiles = [];
+        if (affectedFiles.length > 0) {
+            logger.log(color.cyan(`Re-running ${affectedFiles.length} affected test file(s)...\n`));
+            for (const testFile of affectedFiles)await rpcManager.reloadTestFile(testFile);
+        } else if (!filesChanged) logger.log(color.cyan('Tests will be re-executed automatically\n'));
     };
     if (!isWatchMode) await destroyBrowserRuntime(runtime);
     if (fatalError) {
@@ -2413,7 +2480,13 @@ const runBrowserController = async (context)=>{
     context.updateReporterResultState(reporterResults, caseResults);
     const isFailure = reporterResults.some((result)=>'fail' === result.status);
     if (isFailure) ensureProcessExitCode(1);
-    for (const reporter of context.reporters)await reporter.onTestRunEnd?.({
+    const result = {
+        results: reporterResults,
+        testResults: caseResults,
+        duration,
+        hasFailure: isFailure
+    };
+    if (!skipOnTestRunEnd) for (const reporter of context.reporters)await reporter.onTestRunEnd?.({
         results: context.reporterResults.results,
         testResults: context.reporterResults.testResults,
         duration,
@@ -2424,6 +2497,7 @@ const runBrowserController = async (context)=>{
         watchContext.hooksEnabled = true;
         logger.log(color.cyan('\nWatch mode enabled - will re-run tests on file changes\n'));
     }
+    return result;
 };
 const listBrowserTests = async (context)=>{
     const projectEntries = await collectProjectEntries(context);
@@ -2567,8 +2641,8 @@ const listBrowserTests = async (context)=>{
         close: cleanup
     };
 };
-async function runBrowserTests(context) {
-    await runBrowserController(context);
+async function runBrowserTests(context, options) {
+    return runBrowserController(context, options);
 }
 async function src_listBrowserTests(context) {
     return listBrowserTests(context);

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@rstest/browser",
-  "version": "0.7.9",
+  "version": "0.8.0",
   "description": "Browser mode support for Rstest testing framework.",
   "bugs": {
     "url": "https://github.com/web-infra-dev/rstest/issues"
@@ -34,11 +34,6 @@
     "dist",
     "src"
   ],
-  "scripts": {
-    "build": "rslib build",
-    "typecheck": "tsc --noEmit",
-    "dev": "rslib build --watch"
-  },
   "dependencies": {
     "@jridgewell/trace-mapping": "0.3.31",
     "convert-source-map": "^2.0.0",
@@ -49,9 +44,6 @@
   },
   "devDependencies": {
     "@rslib/core": "^0.19.0",
-    "@rstest/browser-ui": "workspace:*",
-    "@rstest/core": "workspace:*",
-    "@rstest/tsconfig": "workspace:*",
     "@types/convert-source-map": "^2.0.3",
     "@types/picomatch": "^4.0.2",
     "@types/ws": "^8.18.1",
@@ -59,11 +51,14 @@
     "birpc": "2.9.0",
     "picocolors": "^1.1.1",
     "picomatch": "^4.0.3",
-    "playwright": "^1.49.1"
+    "playwright": "^1.49.1",
+    "@rstest/browser-ui": "0.0.0",
+    "@rstest/core": "0.8.0",
+    "@rstest/tsconfig": "0.0.1"
   },
   "peerDependencies": {
-    "@rstest/core": "workspace:^",
-    "playwright": "^1.49.1"
+    "playwright": "^1.49.1",
+    "@rstest/core": "^0.8.0"
   },
   "peerDependenciesMeta": {
     "playwright": {
@@ -76,5 +71,10 @@
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
+  },
+  "scripts": {
+    "build": "rslib build",
+    "typecheck": "tsc --noEmit",
+    "dev": "rslib build --watch"
   }
-}
+}