@midscene/cli 1.9.5-beta-20260611051901.0 → 1.9.5

package/dist/es/index.mjs

@@ -15,6 +15,7 @@ import lodash_merge from "lodash.merge";
 import { createHash } from "node:crypto";
 import { getMidsceneRunSubDir } from "@midscene/shared/common";
 import { createRequire } from "node:module";
+import "@rstest/core";
 import "@midscene/web/puppeteer-agent-launcher";
 import "puppeteer";
 import "http-server";
@@ -3026,7 +3027,9 @@ var __webpack_modules__ = {
     "./src/index.ts" (__unused_rspack_module, __unused_rspack___webpack_exports__, __webpack_require__) {
         var main = __webpack_require__("../../node_modules/.pnpm/dotenv@16.4.5/node_modules/dotenv/lib/main.js");
         var main_default = /*#__PURE__*/ __webpack_require__.n(main);
-        var package_namespaceObject = JSON.parse('{"rE":"1.9.5-beta-20260611051901.0"}');
+        var package_namespaceObject = {
+            rE: "1.9.5"
+        };
         var brace_expansion = __webpack_require__("../../node_modules/.pnpm/brace-expansion@2.0.1/node_modules/brace-expansion/index.js");
         const MAX_PATTERN_LENGTH = 65536;
         const assertValidPattern = (pattern)=>{
@@ -10857,7 +10860,7 @@ Usage:
                     type: 'boolean',
                     description: `Turn on logging to help debug why certain keys or values are not being set as you expect, default is ${config_factory_defaultConfig.dotenvDebug}`
                 }
-            }).version('version', 'Show version number', "1.9.5-beta-20260611051901.0").help().epilogue(`For complete list of configuration options, please visit:
+            }).version('version', 'Show version number', "1.9.5").help().epilogue(`For complete list of configuration options, please visit:
   • Web options: https://midscenejs.com/automate-with-scripts-in-yaml#the-web-part
   • Android options: https://midscenejs.com/automate-with-scripts-in-yaml#the-android-part
   • iOS options: https://midscenejs.com/automate-with-scripts-in-yaml#the-ios-part
@@ -11094,20 +11097,6 @@ Examples:
             else console.log('\n⚠️ Some files failed or were not executed.');
             return success;
         }
-        const requireFromCliPackage = ()=>{
-            if ('undefined' != typeof __dirname) return createRequire(external_node_path_join(__dirname, 'index.js'));
-            const entry = process.argv[1] ? external_node_path_resolve(process.argv[1]) : external_node_path_join(process.cwd(), 'midscene-cli.js');
-            return createRequire(entry);
-        };
-        const resolvePackageFromRstestCore = (packageName)=>{
-            const require1 = requireFromCliPackage();
-            const rstestPackageJsonPath = require1.resolve('@rstest/core/package.json');
-            return createRequire(rstestPackageJsonPath).resolve(packageName);
-        };
-        function resolveRstestCoreImportPath() {
-            const require1 = requireFromCliPackage();
-            return require1.resolve('@rstest/core');
-        }
         const DEFAULT_YAML_TEST_TIMEOUT = 0;
         const RSTEST_YAML_BATCH_TEST_MODULE = 'virtual:midscene-yaml/batch.test.ts';
         const RSTEST_YAML_BATCH_TEST_NAME = 'midscene yaml batch';
@@ -11134,16 +11123,9 @@ Examples:
                     webRuntimeOptions: options.webRuntimeOptions
                 } : {}
             };
-            return `import { test } from ${toImportLiteral(options.rstestCoreImport)};
-import { defineYamlCaseTest } from ${toImportLiteral(options.frameworkImport)};
-
-const testOptions = ${JSON.stringify(testOptions, null, 2)};
+            return `import { defineYamlCaseTest } from ${toImportLiteral(options.frameworkImport)};
 
-if (defineYamlCaseTest.length >= 2) {
-  defineYamlCaseTest(test, testOptions);
-} else {
-  await defineYamlCaseTest(testOptions);
-}
+defineYamlCaseTest(${JSON.stringify(testOptions, null, 2)});
 `;
         };
         const createGeneratedBatchTestContent = (options)=>{
@@ -11152,16 +11134,9 @@ if (defineYamlCaseTest.length >= 2) {
                 config: options.config,
                 resultFiles: options.resultFiles
             };
-            return `import { test } from ${toImportLiteral(options.rstestCoreImport)};
-import { defineYamlBatchTest } from ${toImportLiteral(options.frameworkImport)};
-
-const testOptions = ${JSON.stringify(testOptions, null, 2)};
+            return `import { defineYamlBatchTest } from ${toImportLiteral(options.frameworkImport)};
 
-if (defineYamlBatchTest.length >= 2) {
-  defineYamlBatchTest(test, testOptions);
-} else {
-  await defineYamlBatchTest(testOptions);
-}
+defineYamlBatchTest(${JSON.stringify(testOptions, null, 2)});
 `;
         };
         const resolveDefaultFrameworkImport = (moduleDir)=>{
@@ -11182,7 +11157,6 @@ if (defineYamlBatchTest.length >= 2) {
             const outputDir = options.outputDir || external_node_path_join(getMidsceneRunSubDir('tmp'), `rstest-yaml-${Date.now()}`);
             const resultDir = options.resultDir || external_node_path_join(outputDir, 'results');
             const frameworkImport = options.frameworkImport || resolveDefaultFrameworkImport();
-            const rstestCoreImport = options.rstestCoreImport || resolveRstestCoreImportPath();
             const testTimeout = options.testTimeout ?? DEFAULT_YAML_TEST_TIMEOUT;
             (0, __rspack_external_node_fs_5ea92f0c.rmSync)(outputDir, {
                 recursive: true,
@@ -11199,7 +11173,6 @@ if (defineYamlBatchTest.length >= 2) {
                 const resultFile = external_node_path_join(resultDir, `${fileStem}.json`);
                 const testModule = toVirtualModuleId(fileStem);
                 virtualModules[testModule] = createGeneratedTestContent({
-                    rstestCoreImport,
                     frameworkImport,
                     yamlFile,
                     resultFile,
@@ -11232,7 +11205,6 @@ if (defineYamlBatchTest.length >= 2) {
                     ],
                     virtualModules: {
                         [batchTest.testModule]: createGeneratedBatchTestContent({
-                            rstestCoreImport,
                             frameworkImport,
                             testName: batchTest.testName,
                             config: options.batchConfig,
@@ -11259,6 +11231,16 @@ if (defineYamlBatchTest.length >= 2) {
                 retry: options.retry
             };
         }
+        const requireFromCliPackage = ()=>{
+            if ('undefined' != typeof __dirname) return createRequire(external_node_path_join(__dirname, 'index.js'));
+            const entry = process.argv[1] ? external_node_path_resolve(process.argv[1]) : external_node_path_join(process.cwd(), 'midscene-cli.js');
+            return createRequire(entry);
+        };
+        const resolvePackageFromRstestCore = (packageName)=>{
+            const require1 = requireFromCliPackage();
+            const rstestPackageJsonPath = require1.resolve('@rstest/core/package.json');
+            return createRequire(rstestPackageJsonPath).resolve(packageName);
+        };
         const formatRunError = (error)=>error.stack || `${error.name}: ${error.message}`;
         const collectRunErrors = (result)=>{
             const messages = [];