Updated plugin to comply with vite 7 new api (#44)

jurijzahn8019 · marbemac · web-flow · commit 3d281cd15619 · 2025-07-13T17:50:04.000-05:00
* Updated plugin to comply with vite 7 new api

* fix: fall back to vite’s default target in non ssr

in vite &lt; 7, it’s modules anyways. in vite &gt; 7, modules is no longer an option, instead it’s “baseline-widely-available”

Signed-off-by: Marc MacLeod &lt;marbemac+gh@gmail.com&gt;

* relax yarn constraints, multiple vite versions

Signed-off-by: Marc MacLeod &lt;marbemac+gh@gmail.com&gt;

* update several of the examples to vite v7

Signed-off-by: Marc MacLeod &lt;marbemac+gh@gmail.com&gt;

---------

Signed-off-by: Marc MacLeod &lt;marbemac+gh@gmail.com&gt;
Co-authored-by: Marc MacLeod &lt;marbemac+gh@gmail.com&gt;
diff --git a/.changeset/fuzzy-dolphins-behave.md b/.changeset/fuzzy-dolphins-behave.md
@@ -0,0 +1,5 @@
+---
+'@ssrx/vite': minor
+---
+
+Updated plugin to comply with vite 7 new api
diff --git a/examples/bun-react-router/package.json b/examples/bun-react-router/package.json
@@ -24,9 +24,9 @@
     "@ssrx/vite": "latest",
     "@types/react": "18.3.5",
     "@types/react-dom": "18.3.0",
-    "@vitejs/plugin-react": "4.3.1",
+    "@vitejs/plugin-react": "4.6.0",
     "typescript": "5.6.2",
-    "vite": "5.4.8",
-    "vite-tsconfig-paths": "5.0.1"
+    "vite": "7.0.4",
+    "vite-tsconfig-paths": "5.1.4"
   }
 }
diff --git a/examples/react-router-kitchen-sink/package.json b/examples/react-router-kitchen-sink/package.json
@@ -57,15 +57,15 @@
     "@types/better-sqlite3": "7.6.11",
     "@types/react": "18.3.5",
     "@types/react-dom": "18.3.0",
-    "@vitejs/plugin-react": "4.3.1",
+    "@vitejs/plugin-react": "4.6.0",
     "autoprefixer": "10.4.20",
     "drizzle-kit": "0.24.2",
     "postcss": "8.4.47",
     "rollup-plugin-analyzer": "4.0.0",
     "tailwindcss": "3.4.13",
     "tsx": "4.19.1",
     "typescript": "5.6.2",
-    "vite": "5.4.8",
-    "vite-tsconfig-paths": "5.0.1"
+    "vite": "7.0.4",
+    "vite-tsconfig-paths": "5.1.4"
   }
 }
diff --git a/examples/react-router-records/package.json b/examples/react-router-records/package.json
@@ -23,12 +23,12 @@
     "@ssrx/vite": "latest",
     "@types/react": "18.3.5",
     "@types/react-dom": "18.3.0",
-    "@vitejs/plugin-react": "4.3.1",
+    "@vitejs/plugin-react": "4.6.0",
     "autoprefixer": "10.4.20",
     "postcss": "8.4.47",
     "tailwindcss": "3.4.13",
     "typescript": "5.6.2",
-    "vite": "5.4.8",
-    "vite-tsconfig-paths": "5.0.1"
+    "vite": "7.0.4",
+    "vite-tsconfig-paths": "5.1.4"
   }
 }
diff --git a/examples/react-router-records/src/server.ts b/examples/react-router-records/src/server.ts
@@ -4,7 +4,7 @@ import { Hono } from 'hono';
 import { compress } from 'hono/compress';
 import type { RedirectStatusCode } from 'hono/utils/http-status';
 
-import { serverHandler } from './app.tsx';
+import { serverHandler } from './App.tsx';
 import { routes } from './routes.tsx';
 
 const server = new Hono();
@@ -67,7 +67,7 @@ if (import.meta.env.PROD) {
       fetch: server.fetch,
     },
     () => {
-      console.log(`🚀 Server running at http://localhost:${port}`);
+      console.log(`🚀 Server running at http://localhost:${port}/react-router-records`);
     },
   );
 }
diff --git a/examples/react-router-simple/package.json b/examples/react-router-simple/package.json
@@ -24,9 +24,9 @@
     "@ssrx/vite": "latest",
     "@types/react": "18.3.5",
     "@types/react-dom": "18.3.0",
-    "@vitejs/plugin-react": "4.3.1",
+    "@vitejs/plugin-react": "4.6.0",
     "typescript": "5.6.2",
-    "vite": "5.4.8",
-    "vite-tsconfig-paths": "5.0.1"
+    "vite": "7.0.4",
+    "vite-tsconfig-paths": "5.1.4"
   }
 }
diff --git a/examples/remix-vite/package.json b/examples/remix-vite/package.json
@@ -64,6 +64,6 @@
     "typescript-remix-routes-plugin": "1.0.1",
     "vite": "5.4.8",
     "vite-env-only": "3.0.3",
-    "vite-tsconfig-paths": "5.0.1"
+    "vite-tsconfig-paths": "5.1.4"
   }
 }
diff --git a/examples/solid-router-simple/package.json b/examples/solid-router-simple/package.json
@@ -23,8 +23,8 @@
   "devDependencies": {
     "@ssrx/vite": "latest",
     "typescript": "5.6.2",
-    "vite": "5.4.8",
-    "vite-plugin-solid": "2.9.1",
-    "vite-tsconfig-paths": "5.0.1"
+    "vite": "7.0.4",
+    "vite-plugin-solid": "2.11.7",
+    "vite-tsconfig-paths": "5.1.4"
   }
 }
diff --git a/examples/tanstack-router-simple/package.json b/examples/tanstack-router-simple/package.json
@@ -27,12 +27,12 @@
     "@tanstack/router-plugin": "1.57.13",
     "@types/react": "18.3.5",
     "@types/react-dom": "18.3.0",
-    "@vitejs/plugin-react": "4.3.1",
+    "@vitejs/plugin-react": "4.6.0",
     "autoprefixer": "10.4.20",
     "postcss": "8.4.47",
     "tailwindcss": "3.4.13",
     "typescript": "5.6.2",
     "vite": "5.4.8",
-    "vite-tsconfig-paths": "5.0.1"
+    "vite-tsconfig-paths": "5.1.4"
   }
 }
diff --git a/packages/plugin-solid-router/package.json b/packages/plugin-solid-router/package.json
@@ -35,6 +35,6 @@
   },
   "devDependencies": {
     "@solidjs/router": "0.11.2",
-    "esbuild-plugin-solid": "0.5.0"
+    "esbuild-plugin-solid": "0.6.0"
   }
 }
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -49,10 +49,10 @@
     "vite-env-only": "3.0.3"
   },
   "devDependencies": {
-    "esbuild": "0.24.0",
+    "esbuild": "0.25.6",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "rollup": "4.22.5",
-    "rollup-plugin-esbuild": "6.1.1"
+    "rollup": "4.45.0",
+    "rollup-plugin-esbuild": "6.2.1"
   }
 }
diff --git a/packages/remix/package.json b/packages/remix/package.json
@@ -41,8 +41,8 @@
   },
   "devDependencies": {
     "@remix-run/react": "2.12.0",
-    "esbuild": "0.24.0",
-    "rollup": "4.22.5",
-    "rollup-plugin-esbuild": "6.1.1"
+    "esbuild": "0.25.6",
+    "rollup": "4.45.0",
+    "rollup-plugin-esbuild": "6.2.1"
   }
 }
diff --git a/packages/renderer/package.json b/packages/renderer/package.json
@@ -53,9 +53,9 @@
   },
   "devDependencies": {
     "@types/node": "22.7.4",
-    "esbuild": "0.24.0",
-    "rollup": "4.22.5",
-    "rollup-plugin-esbuild": "6.1.1",
+    "esbuild": "0.25.6",
+    "rollup": "4.45.0",
+    "rollup-plugin-esbuild": "6.2.1",
     "type-fest": "4.26.1"
   }
 }
diff --git a/packages/vite/package.json b/packages/vite/package.json
@@ -49,9 +49,9 @@
   },
   "devDependencies": {
     "@total-typescript/ts-reset": "~0.6.1",
-    "esbuild": "0.24.0",
-    "rollup": "4.22.5",
-    "rollup-plugin-esbuild": "6.1.1",
-    "vite": "5.4.8"
+    "esbuild": "0.25.6",
+    "rollup": "4.45.0",
+    "rollup-plugin-esbuild": "6.2.1",
+    "vite": "7.0.4"
   }
 }
diff --git a/packages/vite/src/config.ts b/packages/vite/src/config.ts
@@ -1,6 +1,6 @@
 import * as path from 'path';
-import type { SSROptions } from 'vite';
-import { normalizePath } from 'vite';
+import type { MinimalPluginContextWithoutEnvironment, SSROptions } from 'vite';
+import { normalizePath, version } from 'vite';
 
 import type { ServerRuntime } from './types';
 
@@ -28,6 +28,7 @@ const RUNTIME_CONDITIONS: Record<ServerRuntime, string[]> = {
 export class Config {
   public root: string;
   public mode: string;
+  public minimalContext?: MinimalPluginContextWithoutEnvironment;
 
   #clientOutDir?: string;
   #serverOutDir?: string;
@@ -132,6 +133,10 @@ export class Config {
     return this.#basePath;
   }
 
+  get viteMajorVersion() {
+    return Number(version.split('.')[0]);
+  }
+
   /**
    * Normalize basePath when we set it. Vite sometimes adds slash at the end turning /foo into /foo/, or //foo etc.
    * We want to make sure basePath is always normalized to /foo.
diff --git a/packages/vite/src/plugins/build.ts b/packages/vite/src/plugins/build.ts
@@ -56,7 +56,7 @@ export const buildPlugin = ({ config, router, manifest }: BuildPluginOpts): Plug
         build: {
           manifest: !isSsr,
           outDir: isSsr ? config.serverOutDir : config.clientOutDir,
-          target: isSsr ? 'esnext' : 'modules',
+          target: isSsr ? 'esnext' : undefined,
           copyPublicDir: !isSsr,
           emptyOutDir: !isSsr,
           rollupOptions: {
diff --git a/packages/vite/src/plugins/config.ts b/packages/vite/src/plugins/config.ts
@@ -61,10 +61,11 @@ export const configPlugin = ({ config }: ConfigPluginOpts): Plugin => {
       } satisfies UserConfig;
     },
 
-    configResolved(viteConfig) {
+    configResolved(this, viteConfig) {
       config.root = viteConfig.root;
       config.mode = viteConfig.mode;
       config.basePath = viteConfig.base;
+      config.minimalContext = this;
     },
   };
 };
diff --git a/packages/vite/src/ssr-manifest.ts b/packages/vite/src/ssr-manifest.ts
@@ -124,7 +124,7 @@ export class Manifest<ExternalRoutes> {
           : // @ts-expect-error ignore
             hook.handler ?? hook.transform;
 
-      const transformedHtml = await handler(``, { path: requestUrl, server, filename: 'index.html' });
+      const transformedHtml = await handler.call(this.config.minimalContext!, ``, { path: requestUrl, server, filename: 'index.html' });
 
       if (!transformedHtml) continue;
 
diff --git a/yarn.config.cjs b/yarn.config.cjs
@@ -11,7 +11,8 @@ const { defineConfig } = require(`@yarnpkg/types`);
  */
 function enforceConsistentDependenciesAcrossTheProject({ Yarn }) {
   for (const dependency of Yarn.dependencies()) {
-    if (dependency.type === `peerDependencies` || dependency.ident.startsWith('@ssrx/')) continue;
+    if (dependency.type === `peerDependencies` || dependency.ident.startsWith('@ssrx/') || dependency.ident === 'vite')
+      continue;
 
     for (const otherDependency of Yarn.dependencies({ ident: dependency.ident })) {
       if (otherDependency.type === `peerDependencies`) continue;
diff --git a/yarn.lock b/yarn.lock

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'@ssrx/vite': minor
 +---
++
 +Updated plugin to comply with vite 7 new api
Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,9 @@`
`24`	`24`	`"@ssrx/vite": "latest",`
`25`	`25`	`"@types/react": "18.3.5",`
`26`	`26`	`"@types/react-dom": "18.3.0",`
`27`		`- "@vitejs/plugin-react": "4.3.1",`
	`27`	`+ "@vitejs/plugin-react": "4.6.0",`
`28`	`28`	`"typescript": "5.6.2",`
`29`		`- "vite": "5.4.8",`
`30`		`- "vite-tsconfig-paths": "5.0.1"`
	`29`	`+ "vite": "7.0.4",`
	`30`	`+ "vite-tsconfig-paths": "5.1.4"`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,6 @@`
`64`	`64`	`"typescript-remix-routes-plugin": "1.0.1",`
`65`	`65`	`"vite": "5.4.8",`
`66`	`66`	`"vite-env-only": "3.0.3",`
`67`		`- "vite-tsconfig-paths": "5.0.1"`
	`67`	`+ "vite-tsconfig-paths": "5.1.4"`
`68`	`68`	`}`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@`
`23`	`23`	`"devDependencies": {`
`24`	`24`	`"@ssrx/vite": "latest",`
`25`	`25`	`"typescript": "5.6.2",`
`26`		`- "vite": "5.4.8",`
`27`		`- "vite-plugin-solid": "2.9.1",`
`28`		`- "vite-tsconfig-paths": "5.0.1"`
	`26`	`+ "vite": "7.0.4",`
	`27`	`+ "vite-plugin-solid": "2.11.7",`
	`28`	`+ "vite-tsconfig-paths": "5.1.4"`
`29`	`29`	`}`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,6 @@`
`35`	`35`	`},`
`36`	`36`	`"devDependencies": {`
`37`	`37`	`"@solidjs/router": "0.11.2",`
`38`		`- "esbuild-plugin-solid": "0.5.0"`
	`38`	`+ "esbuild-plugin-solid": "0.6.0"`
`39`	`39`	`}`
`40`	`40`	`}`