weapp-vite 7.5.0 → 7.7.0

package/dist/{utils-CJSCgEj6.mjs → utils-CTGSZp4j.mjs}

@@ -1,19 +1,20 @@
-import { c as isSkippableResolvedId, i as normalizeRoot, l as normalizeFsResolvedId, s as toPosixPath } from "./path-doV773b7.mjs";
-import { S as shouldNormalizeUsingComponents, l as getProjectPlatformOptions, p as normalizePlatformNpmImportPath, v as shouldFillComponentGenericsDefault, x as shouldNormalizePlatformNpmImportPath } from "./platform-CnkySBKz.mjs";
-import { n as changeFileExtension } from "./file-sC3jD7Fh.mjs";
-import { i as scriptExtensions, s as vueExtensions } from "./constants-DEZdcsMn.mjs";
+import { n as normalizeFsResolvedId, t as isSkippableResolvedId } from "./resolvedId-DaxPh_yV.mjs";
+import { i as normalizeRoot, s as toPosixPath } from "./path-E1OjBJAl.mjs";
+import { S as shouldNormalizeUsingComponents, l as getProjectPlatformOptions, p as normalizePlatformNpmImportPath, v as shouldFillComponentGenericsDefault, x as shouldNormalizePlatformNpmImportPath } from "./platform-BiMpsZIb.mjs";
+import { o as changeFileExtension } from "./file-D8mp5GmB.mjs";
+import { i as scriptExtensions, s as vueExtensions } from "./constants-BOe8mgqL.mjs";
 import "./logger-DGn5iEVN.mjs";
+import { n as loadHostRolldownBuild } from "./engine-Mnnm_ALP.mjs";
 import { createRequire } from "node:module";
 import process from "node:process";
 import path from "pathe";
 import { existsSync, readFileSync } from "node:fs";
-import { pathToFileURL } from "node:url";
 import path$1 from "node:path";
 import { defuOverrideArray, get, isObject, removeExtensionDeep, set } from "@weapp-core/shared";
 import { parse, stringify } from "comment-json";
 import { fs as fs$1 } from "@weapp-core/shared/fs";
 import { parseJsLikeWithEngine } from "@weapp-vite/ast";
-import { BABEL_TS_MODULE_PARSER_OPTIONS as BABEL_TS_MODULE_PARSER_OPTIONS$1, generate as generate$1, parse as parse$2, parseJsLike as parseJsLike$1, traverse as traverse$1 } from "@weapp-vite/ast/babel";
+import { BABEL_TS_MODULE_PARSER_OPTIONS as BABEL_TS_MODULE_PARSER_OPTIONS$1, generate as generate$1, getVisitorKeys, parse as parse$2, parseJsLike as parseJsLike$1, traverse as traverse$1 } from "@weapp-vite/ast/babel";
 import picomatch from "picomatch";
 import { invalidateFileCache, pathExists, readFile as readFile$2 } from "wevu/compiler";
 import fs$2, { readFile as readFile$1, readdir, realpath, unlink } from "node:fs/promises";
@@ -21,7 +22,7 @@ import { loadConfigFromFile } from "vite";
 import "semver/functions/gte.js";
 import "semver/functions/satisfies.js";
 import "semver/functions/valid.js";
-//#region src/utils/npmImport.ts
+// src/utils/npmImport.ts
 const WINDOWS_PATH_SEPARATORS_RE = /\\/g;
 const WINDOWS_ABSOLUTE_PATH_RE = /^[a-z]:[\\/]/i;
 const NPM_PROTOCOL_RE = /^npm:/;
@@ -148,8 +149,7 @@ function normalizeNpmImportPathByPlatform(importee, options) {
 	const normalized = trimmed.replace(NPM_PROTOCOL_RE, "");
 	return normalizePlatformNpmImportPath(options.platform, normalized, { alipayNpmMode: options.alipayNpmMode });
 }
-//#endregion
-//#region src/utils/json.ts
+// src/utils/json.ts
 const ALIPAY_GENERIC_COMPONENT_PLACEHOLDER = "./__weapp_vite_generic_component";
 const WEAPP_SCOPED_SLOT_GENERIC_COMPONENT_PLACEHOLDER = "./__weapp_vite_scoped_slot_generic_component";
 const JSON_FILE_JS_EXTENSION_RE = /\.[jt]s$/;
@@ -291,8 +291,7 @@ function getPathExistsTtlMs(config) {
 function getReadFileCheckMtime(config) {
 	return Boolean(config?.isDev);
 }
-//#endregion
-//#region src/utils/configErrors.ts
+// src/utils/configErrors.ts
 const CJS_ERROR_PATTERNS = [
 	"__dirname is not defined",
 	"__filename is not defined",
@@ -330,8 +329,7 @@ function createCjsConfigLoadError(options) {
 	if (options.error instanceof Error) error.cause = options.error;
 	return error;
 }
-//#endregion
-//#region src/utils/entryResolve.ts
+// src/utils/entryResolve.ts
 function buildCandidates(base, extensions) {
 	return extensions.map((ext) => changeFileExtension(base, ext));
 }
@@ -372,8 +370,7 @@ async function resolveEntryPath(input, options) {
 	const extensions = resolveEntryExtensions(kind, isDir);
 	for (const candidate of buildCandidates(base, extensions)) if (await exists(candidate)) return candidate;
 }
-//#endregion
-//#region src/utils/loadViteConfigFile.ts
+// src/utils/loadViteConfigFile.ts
 const DEFAULT_VITE_CONFIG_FILES = [
 	"vite.config.ts",
 	"vite.config.mts",
@@ -423,8 +420,7 @@ async function loadViteConfigFile(configEnv, configFile, configRoot, configFileD
 	const resolvedConfigLoader = configLoader ?? "bundle";
 	return withSuppressedWarningCodes(suppressedWarningCodes, () => loadConfigFromFile(configEnv, resolvedConfigFile, configRoot, logLevel, void 0, resolvedConfigLoader));
 }
-//#endregion
-//#region src/utils/preloadScan.ts
+// src/utils/preloadScan.ts
 const HOST_ROUTER_METHODS = /* @__PURE__ */ new Set([
 	"navigateTo",
 	"redirectTo",
@@ -555,8 +551,7 @@ function collectTemplateTargets(source, sourcePage) {
 function collectStaticRouteTargets(source, kind, sourcePage) {
 	return kind === "template" ? collectTemplateTargets(source, sourcePage) : collectScriptTargets(source, sourcePage);
 }
-//#endregion
-//#region src/utils/preloadRule.ts
+// src/utils/preloadRule.ts
 const PRELOAD_RULE_GLOB_RE = /[*?[\]{}()!+@]/g;
 function normalizePagePath(value) {
 	return normalizeRoot(value).replace(/^\/+/, "");
@@ -714,8 +709,7 @@ function suggestPreloadRules(appJson, pageSources) {
 		uncovered: [...uncovered]
 	};
 }
-//#endregion
-//#region src/plugins/asset/prune.ts
+// src/plugins/asset/prune.ts
 /** 成功写出后仅撤销上一轮持有的文件，不清空目录，也不越过输出根内的符号链接。 */
 async function pruneOwnedAssetFiles(outDir, fileNames) {
 	const root = path$1.resolve(outDir);
@@ -743,58 +737,7 @@ async function pruneOwnedAssetFiles(outDir, fileNames) {
 		if (error.code !== "ENOENT") throw error;
 	}
 }
-//#endregion
-//#region src/runtime/viteHost/engine.ts
-function readIdentity(file) {
-	const value = JSON.parse(readFileSync(file, "utf8"));
-	if (!value || typeof value !== "object" || !("name" in value) || typeof value.name !== "string" || !("version" in value) || typeof value.version !== "string") throw new Error("[weapp-vite] Vite 宿主 package.json 缺少 name/version。");
-	return {
-		name: value.name,
-		version: value.version
-	};
-}
-/** 按宿主的真实导出解析引擎，不依赖扁平 node_modules 布局或版本号相等。 */
-function resolveViteHost(importer = import.meta.url) {
-	const packagePath = createRequire(importer).resolve("vite/package.json");
-	const identity = readIdentity(packagePath);
-	const hostRequire = createRequire(packagePath);
-	if (identity.name === "@voidzero-dev/vite-plus-core") return {
-		kind: "vite-plus",
-		packagePath,
-		packageVersion: identity.version,
-		experimentalPath: hostRequire.resolve("@voidzero-dev/vite-plus-core/rolldown/experimental")
-	};
-	if (identity.name !== "vite") throw new Error(`[weapp-vite] 不支持的 Vite 宿主：${identity.name}@${identity.version}。`);
-	return {
-		kind: "vite",
-		packagePath,
-		packageVersion: identity.version,
-		experimentalPath: hostRequire.resolve("rolldown/experimental")
-	};
-}
-/** 加载与宿主绑定的引擎；缺失能力时保留原始错误，禁止回退到另一套引擎。 */
-async function loadHostRolldown(importer) {
-	let identity;
-	try {
-		identity = resolveViteHost(importer);
-		const runtime = await import(pathToFileURL(identity.experimentalPath).href);
-		if (typeof runtime.dev !== "function" || typeof runtime.scan !== "function") throw new TypeError("Rolldown 缺少 dev/scan 能力");
-		return runtime;
-	} catch (cause) {
-		const host = identity ? `${identity.kind}@${identity.packageVersion}` : "vite";
-		throw new Error(`[weapp-vite] 无法加载 ${host} 配套的 Rolldown；请检查宿主依赖和 Vite+ alias 配置。`, { cause });
-	}
-}
-/** 原生输出写出也绑定宿主引擎，避免 Vite+ 额外加载包内另一套 Rolldown。 */
-async function loadHostRolldownBuild(importer) {
-	const identity = resolveViteHost(importer);
-	const entry = createRequire(identity.packagePath).resolve(identity.kind === "vite-plus" ? "@voidzero-dev/vite-plus-core/rolldown" : "rolldown");
-	const runtime = await import(pathToFileURL(entry).href);
-	if (typeof runtime.rolldown !== "function") throw new TypeError(`[weapp-vite] ${identity.kind}@${identity.packageVersion} 缺少 Rolldown 原生写出能力。`);
-	return runtime;
-}
-//#endregion
-//#region src/utils/projectConfigOutput.ts
+// src/utils/projectConfigOutput.ts
 /** 平台项目目录独立发布，禁止覆盖由主编译持有的小程序目录。 */
 async function collectProjectConfigAssets(sourceDir, outputRoot, outDir, watch) {
 	const assets = [];
@@ -852,15 +795,14 @@ async function publishProjectConfigAssets(outputRoot, assets, previous = /* @__P
 	}
 	return current;
 }
-//#endregion
-//#region src/utils/projectConfig.ts
-async function readProjectConfigFile(filePath, required) {
+// src/utils/projectConfig.ts
+async function readProjectConfigFile(filePath, required, readFile) {
 	if (!await fs$1.pathExists(filePath)) {
 		if (required) throw new Error(`找不到项目配置文件：${filePath}`);
 		return {};
 	}
 	try {
-		return await fs$1.readJson(filePath) || {};
+		return readFile ? JSON.parse((await readFile(filePath)).replace(/^\uFEFF/, "")) || {} : await fs$1.readJson(filePath) || {};
 	} catch {
 		throw new Error(`解析 json 格式失败, ${filePath} 为非法的 json 格式`);
 	}
@@ -885,23 +827,12 @@ function resolveProjectConfigRoot(projectConfig, platform) {
 async function getProjectConfig(root, options) {
 	const baseJsonPath = path.resolve(root, options?.basePath ?? "project.config.json");
 	const privateJsonPath = path.resolve(root, options?.privatePath ?? "project.private.config.json");
-	const baseJson = await readProjectConfigFile(baseJsonPath, true);
-	const privateJson = options?.ignorePrivate ? {} : await readProjectConfigFile(privateJsonPath, false);
+	const baseJson = await readProjectConfigFile(baseJsonPath, true, options?.readFile);
+	const privateJson = options?.ignorePrivate ? {} : await readProjectConfigFile(privateJsonPath, false, options?.readFile);
 	return defuOverrideArray(privateJson, baseJson);
 }
 async function getProjectPrivateConfig(root, options) {
-	return await readProjectConfigFile(path.resolve(root, options?.privatePath ?? "project.private.config.json"), false);
-}
-async function disableProjectPrivateConfigHotReload(filePath) {
-	const config = await readProjectConfigFile(filePath, true);
-	const setting = config.setting && typeof config.setting === "object" && !Array.isArray(config.setting) ? config.setting : {};
-	if (setting.compileHotReLoad === false) return false;
-	config.setting = {
-		...setting,
-		compileHotReLoad: false
-	};
-	await fs$1.writeFile(filePath, `${JSON.stringify(config, null, 2)}\n`, "utf8");
-	return true;
+	return await readProjectConfigFile(path.resolve(root, options?.privatePath ?? "project.private.config.json"), false, options?.readFile);
 }
 function resolveProjectConfigSyncDirs(options) {
 	const outputRoot = path.dirname(options.outDir);
@@ -928,13 +859,10 @@ async function syncProjectConfigToOutput(options) {
 	const assets = await collectProjectConfigAssets(syncDirs.sourceDir, syncDirs.outputRoot, options.outDir);
 	await publishProjectConfigAssets(syncDirs.outputRoot, assets);
 }
-//#endregion
-//#region src/utils/reExport.ts
-function getExportedName(spec) {
-	const exported = spec?.exported;
-	if (!exported) return;
-	if (exported.type === "Identifier") return exported.name;
-	if (exported.type === "StringLiteral") return exported.value;
+// src/utils/reExport.ts
+function getSpecifierName(name) {
+	if (name?.type === "Identifier") return name.name;
+	if (name?.type === "StringLiteral" || name?.type === "Literal") return name.value;
 }
 function getSourceValue(node) {
 	const source = node?.source;
@@ -951,68 +879,69 @@ function parseModuleForReExport(code, astEngine) {
 	});
 	return parse$2(code, BABEL_TS_MODULE_PARSER_OPTIONS$1).program;
 }
-async function resolveReExportedInternal(exporterFile, exportName, depth, visited, options) {
-	if (depth <= 0) return;
-	if (visited.has(exporterFile)) return;
-	visited.add(exporterFile);
+async function readReExportFacts(exporterFile, options) {
 	const cacheKey = getReExportCacheKey(exporterFile, options.astEngine);
-	let entry = options.cache.get(cacheKey);
-	if (!entry) {
-		entry = /* @__PURE__ */ new Map();
-		options.cache.set(cacheKey, entry);
-	}
-	if (entry.has(exportName)) return entry.get(exportName);
-	let code;
+	let source;
 	try {
-		code = await options.readFile(exporterFile);
+		source = await options.readFile(exporterFile);
 	} catch {
-		entry.set(exportName, void 0);
+		options.cache.delete(cacheKey);
 		return;
 	}
-	let ast;
+	const cached = options.cache.get(cacheKey);
+	if (cached?.source === source) return cached;
+	const facts = {
+		source,
+		named: /* @__PURE__ */ new Map(),
+		exportAll: []
+	};
 	try {
-		ast = parseModuleForReExport(code, options.astEngine);
-	} catch {
-		entry.set(exportName, void 0);
-		return;
-	}
-	const exportAllSources = [];
-	for (const node of ast.body ?? []) {
-		if (node?.type === "ExportNamedDeclaration") {
+		const ast = parseModuleForReExport(source, options.astEngine);
+		for (const node of ast.body) {
 			const source = getSourceValue(node);
 			if (!source) continue;
-			for (const spec of node.specifiers ?? []) {
+			if (node?.type === "ExportNamedDeclaration") for (const spec of node.specifiers ?? []) {
 				if (spec?.type !== "ExportSpecifier") continue;
-				const exportedName = getExportedName(spec);
-				if (!exportedName || exportedName !== exportName) continue;
-				const resolved = await options.resolveId(source, exporterFile);
-				if (resolved) {
-					entry.set(exportName, resolved);
-					return resolved;
-				}
+				const name = getSpecifierName(spec.exported);
+				const imported = getSpecifierName(spec.local);
+				if (name && imported) facts.named.set(name, {
+					source,
+					imported
+				});
 			}
+			else if (node?.type === "ExportAllDeclaration") facts.exportAll.push(source);
 		}
-		if (node?.type === "ExportAllDeclaration") {
-			const source = getSourceValue(node);
-			if (source) exportAllSources.push(source);
+	} catch {}
+	options.cache.set(cacheKey, facts);
+	return facts;
+}
+async function resolveReExportedInternal(exporterFile, exportName, depth, visited, options) {
+	const key = `${exporterFile}\0${exportName}`;
+	if (depth <= 0 || (visited.get(key) ?? 0) >= depth) return;
+	visited.set(key, depth);
+	const facts = await readReExportFacts(exporterFile, options);
+	if (!facts) return;
+	const binding = facts.named.get(exportName);
+	if (binding) {
+		const resolved = await options.resolveId(binding.source, exporterFile);
+		if (!resolved) return;
+		if (binding.imported !== "default") return resolveReExportedInternal(resolved, binding.imported, depth - 1, visited, options);
+		if (/\.(?:[cm]?ts|[cm]?js)$/.test(resolved)) {
+			if ((await readReExportFacts(resolved, options))?.named.has("default")) return resolveReExportedInternal(resolved, "default", depth - 1, visited, options);
 		}
+		return resolved;
 	}
-	for (const source of exportAllSources) {
+	for (const source of facts.exportAll) {
 		const hopId = await options.resolveId(source, exporterFile);
 		if (!hopId) continue;
 		const nested = await resolveReExportedInternal(hopId, exportName, depth - 1, visited, options);
-		if (nested) {
-			entry.set(exportName, nested);
-			return nested;
-		}
+		if (nested) return nested;
 	}
-	entry.set(exportName, void 0);
 }
 async function resolveReExportedName(exporterFile, exportName, options) {
-	return resolveReExportedInternal(exporterFile, exportName, options.maxDepth ?? 4, /* @__PURE__ */ new Set(), options);
+	return resolveReExportedInternal(exporterFile, exportName, options.maxDepth ?? 4, /* @__PURE__ */ new Map(), options);
 }
-//#endregion
-//#region src/utils/toAbsoluteId.ts
+// src/utils/toAbsoluteId.ts
 function resolveAbsoluteIdBaseDir(configService, importer, options) {
 	const cleanImporter = importer ? normalizeFsResolvedId(importer) : void 0;
 	if (cleanImporter && !isSkippableResolvedId(cleanImporter) && path.isAbsolute(cleanImporter)) return path.dirname(cleanImporter);
@@ -1035,8 +964,7 @@ function toAbsoluteId(id, configService, importer, options) {
 	const baseDir = resolveAbsoluteIdBaseDir(configService, importer, options);
 	return path.resolve(baseDir, cleanId);
 }
-//#endregion
-//#region src/utils/usingComponentFrom.ts
+// src/utils/usingComponentFrom.ts
 function shouldResolveUsingComponentFrom(normalizedResolvedFile) {
 	return Boolean(normalizedResolvedFile && !isSkippableResolvedId(normalizedResolvedFile) && path.isAbsolute(normalizedResolvedFile));
 }
@@ -1049,8 +977,7 @@ function usingComponentFromResolvedFile(resolvedFile, configService) {
 	if (!relative || relative.startsWith("..")) return;
 	return `/${toPosixPath(relative)}`;
 }
-//#endregion
-//#region src/utils/weappConfig.ts
+// src/utils/weappConfig.ts
 const WEAPP_VITE_CONFIG_CANDIDATES = [
 	"weapp-vite.config.ts",
 	"weapp-vite.config.mts",
@@ -1090,5 +1017,4 @@ async function resolveWeappConfigFile(options) {
 	}
 	return findWeappConfigInDirectory(root);
 }
-//#endregion
-export { parseNpmPackageSpecifier as $, pathExists as A, ALIPAY_GENERIC_COMPONENT_PLACEHOLDER as B, resolvePreloadPackageIdentifier as C, createCachedEntryResolveOptions as D, loadViteConfigFile as E, BABEL_TS_MODULE_PARSER_OPTIONS$1 as F, normalizeAppJson as G, getAliasEntries as H, generate$1 as I, resolveJson as J, parseCommentJson as K, parse$2 as L, createCjsConfigLoadError as M, getPathExistsTtlMs as N, resolveEntryPath as O, getReadFileCheckMtime as P, normalizeNpmImportPathByPlatform as Q, parseJsLike$1 as R, findPreloadRuleKey as S, TYPELESS_PACKAGE_JSON_WARNING_CODE as T, jsonFileRemoveJsExtension as U, WEAPP_SCOPED_SLOT_GENERIC_COMPONENT_PLACEHOLDER as V, matches as W, hasNpmDependencyPrefix as X, toKebabCaseComponentName as Y, normalizeNpmImportLookupPath as Z, loadHostRolldown as _, resolveReExportedName as a, applyPreloadRulesToAppJson as b, getProjectConfigFileName as c, getProjectPrivateConfigFileName as d, resolveNpmDependencyId as et, resolveProjectConfigRoot as f, publishProjectConfigAssets as g, collectProjectConfigAssets as h, toAbsoluteId as i, readFile$2 as j, invalidateFileCache as k, getProjectConfigRootKeys as l, syncProjectConfigToOutput as m, shouldResolveUsingComponentFrom as n, disableProjectPrivateConfigHotReload as o, resolveProjectConfigSyncDirs as p, resolveImportee as q, usingComponentFromResolvedFile as r, getProjectConfig as s, resolveWeappConfigFile as t, getProjectPrivateConfig as u, loadHostRolldownBuild as v, suggestPreloadRules as w, collectPreloadPages as x, pruneOwnedAssetFiles as y, traverse$1 as z };
+export { resolveNpmDependencyId as $, createCjsConfigLoadError as A, WEAPP_SCOPED_SLOT_GENERIC_COMPONENT_PLACEHOLDER as B, loadViteConfigFile as C, invalidateFileCache as D, resolveEntryPath as E, getVisitorKeys as F, parseCommentJson as G, jsonFileRemoveJsExtension as H, parse$2 as I, toKebabCaseComponentName as J, resolveImportee as K, parseJsLike$1 as L, getReadFileCheckMtime as M, BABEL_TS_MODULE_PARSER_OPTIONS$1 as N, pathExists as O, generate$1 as P, parseNpmPackageSpecifier as Q, traverse$1 as R, TYPELESS_PACKAGE_JSON_WARNING_CODE as S, resolveEntryExtensions as T, matches as U, getAliasEntries as V, normalizeAppJson as W, normalizeNpmImportLookupPath as X, hasNpmDependencyPrefix as Y, normalizeNpmImportPathByPlatform as Z, applyPreloadRulesToAppJson as _, resolveReExportedName as a, resolvePreloadPackageIdentifier as b, getProjectConfigRootKeys as c, resolveProjectConfigRoot as d, resolveProjectConfigSyncDirs as f, pruneOwnedAssetFiles as g, publishProjectConfigAssets as h, toAbsoluteId as i, getPathExistsTtlMs as j, readFile$2 as k, getProjectPrivateConfig as l, collectProjectConfigAssets as m, shouldResolveUsingComponentFrom as n, getProjectConfig as o, syncProjectConfigToOutput as p, resolveJson as q, usingComponentFromResolvedFile as r, getProjectConfigFileName as s, resolveWeappConfigFile as t, getProjectPrivateConfigFileName as u, collectPreloadPages as v, createCachedEntryResolveOptions as w, suggestPreloadRules as x, findPreloadRuleKey as y, ALIPAY_GENERIC_COMPONENT_PLACEHOLDER as z };

package/dist/vite.d.mts

@@ -1,9 +1,7 @@
-import "./config-V0L-IAJf.mjs";
+import "./config-BNx2BODw.mjs";
 import { ConfigEnv, Plugin } from "vite";
-//#region src/vite/index.d.ts
 /** 通过顶层 weapp 配置激活标准 Vite 小程序编译。 */
 export declare function weapp(): Plugin[];
 declare module 'vite' {
   function defineConfig<T extends (env: ConfigEnv) => UserConfig | Promise<UserConfig>>(config: T): T;
-}
-//#endregion
+}

package/dist/vite.mjs

@@ -1,8 +1,32 @@
-import { i as isWeappViteHost } from "./pluginHost--CaeyWpA.mjs";
-import { t as bindHostLifecycle } from "./lifecycle-BROTlwSL.mjs";
+import { i as isWeappViteHost } from "./pluginHost-vn8Vty1J.mjs";
+import { i as takeHostLifecycle, n as setHostRestartData, r as takeHostConfigRestartData, t as bindHostLifecycle } from "./lifecycle-CUo8PMQc.mjs";
 import process from "node:process";
+import { WEAPP_VITE_HMR_RUNTIME_SESSION_HANDOFF_KEY } from "@weapp-core/constants";
 import path from "pathe";
-//#region src/vite/environment.ts
+// src/vite/classicFallback.ts
+/** 停止失败的宿主时同时保留原始错误与清理错误。 */
+async function rethrowAfterHostCleanup(error, cleanup) {
+	try {
+		await cleanup();
+	} catch (cleanupError) {
+		if (cleanupError === error) throw error;
+		throw new AggregateError([error, cleanupError], "Host operation and cleanup failed", { cause: error });
+	}
+	throw error;
+}
+/** 通过公共宿主重启交接到 classic，当前构建只发布请求，不等待关闭自己。 */
+function bindClassicFallback(server, runtime) {
+	return runtime.bindRequest(async () => {
+		try {
+			await server.restart();
+		} catch (error) {
+			const failure = error instanceof Error ? error : new Error(String(error));
+			server.config.logger.error("[weapp-vite] classic 回退失败，开发会话已停止。", { error: failure });
+			await rethrowAfterHostCleanup(failure, () => server.close());
+		}
+	});
+}
+// src/vite/environment.ts
 /** 环境钩子捕获本轮会话，旧环境关闭不能清理重启后的新会话。 */
 function createSessionEnvironmentPlugin(session, serve) {
 	return {
@@ -53,12 +77,12 @@ function createSessionEnvironmentPlugin(session, serve) {
 			}
 		},
 		async closeWatcher() {
-			await session.close();
+			if (serve) await session.closeHostGeneration("close");
+			else await session.close();
 		}
 	};
 }
-//#endregion
-//#region src/vite/options.ts
+// src/vite/options.ts
 async function resolvePlugins(options) {
 	const result = [];
 	for (const option of options ?? []) {
@@ -68,8 +92,7 @@ async function resolvePlugins(options) {
 	}
 	return result;
 }
-//#endregion
-//#region src/vite/slots.ts
+// src/vite/slots.ts
 const descriptors = [
 	["weapp-vite:runtime-provider:web-runtime", "pre"],
 	["@weapp-vite/web", "pre"],
@@ -164,15 +187,16 @@ function createPluginSlots(apply) {
 		}
 	};
 }
-//#endregion
-//#region src/vite/index.ts
+// src/vite/index.ts
 const PLUGIN_NAME = "weapp-vite:host";
+const hmrRuntimeSessionKey = Symbol.for(WEAPP_VITE_HMR_RUNTIME_SESSION_HANDOFF_KEY);
 /** 通过顶层 weapp 配置激活标准 Vite 小程序编译。 */
 function weapp() {
 	let session;
 	let initializing = false;
 	let inactive = false;
 	let serveRequested = false;
+	let inheritedLifecycle;
 	const apply = (config) => !isWeappViteHost(config);
 	const slots = createPluginSlots(apply);
 	const coordinator = {
@@ -185,6 +209,7 @@ function weapp() {
 				if (initializing || session && session.state !== "closed") throw new Error("[weapp-vite] 同一插件实例不能被多个活动宿主复用，请为每个宿主调用 weapp()。");
 				initializing = true;
 				try {
+					inheritedLifecycle = takeHostLifecycle(config);
 					session = void 0;
 					serveRequested = false;
 					slots.bind([]);
@@ -200,10 +225,17 @@ function weapp() {
 						...config,
 						plugins: serveRequested ? userPlugins : []
 					};
-					const { WeappBuildSession } = await import("./session-PskhD-nZ.mjs");
-					session = new WeappBuildSession();
+					const { WeappBuildSession } = await import("./session-COrQJYif.mjs");
+					session = new WeappBuildSession(takeHostConfigRestartData(inheritedLifecycle, hmrRuntimeSessionKey));
 					try {
-						const merged = await session.prepare(hostConfig, path.resolve(config.root ?? process.cwd()), env.mode, serveRequested);
+						const fallbackBeforePrepare = session.hmrRuntimeSession.fallback;
+						let merged = await session.prepare(hostConfig, path.resolve(config.root ?? process.cwd()), env.mode, serveRequested);
+						if (session.hmrRuntimeSession.phase === "switching" && session.hmrRuntimeSession.fallback !== fallbackBeforePrepare) {
+							const runtime = session.hmrRuntimeSession;
+							await session.close("restart");
+							session = new WeappBuildSession(runtime);
+							merged = await session.prepare(hostConfig, path.resolve(config.root ?? process.cwd()), env.mode, serveRequested);
+						}
 						session.context.configService.options.sourceConfig = {
 							...hostConfig,
 							root: session.context.configService.cwd,
@@ -216,8 +248,8 @@ function weapp() {
 							return normalized;
 						}
 						if (serveRequested) {
-							const { prepareDevHostConfig } = await import("./dev-fR5GiJRO.mjs");
-							if (!session.statefulController && config.experimental?.bundledDev) throw new Error("[weapp-vite] classic 开发模式暂不支持 experimental.bundledDev，请关闭此选项。");
+							const { prepareDevHostConfig } = await import("./dev-D1QSExwk.mjs");
+							if (!session.statefulController && config.experimental?.bundledDev && !session.hmrRuntimeSession.fallback) throw new Error("[weapp-vite] classic 开发模式暂不支持 experimental.bundledDev，请关闭此选项。");
 							const host = prepareDevHostConfig(session, merged, config);
 							slots.bind((await resolvePlugins(host.plugins)).filter((plugin) => !configuredPlugins.includes(plugin)));
 							return host.config;
@@ -228,8 +260,7 @@ function weapp() {
 						if (normalized.build) normalized.build.emptyOutDir = config.build?.emptyOutDir;
 						return normalized;
 					} catch (error) {
-						await session.close().catch(() => {});
-						throw error;
+						return await rethrowAfterHostCleanup(error, () => session.close(inheritedLifecycle ? "restart" : "close"));
 					}
 				} finally {
 					initializing = false;
@@ -247,13 +278,17 @@ function weapp() {
 					return result;
 				};
 			}
-			bindHostLifecycle(server, () => active.close());
+			bindHostLifecycle(server, (reason) => active.closeHostGeneration(reason), inheritedLifecycle, () => active.hmrRuntimeSession.phase === "switching", () => active.releaseHostClassicIdeConfig());
+			inheritedLifecycle = void 0;
 			try {
+				await setHostRestartData(server, hmrRuntimeSessionKey, active.hmrRuntimeSession);
 				await active.startDev(server);
 			} catch (error) {
-				await server.close().catch(() => {});
-				throw error;
+				return await rethrowAfterHostCleanup(error, () => server.close());
 			}
+			return () => {
+				if (!active.isClosing) active.onClose(bindClassicFallback(server, active.hmrRuntimeSession));
+			};
 		},
 		configResolved(config) {
 			if (inactive || !session) return;
@@ -266,5 +301,4 @@ function weapp() {
 	};
 	return [coordinator, ...slots.plugins];
 }
-//#endregion
 export { weapp };

package/dist/volar.mjs

@@ -1,5 +1,4 @@
 import plugin from "@weapp-vite/volar";
-//#region src/volar.ts
+// src/volar.ts
 var volar_default = plugin;
-//#endregion
 export { volar_default as default };

package/dist/{wevu-BQWUU7br.mjs → wevu-BaihCXO9.mjs}

@@ -1,5 +1,5 @@
 import { WEVU_DEFINE_PAGE_MACRO, WEVU_ROUTER_MODULE_ID } from "@weapp-core/constants";
-//#region src/auto-import-presets/wevu.ts
+// src/auto-import-presets/wevu.ts
 const wevu = {
 	wevu: [
 		"createApp",
@@ -138,5 +138,4 @@ const wevu = {
 	],
 	[WEVU_ROUTER_MODULE_ID]: [WEVU_DEFINE_PAGE_MACRO]
 };
-//#endregion
 export { wevu as t };

package/dist/wevu-DTtSOyxB.d.mts

@@ -0,0 +1,3 @@
+type ImportsMap = Record<string, string[]>;
+declare const wevu: ImportsMap;
+export { wevu as t };

package/dist/{wevu-router-Dg1LnBlg.mjs → wevu-router-BIoxDbnu.mjs}

@@ -1,5 +1,5 @@
 import { WEVU_DEFINE_PAGE_MACRO, WEVU_ROUTER_MODULE_ID } from "@weapp-core/constants";
-//#region src/auto-import-presets/wevu-router.ts
+// src/auto-import-presets/wevu-router.ts
 const wevuRouter = { [WEVU_ROUTER_MODULE_ID]: [
 	WEVU_DEFINE_PAGE_MACRO,
 	"createRouter",
@@ -13,5 +13,4 @@ const wevuRouter = { [WEVU_ROUTER_MODULE_ID]: [
 	"createNavigationFailure",
 	"isNavigationFailure"
 ] };
-//#endregion
 export { wevuRouter as t };

package/dist/wevu-router-CdWurGQ4.d.mts

@@ -0,0 +1,3 @@
+type ImportsMap = Record<string, string[]>;
+declare const wevuRouter: ImportsMap;
+export { wevuRouter as t };

package/dist/wxs-7V7MPzeW.mjs

@@ -0,0 +1 @@
+export { t as transformWxsCode } from "./wxs-BdHHXltv.mjs";