@solidjs/start 0.7.6 → 1.0.0-rc.0

package/dist/router/routes.js

@@ -7,7 +7,7 @@ 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);
@@ -38,7 +38,7 @@ const router = createRouter({
     routes: fileRoutes.reduce((memo, route) => {
         if (!containsHTTP(route))
             return memo;
-        let path = route.path.replace(/\(.*\)\/?/g, "").replace(/\*([^/]*)/g, (_, m) => `**:${m}`);
+        let path = route.path.replace(/\([^)/]+\)/g, "").replace(/\*([^/]*)/g, (_, m) => `**:${m}`);
         if (/:[^/]*\?/g.test(path)) {
             throw new Error(`Optional parameters are not supported in API routes: ${path}`);
         }

package/dist/runtime/server-handler.js

@@ -68,8 +68,25 @@ async function handleServerFunction(h3Event) {
     // grab bound arguments from url when no JS
     if (!instance || h3Event.method === "GET") {
         const args = url.searchParams.get("args");
-        if (args)
-            JSON.parse(args).forEach((arg) => parsed.push(arg));
+        if (args) {
+            const json = JSON.parse(args);
+            (json.t
+                ? fromJSON(json, {
+                    plugins: [
+                        CustomEventPlugin,
+                        DOMExceptionPlugin,
+                        EventPlugin,
+                        FormDataPlugin,
+                        HeadersPlugin,
+                        ReadableStreamPlugin,
+                        RequestPlugin,
+                        ResponsePlugin,
+                        URLSearchParamsPlugin,
+                        URLPlugin
+                    ]
+                })
+                : json).forEach((arg) => parsed.push(arg));
+        }
     }
     if (h3Event.method === "POST") {
         const contentType = request.headers.get("content-type");
@@ -108,7 +125,7 @@ async function handleServerFunction(h3Event) {
             /* @ts-ignore */
             sharedConfig.context = { event };
             event.locals.serverFunctionMeta = {
-                id: filepath + "#" + name,
+                id: filepath + "#" + name
             };
             return serverFunction(...parsed);
         });

package/dist/runtime/server-runtime.js

@@ -97,6 +97,18 @@ function createRequest(base, id, instance, options) {
         }
     });
 }
+const plugins = [
+    CustomEventPlugin,
+    DOMExceptionPlugin,
+    EventPlugin,
+    FormDataPlugin,
+    HeadersPlugin,
+    ReadableStreamPlugin,
+    RequestPlugin,
+    ResponsePlugin,
+    URLSearchParamsPlugin,
+    URLPlugin
+];
 async function fetchServerFunction(base, id, options, args) {
     const instance = `server-fn:${INSTANCE++}`;
     const response = await (args.length === 0
@@ -105,20 +117,7 @@ async function fetchServerFunction(base, id, options, args) {
             ? createRequest(base, id, instance, { ...options, body: args[0] })
             : createRequest(base, id, instance, {
                 ...options,
-                body: JSON.stringify(await Promise.resolve(toJSONAsync(args, {
-                    plugins: [
-                        CustomEventPlugin,
-                        DOMExceptionPlugin,
-                        EventPlugin,
-                        FormDataPlugin,
-                        HeadersPlugin,
-                        ReadableStreamPlugin,
-                        RequestPlugin,
-                        ResponsePlugin,
-                        URLSearchParamsPlugin,
-                        URLPlugin
-                    ]
-                }))),
+                body: JSON.stringify(await Promise.resolve(toJSONAsync(args, { plugins }))),
                 headers: { ...options.headers, "Content-Type": "application/json" }
             }));
     if (response.headers.get("Location") ||
@@ -161,10 +160,10 @@ export function createServerReference(fn, id, name) {
             if (prop === "withOptions") {
                 const url = `${baseURL}/_server/?id=${encodeURIComponent(id)}&name=${encodeURIComponent(name)}`;
                 return (options) => {
-                    const fn = (...args) => {
+                    const fn = async (...args) => {
                         const encodeArgs = options.method && options.method.toUpperCase() === "GET";
                         return fetchServerFunction(encodeArgs
-                            ? url + (args.length ? `&args=${JSON.stringify(args)}` : "")
+                            ? url + (args.length ? `&args=${JSON.stringify(await Promise.resolve(toJSONAsync(args, { plugins })))}` : "")
                             : `${baseURL}/_server`, `${id}#${name}`, options, encodeArgs ? [] : args);
                     };
                     fn.url = url;

package/dist/server/index.d.ts

@@ -1,4 +1,4 @@
 export { StartServer } from "./StartServer";
 export { createHandler } from "./handler";
 export { getServerFunctionMeta } from "./serverFunction";
-export * from "./types";
+export type { DocumentComponentProps, Asset, HandlerOptions, ContextMatches, ResponseStub, FetchEvent, RequestEventLocals, PageEvent, APIEvent, APIHandler, ServerFunctionMeta } from "./types";

package/dist/server/index.jsx

@@ -2,4 +2,3 @@
 export { StartServer } from "./StartServer";
 export { createHandler } from "./handler";
 export { getServerFunctionMeta } from "./serverFunction";
-export * from "./types";

package/package.json

@@ -1,9 +1,16 @@
 {
   "name": "@solidjs/start",
-  "version": "0.7.6",
+  "version": "1.0.0-rc.0",
   "type": "module",
   "author": "Ryan Carniato",
   "license": "MIT",
+  "homepage": "https://start.solidjs.com/",
+  "bugs": "https://github.com/solidjs/solid-start/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/solidjs/solid-start.git",
+    "directory": "packages/start"
+  },
   "publishConfig": {
     "access": "public"
   },
@@ -44,7 +51,7 @@
     }
   },
   "devDependencies": {
-    "solid-js": "^1.8.15",
+    "solid-js": "^1.8.16",
     "vinxi": "^0.3.10",
     "typescript": "^5.4.2"
   },