weapp-vite 6.16.8 → 6.16.9

package/dist/auto-routes.mjs

@@ -1,4 +1,4 @@
-import { g as getRouteRuntimeGlobalKeys, i as getCompilerContext } from "./createContext-BLUytiY2.mjs";
+import { g as getRouteRuntimeGlobalKeys, i as getCompilerContext } from "./createContext-BKbuGSJa.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 getDefaultIdeProjectRoot, S as createCjsConfigLoadError, T as isPathInside, _ as resolveWeappConfigFile, b as loadViteConfigFile, 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 checkRuntime, w as shouldPassPlatformArgToIdeOpen, x as parseCommentJson, y as getProjectConfigFileName } from "./createContext-BLUytiY2.mjs";
+import { C as getDefaultIdeProjectRoot, S as createCjsConfigLoadError, T as isPathInside, _ as resolveWeappConfigFile, b as loadViteConfigFile, 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 checkRuntime, w as shouldPassPlatformArgToIdeOpen, x as parseCommentJson, y as getProjectConfigFileName } from "./createContext-BKbuGSJa.mjs";
 import { r as logger_default, t as colors } from "./logger-CgxdNjvb.mjs";
-import { h as VERSION } from "./file-B6UGp073.mjs";
+import { h as VERSION } from "./file-CKCR-PsP.mjs";
 import { o as resolveWeappMcpConfig, s as startWeappViteMcpServer } from "./mcp-DV3K2AVD.mjs";
 import { createRequire } from "node:module";
 import path, { posix } from "pathe";
@@ -3704,7 +3704,7 @@ function resolveRunnableHotkeyDefinition(input) {
 }
 //#endregion
 //#region package.json
-var version = "6.16.8";
+var version = "6.16.9";
 //#endregion
 //#region src/cli/devHotkeys/format.ts
 const FULLWIDTH_ASCII_START = 65281;

package/dist/{createContext-BLUytiY2.mjs → createContext-BKbuGSJa.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-B6UGp073.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-CKCR-PsP.mjs";
 import { createRequire, isBuiltin } from "node:module";
 import path, { posix } from "pathe";
 import path$1, { normalize, relative, win32 } from "node:path";
@@ -34,7 +34,7 @@ import { getPackageInfo, getPackageInfoSync, resolveModule } from "local-pkg";
 import { spawn } from "node:child_process";
 import * as t from "@weapp-vite/ast/babelTypes";
 import { objectHash } from "@weapp-core/shared/node";
-import { APP_PRELUDE_CHUNK_MARKER, APP_PRELUDE_GUARD_KEY, APP_PRELUDE_REQUIRE_MARKER, REQUEST_GLOBAL_ACTUALS_KEY, REQUEST_GLOBAL_BUNDLE_HOST_REF, REQUEST_GLOBAL_BUNDLE_MARKER, REQUEST_GLOBAL_CHUNK_HOST_REF, REQUEST_GLOBAL_CHUNK_MODULE_REF, REQUEST_GLOBAL_EXPOSE_HELPER, REQUEST_GLOBAL_INSTALLER_HOST_REF, REQUEST_GLOBAL_LAZY_CONSTRUCTOR_HELPER, REQUEST_GLOBAL_LAZY_FUNCTION_HELPER, REQUEST_GLOBAL_LOCAL_BINDINGS_MARKER, REQUEST_GLOBAL_MARK_PLACEHOLDER_HELPER, REQUEST_GLOBAL_PASSIVE_BINDINGS_MARKER, REQUEST_GLOBAL_PASSIVE_BINDINGS_MARKER as REQUEST_GLOBAL_PASSIVE_BINDINGS_MARKER$1, REQUEST_GLOBAL_PLACEHOLDER_KEY, REQUEST_GLOBAL_PRELUDE_GUARD_KEY, REQUEST_GLOBAL_PRELUDE_MARKER, REQUEST_GLOBAL_SYNTHETIC_EXPORT_NAME, REQUEST_GLOBAL_USABLE_CONSTRUCTOR_HELPER, WEAPP_VITE_IMPORT_META_ENV_KEY, WEAPP_VITE_INJECTED_API_IDENTIFIER, WEVU_EXPRESSION_ERROR_IDENTIFIER, WEVU_GENERIC_SLOT_OWNER_ID_ATTR, WEVU_GENERIC_SLOT_OWNER_PROPS_ATTR, WEVU_GENERIC_SLOT_PROPS_ATTR, WEVU_GENERIC_SLOT_PROPS_DATA_ATTR, WEVU_GENERIC_SLOT_SCOPE_ATTR, WEVU_INTERNAL_KEY_IDENTIFIER, WEVU_LAYOUT_BIND_PREFIX, WEVU_PAGE_LAYOUT_CURRENT_NAME_IDENTIFIER, WEVU_PAGE_LAYOUT_CURRENT_PROPS_IDENTIFIER, WEVU_PAGE_LAYOUT_NAME_KEY, WEVU_PAGE_LAYOUT_NEXT_NAME_IDENTIFIER, WEVU_PAGE_LAYOUT_NEXT_PROPS_IDENTIFIER, WEVU_PAGE_LAYOUT_NONE, WEVU_PAGE_LAYOUT_PROPS_KEY, WEVU_PAGE_LAYOUT_SETTER_KEY, WEVU_SCOPED_SLOT_CREATOR_KEY } from "@weapp-core/constants";
+import { APP_PRELUDE_CHUNK_MARKER, APP_PRELUDE_GUARD_KEY, APP_PRELUDE_REQUIRE_MARKER, REQUEST_GLOBAL_ACTUALS_KEY, REQUEST_GLOBAL_BUNDLE_HOST_REF, REQUEST_GLOBAL_BUNDLE_MARKER, REQUEST_GLOBAL_CHUNK_HOST_REF, REQUEST_GLOBAL_CHUNK_MODULE_REF, REQUEST_GLOBAL_EXPOSE_HELPER, REQUEST_GLOBAL_INSTALLER_HOST_REF, REQUEST_GLOBAL_LAZY_CONSTRUCTOR_HELPER, REQUEST_GLOBAL_LAZY_FUNCTION_HELPER, REQUEST_GLOBAL_LOCAL_BINDINGS_MARKER, REQUEST_GLOBAL_MARK_PLACEHOLDER_HELPER, REQUEST_GLOBAL_PASSIVE_BINDINGS_MARKER, REQUEST_GLOBAL_PASSIVE_BINDINGS_MARKER as REQUEST_GLOBAL_PASSIVE_BINDINGS_MARKER$1, REQUEST_GLOBAL_PLACEHOLDER_KEY, REQUEST_GLOBAL_PRELUDE_GUARD_KEY, REQUEST_GLOBAL_PRELUDE_MARKER, REQUEST_GLOBAL_SYNTHETIC_EXPORT_NAME, REQUEST_GLOBAL_USABLE_CONSTRUCTOR_HELPER, WEAPP_VITE_IMPORT_META_ENV_KEY, WEAPP_VITE_INJECTED_API_IDENTIFIER, WEVU_APP_SHELL_COMPONENT_BASE, WEVU_APP_SHELL_TAG_NAME, WEVU_EXPRESSION_ERROR_IDENTIFIER, WEVU_INTERNAL_KEY_IDENTIFIER, WEVU_LAYOUT_BIND_PREFIX, WEVU_PAGE_LAYOUT_CURRENT_NAME_IDENTIFIER, WEVU_PAGE_LAYOUT_CURRENT_PROPS_IDENTIFIER, WEVU_PAGE_LAYOUT_NAME_KEY, WEVU_PAGE_LAYOUT_NEXT_NAME_IDENTIFIER, WEVU_PAGE_LAYOUT_NEXT_PROPS_IDENTIFIER, WEVU_PAGE_LAYOUT_NONE, WEVU_PAGE_LAYOUT_PROPS_KEY, WEVU_PAGE_LAYOUT_SETTER_KEY, WEVU_SCOPED_SLOT_CREATOR_KEY } from "@weapp-core/constants";
 import { Buffer } from "node:buffer";
 import { detect } from "package-manager-detector/detect";
 import tsconfigPaths from "vite-tsconfig-paths";
@@ -13563,6 +13563,23 @@ async function collectNativeLayoutAssets(basePath) {
 	};
 }
 //#endregion
+//#region src/plugins/vue/transform/pageLayout/slot.ts
+const SLOT_OPEN_TAG_RE = /<slot\b([^>]*)>/gi;
+const DEFAULT_SLOT_NAME_RE = /(?:^|\s)name\s*=/;
+function hasDefaultSlotTemplate(template) {
+	if (!template) return false;
+	for (const match of template.matchAll(SLOT_OPEN_TAG_RE)) {
+		const attrs = match[1] ?? "";
+		if (!DEFAULT_SLOT_NAME_RE.test(attrs)) return true;
+	}
+	return false;
+}
+function assertTemplateHasDefaultSlot(options) {
+	if (hasDefaultSlotTemplate(options.template)) return;
+	if (options.kind === "app-shell") throw new Error(`${options.filename} 中 app.vue <template> 必须包含默认 <slot />，否则页面内容无法渲染到应用外壳内。`);
+	throw new Error(`${options.filename} 对应的 layout template 必须包含默认 <slot />，否则页面内容无法渲染到布局内。`);
+}
+//#endregion
 //#region src/plugins/utils/layoutEntries.ts
 async function registerResolvedPageLayoutEntries(options) {
 	const { layouts, entries, explicitEntryTypes, nativeScriptEntries, normalizeEntry, jsonPath } = options;
@@ -18108,6 +18125,46 @@ function createSidecarIgnoredMatcher(ctx, rootDir) {
 	};
 }
 //#endregion
+//#region src/plugins/vue/transform/appShell.ts
+const APP_VUE_FILE_RE = /[\\/]app\.vue$/;
+function isAppVueFile(filename) {
+	return APP_VUE_FILE_RE.test(filename);
+}
+function hasAppShellTemplate(result) {
+	return Boolean(result?.template?.trim());
+}
+function resolveAppShellBase(configService) {
+	return path.join(configService.absoluteSrcRoot, WEVU_APP_SHELL_COMPONENT_BASE);
+}
+function resolveAppShellRelativeBase(configService) {
+	return configService.relativeOutputPath(resolveAppShellBase(configService));
+}
+function resolveAppShellImportPath(configService) {
+	const relativeBase = resolveAppShellRelativeBase(configService);
+	return relativeBase ? `/${toPosixPath(relativeBase)}` : void 0;
+}
+function resolveAppShellLayout(configService) {
+	const importPath = resolveAppShellImportPath(configService);
+	if (!importPath) return;
+	return {
+		file: normalizeWatchPath(resolveAppShellBase(configService)),
+		importPath,
+		kind: "vue",
+		layoutName: "app-shell",
+		tagName: WEVU_APP_SHELL_TAG_NAME
+	};
+}
+function applyAppShell(result, filename, appShell) {
+	if (!appShell || !result.template) return result;
+	return applyPageLayout(result, filename, {
+		file: appShell.file,
+		importPath: appShell.importPath,
+		kind: "vue",
+		layoutName: "app-shell",
+		tagName: appShell.tagName
+	});
+}
+//#endregion
 //#region src/plugins/core/lifecycle/watch.ts
 const configSuffixes = configExtensions.map((ext) => `.${ext}`);
 const styleSuffixes = supportedCssLangs.map((ext) => `.${ext}`);
@@ -18197,6 +18254,10 @@ async function processChangedFile(state, id, event) {
 	if ((event === "create" || isDeletedMissingSelf) && isAutoRouteFile) {
 		if (await ctx.autoRoutesService?.handleFileChange(normalizedId, event)) dirtyReasonStats.set("auto-routes-topology", 1);
 	}
+	if (event === "update" && isAppVueFile(normalizedId) && resolvedEntryMap.size) for (const entryId of resolvedEntryMap.keys()) {
+		if (entryId === normalizedId) continue;
+		markEntryDirtyWithCause(entryId, "dependency", "app-shell-dependent");
+	}
 	invalidateFileCache(normalizedId);
 	if (event === "update") {
 		const isTemplateFile = isTemplate(normalizedId);
@@ -19205,8 +19266,8 @@ function buildScopedSlotComponentModule(options) {
 	const lines = [
 		`import { ${computedCode ? `${WE_VU_RUNTIME_APIS.createWevuScopedSlotComponent} as _createWevuScopedSlotComponent, normalizeClass as __wevuNormalizeClass, normalizeStyle as __wevuNormalizeStyle, unref as __wevuUnref` : `${WE_VU_RUNTIME_APIS.createWevuScopedSlotComponent} as _createWevuScopedSlotComponent`} } from '${WE_VU_MODULE_ID}';`,
 		"const globalObject = typeof globalThis !== 'undefined' ? globalThis : undefined;",
-		`const createWevuScopedSlotComponent = _createWevuScopedSlotComponent`,
-		`  ?? globalObject?.${WEVU_SCOPED_SLOT_CREATOR_KEY};`
+		`const createWevuScopedSlotComponent = globalObject?.${WEVU_SCOPED_SLOT_CREATOR_KEY}`,
+		"  ?? _createWevuScopedSlotComponent;"
 	];
 	if (computedCode) lines.push(`const __wevuComputed = ${computedCode};`);
 	if (inlineMapCode) lines.push(`const __wevuInlineMap = ${inlineMapCode};`);
@@ -19588,18 +19649,6 @@ function scanWxml(wxml, options) {
 const LEADING_DOT_SLASH_RE$1 = /^\.\//;
 const SCOPED_SLOT_GENERIC_KEY_RE = /^scoped-slots-/;
 const WEAPP_SCOPED_SLOT_GENERIC_PLACEHOLDER_TEMPLATE = "<view wx:if=\"{{false}}\" />";
-const WEAPP_SCOPED_SLOT_GENERIC_PLACEHOLDER_SCRIPT = `Component({
-  properties: {
-${[
-	[WEVU_GENERIC_SLOT_OWNER_ID_ATTR, `{ type: String, value: '' }`],
-	[WEVU_GENERIC_SLOT_PROPS_ATTR, "{ type: null, value: null }"],
-	[WEVU_GENERIC_SLOT_PROPS_DATA_ATTR, "{ type: null, value: null }"],
-	[WEVU_GENERIC_SLOT_OWNER_PROPS_ATTR, "{ type: null, value: null }"],
-	[WEVU_GENERIC_SLOT_SCOPE_ATTR, "{ type: null, value: null }"]
-].map(([name, value]) => `    ${name}: ${value},`).join("\n")}
-  },
-})
-`;
 function resolveVueBundlePlatformOptions(options) {
 	return {
 		normalizeUsingComponents: resolveVueTransformJsonPlatformOptions({
@@ -19698,22 +19747,6 @@ function resolveAlipayGenericPlaceholderBase(relativeBase) {
 function resolveWeappScopedSlotGenericPlaceholderBase(relativeBase) {
 	return resolveGenericPlaceholderBase(relativeBase, WEAPP_SCOPED_SLOT_GENERIC_COMPONENT_PLACEHOLDER);
 }
-function emitGenericPlaceholderScriptAsset(ctx, bundle, placeholderBase, scriptExtension, source) {
-	const fileName = resolveScriptlessComponentFileName(placeholderBase, scriptExtension);
-	const existing = bundle[fileName];
-	if (existing) {
-		if (existing.type === "asset") {
-			if ((existing.source?.toString?.() ?? "") !== source) existing.source = source;
-		}
-		return fileName;
-	}
-	ctx.emitFile({
-		type: "asset",
-		fileName,
-		source
-	});
-	return fileName;
-}
 function emitAlipayGenericPlaceholderAssetsByBase(ctx, bundle, placeholderBase, outputExtensions, options) {
 	const templateExtension = outputExtensions?.wxml ?? "wxml";
 	const jsonExtension = outputExtensions?.json ?? "json";
@@ -19723,8 +19756,7 @@ function emitAlipayGenericPlaceholderAssetsByBase(ctx, bundle, placeholderBase,
 		extension: jsonExtension,
 		kind: "component"
 	});
-	if (options?.scriptSource) emitGenericPlaceholderScriptAsset(ctx, bundle, placeholderBase, scriptExtension, options.scriptSource);
-	else ensureScriptlessComponentAsset(ctx, bundle, placeholderBase, scriptExtension);
+	ensureScriptlessComponentAsset(ctx, bundle, placeholderBase, scriptExtension);
 }
 function shouldEmitAlipayGenericPlaceholder(configSource) {
 	if (!configSource) return false;
@@ -19776,7 +19808,6 @@ function emitAlipayGenericPlaceholderAssets(ctx, bundle, relativeBase, configSou
 			component: true,
 			options: { virtualHost: true }
 		},
-		scriptSource: WEAPP_SCOPED_SLOT_GENERIC_PLACEHOLDER_SCRIPT,
 		templateSource: WEAPP_SCOPED_SLOT_GENERIC_PLACEHOLDER_TEMPLATE
 	} : void 0);
 }
@@ -19806,7 +19837,6 @@ function emitPlatformConfigSideEffects(bundle, options) {
 				component: true,
 				options: { virtualHost: true }
 			},
-			scriptSource: WEAPP_SCOPED_SLOT_GENERIC_PLACEHOLDER_SCRIPT,
 			templateSource: WEAPP_SCOPED_SLOT_GENERIC_PLACEHOLDER_TEMPLATE
 		} : void 0);
 		return;
@@ -19885,7 +19915,8 @@ function resolveClassStyleWxsAsset(ctx, relativeBase, wxsExtension, configServic
 }
 function emitSharedVueEntryAssets(options) {
 	const { bundle, pluginCtx, ctx, filename, relativeBase, result, configService, scriptModuleExtension, outputExtensions, platformAssetOptions, scopedSlotDefaults, scopedSlotMergeStrategy } = options;
-	if (result.template) emitPlatformTemplateAsset(bundle, {
+	const isAppVue = APP_VUE_LIKE_FILE_RE$1.test(filename);
+	if (result.template && !isAppVue) emitPlatformTemplateAsset(bundle, {
 		ctx,
 		pluginCtx,
 		filename,
@@ -20398,9 +20429,7 @@ function injectPickIntoOptionsObject(optionsObject, keys) {
 * 从编译后的 WXML 模板提取渲染相关的顶层 key。
 */
 function collectSetDataPickKeysFromTemplate(template, options) {
-	const keys = new Set(collectSetDataPickKeysFromTemplateCode(template, options));
-	for (const key of options?.extraKeys ?? []) if (key) keys.add(key);
-	return [...keys].sort((a, b) => a.localeCompare(b));
+	return collectSetDataPickKeysFromTemplateCode(template, options);
 }
 /**
 * 在 wevu 组件脚本中注入 setData.pick。
@@ -20531,7 +20560,7 @@ async function finalizeCompiledVueLikeResult(options) {
 		if (injected.transformed) result.script = injected.code;
 	}
 	if (!isApp && result.script && result.template && isAutoSetDataPickEnabled(configService.weappViteConfig) && mayNeedInjectSetDataPickInJs(result.script)) {
-		const keys = collectSetDataPickKeysFromTemplate(result.template, { extraKeys: result.scopedSlotComponents?.flatMap((slot) => slot.ownerKeys ?? []) });
+		const keys = collectSetDataPickKeysFromTemplate(result.template);
 		const injectedPick = injectSetDataPickInJs(result.script, keys);
 		if (injectedPick.transformed) result.script = injectedPick.code;
 	}
@@ -20660,6 +20689,11 @@ async function emitResolvedNativeLayoutStaticAssets(options) {
 	});
 	for (const asset of staticAssetEntries) {
 		if (asset.kind === "template") {
+			assertTemplateHasDefaultSlot({
+				filename: options.assets.template,
+				kind: "page-layout",
+				template: asset.source
+			});
 			emitSfcTemplateIfMissing(options.pluginCtx, options.bundle, options.resolvedOptions.relativeBase, asset.source, options.resolvedOptions.templateExtension);
 			continue;
 		}
@@ -20714,7 +20748,7 @@ async function emitVueLayoutScriptFallbackIfNeeded(options) {
 	});
 	if (!fallbackState) return;
 	const { resolvedOptions } = fallbackState;
-	if ((await compileVueLikeFile({
+	const result = await compileVueLikeFile({
 		source: await fs.readFile(layoutFilePath, "utf-8"),
 		filename: layoutFilePath,
 		ctx,
@@ -20723,7 +20757,13 @@ async function emitVueLayoutScriptFallbackIfNeeded(options) {
 		isApp: false,
 		configService,
 		compileOptionsState
-	})).script?.trim()) return;
+	});
+	assertTemplateHasDefaultSlot({
+		filename: layoutFilePath,
+		kind: "page-layout",
+		template: result.template
+	});
+	if (result.script?.trim()) return;
 	emitScriptlessComponentJsFallbackIfMissing({
 		pluginCtx,
 		bundle,
@@ -20764,6 +20804,62 @@ async function emitBundlePageLayoutsIfNeeded(options) {
 		emitVueLayout: layoutEmitters.emitVueLayout
 	});
 }
+function resolveAppShellComponentConfig(config) {
+	const shellConfig = { styleIsolation: "apply-shared" };
+	if (!config) return JSON.stringify(shellConfig, null, 2);
+	try {
+		const parsed = JSON.parse(config);
+		if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return JSON.stringify(shellConfig, null, 2);
+		for (const key of ["usingComponents", "componentGenerics"]) {
+			const value = parsed[key];
+			if (value && typeof value === "object" && !Array.isArray(value)) shellConfig[key] = value;
+		}
+		return Object.keys(shellConfig).length ? JSON.stringify(shellConfig, null, 2) : void 0;
+	} catch {
+		return;
+	}
+}
+function emitAppShellAssetsIfNeeded(options) {
+	const { relativeBase, result } = options;
+	if (!relativeBase || !result.template?.trim()) return;
+	assertTemplateHasDefaultSlot({
+		filename: options.filename,
+		kind: "app-shell",
+		template: result.template
+	});
+	emitBundleVueEntryAssets({
+		bundle: options.bundle,
+		pluginCtx: options.pluginCtx,
+		ctx: options.ctx,
+		filename: relativeBase,
+		relativeBase,
+		result,
+		configService: options.configService,
+		templateExtension: options.templateExtension,
+		scriptModuleExtension: options.scriptModuleExtension,
+		outputExtensions: options.outputExtensions,
+		platformAssetOptions: options.platformAssetOptions
+	});
+	emitSharedVueEntryJsonAsset({
+		bundle: options.bundle,
+		pluginCtx: options.pluginCtx,
+		relativeBase,
+		config: resolveAppShellComponentConfig(result.config),
+		outputExtensions: options.outputExtensions,
+		platformAssetOptions: options.platformAssetOptions,
+		jsonOptions: {
+			defaultConfig: { component: true },
+			kind: "component",
+			extension: options.jsonExtension
+		}
+	});
+	emitScriptlessComponentJsFallbackIfMissing({
+		pluginCtx: options.pluginCtx,
+		bundle: options.bundle,
+		relativeBase,
+		scriptExtension: options.scriptExtension
+	});
+}
 //#endregion
 //#region src/plugins/vue/transform/bundle/emitCompiledEntry.ts
 async function emitResolvedCompiledVueEntryAssets(options) {
@@ -20771,22 +20867,45 @@ async function emitResolvedCompiledVueEntryAssets(options) {
 	const { ctx, pluginCtx } = state;
 	const { configService } = ctx;
 	if (!configService) return;
-	if (cached.isPage && cached.source) await handleCompiledEntryPageLayouts({
-		source: cached.source,
+	if (isAppVueFile(filename) && hasAppShellTemplate(result)) emitAppShellAssetsIfNeeded({
+		bundle,
+		pluginCtx,
+		ctx,
 		filename,
+		relativeBase: resolveAppShellRelativeBase(configService),
 		result,
 		configService,
-		emitLayouts: async (layouts) => {
-			await emitBundlePageLayoutsIfNeeded({
-				layouts,
-				pluginCtx,
-				bundle,
-				ctx,
-				configService,
-				compileOptionsState,
-				outputExtensions: options.outputExtensions
-			});
-		}
+		templateExtension: options.templateExtension,
+		jsonExtension: options.jsonExtension,
+		scriptExtension: options.scriptExtension,
+		scriptModuleExtension: options.scriptModuleExtension,
+		outputExtensions: options.outputExtensions,
+		platformAssetOptions: options.platformAssetOptions
+	});
+	if (cached.isPage && cached.source) {
+		await handleCompiledEntryPageLayouts({
+			source: cached.source,
+			filename,
+			result,
+			configService,
+			emitLayouts: async (layouts) => {
+				await emitBundlePageLayoutsIfNeeded({
+					layouts,
+					pluginCtx,
+					bundle,
+					ctx,
+					configService,
+					compileOptionsState,
+					outputExtensions: options.outputExtensions
+				});
+			}
+		});
+		applyAppShell(result, filename, state.appShell);
+	}
+	if (isLayoutFile(filename, configService)) assertTemplateHasDefaultSlot({
+		filename,
+		kind: "page-layout",
+		template: result.template
 	});
 	const { shouldEmitComponentJson } = emitCompiledEntryBundleAssets({
 		bundle,
@@ -20905,6 +21024,7 @@ async function emitResolvedFallbackPageEntryAssets(options) {
 			});
 		}
 	});
+	applyAppShell(result, options.entryFilePath, options.appShell);
 	emitFallbackPageBundleAssets({
 		bundle: options.bundle,
 		pluginCtx: options.pluginCtx,
@@ -20958,7 +21078,8 @@ async function emitFallbackPageAssets(bundle, state) {
 				jsonExtension,
 				scriptModuleExtension,
 				outputExtensions,
-				platformAssetOptions
+				platformAssetOptions,
+				appShell: state.appShell
 			});
 		} catch (error) {
 			const message = error instanceof Error ? error.message : String(error);
@@ -20972,6 +21093,9 @@ function resolveVueBundleEmitState(state) {
 	const { ctx, compilationCache } = state;
 	const { configService, scanService } = ctx;
 	if (!configService || !scanService) return;
+	state.appShell = Array.from(compilationCache.entries()).find(([filename, cached]) => {
+		return isAppVueFile(filename) && hasAppShellTemplate(cached.result);
+	}) ? resolveAppShellLayout(configService) : void 0;
 	const emittedEntryIds = Boolean(configService.isDev && ctx.runtimeState?.build?.hmr?.profile?.event === "update" && !ctx.runtimeState.build.hmr.didEmitAllEntries && ctx.runtimeState.build.hmr.lastEmittedEntryIds.size > 0) ? ctx.runtimeState.build.hmr.lastEmittedEntryIds : void 0;
 	return { compilationEntries: Array.from(compilationCache.entries()).filter(([id]) => {
 		return !emittedEntryIds || emittedEntryIds.has(normalizeFsResolvedId(id));
@@ -21278,10 +21402,7 @@ async function finalizeTransformEntryScript(options) {
 		}
 	}
 	if (!isApp && result.script && result.template && isAutoSetDataPickEnabled(configService.weappViteConfig) && mayNeedTransformSetDataPick(result.template, { platform: configService.platform }) && mayNeedInjectSetDataPickInJs(result.script)) {
-		const keys = collectSetDataPickKeysFromTemplate(result.template, {
-			astEngine: resolveAstEngine(configService.weappViteConfig),
-			extraKeys: result.scopedSlotComponents?.flatMap((slot) => slot.ownerKeys ?? [])
-		});
+		const keys = collectSetDataPickKeysFromTemplate(result.template, { astEngine: resolveAstEngine(configService.weappViteConfig) });
 		const injectedPick = injectSetDataPickInJs(result.script, keys);
 		if (injectedPick.transformed) {
 			result.script = injectedPick.code;
@@ -21329,7 +21450,7 @@ async function compileTransformEntryResult(options) {
 	return filename.endsWith(".vue") ? await compileVueFile(transformedSource, filename, compileOptions) : await compileJsxFile(transformedSource, filename, compileOptions);
 }
 async function finalizeTransformCompiledResult(options) {
-	const { ctx, pluginCtx, filename, source, result, compilationCache, configService, isPage, isApp, scopedSlotModules, emittedScopedSlotChunks, addWatchFile, emitScopedSlotChunks } = options;
+	const { ctx, pluginCtx, filename, source, result, compilationCache, setAppShell, configService, isPage, isApp, scopedSlotModules, emittedScopedSlotChunks, addWatchFile, emitScopedSlotChunks } = options;
 	const transformResult = result;
 	if (isPage && result.template) await handleTransformEntryPageLayoutFlow({
 		pluginCtx,
@@ -21338,7 +21459,8 @@ async function finalizeTransformCompiledResult(options) {
 		source,
 		result
 	});
-	registerVueTemplateToken(ctx, filename, result.template);
+	if (isApp) setAppShell?.(hasAppShellTemplate(result) ? resolveAppShellLayout(configService) : void 0);
+	if (!isApp) registerVueTemplateToken(ctx, filename, result.template);
 	if (Array.isArray(result.meta?.sfcSrcDeps) && typeof pluginCtx.addWatchFile === "function") for (const dep of result.meta.sfcSrcDeps) addWatchFile(pluginCtx, dep);
 	await finalizeTransformEntryScript({
 		result: transformResult,
@@ -21430,7 +21552,7 @@ const wevu = wevuPlugin;
 //#endregion
 //#region src/plugins/vue/transform/plugin/transformFile.ts
 async function transformVueLikeFile(options) {
-	const { ctx, pluginCtx, code, id, compilationCache, pageMatcher, setPageMatcher, scanDirtySynced, setScanDirtySynced, reExportResolutionCache, compileOptionsCache, styleBlocksCache, scopedSlotModules, emittedScopedSlotChunks, classStyleRuntimeWarned, readAndParseSfc, createReadAndParseSfcOptions } = options;
+	const { ctx, pluginCtx, code, id, compilationCache, setAppShell, pageMatcher, setPageMatcher, scanDirtySynced, setScanDirtySynced, reExportResolutionCache, compileOptionsCache, styleBlocksCache, scopedSlotModules, emittedScopedSlotChunks, classStyleRuntimeWarned, readAndParseSfc, createReadAndParseSfcOptions } = options;
 	const vueTransformTiming = ctx.configService?.weappViteConfig?.debug?.vueTransformTiming;
 	const { measureStage, reportTiming } = createTransformStageMeasurer(vueTransformTiming);
 	const configService = ctx.configService;
@@ -21500,6 +21622,7 @@ async function transformVueLikeFile(options) {
 				source: transformedSource,
 				result,
 				compilationCache,
+				setAppShell,
 				configService,
 				isPage,
 				isApp,
@@ -21531,6 +21654,7 @@ async function transformVueLikeFile(options) {
 //#region src/plugins/vue/transform/plugin/index.ts
 function createVueTransformPlugin(ctx) {
 	const compilationCache = /* @__PURE__ */ new Map();
+	let appShell;
 	let pageMatcher = null;
 	let scanDirtySynced = false;
 	const reExportResolutionCache = /* @__PURE__ */ new Map();
@@ -21586,6 +21710,7 @@ function createVueTransformPlugin(ctx) {
 					code,
 					id,
 					compilationCache,
+					setAppShell: (shell) => appShell = shell,
 					pageMatcher,
 					setPageMatcher: (matcher) => pageMatcher = matcher,
 					scanDirtySynced,
@@ -21608,6 +21733,7 @@ function createVueTransformPlugin(ctx) {
 				ctx,
 				pluginCtx: this,
 				compilationCache,
+				appShell,
 				reExportResolutionCache,
 				compileOptionsCache,
 				classStyleRuntimeWarned
@@ -22957,7 +23083,7 @@ async function loadAppEntry(ctx, scanState) {
 	const vueAppPath = await findVueEntry(appBasename);
 	let configFromVue;
 	if (!appConfigFile && vueAppPath) {
-		const { extractConfigFromVue } = await import("./file-Dhy30jgW.mjs");
+		const { extractConfigFromVue } = await import("./file-Cj1AceWV.mjs");
 		configFromVue = await extractConfigFromVue(vueAppPath);
 		if (configFromVue) appConfigFile = vueAppPath;
 	}

package/dist/{file-B6UGp073.mjs → file-CKCR-PsP.mjs}

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

package/dist/file-Cj1AceWV.mjs

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

package/dist/getInstance-iZ7e_smp.mjs

@@ -0,0 +1,2 @@
+import { i as getCompilerContext } from "./createContext-BKbuGSJa.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-BLUytiY2.mjs";
+import { c as WEB_PLATFORM_ALIASES, d as isWebPlatform, f as resolveWeappViteTarget, l as getSupportedWeappVitePlatforms, t as createCompilerContext, u as getSupportedWeappViteTargetDescriptors } from "./createContext-BKbuGSJa.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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weapp-vite",
   "type": "module",
-  "version": "6.16.8",
+  "version": "6.16.9",
   "description": "weapp-vite 一个现代化的小程序打包工具",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -117,22 +117,22 @@
     "vite-tsconfig-paths": "^6.1.1",
     "vue": "^3.5.34",
     "vue-tsc": "^3.2.8",
-    "@weapp-core/constants": "^0.1.5",
+    "@weapp-core/constants": "^0.1.6",
     "@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.8",
+    "@weapp-vite/ast": "6.16.9",
     "@weapp-vite/mcp": "1.3.2",
     "@weapp-vite/miniprogram-automator": "1.1.0",
     "@weapp-vite/volar": "2.1.0",
     "@weapp-vite/web": "1.3.20",
     "@wevu/api": "0.2.8",
     "@wevu/web-apis": "1.2.12",
-    "vite-plugin-performance": "2.0.1",
     "rolldown-require": "2.0.15",
+    "vite-plugin-performance": "2.0.1",
     "weapp-ide-cli": "5.2.9",
-    "wevu": "6.16.8"
+    "wevu": "6.16.9"
   },
   "publishConfig": {
     "access": "public",

package/dist/file-Dhy30jgW.mjs

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

package/dist/getInstance-CJR0kbLn.mjs

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