weapp-vite 6.16.4 → 6.16.6

package/dist/{createContext-CoTaL8he.mjs → createContext-BEnghhM9.mjs}

@@ -1,6 +1,6 @@
 import { n as applyWeappViteHostMeta } from "./pluginHost-BEnGeaSo.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-D57m5ljp.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-CR2wVRDX.mjs";
 import { createRequire, isBuiltin } from "node:module";
 import path, { posix } from "pathe";
 import path$1, { normalize, relative, win32 } from "node:path";
@@ -464,6 +464,9 @@ function createDebugger(namespace) {
 //#endregion
 //#region src/context/shared.ts
 const debug$2 = createDebugger("weapp-vite:context");
+function hasOwn$6(source, key) {
+	return Object.prototype.hasOwnProperty.call(source, key);
+}
 function resolvedComponentName(entry) {
 	const base = path.basename(entry);
 	if (base === "index") {
@@ -480,7 +483,7 @@ function resolvedComponentName(entry) {
 	};
 }
 function isEmptyObject$1(obj) {
-	for (const key in obj) if (Object.hasOwn(obj, key)) return false;
+	for (const key in obj) if (hasOwn$6(obj, key)) return false;
 	return true;
 }
 //#endregion
@@ -792,6 +795,11 @@ function extractComponentProps(code, options) {
 	return collectComponentPropsFromCode(code, options);
 }
 //#endregion
+//#region src/runtime/utils/object.ts
+function hasOwn$5(source, key) {
+	return Object.prototype.hasOwnProperty.call(source, key);
+}
+//#endregion
 //#region src/runtime/utils/constructorType.ts
 const CONSTRUCTOR_TYPE_MAP = {
 	String: "string",
@@ -809,7 +817,7 @@ const CONSTRUCTOR_TYPE_MAP = {
 	NullConstructor: "any"
 };
 function mapConstructorName(name) {
-	if (Object.hasOwn(CONSTRUCTOR_TYPE_MAP, name)) return CONSTRUCTOR_TYPE_MAP[name];
+	if (hasOwn$5(CONSTRUCTOR_TYPE_MAP, name)) return CONSTRUCTOR_TYPE_MAP[name];
 	return CONSTRUCTOR_TYPE_MAP[name.endsWith("Constructor") ? name.slice(0, -11) : name] ?? "any";
 }
 //#endregion
@@ -6216,15 +6224,6 @@ function createMiniProgramGlobalResolveExpression(options) {
 	const hostExpression = resolveMiniProgramGlobalHostExpression(options?.hostExpression);
 	return `(${globalKeys.map((key) => `${hostExpression}.${key}`).join(" ?? ")})`;
 }
-function createMiniProgramHostOrTopLevelResolveExpression(options) {
-	return `(${createMiniProgramGlobalResolveExpression({
-		globalKeys: options?.globalKeys,
-		hostExpression: options?.hostExpression
-	})} ?? ${createMiniProgramTopLevelResolveExpression({
-		globalKeys: options?.globalKeys,
-		fallbackExpression: options?.fallbackExpression
-	})})`;
-}
 //#endregion
 //#region src/runtime/autoRoutesPlugin/service/shared.ts
 const AUTO_ROUTES_CACHE_FILE = ".weapp-vite/auto-routes.cache.json";
@@ -7554,8 +7553,8 @@ async function generateLibDts(configService) {
 		const tsconfigPath = path.resolve(configService.cwd, "tsconfig.json");
 		const hasTsconfig = await fs.pathExists(tsconfigPath);
 		const userRolldownOptions = dtsOptions?.rolldown ?? {};
-		const hasUserTsconfig = Object.hasOwn(userRolldownOptions, "tsconfig");
-		const hasUserBuild = Object.hasOwn(userRolldownOptions, "build");
+		const hasUserTsconfig = hasOwn$5(userRolldownOptions, "tsconfig");
+		const hasUserBuild = hasOwn$5(userRolldownOptions, "build");
 		const userTsconfig = userRolldownOptions.tsconfig;
 		const resolvedTsconfig = hasUserTsconfig ? typeof userTsconfig === "string" || userTsconfig === false ? userTsconfig : hasTsconfig ? tsconfigPath : false : hasTsconfig ? tsconfigPath : false;
 		const shouldUseBuildMode = !hasUserBuild && await tsconfigHasProjectReferences(resolvedTsconfig);
@@ -10560,7 +10559,7 @@ function createBuildService(ctx) {
 		const recentProfiles = ctx.runtimeState.build.hmr.recentProfiles;
 		if (recentProfiles.length < 4) return false;
 		if (recentProfiles.length - lastHmrSlowTipProfileCount < 3) return false;
-		const currentProfile = recentProfiles.at(-1);
+		const currentProfile = recentProfiles[recentProfiles.length - 1];
 		if (!currentProfile) return false;
 		const previousProfiles = recentProfiles.slice(0, -1);
 		const previousAverage = previousProfiles.reduce((sum, item) => sum + item.totalMs, 0) / previousProfiles.length;
@@ -11223,7 +11222,7 @@ const enhanceKeys = [
 let hasLoggedEnhanceDeprecation = false;
 function hasDeprecatedEnhanceUsage(enhance) {
 	if (!enhance || typeof enhance !== "object") return false;
-	return enhanceKeys.some((key) => Object.hasOwn(enhance, key));
+	return enhanceKeys.some((key) => hasOwn$5(enhance, key));
 }
 function migrateEnhanceOptions(target, options) {
 	if (!target) return;
@@ -12192,6 +12191,9 @@ const AUTO_IMPORT_CONFIG_SUFFIXES = configExtensions.map((ext) => `.${ext}`);
 const AUTO_IMPORT_JS_SUFFIXES = new Set(jsExtensions.map((ext) => `.${ext}`));
 const AUTO_IMPORT_TEMPLATE_SUFFIXES = new Set(templateExtensions.map((ext) => `.${ext}`));
 const AUTO_IMPORT_VUE_SUFFIXES = new Set(vueExtensions.map((ext) => `.${ext}`));
+function hasOwn$4(source, key) {
+	return Object.prototype.hasOwnProperty.call(source, key);
+}
 function isEnabledOutputOption(option) {
 	if (option === true) return true;
 	if (typeof option === "string") return option.trim().length > 0;
@@ -12308,7 +12310,7 @@ async function refreshAutoImportImporters(ctx, filePath) {
 	const touchedImporters = /* @__PURE__ */ new Set();
 	const entries = Array.from(wxmlService.wxmlComponentsMap.entries());
 	for (const [baseName, components] of entries) {
-		if (!Object.hasOwn(components, componentName)) continue;
+		if (!hasOwn$4(components, componentName)) continue;
 		const pendingEntriesByImporter = ctx.runtimeState?.autoImport?.pendingEntriesByImporter;
 		const pendingEntry = (autoImportService?.resolve(componentName, baseName))?.value.from;
 		if (pendingEntriesByImporter && pendingEntry) {
@@ -13453,7 +13455,7 @@ async function collectLayoutFiles(root) {
 				const base = full.slice(0, -path.extname(full).length);
 				if (!(await findJsonEntry(base)).path) continue;
 				const parts = path.relative(comparableRoot, normalizeComparablePath(base)).split(PATH_SEGMENT_RE).filter(Boolean);
-				if (parts.at(-1) === "index") parts.pop();
+				if (parts[parts.length - 1] === "index") parts.pop();
 				const layoutName = normalizeLayoutName(parts.join("/"));
 				if (!layoutName) continue;
 				const duplicated = layoutMap.get(layoutName);
@@ -13469,7 +13471,7 @@ async function collectLayoutFiles(root) {
 			const relativePath = path.relative(comparableRoot, normalizeComparablePath(full));
 			const ext = path.extname(relativePath);
 			const parts = relativePath.slice(0, -ext.length).split(PATH_SEGMENT_RE).filter(Boolean);
-			if (parts.at(-1) === "index") parts.pop();
+			if (parts[parts.length - 1] === "index") parts.pop();
 			const layoutName = normalizeLayoutName(parts.join("/"));
 			if (!layoutName) continue;
 			const duplicated = layoutMap.get(layoutName);
@@ -14933,7 +14935,10 @@ function resolvePendingEntryIds(options) {
 		}
 	}
 	if (expandedImporters.size > 0) {
-		const chunkPreview = [...relatedChunkIds].slice(0, 2).map((chunkId) => chunkId.split("/").at(-1)).join(",");
+		const chunkPreview = [...relatedChunkIds].slice(0, 2).map((chunkId) => {
+			const segments = chunkId.split("/");
+			return segments[segments.length - 1];
+		}).join(",");
 		const overflow = relatedChunkIds.size > 2 ? "+" : "";
 		const mode = expansionMode ? `:${expansionMode}` : "";
 		pendingReasonSummary.push(`shared-chunk(${chunkPreview}${overflow})+${expandedImporters.size}${mode}`);
@@ -15104,7 +15109,7 @@ function emitJsonAssets(state) {
 function stripQuotes(value) {
 	if (!value) return value;
 	const first = value[0];
-	const last = value.at(-1);
+	const last = value[value.length - 1];
 	if (first === last && (first === "\"" || first === "'") || first === "`" && last === "`") return value.slice(1, -1);
 	return value;
 }
@@ -15541,7 +15546,7 @@ function hasCustomAutoRuleConfig(config) {
 	return Boolean(Array.isArray(config.dependencies) && config.dependencies.length > 0 || Array.isArray(config.targets) && config.targets.length > 0);
 }
 function hasConfiguredNetworkDefaults(config) {
-	return Boolean(config && typeof config === "object" && Object.hasOwn(config, "networkDefaults"));
+	return Boolean(config && typeof config === "object" && hasOwn$5(config, "networkDefaults"));
 }
 function resolveAutoRules(config) {
 	if (hasCustomAutoRuleConfig(config)) return [{
@@ -15828,6 +15833,9 @@ function injectRequestGlobalsIntoSfc(source, targets, options) {
 }
 //#endregion
 //#region src/plugins/core/lifecycle/transform/importMeta.ts
+function hasOwn$3(source, key) {
+	return Object.prototype.hasOwnProperty.call(source, key);
+}
 function isImportMetaNode(node) {
 	return node?.type === "MetaProperty" && node.meta?.type === "Identifier" && node.meta.name === "import" && node.property?.type === "Identifier" && node.property.name === "meta";
 }
@@ -15893,7 +15901,7 @@ function replaceImportMetaAccess(code, options) {
 		MemberExpression(path) {
 			const envPropertyName = getImportMetaEnvPropertyName(path.node);
 			if (envPropertyName) {
-				const envValue = Object.hasOwn(values.envAccess, envPropertyName) ? values.envAccess[envPropertyName] : void 0;
+				const envValue = hasOwn$3(values.envAccess, envPropertyName) ? values.envAccess[envPropertyName] : void 0;
 				addReplacement(path.node, toInlineLiteral(envValue));
 				return;
 			}
@@ -15914,7 +15922,7 @@ function replaceImportMetaAccess(code, options) {
 		OptionalMemberExpression(path) {
 			const envPropertyName = getImportMetaEnvPropertyName(path.node);
 			if (envPropertyName) {
-				const envValue = Object.hasOwn(values.envAccess, envPropertyName) ? values.envAccess[envPropertyName] : void 0;
+				const envValue = hasOwn$3(values.envAccess, envPropertyName) ? values.envAccess[envPropertyName] : void 0;
 				addReplacement(path.node, toInlineLiteral(envValue));
 				return;
 			}
@@ -16038,30 +16046,35 @@ function prependChunkCodePreservingDirectives(code, injectedCode) {
 }
 //#endregion
 //#region src/utils/weapi.ts
-function getWeapiGlobalHostCandidates() {
+function getWeapiGlobalRootCandidateItems() {
 	return [
-		`((typeof globalThis !== 'undefined' && globalThis)`,
-		` || (typeof self !== 'undefined' && self)`,
-		` || (typeof window !== 'undefined' && window)`,
-		` || (typeof global !== 'undefined' && global)`,
-		...getMiniProgramGlobalKeys().map((key) => {
-			return ` || (typeof ${key} !== 'undefined' && ${key})`;
-		}),
-		` || {})`
+		`(typeof globalThis !== 'undefined' && globalThis)`,
+		`(typeof self !== 'undefined' && self)`,
+		`(typeof window !== 'undefined' && window)`,
+		`(typeof global !== 'undefined' && global)`
 	];
 }
-function createGlobalHostExpression() {
-	return getWeapiGlobalHostCandidates().join("");
+function getWeapiGlobalHostCandidateItems() {
+	return [...getWeapiGlobalRootCandidateItems(), ...getMiniProgramGlobalKeys().map((key) => `(typeof ${key} !== 'undefined' && ${key})`)];
+}
+function createUniqueCandidatesExpression(items) {
+	return `([${items.join(",")}].filter(Boolean).filter((item,index,list)=>list.indexOf(item)===index))`;
+}
+function createGlobalRootCandidatesExpression() {
+	return createUniqueCandidatesExpression(getWeapiGlobalRootCandidateItems());
+}
+function createGlobalHostCandidatesExpression() {
+	return createUniqueCandidatesExpression(getWeapiGlobalHostCandidateItems());
 }
 function createNativeApiFallbackExpression() {
 	return createMiniProgramTopLevelResolveExpression({ globalKeys: getMiniProgramGlobalKeys() });
 }
-function createWeapiHostExpression() {
-	return createGlobalHostExpression();
+function createWeapiHostCandidatesExpression() {
+	return createGlobalRootCandidatesExpression();
 }
 function createWeapiAccessExpression(globalName) {
 	const globalKey = JSON.stringify(globalName);
-	return `((${createGlobalHostExpression()}[${globalKey}]) || ${createNativeApiFallbackExpression()})`;
+	return `((${createGlobalHostCandidatesExpression()}.map(item=>item&&item[${globalKey}]).find(Boolean)) || ${createNativeApiFallbackExpression()})`;
 }
 //#endregion
 //#region src/plugins/core/lifecycle/platformApiRewrite.ts
@@ -17146,6 +17159,9 @@ function createBuildEndHook(state) {
 }
 //#endregion
 //#region src/plugins/utils/parse.ts
+function hasOwn$2(source, key) {
+	return Object.prototype.hasOwnProperty.call(source, key);
+}
 /**
 * 参考：https://github.com/tailwindlabs/tailwindcss/blob/main/packages/%40tailwindcss-vite/src/index.ts
 * 解析请求ID，返回包含文件名和查询参数的对象。
@@ -17159,7 +17175,7 @@ function parseRequest(id) {
 	if (rawQuery) {
 		const params = new URLSearchParams(rawQuery);
 		for (const [key, value] of params.entries()) query[key] = value;
-		if (Object.hasOwn(query, "wxss")) query.wxss = true;
+		if (hasOwn$2(query, "wxss")) query.wxss = true;
 	}
 	return {
 		filename,
@@ -17217,23 +17233,31 @@ function resolveInjectWeapiOptions$1(configService) {
 function createWeapiInjectionCode(options) {
 	const globalKey = JSON.stringify(options.globalName);
 	const platform = JSON.stringify(options.platform);
-	const hostExpression = createWeapiHostExpression();
-	const nativeApiFallbackExpression = createMiniProgramHostOrTopLevelResolveExpression({ hostExpression: "__weappGlobal" });
+	const hostCandidatesExpression = createWeapiHostCandidatesExpression();
+	const nativeApiResolveExpression = [`(${getMiniProgramGlobalKeys().map((globalKey) => `__weappResolveRootGlobal(${JSON.stringify(globalKey)})`).join(" ?? ")}`, ` ?? ${createMiniProgramTopLevelResolveExpression()})`].join("");
+	const nativeApiFallbackExpression = [`(${getMiniProgramGlobalKeys().map((globalKey) => `__weappResolveGlobal(${JSON.stringify(globalKey)})`).join(" ?? ")}`, ` ?? ${createMiniProgramTopLevelResolveExpression()})`].join("");
 	const replaceLines = options.replaceWx ? [
-		...getMiniProgramRuntimeGlobalKeys().map((globalKey) => `  __weappGlobal.${globalKey} = __weappInstance`),
-		`  if (__weappPlatformKey) {`,
-		`    __weappGlobal[__weappPlatformKey] = __weappInstance`,
-		`  }`
+		`    for (const __weappGlobal of __weappGlobals) {`,
+		...getMiniProgramRuntimeGlobalKeys().map((globalKey) => `      __weappGlobal.${globalKey} = __weappInstance`),
+		`      if (__weappPlatformKey) {`,
+		`        __weappGlobal[__weappPlatformKey] = __weappInstance`,
+		`      }`,
+		`    }`
 	] : [];
 	return [
 		`import { wpi as __weappWpi } from '@wevu/api'`,
-		`const __weappGlobal = ${hostExpression}`,
+		`const __weappRootGlobals = ${hostCandidatesExpression}`,
+		`const __weappResolveRootGlobal = key => __weappRootGlobals.map(item => item && item[key]).find(Boolean)`,
+		`const __weappNativeApi = ${nativeApiResolveExpression}`,
+		`const __weappGlobals = __weappRootGlobals.length ? __weappRootGlobals : [__weappNativeApi].filter(Boolean)`,
+		`const __weappGlobal = __weappGlobals[0] || {}`,
+		`const __weappResolveGlobal = key => __weappGlobals.map(item => item && item[key]).find(Boolean)`,
 		`const __weappPlatformKey = ${platform}`,
 		`if (__weappGlobal) {`,
-		`  const __weappExistingWpi = __weappGlobal[${globalKey}]`,
+		`  const __weappExistingWpi = __weappResolveGlobal(${globalKey})`,
 		`  const __weappInstance = __weappExistingWpi || __weappWpi`,
 		`  if (!__weappExistingWpi) {`,
-		`    const __weappRawApi = (__weappPlatformKey ? __weappGlobal[__weappPlatformKey] : undefined) ?? ${nativeApiFallbackExpression}`,
+		`    const __weappRawApi = (__weappPlatformKey ? __weappResolveGlobal(__weappPlatformKey) : undefined) ?? ${nativeApiFallbackExpression}`,
 		`    if (__weappRawApi && __weappRawApi !== __weappWpi) {`,
 		`      __weappWpi.setAdapter(__weappRawApi, __weappPlatformKey)`,
 		`    }`,
@@ -18896,6 +18920,9 @@ function getSourceFromVirtualId(id) {
 //#endregion
 //#region src/plugins/vue/transform/emitAssets.ts
 const emittedAssetSourceCache = /* @__PURE__ */ new Map();
+function hasOwn$1(source, key) {
+	return Object.prototype.hasOwnProperty.call(source, key);
+}
 /**
 * 统一拼接 SFC 相关产物文件名。
 */
@@ -18957,7 +18984,7 @@ function emitSfcJsonAsset(ctx, bundle, relativeBase, result, options) {
 	if (!nextConfig && options.defaults) nextConfig = mergeJson({}, options.defaults, "defaults");
 	if (defaultConfig) nextConfig = mergeJson(defaultConfig, nextConfig ?? {}, "emit");
 	if (defaultConfig && nextConfig) {
-		if (Object.hasOwn(defaultConfig, "component") && !Object.hasOwn(nextConfig, "component")) nextConfig.component = true;
+		if (hasOwn$1(defaultConfig, "component") && !hasOwn$1(nextConfig, "component")) nextConfig.component = true;
 	}
 	if (!nextConfig && defaultConfig) nextConfig = defaultConfig;
 	if (!nextConfig) return;
@@ -19058,6 +19085,9 @@ function resolveVueTransformJsonPlatformOptions(configService) {
 }
 //#endregion
 //#region src/plugins/vue/transform/scopedSlot/assets.ts
+function hasOwn(source, key) {
+	return Object.prototype.hasOwnProperty.call(source, key);
+}
 function parseJsonSafely(source) {
 	if (!source) return;
 	try {
@@ -19089,14 +19119,14 @@ function resolveScopedSlotAutoImports(compilerCtx, baseUsingComponents, componen
 		const token = wxmlService.analyze(template);
 		const depComponentNames = Object.keys(token.components ?? {});
 		for (const depComponentName of depComponentNames) {
-			if (Object.hasOwn(baseUsingComponents, depComponentName)) {
+			if (hasOwn(baseUsingComponents, depComponentName)) {
 				usingComponents[depComponentName] = baseUsingComponents[depComponentName];
 				continue;
 			}
 			const match = autoImportService.resolve(depComponentName, componentBase);
 			if (!match) continue;
 			const { value } = match;
-			if (Object.hasOwn(usingComponents, value.name)) continue;
+			if (hasOwn(usingComponents, value.name)) continue;
 			usingComponents[value.name] = value.from;
 		}
 	} catch {
@@ -19104,6 +19134,15 @@ function resolveScopedSlotAutoImports(compilerCtx, baseUsingComponents, componen
 	}
 	return usingComponents;
 }
+function resolveNestedScopedSlotUsingComponents(scopedSlots, currentComponentName, relativeBase, template) {
+	const usingComponents = {};
+	for (const scopedSlot of scopedSlots) {
+		if (scopedSlot.componentName === currentComponentName) continue;
+		if (!template.includes(scopedSlot.componentName)) continue;
+		usingComponents[scopedSlot.componentName] = `/${toPosixPath(`${relativeBase}.__scoped-slot-${scopedSlot.id}`)}`;
+	}
+	return usingComponents;
+}
 function emitScopedSlotAssets(ctx, bundle, relativeBase, result, compilerCtx, classStyleWxs, outputExtensions, jsonOptions) {
 	const scopedSlots = result.scopedSlotComponents;
 	if (!scopedSlots?.length) return;
@@ -19118,6 +19157,7 @@ function emitScopedSlotAssets(ctx, bundle, relativeBase, result, compilerCtx, cl
 		const wxmlFile = `${componentBase}.${templateExtension}`;
 		const jsonFile = `${componentBase}.${jsonExtension}`;
 		const scopedUsingComponents = resolveScopedSlotAutoImports(compilerCtx, baseUsingComponents, componentBase, scopedSlot.template);
+		Object.assign(scopedUsingComponents, resolveNestedScopedSlotUsingComponents(scopedSlots, scopedSlot.componentName, relativeBase, scopedSlot.template));
 		if (!bundle[wxmlFile]) ctx.emitFile({
 			type: "asset",
 			fileName: wxmlFile,
@@ -19129,13 +19169,14 @@ function emitScopedSlotAssets(ctx, bundle, relativeBase, result, compilerCtx, cl
 				kind: "component"
 			});
 			let json = mergeJson({}, { usingComponents: scopedUsingComponents }, "auto-using-components");
+			if (scopedSlot.componentGenerics && Object.keys(scopedSlot.componentGenerics).length > 0) json = mergeJson(json, { componentGenerics: scopedSlot.componentGenerics }, "component-generics");
 			if (jsonOptions?.defaults && Object.keys(jsonOptions.defaults).length > 0) json = mergeJson(json, jsonOptions.defaults, "defaults");
 			const defaultConfig = {
 				component: true,
 				styleIsolation: "apply-shared"
 			};
 			json = mergeJson(defaultConfig, json, "emit");
-			if (Object.hasOwn(defaultConfig, "component")) json.component = true;
+			if (hasOwn(defaultConfig, "component")) json.component = true;
 			const normalizedJson = normalizeJsonConfigForPlatform(json, compilerCtx);
 			ctx.emitFile({
 				type: "asset",
@@ -22482,7 +22523,7 @@ function createJsonService(ctx) {
 							output: { exports: "named" }
 						}
 					});
-					const exportedConfig = Object.hasOwn(mod, "default") ? mod.default : mod;
+					const exportedConfig = hasOwn$5(mod, "default") ? mod.default : mod;
 					resultJson = typeof exportedConfig === "function" ? await exportedConfig(ctx) : exportedConfig;
 				} finally {
 					if (tempFilepath !== filepath) await fs.remove(tempFilepath);
@@ -22880,7 +22921,7 @@ async function loadAppEntry(ctx, scanState) {
 	const vueAppPath = await findVueEntry(appBasename);
 	let configFromVue;
 	if (!appConfigFile && vueAppPath) {
-		const { extractConfigFromVue } = await import("./file-Dxf7qCi6.mjs");
+		const { extractConfigFromVue } = await import("./file-DcukQfQc.mjs");
 		configFromVue = await extractConfigFromVue(vueAppPath);
 		if (configFromVue) appConfigFile = vueAppPath;
 	}
@@ -22988,7 +23029,7 @@ function coerceStyleConfig(entry) {
 	if (!entry || typeof entry !== "object") return;
 	const source = entry.source?.toString().trim();
 	if (!source) return;
-	const hasExplicitScope = Object.hasOwn(entry, "scope") && entry.scope != null;
+	const hasExplicitScope = hasOwn$5(entry, "scope") && entry.scope != null;
 	return {
 		source,
 		scope: hasExplicitScope ? coerceScope(entry.scope) : "all",

package/dist/{file-D57m5ljp.mjs → file-CR2wVRDX.mjs}

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

package/dist/file-DcukQfQc.mjs

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

package/dist/getInstance-BAXgOqBQ.mjs

@@ -0,0 +1,2 @@
+import { i as getCompilerContext } from "./createContext-BEnghhM9.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-D0HkutE0.mjs";
 import { a as resolveWeappViteHostMeta, i as isWeappViteHost, n as applyWeappViteHostMeta, r as createWeappViteHostMeta, t as WEAPP_VITE_HOST_NAME } from "./pluginHost-BEnGeaSo.mjs";
 import { t as defineConfig } from "./config-DJjSbpNX.mjs";
-import { c as WEB_PLATFORM_ALIASES, d as isWebPlatform, f as resolveWeappViteTarget, l as getSupportedWeappVitePlatforms, t as createCompilerContext, u as getSupportedWeappViteTargetDescriptors } from "./createContext-CoTaL8he.mjs";
-import { i as createWevuComponent, n as defineProps, r as setPageLayout, t as defineEmits } from "./runtime-DN3lxU9s.mjs";
+import { c as WEB_PLATFORM_ALIASES, d as isWebPlatform, f as resolveWeappViteTarget, l as getSupportedWeappVitePlatforms, t as createCompilerContext, u as getSupportedWeappViteTargetDescriptors } from "./createContext-BEnghhM9.mjs";
+import { i as createWevuComponent, n as defineProps, r as setPageLayout, t as defineEmits } from "./runtime-spnjzaP2.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/dist/{runtime-DN3lxU9s.mjs → runtime-spnjzaP2.mjs}

@@ -25,7 +25,8 @@ function resolveCurrentPageInstance() {
 	const getCurrentPagesFn = globalThis.getCurrentPages;
 	if (typeof getCurrentPagesFn !== "function") return;
 	try {
-		return getCurrentPagesFn().at(-1);
+		const pages = getCurrentPagesFn();
+		return pages[pages.length - 1];
 	} catch {
 		return;
 	}

package/dist/runtime.mjs

@@ -1,2 +1,2 @@
-import { i as createWevuComponent, n as defineProps, r as setPageLayout, t as defineEmits } from "./runtime-DN3lxU9s.mjs";
+import { i as createWevuComponent, n as defineProps, r as setPageLayout, t as defineEmits } from "./runtime-spnjzaP2.mjs";
 export { createWevuComponent, defineEmits, defineProps, setPageLayout };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weapp-vite",
   "type": "module",
-  "version": "6.16.4",
+  "version": "6.16.6",
   "description": "weapp-vite 一个现代化的小程序打包工具",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -109,30 +109,30 @@
     "pathe": "^2.0.3",
     "picomatch": "^4.0.4",
     "postcss": "^8.5.14",
-    "rolldown": "1.0.0-rc.17",
-    "rolldown-plugin-dts": "0.23.2",
+    "rolldown": "1.0.0-rc.18",
+    "rolldown-plugin-dts": "0.24.1",
     "semver": "^7.7.4",
     "typescript": "^6.0.3",
-    "vite": "8.0.10",
+    "vite": "8.0.11",
     "vite-tsconfig-paths": "^6.1.1",
-    "vue": "^3.5.33",
+    "vue": "^3.5.34",
     "vue-tsc": "^3.2.8",
     "@weapp-core/constants": "^0.1.4",
     "@weapp-core/init": "6.0.8",
     "@weapp-core/logger": "3.1.1",
-    "@weapp-core/schematics": "6.0.4",
     "@weapp-core/shared": "3.0.4",
-    "@weapp-vite/ast": "6.16.4",
-    "@weapp-vite/mcp": "1.3.1",
-    "@weapp-vite/miniprogram-automator": "1.0.5",
+    "@weapp-vite/ast": "6.16.6",
+    "@weapp-core/schematics": "6.0.4",
+    "@weapp-vite/mcp": "1.3.2",
+    "@weapp-vite/miniprogram-automator": "1.1.0",
+    "@weapp-vite/web": "1.3.20",
+    "@wevu/api": "0.2.8",
+    "@wevu/web-apis": "1.2.12",
     "@weapp-vite/volar": "2.1.0",
-    "@weapp-vite/web": "1.3.19",
-    "@wevu/api": "0.2.6",
-    "@wevu/web-apis": "1.2.10",
     "rolldown-require": "2.0.15",
     "vite-plugin-performance": "2.0.1",
-    "weapp-ide-cli": "5.2.8",
-    "wevu": "6.16.4"
+    "weapp-ide-cli": "5.2.9",
+    "wevu": "6.16.6"
   },
   "publishConfig": {
     "access": "public",

package/dist/file-Dxf7qCi6.mjs

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

package/dist/getInstance-BWhJaTcd.mjs

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