add correct test

sveltejs · elliott-with-the-longest-name-on-github · Jun 5, 2025 · May 15, 2025 · May 15, 2025 · May 15, 2025
commit d44e2de174d9b0809dde425de7bb124de30b3ecc
diff --git a/.changeset/big-eels-watch.md b/.changeset/big-eels-watch.md
@@ -2,4 +2,4 @@
 '@sveltejs/kit': patch
 ---
 
-fix: correctly invalidate static analysis cache when modifying a universal `+page`/`+layout` file during dev
+fix: correctly invalidate static analysis cache of child nodes when modifying a universal `+layout` file during dev
diff --git a/packages/kit/src/exports/vite/dev/index.js b/packages/kit/src/exports/vite/dev/index.js
@@ -353,13 +353,14 @@ export async function dev(vite, vite_config, svelte_config) {
 
 	// Debounce add/unlink events because in case of folder deletion or moves
 	// they fire in rapid succession, causing needless invocations.
+	// These watchers only run for routes, param matchers, and client hooks.
 	watch('add', () => debounce(update_manifest));
 	watch('unlink', () => debounce(update_manifest));
 	watch('change', (file) => {
 		// Don't run for a single file if the whole manifest is about to get updated
 		if (timeout || restarting) return;
 
-		if (is_universal_file(file)) {
+		if (/\+(page|layout).*$/.test(file)) {
 			invalidate_page_options(path.relative(cwd, file));
 		}
 
@@ -391,10 +392,6 @@ export async function dev(vite, vite_config, svelte_config) {
 	});
 
 	vite.watcher.on('change', async (file) => {
-		if (is_universal_file(file)) {
-			invalidate_page_options(path.relative(cwd, file));
-		}
-
 		// changing the svelte config requires restarting the dev server
 		// the config is only read on start and passed on to vite-plugin-svelte
 		// which needs up-to-date values to operate correctly
@@ -654,11 +651,3 @@ function has_correct_case(file, assets) {
 
 	return false;
 }
-
-/**
- * @param {string} file
- * @returns {boolean}
- */
-function is_universal_file(file) {
-	return /\+(page|layout).*$/.test(file);
-}
diff --git a/packages/kit/src/exports/vite/static_analysis/index.js b/packages/kit/src/exports/vite/static_analysis/index.js
@@ -252,6 +252,7 @@ export function create_static_analyser(resolve) {
 	 * @returns {void}
 	 */
 	const invalidate_page_options = (file) => {
+		// TODO: this needs to invalidate nodes lower in the branch too
 		static_exports.delete(file);
 	};
 

diff --git a/packages/kit/test/apps/writes/src/routes/universal/parent-changed/+layout.js b/packages/kit/test/apps/writes/src/routes/universal/parent-changed/+layout.js
@@ -0,0 +1 @@
+export const ssr = false;
diff --git a/packages/kit/test/apps/writes/src/routes/universal/parent-changed/+page.js b/packages/kit/test/apps/writes/src/routes/universal/parent-changed/+page.js
@@ -0,0 +1 @@
+document.body.style.backgroundColor = 'red';
diff --git a/packages/kit/test/apps/writes/src/routes/universal/parent-changed/+page.svelte b/packages/kit/test/apps/writes/src/routes/universal/parent-changed/+page.svelte
@@ -0,0 +1 @@
+<p>hello world</p>
diff --git a/packages/kit/test/apps/writes/test/test.js b/packages/kit/test/apps/writes/test/test.js
@@ -74,17 +74,40 @@ test.describe('Filesystem updates', () => {
 		}
 
 		await page.waitForTimeout(500); // this is the rare time we actually need waitForTimeout; we have no visibility into whether the module graph has been invalidated
+		// a reload is required because Vite HMR doesn't trigger if the page has never loaded successfully
 		await page.reload();
 		expect(await get_computed_style('body', 'background-color')).toBe('rgb(255, 0, 0)');
 
 		try {
 			fs.writeFileSync(file, contents.replace(/export const ssr = .*;/, 'export const ssr = !1;'));
 			await page.waitForTimeout(500); // this is the rare time we actually need waitForTimeout; we have no visibility into whether the module graph has been invalidated
-			await page.goto('/universal', { wait_for_started: false });
 			expect(await get_computed_style('body', 'background-color')).not.toBe('rgb(255, 0, 0)');
 			await expect(page.locator('h1')).toHaveText('Internal Error');
 		} finally {
 			fs.writeFileSync(file, contents.replace(/\\nexport const ssr = false;\\n/, ''));
 		}
 	});
+
+	test('Universal node is updated when parent page options change', async ({
+		page,
+		javaScriptEnabled,
+		get_computed_style
+	}) => {
+		test.skip(!process.env.DEV || !javaScriptEnabled);
+
+		const file = fileURLToPath(new URL('../src/routes/universal/parent-changed/+layout.js', import.meta.url));
+		const contents = fs.readFileSync(file, 'utf-8');
+
+		try {
+			await page.goto('/universal/parent-changed');
+			expect(await get_computed_style('body', 'background-color')).toBe('rgb(255, 0, 0)');
+
+			fs.writeFileSync(file, contents.replace(/export const ssr = false;/, ''));
+		await page.waitForTimeout(500); // this is the rare time we actually need waitForTimeout; we have no visibility into whether the module graph has been invalidated
+			expect(await get_computed_style('body', 'background-color')).not.toBe('rgb(255, 0, 0)');
+			await expect(page.locator('h1')).toHaveText('Internal Error');
+		} finally {
+			fs.writeFileSync(file, contents);
+		}
+	});
 });