fix: basename in getStylesForUrl

remix-run · Nov 27, 2023 · 01e201f · 01e201f
1 parent ac7c0e0
commit 01e201f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/packages/remix-dev/vite/plugin.ts b/packages/remix-dev/vite/plugin.ts
@@ -70,7 +70,7 @@ type RemixConfigJsdocOverrides = {
    */
   serverBuildPath?: SupportedRemixConfig["serverBuildPath"];
   /**
-   * TODO: doc
+   * TODO: for now sneak this in as remix vite only option
    */
   basename?: string;
 };

diff --git a/packages/remix-dev/vite/styles.ts b/packages/remix-dev/vite/styles.ts
@@ -157,7 +157,9 @@ const createRoutes = (
 
 export const getStylesForUrl = async (
   vite: ViteDevServer,
-  config: Pick<ResolvedRemixConfig, "appDirectory" | "routes" | "publicPath">,
+  config: Pick<ResolvedRemixConfig, "appDirectory" | "routes"> & {
+    basename: string;
+  },
   cssModulesManifest: Record<string, string>,
   build: ServerBuild,
   url: string | undefined
@@ -169,7 +171,7 @@ export const getStylesForUrl = async (
   let routes = createRoutes(build.routes);
   let appPath = path.relative(process.cwd(), config.appDirectory);
   let documentRouteFiles =
-    matchRoutes(routes, url, config.publicPath)?.map((match) =>
+    matchRoutes(routes, url, config.basename)?.map((match) =>
       path.join(appPath, config.routes[match.route.id].file)
     ) ?? [];