omit CSS if ssr=false - fixes #818

sveltejs · Apr 2, 2021 · f3fd750 · f3fd750
1 parent 2855f7d
commit f3fd750
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/.changeset/funny-needles-talk.md b/.changeset/funny-needles-talk.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+Only include CSS on an SSR'd page
diff --git a/packages/kit/src/runtime/server/page.js b/packages/kit/src/runtime/server/page.js
@@ -386,9 +386,9 @@ async function get_response({ request, options, $session, route, status = 200, e
 	}
 
 	// TODO all the `route &&` stuff is messy
-	const js_deps = route ? route.js : [];
-	const css_deps = route ? route.css : [];
-	const style = route ? route.style : '';
+	const js_deps = route && page_config.ssr ? route.js : [];
+	const css_deps = route && page_config.ssr ? route.css : [];
+	const style = route && page_config.ssr ? route.style : '';
 
 	const prefix = `${options.paths.assets}/${options.app_dir}`;
 

diff --git a/packages/kit/test/apps/basics/src/routes/ssr/__tests__.js b/packages/kit/test/apps/basics/src/routes/ssr/__tests__.js
@@ -7,6 +7,8 @@ export default function (test, is_dev) {
 			assert.equal(await page.textContent('h1'), 'content was rendered');
 		} else {
 			assert.ok(await page.evaluate(() => !document.querySelector('h1')));
+			assert.ok(await page.evaluate(() => !document.querySelector('style[data-svelte]')));
+			assert.ok(await page.evaluate(() => !document.querySelector('link[rel=stylesheet]')));
 		}
 	});
 }
diff --git a/packages/kit/test/apps/basics/src/routes/ssr/index.svelte b/packages/kit/test/apps/basics/src/routes/ssr/index.svelte
@@ -2,4 +2,10 @@
 	export const ssr = false;
 </script>
 
-<h1>content was rendered</h1>
+<h1>content was rendered</h1>
+
+<style>
+	h1 {
+		color: red;
+	}
+</style>