@rstest/core 0.8.4 → 0.8.5

package/dist/0~1472.js

@@ -4,7 +4,7 @@ import { pathToFileURL } from "./6198.js";
 import "./1157.js";
 import { logger as logger_logger, color } from "./3160.js";
 async function loadBrowserModule(options = {}) {
-    const coreVersion = "0.8.4";
+    const coreVersion = "0.8.5";
     const { projectRoots = [] } = options;
     let browserModule;
     let browserVersion;

package/dist/0~5835.js

@@ -5,7 +5,7 @@ import { createRequire as external_node_module_createRequire } from "./4881.js";
 import { pathToFileURL } from "./6198.js";
 import { node_vm, asModule, shouldInterop, interopModule } from "./0~3346.js";
 import { posix } from "./7011.js";
-const external_node_path_ = __webpack_require__("node:path");
+const external_node_path_ = __webpack_require__("path");
 const isRelativePath = (p)=>/^\.\.?\//.test(p);
 const createRequire = (filename, distPath, rstestContext, assetFiles, interopDefault)=>{
     const _require = (()=>{

package/dist/0~6588.js

@@ -27,7 +27,7 @@ async function createChokidar(pathOrGlobs, root, options) {
     }
     return chokidar.watch(Array.from(watchFiles), options);
 }
-const external_node_path_ = __webpack_require__("node:path");
+const external_node_path_ = __webpack_require__("path");
 const picocolors = __webpack_require__("../../node_modules/.pnpm/picocolors@1.1.1/node_modules/picocolors/picocolors.js");
 let cleaners = [];
 const onBeforeRestart = (cleaner)=>{

package/dist/0~6923.js

@@ -4,7 +4,7 @@ import { logger as logger_logger } from "./3160.js";
 import { pathToFileURL } from "./6198.js";
 import { node_vm, interopModule, shouldInterop } from "./0~3346.js";
 import { posix } from "./7011.js";
-const external_node_path_ = __webpack_require__("node:path");
+const external_node_path_ = __webpack_require__("path");
 var loadEsModule_EsmMode = /*#__PURE__*/ function(EsmMode) {
     EsmMode[EsmMode["Unknown"] = 0] = "Unknown";
     EsmMode[EsmMode["Evaluated"] = 1] = "Evaluated";

package/dist/0~7583.js

@@ -6,7 +6,7 @@ import "./3160.js";
 import { readdir as promises_readdir, lstat as promises_lstat, promises_stat as promises_promises_stat, realpath as external_node_fs_promises_realpath } from "./1157.js";
 import { Readable } from "./0~1981.js";
 import { EventEmitter } from "./9131.js";
-const external_node_path_ = __webpack_require__("node:path");
+const external_node_path_ = __webpack_require__("path");
 const EntryTypes = {
     FILE_TYPE: 'files',
     DIR_TYPE: 'directories',

package/dist/0~7882.js

@@ -5,7 +5,7 @@ import { detect, resolveCommand } from "./9131.js";
 import { Ie, Me, ye, M, dist_Y, Se, ve, pD, xe } from "./0~9348.js";
 import "./1157.js";
 const external_node_fs_ = __webpack_require__("node:fs");
-const external_node_path_ = __webpack_require__("node:path");
+const external_node_path_ = __webpack_require__("path");
 function getUniqueBaseName(dir, baseName, ext) {
     const fullPath = external_node_path_["default"].join(dir, `${baseName}${ext}`);
     if (!external_node_fs_["default"].existsSync(fullPath)) return baseName;
@@ -372,7 +372,7 @@ async function createInteractive(cwd, projectInfo, isAgent) {
     }
     const provider = providerSelection;
     const preview = computeFilePreview(cwd, projectInfo);
-    const deps = getDependenciesWithVersions(effectiveFramework, provider, "0.8.4");
+    const deps = getDependenciesWithVersions(effectiveFramework, provider, "0.8.5");
     const depsList = Object.entries(deps).map(([name, version])=>`${name}@${version}`).join(', ');
     const previewLines = [
         `${color.cyan('+')} Create ${preview.configFile}`,
@@ -450,7 +450,7 @@ async function generateFiles(cwd, projectInfo, provider) {
     updatePackageJsonScripts(cwd, {
         'test:browser': 'rstest --config=rstest.browser.config.ts'
     });
-    const deps = getDependenciesWithVersions(effectiveFramework, provider, "0.8.4");
+    const deps = getDependenciesWithVersions(effectiveFramework, provider, "0.8.5");
     updatePackageJsonDevDeps(cwd, deps);
     return createdFiles;
 }

package/dist/0~89.js

@@ -5,7 +5,7 @@ import { Tinypool } from "tinypool";
 import node_inspector from "node:inspector";
 import { basename, needFlagExperimentalDetectModule, isDeno, dirname, castArray, resolve as pathe_M_eThtNZ_resolve, serializableConfig, node_process, isDebug, color, getForceColorEnv, ADDITIONAL_NODE_BUILTINS, bgColor, join } from "./3160.js";
 import { fileURLToPath } from "./6198.js";
-import { node_v8, parseWorkerMetaMessage, createBirpc } from "./9869.js";
+import { node_v8, parseWorkerMetaMessage, createBirpc } from "./5960.js";
 import { TEMP_RSTEST_OUTPUT_DIR, TEMP_RSTEST_OUTPUT_DIR_GLOB } from "./1157.js";
 import { posix } from "./7011.js";
 import { isBuiltin } from "./4881.js";
@@ -198,9 +198,8 @@ const createWorkerStderrCapture = (pool)=>{
 };
 const forks_filename = fileURLToPath(import.meta.url);
 const forks_dirname = dirname(forks_filename);
-function createChannel(rpcMethods, onWorkerMeta) {
+function createForksChannel(rpcMethods, onWorkerMeta, createBirpcImpl = createBirpc) {
     const emitter = new node_events();
-    const cleanup = ()=>emitter.removeAllListeners();
     const events = {
         message: 'message',
         response: 'response'
@@ -215,9 +214,10 @@ function createChannel(rpcMethods, onWorkerMeta) {
             emitter.emit(events.response, message);
         }
     };
-    createBirpc(rpcMethods, {
+    const rpc = createBirpcImpl(rpcMethods, {
         serialize: node_v8.serialize,
         deserialize: (v)=>node_v8.deserialize(Buffer.from(v)),
+        timeout: -1,
         post (v) {
             emitter.emit(events.message, v);
         },
@@ -225,9 +225,13 @@ function createChannel(rpcMethods, onWorkerMeta) {
             emitter.on(events.response, fn);
         }
     });
+    const cleanup = ()=>{
+        rpc.$close(new Error('[rstest-pool]: Pending methods while closing rpc'));
+        emitter.removeAllListeners();
+    };
     return {
-        channel,
-        cleanup
+        channel: channel,
+        cleanup: cleanup
     };
 }
 const createForksPool = (poolOptions)=>{
@@ -250,7 +254,7 @@ const createForksPool = (poolOptions)=>{
         runTest: async ({ options, rpcMethods })=>{
             const taskId = ++nextTaskId;
             stderrCapture.createTask(taskId);
-            const { channel, cleanup } = createChannel(rpcMethods, ({ pid })=>{
+            const { channel, cleanup } = createForksChannel(rpcMethods, ({ pid })=>{
                 stderrCapture.bindTaskToPid(taskId, pid);
             });
             try {
@@ -268,7 +272,7 @@ const createForksPool = (poolOptions)=>{
         collectTests: async ({ options, rpcMethods })=>{
             const taskId = ++nextTaskId;
             stderrCapture.createTask(taskId);
-            const { channel, cleanup } = createChannel(rpcMethods, ({ pid })=>{
+            const { channel, cleanup } = createForksChannel(rpcMethods, ({ pid })=>{
                 stderrCapture.bindTaskToPid(taskId, pid);
             });
             try {
@@ -597,7 +601,7 @@ async function runGlobalTeardown() {
         process.exitCode = 1;
     }
 }
-const external_node_path_ = __webpack_require__("node:path");
+const external_node_path_ = __webpack_require__("path");
 const RUNTIME_CHUNK_NAME = 'runtime';
 const requireShim = `// Rstest ESM shims
 import __rstest_shim_module__ from 'node:module';

package/dist/0~9634.js

@@ -4,7 +4,7 @@ import { logger as logger_logger, getTaskNameWithPrefix, color, bgColor } from "
 import { prepareRsbuild, createPool, createRsbuildServer, runGlobalTeardown, runGlobalSetup } from "./0~89.js";
 import { getTestEntries, resolveShardedEntries, prettyTestPath, ROOT_SUITE_NAME } from "./1157.js";
 const external_node_fs_ = __webpack_require__("node:fs");
-const external_node_path_ = __webpack_require__("node:path");
+const external_node_path_ = __webpack_require__("path");
 const collectNodeTests = async ({ context, nodeProjects, globTestSourceEntries })=>{
     const { getSetupFiles } = await import("./6973.js").then((mod)=>({
             getSetupFiles: mod.getSetupFiles

package/dist/1157.js

@@ -1441,7 +1441,7 @@ const globalApis = [
     'onTestFailed'
 ];
 const TS_CONFIG_FILE = 'tsconfig.json';
-const external_node_path_ = __webpack_require__("node:path");
+const external_node_path_ = __webpack_require__("path");
 const external_node_fs_ = __webpack_require__("node:fs");
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 function cleanPath(path) {

package/dist/3160.js

@@ -79,7 +79,7 @@ __webpack_require__.add({
     "node:os" (module) {
         module.exports = __rspack_external_node_os_74b4b876;
     },
-    "node:path" (module) {
+    path (module) {
         module.exports = __rspack_external_node_path_c5b9b54f;
     },
     "node:tty" (module) {

package/dist/487.js

@@ -35,7 +35,7 @@ __webpack_require__.add({
     "../../node_modules/.pnpm/source-map-support@0.5.21/node_modules/source-map-support/source-map-support.js" (module, exports, __webpack_require__) {
         module = __webpack_require__.nmd(module);
         var SourceMapConsumer = __webpack_require__("../../node_modules/.pnpm/source-map@0.6.1/node_modules/source-map/source-map.js").SourceMapConsumer;
-        var path = __webpack_require__("node:path");
+        var path = __webpack_require__("path");
         var fs;
         try {
             fs = __webpack_require__("node:fs");

package/dist/{9869.js → 5960.js}

@@ -19,15 +19,32 @@ const parseWorkerMetaMessage = (message)=>{
 };
 const TYPE_REQUEST = "q";
 const TYPE_RESPONSE = "s";
-const DEFAULT_TIMEOUT = 6e4;
-function defaultSerialize(i) {
-    return i;
+function createPromiseWithResolvers() {
+    let resolve;
+    let reject;
+    return {
+        promise: new Promise((res, rej)=>{
+            resolve = res;
+            reject = rej;
+        }),
+        resolve,
+        reject
+    };
+}
+const random = Math.random.bind(Math);
+const urlAlphabet = "useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict";
+function nanoid(size = 21) {
+    let id = "";
+    let i = size;
+    while(i--)id += urlAlphabet[64 * random() | 0];
+    return id;
 }
+const DEFAULT_TIMEOUT = 6e4;
+const defaultSerialize = (i)=>i;
 const defaultDeserialize = defaultSerialize;
 const { clearTimeout: dist_clearTimeout, setTimeout: dist_setTimeout } = globalThis;
-const random = Math.random.bind(Math);
 function createBirpc($functions, options) {
-    const { post, on, off = ()=>{}, eventNames = [], serialize = defaultSerialize, deserialize = defaultDeserialize, resolver, bind = "rpc", timeout = DEFAULT_TIMEOUT } = options;
+    const { post, on, off = ()=>{}, eventNames = [], serialize = defaultSerialize, deserialize = defaultDeserialize, resolver, bind = "rpc", timeout = DEFAULT_TIMEOUT, proxify = true } = options;
     let $closed = false;
     const _rpcPromiseMap = /* @__PURE__ */ new Map();
     let _promiseInit;
@@ -55,8 +72,7 @@ function createBirpc($functions, options) {
             if (timeout >= 0) {
                 timeoutId = dist_setTimeout(()=>{
                     try {
-                        const handleResult = options.onTimeoutError?.call(rpc, method, args);
-                        if (true !== handleResult) throw new Error(`[birpc] timeout on calling "${method}"`);
+                        if (options.onTimeoutError?.call(rpc, method, args) !== true) throw new Error(`[birpc] timeout on calling "${method}"`);
                     } catch (e) {
                         reject(e);
                     }
@@ -85,15 +101,11 @@ function createBirpc($functions, options) {
         }
         return promise;
     }
-    const $call = (method, ...args)=>_call(method, args, false);
-    const $callOptional = (method, ...args)=>_call(method, args, false, true);
-    const $callEvent = (method, ...args)=>_call(method, args, true);
-    const $callRaw = (options2)=>_call(options2.method, options2.args, options2.event, options2.optional);
     const builtinMethods = {
-        $call,
-        $callOptional,
-        $callEvent,
-        $callRaw,
+        $call: (method, ...args)=>_call(method, args, false),
+        $callOptional: (method, ...args)=>_call(method, args, false, true),
+        $callEvent: (method, ...args)=>_call(method, args, true),
+        $callRaw: (options$1)=>_call(options$1.method, options$1.args, options$1.event, options$1.optional),
         $rejectPendingCalls,
         get $closed () {
             return $closed;
@@ -104,7 +116,7 @@ function createBirpc($functions, options) {
         $close,
         $functions
     };
-    rpc = new Proxy({}, {
+    rpc = proxify ? new Proxy({}, {
         get (_, method) {
             if (Object.prototype.hasOwnProperty.call(builtinMethods, method)) return builtinMethods[method];
             if ("then" === method && !eventNames.includes("then") && !("then" in $functions)) return;
@@ -117,11 +129,11 @@ function createBirpc($functions, options) {
             sendCall.asEvent = sendEvent;
             return sendCall;
         }
-    });
+    }) : builtinMethods;
     function $close(customError) {
         $closed = true;
         _rpcPromiseMap.forEach(({ reject, method })=>{
-            const error = new Error(`[birpc] rpc is closed, cannot call "${method}"`);
+            const error = /* @__PURE__ */ new Error(`[birpc] rpc is closed, cannot call "${method}"`);
             if (customError) {
                 customError.cause ??= error;
                 return reject(customError);
@@ -132,9 +144,8 @@ function createBirpc($functions, options) {
         off(onMessage);
     }
     function $rejectPendingCalls(handler) {
-        const entries = Array.from(_rpcPromiseMap.values());
-        const handlerResults = entries.map(({ method, reject })=>{
-            if (!handler) return reject(new Error(`[birpc]: rejected pending call "${method}".`));
+        const handlerResults = Array.from(_rpcPromiseMap.values()).map(({ method, reject })=>{
+            if (!handler) return reject(/* @__PURE__ */ new Error(`[birpc]: rejected pending call "${method}".`));
             return handler({
                 method,
                 reject
@@ -161,9 +172,8 @@ function createBirpc($functions, options) {
             } catch (e) {
                 error = e;
             }
-            else error = new Error(`[birpc] function "${method}" not found`);
+            else error = /* @__PURE__ */ new Error(`[birpc] function "${method}" not found`);
             if (msg.i) {
-                if (error && options.onError) options.onError.call(rpc, error, method, args);
                 if (error && options.onFunctionError) {
                     if (true === options.onFunctionError.call(rpc, error, method, args)) return;
                 }
@@ -202,25 +212,5 @@ function createBirpc($functions, options) {
     _promiseInit = on(onMessage);
     return rpc;
 }
-function createPromiseWithResolvers() {
-    let resolve;
-    let reject;
-    const promise = new Promise((res, rej)=>{
-        resolve = res;
-        reject = rej;
-    });
-    return {
-        promise,
-        resolve,
-        reject
-    };
-}
-const urlAlphabet = "useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict";
-function nanoid(size = 21) {
-    let id = "";
-    let i = size;
-    while(i--)id += urlAlphabet[64 * random() | 0];
-    return id;
-}
 export { default as node_v8 } from "node:v8";
 export { createBirpc, createWorkerMetaMessage, parseWorkerMetaMessage };

package/dist/9131.js

@@ -504,7 +504,7 @@ function prepareCli() {
     if (!npm_execpath || npm_execpath.includes('npx-cli.js') || npm_execpath.includes('.bun')) logger_logger.log();
 }
 function showRstest() {
-    logger_logger.greet("  Rstest v0.8.4");
+    logger_logger.greet("  Rstest v0.8.5");
     logger_logger.log('');
 }
 const applyCommonOptions = (cli)=>{
@@ -562,7 +562,7 @@ const runRest = async ({ options, filters, command })=>{
 function setupCommands() {
     const cli = dist('rstest');
     cli.help();
-    cli.version("0.8.4");
+    cli.version("0.8.5");
     applyCommonOptions(cli);
     cli.command('[...filters]', 'run tests').option('-w, --watch', 'Run tests in watch mode').action(async (filters, options)=>{
         if (!determineAgent().isAgent) showRstest();
@@ -2191,7 +2191,7 @@ function traceSegmentInternal(segments, memo, line, column, bias) {
     if (-1 === index || index === segments.length) return -1;
     return index;
 }
-const external_node_path_ = __webpack_require__("node:path");
+const external_node_path_ = __webpack_require__("path");
 const isRelativePath = (p)=>/^\.\.?\//.test(p);
 const hintNotDefinedError = (message)=>{
     const [, varName] = message.match(/(\w+) is not defined/) || [];
@@ -3452,7 +3452,7 @@ class MdReporter {
     }
     renderFrontMatter(lines) {
         const frontMatter = {
-            tool: "@rstest/core@0.8.4",
+            tool: "@rstest/core@0.8.5",
             timestamp: new Date().toISOString()
         };
         if (this.options.header.env) frontMatter.runtime = {
@@ -3822,7 +3822,7 @@ class Rstest {
             updateSnapshot: rstestConfig.update ? 'all' : T ? 'none' : 'new'
         });
         this.snapshotManager = snapshotManager;
-        this.version = "0.8.4";
+        this.version = "0.8.5";
         this.rootPath = rootPath;
         this.originalConfig = userConfig;
         this.normalizedConfig = rstestConfig;

package/dist/mockRuntimeCode.js

@@ -40,7 +40,9 @@ __webpack_require__.rstest_require_actual = __webpack_require__.rstest_import_ac
     }
     return __webpack_require__(id);
 };
-const getMockImplementation = (mockType = 'mock')=>(id, modFactory)=>{
+const getMockImplementation = (mockType = 'mock')=>{
+    const isMockRequire = 'mockRequire' === mockType || 'doMockRequire' === mockType;
+    return (id, modFactory)=>{
         let requiredModule = __webpack_module_cache__[id]?.exports;
         const wasAlreadyLoaded = !!requiredModule;
         if (requiredModule) {
@@ -66,7 +68,11 @@ const getMockImplementation = (mockType = 'mock')=>(id, modFactory)=>{
             const mockedModule = globalThis.RSTEST_API?.rstest?.mockObject(originalModule, {
                 spy: isSpy
             }) || originalModule;
-            const finalModFactory = function(__unused_webpack_module, __webpack_exports__, __webpack_require__1) {
+            const finalModFactory = function(__webpack_module__, __webpack_exports__, __webpack_require__1) {
+                if (isMockRequire) {
+                    __webpack_module__.exports = mockedModule;
+                    return;
+                }
                 __webpack_require__1.r(__webpack_exports__);
                 for(const key in mockedModule)__webpack_require__1.d(__webpack_exports__, {
                     [key]: ()=>mockedModule[key]
@@ -83,9 +89,13 @@ const getMockImplementation = (mockType = 'mock')=>(id, modFactory)=>{
             exports: __webpack_require__(modFactory)
         };
         else if ('function' == typeof modFactory) {
-            const finalModFactory = function(__unused_webpack_module, __webpack_exports__, __webpack_require__1) {
-                __webpack_require__1.r(__webpack_exports__);
+            const finalModFactory = function(__webpack_module__, __webpack_exports__, __webpack_require__1) {
                 const res = modFactory();
+                if (isMockRequire) {
+                    __webpack_module__.exports = res;
+                    return;
+                }
+                __webpack_require__1.r(__webpack_exports__);
                 for(const key in res)__webpack_require__1.d(__webpack_exports__, {
                     [key]: ()=>res[key]
                 });
@@ -94,6 +104,7 @@ const getMockImplementation = (mockType = 'mock')=>(id, modFactory)=>{
             delete __webpack_module_cache__[id];
         }
     };
+};
 __webpack_require__.rstest_mock = getMockImplementation('mock');
 __webpack_require__.rstest_mock_require = getMockImplementation('mockRequire');
 __webpack_require__.rstest_do_mock = getMockImplementation('doMock');

package/dist/worker.js

@@ -2,7 +2,7 @@ import "node:module";
 import { __webpack_require__ } from "./rslib-runtime.js";
 import { basename, isAbsolute, undoSerializableConfig, dirname, color, resolve as pathe_M_eThtNZ_resolve, join } from "./3160.js";
 import "./487.js";
-import { node_v8, createWorkerMetaMessage, createBirpc } from "./9869.js";
+import { node_v8, createWorkerMetaMessage, createBirpc } from "./5960.js";
 import { createCoverageProvider } from "./5734.js";
 import { formatTestError, setRealTimers, getRealTimers } from "./1294.js";
 import { globalApis } from "./1157.js";
@@ -26,30 +26,10 @@ function createForksRpcOptions({ nodeV8 = node_v8, dispose = [] }) {
         }
     };
 }
-function createRuntimeRpc(options, { originalConsole }) {
-    const rpc = createBirpc({}, {
+function createRuntimeRpc(options, createBirpcImpl = createBirpc) {
+    const rpc = createBirpcImpl({}, {
         ...options,
-        onTimeoutError: (functionName, error)=>{
-            switch(functionName){
-                case 'onTestCaseStart':
-                    {
-                        const caseTest = error[0];
-                        console.error(`[Rstest] timeout on calling "onTestCaseStart" rpc method (Case: "${caseTest.name}")`);
-                        return true;
-                    }
-                case 'onTestCaseResult':
-                    {
-                        const caseResult = error[0];
-                        console.error(`[Rstest] timeout on calling "onTestCaseResult" rpc method (Case: "${caseResult.name}", Result: "${caseResult.status}")`);
-                        return true;
-                    }
-                case 'onConsoleLog':
-                    originalConsole.error(`[Rstest] timeout on calling "onConsoleLog" rpc method (Original log: ${error[0].content})`);
-                    return true;
-                default:
-                    return false;
-            }
-        }
+        timeout: -1
     });
     return {
         rpc
@@ -135,13 +115,10 @@ const preparePool = async ({ entryInfo: { distPath, testPath }, updateSnapshot,
     context.runtimeConfig = undoSerializableConfig(context.runtimeConfig);
     process.env.RSTEST_WORKER_ID = String(process.__tinypool_state__.workerId || context.taskId);
     const cleanupFns = [];
-    const originalConsole = global.console;
     const disposeFns = [];
     const { rpc } = createRuntimeRpc(createForksRpcOptions({
         dispose: disposeFns
-    }), {
-        originalConsole
-    });
+    }));
     globalCleanups.push(()=>{
         disposeFns.forEach((fn)=>{
             fn();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rstest/core",
-  "version": "0.8.4",
+  "version": "0.8.5",
   "description": "The Rsbuild-based test tool.",
   "bugs": {
     "url": "https://github.com/web-infra-dev/rstest/issues"
@@ -76,7 +76,7 @@
     "@types/source-map-support": "^0.5.10",
     "@vitest/expect": "^3.2.4",
     "@vitest/snapshot": "^3.2.4",
-    "birpc": "2.9.0",
+    "birpc": "^4.0.0",
     "cac": "^6.7.14",
     "chai": "^5.3.3",
     "chokidar": "^4.0.3",