@rstest/core 0.8.1 → 0.8.3

package/dist/0~7882.js

@@ -1,165 +1,11 @@
-import 'module';
-/*#__PURE__*/ import.meta.url;
+import "node:module";
 import { __webpack_require__ } from "./rslib-runtime.js";
-import { node_process, color } from "./3160.js";
-import { determineAgent, promises } from "./1157.js";
+import { determineAgent, color } from "./3160.js";
+import { detect, resolveCommand } from "./9131.js";
 import { Ie, Me, ye, M, dist_Y, Se, ve, pD, xe } from "./0~9348.js";
-const constants_AGENTS = [
-    "npm",
-    "yarn",
-    "yarn@berry",
-    "pnpm",
-    "pnpm@6",
-    "bun",
-    "deno"
-];
-const LOCKS = {
-    "bun.lock": "bun",
-    "bun.lockb": "bun",
-    "deno.lock": "deno",
-    "pnpm-lock.yaml": "pnpm",
-    "pnpm-workspace.yaml": "pnpm",
-    "yarn.lock": "yarn",
-    "package-lock.json": "npm",
-    "npm-shrinkwrap.json": "npm"
-};
-const INSTALL_METADATA = {
-    "node_modules/.deno/": "deno",
-    "node_modules/.pnpm/": "pnpm",
-    "node_modules/.yarn-state.yml": "yarn",
-    "node_modules/.yarn_integrity": "yarn",
-    "node_modules/.package-lock.json": "npm",
-    ".pnp.cjs": "yarn",
-    ".pnp.js": "yarn",
-    "bun.lock": "bun",
-    "bun.lockb": "bun"
-};
-const external_node_path_ = __webpack_require__("node:path");
-async function pathExists(path2, type) {
-    try {
-        const stat = await promises.stat(path2);
-        return "file" === type ? stat.isFile() : stat.isDirectory();
-    } catch  {
-        return false;
-    }
-}
-function* lookup(cwd = node_process.cwd()) {
-    let directory = external_node_path_["default"].resolve(cwd);
-    const { root } = external_node_path_["default"].parse(directory);
-    while(directory && directory !== root){
-        yield directory;
-        directory = external_node_path_["default"].dirname(directory);
-    }
-}
-async function parsePackageJson(filepath, options) {
-    if (!filepath || !await pathExists(filepath, "file")) return null;
-    return await handlePackageManager(filepath, options);
-}
-async function detect(options = {}) {
-    const { cwd, strategies = [
-        "lockfile",
-        "packageManager-field",
-        "devEngines-field"
-    ] } = options;
-    let stopDir;
-    if ("string" == typeof options.stopDir) {
-        const resolved = external_node_path_["default"].resolve(options.stopDir);
-        stopDir = (dir)=>dir === resolved;
-    } else stopDir = options.stopDir;
-    for (const directory of lookup(cwd)){
-        for (const strategy of strategies)switch(strategy){
-            case "lockfile":
-                for (const lock of Object.keys(LOCKS))if (await pathExists(external_node_path_["default"].join(directory, lock), "file")) {
-                    const name = LOCKS[lock];
-                    const result = await parsePackageJson(external_node_path_["default"].join(directory, "package.json"), options);
-                    if (result) return result;
-                    return {
-                        name,
-                        agent: name
-                    };
-                }
-                break;
-            case "packageManager-field":
-            case "devEngines-field":
-                {
-                    const result = await parsePackageJson(external_node_path_["default"].join(directory, "package.json"), options);
-                    if (result) return result;
-                    break;
-                }
-            case "install-metadata":
-                for (const metadata of Object.keys(INSTALL_METADATA)){
-                    const fileOrDir = metadata.endsWith("/") ? "dir" : "file";
-                    if (await pathExists(external_node_path_["default"].join(directory, metadata), fileOrDir)) {
-                        const name = INSTALL_METADATA[metadata];
-                        const agent = "yarn" === name ? isMetadataYarnClassic(metadata) ? "yarn" : "yarn@berry" : name;
-                        return {
-                            name,
-                            agent
-                        };
-                    }
-                }
-                break;
-        }
-        if (stopDir?.(directory)) break;
-    }
-    return null;
-}
-function getNameAndVer(pkg) {
-    const handelVer = (version)=>version?.match(/\d+(\.\d+){0,2}/)?.[0] ?? version;
-    if ("string" == typeof pkg.packageManager) {
-        const [name, ver] = pkg.packageManager.replace(/^\^/, "").split("@");
-        return {
-            name,
-            ver: handelVer(ver)
-        };
-    }
-    if ("string" == typeof pkg.devEngines?.packageManager?.name) return {
-        name: pkg.devEngines.packageManager.name,
-        ver: handelVer(pkg.devEngines.packageManager.version)
-    };
-}
-async function handlePackageManager(filepath, options) {
-    try {
-        const content = await promises.readFile(filepath, "utf8");
-        const pkg = options.packageJsonParser ? await options.packageJsonParser(content, filepath) : JSON.parse(content);
-        let agent;
-        const nameAndVer = getNameAndVer(pkg);
-        if (nameAndVer) {
-            const name = nameAndVer.name;
-            const ver = nameAndVer.ver;
-            let version = ver;
-            if ("yarn" === name && ver && Number.parseInt(ver) > 1) {
-                agent = "yarn@berry";
-                version = "berry";
-                return {
-                    name,
-                    agent,
-                    version
-                };
-            }
-            if ("pnpm" === name && ver && Number.parseInt(ver) < 7) {
-                agent = "pnpm@6";
-                return {
-                    name,
-                    agent,
-                    version
-                };
-            }
-            if (!constants_AGENTS.includes(name)) return options.onUnknown?.(pkg.packageManager) ?? null;
-            agent = name;
-            return {
-                name,
-                agent,
-                version
-            };
-        }
-    } catch  {}
-    return null;
-}
-function isMetadataYarnClassic(metadataPath) {
-    return metadataPath.endsWith(".yarn_integrity");
-}
+import "./1157.js";
 const external_node_fs_ = __webpack_require__("node:fs");
+const external_node_path_ = __webpack_require__("node: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;
@@ -266,424 +112,6 @@ async function detectProject(cwd) {
         reactVersion
     };
 }
-function dashDashArg(agent, agentCommand) {
-    return (args)=>{
-        if (args.length > 1) return [
-            agent,
-            agentCommand,
-            args[0],
-            "--",
-            ...args.slice(1)
-        ];
-        return [
-            agent,
-            agentCommand,
-            args[0]
-        ];
-    };
-}
-function denoExecute() {
-    return (args)=>[
-            "deno",
-            "run",
-            `npm:${args[0]}`,
-            ...args.slice(1)
-        ];
-}
-const npm = {
-    agent: [
-        "npm",
-        0
-    ],
-    run: dashDashArg("npm", "run"),
-    install: [
-        "npm",
-        "i",
-        0
-    ],
-    frozen: [
-        "npm",
-        "ci",
-        0
-    ],
-    global: [
-        "npm",
-        "i",
-        "-g",
-        0
-    ],
-    add: [
-        "npm",
-        "i",
-        0
-    ],
-    upgrade: [
-        "npm",
-        "update",
-        0
-    ],
-    "upgrade-interactive": null,
-    dedupe: [
-        "npm",
-        "dedupe",
-        0
-    ],
-    execute: [
-        "npx",
-        0
-    ],
-    "execute-local": [
-        "npx",
-        0
-    ],
-    uninstall: [
-        "npm",
-        "uninstall",
-        0
-    ],
-    global_uninstall: [
-        "npm",
-        "uninstall",
-        "-g",
-        0
-    ]
-};
-const yarn = {
-    agent: [
-        "yarn",
-        0
-    ],
-    run: [
-        "yarn",
-        "run",
-        0
-    ],
-    install: [
-        "yarn",
-        "install",
-        0
-    ],
-    frozen: [
-        "yarn",
-        "install",
-        "--frozen-lockfile",
-        0
-    ],
-    global: [
-        "yarn",
-        "global",
-        "add",
-        0
-    ],
-    add: [
-        "yarn",
-        "add",
-        0
-    ],
-    upgrade: [
-        "yarn",
-        "upgrade",
-        0
-    ],
-    "upgrade-interactive": [
-        "yarn",
-        "upgrade-interactive",
-        0
-    ],
-    dedupe: null,
-    execute: [
-        "npx",
-        0
-    ],
-    "execute-local": dashDashArg("yarn", "exec"),
-    uninstall: [
-        "yarn",
-        "remove",
-        0
-    ],
-    global_uninstall: [
-        "yarn",
-        "global",
-        "remove",
-        0
-    ]
-};
-const yarnBerry = {
-    ...yarn,
-    frozen: [
-        "yarn",
-        "install",
-        "--immutable",
-        0
-    ],
-    upgrade: [
-        "yarn",
-        "up",
-        0
-    ],
-    "upgrade-interactive": [
-        "yarn",
-        "up",
-        "-i",
-        0
-    ],
-    dedupe: [
-        "yarn",
-        "dedupe",
-        0
-    ],
-    execute: [
-        "yarn",
-        "dlx",
-        0
-    ],
-    "execute-local": [
-        "yarn",
-        "exec",
-        0
-    ],
-    global: [
-        "npm",
-        "i",
-        "-g",
-        0
-    ],
-    global_uninstall: [
-        "npm",
-        "uninstall",
-        "-g",
-        0
-    ]
-};
-const pnpm = {
-    agent: [
-        "pnpm",
-        0
-    ],
-    run: [
-        "pnpm",
-        "run",
-        0
-    ],
-    install: [
-        "pnpm",
-        "i",
-        0
-    ],
-    frozen: [
-        "pnpm",
-        "i",
-        "--frozen-lockfile",
-        0
-    ],
-    global: [
-        "pnpm",
-        "add",
-        "-g",
-        0
-    ],
-    add: [
-        "pnpm",
-        "add",
-        0
-    ],
-    upgrade: [
-        "pnpm",
-        "update",
-        0
-    ],
-    "upgrade-interactive": [
-        "pnpm",
-        "update",
-        "-i",
-        0
-    ],
-    dedupe: [
-        "pnpm",
-        "dedupe",
-        0
-    ],
-    execute: [
-        "pnpm",
-        "dlx",
-        0
-    ],
-    "execute-local": [
-        "pnpm",
-        "exec",
-        0
-    ],
-    uninstall: [
-        "pnpm",
-        "remove",
-        0
-    ],
-    global_uninstall: [
-        "pnpm",
-        "remove",
-        "--global",
-        0
-    ]
-};
-const bun = {
-    agent: [
-        "bun",
-        0
-    ],
-    run: [
-        "bun",
-        "run",
-        0
-    ],
-    install: [
-        "bun",
-        "install",
-        0
-    ],
-    frozen: [
-        "bun",
-        "install",
-        "--frozen-lockfile",
-        0
-    ],
-    global: [
-        "bun",
-        "add",
-        "-g",
-        0
-    ],
-    add: [
-        "bun",
-        "add",
-        0
-    ],
-    upgrade: [
-        "bun",
-        "update",
-        0
-    ],
-    "upgrade-interactive": [
-        "bun",
-        "update",
-        "-i",
-        0
-    ],
-    dedupe: null,
-    execute: [
-        "bun",
-        "x",
-        0
-    ],
-    "execute-local": [
-        "bun",
-        "x",
-        0
-    ],
-    uninstall: [
-        "bun",
-        "remove",
-        0
-    ],
-    global_uninstall: [
-        "bun",
-        "remove",
-        "-g",
-        0
-    ]
-};
-const deno = {
-    agent: [
-        "deno",
-        0
-    ],
-    run: [
-        "deno",
-        "task",
-        0
-    ],
-    install: [
-        "deno",
-        "install",
-        0
-    ],
-    frozen: [
-        "deno",
-        "install",
-        "--frozen",
-        0
-    ],
-    global: [
-        "deno",
-        "install",
-        "-g",
-        0
-    ],
-    add: [
-        "deno",
-        "add",
-        0
-    ],
-    upgrade: [
-        "deno",
-        "outdated",
-        "--update",
-        0
-    ],
-    "upgrade-interactive": [
-        "deno",
-        "outdated",
-        "--update",
-        0
-    ],
-    dedupe: null,
-    execute: denoExecute(),
-    "execute-local": [
-        "deno",
-        "task",
-        "--eval",
-        0
-    ],
-    uninstall: [
-        "deno",
-        "remove",
-        0
-    ],
-    global_uninstall: [
-        "deno",
-        "uninstall",
-        "-g",
-        0
-    ]
-};
-const COMMANDS = {
-    npm: npm,
-    yarn: yarn,
-    "yarn@berry": yarnBerry,
-    pnpm: pnpm,
-    "pnpm@6": {
-        ...pnpm,
-        run: dashDashArg("pnpm", "run")
-    },
-    bun: bun,
-    deno: deno
-};
-function resolveCommand(agent, command, args) {
-    const value = COMMANDS[agent][command];
-    return constructCommand(value, args);
-}
-function constructCommand(value, args) {
-    if (null == value) return null;
-    const list = "function" == typeof value ? value(args) : value.flatMap((v)=>{
-        if ("number" == typeof v) return args;
-        return [
-            v
-        ];
-    });
-    return {
-        command: list[0],
-        args: list.slice(1)
-    };
-}
 function getConfigTemplate() {
     return `import { defineConfig } from '@rstest/core';
 
@@ -944,7 +372,7 @@ async function createInteractive(cwd, projectInfo, isAgent) {
     }
     const provider = providerSelection;
     const preview = computeFilePreview(cwd, projectInfo);
-    const deps = getDependenciesWithVersions(effectiveFramework, provider, "0.8.1");
+    const deps = getDependenciesWithVersions(effectiveFramework, provider, "0.8.3");
     const depsList = Object.entries(deps).map(([name, version])=>`${name}@${version}`).join(', ');
     const previewLines = [
         `${color.cyan('+')} Create ${preview.configFile}`,
@@ -1022,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.1");
+    const deps = getDependenciesWithVersions(effectiveFramework, provider, "0.8.3");
     updatePackageJsonDevDeps(cwd, deps);
     return createdFiles;
 }

package/dist/0~8426.js

@@ -1,5 +1,4 @@
-import 'module';
-/*#__PURE__*/ import.meta.url;
+import "node:module";
 import { __webpack_require__ } from "./rslib-runtime.js";
 import "./1157.js";
 import { relative, color } from "./3160.js";

package/dist/0~89.js

@@ -1,5 +1,4 @@
-import 'module';
-/*#__PURE__*/ import.meta.url;
+import "node:module";
 import { __webpack_require__ } from "./rslib-runtime.js";
 import node_events from "node:events";
 import { Tinypool } from "tinypool";
@@ -182,8 +181,8 @@ const createPool = async ({ context, recommendWorkerCount = 1 / 0 })=>{
         ],
         env: {
             NODE_ENV: 'test',
-            ...process.env,
-            ...getForceColorEnv()
+            ...getForceColorEnv(),
+            ...process.env
         }
     });
     const rpcMethods = {
@@ -353,8 +352,8 @@ async function createSetupPool() {
         isolateWorkers: false,
         env: {
             NODE_ENV: 'test',
-            ...process.env,
-            ...getForceColorEnv()
+            ...getForceColorEnv(),
+            ...process.env
         }
     };
     const pool = new Tinypool(options);
@@ -662,8 +661,10 @@ const pluginIgnoreResolveError = {
         });
     }
 };
-const enable = void 0 !== node_inspector.url();
-const pluginInspect = ()=>enable ? {
+const hasInspectFlag = (execArgv)=>execArgv?.some((arg)=>arg.startsWith('--inspect')) ?? false;
+const pluginInspect = (options)=>{
+    const enable = void 0 !== node_inspector.url() || hasInspectFlag(options?.poolExecArgv);
+    return enable ? {
         name: 'rstest:inspect',
         setup: (api)=>{
             api.modifyRspackConfig(async (config)=>{
@@ -677,6 +678,7 @@ const pluginInspect = ()=>enable ? {
             });
         }
     } : null;
+};
 const external_node_fs_ = __webpack_require__("node:fs");
 const mockRuntime_dirname = external_node_path_["default"].dirname(fileURLToPath(import.meta.url));
 class MockRuntimeRspackPlugin {
@@ -698,11 +700,11 @@ class MockRuntimeRspackPlugin {
         compiler.hooks.compilation.tap('RstestMockPlugin', (compilation)=>{
             compilation.hooks.runtimeModule.tap('RstestMockChunkLoadingRuntimePlugin', (module)=>{
                 if ('require_chunk_loading' === module.name) {
-                    const finalSource = module.source.source.toString('utf-8').replace('for (var moduleId in moreModules) {', "for (var moduleId in moreModules) {\n		if (Object.keys(__webpack_require__.rstest_original_modules).includes(moduleId)) continue;");
+                    const finalSource = module.source.source.toString('utf-8').replace('for (var moduleId in moreModules) {', "for (var moduleId in moreModules) {\n		if (Object.keys(__webpack_require__.rstest_original_modules).includes(moduleId) || Object.keys(__webpack_require__.rstest_original_module_factories).includes(moduleId)) continue;");
                     module.source.source = Buffer.from(finalSource);
                 }
                 if ('module_chunk_loading' === module.name) {
-                    const finalSource = module.source.source.toString('utf-8').replace('for (moduleId in __webpack_modules__) {', "for (moduleId in __webpack_modules__) {\n		if (Object.keys(__webpack_require__.rstest_original_modules).includes(moduleId)) continue;");
+                    const finalSource = module.source.source.toString('utf-8').replace('for (moduleId in __webpack_modules__) {', "for (moduleId in __webpack_modules__) {\n		if (Object.keys(__webpack_require__.rstest_original_modules).includes(moduleId) || Object.keys(__webpack_require__.rstest_original_module_factories).includes(moduleId)) continue;");
                     module.source.source = Buffer.from(finalSource);
                 }
                 if ('define_property_getters' === module.name) {
@@ -795,7 +797,7 @@ function parseInlineSourceMapStr(code) {
 }
 const isMultiCompiler = (compiler)=>'compilers' in compiler && Array.isArray(compiler.compilers);
 const prepareRsbuild = async (context, globTestSourceEntries, setupFiles, globalSetupFiles)=>{
-    const { command, normalizedConfig: { isolate, dev = {}, coverage } } = context;
+    const { command, normalizedConfig: { isolate, dev = {}, coverage, pool } } = context;
     const projects = context.projects.filter((project)=>!project.normalizedConfig.browser.enabled);
     const debugMode = isDebug();
     __rspack_external__rsbuild_core_1b356efc.logger.level = debugMode ? 'verbose' : 'error';
@@ -843,7 +845,9 @@ const prepareRsbuild = async (context, globTestSourceEntries, setupFiles, global
                     ...setupFiles,
                     ...globalSetupFiles
                 }).flatMap((files)=>Object.values(files))) : null,
-                pluginInspect()
+                pluginInspect({
+                    poolExecArgv: pool.execArgv
+                })
             ].filter(Boolean)
         }
     });

package/dist/0~9348.js

@@ -1,5 +1,4 @@
-import 'module';
-/*#__PURE__*/ import.meta.url;
+import "node:module";
 import { __webpack_require__ } from "./rslib-runtime.js";
 import node_readline, { clearLine, createInterface, emitKeypressEvents, moveCursor } from "node:readline";
 import { stdout, node_process, stdin } from "./3160.js";