weapp-vite 6.15.5 → 6.15.6

package/README.md

@@ -187,6 +187,38 @@ wv ide logs
 wv ide logs --open
 ```
 
+## DevTools 配置预热
+
+`weapp-vite` 在打开微信开发者工具前，会复用 `weapp-ide-cli` 的底层能力，自动尝试预热本机 DevTools 配置：
+
+- 确保安全设置中的服务端口处于开启状态
+- 按命令参数或全局配置决定是否自动信任当前项目
+
+如果你只想预热配置、不立即打开 IDE，可以使用：
+
+```sh
+weapp-vite ide setup .
+# 等价写法
+wv ide setup .
+```
+
+如果你希望以后 `open` / `dev --open` / `build --open` 都默认自动信任项目，直接配置 `weapp-ide-cli` 即可：
+
+```sh
+weapp config set autoBootstrapDevtools true
+weapp config set autoTrustProject true
+```
+
+这样以后执行：
+
+```sh
+weapp-vite open .
+weapp-vite dev --open
+weapp-vite build --open
+```
+
+都会沿用同一套默认策略。
+
 ## CLI 中调用 weapp-ide-cli
 
 `weapp-vite` 内置了对 `weapp-ide-cli` 的透传能力，除了 `dev/build/open/init/generate/analyze/npm` 等原生命令外，其它 IDE 相关命令都可以直接调用：
@@ -197,6 +229,7 @@ weapp-vite upload --project ./dist/build/mp-weixin -v 1.0.0 -d "release"
 weapp-vite cache --clean compile
 weapp-vite cache --clean all
 weapp-vite config lang zh
+weapp-vite config set autoTrustProject true
 weapp-vite navigate pages/index/index --project ./dist/build/mp-weixin
 # 等价写法
 wv preview --project ./dist/build/mp-weixin
@@ -208,6 +241,7 @@ wv cache --clean all
 ```sh
 weapp-vite ide preview --project ./dist/build/mp-weixin
 weapp-vite ide config show
+weapp-vite ide setup .
 weapp-vite ide logs --open
 # 等价写法
 wv ide preview --project ./dist/build/mp-weixin

package/dist/auto-routes.mjs

@@ -1,4 +1,4 @@
-import { i as getCompilerContext, u as getRouteRuntimeGlobalKeys } from "./createContext-BJXXIcT5.mjs";
+import { i as getCompilerContext, u as getRouteRuntimeGlobalKeys } from "./createContext-DPe-Wp3_.mjs";
 //#region src/auto-routes.ts
 const ROUTE_RUNTIME_OVERRIDE_KEY = Symbol.for("weapp-vite.route-runtime");
 function createGetter(resolver) {

package/dist/cli.mjs

@@ -1,6 +1,6 @@
-import { S as isPathInside, _ as DEFAULT_MP_PLATFORM, b as resolveMiniPlatform, c as createSharedBuildConfig, d as resolveWeappConfigFile, f as checkRuntime, g as createCjsConfigLoadError, h as parseCommentJson, l as SHARED_CHUNK_VIRTUAL_PREFIX, m as loadViteConfigFile, n as syncProjectSupportFiles, p as getProjectConfigFileName, r as syncManagedTsconfigBootstrapFiles, s as formatBytes, t as createCompilerContext, v as getDefaultIdeProjectRoot, x as shouldPassPlatformArgToIdeOpen, y as normalizeMiniPlatform } from "./createContext-BJXXIcT5.mjs";
+import { S as isPathInside, _ as DEFAULT_MP_PLATFORM, b as resolveMiniPlatform, c as createSharedBuildConfig, d as resolveWeappConfigFile, f as checkRuntime, g as createCjsConfigLoadError, h as parseCommentJson, l as SHARED_CHUNK_VIRTUAL_PREFIX, m as loadViteConfigFile, n as syncProjectSupportFiles, p as getProjectConfigFileName, r as syncManagedTsconfigBootstrapFiles, s as formatBytes, t as createCompilerContext, v as getDefaultIdeProjectRoot, x as shouldPassPlatformArgToIdeOpen, y as normalizeMiniPlatform } from "./createContext-DPe-Wp3_.mjs";
 import { r as logger_default, t as colors } from "./logger-CgxdNjvb.mjs";
-import { h as VERSION } from "./file-DllJX3aP.mjs";
+import { h as VERSION } from "./file-CCWF5mwT.mjs";
 import { a as resolveWeappMcpConfig, o as startWeappViteMcpServer } from "./mcp-DRlj32v4.mjs";
 import { createRequire } from "node:module";
 import path, { posix } from "pathe";
@@ -15,7 +15,7 @@ import fs$2 from "node:fs";
 import { cac } from "cac";
 import { resolveCommand } from "package-manager-detector/commands";
 import { promisify } from "node:util";
-import { closeSharedMiniProgram, connectOpenedAutomator, formatRetryHotkeyPrompt, formatWechatIdeLoginRequiredError, getConfig, isWeappIdeTopLevelCommand, isWechatIdeLoginRequiredError, launchAutomator, parse, startForwardConsole, takeScreenshot, waitForRetryKeypress } from "weapp-ide-cli";
+import { bootstrapWechatDevtoolsSettings, closeSharedMiniProgram, connectOpenedAutomator, formatAutomatorLoginError, formatRetryHotkeyPrompt, formatWechatIdeLoginRequiredError, getConfig, isAutomatorLoginError, isWeappIdeTopLevelCommand, isWechatIdeLoginRequiredError, launchAutomator, parse, startForwardConsole, takeScreenshot, waitForRetryKeypress } from "weapp-ide-cli";
 import { generateJs, generateJson, generateWxml, generateWxss } from "@weapp-core/schematics";
 import { determineAgent } from "@vercel/detect-agent";
 import { initConfig } from "@weapp-core/init";
@@ -1093,6 +1093,15 @@ async function reopenOpenedWechatIde(projectPath) {
 	return true;
 }
 async function openIde(platform, projectPath, options = {}) {
+	if (platform === "weapp" && projectPath) try {
+		await bootstrapWechatDevtoolsSettings({
+			projectPath,
+			trustProject: options.trustProject
+		});
+	} catch (error) {
+		logger_default.warn("预写入微信开发者工具安全设置或项目信任状态失败，继续执行 open 流程。");
+		logger_default.error(error);
+	}
 	if (platform === "weapp" && projectPath && options.trustProject !== false) try {
 		if (options.reuseOpenedProject === false) {
 			if (await reopenOpenedWechatIde(projectPath)) return;
@@ -1102,6 +1111,10 @@ async function openIde(platform, projectPath, options = {}) {
 		await openWechatIdeByAutomator(projectPath);
 		return;
 	} catch (error) {
+		if (isAutomatorLoginError(error)) {
+			logger_default.error("检测到微信开发者工具登录状态失效，请先登录后重试。");
+			logger_default.warn(formatAutomatorLoginError(error));
+		}
 		logger_default.warn("通过 automator 启动微信开发者工具并自动信任项目失败，回退到普通 open 流程。");
 		logger_default.error(error);
 	}
@@ -1386,8 +1399,7 @@ async function loadConfig(configFile) {
 		}
 	}
 	if (!loaded && !weappLoaded) return;
-	const config = loaded?.config ?? weappLoaded?.config ?? {};
-	if (weappLoaded?.config?.weapp) config.weapp = defu(weappLoaded.config.weapp, config.weapp ?? {});
+	const config = weappLoaded?.config ? defu(weappLoaded.config, loaded?.config ?? {}) : loaded?.config ?? {};
 	const dependencySet = /* @__PURE__ */ new Set();
 	for (const dependency of loaded?.dependencies ?? []) dependencySet.add(dependency);
 	for (const dependency of weappLoaded?.dependencies ?? []) dependencySet.add(dependency);
@@ -1592,7 +1604,7 @@ async function waitForTermination(cleanup) {
 * @description 执行 ide 子命令。
 */
 async function runIdeCommand(action, root, options) {
-	if (action !== "logs") throw new Error(`未知 ide 子命令: ${action ?? "(empty)"}`);
+	if (action !== "logs" && action !== "setup") throw new Error(`未知 ide 子命令: ${action ?? "(empty)"}`);
 	filterDuplicateOptions(options);
 	const configFile = resolveConfigFile(options);
 	const targets = resolveRuntimeTargets(options);
@@ -1605,6 +1617,14 @@ async function runIdeCommand(action, root, options) {
 	});
 	if (resolved.platform !== "weapp") throw new Error("`weapp-vite ide logs` 当前仅支持微信小程序平台。");
 	if (!resolved.projectPath) throw new Error("无法解析微信开发者工具项目目录，请显式传入 root 或检查 project.config.json。");
+	if (action === "setup") {
+		const result = await bootstrapWechatDevtoolsSettings({
+			projectPath: resolved.projectPath,
+			trustProject: options.trustProject
+		});
+		logger_default.info(`已完成微信开发者工具配置预热：扫描实例 ${result.touchedInstanceCount} 个，更新安全设置 ${result.updatedSecurityCount} 处，写入项目信任 ${result.trustedProjectCount} 处。`);
+		return;
+	}
 	if (options.open) await openIde(resolved.platform, resolved.projectPath, { trustProject: options.trustProject });
 	const forwardConsoleOptions = await resolveForwardConsoleOptions({
 		...resolved.weappViteConfig,
@@ -2096,7 +2116,7 @@ function registerPrepareCommand(cli) {
 }
 //#endregion
 //#region package.json
-var version = "6.15.5";
+var version = "6.15.6";
 //#endregion
 //#region src/cli/devHotkeys/format.ts
 const FULLWIDTH_ASCII_START = 65281;

package/dist/{createContext-BJXXIcT5.mjs → createContext-DPe-Wp3_.mjs}

@@ -1,6 +1,6 @@
 import { n as applyWeappViteHostMeta } from "./pluginHost-BzPJL4F-.mjs";
 import { n as configureLogger, r as logger_default } from "./logger-CgxdNjvb.mjs";
-import { _ as jsExtensions, a as findJsonEntry, b as vueExtensions, c as isJsOrTs, d as touch, g as configExtensions, i as findJsEntry, l as isTemplate, n as changeFileExtension, o as findTemplateEntry, p as inlineAutoRoutesImports, r as findCssEntry, s as findVueEntry, t as extractConfigFromVue, v as supportedCssLangs, y as templateExtensions } from "./file-DllJX3aP.mjs";
+import { _ as jsExtensions, a as findJsonEntry, b as vueExtensions, c as isJsOrTs, d as touch, g as configExtensions, i as findJsEntry, l as isTemplate, n as changeFileExtension, o as findTemplateEntry, p as inlineAutoRoutesImports, r as findCssEntry, s as findVueEntry, t as extractConfigFromVue, v as supportedCssLangs, y as templateExtensions } from "./file-CCWF5mwT.mjs";
 import { createRequire, isBuiltin } from "node:module";
 import path, { posix } from "pathe";
 import { normalize, relative, win32 } from "node:path";
@@ -11151,10 +11151,11 @@ function createLoadConfig(options) {
 			if (cjsError) throw cjsError;
 			throw error;
 		}
+		const mergedLoadedConfig = weappLoaded?.config ? defu(weappLoaded.config, loadedConfig) : loadedConfig;
 		const config = defu(inlineConfig, {
 			mode,
 			configFile: false
-		}, loadedConfig, {
+		}, mergedLoadedConfig, {
 			build: {
 				rolldownOptions: { output: {
 					entryFileNames: (chunkInfo) => {
@@ -11167,7 +11168,6 @@ function createLoadConfig(options) {
 			logLevel: "warn",
 			weapp: getWeappViteConfig()
 		});
-		if (weappLoaded?.config?.weapp) config.weapp = defu(weappLoaded.config.weapp, config.weapp ?? {});
 		const chunksConfigured = Boolean(inlineConfig?.weapp?.chunks || loadedConfig.weapp?.chunks || weappLoaded?.config?.weapp?.chunks);
 		const shouldWarnEnhance = [
 			inlineConfig?.weapp?.enhance,
@@ -34172,6 +34172,7 @@ function mergeMiniprogram(options, ...configs) {
 		define: miniprogramDefines,
 		build: {
 			modulePreload: false,
+			minify: false,
 			emptyOutDir: false,
 			rolldownOptions: { ...rolldownOptions }
 		}
@@ -34479,7 +34480,7 @@ function createConfigService(ctx) {
 		if (resolvedConfig.configMergeInfo?.merged) {
 			const weappConfigDisplay = formatConfigDisplayPath(resolvedConfig.configMergeInfo.weappConfigPath) ?? "weapp-vite.config.ts";
 			const viteConfigDisplay = formatConfigDisplayPath(resolvedConfig.configMergeInfo.viteConfigPath) ?? "vite.config.ts";
-			logger_default.info(`[config] 检测到同时存在 ${weappConfigDisplay} 与 ${viteConfigDisplay}，已合并其中的 \`weapp\` 配置，优先级：${weappConfigDisplay} > ${viteConfigDisplay}`);
+			logger_default.info(`[config] 检测到同时存在 ${weappConfigDisplay} 与 ${viteConfigDisplay}，已合并两份 Vite 配置，优先级：${weappConfigDisplay} > ${viteConfigDisplay}`);
 		}
 		packageManager = await detect() ?? {
 			agent: "npm",
@@ -35059,7 +35060,7 @@ async function loadAppEntry(ctx, scanState) {
 	const vueAppPath = await findVueEntry(appBasename);
 	let configFromVue;
 	if (!appConfigFile && vueAppPath) {
-		const { extractConfigFromVue } = await import("./file-D-LpaSgY.mjs");
+		const { extractConfigFromVue } = await import("./file-DY9paehF.mjs");
 		configFromVue = await extractConfigFromVue(vueAppPath);
 		if (configFromVue) appConfigFile = vueAppPath;
 	}

package/dist/docs/README.md

@@ -187,6 +187,38 @@ wv ide logs
 wv ide logs --open
 ```
 
+## DevTools 配置预热
+
+`weapp-vite` 在打开微信开发者工具前，会复用 `weapp-ide-cli` 的底层能力，自动尝试预热本机 DevTools 配置：
+
+- 确保安全设置中的服务端口处于开启状态
+- 按命令参数或全局配置决定是否自动信任当前项目
+
+如果你只想预热配置、不立即打开 IDE，可以使用：
+
+```sh
+weapp-vite ide setup .
+# 等价写法
+wv ide setup .
+```
+
+如果你希望以后 `open` / `dev --open` / `build --open` 都默认自动信任项目，直接配置 `weapp-ide-cli` 即可：
+
+```sh
+weapp config set autoBootstrapDevtools true
+weapp config set autoTrustProject true
+```
+
+这样以后执行：
+
+```sh
+weapp-vite open .
+weapp-vite dev --open
+weapp-vite build --open
+```
+
+都会沿用同一套默认策略。
+
 ## CLI 中调用 weapp-ide-cli
 
 `weapp-vite` 内置了对 `weapp-ide-cli` 的透传能力，除了 `dev/build/open/init/generate/analyze/npm` 等原生命令外，其它 IDE 相关命令都可以直接调用：
@@ -197,6 +229,7 @@ weapp-vite upload --project ./dist/build/mp-weixin -v 1.0.0 -d "release"
 weapp-vite cache --clean compile
 weapp-vite cache --clean all
 weapp-vite config lang zh
+weapp-vite config set autoTrustProject true
 weapp-vite navigate pages/index/index --project ./dist/build/mp-weixin
 # 等价写法
 wv preview --project ./dist/build/mp-weixin
@@ -208,6 +241,7 @@ wv cache --clean all
 ```sh
 weapp-vite ide preview --project ./dist/build/mp-weixin
 weapp-vite ide config show
+weapp-vite ide setup .
 weapp-vite ide logs --open
 # 等价写法
 wv ide preview --project ./dist/build/mp-weixin

package/dist/{file-DllJX3aP.mjs → file-CCWF5mwT.mjs}

@@ -84,7 +84,7 @@ function resolveAutoRoutesMacroImportPath() {
 }
 async function resolveAutoRoutesInlineSnapshot() {
 	try {
-		const { getCompilerContext } = await import("./getInstance-BuIdW4Wd.mjs");
+		const { getCompilerContext } = await import("./getInstance-DPNGGEFm.mjs");
 		const compilerContext = getCompilerContext();
 		const service = compilerContext.autoRoutesService;
 		const reference = service?.getReference?.();

package/dist/file-DY9paehF.mjs

@@ -0,0 +1,2 @@
+import { t as extractConfigFromVue } from "./file-CCWF5mwT.mjs";
+export { extractConfigFromVue };

package/dist/getInstance-DPNGGEFm.mjs

@@ -0,0 +1,2 @@
+import { i as getCompilerContext } from "./createContext-DPe-Wp3_.mjs";
+export { getCompilerContext };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { t as createCompilerContext } from "./createContext-BJXXIcT5.mjs";
+import { t as createCompilerContext } from "./createContext-DPe-Wp3_.mjs";
 import { a as defineThemeJson, i as defineSitemapJson, n as defineComponentJson, r as definePageJson, t as defineAppJson } from "./json-wnfVS9jE.mjs";
 import { a as resolveWeappViteHostMeta, i as isWeappViteHost, n as applyWeappViteHostMeta, r as createWeappViteHostMeta, t as WEAPP_VITE_HOST_NAME } from "./pluginHost-BzPJL4F-.mjs";
 import { t as defineConfig } from "./config-B2xtjEug.mjs";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weapp-vite",
   "type": "module",
-  "version": "6.15.5",
+  "version": "6.15.6",
   "description": "weapp-vite 一个现代化的小程序打包工具",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -121,17 +121,17 @@
     "@weapp-core/logger": "3.1.1",
     "@weapp-core/schematics": "6.0.4",
     "@weapp-core/shared": "3.0.3",
-    "@weapp-vite/ast": "6.15.5",
+    "@weapp-vite/ast": "6.15.6",
     "@weapp-vite/mcp": "1.2.1",
     "@weapp-vite/miniprogram-automator": "1.0.2",
     "@weapp-vite/volar": "2.0.8",
-    "@weapp-vite/web": "1.3.15",
+    "@weapp-vite/web": "1.3.16",
     "@wevu/api": "0.2.3",
     "@wevu/web-apis": "1.2.7",
     "rolldown-require": "2.0.13",
     "vite-plugin-performance": "2.0.1",
-    "weapp-ide-cli": "5.2.2",
-    "wevu": "6.15.5"
+    "weapp-ide-cli": "5.2.3",
+    "wevu": "6.15.6"
   },
   "publishConfig": {
     "access": "public",

package/dist/file-D-LpaSgY.mjs

@@ -1,2 +0,0 @@
-import { t as extractConfigFromVue } from "./file-DllJX3aP.mjs";
-export { extractConfigFromVue };

package/dist/getInstance-BuIdW4Wd.mjs

@@ -1,2 +0,0 @@
-import { i as getCompilerContext } from "./createContext-BJXXIcT5.mjs";
-export { getCompilerContext };