use import helper in lazy route and runtime path normalization

solidjs · Nov 5, 2023 · 39a332d · 39a332d
1 parent 0d0e6b6
commit 39a332d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/start-new/config/index.js b/packages/start-new/config/index.js
@@ -3,10 +3,12 @@ import defu from "defu";
 import { join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { createApp, resolve } from "vinxi";
+import { normalize } from "vinxi/lib/path";
 import { config } from "vinxi/plugins/config";
 import solid from "vite-plugin-solid";
 import { SolidStartClientFileRouter, SolidStartServerFileRouter } from "./fs-router.js";
 import { serverComponents } from "./server-components.js";
+
 const DEFAULT_EXTENSIONS = ["js", "jsx", "ts", "tsx"];
 
 function solidStartClientFsRouter(config) {
@@ -105,7 +107,7 @@ export function defineConfig(baseConfig = {}) {
           config("user", userConfig),
           ...plugins,
           serverFunctions.client({
-            runtime: fileURLToPath(new URL("./server-runtime.jsx", import.meta.url))
+            runtime: normalize(fileURLToPath(new URL("./server-runtime.jsx", import.meta.url)))
           }),
           start.islands ? serverComponents.client() : null,
           solid({ ssr: start.ssr, extensions: extensions.map(ext => `.${ext}`) }),

diff --git a/packages/start-new/shared/lazyRoute.tsx b/packages/start-new/shared/lazyRoute.tsx
@@ -14,9 +14,7 @@ export default function lazyRoute(
 		if (import.meta.env.DEV) {
 			let manifest = import.meta.env.SSR ? serverManifest : clientManifest;
 
-			const mod = await import(
-				/* @vite-ignore */ manifest.inputs[component.src].output.path
-			);
+			const mod = await manifest.inputs[component.src].import();
 			if (!mod[exported]) console.error(`Module ${component.src} does not export ${exported}`)
 			const Component = mod[exported];
 			let assets = await clientManifest.inputs?.[component.src].assets();