@midscene/cli 1.10.4-beta-20260710100314.0 → 1.10.4-beta-20260710115744.0

package/dist/lib/index.js

@@ -3416,9 +3416,10 @@ var __webpack_modules__ = {
             };
             const player = new yaml_.ScriptPlayer(clonedYamlScript, async ()=>{
                 const freeFn = [];
-                const webTarget = clonedYamlScript.web || clonedYamlScript.target;
+                const resolvedWebTarget = (0, yaml_.resolveWebTarget)(clonedYamlScript);
+                const webTarget = resolvedWebTarget?.target;
                 const targetCount = [
-                    void 0 !== webTarget,
+                    void 0 !== resolvedWebTarget,
                     void 0 !== clonedYamlScript.android,
                     void 0 !== clonedYamlScript.ios,
                     void 0 !== clonedYamlScript.harmony,
@@ -3427,17 +3428,17 @@ var __webpack_modules__ = {
                 ].filter(Boolean).length;
                 if (targetCount > 1) {
                     const specifiedTargets = [
-                        void 0 !== webTarget ? 'web' : null,
+                        resolvedWebTarget?.source ?? null,
                         void 0 !== clonedYamlScript.android ? 'android' : null,
                         void 0 !== clonedYamlScript.ios ? 'ios' : null,
                         void 0 !== clonedYamlScript.harmony ? 'harmony' : null,
                         void 0 !== clonedYamlScript.computer ? 'computer' : null,
                         void 0 !== clonedYamlScript.interface ? 'interface' : null
                     ].filter(Boolean);
-                    throw new Error(`Only one target type can be specified, but found multiple: ${specifiedTargets.join(', ')}. Please specify only one of: web, android, ios, harmony, computer, or interface.`);
+                    throw new Error(`Only one target type can be specified, but found multiple: ${specifiedTargets.join(', ')}. Please specify only one of: page, browser, web, android, ios, harmony, computer, or interface.`);
                 }
                 if (void 0 !== webTarget) {
-                    if (void 0 !== clonedYamlScript.target) console.warn("target is deprecated, please use web instead. See https://midscenejs.com/automate-with-scripts-in-yaml for more information. Sorry for the inconvenience.");
+                    if (resolvedWebTarget?.source === 'target') console.warn("target is deprecated, please use page or browser instead. See https://midscenejs.com/automate-with-scripts-in-yaml for more information. Sorry for the inconvenience.");
                     let localServer;
                     let urlToVisit;
                     if (webTarget.serve) {
@@ -3452,6 +3453,7 @@ var __webpack_modules__ = {
                         webTarget.url = urlToVisit;
                     }
                     if (webTarget.cdpEndpoint && webTarget.bridgeMode) throw new Error('cdpEndpoint and bridgeMode are mutually exclusive. Please specify only one.');
+                    if ('browser' === webTarget.mode && webTarget.bridgeMode) throw new Error('[midscene] browser mode does not support bridgeMode. Use page: or web.mode: page for bridge mode.');
                     if (webTarget.cdpEndpoint) {
                         const cdpBrowser = options?.browser ?? await external_puppeteer_default().connect({
                             browserWSEndpoint: webTarget.cdpEndpoint,
@@ -4096,9 +4098,9 @@ var __webpack_modules__ = {
                         setupContext,
                         ...fileContextList
                     ] : fileContextList;
-                    const needsBrowser = allContexts.some((ctx)=>Object.keys(ctx.executionConfig.web || ctx.executionConfig.target || {}).length > 0);
+                    const needsBrowser = allContexts.some((ctx)=>void 0 !== (0, yaml_.resolveWebTarget)(ctx.executionConfig));
                     if (needsBrowser && this.config.shareBrowserContext) {
-                        const globalWebConfig = this.config.globalConfig?.web;
+                        const globalWebConfig = (0, yaml_.resolveWebTarget)(this.config.globalConfig ?? {})?.target;
                         if (globalWebConfig?.cdpEndpoint) browser = await external_puppeteer_default().connect({
                             browserWSEndpoint: globalWebConfig.cdpEndpoint,
                             defaultViewport: null,
@@ -4136,7 +4138,7 @@ var __webpack_modules__ = {
                     this.results = await this.processResults(executedResults, notExecutedContexts);
                 } finally{
                     if (browser && !this.config.keepWindow) {
-                        const isCdp = !!this.config.globalConfig?.web?.cdpEndpoint;
+                        const isCdp = !!(0, yaml_.resolveWebTarget)(this.config.globalConfig ?? {})?.target.cdpEndpoint;
                         if (isCdp) browser.disconnect();
                         else await browser.close();
                     }
@@ -4147,20 +4149,6 @@ var __webpack_modules__ = {
             async createFileContext(file, fileConfig, options) {
                 const { globalConfig } = this.config;
                 const clonedFileConfig = JSON.parse(JSON.stringify(fileConfig));
-                if (clonedFileConfig.target) {
-                    clonedFileConfig.web = {
-                        ...clonedFileConfig.target,
-                        ...clonedFileConfig.web
-                    };
-                    delete clonedFileConfig.target;
-                }
-                if (globalConfig?.target) {
-                    globalConfig.web = {
-                        ...globalConfig.target,
-                        ...globalConfig.web
-                    };
-                    delete globalConfig.target;
-                }
                 const executionConfig = external_lodash_merge_default()(clonedFileConfig, globalConfig);
                 return {
                     file,
@@ -4708,7 +4696,7 @@ defineYamlBatchTest(test, testOptions);
         "use strict";
         var core_ = __webpack_require__("@midscene/core");
         const cli_namespaceObject = require("@midscene/shared/cli");
-        var package_namespaceObject = JSON.parse('{"rE":"1.10.4-beta-20260710100314.0"}');
+        var package_namespaceObject = JSON.parse('{"rE":"1.10.4-beta-20260710115744.0"}');
         var external_node_fs_ = __webpack_require__("node:fs");
         var external_node_fs_namespaceObject = /*#__PURE__*/ __webpack_require__.t(external_node_fs_, 2);
         var external_node_path_ = __webpack_require__("node:path");
@@ -12420,6 +12408,7 @@ defineYamlBatchTest(test, testOptions);
                 throw new Error(`Failed to parse config YAML: ${error}`);
             }
             if (!configYaml?.files || !Array.isArray(configYaml?.files)) throw new Error('Config YAML must contain a "files" array');
+            (0, yaml_.resolveWebTarget)(configYaml);
             const files = await expandFilePatterns(configYaml?.files, basePath);
             if (0 === files.length) throw new Error('No YAML files found matching the patterns in "files"');
             const setup = await resolveSetupFile(configYaml.setup, basePath);
@@ -12432,7 +12421,10 @@ defineYamlBatchTest(test, testOptions);
                 retry: configYaml.retry ?? config_factory_defaultConfig.retry,
                 summary: configYaml.summary ?? defaultSummary,
                 shareBrowserContext: configYaml.shareBrowserContext ?? config_factory_defaultConfig.shareBrowserContext,
+                page: configYaml.page,
+                browser: configYaml.browser,
                 web: configYaml.web,
+                target: configYaml.target,
                 android: configYaml.android,
                 ios: configYaml.ios,
                 patterns: configYaml.files,
@@ -12448,14 +12440,19 @@ defineYamlBatchTest(test, testOptions);
         async function createConfig(configYamlPath, options) {
             const parsedConfig = await parseConfigYaml(configYamlPath);
             const globalConfig = external_lodash_merge_default()({
+                page: parsedConfig.page,
+                browser: parsedConfig.browser,
                 web: parsedConfig.web,
                 android: parsedConfig.android,
                 ios: parsedConfig.ios,
                 target: parsedConfig.target
             }, {
+                page: options?.page,
+                browser: options?.browser,
                 web: options?.web,
                 android: options?.android,
-                ios: options?.ios
+                ios: options?.ios,
+                target: options?.target
             });
             const keepWindow = options?.keepWindow ?? parsedConfig.keepWindow;
             const headed = options?.headed ?? parsedConfig.headed;
@@ -12510,7 +12507,10 @@ defineYamlBatchTest(test, testOptions);
                 dotenvOverride: options.dotenvOverride ?? config_factory_defaultConfig.dotenvOverride,
                 dotenvDebug: options.dotenvDebug ?? config_factory_defaultConfig.dotenvDebug,
                 globalConfig: {
+                    page: options.page,
+                    browser: options.browser,
                     web: options.web,
+                    target: options.target,
                     android: options.android,
                     ios: options.ios
                 }
@@ -12583,7 +12583,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.10.4-beta-20260710100314.0").help().epilogue(`For complete list of configuration options, please visit:
+            }).version('version', 'Show version number', "1.10.4-beta-20260710115744.0").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