docs(changeset): move back to vite 4

.changeset/gentle-melons-rescue.md

@@ -0,0 +1,5 @@
+---
+"vinxi": patch
+---
+
+move back to vite 4

examples/react/rsc/spa/app.config.js

@@ -3,7 +3,7 @@ import { serverFunctions } from "@vinxi/plugin-server-functions";
 import reactRefresh from "@vitejs/plugin-react";
 import { createApp } from "vinxi";
 
-export default createApp({
+const app = createApp({
 	routers: [
 		{
 			name: "public",
@@ -51,3 +51,9 @@ export default createApp({
 		},
 	],
 });
+
+app.hooks.hook("app:build:router:vite:config:resolved", ({ vite }) => {
+	console.log(vite.build.rollupOptions.input);
+});
+
+export default app;

examples/solid/spa/basic/package.json

@@ -14,7 +14,7 @@
     "solid-js": "^1.7.11",
     "tailwindcss": "^3.3.3",
     "vinxi": "0.0.42",
-    "vite": "^4.4.9",
+    "vite": "^4.5.0",
     "vite-plugin-solid": "^2.7.0"
   }
 }

examples/vanilla/spa/package.json

@@ -13,6 +13,6 @@
     "@vinxi/plugin-server-functions": "workspace:^",
     "autoprefixer": "^10.4.15",
     "tailwindcss": "^3.3.3",
-    "vinxi": "0.0.38"
+    "vinxi": "0.0.42"
   }
 }

packages/vinxi-mdx/package.json

@@ -38,7 +38,7 @@
     "@types/resolve": "^1.20.2",
     "@types/unist": "^2.0.7",
     "typescript": "^5.2.2",
-    "vite": "^4.4.9"
+    "vite": "^4.5.0"
   },
   "description": "Vite plugin for MDX",
   "license": "MIT",

packages/vinxi/lib/build.js

@@ -11,7 +11,13 @@ import { createIncomingMessage, createServerResponse } from "./http-stream.js";
 import invariant from "./invariant.js";
 import { consola, withLogger } from "./logger.js";
 import { createSPAManifest } from "./manifest/spa-manifest.js";
-import { handlerModule, join, relative, virtualId } from "./path.js";
+import {
+	handlerModule,
+	join,
+	relative,
+	virtualId,
+	viteManifestPath,
+} from "./path.js";
 import { config } from "./plugins/config.js";
 import { manifest } from "./plugins/manifest.js";
 import { routes } from "./plugins/routes.js";
@@ -95,10 +101,7 @@ export async function createBuild(app, buildConfig) {
 					if (router.mode === "handler") {
 						invariant(router.handler, "Missing router.handler");
 						const bundlerManifest = JSON.parse(
-							readFileSync(
-								join(router.outDir, router.base, ".vite", "manifest.json"),
-								"utf-8",
-							),
+							readFileSync(viteManifestPath(router), "utf-8"),
 						);
 
 						const virtualHandlerId = virtualId(handlerModule(router));
@@ -193,15 +196,7 @@ export async function createBuild(app, buildConfig) {
 							.map((router) => {
 								if (router.mode !== "static") {
 									const bundlerManifest = JSON.parse(
-										readFileSync(
-											join(
-												router.outDir,
-												router.base,
-												".vite",
-												"manifest.json",
-											),
-											"utf-8",
-										),
+										readFileSync(viteManifestPath(router), "utf-8"),
 									);
 									return [router.name, bundlerManifest];
 								}
@@ -387,6 +382,16 @@ async function createRouterBuild(app, router) {
 			routerModePlugin[buildRouter.internals.mode.name]?.(buildRouter) ?? [],
 			buildTargetPlugin[buildRouter.target]?.(buildRouter) ?? [],
 			...((await buildRouter.plugins?.(buildRouter)) ?? []),
+			{
+				name: "vinxi:build:router:config",
+				async configResolved(config) {
+					await app.hooks.callHook("app:build:router:vite:config:resolved", {
+						vite: config,
+						router: buildRouter,
+						app,
+					});
+				},
+			},
 		],
 	};
 
@@ -543,7 +548,17 @@ const routerModePlugin = {
 			},
 		}),
 	],
-	spa: () => [
+	spa: (router) => [
+		router.handler?.endsWith(".html")
+			? undefined
+			: virtual(
+					{
+						[handlerModule(router)]: ({ config }) => {
+							return `export default {}`;
+						},
+					},
+					"handler",
+			  ),
 		spaManifest(),
 		config("appType", {
 			appType: "custom",
@@ -643,6 +658,7 @@ function browserBuild() {
 			if (env.command === "build") {
 				invariant(router && router.mode !== "static", "Invalid router");
 				const { join } = await import("./path.js");
+				console.log(await getEntries(router));
 				return {
 					build: {
 						rollupOptions: {

packages/vinxi/lib/chunks.js

@@ -1,5 +1,5 @@
 import { readFileSync } from "fs";
-import { join } from "vinxi/lib/path";
+import { join, viteManifestPath } from "vinxi/lib/path";
 
 const CHUNK_PREFIX = "c_";
 
@@ -18,10 +18,7 @@ function getChunks(app, routerName, modIndex) {
 
 	try {
 		const bundlerManifest = JSON.parse(
-			readFileSync(
-				join(router.outDir, router.base, ".vite", "manifest.json"),
-				"utf-8",
-			),
+			readFileSync(viteManifestPath(router), "utf-8"),
 		);
 
 		const chunks = Object.entries(bundlerManifest)

packages/vinxi/lib/path.js

@@ -1,3 +1,5 @@
+import { join } from "pathe";
+
 export * from "pathe";
 
 export function virtualId(/** @type {string} */ moduleName) {
@@ -7,5 +9,14 @@ export function virtualId(/** @type {string} */ moduleName) {
 export function handlerModule(
 	/** @type {import("./router-mode").Router} */ router,
 ) {
-	return `#vinxi/handler/${router.name}`;
+	return router.handler?.endsWith(".html")
+		? router.handler
+		: `#vinxi/handler/${router.name}`;
+}
+
+export function viteManifestPath(
+	/** @type {import("./router-mode").Router} */ router,
+) {
+	// return join(router.outDir, router.base, ".vite", "manifest.json");
+	return join(router.outDir, router.base, "manifest.json");
 }

packages/vinxi/lib/plugins/manifest.js

@@ -22,6 +22,8 @@ export function manifest() {
 				if (!router || !app) {
 					throw new Error("Missing router or app");
 				}
+
+				console.log(router.name, router.handler);
 				return {
 					define: {
 						"import.meta.env.MANIFEST": `globalThis.MANIFEST`,

packages/vinxi/package.json

@@ -163,7 +163,7 @@
     "unenv": "^1.7.4",
     "unimport": "^3.2.0",
     "unstorage": "^1.9.0",
-    "vite": "5.0.0-beta.7",
+    "vite": "4.5.0",
     "ws": "^8.13.0",
     "zod": "^3.22.2"
   },