weapp-vite 6.14.1 → 6.14.3

package/dist/auto-import-components/resolvers.d.mts

@@ -1,2 +1,2 @@
-import { a as ExternalMetadataFileCandidates, c as Resolver, d as ResolverObject, f as ResolverSupportFilesStrategy, i as CreateResolver, l as ResolverFn, n as VantResolver, o as Options, r as TDesignResolver, s as ResolvedValue, t as WeuiResolver, u as ResolverMeta } from "../index-hN5mdpQ_.mjs";
+import { a as ExternalMetadataFileCandidates, c as Resolver, d as ResolverObject, f as ResolverSupportFilesStrategy, i as CreateResolver, l as ResolverFn, n as VantResolver, o as Options, r as TDesignResolver, s as ResolvedValue, t as WeuiResolver, u as ResolverMeta } from "../index-6QUk3Zbc.mjs";
 export { CreateResolver, ExternalMetadataFileCandidates, Options, ResolvedValue, Resolver, ResolverFn, ResolverMeta, ResolverObject, ResolverSupportFilesStrategy, TDesignResolver, VantResolver, WeuiResolver };

package/dist/auto-import-components/resolvers.mjs

@@ -109,6 +109,7 @@ const TDesignResolver = (opts) => {
 	}, {});
 	return {
 		components: Object.freeze({ ...map }),
+		componentLookupStrategy: "static",
 		supportFilesStrategy,
 		resolve(componentName) {
 			const from = map[componentName];
@@ -241,6 +242,7 @@ const VantResolver = (opts) => {
 	}, {});
 	return {
 		components: Object.freeze({ ...map }),
+		componentLookupStrategy: "static",
 		supportFilesStrategy,
 		resolve(componentName) {
 			const from = map[componentName];
@@ -311,6 +313,7 @@ const WeuiResolver = (opts) => {
 	}, {});
 	return {
 		components: Object.freeze({ ...map }),
+		componentLookupStrategy: "static",
 		supportFilesStrategy,
 		resolve(componentName) {
 			const from = map[componentName];

package/dist/auto-routes.mjs

@@ -1,4 +1,4 @@
-import { i as getCompilerContext, u as getRouteRuntimeGlobalKeys } from "./createContext-DT4tLA1C.mjs";
+import { i as getCompilerContext, u as getRouteRuntimeGlobalKeys } from "./createContext-BWIKo9nG.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-DT4tLA1C.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-BWIKo9nG.mjs";
 import { r as logger_default, t as colors } from "./logger-CgxdNjvb.mjs";
-import { m as VERSION } from "./file-BkvmW6_2.mjs";
+import { m as VERSION } from "./file-B1jggPxp.mjs";
 import { a as resolveWeappMcpConfig, o as startWeappViteMcpServer } from "./mcp-DRlj32v4.mjs";
 import { createRequire } from "node:module";
 import { defu, fs } from "@weapp-core/shared";
@@ -960,21 +960,6 @@ async function openWechatIdeByAutomator(projectPath) {
 	})).disconnect();
 }
 /**
-* @description 若当前项目已在微信开发者工具中打开且自动化可连通，则直接复用现有会话，避免重复拉起 IDE。
-*/
-async function tryReuseOpenedWechatIde(projectPath) {
-	try {
-		(await connectOpenedAutomator({
-			projectPath,
-			timeout: 3e3
-		})).disconnect();
-		logger_default.info("目标项目已在微信开发者工具中打开，跳过重复打开。");
-		return true;
-	} catch {
-		return false;
-	}
-}
-/**
 * @description 执行 IDE 打开流程，并在登录失效时允许按键重试。
 */
 async function runWechatIdeOpenWithRetry(argv) {
@@ -990,7 +975,7 @@ async function runWechatIdeOpenWithRetry(argv) {
 		logger_default.error("检测到微信开发者工具登录状态失效，请先登录后重试。");
 		logger_default.warn(formatWechatIdeLoginRequiredError(error));
 		logger_default.info(formatRetryHotkeyPrompt());
-		if (!await waitForRetryKeypress()) {
+		if (await waitForRetryKeypress() !== "retry") {
 			logger_default.warn("已取消重试。完成登录后请重新执行当前命令。");
 			retrying = false;
 			continue;
@@ -1033,20 +1018,6 @@ function resolveIdeProjectPath(mpDistRoot) {
 function resolveIdeProjectRoot(mpDistRoot, cwd) {
 	return resolveIdeProjectPath(mpDistRoot) ?? cwd;
 }
-async function openIde(platform, projectPath, options = {}) {
-	if (platform === "weapp" && projectPath && options.trustProject !== false) try {
-		if (await tryReuseOpenedWechatIde(projectPath)) return;
-		await openWechatIdeByAutomator(projectPath);
-		return;
-	} catch (error) {
-		logger_default.warn("通过 automator 启动微信开发者工具并自动信任项目失败，回退到普通 open 流程。");
-		logger_default.error(error);
-	}
-	const argv = ["open", "-p"];
-	if (projectPath) argv.push(projectPath);
-	if (shouldPassPlatformArgToIdeOpen(platform)) argv.push("--platform", platform);
-	await runWechatIdeOpenWithRetry(argv);
-}
 async function closeIde() {
 	const config = await getConfig();
 	const cliPath = config.cliPath?.trim() ? config.cliPath : null;
@@ -1075,6 +1046,51 @@ async function closeIde() {
 		return false;
 	}
 }
+function formatReuseOpenedWechatIdePrompt() {
+	return `目标项目已在微信开发者工具中打开，已跳过重复打开。按 ${colors.bold(colors.green("r"))} 关闭当前窗口后重新打开。`;
+}
+/**
+* @description 若当前项目已在微信开发者工具中打开且自动化可连通，则直接复用现有会话，避免重复拉起 IDE。
+*/
+async function tryReuseOpenedWechatIde(projectPath) {
+	let miniProgram;
+	try {
+		miniProgram = await connectOpenedAutomator({
+			projectPath,
+			timeout: 3e3
+		});
+	} catch {
+		return null;
+	}
+	miniProgram.disconnect();
+	logger_default.info(formatReuseOpenedWechatIdePrompt());
+	if (await waitForRetryKeypress() !== "retry") return {
+		reopened: false,
+		reused: true
+	};
+	logger_default.info(colors.bold(colors.green("正在关闭当前已打开项目，并重新拉起微信开发者工具...")));
+	if (!await closeIde()) logger_default.warn("关闭当前微信开发者工具失败，仍继续尝试重新打开目标项目。");
+	await openWechatIdeByAutomator(projectPath);
+	return {
+		reopened: true,
+		reused: false
+	};
+}
+async function openIde(platform, projectPath, options = {}) {
+	if (platform === "weapp" && projectPath && options.trustProject !== false) try {
+		const reuseResult = await tryReuseOpenedWechatIde(projectPath);
+		if (reuseResult?.reused || reuseResult?.reopened) return;
+		await openWechatIdeByAutomator(projectPath);
+		return;
+	} catch (error) {
+		logger_default.warn("通过 automator 启动微信开发者工具并自动信任项目失败，回退到普通 open 流程。");
+		logger_default.error(error);
+	}
+	const argv = ["open", "-p"];
+	if (projectPath) argv.push(projectPath);
+	if (platform && shouldPassPlatformArgToIdeOpen(platform)) argv.push("--platform", platform);
+	await runWechatIdeOpenWithRetry(argv);
+}
 /**
 * @description 解析 IDE 相关命令所需的平台、项目目录与配置上下文。
 */
@@ -1137,6 +1153,7 @@ function registerBuildCommand(cli) {
 			inlineConfig,
 			cliPlatform: targets.rawPlatform,
 			projectConfigPath: options.projectConfig,
+			emitDefaultAutoImportOutputs: false,
 			syncSupportFiles: false,
 			preloadAppEntry: false
 		});
@@ -1958,7 +1975,7 @@ async function handleDoctor(clientName, options) {
 	logger_default.success("MCP 客户端配置检查通过。");
 }
 async function handleServer(options) {
-	const resolvedTransport = options.transport === "http" ? "streamable-http" : options.transport;
+	const resolvedTransport = options.transport === "http" ? "streamable-http" : options.transport === "command" ? void 0 : options.transport;
 	await startWeappViteMcpServer({
 		endpoint: options.endpoint,
 		host: options.host,
@@ -2051,10 +2068,10 @@ function registerPrepareCommand(cli) {
 }
 //#endregion
 //#region package.json
-var version = "6.14.1";
+var version = "6.14.3";
 //#endregion
 //#region src/cli/devHotkeys.ts
-const DEV_SCREENSHOT_DIR = ".tmp/weapp-vite-dev-screenshots";
+const DEV_SCREENSHOT_DIR = ".weapp-vite/dev-screenshots";
 const DEFAULT_SCREENSHOT_TIMEOUT = 3e4;
 const REG_PENDING_PREFIX = /^正在/;
 const FULLWIDTH_ASCII_START = 65281;
@@ -2346,7 +2363,7 @@ function startDevHotkeys(options) {
 	const handleInputOnce = (input, source) => {
 		const normalizedInput = normalizeInputChar(input);
 		const now = Date.now();
-		for (const [token, timestamp] of recentInputs) if (now - timestamp > HOTKEY_DEDUP_WINDOW_MS) recentInputs.delete(token);
+		for (const [token, timestamp] of recentInputs) if (now - Number(timestamp.split(":")[1] ?? 0) > HOTKEY_DEDUP_WINDOW_MS) recentInputs.delete(token);
 		const dedupKey = normalizedInput;
 		const recentEntry = recentInputs.get(dedupKey);
 		if (recentEntry !== void 0) {
@@ -2502,21 +2519,12 @@ function registerServeCommand(cli) {
 				}
 			};
 			if (targets.runMini) {
-				const buildWatch = typeof inlineConfig?.build?.watch === "object" && inlineConfig.build.watch ? inlineConfig.build.watch : {};
-				const buildChokidar = "chokidar" in buildWatch ? buildWatch.chokidar : void 0;
 				const existingServer = inlineConfig?.server ?? {};
 				inlineConfig = {
 					...inlineConfig,
 					build: {
 						...inlineConfig?.build ?? {},
-						watch: {
-							...buildWatch,
-							chokidar: {
-								...buildChokidar ?? {},
-								usePolling: true,
-								interval: 100
-							}
-						}
+						watch: typeof inlineConfig?.build?.watch === "object" && inlineConfig.build.watch ? { ...inlineConfig.build.watch } : {}
 					},
 					server: {
 						...existingServer,
@@ -2546,9 +2554,9 @@ function registerServeCommand(cli) {
 		let analyzeRunId = 0;
 		const devHotkeysSession = targets.runMini ? startDevHotkeys({
 			cwd: configService.cwd,
-			mcpConfig: configService.weappViteConfig?.weapp?.mcp,
+			mcpConfig: configService.weappViteConfig?.mcp,
 			platform: configService.platform,
-			projectPath: resolveIdeProjectRoot(configService.mpDistRoot, configService.cwd),
+			projectPath: resolveIdeProjectRoot(configService.mpDistRoot, configService.cwd) ?? configService.cwd,
 			silentStartupHint: true
 		}) : void 0;
 		try {

package/dist/{config-GqcM7sq1.d.mts → config-BMpfbpQb.d.mts}

@@ -1,4 +1,4 @@
-import { c as Resolver, s as ResolvedValue } from "./index-hN5mdpQ_.mjs";
+import { c as Resolver, s as ResolvedValue } from "./index-6QUk3Zbc.mjs";
 import { t as AutoRoutes } from "./routes-DiEBrMtj.mjs";
 import { LRUCache } from "lru-cache";
 import { LoggerConfig } from "@weapp-core/logger";
@@ -351,6 +351,7 @@ interface ScanWxmlOptions {
  * @description WXML 处理阶段配置
  */
 interface HandleWxmlOptions {
+  defineImportMetaEnv?: Record<string, any>;
   removeComment?: boolean;
   transformEvent?: boolean;
   scriptModuleExtension?: string;
@@ -1022,6 +1023,7 @@ interface LoadConfigOptions {
   cwd: string;
   isDev: boolean;
   mode: string;
+  emitDefaultAutoImportOutputs?: boolean;
   pluginOnly?: boolean;
   inlineConfig?: InlineConfig;
   configFile?: string;
@@ -1037,6 +1039,7 @@ interface LoadConfigResult {
   cwd: string;
   isDev: boolean;
   mode: string;
+  emitDefaultAutoImportOutputs: boolean;
   chunksConfigured?: boolean;
   projectConfig: Record<string, any>;
   projectConfigPath?: string;
@@ -1085,6 +1088,7 @@ interface ConfigService {
   readonly defineImportMetaEnv: Record<string, any>;
   readonly cwd: string;
   readonly isDev: boolean;
+  readonly emitDefaultAutoImportOutputs: boolean;
   readonly mpDistRoot: string;
   readonly outDir: string;
   readonly inlineConfig: InlineConfig;
@@ -1202,7 +1206,18 @@ interface RemovalRange {
   end: number;
 }
 interface WxmlToken {
+  /**
+   * @description 参与常规组件分析的标签集合。
+   * 会应用 `excludeComponent` 过滤，通常会排除宿主内置组件，
+   * 供原有的 `usingComponents` 推断与模板依赖聚合使用。
+   */
   components: ComponentsMap;
+  /**
+   * @description 供自动导入使用的完整标签集合。
+   * 不会因为“这是宿主内置组件名”而被提前过滤，
+   * 用来支持“本地组件与内置组件重名时仍优先命中用户组件”的场景。
+   */
+  autoImportComponents?: ComponentsMap;
   deps: WxmlDep[];
   removalRanges: RemovalRange[];
   commentTokens: Token[];
@@ -1367,7 +1382,15 @@ interface WxmlService {
   depsMap: Map<string, Set<string>>;
   importerMap: Map<string, Set<string>>;
   tokenMap: Map<string, ScanWxmlResult>;
+  /**
+   * @description 常规组件索引缓存。
+   * 这里沿用历史行为，只保留“应参与 usingComponents 推断”的组件标签。
+   */
   wxmlComponentsMap: Map<string, ComponentsMap>;
+  /**
+   * @description 常规组件聚合缓存。
+   * 会递归合并 import/include 进来的模板组件，但仍遵循内置组件过滤规则。
+   */
   aggregatedComponentsMap: Map<string, ComponentsMap>;
   addDeps: (filepath: string, deps?: string[]) => Promise<void>;
   setDeps: (filepath: string, deps?: string[]) => Promise<void>;
@@ -1375,7 +1398,10 @@ interface WxmlService {
   getImporters: (filepath: string) => Set<string>;
   getAllDeps: () => Set<string>;
   getAggregatedComponents: (filepathOrBaseName: string) => ComponentsMap | undefined;
-  clearAll: () => void;
+  getAggregatedAutoImportComponents: (filepathOrBaseName: string) => ComponentsMap | undefined;
+  clearAll: (options?: {
+    clearEmittedCode?: boolean;
+  }) => void;
   analyze: (wxml: string) => ScanWxmlResult;
   scan: (filepath: string) => Promise<ScanWxmlResult | undefined>;
   setWxmlComponentsMap: (absPath: string, components: ComponentsMap) => void;

package/dist/config.d.mts

@@ -1,2 +1,2 @@
-import { An as createWeappViteHostMeta, Dn as WeappViteHostMeta, En as WEAPP_VITE_HOST_NAME, Mn as resolveWeappViteHostMeta, On as WeappViteRuntime, _ as definePageJson, a as UserConfigFnNoEnvPlain, c as UserConfigFnPromise, d as Component, f as Page, g as defineComponentJson, h as defineAppJson, i as UserConfigFnNoEnv, jn as isWeappViteHost, kn as applyWeappViteHostMeta, l as defineConfig, m as Theme, n as UserConfigExport, nt as WeappViteConfig, o as UserConfigFnObject, p as Sitemap, r as UserConfigFn, s as UserConfigFnObjectPlain, t as UserConfig, u as App, v as defineSitemapJson, y as defineThemeJson } from "./config-GqcM7sq1.mjs";
+import { An as createWeappViteHostMeta, Dn as WeappViteHostMeta, En as WEAPP_VITE_HOST_NAME, Mn as resolveWeappViteHostMeta, On as WeappViteRuntime, _ as definePageJson, a as UserConfigFnNoEnvPlain, c as UserConfigFnPromise, d as Component, f as Page, g as defineComponentJson, h as defineAppJson, i as UserConfigFnNoEnv, jn as isWeappViteHost, kn as applyWeappViteHostMeta, l as defineConfig, m as Theme, n as UserConfigExport, nt as WeappViteConfig, o as UserConfigFnObject, p as Sitemap, r as UserConfigFn, s as UserConfigFnObjectPlain, t as UserConfig, u as App, v as defineSitemapJson, y as defineThemeJson } from "./config-BMpfbpQb.mjs";
 export { App, Component, Page, Sitemap, Theme, UserConfig, UserConfigExport, UserConfigFn, UserConfigFnNoEnv, UserConfigFnNoEnvPlain, UserConfigFnObject, UserConfigFnObjectPlain, UserConfigFnPromise, WEAPP_VITE_HOST_NAME, WeappViteConfig, WeappViteHostMeta, WeappViteRuntime, applyWeappViteHostMeta, createWeappViteHostMeta, defineAppJson, defineComponentJson, defineConfig, definePageJson, defineSitemapJson, defineThemeJson, isWeappViteHost, resolveWeappViteHostMeta };

package/dist/config.mjs

@@ -1,4 +1,4 @@
-import { a as defineThemeJson, i as defineSitemapJson, n as defineComponentJson, r as definePageJson, t as defineAppJson } from "./json-D0HkutE0.mjs";
-import { a as resolveWeappViteHostMeta, i as isWeappViteHost, n as applyWeappViteHostMeta, r as createWeappViteHostMeta, t as WEAPP_VITE_HOST_NAME } from "./pluginHost-SJdl15d3.mjs";
-import { t as defineConfig } from "./config-DJjSbpNX.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";
 export { WEAPP_VITE_HOST_NAME, applyWeappViteHostMeta, createWeappViteHostMeta, defineAppJson, defineComponentJson, defineConfig, definePageJson, defineSitemapJson, defineThemeJson, isWeappViteHost, resolveWeappViteHostMeta };