test(vite): update checks for error messages for .server imports

remix-run · Dec 12, 2023 · 0ca4b4f · 0ca4b4f
1 parent 27826f0
commit 0ca4b4f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/integration/vite-dot-server-test.ts b/integration/vite-dot-server-test.ts
@@ -135,8 +135,10 @@ test.describe("Vite / route / server-only module referenced by client", () => {
 
         `    '${specifier}' imported by route 'app/routes/_index.tsx'`,
 
-        "  The only route exports that can reference server-only modules are: `loader`, `action`, `headers`",
-        `  but other route exports in 'app/routes/_index.tsx' depend on '${specifier}'.`,
+        "  The only route exports that can reference server-only modules are:",
+        "    `loader`, `action`, `headers`",
+
+        `  But other route exports in 'app/routes/_index.tsx' depend on '${specifier}'.`,
 
         "  For more see https://remix.run/docs/en/main/discussion/server-vs-client",
       ].forEach(expect(stderr).toMatch);
@@ -204,11 +206,12 @@ test.describe("Vite / non-route / server-only module referenced by client", () =
 
         "  * Otherwise:",
 
-        "    Keep client-safe code in 'app/reexport-server-only.ts'",
-        "    and move server-only code:",
+        `    - Keep client-safe code in 'app/reexport-server-only.ts'`,
+        `    - And move server-only code to a \`.server\` file`,
+        `      e.g. 'app/reexport-server-only.server.ts'`,
 
-        "    - Into a `.server` directory   e.g. 'app/.server/utils.ts'",
-        "    - Or into a `.server` file     e.g. 'app/reexport-server-only.server.ts'",
+        "  If you have lots of `.server` files, try using",
+        "  a `.server` directory e.g. 'app/.server'",
 
         "For more, see https://remix.run/docs/en/main/future/vite#server-code-not-tree-shaken-in-development",
       ].forEach(expect(stderr).toMatch);

diff --git a/packages/remix-dev/vite/plugin.ts b/packages/remix-dev/vite/plugin.ts
@@ -948,8 +948,11 @@ export const remixVitePlugin: RemixVitePlugin = (options = {}) => {
 
         if (!importer) throw Error(`Importer not found: ${id}`);
 
+        let vite = importViteEsmSync();
         let pluginConfig = await resolvePluginConfig();
-        let importerShort = path.relative(pluginConfig.rootDirectory, importer);
+        let importerShort = vite.normalizePath(
+          path.relative(pluginConfig.rootDirectory, importer)
+        );
         let isRoute = getRoute(pluginConfig, importer);
 
         if (isRoute) {
@@ -974,10 +977,11 @@ export const remixVitePlugin: RemixVitePlugin = (options = {}) => {
         }
 
         let importedBy = path.parse(importerShort);
-        let ext = importedBy.ext === ".jsx" ? ".js" : ".ts";
-        let dotServerFile = path.join(
-          importedBy.dir,
-          importedBy.name + ".server" + ext
+        let dotServerFile = vite.normalizePath(
+          path.join(
+            importedBy.dir,
+            importedBy.name + ".server" + importedBy.ext
+          )
         );
 
         throw Error(