Merge pull request #11721 from remix-run/pedro/upgrade-vite-env-only

upgrade vite-env-only

integration/helpers/vite-template/package.json

@@ -30,7 +30,7 @@
     "eslint": "^8.38.0",
     "typescript": "^5.1.6",
     "vite": "^5.1.0",
-    "vite-env-only": "^2.0.0",
+    "vite-env-only": "^3.0.1",
     "vite-tsconfig-paths": "^4.2.1"
   },
   "engines": {

integration/helpers/vite.ts

@@ -44,14 +44,14 @@ export const viteConfig = {
 
     return dedent`
       import { vitePlugin as reactRouter } from "@react-router/dev";
-      import envOnly from "vite-env-only";
+      import { envOnlyMacros } from "vite-env-only";
       import tsconfigPaths from "vite-tsconfig-paths";
 
       export default {
         ${await viteConfig.server(args)}
         plugins: [
           reactRouter(${JSON.stringify(pluginOptions)}),
-          envOnly(),
+          envOnlyMacros(),
           tsconfigPaths()
         ],
       };

integration/vite-dot-server-test.ts

@@ -218,18 +218,18 @@ test.describe("Vite / server-only escape hatch", async () => {
   let files: Files = async ({ port }) => ({
     "vite.config.ts": dedent`
       import { vitePlugin as reactRouter } from "@react-router/dev";
-      import envOnly from "vite-env-only";
+      import { envOnlyMacros } from "vite-env-only";
       import tsconfigPaths from "vite-tsconfig-paths";
 
       export default {
         ${await viteConfig.server({ port })}
-        plugins: [reactRouter(), envOnly(), tsconfigPaths()],
+        plugins: [reactRouter(), envOnlyMacros(), tsconfigPaths()],
       }
     `,
     "app/utils.server.ts": serverOnlyModule,
     "app/.server/utils.ts": serverOnlyModule,
     "app/routes/_index.tsx": `
-      import { serverOnly$ } from "vite-env-only";
+      import { serverOnly$ } from "vite-env-only/macros";
 
       import { serverOnly as serverOnlyFile } from "~/utils.server";
       import serverOnlyDir from "~/.server/utils";

package.json

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