@solidjs/start 2.0.0-alpha.0 → 2.0.0-alpha.2

package/src/config/fs-routes/fs-watcher.ts

@@ -1,81 +1,77 @@
 import type {
-	EnvironmentModuleNode,
-	FSWatcher,
-	ModuleGraph,
-	ModuleNode,
-	PluginOption,
-	ViteDevServer,
+  EnvironmentModuleNode,
+  FSWatcher,
+  ModuleGraph,
+  ModuleNode,
+  PluginOption,
+  ViteDevServer,
 } from "vite";
 import { moduleId } from "./index.ts";
 import type { BaseFileSystemRouter } from "./router.ts";
 
 interface CompiledRouter {
-	removeRoute(path: string): void;
-	addRoute(path: string): void;
-	updateRoute(path: string): void;
-	addEventListener(event: "reload", handler: () => void): void;
-	removeEventListener(event: "reload", handler: () => void): void;
+  removeRoute(path: string): void;
+  addRoute(path: string): void;
+  updateRoute(path: string): void;
+  addEventListener(event: "reload", handler: () => void): void;
+  removeEventListener(event: "reload", handler: () => void): void;
 }
 
 function setupWatcher(watcher: FSWatcher, routes: CompiledRouter): void {
-	watcher.on("unlink", (path) => routes.removeRoute(path));
-	watcher.on("add", (path) => routes.addRoute(path));
-	watcher.on("change", (path) => routes.updateRoute(path));
+  watcher.on("unlink", path => routes.removeRoute(path));
+  watcher.on("add", path => routes.addRoute(path));
+  watcher.on("change", path => routes.updateRoute(path));
 }
 
 function createRoutesReloader(
-	server: ViteDevServer,
-	routes: CompiledRouter,
-	environment: "client" | "ssr",
+  server: ViteDevServer,
+  routes: CompiledRouter,
+  environment: "client" | "ssr",
 ): () => void {
-	routes.addEventListener("reload", handleRoutesReload);
-	return () => routes.removeEventListener("reload", handleRoutesReload);
+  routes.addEventListener("reload", handleRoutesReload);
+  return () => routes.removeEventListener("reload", handleRoutesReload);
 
-	function handleRoutesReload(): void {
-		if (environment === "ssr") {
-			// Handle server environment HMR reload
-			const serverEnv = server.environments.server;
-			if (serverEnv && serverEnv.moduleGraph) {
-				const mod: EnvironmentModuleNode | undefined =
-					serverEnv.moduleGraph.getModuleById(moduleId);
-				if (mod) {
-					const seen = new Set<EnvironmentModuleNode>();
-					serverEnv.moduleGraph.invalidateModule(mod, seen);
-				}
-			}
-		} else {
-			// Handle client environment HMR reload
-			const { moduleGraph }: { moduleGraph: ModuleGraph } = server;
-			const mod: ModuleNode | undefined = moduleGraph.getModuleById(moduleId);
-			if (mod) {
-				const seen = new Set<ModuleNode>();
-				moduleGraph.invalidateModule(mod, seen);
-				server.reloadModule(mod);
-			}
-		}
+  function handleRoutesReload(): void {
+    if (environment === "ssr") {
+      // Handle server environment HMR reload
+      const serverEnv = server.environments.server;
+      if (serverEnv && serverEnv.moduleGraph) {
+        const mod: EnvironmentModuleNode | undefined =
+          serverEnv.moduleGraph.getModuleById(moduleId);
+        if (mod) {
+          const seen = new Set<EnvironmentModuleNode>();
+          serverEnv.moduleGraph.invalidateModule(mod, seen);
+        }
+      }
+    } else {
+      // Handle client environment HMR reload
+      const { moduleGraph }: { moduleGraph: ModuleGraph } = server;
+      const mod: ModuleNode | undefined = moduleGraph.getModuleById(moduleId);
+      if (mod) {
+        const seen = new Set<ModuleNode>();
+        moduleGraph.invalidateModule(mod, seen);
+        server.reloadModule(mod);
+      }
+    }
 
-		if (!server.hot) {
-			server.ws.send({ type: "full-reload" });
-		}
-	}
+    if (!server.hot) {
+      server.ws.send({ type: "full-reload" });
+    }
+  }
 }
 
 export const fileSystemWatcher = (
-	routers: Record<"client" | "ssr", BaseFileSystemRouter>,
+  routers: Record<"client" | "ssr", BaseFileSystemRouter>,
 ): PluginOption => {
-	const plugin: PluginOption = {
-		name: "fs-watcher",
-		async configureServer(server: ViteDevServer) {
-			Object.keys(routers).forEach((environment) => {
-				const router = (globalThis as any).ROUTERS[environment];
-				setupWatcher(server.watcher, router);
-				createRoutesReloader(
-					server,
-					router,
-					environment as keyof typeof routers,
-				);
-			});
-		},
-	};
-	return plugin;
+  const plugin: PluginOption = {
+    name: "fs-watcher",
+    async configureServer(server: ViteDevServer) {
+      Object.keys(routers).forEach(environment => {
+        const router = (globalThis as any).ROUTERS[environment];
+        setupWatcher(server.watcher, router);
+        createRoutesReloader(server, router, environment as keyof typeof routers);
+      });
+    },
+  };
+  return plugin;
 };

package/src/config/fs-routes/index.ts

@@ -8,131 +8,129 @@ import { treeShake } from "./tree-shake.ts";
 export const moduleId = "solid-start:routes";
 
 export interface FsRoutesArgs {
-	routers: Record<"client" | "ssr", BaseFileSystemRouter>;
+  routers: Record<"client" | "ssr", BaseFileSystemRouter>;
 }
 
 export function fsRoutes({ routers }: FsRoutesArgs): Array<PluginOption> {
-	(globalThis as any).ROUTERS = routers;
-
-	return [
-		{
-			name: "solid-start-fs-routes",
-			enforce: "pre",
-			resolveId(id) {
-				if (id === moduleId) return id;
-			},
-			async load(id) {
-				const root = this.environment.config.root;
-				const isBuild = this.environment.mode === "build";
-
-				if (id !== moduleId) return;
-				const js = jsCode();
-
-				const router = (globalThis as any).ROUTERS[this.environment.name];
-
-				const routes = await router.getRoutes();
-
-				let routesCode = JSON.stringify(routes ?? [], (k, v) => {
-					if (v === undefined) return undefined;
-
-					if (k.startsWith("$$")) {
-						const buildId = `${v.src}?${v.pick.map((p: any) => `pick=${p}`).join("&")}`;
-
-						/**
-						 * @type {{ [key: string]: string }}
-						 */
-						const refs: Record<string, string> = {};
-						for (var pick of v.pick) {
-							refs[pick] = js.addNamedImport(pick, buildId);
-						}
-						return {
-							require: `_$() => ({ ${Object.entries(refs)
-								.map(([pick, namedImport]) => `'${pick}': ${namedImport}`)
-								.join(", ")} })$_`,
-							// src: isBuild ? relative(root, buildId) : buildId
-						};
-					} else if (k.startsWith("$")) {
-						const buildId = `${v.src}?${v.pick.map((p: any) => `pick=${p}`).join("&")}`;
-						return {
-							src: relative(root, buildId),
-							build: isBuild
-								? `_$() => import(/* @vite-ignore */ '${buildId}')$_`
-								: undefined,
-							import: `_$() => import(/* @vite-ignore */ '${buildId}')$_`
-						};
-					}
-					return v;
-				});
-
-				routesCode = routesCode.replaceAll('"_$(', "(").replaceAll(')$_"', ")");
-
-				const code = `
+  (globalThis as any).ROUTERS = routers;
+
+  return [
+    {
+      name: "solid-start-fs-routes",
+      enforce: "pre",
+      resolveId(id) {
+        if (id === moduleId) return id;
+      },
+      async load(id) {
+        const root = this.environment.config.root;
+        const isBuild = this.environment.mode === "build";
+
+        if (id !== moduleId) return;
+        const js = jsCode();
+
+        const router = (globalThis as any).ROUTERS[this.environment.name];
+
+        const routes = await router.getRoutes();
+
+        let routesCode = JSON.stringify(routes ?? [], (k, v) => {
+          if (v === undefined) return undefined;
+
+          if (k.startsWith("$$")) {
+            const buildId = `${v.src}?${v.pick.map((p: any) => `pick=${p}`).join("&")}`;
+
+            /**
+             * @type {{ [key: string]: string }}
+             */
+            const refs: Record<string, string> = {};
+            for (var pick of v.pick) {
+              refs[pick] = js.addNamedImport(pick, buildId);
+            }
+            return {
+              require: `_$() => ({ ${Object.entries(refs)
+                .map(([pick, namedImport]) => `'${pick}': ${namedImport}`)
+                .join(", ")} })$_`,
+              // src: isBuild ? relative(root, buildId) : buildId
+            };
+          } else if (k.startsWith("$")) {
+            const buildId = `${v.src}?${v.pick.map((p: any) => `pick=${p}`).join("&")}`;
+            return {
+              src: relative(root, buildId),
+              build: isBuild ? `_$() => import(/* @vite-ignore */ '${buildId}')$_` : undefined,
+              import: `_$() => import(/* @vite-ignore */ '${buildId}')$_`,
+            };
+          }
+          return v;
+        });
+
+        routesCode = routesCode.replaceAll('"_$(', "(").replaceAll(')$_"', ")");
+
+        const code = `
 ${js.getImportStatements()}
 export default ${routesCode}`;
-				return code;
-			},
-		},
-		treeShake(),
-		fileSystemWatcher(routers),
-	];
+        return code;
+      },
+    },
+    treeShake(),
+    fileSystemWatcher(routers),
+  ];
 }
 
 function jsCode() {
-	const imports = new Map();
-	let vars = 0;
-
-	function addImport(p: any) {
-		let id = imports.get(p);
-		if (!id) {
-			id = {};
-			imports.set(p, id);
-		}
-
-		const d = "routeData" + vars++;
-		id["default"] = d;
-		return d;
-	}
-
-	function addNamedImport(name: string | number, p: any) {
-		let id = imports.get(p);
-		if (!id) {
-			id = {};
-			imports.set(p, id);
-		}
-
-		const d = "routeData" + vars++;
-		id[name] = d;
-		return d;
-	}
-
-	const getNamedExport = (p: any) => {
-		const id = imports.get(p);
-
-		delete id["default"];
-
-		return Object.keys(id).length > 0
-			? `{ ${Object.keys(id)
-					.map((k) => `${k} as ${id[k]}`)
-					.join(", ")} }`
-			: "";
-	};
-
-	const getImportStatements = () => {
-		return `${[...imports.keys()]
-			.map(
-				(i) =>
-					`import ${
-						imports.get(i).default
-							? `${imports.get(i).default}${Object.keys(imports.get(i)).length > 1 ? ", " : ""}`
-							: ""
-					} ${getNamedExport(i)} from '${i}';`,
-			)
-			.join("\n")}`;
-	};
-
-	return {
-		addImport,
-		addNamedImport,
-		getImportStatements,
-	};
+  const imports = new Map();
+  let vars = 0;
+
+  function addImport(p: any) {
+    let id = imports.get(p);
+    if (!id) {
+      id = {};
+      imports.set(p, id);
+    }
+
+    const d = "routeData" + vars++;
+    id["default"] = d;
+    return d;
+  }
+
+  function addNamedImport(name: string | number, p: any) {
+    let id = imports.get(p);
+    if (!id) {
+      id = {};
+      imports.set(p, id);
+    }
+
+    const d = "routeData" + vars++;
+    id[name] = d;
+    return d;
+  }
+
+  const getNamedExport = (p: any) => {
+    const id = imports.get(p);
+
+    delete id["default"];
+
+    return Object.keys(id).length > 0
+      ? `{ ${Object.keys(id)
+          .map(k => `${k} as ${id[k]}`)
+          .join(", ")} }`
+      : "";
+  };
+
+  const getImportStatements = () => {
+    return `${[...imports.keys()]
+      .map(
+        i =>
+          `import ${
+            imports.get(i).default
+              ? `${imports.get(i).default}${Object.keys(imports.get(i)).length > 1 ? ", " : ""}`
+              : ""
+          } ${getNamedExport(i)} from '${i}';`,
+      )
+      .join("\n")}`;
+  };
+
+  return {
+    addImport,
+    addNamedImport,
+    getImportStatements,
+  };
 }

package/src/config/fs-routes/router.ts

@@ -1,5 +1,4 @@
-import { init } from "es-module-lexer";
-import { parse } from "es-module-lexer";
+import { init, parse } from "es-module-lexer";
 import esbuild from "esbuild";
 import fg from "fast-glob";
 import fs from "fs";
@@ -7,7 +6,7 @@ import micromatch from "micromatch";
 import { posix } from "path";
 import { pathToRegexp } from "path-to-regexp";
 
-import { normalize } from "node:path";
+import { normalizePath } from "vite";
 
 export { pathToRegexp };
 
@@ -27,9 +26,9 @@ export function analyzeModule(src: string) {
     esbuild.transformSync(fs.readFileSync(src, "utf-8"), {
       jsx: "transform",
       format: "esm",
-      loader: "tsx"
+      loader: "tsx",
     }).code,
-    src
+    src,
   );
 }
 
@@ -86,9 +85,9 @@ export class BaseFileSystemRouter extends EventTarget {
     return {
       $component: {
         src: src,
-        pick: ["default", "$css"]
+        pick: ["default", "$css"],
       },
-      path
+      path,
       // filePath: src
     };
   }
@@ -104,7 +103,7 @@ export class BaseFileSystemRouter extends EventTarget {
   }
 
   async addRoute(src: string) {
-    src = normalize(src);
+    src = normalizePath(src);
     if (this.isRoute(src)) {
       try {
         const route = this.toRoute(src);
@@ -123,14 +122,14 @@ export class BaseFileSystemRouter extends EventTarget {
       new Event("reload", {
         // @ts-ignore
         detail: {
-          route
-        }
-      })
+          route,
+        },
+      }),
     );
   }
 
   async updateRoute(src: string) {
-    src = normalize(src);
+    src = normalizePath(src);
     if (this.isRoute(src)) {
       try {
         const route = this.toRoute(src);
@@ -146,7 +145,7 @@ export class BaseFileSystemRouter extends EventTarget {
   }
 
   removeRoute(src: string) {
-    src = normalize(src);
+    src = normalizePath(src);
     if (this.isRoute(src)) {
       const path = this.toPath(src);
       if (path === undefined) {