weapp-vite 6.16.45 → 6.16.46

package/dist/auto-routes.mjs

@@ -1,4 +1,4 @@
-import { g as getRouteRuntimeGlobalKeys, n as getCompilerContext } from "./createContext-Bqsm_duR.mjs";
+import { g as getRouteRuntimeGlobalKeys, n as getCompilerContext } from "./createContext-BJPEU7dU.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, a as formatBytes, b as getProjectConfigFileName, d as syncProjectSupportFiles, f as syncManagedTsconfigBootstrapFiles, h as resolveHmrProfileJsonPath, m as SHARED_CHUNK_VIRTUAL_PREFIX, p as createSharedBuildConfig, t as createCompilerContext, u as resolveWeappViteTarget, v as resolveWeappConfigFile, w as getDefaultIdeProjectRoot, x as loadViteConfigFile, y as checkRuntime } from "./createContext-Bqsm_duR.mjs";
+import { C as createCjsConfigLoadError, E as isPathInside, S as parseCommentJson, T as shouldPassPlatformArgToIdeOpen, _ as createBuildScopeConfigFromCli, a as formatBytes, b as getProjectConfigFileName, d as syncProjectSupportFiles, f as syncManagedTsconfigBootstrapFiles, h as resolveHmrProfileJsonPath, m as SHARED_CHUNK_VIRTUAL_PREFIX, p as createSharedBuildConfig, t as createCompilerContext, u as resolveWeappViteTarget, v as resolveWeappConfigFile, w as getDefaultIdeProjectRoot, x as loadViteConfigFile, y as checkRuntime } from "./createContext-BJPEU7dU.mjs";
 import { r as logger_default, t as colors } from "./logger-mt4mSTqV.mjs";
-import { h as VERSION } from "./file-CsF2X7eL.mjs";
+import { h as VERSION } from "./file-_O6M6mJG.mjs";
 import { c as startWeappViteMcpServer, l as detectAiDevelopmentEnvironment, s as resolveWeappMcpConfig } from "./mcp-YXCIQr-Z.mjs";
 import { createRequire } from "node:module";
 import path, { posix } from "pathe";
@@ -15,7 +15,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, createWechatIdeLoginRequiredExitError, dispatchWechatCliCommand, formatAutomatorLoginError, getConfig, getWechatIdeTestAccounts, getWechatIdeTicket, getWechatIdeToolInfo, isAutomatorLoginError, isWeappIdeTopLevelCommand, isWechatIdeEngineBuildEndpointMissingError, isWechatIdeLoginRequiredError, isWechatIdeLoginRequiredExitError, launchAutomator, openWechatIdeProjectByHttp, parse, promptRetryKeypress, promptWechatIdeLoginRetry, quitWechatIde, refreshWechatIdeTicket, resetWechatIdeFileUtilsByHttp, resolveProjectAutomatorPort, 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, parse, promptRetryKeypress, promptWechatIdeLoginRetry, quitWechatIde, refreshWechatIdeTicket, resetWechatIdeFileUtilsByHttp, resolveProjectAutomatorPort, 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";
@@ -94,11 +94,6 @@ async function tryExecuteWechatIdeCliCommandByAutomator(argv, projectPath, optio
 async function tryExecuteWechatIdeCliCommandByHttp(argv, projectPath, engineBuildFallbackToCli = false) {
 	const command = argv[0];
 	if (!command) return false;
-	if (command === "compile") {
-		if (!projectPath) return false;
-		await openWechatIdeProjectByHttp(projectPath);
-		return true;
-	}
 	if (command === "reset-fileutils") {
 		if (!projectPath) return false;
 		await resetWechatIdeFileUtilsByHttp(projectPath);
@@ -261,6 +256,7 @@ function disconnectMiniProgram(miniProgram) {
 }
 async function openWechatIdeByAutomator(projectPath) {
 	disconnectMiniProgram(await launchAutomator({
+		preserveProjectRoot: true,
 		projectPath,
 		trustProject: true
 	}));
@@ -388,13 +384,6 @@ async function prepareOpenedWechatIdeAutomatorSession(projectPath, options) {
 async function stabilizeOpenedWechatIdeProject(projectPath, servicePortEnabled, options = {}) {
 	if (servicePortEnabled === false) return;
 	try {
-		await executeWechatIdeCliCommand(appendLoginRetryArgv(["compile"], options), {
-			automatorMode: options.useAutomatorOpen === false ? "skip" : "prefer",
-			httpMode: "prefer",
-			onNonLoginError: (error) => logger_default.error(error),
-			preserveProjectRoot: options.useAutomatorOpen === false,
-			projectPath
-		});
 		await executeWechatIdeCliCommand(appendLoginRetryArgv([
 			"reset-fileutils",
 			"-p",
@@ -451,22 +440,26 @@ function createIdeOpenArgv(platform, projectPath, options = {}) {
 }
 async function openIde(platform, projectPath, options = {}) {
 	let bootstrapResult;
-	const useAutomatorOpen = options.useAutomatorOpen !== false;
+	const useAutomatorOpen = options.useAutomatorOpen === true;
+	const normalizedOptions = {
+		...options,
+		useAutomatorOpen
+	};
 	if (platform === "weapp" && projectPath) try {
 		bootstrapResult = await bootstrapWechatDevtoolsSettings({
 			projectPath,
-			trustProject: options.trustProject
+			trustProject: normalizedOptions.trustProject
 		});
 	} catch (error) {
 		logger_default.warn("检测微信开发者工具服务端口或写入项目信任状态失败，继续执行 open 流程。");
 		logger_default.error(error);
 	}
 	if (platform === "weapp" && projectPath && bootstrapResult?.servicePortEnabled === false) logger_default.warn("检测到微信开发者工具服务端口当前处于关闭状态，已保留用户设置并回退到普通 open 流程。");
-	if (platform === "weapp" && projectPath && options.trustProject !== false && bootstrapResult?.servicePortEnabled !== false && useAutomatorOpen) try {
-		const openResult = await tryOpenWechatIdeByAutomator(projectPath, options);
+	if (platform === "weapp" && projectPath && normalizedOptions.trustProject !== false && bootstrapResult?.servicePortEnabled !== false && useAutomatorOpen) try {
+		const openResult = await tryOpenWechatIdeByAutomator(projectPath, normalizedOptions);
 		if (openResult === "reused") return;
 		if (openResult) {
-			await stabilizeOpenedWechatIdeProject(projectPath, bootstrapResult?.servicePortEnabled, options);
+			await stabilizeOpenedWechatIdeProject(projectPath, bootstrapResult?.servicePortEnabled, normalizedOptions);
 			return;
 		}
 	} catch (error) {
@@ -477,13 +470,13 @@ async function openIde(platform, projectPath, options = {}) {
 		logger_default.warn("通过 automator 启动微信开发者工具并自动信任项目失败，回退到普通 open 流程。");
 		if (shouldLogAutomatorFallbackError()) logger_default.error(error);
 	}
-	else if (platform === "weapp" && projectPath && options.reuseOpenedProject === false) {
+	else if (platform === "weapp" && projectPath && normalizedOptions.reuseOpenedProject === false) {
 		if (!await closeIde()) logger_default.warn("关闭当前微信开发者工具失败，仍继续尝试打开目标项目。");
 	}
-	await runWechatIdeOpenWithRetry(createIdeOpenArgv(platform, projectPath, options));
+	await runWechatIdeOpenWithRetry(createIdeOpenArgv(platform, projectPath, normalizedOptions));
 	if (platform === "weapp" && projectPath) {
-		await stabilizeOpenedWechatIdeProject(projectPath, bootstrapResult?.servicePortEnabled, options);
-		if (options.useAutomatorOpen === false && bootstrapResult?.servicePortEnabled !== false) await prepareOpenedWechatIdeAutomatorSession(projectPath, options);
+		await stabilizeOpenedWechatIdeProject(projectPath, bootstrapResult?.servicePortEnabled, normalizedOptions);
+		if (!useAutomatorOpen && bootstrapResult?.servicePortEnabled !== false) await prepareOpenedWechatIdeAutomatorSession(projectPath, normalizedOptions);
 	}
 }
 /**
@@ -3899,7 +3892,7 @@ function resolveRunnableHotkeyDefinition(input) {
 }
 //#endregion
 //#region package.json
-var version = "6.16.45";
+var version = "6.16.46";
 //#endregion
 //#region src/cli/devHotkeys/format.ts
 const FULLWIDTH_ASCII_START = 65281;

package/dist/{createContext-Bqsm_duR.mjs → createContext-BJPEU7dU.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-CsF2X7eL.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-_O6M6mJG.mjs";
 import { createRequire, isBuiltin } from "node:module";
 import path, { posix } from "pathe";
 import path$1, { normalize, relative, win32 } from "node:path";
@@ -13,7 +13,7 @@ import { createDebug } from "obug";
 import fs$1, { existsSync, readFileSync } from "node:fs";
 import { parse } from "vue/compiler-sfc";
 import { BABEL_TS_MODULE_PARSER_OPTIONS, generate, getVisitorKeys, parse as parse$2, parseJsLike, traverse } from "@weapp-vite/ast/babel";
-import pm from "picomatch";
+import picomatch from "picomatch";
 import { VUE_COMPONENT_TAG_RE, WE_VU_INTERNAL_REACTIVITY_MODULE_ID, WE_VU_INTERNAL_RUNTIME_MODULE_ID, WE_VU_INTERNAL_TEMPLATE_MODULE_ID, WE_VU_RUNTIME_APIS, buildClassStyleComputedCode, collectVueTemplateTags, compileJsxFile, compileVueFile, createJsonMerger, createPageEntryMatcher, createPageEntryMatcher as createPageEntryMatcher$1, getClassStyleWxsSource, getMiniProgramTemplatePlatform, getSfcCheckMtime, injectWevuPageFeaturesInJsWithResolver, invalidateFileCache, isAutoImportCandidateTag, isBuiltinComponent, pathExists, readAndParseSfc, readFile as readFile$1, resolveClassStyleWxsLocation, stripJsonMacroCallsFromCode } from "wevu/compiler";
 import process from "node:process";
 import { parse as parse$1, stringify } from "comment-json";
@@ -5366,7 +5366,7 @@ function createRegistryHelpers(state) {
 		}
 		const nextKey = globs.join("\0");
 		if (!state.autoImportState.matcher || state.autoImportState.matcherKey !== nextKey) {
-			state.autoImportState.matcher = pm(globs, { windows: true });
+			state.autoImportState.matcher = picomatch(globs, { windows: true });
 			state.autoImportState.matcherKey = nextKey;
 		}
 		return state.autoImportState.matcher;
@@ -5814,7 +5814,7 @@ function createRule(pattern) {
 	};
 	return {
 		pattern,
-		match: pm(pattern, { dot: true })
+		match: picomatch(pattern, { dot: true })
 	};
 }
 function isDefaultAutoRouteInclude(include) {
@@ -10472,7 +10472,7 @@ function resolveNodeModulesSharedPath(cleanedAbsoluteId) {
 }
 function createStringOrRegExpMatcher(pattern) {
 	if (typeof pattern === "string") {
-		const matcher = pm(pattern, { dot: true });
+		const matcher = picomatch(pattern, { dot: true });
 		return (value) => matcher(value);
 	}
 	if (isRegexp(pattern)) return (value) => {
@@ -15249,7 +15249,7 @@ function stripQueryAndHash(value) {
 }
 function createPathMatcher(patterns, options) {
 	if (!patterns.length) return () => false;
-	return pm(patterns.map((pattern) => normalizePath$1(pattern)), options);
+	return picomatch(patterns.map((pattern) => normalizePath$1(pattern)), options);
 }
 function createAssetPathVariants(file, roots) {
 	const variants = [file];
@@ -16513,7 +16513,7 @@ function resolveRouteRuleLayoutMeta(filename, configService) {
 	const routeCandidates = normalizePageRouteCandidates(filename, configService);
 	let matched;
 	for (const [pattern, rule] of Object.entries(routeRules)) {
-		if (!routeCandidates.some((candidate) => pm(pattern)(candidate))) continue;
+		if (!routeCandidates.some((candidate) => picomatch(pattern)(candidate))) continue;
 		const normalizedMeta = normalizeRouteRuleLayoutMeta(rule?.appLayout);
 		const patternSegments = pattern.split("/").filter(Boolean);
 		const wildcardMatches = pattern.match(ROUTE_RULE_GLOB_TOKEN_RE) ?? [];
@@ -18521,8 +18521,8 @@ function getStyleMatcher(entry) {
 	if (cached) return cached;
 	const includePatterns = entry.include?.length ? entry.include : ["**/*"];
 	const excludePatterns = entry.exclude?.length ? entry.exclude : void 0;
-	const matcher = { include: pm(includePatterns, { dot: true }) };
-	if (excludePatterns?.length) matcher.exclude = pm(excludePatterns, { dot: true });
+	const matcher = { include: picomatch(includePatterns, { dot: true }) };
+	if (excludePatterns?.length) matcher.exclude = picomatch(excludePatterns, { dot: true });
 	styleMatcherCache.set(entry, matcher);
 	return matcher;
 }
@@ -25473,7 +25473,7 @@ async function loadAppEntry(ctx, scanState) {
 	const vueAppPath = await findVueEntry(appBasename);
 	let configFromVue;
 	if (!appConfigFile && vueAppPath) {
-		const { extractConfigFromVue } = await import("./file-CsjD5DM3.mjs");
+		const { extractConfigFromVue } = await import("./file-BQG0E0sq.mjs");
 		configFromVue = await extractConfigFromVue(vueAppPath);
 		if (configFromVue) appConfigFile = vueAppPath;
 	}

package/dist/file-BQG0E0sq.mjs

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

package/dist/{file-CsF2X7eL.mjs → file-_O6M6mJG.mjs}

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

package/dist/getInstance-BwXyeue5.mjs

@@ -0,0 +1,2 @@
+import { n as getCompilerContext } from "./createContext-BJPEU7dU.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 getSupportedWeappViteTargetDescriptors, l as isWebPlatform, o as WEB_PLATFORM_ALIASES, s as getSupportedWeappVitePlatforms, t as createCompilerContext, u as resolveWeappViteTarget } from "./createContext-Bqsm_duR.mjs";
+import { c as getSupportedWeappViteTargetDescriptors, l as isWebPlatform, o as WEB_PLATFORM_ALIASES, s as getSupportedWeappVitePlatforms, t as createCompilerContext, u as resolveWeappViteTarget } from "./createContext-BJPEU7dU.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.45",
+  "version": "6.16.46",
   "description": "weapp-vite 一个现代化的小程序打包工具",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -122,17 +122,17 @@
     "@weapp-core/logger": "3.1.1",
     "@weapp-core/schematics": "6.0.4",
     "@weapp-core/shared": "3.0.4",
-    "@weapp-vite/ast": "6.16.45",
+    "@weapp-vite/ast": "6.16.46",
     "@weapp-vite/mcp": "1.4.4",
     "@weapp-vite/miniprogram-automator": "1.2.3",
     "@weapp-vite/volar": "2.1.0",
     "@weapp-vite/web": "1.3.31",
     "@wevu/api": "0.2.9",
-    "@wevu/web-apis": "1.2.21",
+    "@wevu/web-apis": "1.2.22",
     "rolldown-require": "2.0.19",
     "vite-plugin-performance": "2.0.1",
-    "weapp-ide-cli": "5.4.5",
-    "wevu": "6.16.45"
+    "weapp-ide-cli": "5.4.6",
+    "wevu": "6.16.46"
   },
   "publishConfig": {
     "access": "public",

package/dist/file-CsjD5DM3.mjs

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

package/dist/getInstance-BNM8-aPJ.mjs

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