weapp-vite 6.16.33 → 6.16.34

package/dist/auto-routes.mjs

@@ -1,4 +1,4 @@
-import { g as getRouteRuntimeGlobalKeys, i as getCompilerContext } from "./createContext-DxZoDRL0.mjs";
+import { g as getRouteRuntimeGlobalKeys, i as getCompilerContext } from "./createContext-BZRrqhni.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 { C as createCjsConfigLoadError, E as isPathInside, S as parseCommentJson, T as shouldPassPlatformArgToIdeOpen, _ as createBuildScopeConfigFromCli, b as getProjectConfigFileName, f as resolveWeappViteTarget, h as resolveHmrProfileJsonPath, m as SHARED_CHUNK_VIRTUAL_PREFIX, n as syncProjectSupportFiles, p as createSharedBuildConfig, r as syncManagedTsconfigBootstrapFiles, s as formatBytes, t as createCompilerContext, v as resolveWeappConfigFile, w as getDefaultIdeProjectRoot, x as loadViteConfigFile, y as checkRuntime } from "./createContext-DxZoDRL0.mjs";
+import { C as createCjsConfigLoadError, E as isPathInside, S as parseCommentJson, T as shouldPassPlatformArgToIdeOpen, _ as createBuildScopeConfigFromCli, b as getProjectConfigFileName, f as resolveWeappViteTarget, h as resolveHmrProfileJsonPath, m as SHARED_CHUNK_VIRTUAL_PREFIX, n as syncProjectSupportFiles, p as createSharedBuildConfig, r as syncManagedTsconfigBootstrapFiles, s as formatBytes, t as createCompilerContext, v as resolveWeappConfigFile, w as getDefaultIdeProjectRoot, x as loadViteConfigFile, y as checkRuntime } from "./createContext-BZRrqhni.mjs";
 import { r as logger_default, t as colors } from "./logger-mt4mSTqV.mjs";
-import { h as VERSION } from "./file-D5ALdQXr.mjs";
+import { h as VERSION } from "./file-DuKnIngQ.mjs";
 import { o as resolveWeappMcpConfig, s as startWeappViteMcpServer } from "./mcp-qmDOTH07.mjs";
 import { createRequire } from "node:module";
 import path, { posix } from "pathe";
@@ -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, 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, 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 { promisify } from "node:util";
 import { brotliCompressSync, gzipSync } from "node:zlib";
 import { resolveCommand } from "package-manager-detector/commands";
@@ -85,7 +85,7 @@ async function tryExecuteWechatIdeCliCommandByAutomator(argv, projectPath) {
 	}
 	return false;
 }
-async function tryExecuteWechatIdeCliCommandByHttp(argv, projectPath) {
+async function tryExecuteWechatIdeCliCommandByHttp(argv, projectPath, engineBuildFallbackToCli = false) {
 	const command = argv[0];
 	if (!command) return false;
 	if (command === "compile") {
@@ -101,7 +101,10 @@ async function tryExecuteWechatIdeCliCommandByHttp(argv, projectPath) {
 	if (command === "engine" && argv[1] === "build") {
 		const engineProjectPath = argv[2] || projectPath;
 		if (!engineProjectPath) return false;
-		await runWechatIdeEngineBuild(engineProjectPath, { logPath: readArgOption(argv, "--logPath", "-l") });
+		await runWechatIdeEngineBuild(engineProjectPath, {
+			fallbackToCli: engineBuildFallbackToCli,
+			logPath: readArgOption(argv, "--logPath", "-l")
+		});
 		return true;
 	}
 	return false;
@@ -129,12 +132,12 @@ async function tryExecuteWechatIdeCliCommandByHelper(argv) {
 * @description 统一执行 weapp-ide-cli 命令，并在登录失效时复用同一套重试交互。
 */
 async function executeWechatIdeCliCommand(argv, options = {}) {
-	const { automatorMode = "prefer", cancelLevel = "warn", httpMode = "prefer", onNonLoginError, onRetry, projectPath } = options;
+	const { automatorMode = "prefer", cancelLevel = "warn", engineBuildFallbackToCli = false, httpMode = "prefer", onNonLoginError, onRetry, projectPath } = options;
 	await runWithSuspendedSharedInput(async () => {
 		if (httpMode !== "skip") try {
-			if (await tryExecuteWechatIdeCliCommandByHttp(argv, projectPath)) return;
+			if (await tryExecuteWechatIdeCliCommandByHttp(argv, projectPath, engineBuildFallbackToCli)) return;
 		} catch (error) {
-			if (httpMode === "require") throw error;
+			if (httpMode === "require" || isWechatIdeEngineBuildEndpointMissingError(error)) throw error;
 		}
 		try {
 			if (await tryExecuteWechatIdeCliCommandByAutomator(argv, projectPath)) return;
@@ -360,15 +363,20 @@ async function stabilizeOpenedWechatIdeProject(projectPath, servicePortEnabled)
 			onNonLoginError: (error) => logger_default.error(error),
 			projectPath
 		});
-		await executeWechatIdeCliCommand([
-			"engine",
-			"build",
-			projectPath
-		], {
-			httpMode: "prefer",
-			onNonLoginError: (error) => logger_default.error(error),
-			projectPath
-		});
+		try {
+			await executeWechatIdeCliCommand([
+				"engine",
+				"build",
+				projectPath
+			], {
+				httpMode: "prefer",
+				onNonLoginError: (error) => logger_default.error(error),
+				projectPath
+			});
+		} catch (error) {
+			if (!isWechatIdeEngineBuildEndpointMissingError(error)) throw error;
+			logger_default.warn("当前微信开发者工具不支持自动 engine build 刷新，已跳过该步骤；如模拟器显示旧状态，可在开发者工具内手动编译。");
+		}
 		try {
 			await executeWechatIdeCliCommand(["compile"], {
 				automatorMode: "require",
@@ -3708,7 +3716,7 @@ function resolveRunnableHotkeyDefinition(input) {
 }
 //#endregion
 //#region package.json
-var version = "6.16.33";
+var version = "6.16.34";
 //#endregion
 //#region src/cli/devHotkeys/format.ts
 const FULLWIDTH_ASCII_START = 65281;

package/dist/{createContext-DxZoDRL0.mjs → createContext-BZRrqhni.mjs}

@@ -1,6 +1,6 @@
 import { n as applyWeappViteHostMeta } from "./pluginHost--CaeyWpA.mjs";
 import { n as configureLogger, r as logger_default } from "./logger-mt4mSTqV.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-D5ALdQXr.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-DuKnIngQ.mjs";
 import { createRequire, isBuiltin } from "node:module";
 import path, { posix } from "pathe";
 import path$1, { normalize, relative, win32 } from "node:path";
@@ -11499,7 +11499,8 @@ function createBuildService(ctx) {
 						logger_default.info("检测到 Vite 配置变更，正在重启小程序开发构建...");
 						resetRuntimeStateForConfigRestart();
 						await configService.load(configService.loadOptions);
-						await scanService.loadAppEntry().catch(() => {});
+						await scanService.loadAppEntry();
+						scanService.loadSubPackages();
 						logger_default.success("Vite 配置已重新加载，小程序开发构建已重启。");
 						await runDev(target);
 					}
@@ -21640,6 +21641,9 @@ function isWevuMinifyEnabled(config, isDev = false) {
 }
 //#endregion
 //#region src/plugins/vue/transform/compileOptions.ts
+function hasVueExtension(id) {
+	return Boolean(id?.endsWith(".vue"));
+}
 function getCompileVueFileOptionsCacheKey(vuePath, isPage, isApp) {
 	return `${vuePath}::${isPage ? "page" : "component"}::${isApp ? "app" : "entry"}`;
 }
@@ -21696,19 +21700,47 @@ function buildCompileVueFileOptions(ctx, pluginCtx, vuePath, isPage, isApp, conf
 	const wevuDefaults = resolveWevuDefaultsWithPreset(configService.weappViteConfig);
 	const wevuMinify = isWevuMinifyEnabled(configService.weappViteConfig, configService.isDev);
 	const jsonKind = isApp ? "app" : isPage ? "page" : "component";
+	async function resolvePotentialVueSfcEntryId(candidate) {
+		const trimmed = candidate?.trim();
+		if (!trimmed) return;
+		const entryResolveOptions = createCachedEntryResolveOptions(configService, { kind: "default" });
+		const localCandidate = path.isAbsolute(trimmed) ? trimmed : trimmed.startsWith(".") ? path.resolve(path.dirname(vuePath), trimmed) : !trimmed.includes(":") && !trimmed.startsWith("@") ? path.resolve(configService.absoluteSrcRoot, trimmed) : void 0;
+		if (localCandidate) {
+			const normalized = normalizeFsResolvedId(localCandidate);
+			if (hasVueExtension(normalized)) return normalized;
+			const resolvedEntry = !normalized || isSkippableResolvedId(normalized) ? void 0 : await resolveEntryPath(normalized, entryResolveOptions);
+			if (hasVueExtension(resolvedEntry)) return resolvedEntry;
+		}
+		const resolveCandidates = path.extname(trimmed) ? [trimmed] : [
+			trimmed,
+			`${trimmed}.vue`,
+			`${trimmed}/index.vue`
+		];
+		for (const resolveCandidate of resolveCandidates) {
+			const resolved = await pluginCtx.resolve?.(resolveCandidate, vuePath);
+			const normalized = resolved?.id ? normalizeFsResolvedId(resolved.id) : void 0;
+			if (!normalized || isSkippableResolvedId(normalized)) continue;
+			if (hasVueExtension(normalized)) return normalized;
+			if (path.isAbsolute(normalized)) {
+				const resolvedEntry = await resolveEntryPath(normalized, entryResolveOptions);
+				if (hasVueExtension(resolvedEntry)) return resolvedEntry;
+			}
+		}
+	}
 	async function resolveAutoImportComponentSourceType(match) {
 		if (match.kind === "local") {
 			const resolvedId = match.entry.templatePath;
 			return {
 				resolvedId,
-				sourceType: resolvedId?.endsWith(".vue") ? "wevu-sfc" : "native"
+				sourceType: hasVueExtension(resolvedId) ? "wevu-sfc" : "native"
 			};
 		}
 		const explicitSourceType = match.value.sourceType;
 		const explicitResolvedId = match.value.resolvedId;
-		if (explicitSourceType || explicitResolvedId?.endsWith(".vue") || match.value.from.endsWith(".vue")) return {
-			resolvedId: explicitResolvedId,
-			sourceType: explicitSourceType ?? (explicitResolvedId?.endsWith(".vue") || match.value.from.endsWith(".vue") ? "wevu-sfc" : "native")
+		const resolvedExplicitVueId = await resolvePotentialVueSfcEntryId(explicitResolvedId);
+		if (explicitSourceType || resolvedExplicitVueId || hasVueExtension(explicitResolvedId) || hasVueExtension(match.value.from)) return {
+			resolvedId: resolvedExplicitVueId ?? explicitResolvedId,
+			sourceType: explicitSourceType ?? (resolvedExplicitVueId || hasVueExtension(explicitResolvedId) || hasVueExtension(match.value.from) ? "wevu-sfc" : "native")
 		};
 		let localSourceBase;
 		if (match.value.from.startsWith("/")) localSourceBase = path.join(configService.absoluteSrcRoot, match.value.from.slice(1));
@@ -21720,7 +21752,7 @@ function buildCompileVueFileOptions(ctx, pluginCtx, vuePath, isPage, isApp, conf
 		const resolvedId = await resolveEntryPath(localSourceBase, createCachedEntryResolveOptions(configService, { kind: "default" }));
 		return {
 			resolvedId,
-			sourceType: resolvedId?.endsWith(".vue") ? "wevu-sfc" : "native"
+			sourceType: hasVueExtension(resolvedId) ? "wevu-sfc" : "native"
 		};
 	}
 	return {
@@ -24701,7 +24733,7 @@ async function loadAppEntry(ctx, scanState) {
 	const vueAppPath = await findVueEntry(appBasename);
 	let configFromVue;
 	if (!appConfigFile && vueAppPath) {
-		const { extractConfigFromVue } = await import("./file-CAsLsVdT.mjs");
+		const { extractConfigFromVue } = await import("./file-B0xt4gdk.mjs");
 		configFromVue = await extractConfigFromVue(vueAppPath);
 		if (configFromVue) appConfigFile = vueAppPath;
 	}
@@ -24754,7 +24786,7 @@ async function loadAppEntry(ctx, scanState) {
 		}
 		throw new Error("`app.json` 解析失败，请确保 `app.json` 文件格式正确");
 	}
-	throw new Error(`在 ${appDirname} 目录下没有找到 \`app.json\` 或 \`app.vue\`，请确保你初始化了小程序项目，或者在 \`vite.config.ts\` / \`weapp-vite.config.ts\` 中设置正确的 \`weapp.srcRoot\` 配置路径`);
+	throw new Error(`在 ${appDirname} 目录下没有找到 \`app.json\`、\`app.json.ts\` 或 \`app.vue\`，请确保你初始化了小程序项目，或者在 \`vite.config.ts\` / \`weapp-vite.config.ts\` 中设置正确的 \`weapp.srcRoot\` 配置路径`);
 }
 //#endregion
 //#region src/runtime/scanPlugin/styleEntries/config.ts
@@ -25071,7 +25103,7 @@ function loadSubPackages(ctx) {
 		scanState.isDirty = false;
 	} else for (const meta of subPackageMap.values()) meta.entries = resolveSubPackageEntries(meta.subPackage);
 	if (scanState.appEntry) return [...subPackageMap.values()];
-	throw new Error(`在 ${configService.absoluteSrcRoot} 目录下没有找到 \`app.json\`, 请确保你初始化了小程序项目，或者在 \`vite.config.ts\` / \`weapp-vite.config.ts\` 中设置正确的 \`weapp.srcRoot\` 配置路径`);
+	throw new Error(`在 ${configService.absoluteSrcRoot} 目录下没有找到 \`app.json\`、\`app.json.ts\` 或 \`app.vue\`，请确保你初始化了小程序项目，或者在 \`vite.config.ts\` / \`weapp-vite.config.ts\` 中设置正确的 \`weapp.srcRoot\` 配置路径`);
 }
 //#endregion
 //#region src/runtime/scanPlugin/service/index.ts

package/dist/file-B0xt4gdk.mjs

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

package/dist/{file-D5ALdQXr.mjs → file-DuKnIngQ.mjs}

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

package/dist/getInstance-BGkP2tgX.mjs

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

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { a as defineThemeJson, i as defineSitemapJson, n as defineComponentJson, r as definePageJson, t as defineAppJson } from "./json-BL8Dhhk6.mjs";
 import { a as resolveWeappViteHostMeta, i as isWeappViteHost, n as applyWeappViteHostMeta, r as createWeappViteHostMeta, t as WEAPP_VITE_HOST_NAME } from "./pluginHost--CaeyWpA.mjs";
 import { t as defineConfig } from "./config-DRGcCi3h.mjs";
-import { c as WEB_PLATFORM_ALIASES, d as isWebPlatform, f as resolveWeappViteTarget, l as getSupportedWeappVitePlatforms, t as createCompilerContext, u as getSupportedWeappViteTargetDescriptors } from "./createContext-DxZoDRL0.mjs";
+import { c as WEB_PLATFORM_ALIASES, d as isWebPlatform, f as resolveWeappViteTarget, l as getSupportedWeappVitePlatforms, t as createCompilerContext, u as getSupportedWeappViteTargetDescriptors } from "./createContext-BZRrqhni.mjs";
 import { i as createWevuComponent, n as defineProps, r as setPageLayout, t as defineEmits } from "./runtime-C3z9pDQB.mjs";
 export { WEAPP_VITE_HOST_NAME, WEB_PLATFORM_ALIASES, applyWeappViteHostMeta, createCompilerContext, createWeappViteHostMeta, createWevuComponent, defineAppJson, defineComponentJson, defineConfig, defineEmits, definePageJson, defineProps, defineSitemapJson, defineThemeJson, getSupportedWeappVitePlatforms, getSupportedWeappViteTargetDescriptors, isWeappViteHost, isWebPlatform, resolveWeappViteHostMeta, resolveWeappViteTarget, setPageLayout };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weapp-vite",
   "type": "module",
-  "version": "6.16.33",
+  "version": "6.16.34",
   "description": "weapp-vite 一个现代化的小程序打包工具",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -122,7 +122,7 @@
     "@weapp-core/logger": "3.1.1",
     "@weapp-core/schematics": "6.0.4",
     "@weapp-core/shared": "3.0.4",
-    "@weapp-vite/ast": "6.16.33",
+    "@weapp-vite/ast": "6.16.34",
     "@weapp-vite/mcp": "1.3.6",
     "@weapp-vite/miniprogram-automator": "1.1.3",
     "@weapp-vite/volar": "2.1.0",
@@ -131,15 +131,15 @@
     "@wevu/web-apis": "1.2.19",
     "rolldown-require": "2.0.18",
     "vite-plugin-performance": "2.0.1",
-    "weapp-ide-cli": "5.3.2",
-    "wevu": "6.16.33"
+    "weapp-ide-cli": "5.3.3",
+    "wevu": "6.16.34"
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
   },
   "devDependencies": {
-    "oxc-parser": "^0.133.0",
+    "oxc-parser": "^0.134.0",
     "oxc-walker": "^1.0.0",
     "tailwindcss": "^4.3.0",
     "ts-morph": "^28.0.0"

package/dist/file-CAsLsVdT.mjs

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

package/dist/getInstance-NP3CPo-d.mjs

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