fix: exclude css with ? import sideeffects from ssr

Author: katywings

packages/start/src/server/collect-styles.ts

@@ -72,37 +72,13 @@ async function findModuleDependencies(
 // Vite doesn't expose these so we just copy the list for now
 // https://github.com/vitejs/vite/blob/d6bde8b03d433778aaed62afc2be0630c8131908/packages/vite/src/node/constants.ts#L49C23-L50
 const cssFileRegExp =
-	/\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)(?:$|\?)/;
+	/\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)$/;
 // https://github.com/vitejs/vite/blob/d6bde8b03d433778aaed62afc2be0630c8131908/packages/vite/src/node/plugins/css.ts#L160
 const cssModulesRegExp = new RegExp(`\\.module${cssFileRegExp.source}`);
 
 const isCssFile = (file: string) => cssFileRegExp.test(file);
 export const isCssModulesFile = (file: string) => cssModulesRegExp.test(file);
 
-// https://github.com/remix-run/remix/blob/65326e39099f3b2285d83aecfe734ba35f668396/packages/remix-dev/vite/styles.ts#L29
-const cssUrlParamsWithoutSideEffects = ["url", "inline", "raw", "inline-css"];
-export const isCssUrlWithoutSideEffects = (url: string) => {
-	const queryString = url.split("?")[1];
-
-	if (!queryString) {
-		return false;
-	}
-
-	const params = new URLSearchParams(queryString);
-	for (const paramWithoutSideEffects of cssUrlParamsWithoutSideEffects) {
-		if (
-			// Parameter is blank and not explicitly set, i.e. "?url", not "?url="
-			params.get(paramWithoutSideEffects) === "" &&
-			!url.includes(`?${paramWithoutSideEffects}=`) &&
-			!url.includes(`&${paramWithoutSideEffects}=`)
-		) {
-			return true;
-		}
-	}
-
-	return false;
-};
-
 async function findFilesDepedencies(
 	vite: DevEnvironment,
 	files: Array<string>,
@@ -133,7 +109,7 @@ export async function findStylesInModuleGraph(
 	const styles: Record<string, any> = {};
 
 	for (const dep of dependencies) {
-		if (isCssFile(dep.url) && dep.id) {
+		if (dep.id && isCssFile(dep.url)) {
 			styles[dep.id] = dep.url;
 		}
 	}

packages/start/src/server/manifest/prod-ssr-manifest.ts

@@ -1,5 +1,6 @@
 import { clientViteManifest } from "solid-start:client-vite-manifest";
 import { join } from "pathe";
+import { Manifest } from "vite";
 import type { Asset } from "../renderAsset.tsx";
 
 // Only reads from client manifest atm, might need server support for islands
@@ -67,7 +68,7 @@ function createHtmlTagsForAssets(assets: string[]) {
 }
 
 function findAssetsInViteManifest(
-	manifest: any,
+	manifest: Manifest,
 	id: string,
 	assetMap = new Map(),
 	stack: string[] = [],
@@ -86,7 +87,8 @@ function findAssetsInViteManifest(
 	}
 
 	const assets = [
-		...(chunk.assets?.filter(Boolean) || []),
+		// TODO: Needs a better way to detect ?url
+		...(chunk.assets?.filter(a => !a.endsWith('.css')) || []),
 		...(chunk.css?.filter(Boolean) || []),
 	];
 	if (chunk.imports) {
@@ -95,7 +97,7 @@ function findAssetsInViteManifest(
 			assets.push(
 				...findAssetsInViteManifest(
 					manifest,
-					chunk.imports[i],
+					chunk.imports[i]!,
 					assetMap,
 					stack,
 				),