ensure hotUpdate returns non-svelte modules, cleanup

Author: dominikg

packages/vite-plugin-svelte/src/plugins/compile.js

@@ -27,10 +27,7 @@ export function compile(api) {
 		},
 		transform: {
 			async handler(code, id) {
-				// TODO: hack work around access restriction to meta in vite dev
-				const svelteMeta = Object.entries(this.getModuleInfo(id)?.meta ?? {}).find(
-					([key]) => key === 'svelte'
-				)?.[1];
+				const svelteMeta = this.getModuleInfo(id)?.meta?.svelte;
 				const cache = api.getEnvironmentCache(this);
 				const ssr = this.environment.config.consumer === 'server';
 				const svelteRequest = api.idParser(id, ssr);

packages/vite-plugin-svelte/src/plugins/hot-update.js

@@ -75,38 +75,49 @@ export function hotUpdate(api) {
 				transformResultCache.set(id, code);
 			}
 		},
+		hotUpdate: {
+			order: 'post',
+			async handler(ctx) {
+				const svelteRequest = idParser(ctx.file, false, ctx.timestamp);
+				if (svelteRequest) {
+					const { modules } = ctx;
+					const svelteModules = [];
+					const nonSvelteModules = [];
+					for (const mod of modules) {
+						if (transformResultCache.has(mod.id)) {
+							svelteModules.push(mod);
+						} else {
+							nonSvelteModules.push(mod);
+						}
+					}
 
-		async hotUpdate(ctx) {
-			const svelteRequest = idParser(ctx.file, false, ctx.timestamp);
-			if (svelteRequest) {
-				const { modules } = ctx;
-				const svelteModules = modules.filter((m) => transformResultCache.has(m.id));
-				if (svelteModules.length === 0) {
-					return; // nothing to do for us, unlikely to happen
-				}
-				const affectedModules = [];
-				const prevResults = svelteModules.map((m) => transformResultCache.get(m.id));
-				for (let i = 0; i < svelteModules.length; i++) {
-					const mod = svelteModules[i];
-					const prev = prevResults[i];
-					await this.environment.transformRequest(mod.url);
-					const next = transformResultCache.get(mod.id);
-					if (!hasCodeChanged(prev, next, mod.id)) {
-						log.debug(
-							`skipping hot update for ${mod.id} because result is unchanged`,
-							undefined,
-							'hmr'
-						);
-						continue;
+					if (svelteModules.length === 0) {
+						return; // nothing to do for us
 					}
-					affectedModules.push(mod);
+					const affectedModules = [];
+					const prevResults = svelteModules.map((m) => transformResultCache.get(m.id));
+					for (let i = 0; i < svelteModules.length; i++) {
+						const mod = svelteModules[i];
+						const prev = prevResults[i];
+						await this.environment.transformRequest(mod.url);
+						const next = transformResultCache.get(mod.id);
+						if (hasCodeChanged(prev, next, mod.id)) {
+							affectedModules.push(mod);
+						} else {
+							log.debug(
+								`skipping hot update for ${mod.id} because result is unchanged`,
+								undefined,
+								'hmr'
+							);
+						}
+					}
+					log.debug(
+						`hotUpdate for ${svelteRequest.id} result: [${affectedModules.map((m) => m.id).join(', ')}]`,
+						undefined,
+						'hmr'
+					);
+					return [...affectedModules, ...nonSvelteModules];
 				}
-				log.debug(
-					`hotUpdate for ${svelteRequest.id} result: [${affectedModules.map((m) => m.id).join(', ')}]`,
-					undefined,
-					'hmr'
-				);
-				return affectedModules;
 			}
 		}
 	};
@@ -123,13 +134,10 @@ export function hotUpdate(api) {
 function hasCodeChanged(prev, next, id) {
 	const isStrictEqual = nullSafeEqual(prev, next);
 	if (isStrictEqual) {
-		//console.log('strict equal ',{id,prev,next})
 		return false;
 	}
-	////console.log({normalizedNext,normalizedPrev})
 	const isLooseEqual = nullSafeEqual(normalize(prev), normalize(next));
 	if (!isStrictEqual && isLooseEqual) {
-		////console.log('loose equal ',{filename,prev,next})
 		log.debug(
 			`ignoring compiler output change for ${id} as it is equal to previous output after normalization`,
 			undefined,