Remove .server/.client module support

integration/helpers/vite-template/package.json

@@ -32,7 +32,7 @@
     "node-fetch": "^3.3.2",
     "typescript": "^5.1.6",
     "vite": "^5.1.0",
-    "vite-env-only": "^2.0.0",
+    "vite-env-only": "^2.3.0",
     "vite-tsconfig-paths": "^4.2.1",
     "wrangler": "^3.24.0"
   },

integration/helpers/vite.ts

@@ -14,6 +14,7 @@ import type { Page } from "@playwright/test";
 import { test as base, expect } from "@playwright/test";
 import type { VitePluginConfig } from "@react-router/dev";
 
+const js = String.raw;
 const reactRouterBin = "node_modules/@react-router/dev/dist/cli.js";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 const root = path.resolve(__dirname, "../..");
@@ -43,7 +44,7 @@ export const viteConfig = {
       ssr: !args.spaMode,
     };
 
-    return dedent`
+    return dedent(js`
       import { vitePlugin as reactRouter } from "@react-router/dev";
       import envOnly from "vite-env-only";
       import tsconfigPaths from "vite-tsconfig-paths";
@@ -52,11 +53,18 @@ export const viteConfig = {
         ${await viteConfig.server(args)}
         plugins: [
           reactRouter(${JSON.stringify(pluginOptions)}),
-          envOnly(),
+          envOnly({
+            denyFiles: {
+              client: [
+                /\.server\.(\w+)?$/, // .server files
+                /(^|\/).server\//, // .server directories
+              ],
+            },
+          }),
           tsconfigPaths()
         ],
       };
-    `;
+    `);
   },
 };
 

integration/vite-build-test.ts

@@ -26,6 +26,7 @@ test.beforeAll(async () => {
     "vite.config.ts": js`
       import { defineConfig } from "vite";
       import { vitePlugin as reactRouter } from "@react-router/dev";
+      import envOnly from "vite-env-only";
       import mdx from "@mdx-js/rollup";
 
       export default defineConfig({
@@ -37,6 +38,14 @@ test.beforeAll(async () => {
         plugins: [
           mdx(),
           reactRouter(),
+          envOnly({
+            denyFiles: {
+              client: [
+                /\.server\.(\w+)?$/, // .server files
+                /(^|\/).server\//, // .server directories
+              ],
+            },
+          }),
         ],
       });
     `,

package.json

@@ -122,7 +122,7 @@
     "unified": "^10.1.2",
     "unist-util-remove": "^3.1.0",
     "vite": "^5.1.0",
-    "vite-env-only": "^2.0.0",
+    "vite-env-only": "^2.3.0",
     "vite-tsconfig-paths": "^4.2.2",
     "wait-on": "^7.0.1"
   },