Merge branch 'main' into vite-8-compat

Author: katywings

.changeset/sanitize-location-header.md

@@ -0,0 +1,5 @@
+---
+"@solidjs/start": patch
+---
+
+Sanitize Location header value in streaming redirect script

.changeset/slick-badgers-wear.md

@@ -0,0 +1,5 @@
+---
+"@solidjs/start": patch
+---
+
+update seroval to 1.5.4

packages/start/package.json

@@ -11,7 +11,7 @@
   },
   "exports": {
     ".": "./src/index.tsx",
-    "./config": "./src/config/index.ts",
+    "./config": "./dist/config/index.js",
     "./server": "./src/server/index.tsx",
     "./client": "./src/client/index.tsx",
     "./router": "./src/router.tsx",
@@ -55,7 +55,7 @@
     "path-to-regexp": "^8.3.0",
     "pathe": "^2.0.3",
     "radix3": "^1.1.2",
-    "seroval": "^1.5.1",
+    "seroval": "^1.5.4",
     "seroval-plugins": "^1.5.1",
     "shiki": "^1.29.2",
     "solid-js": "^1.9.11",

packages/start/src/config/constants.ts

@@ -7,7 +7,7 @@ export const VIRTUAL_MODULES = {
   getClientManifest: "solid-start:get-client-manifest",
   getManifest: "solid-start:get-manifest",
   middleware: "solid-start:middleware",
-  serverFnManifest: "solidstart:server-fn-manifest",
+  serverFnManifest: "solid-start:server-fn-manifest",
   clientEntry: "solid-start:client-entry",
   serverEntry: "solid-start:server-entry",
   app: "solid-start:app",

packages/start/src/config/fs-routes/router.ts

@@ -1,9 +1,9 @@
 import { init, parse } from "es-module-lexer";
 import esbuild from "esbuild";
 import fg from "fast-glob";
-import fs from "fs";
+import fs from "node:fs";
 import micromatch from "micromatch";
-import { posix } from "path";
+import { posix } from "node:path";
 import { pathToRegexp } from "path-to-regexp";
 
 import { normalizePath } from "vite";

packages/start/src/config/lazy.ts

@@ -1,8 +1,8 @@
 import type { PluginItem } from "@babel/core";
 import babel from "@babel/core";
 import * as t from "@babel/types";
-import { sep as osSep } from "path";
-import { basename, relative, sep } from "path/posix";
+import { sep as osSep } from "node:path";
+import { basename, relative, sep } from "node:path/posix";
 import type { PluginOption } from "vite";
 import { VITE_ENVIRONMENTS } from "./constants.ts";
 

packages/start/src/env.d.ts

@@ -1,6 +1,6 @@
 // This file contains global type definitions that are internal to SolidStart and are not exported
 
-declare module "solidstart:server-fn-manifest" {
+declare module "solid-start:server-fn-manifest" {
   type ServerFn = (...args: Array<any>) => Promise<any>;
   export function getServerFnById(id: string): Promise<ServerFn>;
 }

packages/start/src/server/handler.ts

@@ -213,7 +213,7 @@ function handleStreamCompleteRedirect(context: PageEvent) {
   return ({ write }: { write: (html: string) => void }) => {
     context.complete = true;
     const to = context.response && context.response.headers.get("Location");
-    to && write(`<script>window.location="${to}"</script>`);
+    to && write(`<script>window.location=${JSON.stringify(to).replace(/</g, "\\u003c")}</script>`);
   };
 }
 

packages/start/src/server/server-functions-handler.spec.ts

@@ -11,7 +11,7 @@ vi.mock("solid-js/web", () => ({
   provideRequestEvent: vi.fn((_event, fn) => fn()),
 }));
 
-vi.mock("solidstart:server-fn-manifest", () => ({
+vi.mock("solid-start:server-fn-manifest", () => ({
   getServerFnById: vi.fn(),
 }));
 

packages/start/src/server/server-functions-handler.ts

@@ -17,7 +17,7 @@ import {
   extractBody,
   getHeadersAndBody,
 } from "./server-functions-shared.ts";
-import "solidstart:server-fn-manifest";
+import "solid-start:server-fn-manifest";
 
 import { getServerFunction } from "./server-fns.ts";
 import type { FetchEvent, PageEvent } from "./types.ts";