@rstest/core 0.7.0 → 0.7.2

package/LICENSE.md

@@ -943,7 +943,7 @@ Licensed under MIT license in the repository at https://github.com/chaijs/loupe.
 
 ### magic-string
 
-Licensed under MIT license in the repository at https://github.com/rich-harris/magic-string.git.
+Licensed under MIT license in the repository at git+https://github.com/Rich-Harris/magic-string.git.
 
 > Copyright 2018 Rich Harris
 >

package/dist/0~122.js

@@ -5,8 +5,8 @@ import node_events from "node:events";
 import { Tinypool } from "tinypool";
 import node_inspector from "node:inspector";
 import { basename, TEMP_RSTEST_OUTPUT_DIR, dirname, posix, resolve as pathe_M_eThtNZ_resolve, serializableConfig, node_process, isBuiltin, castArray, TEMP_RSTEST_OUTPUT_DIR_GLOB, isDebug, ADDITIONAL_NODE_BUILTINS, join, needFlagExperimentalDetectModule } from "./946.js";
-import { node_v8, fileURLToPath, createBirpc } from "./770.js";
-import { logger, createRsbuild } from "./155.js";
+import { node_v8, fileURLToPath, createBirpc } from "./404.js";
+import { core_logger, createRsbuild } from "./131.js";
 const DefaultMaxHeapSize = 1073741824;
 function memory_isMemorySufficient(options) {
     const { memoryThreshold = 0.7, maxHeapSize = DefaultMaxHeapSize } = options || {};
@@ -185,6 +185,12 @@ const createPool = async ({ context, recommendWorkerCount = 1 / 0 })=>{
             context.stateManager.onTestFileStart(test.testPath);
             await Promise.all(reporters.map((reporter)=>reporter.onTestFileStart?.(test)));
         },
+        onTestSuiteStart: async (test)=>{
+            await Promise.all(reporters.map((reporter)=>reporter.onTestSuiteStart?.(test)));
+        },
+        onTestSuiteResult: async (result)=>{
+            await Promise.all(reporters.map((reporter)=>reporter.onTestSuiteResult?.(result)));
+        },
         resolveSnapshotPath: (testPath)=>{
             const snapExtension = '.snap';
             const resolver = context.normalizedConfig.resolveSnapshotPath || (()=>join(dirname(testPath), '__snapshots__', `${basename(testPath)}${snapExtension}`));
@@ -202,6 +208,7 @@ const createPool = async ({ context, recommendWorkerCount = 1 / 0 })=>{
                     options: {
                         entryInfo,
                         context: {
+                            outputModule: project.outputModule,
                             taskId: index + 1,
                             project: projectName,
                             rootPath: context.rootPath,
@@ -273,6 +280,7 @@ const createPool = async ({ context, recommendWorkerCount = 1 / 0 })=>{
                         context: {
                             taskId: index + 1,
                             project: projectName,
+                            outputModule: project.outputModule,
                             rootPath: context.rootPath,
                             projectRoot: project.rootPath,
                             runtimeConfig: serializableConfig(runtimeConfig)
@@ -302,11 +310,15 @@ const createPool = async ({ context, recommendWorkerCount = 1 / 0 })=>{
     };
 };
 const RUNTIME_CHUNK_NAME = 'runtime';
+const requireShim = `// Rstest ESM shims
+import __rstest_shim_module__ from 'node:module';
+const require = /*#__PURE__*/ __rstest_shim_module__.createRequire(import.meta.url);
+`;
 const pluginBasic = (context)=>({
         name: 'rstest:basic',
         setup: (api)=>{
             api.modifyEnvironmentConfig(async (config, { mergeEnvironmentConfig, name })=>{
-                const { normalizedConfig: { resolve, source, output, tools, performance, dev, testEnvironment }, rootPath } = context.projects.find((p)=>p.environmentName === name);
+                const { normalizedConfig: { resolve, source, output, tools, performance, dev, testEnvironment }, outputModule, rootPath } = context.projects.find((p)=>p.environmentName === name);
                 return mergeEnvironmentConfig(config, {
                     performance,
                     tools,
@@ -326,6 +338,10 @@ const pluginBasic = (context)=>({
                         sourceMap: {
                             js: 'source-map'
                         },
+                        module: outputModule,
+                        filename: outputModule ? {
+                            js: '[name].mjs'
+                        } : void 0,
                         distPath: {
                             root: context.projects.length > 1 ? `${TEMP_RSTEST_OUTPUT_DIR}/${name}` : TEMP_RSTEST_OUTPUT_DIR
                         }
@@ -336,7 +352,7 @@ const pluginBasic = (context)=>({
                             config.mode = isProd ? 'production' : 'development';
                             config.output ??= {};
                             config.output.iife = false;
-                            config.output.importFunctionName = '__rstest_dynamic_import__';
+                            config.output.importFunctionName = outputModule ? 'import.meta.__rstest_dynamic_import__' : '__rstest_dynamic_import__';
                             config.output.devtoolModuleFilenameTemplate = '[absolute-resource-path]';
                             if (!config.devtool || !config.devtool.includes('inline')) config.devtool = 'nosources-source-map';
                             config.plugins.push(new rspack.experiments.RstestPlugin({
@@ -345,6 +361,12 @@ const pluginBasic = (context)=>({
                                 hoistMockModule: true,
                                 manualMockRoot: posix.resolve(rootPath, '__mocks__')
                             }));
+                            if (outputModule) config.plugins.push(new rspack.BannerPlugin({
+                                banner: requireShim,
+                                stage: rspack.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE - 1,
+                                raw: true,
+                                include: /\.(js|mjs)$/
+                            }));
                             config.module.parser ??= {};
                             config.module.parser.javascript = {
                                 importDynamic: false,
@@ -467,20 +489,20 @@ const pluginEntryWatch = ({ isWatch, globTestSourceEntries, setupFiles, context
             });
         }
     });
-const autoExternalNodeModules = ({ context, request, dependencyType, getResolve }, callback)=>{
-    if (!request) return callback();
-    if (request.startsWith('@swc/helpers/') || request.endsWith('.wasm')) return callback();
-    const doExternal = (externalPath = request)=>{
-        callback(void 0, externalPath, 'commonjs' === dependencyType ? 'commonjs' : 'import');
+const autoExternalNodeModules = (outputModule)=>({ context, request, dependencyType, getResolve }, callback)=>{
+        if (!request) return callback();
+        if (request.startsWith('@swc/helpers/') || request.endsWith('.wasm')) return callback();
+        const doExternal = (externalPath = request)=>{
+            callback(void 0, externalPath, 'commonjs' === dependencyType ? 'commonjs' : outputModule ? 'module-import' : 'import');
+        };
+        const resolver = getResolve?.();
+        if (!resolver) return callback();
+        resolver(context, request, (err, resolvePath)=>{
+            if (err) return callback(void 0, request, 'node-commonjs');
+            if (resolvePath && resolvePath.includes('node_modules') && !/\.(?:ts|tsx|jsx|mts|cts)$/.test(resolvePath)) return doExternal(resolvePath);
+            return callback();
+        });
     };
-    const resolver = getResolve?.();
-    if (!resolver) return callback();
-    resolver(context, request, (err, resolvePath)=>{
-        if (err) return callback();
-        if (resolvePath && resolvePath.includes('node_modules') && !/\.(?:ts|tsx|jsx|mts|cts)$/.test(resolvePath)) return doExternal(resolvePath);
-        return callback();
-    });
-};
 function autoExternalNodeBuiltin({ request, dependencyType }, callback) {
     if (!request) return void callback();
     const isNodeBuiltin = isBuiltin(request) || ADDITIONAL_NODE_BUILTINS.some((builtin)=>{
@@ -494,11 +516,11 @@ const pluginExternal = (context)=>({
         name: 'rstest:external',
         setup: (api)=>{
             api.modifyEnvironmentConfig(async (config, { mergeEnvironmentConfig, name })=>{
-                const { normalizedConfig: { testEnvironment } } = context.projects.find((p)=>p.environmentName === name);
+                const { normalizedConfig: { testEnvironment }, outputModule } = context.projects.find((p)=>p.environmentName === name);
                 return mergeEnvironmentConfig(config, {
                     output: {
                         externals: 'node' === testEnvironment ? [
-                            autoExternalNodeModules
+                            autoExternalNodeModules(outputModule)
                         ] : void 0
                     },
                     tools: {
@@ -509,7 +531,7 @@ const pluginExternal = (context)=>({
                             });
                             config.externalsPresets ??= {};
                             config.externalsPresets.node = false;
-                            config.externals.push(autoExternalNodeBuiltin);
+                            config.externals.unshift(autoExternalNodeBuiltin);
                         }
                     }
                 });
@@ -553,6 +575,10 @@ const pluginInspect = ()=>enable ? {
 const external_node_fs_ = __webpack_require__("node:fs");
 const mockRuntime_dirname = external_node_path_["default"].dirname(fileURLToPath(import.meta.url));
 class MockRuntimeRspackPlugin {
+    outputModule;
+    constructor(outputModule){
+        this.outputModule = outputModule;
+    }
     apply(compiler) {
         const { RuntimeModule } = compiler.webpack;
         class RetestImportRuntimeModule extends RuntimeModule {
@@ -570,12 +596,16 @@ class MockRuntimeRspackPlugin {
                     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;");
                     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;");
+                    module.source.source = Buffer.from(finalSource);
+                }
                 if ('define_property_getters' === module.name) {
                     const finalSource = module.source.source.toString('utf-8').replace('enumerable: true, get:', 'enumerable: true, configurable: true, get:');
                     module.source.source = Buffer.from(finalSource);
                 }
                 if ('async_wasm_loading' === module.name) {
-                    const finalSource = module.source.source.toString('utf-8').replace('readFile(', 'readWasmFile(');
+                    const finalSource = module.source.source.toString('utf-8').replace('readFile(', this.outputModule ? 'import.meta.readWasmFile(' : 'readWasmFile(');
                     module.source.source = Buffer.from(finalSource);
                 }
             });
@@ -591,7 +621,7 @@ const pluginMockRuntime = {
     name: 'rstest:mock-runtime',
     setup: (api)=>{
         api.modifyRspackConfig(async (config)=>{
-            config.plugins.push(new MockRuntimeRspackPlugin());
+            config.plugins.push(new MockRuntimeRspackPlugin(Boolean(config.output.module)));
         });
     }
 };
@@ -663,7 +693,7 @@ const isMultiCompiler = (compiler)=>'compilers' in compiler && Array.isArray(com
 const prepareRsbuild = async (context, globTestSourceEntries, setupFiles)=>{
     const { command, normalizedConfig: { isolate, dev = {}, coverage } } = context;
     const debugMode = isDebug();
-    logger.level = debugMode ? 'verbose' : 'error';
+    core_logger.level = debugMode ? 'verbose' : 'error';
     const writeToDisk = dev.writeToDisk || debugMode;
     const rsbuildInstance = await createRsbuild({
         callerName: 'rstest',