weapp-vite 6.16.35 → 6.16.37

package/dist/cli.mjs

@@ -14,7 +14,7 @@ import os from "node:os";
 import { execFile, spawn } from "node:child_process";
 import { Buffer } from "node:buffer";
 import { cac } from "cac";
-import { RETRY_CANCEL_KEYS, RETRY_CONFIRM_KEYS, bootstrapWechatDevtoolsSettings, buildWechatIdeNpm, clearWechatIdeCache, clearWechatIdeCacheByAutomator, closeSharedMiniProgram, closeWechatIdeProject, compileWechatIdeByAutomator, connectOpenedAutomator, createSharedInputSession, dispatchWechatCliCommand, formatAutomatorLoginError, getConfig, getWechatIdeTestAccounts, getWechatIdeTicket, getWechatIdeToolInfo, isAutomatorLoginError, isWeappIdeTopLevelCommand, isWechatIdeEngineBuildEndpointMissingError, isWechatIdeLoginRequiredError, launchAutomator, openWechatIdeProjectByHttp, parse, promptRetryKeypress, promptWechatIdeLoginRetry, quitWechatIde, refreshWechatIdeTicket, resetWechatIdeFileUtilsByHttp, runRetryableCommand, runWechatIdeEngineBuild, runWithSuspendedSharedInput, setWechatIdeTicket, startForwardConsole, takeScreenshot } from "weapp-ide-cli";
+import { RETRY_CANCEL_KEYS, RETRY_CONFIRM_KEYS, bootstrapWechatDevtoolsSettings, buildWechatIdeNpm, clearWechatIdeCache, clearWechatIdeCacheByAutomator, closeSharedMiniProgram, closeWechatIdeProject, compileWechatIdeByAutomator, connectOpenedAutomator, createSharedInputSession, createWechatIdeLoginRequiredExitError, dispatchWechatCliCommand, formatAutomatorLoginError, getConfig, getWechatIdeTestAccounts, getWechatIdeTicket, getWechatIdeToolInfo, isAutomatorLoginError, isWeappIdeTopLevelCommand, isWechatIdeEngineBuildEndpointMissingError, isWechatIdeLoginRequiredError, isWechatIdeLoginRequiredExitError, launchAutomator, openWechatIdeProjectByHttp, parse, promptRetryKeypress, promptWechatIdeLoginRetry, quitWechatIde, refreshWechatIdeTicket, resetWechatIdeFileUtilsByHttp, runRetryableCommand, runWechatIdeEngineBuild, runWithSuspendedSharedInput, setWechatIdeTicket, startForwardConsole, takeScreenshot } from "weapp-ide-cli";
 import { promisify } from "node:util";
 import { brotliCompressSync, gzipSync } from "node:zlib";
 import { resolveCommand } from "package-manager-detector/commands";
@@ -132,7 +132,7 @@ async function tryExecuteWechatIdeCliCommandByHelper(argv) {
 * @description 统一执行 weapp-ide-cli 命令，并在登录失效时复用同一套重试交互。
 */
 async function executeWechatIdeCliCommand(argv, options = {}) {
-	const { automatorMode = "prefer", cancelLevel = "warn", engineBuildFallbackToCli = false, httpMode = "prefer", onNonLoginError, onRetry, projectPath } = options;
+	const { automatorMode = "prefer", cancelLevel = "warn", engineBuildFallbackToCli = false, httpMode = "prefer", promptOpenIdeLogin = true, onNonLoginError, onRetry, projectPath } = options;
 	await runWithSuspendedSharedInput(async () => {
 		if (httpMode !== "skip") try {
 			if (await tryExecuteWechatIdeCliCommandByHttp(argv, projectPath, engineBuildFallbackToCli)) return;
@@ -147,6 +147,7 @@ async function executeWechatIdeCliCommand(argv, options = {}) {
 		try {
 			if (await tryExecuteWechatIdeCliCommandByHelper(argv)) return;
 		} catch (error) {
+			if (isWechatIdeLoginRequiredExitError(error)) throw error;
 			if (onNonLoginError) {
 				onNonLoginError(error);
 				return;
@@ -154,12 +155,13 @@ async function executeWechatIdeCliCommand(argv, options = {}) {
 			throw error;
 		}
 		await runRetryableCommand({
-			createCancelError: () => /* @__PURE__ */ new Error("cancelled"),
+			createCancelError: (error) => createWechatIdeLoginRequiredExitError(error, "cancelled"),
 			execute: async () => {
 				try {
 					await parse(argv);
 					return null;
 				} catch (error) {
+					if (isWechatIdeLoginRequiredExitError(error)) throw error;
 					if (!isWechatIdeLoginRequiredError(error)) {
 						if (onNonLoginError) {
 							onNonLoginError(error);
@@ -178,7 +180,8 @@ async function executeWechatIdeCliCommand(argv, options = {}) {
 			promptRetry: async (error) => await promptWechatIdeLoginRetry({
 				cancelLevel,
 				error,
-				logger: logger_default
+				logger: logger_default,
+				promptOpenIdeLogin
 			}),
 			shouldRetry: (action) => action === "retry"
 		});
@@ -313,7 +316,8 @@ async function runWechatIdeOpenWithRetry(argv) {
 		onNonLoginError: (error) => logger_default.error(error),
 		onRetry: () => {
 			logger_default.info(colors.bold(colors.green("正在重试连接微信开发者工具...")));
-		}
+		},
+		promptOpenIdeLogin: true
 	});
 }
 /**
@@ -346,29 +350,35 @@ async function tryOpenWechatIdeByAutomator(projectPath, options) {
 /**
 * @description 打开后主动刷新微信开发者工具的项目索引，避免模拟器沿用过期 app 配置。
 */
-async function stabilizeOpenedWechatIdeProject(projectPath, servicePortEnabled) {
+function appendLoginRetryArgv(argv, options) {
+	if (options.nonInteractive) argv.push("--non-interactive");
+	if (options.loginRetry) argv.push("--login-retry", options.loginRetry);
+	if (options.loginRetryTimeout) argv.push("--login-retry-timeout", options.loginRetryTimeout);
+	return argv;
+}
+async function stabilizeOpenedWechatIdeProject(projectPath, servicePortEnabled, options = {}) {
 	if (servicePortEnabled === false) return;
 	try {
-		await executeWechatIdeCliCommand(["compile"], {
+		await executeWechatIdeCliCommand(appendLoginRetryArgv(["compile"], options), {
 			httpMode: "prefer",
 			onNonLoginError: (error) => logger_default.error(error),
 			projectPath
 		});
-		await executeWechatIdeCliCommand([
+		await executeWechatIdeCliCommand(appendLoginRetryArgv([
 			"reset-fileutils",
 			"-p",
 			projectPath
-		], {
+		], options), {
 			httpMode: "prefer",
 			onNonLoginError: (error) => logger_default.error(error),
 			projectPath
 		});
 		try {
-			await executeWechatIdeCliCommand([
+			await executeWechatIdeCliCommand(appendLoginRetryArgv([
 				"engine",
 				"build",
 				projectPath
-			], {
+			], options), {
 				httpMode: "prefer",
 				onNonLoginError: (error) => logger_default.error(error),
 				projectPath
@@ -378,7 +388,7 @@ async function stabilizeOpenedWechatIdeProject(projectPath, servicePortEnabled)
 			logger_default.warn("当前微信开发者工具不支持自动 engine build 刷新，已跳过该步骤；如模拟器显示旧状态，可在开发者工具内手动编译。");
 		}
 		try {
-			await executeWechatIdeCliCommand(["compile"], {
+			await executeWechatIdeCliCommand(appendLoginRetryArgv(["compile"], options), {
 				automatorMode: "require",
 				httpMode: "skip",
 				projectPath
@@ -387,6 +397,7 @@ async function stabilizeOpenedWechatIdeProject(projectPath, servicePortEnabled)
 			if (shouldLogAutomatorFallbackError()) logger_default.error(error);
 		}
 	} catch (error) {
+		if (isWechatIdeLoginRequiredExitError(error)) throw error;
 		logger_default.warn("刷新微信开发者工具项目索引失败，已保留当前打开状态；如模拟器仍显示旧状态，可手动刷新一次。");
 		if (shouldLogAutomatorFallbackError()) logger_default.error(error);
 	}
@@ -396,6 +407,9 @@ function createIdeOpenArgv(platform, projectPath, options = {}) {
 	if (projectPath) argv.push(projectPath);
 	if (platform === "weapp" && options.trustProject !== false) argv.push("--trust-project");
 	if (platform && shouldPassPlatformArgToIdeOpen(platform)) argv.push("--platform", platform);
+	if (options.nonInteractive) argv.push("--non-interactive");
+	if (options.loginRetry) argv.push("--login-retry", options.loginRetry);
+	if (options.loginRetryTimeout) argv.push("--login-retry-timeout", options.loginRetryTimeout);
 	return argv;
 }
 async function openIde(platform, projectPath, options = {}) {
@@ -412,7 +426,7 @@ async function openIde(platform, projectPath, options = {}) {
 	if (platform === "weapp" && projectPath && bootstrapResult?.servicePortEnabled === false) logger_default.warn("检测到微信开发者工具服务端口当前处于关闭状态，已保留用户设置并回退到普通 open 流程。");
 	if (platform === "weapp" && projectPath && options.trustProject !== false && bootstrapResult?.servicePortEnabled !== false) try {
 		if (await tryOpenWechatIdeByAutomator(projectPath, options)) {
-			await stabilizeOpenedWechatIdeProject(projectPath, bootstrapResult?.servicePortEnabled);
+			await stabilizeOpenedWechatIdeProject(projectPath, bootstrapResult?.servicePortEnabled, options);
 			return;
 		}
 	} catch (error) {
@@ -424,7 +438,7 @@ async function openIde(platform, projectPath, options = {}) {
 		if (shouldLogAutomatorFallbackError()) logger_default.error(error);
 	}
 	await runWechatIdeOpenWithRetry(createIdeOpenArgv(platform, projectPath, options));
-	if (platform === "weapp" && projectPath) await stabilizeOpenedWechatIdeProject(projectPath, bootstrapResult?.servicePortEnabled);
+	if (platform === "weapp" && projectPath) await stabilizeOpenedWechatIdeProject(projectPath, bootstrapResult?.servicePortEnabled, options);
 }
 /**
 * @description 解析 IDE 相关命令所需的平台、项目目录与配置上下文。
@@ -3450,7 +3464,7 @@ function registerNpmCommand(cli) {
 //#endregion
 //#region src/cli/commands/open.ts
 function registerOpenCommand(cli) {
-	cli.command("open [root]").option("-p, --platform <platform>", `[string] target platform (weapp | web)`).option("--trust-project", "[boolean] auto trust Wechat DevTools project on open", { default: true }).action(async (root, options) => {
+	cli.command("open [root]").option("-p, --platform <platform>", `[string] target platform (weapp | web)`).option("--trust-project", "[boolean] auto trust Wechat DevTools project on open", { default: true }).option("--login-retry <mode>", "[string] login retry mode for Wechat DevTools (never | once | always)").option("--login-retry-timeout <ms>", "[number] login retry prompt timeout in milliseconds").option("--non-interactive", "[boolean] fail immediately when Wechat DevTools login has expired").action(async (root, options) => {
 		filterDuplicateOptions(options);
 		const configFile = resolveConfigFile(options);
 		const targets = resolveRuntimeTargets(options);
@@ -3467,7 +3481,12 @@ function registerOpenCommand(cli) {
 			weappViteConfig
 		});
 		if (latestHmrSummary) logger_default.info(latestHmrSummary.line);
-		await openIde(platform, projectPath ?? resolveIdeProjectRoot(mpDistRoot, process.cwd()), { trustProject: options.trustProject });
+		await openIde(platform, projectPath ?? resolveIdeProjectRoot(mpDistRoot, process.cwd()), {
+			loginRetry: options.loginRetry,
+			loginRetryTimeout: options.loginRetryTimeout,
+			nonInteractive: options.nonInteractive,
+			trustProject: options.trustProject
+		});
 	});
 }
 //#endregion
@@ -3716,7 +3735,7 @@ function resolveRunnableHotkeyDefinition(input) {
 }
 //#endregion
 //#region package.json
-var version = "6.16.35";
+var version = "6.16.37";
 //#endregion
 //#region src/cli/devHotkeys/format.ts
 const FULLWIDTH_ASCII_START = 65281;
@@ -4316,7 +4335,7 @@ function waitForServeShutdownSignal() {
 //#endregion
 //#region src/cli/commands/serve/index.ts
 function registerServeCommand(cli) {
-	cli.command("[root]", "start dev server").alias("serve").alias("dev").option("--skipNpm", `[boolean] if skip npm build`).option("-o, --open", `[boolean] open ide`).option("-p, --platform <platform>", `[string] target platform (weapp | web | all)`).option("--project-config <path>", `[string] project config path (miniprogram only)`).option("--trust-project", "[boolean] auto trust Wechat DevTools project on open", { default: true }).option("--host [host]", `[string] web dev server host`).option("--ui", `[boolean] 启动调试 UI（当前提供分析视图）`, { default: false }).option("--analyze", `[boolean] 启动分包分析仪表盘 (实验特性)`, { default: false }).option("--scope <scope>", `[string] 局部构建范围，例如 main,packages/order`).action(async (root, options) => {
+	cli.command("[root]", "start dev server").alias("serve").alias("dev").option("--skipNpm", `[boolean] if skip npm build`).option("-o, --open", `[boolean] open ide`).option("-p, --platform <platform>", `[string] target platform (weapp | web | all)`).option("--project-config <path>", `[string] project config path (miniprogram only)`).option("--trust-project", "[boolean] auto trust Wechat DevTools project on open", { default: true }).option("--login-retry <mode>", "[string] login retry mode for Wechat DevTools (never | once | always)").option("--login-retry-timeout <ms>", "[number] login retry prompt timeout in milliseconds").option("--non-interactive", "[boolean] fail immediately when Wechat DevTools login has expired").option("--host [host]", `[string] web dev server host`).option("--ui", `[boolean] 启动调试 UI（当前提供分析视图）`, { default: false }).option("--analyze", `[boolean] 启动分包分析仪表盘 (实验特性)`, { default: false }).option("--scope <scope>", `[string] 局部构建范围，例如 main,packages/order`).action(async (root, options) => {
 		filterDuplicateOptions(options);
 		const configFile = resolveConfigFile(options);
 		const targets = resolveRuntimeTargets(options);
@@ -4370,6 +4389,9 @@ function registerServeCommand(cli) {
 			fallbackProjectPath: configService.cwd,
 			openIde: async (projectPath) => {
 				await openIde(configService.platform, projectPath, {
+					loginRetry: options.loginRetry,
+					loginRetryTimeout: options.loginRetryTimeout,
+					nonInteractive: options.nonInteractive,
 					reuseOpenedProject: false,
 					trustProject: options.trustProject
 				});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weapp-vite",
   "type": "module",
-  "version": "6.16.35",
+  "version": "6.16.37",
   "description": "weapp-vite 一个现代化的小程序打包工具",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -118,21 +118,21 @@
     "vue": "^3.5.35",
     "vue-tsc": "^3.3.3",
     "@weapp-core/constants": "0.1.12",
-    "@weapp-core/logger": "3.1.1",
-    "@weapp-core/schematics": "6.0.4",
     "@weapp-core/init": "6.0.9",
+    "@weapp-core/schematics": "6.0.4",
     "@weapp-core/shared": "3.0.4",
-    "@weapp-vite/ast": "6.16.35",
-    "@weapp-vite/miniprogram-automator": "1.2.0",
-    "@weapp-vite/volar": "2.1.0",
-    "@weapp-vite/web": "1.3.29",
+    "@weapp-core/logger": "3.1.1",
+    "@weapp-vite/ast": "6.16.37",
+    "@weapp-vite/miniprogram-automator": "1.2.1",
+    "@weapp-vite/web": "1.3.30",
     "@wevu/api": "0.2.9",
-    "@weapp-vite/mcp": "1.4.0",
     "@wevu/web-apis": "1.2.20",
     "rolldown-require": "2.0.18",
+    "@weapp-vite/volar": "2.1.0",
     "vite-plugin-performance": "2.0.1",
-    "weapp-ide-cli": "5.4.0",
-    "wevu": "6.16.35"
+    "@weapp-vite/mcp": "1.4.1",
+    "weapp-ide-cli": "5.4.1",
+    "wevu": "6.16.37"
   },
   "publishConfig": {
     "access": "public",