@solidjs/start 1.0.10 → 1.1.0

package/config/fs-router.js

@@ -58,7 +58,7 @@ export class SolidStartClientFileRouter extends BaseFileSystemRouter {
   }
 }
 
-const HTTP_METHODS = ["HEAD", "GET", "POST", "PUT", "DELETE", "PATCH"];
+const HTTP_METHODS = ["HEAD", "GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"];
 function createHTTPHandlers(src, exports) {
   const handlers = {};
   for (const exp of exports) {

package/config/index.js

@@ -1,5 +1,4 @@
-import { serverFunctions } from "@vinxi/server-functions/plugin";
-import { server as serverFunctionServer, serverTransform } from "@vinxi/server-functions/server";
+import { createTanStackServerFnPlugin } from "@tanstack/server-functions-plugin";
 import defu from "defu";
 import { existsSync } from "node:fs";
 import { join } from "node:path";
@@ -38,6 +37,36 @@ function solidStartServerFsRouter(config) {
     );
 }
 
+const SolidStartServerFnsPlugin = createTanStackServerFnPlugin({
+  // This is the ID that will be available to look up and import
+  // our server function manifest and resolve its module
+  manifestVirtualImportId: "solidstart:server-fn-manifest",
+  client: {
+    getRuntimeCode: () =>
+      `import { createServerReference } from "${normalize(
+        fileURLToPath(new URL("../dist/runtime/server-runtime.js", import.meta.url))
+      )}"`,
+    replacer: opts =>
+      `createServerReference(${() => {}}, '${opts.functionId}', '${opts.extractedFilename}')`
+  },
+  ssr: {
+    getRuntimeCode: () =>
+      `import { createServerReference } from '${normalize(
+        fileURLToPath(new URL("../dist/runtime/server-fns-runtime.js", import.meta.url))
+      )}'`,
+    replacer: opts =>
+      `createServerReference(${opts.fn}, '${opts.functionId}', '${opts.extractedFilename}')`
+  },
+  server: {
+    getRuntimeCode: () =>
+      `import { createServerReference } from '${normalize(
+        fileURLToPath(new URL("../dist/runtime/server-fns-runtime.js", import.meta.url))
+      )}'`,
+    replacer: opts =>
+      `createServerReference(${opts.fn}, '${opts.functionId}', '${opts.extractedFilename}')`
+  }
+});
+
 export function defineConfig(baseConfig = {}) {
   let { vite = {}, ...start } = baseConfig;
   const extensions = [...DEFAULT_EXTENSIONS, ...(start.extensions || [])];
@@ -112,11 +141,7 @@ export function defineConfig(baseConfig = {}) {
               }
             }),
             ...plugins,
-            serverTransform({
-              runtime: normalize(
-                fileURLToPath(new URL("../dist/runtime/server-fns-runtime.js", import.meta.url))
-              )
-            }),
+            SolidStartServerFnsPlugin.ssr,
             start.experimental.islands ? serverComponents.server() : null,
             solid({ ...start.solid, ssr: true, extensions: extensions.map(ext => `.${ext}`) }),
             config("app-server", {
@@ -177,11 +202,7 @@ export function defineConfig(baseConfig = {}) {
               }
             }),
             ...plugins,
-            serverFunctions.client({
-              runtime: normalize(
-                fileURLToPath(new URL("../dist/runtime/server-runtime.js", import.meta.url))
-              )
-            }),
+            SolidStartServerFnsPlugin.client,
             start.experimental.islands ? serverComponents.client() : null,
             solid({ ...start.solid, ssr: start.ssr, extensions: extensions.map(ext => `.${ext}`) }),
             config("app-client", {
@@ -247,11 +268,7 @@ export function defineConfig(baseConfig = {}) {
               cacheDir: "node_modules/.vinxi/server-fns"
             }),
             ...plugins,
-            serverFunctionServer({
-              runtime: normalize(
-                fileURLToPath(new URL("../dist/runtime/server-fns-runtime.js", import.meta.url))
-              )
-            }),
+            SolidStartServerFnsPlugin.server,
             start.experimental.islands ? serverComponents.server() : null,
             solid({ ...start.solid, ssr: true, extensions: extensions.map(ext => `.${ext}`) }),
             config("app-server", {

package/dist/index.d.ts

@@ -1,4 +1,5 @@
+export { default as clientOnly } from "./shared/clientOnly";
 export { GET } from "./shared/GET";
 export { HttpHeader } from "./shared/HttpHeader";
 export { HttpStatusCode } from "./shared/HttpStatusCode";
-export { default as clientOnly } from "./shared/clientOnly";
+export { getServerFunctionMeta } from "./shared/serverFunction";

package/dist/index.jsx

@@ -1,5 +1,6 @@
 // @refresh skip
+export { default as clientOnly } from "./shared/clientOnly";
 export { GET } from "./shared/GET";
 export { HttpHeader } from "./shared/HttpHeader";
 export { HttpStatusCode } from "./shared/HttpStatusCode";
-export { default as clientOnly } from "./shared/clientOnly";
+export { getServerFunctionMeta } from "./shared/serverFunction";

package/dist/middleware/index.jsx

@@ -5,11 +5,8 @@ function wrapRequestMiddleware(onRequest) {
     return async (h3Event) => {
         const fetchEvent = getFetchEvent(h3Event);
         const response = await onRequest(fetchEvent);
-        if (!response) {
-            return;
-        }
-        else {
-            sendWebResponse(h3Event, response);
+        if (response) {
+            await sendWebResponse(h3Event, response);
         }
     };
 }
@@ -17,11 +14,8 @@ function wrapResponseMiddleware(onBeforeResponse) {
     return async (h3Event, response) => {
         const fetchEvent = getFetchEvent(h3Event);
         const mwResponse = await onBeforeResponse(fetchEvent, response);
-        if (!mwResponse) {
-            return;
-        }
-        else {
-            sendWebResponse(h3Event, mwResponse);
+        if (mwResponse) {
+            await sendWebResponse(h3Event, mwResponse);
         }
     };
 }

package/dist/router/routes.js

@@ -7,7 +7,11 @@ function defineRoutes(fileRoutes) {
             return id.startsWith(o.id + "/");
         });
         if (!parentRoute) {
-            routes.push({ ...route, id, path: id.replace(/\/\([^)/]+\)/g, "").replace(/\([^)/]+\)/g, "") });
+            routes.push({
+                ...route,
+                id,
+                path: id.replace(/\/\([^)/]+\)/g, "").replace(/\([^)/]+\)/g, "")
+            });
             return routes;
         }
         processRoute(parentRoute.children || (parentRoute.children = []), route, id.slice(parentRoute.id.length), full);
@@ -32,13 +36,24 @@ export function matchAPIRoute(path, method) {
     }
 }
 function containsHTTP(route) {
-    return route["$HEAD"] || route["$GET"] || route["$POST"] || route["$PUT"] || route["$PATCH"] || route["$DELETE"];
+    return (route["$HEAD"] ||
+        route["$GET"] ||
+        route["$POST"] ||
+        route["$PUT"] ||
+        route["$PATCH"] ||
+        route["$DELETE"]);
 }
 const router = createRouter({
     routes: fileRoutes.reduce((memo, route) => {
         if (!containsHTTP(route))
             return memo;
-        let path = route.path.replace(/\/\([^)/]+\)/g, "").replace(/\([^)/]+\)/g, "").replace(/\*([^/]*)/g, (_, m) => `**:${m}`).split('/').map(s => (s.startsWith(':') || s.startsWith('*')) ? s : encodeURIComponent(s)).join('/');
+        let path = route.path
+            .replace(/\/\([^)/]+\)/g, "")
+            .replace(/\([^)/]+\)/g, "")
+            .replace(/\*([^/]*)/g, (_, m) => `**:${m}`)
+            .split("/")
+            .map(s => (s.startsWith(":") || s.startsWith("*") ? s : encodeURIComponent(s)))
+            .join("/");
         if (/:[^/]*\?/g.test(path)) {
             throw new Error(`Optional parameters are not supported in API routes: ${path}`);
         }

package/dist/runtime/server-handler.js

@@ -5,11 +5,13 @@ import { CustomEventPlugin, DOMExceptionPlugin, EventPlugin, FormDataPlugin, Hea
 import { sharedConfig } from "solid-js";
 import { renderToString } from "solid-js/web";
 import { provideRequestEvent } from "solid-js/web/storage";
-import { eventHandler, setHeader, setResponseStatus } from "vinxi/http";
+import { eventHandler, parseCookies, setHeader, setResponseStatus } from "vinxi/http";
 import invariant from "vinxi/lib/invariant";
 import { cloneEvent, getFetchEvent, mergeResponseHeaders } from "../server/fetchEvent";
 import { getExpectedRedirectStatus } from "../server/handler";
 import { createPageEvent } from "../server/pageEvent";
+// @ts-ignore
+import serverFnManifest from "solidstart:server-fn-manifest";
 function createChunk(data) {
     const encodeData = new TextEncoder().encode(data);
     const bytes = encodeData.length;
@@ -58,18 +60,40 @@ async function handleServerFunction(h3Event) {
     const instance = request.headers.get("X-Server-Instance");
     const singleFlight = request.headers.has("X-Single-Flight");
     const url = new URL(request.url);
-    let filepath, name;
+    let functionId, name;
     if (serverReference) {
         invariant(typeof serverReference === "string", "Invalid server function");
-        [filepath, name] = serverReference.split("#");
+        [functionId, name] = serverReference.split("#");
     }
     else {
-        filepath = url.searchParams.get("id");
+        functionId = url.searchParams.get("id");
         name = url.searchParams.get("name");
-        if (!filepath || !name)
-            throw new Error("Invalid request");
+        if (!functionId || !name) {
+            return process.env.NODE_ENV === "development"
+                ? new Response("Server function not found", { status: 404 })
+                : new Response(null, { status: 404 });
+        }
+    }
+    const serverFnInfo = serverFnManifest[functionId];
+    let fnModule;
+    if (!serverFnInfo) {
+        return process.env.NODE_ENV === "development"
+            ? new Response("Server function not found", { status: 404 })
+            : new Response(null, { status: 404 });
+    }
+    if (process.env.NODE_ENV === "development") {
+        // In dev, we use Vinxi to get the "server" server-side router
+        // Then we use that router's devServer.ssrLoadModule to get the serverFn
+        // This code comes from:
+        // https://github.com/TanStack/router/blob/266f5cc863cd1a99809d1af2669e58b6b6db9a67/packages/start-server-functions-handler/src/index.tsx#L83-L87
+        fnModule = await globalThis.app
+            .getRouter("server-fns")
+            .internals.devServer.ssrLoadModule(serverFnInfo.extractedFilename);
+    }
+    else {
+        fnModule = await serverFnInfo.importer();
     }
-    const serverFunction = (await import.meta.env.MANIFEST[import.meta.env.ROUTER_NAME].chunks[filepath].import())[name];
+    const serverFunction = fnModule[serverFnInfo.functionName];
     let parsed = [];
     // grab bound arguments from url when no JS
     if (!instance || h3Event.method === "GET") {
@@ -100,12 +124,14 @@ async function handleServerFunction(h3Event) {
         // This should never be the case in "proper" Nitro presets since node.req has to be IncomingMessage,
         // But the new azure-functions preset for some reason uses a ReadableStream in node.req (#1521)
         const isReadableStream = h3Request instanceof ReadableStream;
-        const isH3EventBodyStreamLocked = isReadableStream && h3Request.locked;
+        const hasReadableStream = h3Request.body instanceof ReadableStream;
+        const isH3EventBodyStreamLocked = (isReadableStream && h3Request.locked) ||
+            (hasReadableStream && h3Request.body.locked);
         const requestBody = isReadableStream ? h3Request : h3Request.body;
         if (contentType?.startsWith("multipart/form-data") ||
             contentType?.startsWith("application/x-www-form-urlencoded")) {
             // workaround for https://github.com/unjs/nitro/issues/1721
-            // (issue only in edge runtimes)
+            // (issue only in edge runtimes and netlify preset)
             parsed.push(await (isH3EventBodyStreamLocked
                 ? request
                 : new Request(request, { ...request, body: requestBody })).formData());
@@ -114,7 +140,7 @@ async function handleServerFunction(h3Event) {
         }
         else if (contentType?.startsWith("application/json")) {
             // workaround for https://github.com/unjs/nitro/issues/1721
-            // (issue only in edge runtimes)
+            // (issue only in edge runtimes and netlify preset)
             const tmpReq = isH3EventBodyStreamLocked
                 ? request
                 : new Request(request, { ...request, body: requestBody });
@@ -141,7 +167,7 @@ async function handleServerFunction(h3Event) {
             /* @ts-ignore */
             sharedConfig.context = { event };
             event.locals.serverFunctionMeta = {
-                id: filepath + "#" + name
+                id: functionId + "#" + name
             };
             return serverFunction(...parsed);
         });
@@ -233,6 +259,32 @@ function handleNoJS(result, request, parsed, thrown) {
     });
 }
 let App;
+function createSingleFlightHeaders(sourceEvent) {
+    // cookie handling logic is pretty simplistic so this might be imperfect
+    // unclear if h3 internals are available on all platforms but we need a way to
+    // update request headers on the underlying H3 event.
+    const headers = new Headers(sourceEvent.request.headers);
+    const cookies = parseCookies(sourceEvent.nativeEvent);
+    const SetCookies = sourceEvent.response.headers.getSetCookie();
+    headers.delete("cookie");
+    let useH3Internals = false;
+    if (sourceEvent.nativeEvent.node?.req) {
+        useH3Internals = true;
+        sourceEvent.nativeEvent.node.req.headers.cookie = "";
+    }
+    SetCookies.forEach(cookie => {
+        if (!cookie)
+            return;
+        const keyValue = cookie.split(";")[0];
+        const [key, value] = keyValue.split("=");
+        key && value && (cookies[key] = value);
+    });
+    Object.entries(cookies).forEach(([key, value]) => {
+        headers.append("cookie", `${key}=${value}`);
+        useH3Internals && (sourceEvent.nativeEvent.node.req.headers.cookie += `${key}=${value};`);
+    });
+    return headers;
+}
 async function handleSingleFlight(sourceEvent, result) {
     let revalidate;
     let url = new URL(sourceEvent.request.headers.get("referer")).toString();
@@ -243,7 +295,7 @@ async function handleSingleFlight(sourceEvent, result) {
             url = new URL(result.headers.get("Location"), new URL(sourceEvent.request.url).origin + import.meta.env.SERVER_BASE_URL).toString();
     }
     const event = cloneEvent(sourceEvent);
-    event.request = new Request(url, { headers: sourceEvent.request.headers });
+    event.request = new Request(url, { headers: createSingleFlightHeaders(sourceEvent) });
     return await provideRequestEvent(event, async () => {
         await createPageEvent(event);
         /* @ts-ignore */

package/dist/server/index.d.ts

@@ -1,4 +1,6 @@
-export { StartServer } from "./StartServer";
 export { createHandler } from "./handler";
-export { getServerFunctionMeta } from "./serverFunction";
-export type { DocumentComponentProps, Asset, HandlerOptions, ContextMatches, ResponseStub, FetchEvent, RequestEventLocals, PageEvent, APIEvent, APIHandler, ServerFunctionMeta } from "./types";
+export { StartServer } from "./StartServer";
+export type { APIEvent, APIHandler, Asset, ContextMatches, DocumentComponentProps, FetchEvent, HandlerOptions, PageEvent, ResponseStub, ServerFunctionMeta } from "./types";
+import { getServerFunctionMeta as getServerFunctionMeta_ } from "../shared/serverFunction";
+/** @deprecated */
+export declare const getServerFunctionMeta: typeof getServerFunctionMeta_;

package/dist/server/index.jsx

@@ -1,4 +1,6 @@
 // @refresh skip
-export { StartServer } from "./StartServer";
 export { createHandler } from "./handler";
-export { getServerFunctionMeta } from "./serverFunction";
+export { StartServer } from "./StartServer";
+import { getServerFunctionMeta as getServerFunctionMeta_ } from "../shared/serverFunction";
+/** @deprecated */
+export const getServerFunctionMeta = getServerFunctionMeta_;

package/dist/server/types.d.ts

@@ -49,12 +49,9 @@ export interface FetchEvent {
     request: Request;
     response: ResponseStub;
     clientAddress?: string;
-    locals: RequestEventLocals;
+    locals: App.RequestEventLocals;
     nativeEvent: HTTPEvent;
 }
-export interface RequestEventLocals {
-    [key: string | symbol]: any;
-}
 export interface PageEvent extends RequestEvent {
     manifest: any;
     assets: any;

package/dist/shared/dev-overlay/CodeView.jsx

@@ -1,16 +1,18 @@
-import { getHighlighterCore, loadWasm } from 'shikiji/core';
+// @refresh skip
+import { getSingletonHighlighter } from 'shiki';
+import { loadWasm } from 'shiki/engine/oniguruma';
 import { createEffect, createResource } from 'solid-js';
-import url from 'shikiji/onig.wasm?url';
-import langJS from 'shikiji/langs/javascript.mjs';
-import langJSX from 'shikiji/langs/jsx.mjs';
-import langTSX from 'shikiji/langs/tsx.mjs';
-import langTS from 'shikiji/langs/typescript.mjs';
-import darkPlus from 'shikiji/themes/dark-plus.mjs';
+import url from 'shiki/onig.wasm?url';
+import langJS from 'shiki/langs/javascript.mjs';
+import langJSX from 'shiki/langs/jsx.mjs';
+import langTSX from 'shiki/langs/tsx.mjs';
+import langTS from 'shiki/langs/typescript.mjs';
+import darkPlus from 'shiki/themes/dark-plus.mjs';
 let HIGHLIGHTER;
 async function loadHighlighter() {
     if (!HIGHLIGHTER) {
         await loadWasm(await fetch(url));
-        HIGHLIGHTER = await getHighlighterCore({
+        HIGHLIGHTER = await getSingletonHighlighter({
             themes: [
                 darkPlus,
             ],

package/dist/{server → shared}/serverFunction.d.ts

@@ -1,4 +1,4 @@
-import type { ServerFunctionMeta } from "./types";
+import type { ServerFunctionMeta } from "../server/types";
 /**
  *
  * Read more: https://docs.solidjs.com/solid-start/reference/server/get-server-function-meta

package/env.d.ts

@@ -4,6 +4,12 @@
 
 /* eslint-disable @typescript-eslint/consistent-type-imports */
 
+declare namespace App {
+  export interface RequestEventLocals {
+    [key: string | symbol]: any;
+  }
+}
+
 interface ImportMetaEnv extends Record<`VITE_${string}`, any>, SolidStartMetaEnv {
   BASE_URL: string;
   MODE: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/start",
-  "version": "1.0.10",
+  "version": "1.1.0",
   "type": "module",
   "author": "Ryan Carniato",
   "license": "MIT",
@@ -55,25 +55,27 @@
     }
   },
   "devDependencies": {
-    "solid-js": "^1.9.2",
-    "vinxi": "^0.4.3",
-    "typescript": "^5.4.2"
+    "solid-js": "^1.9.4",
+    "vinxi": "^0.5.3"
   },
   "dependencies": {
-    "@vinxi/plugin-directives": "^0.4.3",
-    "@vinxi/server-components": "^0.4.3",
-    "@vinxi/server-functions": "^0.4.3",
+    "@vinxi/plugin-directives": "^0.5.0",
+    "@vinxi/server-components": "^0.5.0",
+    "@tanstack/server-functions-plugin": "^1.99.5",
     "defu": "^6.1.2",
     "error-stack-parser": "^2.1.4",
     "html-to-image": "^1.11.11",
     "radix3": "^1.1.0",
     "seroval": "^1.0.2",
     "seroval-plugins": "^1.0.2",
-    "shikiji": "^0.9.12",
+    "shiki": "^1.26.1",
     "source-map-js": "^1.0.2",
     "terracotta": "^1.0.4",
     "tinyglobby": "^0.2.2",
-    "vite-plugin-solid": "^2.10.2"
+    "vite-plugin-solid": "^2.11.1"
+  },
+  "peerDependencies": {
+    "vinxi": "^0.5.3"
   },
   "scripts": {
     "typecheck": "tsc --noEmit",