@solidjs/start 1.0.2 → 1.0.4

package/config/index.js

@@ -252,6 +252,7 @@ export function defineConfig(baseConfig = {}) {
                 fileURLToPath(new URL("../dist/runtime/server-fns-runtime.js", import.meta.url))
               )
             }),
+            start.experimental.islands ? serverComponents.server() : null,
             solid({ ...start.solid, ssr: true, extensions: extensions.map(ext => `.${ext}`) }),
             config("app-server", {
               resolve: {

package/dist/runtime/server-fns-runtime.js

@@ -12,6 +12,7 @@ export function createServerReference(fn, id, name) {
             }
             if (prop === "GET")
                 return receiver;
+            return target[prop];
         },
         apply(target, thisArg, args) {
             const ogEvt = getRequestEvent();

package/dist/runtime/server-handler.js

@@ -96,18 +96,28 @@ async function handleServerFunction(h3Event) {
     }
     if (h3Event.method === "POST") {
         const contentType = request.headers.get("content-type");
+        const h3Request = h3Event.node.req;
+        // 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 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)
-            parsed.push(await new Request(request, { ...request, body: h3Event.node.req.body }).formData());
+            parsed.push(await (isH3EventBodyStreamLocked
+                ? request
+                : new Request(request, { ...request, body: requestBody })).formData());
             // what should work when #1721 is fixed
             // parsed.push(await request.formData);
         }
         else if (contentType?.startsWith("application/json")) {
             // workaround for https://github.com/unjs/nitro/issues/1721
             // (issue only in edge runtimes)
-            const tmpReq = new Request(request, { ...request, body: h3Event.node.req.body });
+            const tmpReq = isH3EventBodyStreamLocked
+                ? request
+                : new Request(request, { ...request, body: requestBody });
             // what should work when #1721 is fixed
             // just use request.json() here
             parsed = fromJSON(await tmpReq.json(), {

package/dist/runtime/server-runtime.js

@@ -119,11 +119,17 @@ async function fetchServerFunction(base, id, options, args) {
         ? createRequest(base, id, instance, options)
         : args.length === 1 && args[0] instanceof FormData
             ? createRequest(base, id, instance, { ...options, body: args[0] })
-            : createRequest(base, id, instance, {
-                ...options,
-                body: JSON.stringify(await Promise.resolve(toJSONAsync(args, { plugins }))),
-                headers: { ...options.headers, "Content-Type": "application/json" }
-            }));
+            : args.length === 1 && args[0] instanceof URLSearchParams
+                ? createRequest(base, id, instance, {
+                    ...options,
+                    body: args[0],
+                    headers: { ...options.headers, "Content-Type": "application/x-www-form-urlencoded" }
+                })
+                : createRequest(base, id, instance, {
+                    ...options,
+                    body: JSON.stringify(await Promise.resolve(toJSONAsync(args, { plugins }))),
+                    headers: { ...options.headers, "Content-Type": "application/json" }
+                }));
     if (response.headers.get("Location") ||
         response.headers.get("X-Revalidate") ||
         response.headers.get("X-Single-Flight")) {
@@ -167,13 +173,17 @@ export function createServerReference(fn, id, name) {
                     const fn = async (...args) => {
                         const encodeArgs = options.method && options.method.toUpperCase() === "GET";
                         return fetchServerFunction(encodeArgs
-                            ? url + (args.length ? `&args=${encodeURIComponent(JSON.stringify(await Promise.resolve(toJSONAsync(args, { plugins }))))}` : "")
+                            ? url +
+                                (args.length
+                                    ? `&args=${encodeURIComponent(JSON.stringify(await Promise.resolve(toJSONAsync(args, { plugins }))))}`
+                                    : "")
                             : `${baseURL}/_server`, `${id}#${name}`, options, encodeArgs ? [] : args);
                     };
                     fn.url = url;
                     return fn;
                 };
             }
+            return target[prop];
         },
         apply(target, thisArg, args) {
             return fetchServerFunction(`${baseURL}/_server`, `${id}#${name}`, {}, args);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/start",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "type": "module",
   "author": "Ryan Carniato",
   "license": "MIT",
@@ -55,14 +55,14 @@
     }
   },
   "devDependencies": {
-    "solid-js": "^1.8.17",
-    "vinxi": "^0.3.12",
+    "solid-js": "^1.8.18",
+    "vinxi": "^0.3.14",
     "typescript": "^5.4.2"
   },
   "dependencies": {
     "@vinxi/plugin-directives": "^0.3.1",
     "@vinxi/server-components": "^0.3.3",
-    "@vinxi/server-functions": "^0.3.2",
+    "@vinxi/server-functions": "^0.3.3",
     "defu": "^6.1.2",
     "error-stack-parser": "^2.1.4",
     "glob": "^10.3.10",