weapp-vite 6.16.0 → 6.16.2

package/dist/{createContext-C-05IQc1.mjs → createContext-D69xinBq.mjs}

@@ -1,6 +1,6 @@
 import { n as applyWeappViteHostMeta } from "./pluginHost-SJdl15d3.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-BC_RNbAI.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-Dnwa6tm_.mjs";
 import { createRequire, isBuiltin } from "node:module";
 import path, { posix } from "pathe";
 import path$1, { normalize, relative, win32 } from "node:path";
@@ -8748,7 +8748,7 @@ const REQUEST_GLOBAL_EXPORT_RE = /Object\.defineProperty\(exports,\s*(?:`([^`]+)
 const REQUEST_GLOBAL_INSTALLER_RE = /function\s+([A-Za-z_$][\w$]*)\([^)]*=\{\}\)\{[\s\S]{0,220}?targets\?\?\[[\s\S]{0,80}?fetch[\s\S]{0,80}?Headers[\s\S]{0,80}?Request[\s\S]{0,80}?Response[\s\S]{0,80}?AbortController[\s\S]{0,80}?AbortSignal[\s\S]{0,80}?XMLHttpRequest[\s\S]{0,80}?WebSocket[\s\S]{0,260}?return [^}]+\}/;
 const REQUEST_GLOBAL_ENTRY_NAME_RE = /\.[^/.]+$/;
 const REQUEST_GLOBAL_REQUIRE_DECLARATOR_RE = /([A-Za-z_$][\w$]*)\s*=\s*require\((`([^`]+)`|'([^']+)'|"([^"]+)")\)/g;
-const REQUEST_GLOBAL_RUNTIME_CHUNK_FILE_BASENAME = "request-globals-runtime.js";
+const REQUEST_GLOBAL_RUNTIME_CHUNK_FILE_BASENAME = "weapp-vendors/request-globals-runtime.js";
 const DYNAMIC_GLOBAL_RESOLUTION_RE = /Function\(\s*(?:`return this`|'return this'|"return this")\s*\)\(\)/g;
 const BROWSER_GLOBAL_HOST_TERNARY_RE = /typeof self<[`'"]u[`'"]\?self:typeof window<[`'"]u[`'"]\?window:globalThis/g;
 const AXIOS_MODULE_ID_RE = /[/\\](?:\.pnpm[/\\][^/\\]+[/\\]node_modules[/\\])?axios[/\\]/u;
@@ -9891,6 +9891,12 @@ function resolveDistChunkPackageToken(cleanedAbsoluteId) {
 	if (!packageToken) return;
 	return sanitizePackageToken(packageToken);
 }
+function isRequestGlobalsRuntimeModuleId(id) {
+	const cleanedAbsoluteId = normalizeSharedPathCandidate(id);
+	REG_REQUEST_GLOBAL_RUNTIME_VENDOR_ID.lastIndex = 0;
+	if (REG_REQUEST_GLOBAL_RUNTIME_VENDOR_ID.test(cleanedAbsoluteId)) return true;
+	return resolveDistChunkPackageToken(cleanedAbsoluteId)?.endsWith("web-apis") === true;
+}
 function resolveStableHashedDistChunkFileName(chunk) {
 	const candidateIds = [chunk.facadeModuleId, ...chunk.moduleIds ?? []].filter((id) => typeof id === "string");
 	for (const id of candidateIds) {
@@ -9902,7 +9908,7 @@ function resolveStableHashedDistChunkFileName(chunk) {
 		const packageToken = resolveDistChunkPackageToken(cleanedAbsoluteId);
 		if (!baseName || !packageToken) continue;
 		REG_REQUEST_GLOBAL_RUNTIME_VENDOR_ID.lastIndex = 0;
-		if (REG_REQUEST_GLOBAL_RUNTIME_VENDOR_ID.test(cleanedAbsoluteId) || packageToken.endsWith("web-apis")) return `request-globals-${packageToken}-${baseName}.js`;
+		if (REG_REQUEST_GLOBAL_RUNTIME_VENDOR_ID.test(cleanedAbsoluteId) || packageToken.endsWith("web-apis")) return `weapp-vendors/request-globals-${packageToken}-${baseName}.js`;
 		return `weapp-vendors/${packageToken}-${baseName}.js`;
 	}
 }
@@ -9913,7 +9919,7 @@ function createSharedBuildResolver(configService, getSubPackageRoots) {
 	const forceDuplicateTester = createForceDuplicateTester(forceDuplicatePatterns);
 	const resolveSharedMode = createSharedModeResolver(sharedMode, sharedOverrides);
 	const resolveSharedPath = createSharedPathResolver(configService, sharedPathRoot);
-	return { resolveAdvancedChunkName: createAdvancedChunkNameResolver({
+	const resolveAdvancedChunkName = createAdvancedChunkNameResolver({
 		vendorsMatchers: [nodeModulesDeps, commonjsHelpersDeps],
 		relativeAbsoluteSrcRoot: configService.relativeAbsoluteSrcRoot,
 		getSubPackageRoots,
@@ -9922,12 +9928,18 @@ function createSharedBuildResolver(configService, getSubPackageRoots) {
 		sharedMode,
 		resolveSharedMode,
 		resolveSharedPath
-	}) };
+	});
+	const resolveSharedBuildChunkName = (id, ctx) => {
+		if (isRequestGlobalsRuntimeModuleId(id)) return REQUEST_GLOBAL_RUNTIME_CHUNK_FILE_BASENAME.replace(/\.js$/, "");
+		return resolveAdvancedChunkName(id, ctx);
+	};
+	return { resolveAdvancedChunkName: resolveSharedBuildChunkName };
 }
 function createSharedBuildOutput(configService, getSubPackageRoots) {
 	const { resolveAdvancedChunkName } = createSharedBuildResolver(configService, getSubPackageRoots);
 	return {
 		codeSplitting: { groups: [{ name: (id, ctx) => resolveAdvancedChunkName(id, ctx) }] },
+		minifyInternalExports: false,
 		chunkFileNames: (chunk) => {
 			if (isRequestGlobalsRuntimeChunk(chunk)) return REQUEST_GLOBAL_RUNTIME_CHUNK_FILE_BASENAME;
 			const stableHashedDistChunkFileName = resolveStableHashedDistChunkFileName(chunk);
@@ -11132,6 +11144,20 @@ function getWeappViteConfig() {
 		multiPlatform: false,
 		es5: false,
 		packageSizeWarningBytes: 2 * 1024 * 1024,
+		analyze: {
+			budgets: {
+				totalBytes: 20 * 1024 * 1024,
+				mainBytes: 2 * 1024 * 1024,
+				subPackageBytes: 2 * 1024 * 1024,
+				independentBytes: 2 * 1024 * 1024,
+				warningRatio: .85
+			},
+			history: {
+				enabled: true,
+				dir: ".weapp-vite/analyze-history",
+				limit: 20
+			}
+		},
 		jsFormat: "cjs",
 		isAdditionalWxml: () => {
 			return false;
@@ -12646,14 +12672,29 @@ function createExtendedLibManager() {
 }
 //#endregion
 //#region src/plugins/hooks/useLoadEntry/jsonEmit.ts
+function normalizeAppJson(json) {
+	if (!json || typeof json !== "object" || Array.isArray(json)) return json;
+	const subPackages = Array.isArray(json.subPackages) ? json.subPackages : Array.isArray(json.subpackages) ? json.subpackages : [];
+	return {
+		...json,
+		subPackages: subPackages.map((subPackage) => ({
+			...subPackage,
+			pages: Array.isArray(subPackage?.pages) ? subPackage.pages : []
+		}))
+	};
+}
 function createJsonEmitManager(configService) {
 	const map = /* @__PURE__ */ new Map();
 	function register(entry) {
 		if (!entry.jsonPath) return;
 		const fileName = resolveRelativeJsonOutputFileName(configService, entry.jsonPath);
+		const normalizedEntry = entry.type === "app" && fileName === "app.json" ? {
+			...entry,
+			json: normalizeAppJson(entry.json)
+		} : entry;
 		map.set(fileName, {
 			fileName,
-			entry
+			entry: normalizedEntry
 		});
 	}
 	return {
@@ -14468,6 +14509,7 @@ async function applyScriptSetupUsingComponents(options) {
 }
 //#endregion
 //#region src/plugins/hooks/useLoadEntry/loadEntry/index.ts
+const VUE_LIKE_PAGE_ENTRY_RE = /\.(?:vue|jsx|tsx)$/;
 function createStopwatch() {
 	const start = performance$1.now();
 	return () => `${(performance$1.now() - start).toFixed(2)}ms`;
@@ -14549,6 +14591,32 @@ function createEntryLoader(options) {
 		let shouldSkipAppEntries = false;
 		const nativeLayoutScriptEntries = /* @__PURE__ */ new Set();
 		const autoRoutesSignature = configService.isDev ? ctx.autoRoutesService?.getSignature?.() : void 0;
+		const registerPageLayoutComponentEntries = async (layoutPlan, options) => {
+			if (options?.trackLayoutDependencies) {
+				const layoutDependencies = /* @__PURE__ */ new Set();
+				for (const file of await expandResolvedPageLayoutFiles(layoutPlan.layouts)) layoutDependencies.add(normalizeFsResolvedId(file));
+				replaceLayoutDependencies(normalizedId, layoutDependencies);
+			}
+			await addResolvedPageLayoutWatchFiles(this, layoutPlan.layouts);
+			await registerResolvedPageLayoutEntries({
+				layouts: layoutPlan.layouts,
+				entries,
+				explicitEntryTypes,
+				nativeScriptEntries: nativeLayoutScriptEntries,
+				normalizeEntry,
+				jsonPath
+			});
+			for (const layout of layoutPlan.layouts) {
+				if (layout.kind === "native") continue;
+				if (!layout.file.endsWith(".vue")) continue;
+				if (!await shouldEmitScriptlessVueLayoutJs$1(layout.file)) continue;
+				const relativeLayoutBase = configService.relativeOutputPath(removeExtensionDeep(layout.file));
+				if (!relativeLayoutBase || emittedScriptlessVueLayoutJs.has(relativeLayoutBase)) continue;
+				emittedScriptlessVueLayoutJs.add(relativeLayoutBase);
+				const { scriptExtension } = resolveCompilerOutputExtensions(configService.outputExtensions);
+				emitScriptlessComponentAsset(this, resolveScriptlessComponentFileName(relativeLayoutBase, scriptExtension));
+			}
+		};
 		if (type === "app") {
 			appResult = await collectAppEntries({
 				pluginCtx: this,
@@ -14614,34 +14682,13 @@ function createEntryLoader(options) {
 					if (vueSource) {
 						const layoutPlan = await resolvePageLayoutPlan(vueSource, vueEntryPath, configService);
 						replaceLayoutDependencies(normalizedId, []);
-						if (layoutPlan) {
-							if (vueSource.includes("definePageMeta") || vueSource.includes("setPageLayout")) {
-								const layoutDependencies = /* @__PURE__ */ new Set();
-								for (const file of await expandResolvedPageLayoutFiles(layoutPlan.layouts)) layoutDependencies.add(normalizeFsResolvedId(file));
-								replaceLayoutDependencies(normalizedId, layoutDependencies);
-							}
-							await addResolvedPageLayoutWatchFiles(this, layoutPlan.layouts);
-							await registerResolvedPageLayoutEntries({
-								layouts: layoutPlan.layouts,
-								entries,
-								explicitEntryTypes,
-								nativeScriptEntries: nativeLayoutScriptEntries,
-								normalizeEntry,
-								jsonPath
-							});
-							for (const layout of layoutPlan.layouts) {
-								if (layout.kind === "native") continue;
-								if (!layout.file.endsWith(".vue")) continue;
-								if (!await shouldEmitScriptlessVueLayoutJs$1(layout.file)) continue;
-								const relativeLayoutBase = configService.relativeOutputPath(removeExtensionDeep(layout.file));
-								if (!relativeLayoutBase || emittedScriptlessVueLayoutJs.has(relativeLayoutBase)) continue;
-								emittedScriptlessVueLayoutJs.add(relativeLayoutBase);
-								const { scriptExtension } = resolveCompilerOutputExtensions(configService.outputExtensions);
-								emitScriptlessComponentAsset(this, resolveScriptlessComponentFileName(relativeLayoutBase, scriptExtension));
-							}
-						}
+						if (layoutPlan) await registerPageLayoutComponentEntries(layoutPlan, { trackLayoutDependencies: vueSource.includes("definePageMeta") || vueSource.includes("setPageLayout") });
 					}
 				}
+			} else if (type === "page" && templatePath && !VUE_LIKE_PAGE_ENTRY_RE.test(id)) {
+				replaceLayoutDependencies(normalizedId, []);
+				const layoutPlan = await resolvePageLayoutPlan(await fs.readFile(id, "utf-8"), id, configService);
+				if (layoutPlan) await registerPageLayoutComponentEntries(layoutPlan, { trackLayoutDependencies: true });
 			}
 			if (configService.isDev && hasJsonEntry && vueEntryPath) {
 				const vueSource = await readVueSource();
@@ -14757,8 +14804,6 @@ function createTemplateScanner(wxmlService, debug) {
 }
 //#endregion
 //#region src/plugins/hooks/useLoadEntry/index.ts
-const MAX_DIRECT_SOURCE_SHARED_CHUNK_IMPORTERS = 128;
-const MAX_FALLBACK_DIRECT_SOURCE_SHARED_CHUNK_IMPORTERS = 8;
 function resolveUpstreamPendingReasonSummary(dirtyReasonSummary) {
 	if (!dirtyReasonSummary?.length) return [];
 	const pendingReasonSummary = [];
@@ -14770,12 +14815,6 @@ function resolveUpstreamPendingReasonSummary(dirtyReasonSummary) {
 	if (hasAutoRoutesTopology) pendingReasonSummary.push("auto-routes-topology");
 	return pendingReasonSummary;
 }
-function isDirectSourceSharedChunkForEntry(options) {
-	if (options.sourceSharedChunks?.has(options.chunkId) !== true) return false;
-	const normalizedEntryId = normalizeFsResolvedId(options.entryId);
-	if ((options.entryLayoutDependencies?.get(normalizedEntryId))?.size) return true;
-	return options.importerCount <= MAX_FALLBACK_DIRECT_SOURCE_SHARED_CHUNK_IMPORTERS;
-}
 function resolvePendingEntryIds(options) {
 	const pending = new Set(options.dirtyEntrySet);
 	const pendingReasonSummary = resolveUpstreamPendingReasonSummary(options.dirtyReasonSummary);
@@ -14817,17 +14856,9 @@ function resolvePendingEntryIds(options) {
 				hasDependencyDrivenImporter = true;
 				continue;
 			}
-			if (options.dirtyEntrySet.has(importer) && options.dirtyEntryReasons.get(importer) === "direct") {
-				if (isDirectSourceSharedChunkForEntry({
-					chunkId,
-					entryId: importer,
-					sourceSharedChunks: options.sourceSharedChunks,
-					entryLayoutDependencies: options.entryLayoutDependencies,
-					importerCount: importers.size
-				})) hasDirectDirtyImporter = true;
-			}
+			if (options.dirtyEntrySet.has(importer) && options.dirtyEntryReasons.get(importer) === "direct") hasDirectDirtyImporter = true;
 		}
-		if (!hasDependencyDrivenImporter && !(hasDirectDirtyImporter && importers.size <= MAX_DIRECT_SOURCE_SHARED_CHUNK_IMPORTERS)) continue;
+		if (!hasDependencyDrivenImporter && !hasDirectDirtyImporter) continue;
 		if (hasDependencyDrivenImporter && hasDirectDirtyImporter) expansionMode = "mixed";
 		else if (hasDirectDirtyImporter) expansionMode = expansionMode && expansionMode !== "direct" ? "mixed" : "direct";
 		else expansionMode = expansionMode && expansionMode !== "dependency" ? "mixed" : "dependency";
@@ -14907,7 +14938,6 @@ function useLoadEntry(ctx, options) {
 	const hmrSharedChunksMode = options?.hmr?.sharedChunks ?? "auto";
 	const hmrSharedChunkImporters = options?.hmr?.sharedChunkImporters;
 	const hmrSharedChunksByEntry = options?.hmr?.sharedChunksByEntry;
-	const hmrSourceSharedChunks = options?.hmr?.sourceSharedChunks;
 	return {
 		loadEntry,
 		entriesMap,
@@ -14940,11 +14970,7 @@ function useLoadEntry(ctx, options) {
 				dirtyEntryReasons,
 				dirtyReasonSummary: ctx.runtimeState.build.hmr.profile.dirtyReasonSummary,
 				sharedChunkImporters: hmrSharedChunkImporters,
-				sharedChunksByEntry: hmrSharedChunksByEntry,
-				sourceSharedChunks: hmrSourceSharedChunks,
-				entryLayoutDependencies,
-				subPackageRoots: new Set(ctx.scanService?.subPackageMap?.keys?.() ?? []),
-				relativeAbsoluteSrcRoot: ctx.configService.relativeAbsoluteSrcRoot.bind(ctx.configService)
+				sharedChunksByEntry: hmrSharedChunksByEntry
 			});
 			const pendingEntryIds = pendingResolution.pending;
 			const pending = [];
@@ -16186,9 +16212,26 @@ function rewriteJsonNpmImportsToLocalRoot(bundle, root, dependencyPatterns, depe
 }
 //#endregion
 //#region src/plugins/core/lifecycle/emit/requestGlobals.ts
+const REQUEST_GLOBAL_REQUIRE_CALL_RE = /require\((`([^`]+)`|'([^']+)'|"([^"]+)")\)/g;
+const REQUEST_GLOBAL_APP_MODULE_KEY_PREFIX = "__weappViteRequestGlobalsModule:";
 function resolveChunkRequestGlobalsTargets(code, targets, mode) {
 	return mode === "auto" ? resolveAutoRequestGlobalsTargets(code, targets) : targets;
 }
+function collectTopLevelDeclaredIdentifiers(code) {
+	const identifiers = /* @__PURE__ */ new Set();
+	try {
+		const body = parseJsLike(code)?.program?.body;
+		if (!Array.isArray(body)) return identifiers;
+		for (const statement of body) {
+			if ((statement?.type === "FunctionDeclaration" || statement?.type === "ClassDeclaration") && statement.id?.type === "Identifier") identifiers.add(statement.id.name);
+			if (statement?.type !== "VariableDeclaration") continue;
+			for (const declaration of statement.declarations ?? []) if (declaration?.id?.type === "Identifier") identifiers.add(declaration.id.name);
+		}
+	} catch {
+		return identifiers;
+	}
+	return identifiers;
+}
 function resolveRequestGlobalsInstallerName(code) {
 	const installerMatch = code.match(REQUEST_GLOBAL_INSTALLER_RE);
 	if (installerMatch?.[1]) return installerMatch[1];
@@ -16267,14 +16310,15 @@ function injectRequestGlobalsBundleRuntime(bundle, targets, mode, networkDefault
 		if (chunkTargets.length === 0) continue;
 		const bindingTargets = resolveRequestGlobalsBindingTargets(chunkTargets);
 		if (bindingTargets.length === 0) continue;
-		const passiveBindingsCode = createRequestGlobalsPassiveBindingsCode(chunkTargets, bindingTargets);
+		const topLevelDeclaredIdentifiers = collectTopLevelDeclaredIdentifiers(chunk.code);
+		const passiveBindingsCode = createRequestGlobalsPassiveBindingsCode(chunkTargets, bindingTargets.filter((target) => !topLevelDeclaredIdentifiers.has(target)));
 		const syntheticExportCode = exportName ? "" : `Object.defineProperty(exports,${JSON.stringify(REQUEST_GLOBAL_SYNTHETIC_EXPORT_NAME)},{enumerable:false,get:function(){return ${installerName}}});`;
 		const runtimeBindingCode = [
 			`const ${REQUEST_GLOBAL_BUNDLE_HOST_REF} = ${installerName}(${createRequestGlobalsInstallerOptionsCode(chunkTargets, networkDefaults)}) || globalThis`,
 			...bindingTargets.map((target) => `${REQUEST_GLOBAL_ACTUALS_KEY}[${JSON.stringify(target)}] = ${REQUEST_GLOBAL_BUNDLE_HOST_REF}.${target}`),
 			...bindingTargets.map((target) => `try{globalThis[${JSON.stringify(target)}]=${REQUEST_GLOBAL_BUNDLE_HOST_REF}.${target}}catch{}`)
 		].join(";");
-		const bundlePrelude = `/* ${REQUEST_GLOBAL_BUNDLE_MARKER} */ ${passiveBindingsCode}\n`;
+		const bundlePrelude = `/* ${REQUEST_GLOBAL_BUNDLE_MARKER} */ ${passiveBindingsCode ? `${passiveBindingsCode}\n` : ""}`;
 		const firstRequireMatch = chunk.code.match(REQUEST_GLOBAL_REQUIRE_DECLARATOR_RE);
 		if (firstRequireMatch?.[0]) {
 			chunk.code = `${bundlePrelude}${chunk.code.replace(firstRequireMatch[0], (match) => `${match};${syntheticExportCode}${runtimeBindingCode}`)}\n`;
@@ -16398,6 +16442,102 @@ function rewriteChunkRequireLiteral(chunk, fromFileName, toFileName) {
 	});
 	if (didRewrite) chunk.code = nextCode;
 }
+function hasBareRequireRegistration(code, requirePath) {
+	const escapedRequireLiteral = JSON.stringify(requirePath).replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+	return new RegExp(`(?:^|[;\\n])\\s*require\\(${escapedRequireLiteral}\\);`).test(code);
+}
+function getRequireCallImportee(args) {
+	return args[2] ?? args[3] ?? args[4];
+}
+function rewriteRequireCallLiterals(code, rewrite) {
+	return code.replaceAll(REQUEST_GLOBAL_REQUIRE_CALL_RE, (...args) => {
+		const match = args[0];
+		const requireLiteral = args[1];
+		const importee = getRequireCallImportee(args);
+		if (typeof importee !== "string") return match;
+		return rewrite(requireLiteral, importee) ?? match;
+	});
+}
+function rewriteEmbeddedRequirePaths(code, fromFileName, toFileName) {
+	return rewriteRequireCallLiterals(code, (_requireLiteral, importee) => {
+		const resolvedImport = normalizeRelativeChunkImport(fromFileName, importee);
+		return `require(${JSON.stringify(toRequireRequestPath(toFileName, resolvedImport))})`;
+	});
+}
+function rewriteChunkRequireCallsToExpression(chunk, targetFileName, expression) {
+	let didRewrite = false;
+	const nextCode = rewriteRequireCallLiterals(chunk.code, (_requireLiteral, importee) => {
+		if (normalizeRelativeChunkImport(chunk.fileName, importee) !== targetFileName) return;
+		didRewrite = true;
+		return expression;
+	});
+	if (didRewrite) chunk.code = nextCode;
+	return didRewrite;
+}
+function createRequestGlobalsStaticImportReplacement(node, expression) {
+	const declarations = [];
+	const namedSpecifiers = [];
+	for (const specifier of node.specifiers ?? []) {
+		if (specifier?.type === "ImportNamespaceSpecifier" && specifier.local?.type === "Identifier") {
+			declarations.push(`const ${specifier.local.name} = ${expression};`);
+			continue;
+		}
+		if (specifier?.type === "ImportDefaultSpecifier" && specifier.local?.type === "Identifier") {
+			declarations.push(`const ${specifier.local.name} = ${expression}.default;`);
+			continue;
+		}
+		if (specifier?.type !== "ImportSpecifier" || specifier.local?.type !== "Identifier") continue;
+		const importedName = specifier.imported?.type === "Identifier" ? specifier.imported.name : getStaticStringLiteral(specifier.imported);
+		if (!importedName) continue;
+		const propertyName = /^[_a-z]\w*$/i.test(importedName) ? importedName : JSON.stringify(importedName);
+		namedSpecifiers.push(specifier.local.name === importedName && propertyName === importedName ? importedName : `${propertyName}: ${specifier.local.name}`);
+	}
+	if (namedSpecifiers.length > 0) declarations.unshift(`const { ${namedSpecifiers.join(", ")} } = ${expression};`);
+	return declarations.length > 0 ? declarations.join("\n") : `${expression};`;
+}
+function rewriteChunkStaticImportsToExpression(chunk, targetFileName, expression) {
+	try {
+		const ast = parseJsLike(chunk.code);
+		const replacements = [];
+		traverse(ast, { ImportDeclaration(path) {
+			const importee = getStaticStringLiteral(path.node?.source);
+			if (!importee) return;
+			if (normalizeRelativeChunkImport(chunk.fileName, importee) !== targetFileName) return;
+			if (typeof path.node.start !== "number" || typeof path.node.end !== "number") return;
+			replacements.push({
+				end: path.node.end,
+				start: path.node.start,
+				value: createRequestGlobalsStaticImportReplacement(path.node, expression)
+			});
+		} });
+		if (replacements.length === 0) return false;
+		let nextCode = chunk.code;
+		for (const replacement of replacements.sort((left, right) => right.start - left.start)) nextCode = `${nextCode.slice(0, replacement.start)}${replacement.value}${nextCode.slice(replacement.end)}`;
+		chunk.code = nextCode;
+		return true;
+	} catch {
+		return false;
+	}
+}
+function hasAssetRequireCallToFile(source, fileName, targetFileName) {
+	let hasRequireCall = false;
+	rewriteRequireCallLiterals(source, (_requireLiteral, importee) => {
+		if (normalizeRelativeChunkImport(fileName, importee) === targetFileName) hasRequireCall = true;
+	});
+	return hasRequireCall;
+}
+function shouldInlineRequestGlobalsAppRegisteredInstallerChunk(fileName) {
+	return fileName !== "weapp-vendors/request-globals-runtime.js" && fileName.startsWith("weapp-vendors/request-globals-");
+}
+function toRequestGlobalsAppRegisteredModuleExpression(fileName) {
+	return `globalThis[${JSON.stringify(`${REQUEST_GLOBAL_APP_MODULE_KEY_PREFIX}${fileName}`)}]`;
+}
+function toRequestGlobalsRequireModuleExpression(fromFileName, installerChunkFileName) {
+	return `require(${JSON.stringify(toRequireRequestPath(fromFileName, installerChunkFileName))})`;
+}
+function toRequestGlobalsInstallerModuleExpression(fromFileName, installerChunkFileName, options = {}) {
+	return options.appRegisteredModule !== false && shouldInlineRequestGlobalsAppRegisteredInstallerChunk(installerChunkFileName) ? toRequestGlobalsAppRegisteredModuleExpression(installerChunkFileName) : toRequestGlobalsRequireModuleExpression(fromFileName, installerChunkFileName);
+}
 function collapseRequestGlobalsRuntimeSupportChunk(bundle) {
 	const runtimeChunk = bundle[REQUEST_GLOBAL_RUNTIME_CHUNK_FILE_BASENAME];
 	if (!runtimeChunk || runtimeChunk.type !== "chunk") return;
@@ -16410,7 +16550,7 @@ function collapseRequestGlobalsRuntimeSupportChunk(bundle) {
 		const resolvedImport = normalizeRelativeChunkImport(runtimeOutput.fileName, importee);
 		const supportChunk = bundle[resolvedImport];
 		if (!supportChunk || supportChunk.type !== "chunk") continue;
-		if (resolvedImport === "request-globals-runtime.js" || !resolvedImport.startsWith("request-globals-") && !resolvedImport.endsWith("web-apis-shared.js")) continue;
+		if (resolvedImport === "weapp-vendors/request-globals-runtime.js" || !resolvedImport.startsWith("request-globals-") && !resolvedImport.endsWith("web-apis-shared.js")) continue;
 		supportChunkFileName = resolvedImport;
 		runtimeRequireMatch = requireMatch;
 		break;
@@ -16444,6 +16584,65 @@ function collapseRequestGlobalsRuntimeSupportChunk(bundle) {
 		rewriteChunkRequireLiteral(chunk, supportChunkFileName, runtimeOutput.fileName);
 	}
 }
+function injectRequestGlobalsAppRegistration(bundle, installerChunks) {
+	if (installerChunks.size === 0) return;
+	const appOutput = bundle["app.js"];
+	if (!appOutput || appOutput.type !== "chunk") return;
+	const appChunk = appOutput;
+	const requireStatements = [];
+	for (const installerChunkFileName of installerChunks.keys()) {
+		const installerOutput = bundle[installerChunkFileName];
+		if (!installerOutput || installerOutput.type !== "chunk") continue;
+		const requirePath = toRequireRequestPath(appChunk.fileName, installerChunkFileName);
+		if (hasBareRequireRegistration(appChunk.code, requirePath)) continue;
+		requireStatements.push(`require(${JSON.stringify(requirePath)});`);
+	}
+	if (requireStatements.length === 0) return;
+	appChunk.code = `${requireStatements.join("\n")}\n${appChunk.code}`;
+}
+function inlineRequestGlobalsAppRegisteredInstallerChunks(bundle, installerChunks, preservedInstallerChunks = /* @__PURE__ */ new Set()) {
+	if (installerChunks.size === 0) return;
+	const appOutput = bundle["app.js"];
+	if (!appOutput || appOutput.type !== "chunk") return;
+	const appChunk = appOutput;
+	const inlinedModules = [];
+	let inlinedIndex = 0;
+	for (const installerChunkFileName of installerChunks.keys()) {
+		if (!shouldInlineRequestGlobalsAppRegisteredInstallerChunk(installerChunkFileName)) continue;
+		const installerOutput = bundle[installerChunkFileName];
+		if (!installerOutput || installerOutput.type !== "chunk") continue;
+		const moduleRef = `__wvRGA${inlinedIndex++}__`;
+		const globalModuleExpression = toRequestGlobalsAppRegisteredModuleExpression(installerChunkFileName);
+		const installerChunk = installerOutput;
+		const embeddedCode = rewriteEmbeddedRequirePaths(installerChunk.code, installerChunk.fileName, appChunk.fileName);
+		let hasPreservedAssetRequire = preservedInstallerChunks.has(installerChunkFileName);
+		inlinedModules.push([
+			`const ${moduleRef} = (() => {`,
+			"  const module = { exports: {} }",
+			"  const exports = module.exports",
+			embeddedCode,
+			"  return module.exports",
+			"})();",
+			`try{${globalModuleExpression}=${moduleRef}}catch{}`
+		].join("\n"));
+		for (const output of Object.values(bundle)) {
+			if (!output || output.type !== "chunk") continue;
+			const chunk = output;
+			const didRewriteRequire = rewriteChunkRequireCallsToExpression(chunk, installerChunkFileName, globalModuleExpression);
+			const didRewriteImport = rewriteChunkStaticImportsToExpression(chunk, installerChunkFileName, globalModuleExpression);
+			if ((didRewriteRequire || didRewriteImport) && Array.isArray(chunk.imports)) chunk.imports = chunk.imports.filter((importee) => importee !== installerChunkFileName);
+		}
+		for (const output of Object.values(bundle)) {
+			if (!output || output.type !== "asset" || typeof output.fileName !== "string") continue;
+			const source = typeof output.source === "string" ? output.source : output.source?.toString();
+			if (!source) continue;
+			if (hasAssetRequireCallToFile(source, output.fileName, installerChunkFileName)) hasPreservedAssetRequire = true;
+		}
+		if (!hasPreservedAssetRequire) delete bundle[installerChunkFileName];
+	}
+	if (inlinedModules.length === 0) return;
+	appChunk.code = `${inlinedModules.join("\n")}\n${appChunk.code}`;
+}
 function createRequestGlobalsPreludeCode(chunk, installerChunks, targets, mode, networkDefaults) {
 	const chunkTargets = resolveChunkRequestGlobalsTargets(chunk.code, targets, mode);
 	if (chunkTargets.length === 0 || chunk.code.includes(REQUEST_GLOBAL_PRELUDE_MARKER)) return;
@@ -16456,7 +16655,7 @@ function createRequestGlobalsPreludeCode(chunk, installerChunks, targets, mode,
 	else {
 		const installerImport = resolveRequestGlobalsInstallerImport(chunk, installerChunks);
 		if (!installerImport?.exportName || !installerImport.installerChunkFileName) return;
-		installerHostCode = `require(${JSON.stringify(toRequireRequestPath(chunk.fileName, installerImport.installerChunkFileName))})[${JSON.stringify(installerImport.exportName)}](${createRequestGlobalsInstallerOptionsCode(chunkTargets, networkDefaults)}) || globalThis`;
+		installerHostCode = `${toRequestGlobalsInstallerModuleExpression(chunk.fileName, installerImport.installerChunkFileName)}[${JSON.stringify(installerImport.exportName)}](${createRequestGlobalsInstallerOptionsCode(chunkTargets, networkDefaults)}) || globalThis`;
 	}
 	return [
 		`/* ${REQUEST_GLOBAL_PRELUDE_MARKER} */`,
@@ -16479,7 +16678,7 @@ function createRequestGlobalsPreludeAssetCode(preludeFileName, chunk, installerC
 	if (bindingTargets.length === 0) return;
 	const installerImport = resolveRequestGlobalsInstallerImport(chunk, installerChunks);
 	if (!installerImport?.installerChunkFileName || !installerImport.exportName) return;
-	const installerHostCode = `require(${JSON.stringify(toRequireRequestPath(preludeFileName, installerImport.installerChunkFileName))})[${JSON.stringify(installerImport.exportName)}](${createRequestGlobalsInstallerOptionsCode(chunkTargets, networkDefaults)}) || globalThis`;
+	const installerHostCode = `${toRequestGlobalsInstallerModuleExpression(preludeFileName, installerImport.installerChunkFileName, { appRegisteredModule: false })}[${JSON.stringify(installerImport.exportName)}](${createRequestGlobalsInstallerOptionsCode(chunkTargets, networkDefaults)}) || globalThis`;
 	return [
 		`/* ${REQUEST_GLOBAL_PRELUDE_MARKER} */`,
 		`(() => {`,
@@ -16603,7 +16802,8 @@ function createAppPreludeRequireStatement(chunkFileName, preludeFileName) {
 	return `/* ${APP_PRELUDE_REQUIRE_MARKER} */require(${JSON.stringify(requestPath)})`;
 }
 function emitAppPreludeRequireAssets(bundle, appPreludeCode, state, requestGlobalsPreludeOptions, emitFile) {
-	if (!appPreludeCode) return;
+	const preservedRequestGlobalsInstallerChunks = /* @__PURE__ */ new Set();
+	if (!appPreludeCode) return preservedRequestGlobalsInstallerChunks;
 	const preludeFileNames = /* @__PURE__ */ new Set();
 	if (state.subPackageMeta?.subPackage.root) preludeFileNames.add(`${state.subPackageMeta.subPackage.root}/${APP_PRELUDE_REQUIRE_FILE_BASENAME}`);
 	else {
@@ -16615,18 +16815,25 @@ function emitAppPreludeRequireAssets(bundle, appPreludeCode, state, requestGloba
 		const scopeChunks = Object.values(bundle).filter((output) => {
 			return output?.type === "chunk" && resolveAppPreludeRequireFileName(output.fileName, state) === fileName;
 		});
-		const source = [requestGlobalsPreludeOptions.enabled ? scopeChunks.map((chunk) => createRequestGlobalsPreludeAssetCode(fileName, chunk, requestGlobalsPreludeOptions.installerChunks, requestGlobalsPreludeOptions.targets, requestGlobalsPreludeOptions.mode, requestGlobalsPreludeOptions.networkDefaults)).find(Boolean) : void 0, appPreludeCode].filter(Boolean).join("\n");
+		const requestGlobalsPreludeCode = requestGlobalsPreludeOptions.enabled ? scopeChunks.map((chunk) => createRequestGlobalsPreludeAssetCode(fileName, chunk, requestGlobalsPreludeOptions.installerChunks, requestGlobalsPreludeOptions.targets, requestGlobalsPreludeOptions.mode, requestGlobalsPreludeOptions.networkDefaults)).find(Boolean) : void 0;
+		if (requestGlobalsPreludeCode) {
+			const installerImport = scopeChunks.map((chunk) => resolveRequestGlobalsInstallerImport(chunk, requestGlobalsPreludeOptions.installerChunks)).find(Boolean);
+			if (installerImport?.installerChunkFileName) preservedRequestGlobalsInstallerChunks.add(installerImport.installerChunkFileName);
+		}
+		const source = [requestGlobalsPreludeCode, appPreludeCode].filter(Boolean).join("\n");
 		emitFile?.({
 			type: "asset",
 			fileName,
 			source: `${source}\n`
 		});
 	}
+	return preservedRequestGlobalsInstallerChunks;
 }
 function injectAppPreludeCode(bundle, appPreludeCode, options, state, requestGlobalsPreludeOptions, emitFile) {
-	if (!options.enabled) return;
+	let preservedRequestGlobalsInstallerChunks = /* @__PURE__ */ new Set();
+	if (!options.enabled) return preservedRequestGlobalsInstallerChunks;
 	const entryChunkFileNames = options.mode === "entry" ? collectAppPreludeEntryChunkFileNames(state) : void 0;
-	if (options.mode === "require" && appPreludeCode) emitAppPreludeRequireAssets(bundle, appPreludeCode, state, requestGlobalsPreludeOptions, emitFile);
+	if (options.mode === "require" && appPreludeCode) preservedRequestGlobalsInstallerChunks = emitAppPreludeRequireAssets(bundle, appPreludeCode, state, requestGlobalsPreludeOptions, emitFile);
 	for (const output of Object.values(bundle)) {
 		if (output?.type !== "chunk") continue;
 		const chunk = output;
@@ -16637,6 +16844,7 @@ function injectAppPreludeCode(bundle, appPreludeCode, options, state, requestGlo
 		if (!injectedCode) continue;
 		chunk.code = prependChunkCodePreservingDirectives(chunk.code, injectedCode);
 	}
+	return preservedRequestGlobalsInstallerChunks;
 }
 //#endregion
 //#region src/plugins/core/lifecycle/emit/generate.ts
@@ -16807,10 +17015,11 @@ function createGenerateBundleHook(state, isPluginBuild) {
 			injectRequestGlobalsPassiveBindings(rolldownBundle, installerChunks, injectRequestGlobalsOptions.targets, injectRequestGlobalsOptions.mode, state.entriesMap);
 			injectRequestGlobalsLocalBindings(rolldownBundle, installerChunks, injectRequestGlobalsOptions.targets, injectRequestGlobalsOptions.mode, state.entriesMap, injectRequestGlobalsOptions.networkDefaults);
 			injectAxiosFetchAdapterEnv(rolldownBundle);
+			injectRequestGlobalsAppRegistration(rolldownBundle, installerChunks);
 			collapseRequestGlobalsRuntimeSupportChunk(rolldownBundle);
 		}
 		const appPreludeOptions = resolveAppPreludeOptions(state);
-		injectAppPreludeCode(rolldownBundle, await resolveAppPreludeCode(scanService.appEntry?.preludePath, {
+		const preservedRequestGlobalsInstallerChunks = injectAppPreludeCode(rolldownBundle, await resolveAppPreludeCode(scanService.appEntry?.preludePath, {
 			importMetaDefineRegistry: configService.importMetaDefineRegistry,
 			relativePath: scanService.appEntry?.preludePath ? configService.relativeAbsoluteSrcRoot(scanService.appEntry.preludePath) : void 0
 		}), {
@@ -16823,6 +17032,7 @@ function createGenerateBundleHook(state, isPluginBuild) {
 			networkDefaults: injectRequestGlobalsOptions?.networkDefaults,
 			targets: injectRequestGlobalsOptions?.targets ?? []
 		}, (asset) => this.emitFile(asset));
+		if (injectRequestGlobalsOptions?.targets?.length) inlineRequestGlobalsAppRegisteredInstallerChunks(rolldownBundle, installerChunks, preservedRequestGlobalsInstallerChunks);
 		syncChunkImportsFromRequireCalls(rolldownBundle);
 		refreshModuleGraph(this, state);
 		if (configService.weappViteConfig?.debug?.watchFiles) {
@@ -22133,6 +22343,17 @@ function createConfigServicePlugin(ctx) {
 //#region src/runtime/jsonPlugin.ts
 const APP_CONFIG_RE = /app\.json(?:\.[jt]s)?$/;
 const SCRIPT_JSON_CONFIG_RE = /\.json\.[jt]s$/;
+function normalizeAppConfigJson(config) {
+	if (!config || typeof config !== "object" || Array.isArray(config)) return config;
+	const subPackages = Array.isArray(config.subPackages) ? config.subPackages : Array.isArray(config.subpackages) ? config.subpackages : [];
+	return {
+		...config,
+		subPackages: subPackages.map((subPackage) => ({
+			...subPackage,
+			pages: Array.isArray(subPackage?.pages) ? subPackage.pages : []
+		}))
+	};
+}
 function createJsonService(ctx) {
 	const cache = ctx.runtimeState.json.cache;
 	async function read(filepath) {
@@ -22172,6 +22393,7 @@ function createJsonService(ctx) {
 					if (tempFilepath !== filepath) await fs.remove(tempFilepath);
 				}
 			} else resultJson = parseCommentJson(await fs.readFile(filepath, "utf8"));
+			if (isAppConfig) resultJson = normalizeAppConfigJson(resultJson);
 			cache.set(filepath, resultJson);
 			return resultJson;
 		} catch (error) {
@@ -22521,6 +22743,13 @@ function mergeAutoRouteSubPackages(subPackages, routeSubPackages) {
 	if (!changed && anonymousEntries.length === 0) return existingEntries;
 	return [...merged.values(), ...anonymousEntries];
 }
+function normalizeAppConfigSubPackages(config) {
+	config.subPackages = (Array.isArray(config.subPackages) ? config.subPackages : Array.isArray(config.subpackages) ? config.subpackages : []).map((subPackage) => ({
+		...subPackage,
+		pages: Array.isArray(subPackage?.pages) ? subPackage.pages : []
+	}));
+	return config;
+}
 async function applyAutoRoutesToAppConfigIfNeeded(ctx, config) {
 	const autoRoutesService = ctx.autoRoutesService;
 	if (!autoRoutesService?.isEnabled()) return config;
@@ -22541,7 +22770,7 @@ async function applyAutoRoutesToAppConfigIfNeeded(ctx, config) {
 		...subPackage,
 		pages: Array.isArray(subPackage.pages) ? subPackage.pages : []
 	}));
-	return config;
+	return normalizeAppConfigSubPackages(config);
 }
 async function loadAppEntry(ctx, scanState) {
 	if (!ctx.configService || !ctx.jsonService) throw new Error("扫描入口前必须初始化 configService/jsonService。");
@@ -22556,7 +22785,7 @@ async function loadAppEntry(ctx, scanState) {
 	const vueAppPath = await findVueEntry(appBasename);
 	let configFromVue;
 	if (!appConfigFile && vueAppPath) {
-		const { extractConfigFromVue } = await import("./file-djYgQoCM.mjs");
+		const { extractConfigFromVue } = await import("./file-C0XHk9ks.mjs");
 		configFromVue = await extractConfigFromVue(vueAppPath);
 		if (configFromVue) appConfigFile = vueAppPath;
 	}
@@ -22578,6 +22807,7 @@ async function loadAppEntry(ctx, scanState) {
 		else config = await ctx.jsonService.read(appConfigFile);
 		await applyAutoRoutesToAppConfigIfNeeded(ctx, config);
 		if (isObject(config)) {
+			normalizeAppConfigSubPackages(config);
 			const resolvedAppEntry = {
 				path: appEntryPath || vueAppPath,
 				preludePath: appPreludePath,