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

package/src/config/dev-server.ts

@@ -1,84 +1,92 @@
 import { NodeRequest, sendNodeResponse } from "srvx/node";
 import {
-	type Connect,
-	isRunnableDevEnvironment,
-	type PluginOption,
-	type ViteDevServer,
+  type Connect,
+  isRunnableDevEnvironment,
+  type PluginOption,
+  type ViteDevServer,
 } from "vite";
 import { VITE_ENVIRONMENTS } from "./constants.ts";
 
 export function devServer(): Array<PluginOption> {
-	return [
-		{
-			name: "solid-start-dev-server",
-			configureServer(viteDevServer) {
-				(globalThis as any).VITE_DEV_SERVER = viteDevServer;
-				return async () => {
-				  if (viteDevServer.config.server.middlewareMode) return
+  return [
+    {
+      name: "solid-start-dev-server",
+      configurePreviewServer(server) {
+        return () => {
+          server.middlewares.use(async (req, res) => {
+            res.setHeader("content-encoding", "identity");
+            const webReq = new NodeRequest({ req, res });
+            const def: {
+              default: { fetch: (req: Request) => Promise<Response> };
+            } = await import(process.cwd() + "/dist/server/entry-server.js");
+            sendNodeResponse(res, await def.default.fetch(webReq));
+          });
+        };
+      },
+      configureServer(viteDevServer) {
+        (globalThis as any).VITE_DEV_SERVER = viteDevServer;
+        return async () => {
+          if (viteDevServer.config.server.middlewareMode) return;
 
-					const serverEnv =
-						viteDevServer.environments[VITE_ENVIRONMENTS.server];
+          const serverEnv = viteDevServer.environments[VITE_ENVIRONMENTS.server];
 
-					if (!serverEnv) throw new Error("Server environment not found");
-					if (
-						// do not check via `isFetchableDevEnvironment` since nitro does implement the `FetchableDevEnvironment` interface but not via inheritance (which this helper checks)
-						"dispatchFetch" in serverEnv
-					)
-						return;
-					// another plugin is controlling the dev server
-					if (!isRunnableDevEnvironment(serverEnv)) {
+          if (!serverEnv) throw new Error("Server environment not found");
+          if (
+            // do not check via `isFetchableDevEnvironment` since nitro does implement the `FetchableDevEnvironment` interface but not via inheritance (which this helper checks)
+            "dispatchFetch" in serverEnv
+          )
             return;
-					}
+          // another plugin is controlling the dev server
+          if (!isRunnableDevEnvironment(serverEnv)) {
+            return;
+          }
 
           globalThis.USING_SOLID_START_DEV_SERVER = true;
 
-					removeHtmlMiddlewares(viteDevServer);
+          removeHtmlMiddlewares(viteDevServer);
 
-					viteDevServer.middlewares.use(async (req, res) => {
-						if (req.originalUrl) {
-							req.url = req.originalUrl;
-						}
-						const webReq = new NodeRequest({ req, res });
+          viteDevServer.middlewares.use(async (req, res) => {
+            if (req.originalUrl) {
+              req.url = req.originalUrl;
+            }
+            const webReq = new NodeRequest({ req, res });
 
-						try {
-							const serverEntry: {
-								default: { fetch: (req: Request) => Promise<Response> };
-							} = await serverEnv.runner.import("./src/entry-server.tsx");
+            try {
+              const serverEntry: {
+                default: { fetch: (req: Request) => Promise<Response> };
+              } = await serverEnv.runner.import("./src/entry-server.tsx");
 
-							const webRes = await serverEntry.default.fetch(webReq);
+              const webRes = await serverEntry.default.fetch(webReq);
 
-							return sendNodeResponse(res, webRes);
-						} catch (e: unknown) {
-							console.error(e);
-							viteDevServer.ssrFixStacktrace(e as Error);
+              return sendNodeResponse(res, webRes);
+            } catch (e: unknown) {
+              console.error(e);
+              viteDevServer.ssrFixStacktrace(e as Error);
 
-							if (
-								webReq.headers.get("content-type")?.includes("application/json")
-							) {
-								return sendNodeResponse(
-									res,
-									Response.json(
-										{
-											status: 500,
-											error: "Internal Server Error",
-											message:
-												"An unexpected error occurred. Please try again later.",
-											timestamp: new Date().toISOString(),
-										},
-										{
-											status: 500,
-											headers: {
-												"Content-Type": "application/json",
-											},
-										},
-									),
-								);
-							}
+              if (webReq.headers.get("content-type")?.includes("application/json")) {
+                return sendNodeResponse(
+                  res,
+                  Response.json(
+                    {
+                      status: 500,
+                      error: "Internal Server Error",
+                      message: "An unexpected error occurred. Please try again later.",
+                      timestamp: new Date().toISOString(),
+                    },
+                    {
+                      status: 500,
+                      headers: {
+                        "Content-Type": "application/json",
+                      },
+                    },
+                  ),
+                );
+              }
 
-							return sendNodeResponse(
-								res,
-								new Response(
-									`
+              return sendNodeResponse(
+                res,
+                new Response(
+                  `
                     <!DOCTYPE html>
                     <html lang="en">
                       <head>
@@ -87,26 +95,26 @@ export function devServer(): Array<PluginOption> {
                         <script type="module">
                           import { ErrorOverlay } from '/@vite/client'
                           document.body.appendChild(new ErrorOverlay(${JSON.stringify(
-														prepareError(req, e),
-													).replace(/</g, "\\u003c")}))
+                            prepareError(req, e),
+                          ).replace(/</g, "\\u003c")}))
                         </script>
                       </head>
                       <body>
                       </body>
                     </html>
                   `,
-									{
-										status: 500,
-										headers: { "Content-Type": "text/html" },
-									},
-								),
-							);
-						}
-					});
-				};
-			},
-		},
-	];
+                  {
+                    status: 500,
+                    headers: { "Content-Type": "text/html" },
+                  },
+                ),
+              );
+            }
+          });
+        };
+      },
+    },
+  ];
 }
 
 /**
@@ -115,21 +123,21 @@ export function devServer(): Array<PluginOption> {
  * @param server
  */
 function removeHtmlMiddlewares(server: ViteDevServer) {
-	const html_middlewares = [
-		"viteIndexHtmlMiddleware",
-		"vite404Middleware",
-		"viteSpaFallbackMiddleware",
-	];
-	for (let i = server.middlewares.stack.length - 1; i > 0; i--) {
-		if (
-			html_middlewares.includes(
-				// @ts-expect-error
-				server.middlewares.stack[i].handle.name,
-			)
-		) {
-			server.middlewares.stack.splice(i, 1);
-		}
-	}
+  const html_middlewares = [
+    "viteIndexHtmlMiddleware",
+    "vite404Middleware",
+    "viteSpaFallbackMiddleware",
+  ];
+  for (let i = server.middlewares.stack.length - 1; i > 0; i--) {
+    if (
+      html_middlewares.includes(
+        // @ts-expect-error
+        server.middlewares.stack[i].handle.name,
+      )
+    ) {
+      server.middlewares.stack.splice(i, 1);
+    }
+  }
 }
 
 /**
@@ -139,11 +147,11 @@ function removeHtmlMiddlewares(server: ViteDevServer) {
  * @returns
  */
 function prepareError(req: Connect.IncomingMessage, error: unknown) {
-	const e = error as Error;
-	return {
-		message: `An error occured while server rendering ${req.url}:\n\n\t${
-			typeof e === "string" ? e : e.message
-		} `,
-		stack: typeof e === "string" ? "" : e.stack,
-	};
+  const e = error as Error;
+  return {
+    message: `An error occured while server rendering ${req.url}:\n\n\t${
+      typeof e === "string" ? e : e.message
+    } `,
+    stack: typeof e === "string" ? "" : e.stack,
+  };
 }

package/src/config/fs-router.ts

@@ -1,177 +1,162 @@
 import type { ExportSpecifier } from "es-module-lexer";
 import {
-	analyzeModule,
-	BaseFileSystemRouter,
-	cleanPath,
-	type FileSystemRouterConfig,
+  analyzeModule,
+  BaseFileSystemRouter,
+  cleanPath,
+  type FileSystemRouterConfig,
 } from "./fs-routes/router.ts";
 
 export class SolidStartClientFileRouter extends BaseFileSystemRouter {
-	toPath(src: string) {
-		const routePath = cleanPath(src, this.config)
-			// remove the initial slash
-			.slice(1)
-			.replace(/index$/, "")
-			.replace(/\[([^/]+)\]/g, (_, m) => {
-				if (m.length > 3 && m.startsWith("...")) {
-					return `*${m.slice(3)}`;
-				}
-				if (m.length > 2 && m.startsWith("[") && m.endsWith("]")) {
-					return `:${m.slice(1, -1)}?`;
-				}
-				return `:${m}`;
-			});
+  toPath(src: string) {
+    const routePath = cleanPath(src, this.config)
+      // remove the initial slash
+      .slice(1)
+      .replace(/index$/, "")
+      .replace(/\[([^/]+)\]/g, (_, m) => {
+        if (m.length > 3 && m.startsWith("...")) {
+          return `*${m.slice(3)}`;
+        }
+        if (m.length > 2 && m.startsWith("[") && m.endsWith("]")) {
+          return `:${m.slice(1, -1)}?`;
+        }
+        return `:${m}`;
+      });
 
-		return routePath?.length > 0 ? `/${routePath}` : "/";
-	}
+    return routePath?.length > 0 ? `/${routePath}` : "/";
+  }
 
-	toRoute(src: string) {
-		const path = this.toPath(src);
+  toRoute(src: string) {
+    const path = this.toPath(src);
 
-		if (src.endsWith(".md") || src.endsWith(".mdx")) {
-			return {
-				page: true,
-				$component: {
-					src: src,
-					pick: ["$css"],
-				},
-				$$route: undefined,
-				path,
-				// filePath: src
-			};
-		}
+    if (src.endsWith(".md") || src.endsWith(".mdx")) {
+      return {
+        page: true,
+        $component: {
+          src: src,
+          pick: ["$css"],
+        },
+        $$route: undefined,
+        path,
+        // filePath: src
+      };
+    }
 
-		const [_, exports] = analyzeModule(src);
-		const hasDefault = !!exports.find((e) => e.n === "default");
-		const hasRouteConfig = !!exports.find((e) => e.n === "route");
-		if (hasDefault) {
-			return {
-				page: true,
-				$component: {
-					src: src,
-					pick: [
-						...exports
-							.filter((e) => e.n === e.ln && e.n !== "route")
-							.map((e) => e.n),
-						"default",
-						"$css",
-					],
-				},
-				$$route: hasRouteConfig
-					? {
-							src: src,
-							pick: ["route"],
-						}
-					: undefined,
-				path,
-				// filePath: src
-			};
-		}
-	}
+    const [_, exports] = analyzeModule(src);
+    const hasDefault = !!exports.find(e => e.n === "default");
+    const hasRouteConfig = !!exports.find(e => e.n === "route");
+    if (hasDefault) {
+      return {
+        page: true,
+        $component: {
+          src: src,
+          pick: [
+            ...exports.filter(e => e.n === e.ln && e.n !== "route").map(e => e.n),
+            "default",
+            "$css",
+          ],
+        },
+        $$route: hasRouteConfig
+          ? {
+              src: src,
+              pick: ["route"],
+            }
+          : undefined,
+        path,
+        // filePath: src
+      };
+    }
+  }
 }
 
-const HTTP_METHODS = [
-	"HEAD",
-	"GET",
-	"POST",
-	"PUT",
-	"DELETE",
-	"PATCH",
-	"OPTIONS",
-];
+const HTTP_METHODS = ["HEAD", "GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"];
 function createHTTPHandlers(src: string, exports: readonly ExportSpecifier[]) {
-	const handlers: Record<string, any> = {};
-	for (const exp of exports) {
-		if (HTTP_METHODS.includes(exp.n)) {
-			handlers[`$${exp.n}`] = {
-				src: src,
-				pick: [exp.n],
-			};
-			if (exp.n === "GET" && !exports.find((exp) => exp.n === "HEAD")) {
-				handlers.$HEAD = {
-					src: src,
-					pick: [exp.n],
-				};
-			}
-		}
-	}
+  const handlers: Record<string, any> = {};
+  for (const exp of exports) {
+    if (HTTP_METHODS.includes(exp.n)) {
+      handlers[`$${exp.n}`] = {
+        src: src,
+        pick: [exp.n],
+      };
+      if (exp.n === "GET" && !exports.find(exp => exp.n === "HEAD")) {
+        handlers.$HEAD = {
+          src: src,
+          pick: [exp.n],
+        };
+      }
+    }
+  }
 
-	return handlers;
+  return handlers;
 }
 
 export class SolidStartServerFileRouter extends BaseFileSystemRouter {
-	declare config: FileSystemRouterConfig & { dataOnly?: boolean };
+  declare config: FileSystemRouterConfig & { dataOnly?: boolean };
 
-	constructor(config: FileSystemRouterConfig & { dataOnly?: boolean }) {
-		super(config);
-	}
+  constructor(config: FileSystemRouterConfig & { dataOnly?: boolean }) {
+    super(config);
+  }
 
-	toPath(src: string) {
-		const routePath = cleanPath(src, this.config)
-			// remove the initial slash
-			.slice(1)
-			.replace(/index$/, "")
-			.replace(/\[([^/]+)\]/g, (_, m) => {
-				if (m.length > 3 && m.startsWith("...")) {
-					return `*${m.slice(3)}`;
-				}
-				if (m.length > 2 && m.startsWith("[") && m.endsWith("]")) {
-					return `:${m.slice(1, -1)}?`;
-				}
-				return `:${m}`;
-			});
+  toPath(src: string) {
+    const routePath = cleanPath(src, this.config)
+      // remove the initial slash
+      .slice(1)
+      .replace(/index$/, "")
+      .replace(/\[([^/]+)\]/g, (_, m) => {
+        if (m.length > 3 && m.startsWith("...")) {
+          return `*${m.slice(3)}`;
+        }
+        if (m.length > 2 && m.startsWith("[") && m.endsWith("]")) {
+          return `:${m.slice(1, -1)}?`;
+        }
+        return `:${m}`;
+      });
 
-		return routePath?.length > 0 ? `/${routePath}` : "/";
-	}
+    return routePath?.length > 0 ? `/${routePath}` : "/";
+  }
 
-	toRoute(src: string) {
-		const path = this.toPath(src);
-		if (src.endsWith(".md") || src.endsWith(".mdx")) {
-			return {
-				page: true,
-				$component: {
-					src: src,
-					pick: ["$css"],
-				},
-				$$route: undefined,
-				path,
-			};
-		}
+  toRoute(src: string) {
+    const path = this.toPath(src);
+    if (src.endsWith(".md") || src.endsWith(".mdx")) {
+      return {
+        page: true,
+        $component: {
+          src: src,
+          pick: ["$css"],
+        },
+        $$route: undefined,
+        path,
+      };
+    }
 
-		const [_, exports] = analyzeModule(src);
-		const hasRouteConfig = exports.find((e) => e.n === "route");
-		const hasDefault = !!exports.find((e) => e.n === "default");
-		const hasAPIRoutes = !!exports.find((exp) => HTTP_METHODS.includes(exp.n));
-		if (hasDefault || hasAPIRoutes) {
-			return {
-				page: hasDefault,
-				$component:
-					!this.config.dataOnly && hasDefault
-						? {
-								src: src,
-								pick: [
-									...exports
-										.filter(
-											(e) =>
-												e.n === e.ln &&
-												e.n !== "route" &&
-												!HTTP_METHODS.includes(e.n),
-										)
-										.map((e) => e.n),
-									"default",
-									"$css",
-								],
-							}
-						: undefined,
-				$$route: hasRouteConfig
-					? {
-							src: src,
-							pick: ["route"],
-						}
-					: undefined,
-				...createHTTPHandlers(src, exports),
-				path,
-			};
-		}
-	}
+    const [_, exports] = analyzeModule(src);
+    const hasRouteConfig = exports.find(e => e.n === "route");
+    const hasDefault = !!exports.find(e => e.n === "default");
+    const hasAPIRoutes = !!exports.find(exp => HTTP_METHODS.includes(exp.n));
+    if (hasDefault || hasAPIRoutes) {
+      return {
+        page: hasDefault,
+        $component:
+          !this.config.dataOnly && hasDefault
+            ? {
+                src: src,
+                pick: [
+                  ...exports
+                    .filter(e => e.n === e.ln && e.n !== "route" && !HTTP_METHODS.includes(e.n))
+                    .map(e => e.n),
+                  "default",
+                  "$css",
+                ],
+              }
+            : undefined,
+        $$route: hasRouteConfig
+          ? {
+              src: src,
+              pick: ["route"],
+            }
+          : undefined,
+        ...createHTTPHandlers(src, exports),
+        path,
+      };
+    }
+  }
 }