Merge pull request #16 from edivados/dynimport-win

nksaraf · Nov 5, 2023 · df053f2 · df053f2
2 parents 52bc505 + 5ee5762
commit df053f2
Show file tree

Hide file tree

Showing 13 changed files with 431 additions and 62 deletions.
diff --git a/packages/vinxi-server-functions/server-handler.js b/packages/vinxi-server-functions/server-handler.js
@@ -2,25 +2,6 @@
 import invariant from "vinxi/lib/invariant";
 import { eventHandler, toWebRequest } from "vinxi/server";
 
-async function loadModule(id) {
-	if (import.meta.env.DEV) {
-		const mod = await import(
-			/* @vite-ignore */
-			import.meta.env.MANIFEST[import.meta.env.ROUTER_NAME].chunks[id].output
-				.path
-		);
-		return mod;
-	}
-
-	if (globalThis.$$chunks[id + ".js"]) {
-		return globalThis.$$chunks[id + ".js"];
-	}
-	return await import(
-		/* @vite-ignore */
-		import.meta.env.MANIFEST[import.meta.env.ROUTER_NAME].chunks[id].output.path
-	);
-}
-
 export async function handleServerAction(event) {
 	invariant(event.method === "POST", "Invalid method");
 
@@ -29,7 +10,7 @@ export async function handleServerAction(event) {
 		invariant(typeof serverReference === "string", "Invalid server action");
 		// This is the client-side case
 		const [filepath, name] = serverReference.split("#");
-		const action = (await loadModule(filepath))[name];
+		const action = (await import.meta.env.MANIFEST[import.meta.env.ROUTER_NAME].chunks[filepath].import())[name];
 		const text = await new Promise((resolve) => {
 			const requestBody = [];
 			event.node.req.on("data", (chunks) => {

diff --git a/packages/vinxi/lib/manifest/prod-server-manifest.js b/packages/vinxi/lib/manifest/prod-server-manifest.js
@@ -2,6 +2,7 @@ import invariant from "vinxi/lib/invariant";
 import { handlerModule, join, virtualId } from "vinxi/lib/path";
 
 import findAssetsInViteManifest from "./vite-manifest.js";
+import { pathToFileURL } from "node:url";
 
 /** @typedef {import("../app.js").App & { config: { buildManifest: { [key:string]: any } }}} ProdApp */
 
@@ -66,7 +67,7 @@ export function createProdManifest(app) {
 										if (globalThis.$$chunks[chunk + ".js"]) {
 											return globalThis.$$chunks[chunk + ".js"];
 										}
-										return import(/* @vite-ignore */ chunkPath);
+										return import(/* @vite-ignore */ pathToFileURL(chunkPath).href);
 									},
 									output: {
 										path: chunkPath,

diff --git a/packages/vinxi/types/manifest.d.ts b/packages/vinxi/types/manifest.d.ts
@@ -20,7 +20,7 @@ export type Manifest = {
 		[key: string]: {
 			/** Assets needed by this entry point */
 			assets(): Promise<Asset[]>;
-
+			import<T = { default: any; [k: string]: any }>(): Promise<T>;
 			output: {
 				/** Path to built artifact for this entry point. */
 				path: string;