fix: make ownership validation work with HMR (#11171)

* fix: make ownership validation work with HMR

* bump vite-plugin-svelte in playground

* missed a spot

Author: Rich-Harris

.changeset/calm-pandas-vanish.md

@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: make ownership validation work correctly with HMR

packages/svelte/src/compiler/phases/3-transform/client/transform-client.js

@@ -464,8 +464,8 @@ export function client_component(source, analysis, options) {
 			);
 		}
 
-		body.unshift(b.stmt(b.call(b.id('$.mark_module_start'), b.id(analysis.name))));
-		body.push(b.stmt(b.call(b.id('$.mark_module_end'))));
+		body.unshift(b.stmt(b.call(b.id('$.mark_module_start'))));
+		body.push(b.stmt(b.call(b.id('$.mark_module_end'), b.id(analysis.name))));
 	}
 
 	if (options.discloseVersion) {

packages/svelte/src/internal/client/dev/ownership.js

@@ -67,27 +67,33 @@ function get_component() {
  * Together with `mark_module_end`, this function establishes the boundaries of a `.svelte` file,
  * such that subsequent calls to `get_component` can tell us which component is responsible
  * for a given state change
- * @param {Function} component
  */
-export function mark_module_start(component) {
+export function mark_module_start() {
 	const start = get_stack()?.[2];
 
 	if (start) {
 		(boundaries[start.file] ??= []).push({
 			start,
 			// @ts-expect-error
 			end: null,
-			component
+			// @ts-expect-error we add the component at the end, since HMR will overwrite the function
+			component: null
 		});
 	}
 }
 
-export function mark_module_end() {
+/**
+ * @param {Function} component
+ */
+export function mark_module_end(component) {
 	const end = get_stack()?.[2];
 
 	if (end) {
 		const boundaries_file = boundaries[end.file];
-		boundaries_file[boundaries_file.length - 1].end = end;
+		const boundary = boundaries_file[boundaries_file.length - 1];
+
+		boundary.end = end;
+		boundary.component = component;
 	}
 }
 

playgrounds/demo/package.json

@@ -11,7 +11,7 @@
     "preview": "vite preview"
   },
   "devDependencies": {
-    "@sveltejs/vite-plugin-svelte": "^3.0.1",
+    "@sveltejs/vite-plugin-svelte": "^3.1.0",
     "express": "^4.19.2",
     "nodemon": "^3.0.3",
     "svelte": "workspace:*",

pnpm-lock.yaml

@@ -17,7 +17,7 @@
     "@sveltejs/adapter-vercel": "^5.0.0",
     "@sveltejs/kit": "^2.5.0",
     "@sveltejs/site-kit": "6.0.0-next.59",
-    "@sveltejs/vite-plugin-svelte": "^3.0.0",
+    "@sveltejs/vite-plugin-svelte": "^3.1.0",
     "@types/marked": "^6.0.0",
     "esrap": "^1.2.1",
     "marked": "^9.0.0",

sites/svelte-5-preview/package.json

@@ -31,7 +31,7 @@
     "@sveltejs/adapter-vercel": "^4.0.0",
     "@sveltejs/kit": "^2.4.3",
     "@sveltejs/site-kit": "6.0.0-next.59",
-    "@sveltejs/vite-plugin-svelte": "^3.0.1",
+    "@sveltejs/vite-plugin-svelte": "^3.1.0",
     "@types/cookie": "^0.6.0",
     "@types/node": "^20.11.5",
     "browserslist": "^4.22.2",