weapp-vite 6.10.0 → 6.10.2

package/dist/auto-routes.mjs

@@ -1,6 +1,6 @@
-import { n as getCompilerContext } from "./createContext-B7PguO6M.mjs";
+import { n as getCompilerContext } from "./createContext-Dzy3vlIP.mjs";
 import "./logger-gutcwWKE.mjs";
-import "./file-arCdbPgR.mjs";
+import "./file-DLpJ9tlX.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 { a as DEFAULT_MP_PLATFORM, c as createSharedBuildConfig, d as checkRuntime, f as getProjectConfigFileName, i as formatBytes, l as SHARED_CHUNK_VIRTUAL_PREFIX, m as isPathInside, o as normalizeMiniPlatform, p as createCjsConfigLoadError, s as resolveMiniPlatform, t as createCompilerContext, u as resolveWeappConfigFile } from "./createContext-B7PguO6M.mjs";
+import { a as DEFAULT_MP_PLATFORM, c as createSharedBuildConfig, d as checkRuntime, f as getProjectConfigFileName, i as formatBytes, l as SHARED_CHUNK_VIRTUAL_PREFIX, m as isPathInside, o as normalizeMiniPlatform, p as createCjsConfigLoadError, s as resolveMiniPlatform, t as createCompilerContext, u as resolveWeappConfigFile } from "./createContext-Dzy3vlIP.mjs";
 import { r as logger_default, t as colors } from "./logger-gutcwWKE.mjs";
-import { f as VERSION } from "./file-arCdbPgR.mjs";
+import { f as VERSION } from "./file-DLpJ9tlX.mjs";
 import { resolveWeappMcpConfig, startWeappViteMcpServer } from "./mcp.mjs";
 import { defu } from "@weapp-core/shared";
 import path, { posix } from "pathe";

package/dist/{createContext-B7PguO6M.mjs → createContext-Dzy3vlIP.mjs}

@@ -1,7 +1,7 @@
 import { t as __exportAll } from "./rolldown-runtime-twds-ZHy.mjs";
 import { n as applyWeappViteHostMeta } from "./pluginHost-SJdl15d3.mjs";
 import { n as configureLogger, r as logger_default } from "./logger-gutcwWKE.mjs";
-import { _ as vueExtensions, a as findJsEntry, c as findVueEntry, d as touch, g as templateExtensions, h as supportedCssLangs, i as findCssEntry, l as isJsOrTs, m as jsExtensions, n as extractConfigFromVue, o as findJsonEntry, p as configExtensions, s as findTemplateEntry, t as changeFileExtension, u as isTemplate } from "./file-arCdbPgR.mjs";
+import { _ as vueExtensions, a as findJsEntry, c as findVueEntry, d as touch, g as templateExtensions, h as supportedCssLangs, i as findCssEntry, l as isJsOrTs, m as jsExtensions, n as extractConfigFromVue, o as findJsonEntry, p as configExtensions, s as findTemplateEntry, t as changeFileExtension, u as isTemplate } from "./file-DLpJ9tlX.mjs";
 import { createRequire, isBuiltin } from "node:module";
 import { addExtension, defu, get, isEmptyObject, isObject, objectHash, removeExtension, removeExtensionDeep, set } from "@weapp-core/shared";
 import { LRUCache } from "lru-cache";
@@ -9382,9 +9382,9 @@ function prepareNormalizedEntries(options) {
 	return normalizedEntries;
 }
 async function emitEntryOutput(options) {
-	const { pluginCtx, id, type, json, jsonPath, isPluginBuild, normalizedEntries, pluginResolvedRecords, pluginJsonPathForRegistration, pluginJsonForRegistration, resolveEntriesWithCache, configService, resolvedEntryMap, loadedEntrySet, dirtyEntrySet, emitEntriesChunks, registerJsonAsset, existsCache, pathExistsTtlMs, debug, relativeCwdId, getTime } = options;
+	const { pluginCtx, id, type, json, jsonPath, isPluginBuild, normalizedEntries, pluginResolvedRecords, pluginJsonPathForRegistration, pluginJsonForRegistration, resolveEntriesWithCache, entryResolveRoot, configService, resolvedEntryMap, loadedEntrySet, dirtyEntrySet, emitEntriesChunks, registerJsonAsset, existsCache, pathExistsTtlMs, debug, relativeCwdId, getTime } = options;
 	const shouldSkipEntries = Boolean(options.skipEntries);
-	const resolvedIds = shouldSkipEntries ? [] : normalizedEntries.length ? await resolveEntriesWithCache(pluginCtx, normalizedEntries, configService.absoluteSrcRoot) : [];
+	const resolvedIds = shouldSkipEntries ? [] : normalizedEntries.length ? await resolveEntriesWithCache(pluginCtx, normalizedEntries, entryResolveRoot) : [];
 	debug?.(`resolvedIds ${relativeCwdId} 耗时 ${getTime()}`);
 	const pendingResolvedIds = [];
 	const combinedResolved = shouldSkipEntries ? [] : pluginResolvedRecords ? isPluginBuild ? pluginResolvedRecords : [...resolvedIds, ...pluginResolvedRecords] : resolvedIds;
@@ -9684,6 +9684,7 @@ function createEntryLoader(options) {
 			extendedLibManager,
 			entryType: entryTypeOverride
 		});
+		const entryResolveRoot = isPluginBuild && configService.absolutePluginRoot && isPathInside(configService.absolutePluginRoot, id) ? configService.absolutePluginRoot : configService.absoluteSrcRoot;
 		const result = await emitEntryOutput({
 			pluginCtx: this,
 			id,
@@ -9696,6 +9697,7 @@ function createEntryLoader(options) {
 			pluginJsonPathForRegistration,
 			pluginJsonForRegistration,
 			resolveEntriesWithCache: entryResolver.resolveEntriesWithCache,
+			entryResolveRoot,
 			configService,
 			resolvedEntryMap,
 			loadedEntrySet,
@@ -9773,6 +9775,7 @@ function useLoadEntry(ctx, options) {
 	const entriesMap = /* @__PURE__ */ new Map();
 	const loadedEntrySet = /* @__PURE__ */ new Set();
 	const dirtyEntrySet = /* @__PURE__ */ new Set();
+	const dirtyEntryReasons = /* @__PURE__ */ new Map();
 	const resolvedEntryMap = /* @__PURE__ */ new Map();
 	const jsonEmitManager = createJsonEmitManager(ctx.configService);
 	const registerJsonAsset = jsonEmitManager.register.bind(jsonEmitManager);
@@ -9804,59 +9807,64 @@ function useLoadEntry(ctx, options) {
 		resolvedEntryMap,
 		jsonEmitFilesMap: jsonEmitManager.map,
 		normalizeEntry,
-		markEntryDirty(entryId) {
+		markEntryDirty(entryId, reason = "direct") {
 			dirtyEntrySet.add(entryId);
+			dirtyEntryReasons.set(entryId, reason);
 			loadedEntrySet.delete(entryId);
 		},
 		async emitDirtyEntries() {
 			if (!dirtyEntrySet.size) {
 				options?.hmr?.setDidEmitAllEntries?.(false);
+				options?.hmr?.setLastEmittedEntries?.(/* @__PURE__ */ new Set());
 				return;
 			}
 			const dirtyCount = dirtyEntrySet.size;
-			const pending = [];
-			const shouldEmitAllEntries = resolveShouldEmitAllEntries({
+			const pendingEntryIds = resolvePendingEntryIds({
 				isDev: Boolean(ctx.configService?.isDev),
 				mode: hmrSharedChunksMode,
-				dirtyEntrySet,
 				resolvedEntryMap,
+				dirtyEntrySet,
+				dirtyEntryReasons,
 				sharedChunkImporters: hmrSharedChunkImporters
 			});
+			const pending = [];
+			const shouldEmitAllEntries = pendingEntryIds.size > 0 && pendingEntryIds.size === resolvedEntryMap.size;
 			options?.hmr?.setDidEmitAllEntries?.(shouldEmitAllEntries);
-			if (shouldEmitAllEntries) {
-				const seen = /* @__PURE__ */ new Set();
-				for (const resolvedId of resolvedEntryMap.values()) {
-					if (!resolvedId) continue;
-					const key = resolvedId.id;
-					if (seen.has(key)) continue;
-					seen.add(key);
-					pending.push(resolvedId);
-				}
-				dirtyEntrySet.clear();
-			} else for (const entryId of Array.from(dirtyEntrySet)) {
+			options?.hmr?.setLastEmittedEntries?.(new Set(pendingEntryIds));
+			for (const entryId of pendingEntryIds) {
 				const resolvedId = resolvedEntryMap.get(entryId);
 				if (!resolvedId) continue;
 				pending.push(resolvedId);
 				dirtyEntrySet.delete(entryId);
+				dirtyEntryReasons.delete(entryId);
 			}
 			if (debug) debug(`hmr emit dirty=${dirtyCount} resolved=${resolvedEntryMap.size} emitAll=${shouldEmitAllEntries} pending=${pending.length}`);
 			if (pending.length) await Promise.all(emitEntriesChunks.call(this, pending));
 		}
 	};
 }
-function resolveShouldEmitAllEntries(options) {
-	if (!options.isDev || options.resolvedEntryMap.size === 0) return false;
-	if (options.mode === "full") return true;
-	if (options.mode === "off") return false;
-	if (!options.sharedChunkImporters) return true;
-	if (options.sharedChunkImporters.size === 0) return false;
+function resolvePendingEntryIds(options) {
+	const pending = new Set(options.dirtyEntrySet);
+	if (options.mode === "full") return new Set(options.resolvedEntryMap.keys());
+	if (!options.isDev || options.mode === "off") return pending;
+	let hasDependencyDrivenEntry = false;
+	for (const entryId of options.dirtyEntrySet) if (options.dirtyEntryReasons.get(entryId) === "dependency") {
+		hasDependencyDrivenEntry = true;
+		break;
+	}
+	if (!hasDependencyDrivenEntry) return pending;
+	if (!options.sharedChunkImporters?.size) return pending;
 	for (const importers of options.sharedChunkImporters.values()) {
 		if (importers.size <= 1) continue;
-		let dirtyCount = 0;
-		for (const importer of importers) if (options.dirtyEntrySet.has(importer)) dirtyCount += 1;
-		if (dirtyCount > 0 && dirtyCount < importers.size) return true;
+		let hasDependencyDrivenImporter = false;
+		for (const importer of importers) if (options.dirtyEntrySet.has(importer) && options.dirtyEntryReasons.get(importer) === "dependency") {
+			hasDependencyDrivenImporter = true;
+			break;
+		}
+		if (!hasDependencyDrivenImporter) continue;
+		for (const importer of importers) pending.add(importer);
 	}
-	return false;
+	return pending;
 }
 //#endregion
 //#region src/utils/wxmlScriptModule.ts
@@ -10256,6 +10264,17 @@ function refreshModuleGraph(pluginCtx, state) {
 }
 function refreshSharedChunkImporters(bundle, state) {
 	state.hmrSharedChunkImporters.clear();
+	appendSharedChunkImporters(bundle, state);
+}
+function refreshPartialSharedChunkImporters(bundle, state, entryIds) {
+	if (!entryIds.size) return;
+	for (const [chunkId, importers] of state.hmrSharedChunkImporters) {
+		for (const entryId of entryIds) importers.delete(entryId);
+		if (importers.size === 0) state.hmrSharedChunkImporters.delete(chunkId);
+	}
+	appendSharedChunkImporters(bundle, state, entryIds);
+}
+function appendSharedChunkImporters(bundle, state, onlyEntryIds) {
 	const isEntryChunk = (chunk) => {
 		if (chunk.isEntry) return true;
 		if (!chunk.facadeModuleId) return false;
@@ -10269,6 +10288,7 @@ function refreshSharedChunkImporters(bundle, state) {
 		if (!chunk.facadeModuleId) continue;
 		if (!isEntryChunk(chunk)) continue;
 		const entryId = normalizeFsResolvedId(chunk.facadeModuleId);
+		if (onlyEntryIds && !onlyEntryIds.has(entryId)) continue;
 		entryChunks.push({
 			entryId,
 			chunk
@@ -10597,6 +10617,7 @@ function createGenerateBundleHook(state, isPluginBuild) {
 			let redundantBytesTotal = 0;
 			if (configService.isDev && state.hmrSharedChunksMode === "auto") {
 				if (state.hmrState.didEmitAllEntries || !state.hmrState.hasBuiltOnce) refreshSharedChunkImporters(rolldownBundle, state);
+				else if (state.hmrState.lastEmittedEntryIds?.size) refreshPartialSharedChunkImporters(rolldownBundle, state, state.hmrState.lastEmittedEntryIds);
 				state.hmrState.hasBuiltOnce = true;
 			}
 			function matchSubPackage(filePath) {
@@ -11639,13 +11660,13 @@ function createWatchChangeHook(state) {
 					const ext = path.extname(normalizedId);
 					return ext ? normalizedId.slice(0, -ext.length) : normalizedId;
 				})());
-				if (primaryScript.path) markEntryDirty(normalizeFsResolvedId(primaryScript.path));
+				if (primaryScript.path) markEntryDirty(normalizeFsResolvedId(primaryScript.path), "direct");
 			}
 		}
-		if (loadedEntrySet.has(normalizedId)) markEntryDirty(normalizedId);
+		if (loadedEntrySet.has(normalizedId)) markEntryDirty(normalizedId, "direct");
 		else if (state.moduleImporters.size && state.entryModuleIds.size) {
 			const affected = collectAffectedEntries(state, normalizedId);
-			if (affected.size) for (const entryId of affected) markEntryDirty(entryId);
+			if (affected.size) for (const entryId of affected) markEntryDirty(entryId, "dependency");
 		}
 		const relativeSrc = configService.relativeAbsoluteSrcRoot(normalizedId);
 		const relativeCwd = configService.relativeCwd(normalizedId);
@@ -11769,7 +11790,8 @@ function weappVite(ctx, subPackageMeta) {
 	const hmrSharedChunkImporters = /* @__PURE__ */ new Map();
 	const hmrState = {
 		didEmitAllEntries: false,
-		hasBuiltOnce: false
+		hasBuiltOnce: false,
+		lastEmittedEntryIds: /* @__PURE__ */ new Set()
 	};
 	const { loadEntry, loadedEntrySet, jsonEmitFilesMap, entriesMap, resolvedEntryMap, markEntryDirty, emitDirtyEntries } = useLoadEntry(ctx, {
 		buildTarget,
@@ -11778,6 +11800,9 @@ function weappVite(ctx, subPackageMeta) {
 			sharedChunkImporters: hmrSharedChunkImporters,
 			setDidEmitAllEntries: (value) => {
 				hmrState.didEmitAllEntries = value;
+			},
+			setLastEmittedEntries: (entryIds) => {
+				hmrState.lastEmittedEntryIds = new Set(entryIds);
 			}
 		}
 	});
@@ -15848,7 +15873,7 @@ function createScanService(ctx) {
 		let vueAppPath;
 		if (!appEntryPath) vueAppPath = await findVueEntry(appBasename);
 		if (!appConfigFile && vueAppPath) {
-			const { extractConfigFromVue } = await import("./file-arCdbPgR.mjs").then((n) => n.r);
+			const { extractConfigFromVue } = await import("./file-DLpJ9tlX.mjs").then((n) => n.r);
 			configFromVue = await extractConfigFromVue(vueAppPath);
 			if (configFromVue) appConfigFile = vueAppPath;
 		}

package/dist/{file-arCdbPgR.mjs → file-DLpJ9tlX.mjs}

@@ -78,7 +78,7 @@ function resolveAutoRoutesMacroImportPath() {
 }
 async function resolveAutoRoutesInlineSnapshot() {
 	try {
-		const { getCompilerContext } = await import("./createContext-B7PguO6M.mjs").then((n) => n.r);
+		const { getCompilerContext } = await import("./createContext-Dzy3vlIP.mjs").then((n) => n.r);
 		const compilerContext = getCompilerContext();
 		const service = compilerContext.autoRoutesService;
 		const reference = service?.getReference?.();

package/dist/index.mjs

@@ -1,9 +1,9 @@
 import { defineAppJson, defineComponentJson, definePageJson, defineSitemapJson, defineThemeJson } from "./json.mjs";
 import { a as resolveWeappViteHostMeta, i as isWeappViteHost, n as applyWeappViteHostMeta, r as createWeappViteHostMeta, t as WEAPP_VITE_HOST_NAME } from "./pluginHost-SJdl15d3.mjs";
 import { defineConfig } from "./config.mjs";
-import { t as createCompilerContext } from "./createContext-B7PguO6M.mjs";
+import { t as createCompilerContext } from "./createContext-Dzy3vlIP.mjs";
 import "./logger-gutcwWKE.mjs";
-import "./file-arCdbPgR.mjs";
+import "./file-DLpJ9tlX.mjs";
 import { defineEmits, defineProps } from "./runtime.mjs";
 import { createWevuComponent } from "wevu";
 export { WEAPP_VITE_HOST_NAME, applyWeappViteHostMeta, createCompilerContext, createWeappViteHostMeta, createWevuComponent, defineAppJson, defineComponentJson, defineConfig, defineEmits, definePageJson, defineProps, defineSitemapJson, defineThemeJson, isWeappViteHost, resolveWeappViteHostMeta };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weapp-vite",
   "type": "module",
-  "version": "6.10.0",
+  "version": "6.10.2",
   "description": "weapp-vite 一个现代化的小程序打包工具",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -117,7 +117,7 @@
     "@weapp-core/logger": "3.1.1",
     "@weapp-core/schematics": "6.0.4",
     "@weapp-core/shared": "3.0.2",
-    "@weapp-vite/ast": "6.10.0",
+    "@weapp-vite/ast": "6.10.2",
     "@weapp-vite/mcp": "1.1.1",
     "@weapp-vite/volar": "2.0.7",
     "@weapp-vite/web": "1.3.5",
@@ -125,7 +125,7 @@
     "rolldown-require": "2.0.8",
     "vite-plugin-performance": "2.0.1",
     "weapp-ide-cli": "5.1.1",
-    "wevu": "6.10.0"
+    "wevu": "6.10.2"
   },
   "publishConfig": {
     "access": "public",