feat: add support for experimental Vite runtime (#95)

ci/ci.test.ts

@@ -11,7 +11,7 @@ import { kill } from "node:process";
 const TEST_HOST = "http://localhost:3000";
 
 const browser = await puppeteer.launch({
-	headless: "new",
+	headless: true,
 	defaultViewport: { width: 1200, height: 800 },
 });
 
@@ -44,12 +44,16 @@ const [major, minor] = process.version
 const cases: Array<{
 	framework: string;
 	file: string;
-	env: "production" | "development" | "with-loader";
+	env: "production" | "development" | "with-loader" | "with-vite-runtime";
 }> = [
 	...baseCases.map((x) => ({ ...x, env: "production" as const })),
 	...baseCases.map((x) => ({ ...x, env: "development" as const })),
 ];
 
+cases.push(
+	...baseCases.map((x) => ({ ...x, env: "with-vite-runtime" as const })),
+);
+
 const loaderAvailable =
 	(major > 16 || (major === 16 && minor >= 12)) && major < 20;
 
@@ -84,6 +88,9 @@ describe.each(cases)("$framework - $env ", ({ framework, env, file }) => {
 						(process.env.NODE_OPTIONS ?? "") +
 						" -r vavite/suppress-loader-warnings --loader vavite/node-loader",
 				}),
+				...(env === "with-vite-runtime" && {
+					USE_VITE_RUNTIME: "true",
+				}),
 			},
 		});
 

examples/express/package.json

@@ -15,7 +15,7 @@
     "@types/node": "^20.11.16",
     "typescript": "^5.3.3",
     "vavite": "4.0.3",
-    "vite": "^5.0.12"
+    "vite": "^5.1.2"
   },
   "dependencies": {
     "express": "^4.18.2"

examples/express/server.ts

@@ -3,6 +3,8 @@
 import express, { RequestHandler } from "express";
 import viteDevServer from "vavite/vite-dev-server";
 
+console.log("Running the server");
+
 const app = express();
 
 // This is an optional optimization to load routes lazily so that

examples/fastify-vite-plugin-ssr/package.json

@@ -21,6 +21,6 @@
     "typescript": "^5.3.3",
     "vavite": "4.0.3",
     "vike": "^0.4.160",
-    "vite": "^5.0.12"
+    "vite": "^5.1.2"
   }
 }

examples/fastify/package.json

@@ -14,7 +14,7 @@
     "@types/node": "^20.11.16",
     "typescript": "^5.3.3",
     "vavite": "4.0.3",
-    "vite": "^5.0.12"
+    "vite": "^5.1.2"
   },
   "dependencies": {
     "fastify": "^4.26.0"

examples/hapi/package.json

@@ -14,7 +14,7 @@
     "@types/node": "^20.11.16",
     "typescript": "^5.3.3",
     "vavite": "4.0.3",
-    "vite": "^5.0.12"
+    "vite": "^5.1.2"
   },
   "dependencies": {
     "@hapi/hapi": "^21.3.3"

examples/koa/package.json

@@ -16,7 +16,7 @@
     "@types/node": "^20.11.16",
     "typescript": "^5.3.3",
     "vavite": "4.0.3",
-    "vite": "^5.0.12"
+    "vite": "^5.1.2"
   },
   "dependencies": {
     "@koa/router": "^12.0.1",

examples/nestjs-vite-plugin-ssr/package.json

@@ -21,7 +21,7 @@
     "rollup-plugin-swc3": "^0.11.0",
     "typescript": "^5.3.3",
     "vavite": "4.0.3",
-    "vite": "^5.0.12",
+    "vite": "^5.1.2",
     "vite-tsconfig-paths": "^4.3.1"
   },
   "dependencies": {

examples/nestjs/package.json

@@ -17,7 +17,7 @@
     "rollup-plugin-swc3": "^0.11.0",
     "typescript": "^5.3.3",
     "vavite": "4.0.3",
-    "vite": "^5.0.12"
+    "vite": "^5.1.2"
   },
   "dependencies": {
     "@nestjs/common": "^10.3.2",

examples/simple-standalone/package.json

@@ -11,6 +11,6 @@
     "@types/node": "^20.11.16",
     "typescript": "^5.3.3",
     "vavite": "4.0.3",
-    "vite": "^5.0.12"
+    "vite": "^5.1.2"
   }
 }

examples/socket-io/package.json

@@ -15,7 +15,7 @@
     "@types/node": "^20.11.16",
     "typescript": "^5.3.3",
     "vavite": "4.0.3",
-    "vite": "^5.0.12"
+    "vite": "^5.1.2"
   },
   "dependencies": {
     "express": "^4.18.2",

examples/ssr-react-express/package.json

@@ -15,7 +15,7 @@
     "@vitejs/plugin-react": "^4.2.1",
     "typescript": "^5.3.3",
     "vavite": "4.0.3",
-    "vite": "^5.0.12"
+    "vite": "^5.1.2"
   },
   "dependencies": {
     "express": "^4.18.2",

examples/ssr-vue-express/package.json

@@ -13,7 +13,7 @@
     "@vitejs/plugin-vue": "^5.0.3",
     "typescript": "^5.3.3",
     "vavite": "4.0.3",
-    "vite": "^5.0.12"
+    "vite": "^5.1.2"
   },
   "dependencies": {
     "express": "^4.18.2",

examples/vite-plugin-ssr/package.json

@@ -21,6 +21,6 @@
     "typescript": "^5.3.3",
     "vavite": "4.0.3",
     "vike": "^0.4.160",
-    "vite": "^5.0.12"
+    "vite": "^5.1.2"
   }
 }

packages/connect/package.json

@@ -50,7 +50,7 @@
     "sirv": "^2.0.4",
     "tsup": "^8.0.1",
     "typescript": "^5.3.3",
-    "vite": "^5.0.12"
+    "vite": "^5.1.2"
   },
   "dependencies": {
     "@types/node": "^20.11.16"

packages/connect/src/index.ts

@@ -38,6 +38,12 @@ export interface VaviteConnectOptions {
 	 * @default true
 	 */
 	bundleSirv?: boolean;
+
+	/** Whether to use the vite runtime to execute the server entry.
+	 * @experimental
+	 * @default false (can be overriden by the USE_VITE_RUNTIME environment variable to "true")
+	 */
+	useViteRuntime?: boolean;
 }
 
 export function vaviteConnect(options: VaviteConnectOptions = {}): Plugin[] {
@@ -48,8 +54,11 @@ export function vaviteConnect(options: VaviteConnectOptions = {}): Plugin[] {
 		standalone = true,
 		clientAssetsDir = null,
 		bundleSirv = true,
+		useViteRuntime = process.env.USE_VITE_RUNTIME === "true",
 	} = options;
 
+	let viteRuntime: import("vite/runtime").ViteRuntime | undefined;
+
 	return [
 		{
 			name: "@vavite/connect:resolve",
@@ -117,7 +126,22 @@ export function vaviteConnect(options: VaviteConnectOptions = {}): Plugin[] {
 						req.url = req.originalUrl || req.url;
 
 						try {
-							const module = await server.ssrLoadModule(handlerEntry);
+							let runner:
+								| typeof server.ssrLoadModule
+								| import("vite/runtime").ViteRuntime["executeEntrypoint"] =
+								server.ssrLoadModule.bind(server);
+
+							if (useViteRuntime) {
+								if (!viteRuntime) {
+									const { createViteRuntime } = await import("vite");
+									viteRuntime = await createViteRuntime(server);
+								}
+
+								runner = viteRuntime.executeEntrypoint.bind(viteRuntime);
+							}
+
+							const module = await runner(handlerEntry);
+
 							await module.default(req, res, (error: unknown) => {
 								if (error) {
 									next(error);

packages/expose-vite-dev-server/package.json

@@ -44,6 +44,6 @@
     "eslint": "^8.56.0",
     "tsup": "^8.0.1",
     "typescript": "^5.3.3",
-    "vite": "^5.0.12"
+    "vite": "^5.1.2"
   }
 }

packages/multibuild-cli/package.json

@@ -30,7 +30,7 @@
     "eslint": "^8.56.0",
     "tsup": "^8.0.1",
     "typescript": "^5.3.3",
-    "vite": "^5.0.12"
+    "vite": "^5.1.2"
   },
   "dependencies": {
     "@types/node": "^20.11.16",

packages/multibuild/package.json

@@ -39,7 +39,7 @@
     "eslint": "^8.56.0",
     "tsup": "^8.0.1",
     "typescript": "^5.3.3",
-    "vite": "^5.0.12"
+    "vite": "^5.1.2"
   },
   "dependencies": {
     "@types/node": "^20.11.16",

packages/node-loader/package.json

@@ -47,6 +47,6 @@
     "sirv": "^2.0.4",
     "tsup": "^8.0.1",
     "typescript": "^5.3.3",
-    "vite": "^5.0.12"
+    "vite": "^5.1.2"
   }
 }

packages/reloader/package.json

@@ -45,6 +45,6 @@
     "eslint": "^8.56.0",
     "tsup": "^8.0.1",
     "typescript": "^5.3.3",
-    "vite": "^5.0.12"
+    "vite": "^5.1.2"
   }
 }

packages/reloader/src/index.ts

@@ -28,16 +28,24 @@ export interface VaviteReloaderOptions {
 	 * @default false
 	 */
 	serveClientAssetsInDev?: boolean;
+
+	/** Whether to use the vite runtime to execute the server entry.
+	 * @experimental
+	 * @default false (can be overriden by the USE_VITE_RUNTIME environment variable to "true")
+	 */
+	useViteRuntime?: boolean;
 }
 
 export function reloader({
 	entry = "/server",
 	reloadOn = "any-change",
 	serveClientAssetsInDev = false,
+	useViteRuntime = process.env.USE_VITE_RUNTIME === "true",
 }: VaviteReloaderOptions = {}): Plugin {
 	let resolvedEntry: string;
 	let entryDeps: Set<string>;
 	let globalSymbol: string;
+	let viteRuntime: import("vite/runtime").ViteRuntime | undefined;
 
 	function getModuleContents() {
 		return `export default ${globalSymbol}`;
@@ -69,7 +77,21 @@ export function reloader({
 		}
 
 		resolvedEntry = resolved.id;
-		await viteServer.ssrLoadModule(resolvedEntry);
+
+		let runner:
+			| typeof viteServer.ssrLoadModule
+			| import("vite/runtime").ViteRuntime["executeEntrypoint"] =
+			viteServer.ssrLoadModule.bind(viteServer);
+
+		if (useViteRuntime) {
+			if (!viteRuntime) {
+				const { createViteRuntime } = await import("vite");
+				viteRuntime = await createViteRuntime(viteServer);
+			}
+			runner = viteRuntime.executeEntrypoint.bind(viteRuntime);
+		}
+
+		await runner(resolvedEntry);
 
 		if (reloadOn === "any-change") return;
 

packages/vavite/package.json

@@ -56,7 +56,7 @@
     "sirv": "^2.0.4",
     "tsup": "^8.0.1",
     "typescript": "^5.3.3",
-    "vite": "^5.0.12"
+    "vite": "^5.1.2"
   },
   "dependencies": {
     "@vavite/connect": "workspace:*",

packages/vavite/src/index.ts

@@ -49,6 +49,11 @@ export interface VaviteOptions {
 	 * @default "any-change"
 	 */
 	reloadOn?: "any-change" | "static-deps-change";
+	/** Whether to use the vite runtime to execute the server entry.
+	 * @experimental
+	 * @default false (can be overriden by the USE_VITE_RUNTIME environment variable to "true")
+	 */
+	useViteRuntime?: boolean;
 }
 
 export function vavite(options: VaviteOptions): PluginOption {
@@ -60,6 +65,7 @@ export function vavite(options: VaviteOptions): PluginOption {
 		clientAssetsDir,
 		bundleSirv,
 		reloadOn,
+		useViteRuntime,
 	} = options;
 
 	if (!serverEntry && !handlerEntry) {
@@ -116,6 +122,7 @@ export function vavite(options: VaviteOptions): PluginOption {
 				standalone,
 				clientAssetsDir,
 				bundleSirv,
+				useViteRuntime,
 			}),
 		);
 	} else {
@@ -124,6 +131,7 @@ export function vavite(options: VaviteOptions): PluginOption {
 				entry: serverEntry,
 				serveClientAssetsInDev,
 				reloadOn,
+				useViteRuntime,
 			}),
 		);
 	}