@solidjs/router 2.0.0-next.18 → 2.0.0-next.19

package/dist/data/action.js

@@ -1,6 +1,6 @@
 import { $TRACK, action as createSolidAction, createMemo, onCleanup, getOwner } from "solid-js";
 import { isResponseEnvelope, isServer, REVALIDATE_HEADER } from "@solidjs/web";
-import { createServerReference, decodeResponsePayload, subscribeFlightData } from "@solidjs/web/server-functions";
+import { createServerReference, decodeResponsePayload, parseServerFunctionUrl, subscribeFlightData } from "@solidjs/web/server-functions";
 // The explicit /server specifier is safe here: the only call site is
 // server-guarded, so client builds tree-shake the codec away.
 import { decodeFlashCookie } from "@solidjs/web/server-functions/server";
@@ -49,8 +49,9 @@ export function handleFormAction(evt, router, actionBase) {
         throw new Error("Only POST forms are supported for Actions");
     // A registry miss on a server-action url is a direct bind whose module
     // never loaded client-side (server components): the url is self-describing
-    // (`?id`, bound `?args`), so a generic invocation is synthesized from it —
-    // delegation alone is sufficient, the no-JS path stays a no-JS fallback.
+    // (the id in the path, bound `?args` in the query), so a generic invocation
+    // is synthesized from it — delegation alone is sufficient, the no-JS path
+    // stays a no-JS fallback.
     // Client-only actions (`https://action/`) are their module's JS by
     // definition, so a miss there falls through to native submission.
     const handler = actions.get(actionRef) || (serverAction && createServerFormAction(actionRef));
@@ -64,16 +65,17 @@ export function handleFormAction(evt, router, actionBase) {
 }
 /**
  * Synthesizes a router action for a server-rendered action url. The url
- * carries everything an invocation needs — the function id and any bound
- * `.with()` arguments (plain JSON in `?args`, which the server prepends for
- * natural-encoding bodies exactly as it does for no-JS posts) — so the
- * FormData is posted to it verbatim through the server-function transport:
+ * carries everything an invocation needs — the function id in the path
+ * (`<endpoint>/<id>`) and any bound `.with()` arguments (plain JSON in
+ * `?args`, which the server prepends for natural-encoding bodies exactly as
+ * it does for no-JS posts) — so the FormData is posted to it verbatim
+ * through the server-function transport:
  * submissions, `aria-busy`, redirects, revalidation, and single-flight all
  * flow through the normal action machinery. Registered under the url, so
  * repeat submits reuse it (and a later real registration overrides it).
  */
 function createServerFormAction(url) {
-    const id = new URL(url, mockBase).searchParams.get("id");
+    const id = parseServerFunctionUrl(url);
     if (!id)
         return undefined;
     // typecheck resolves the server half of the dual module; this path only
@@ -91,8 +93,9 @@ function createServerFormAction(url) {
  */
 export function submitServerForm(router, url, form, data) {
     const handler = actions.get(url) || createServerFormAction(url);
-    // no `?id` — not the server function convention; nothing can run it,
-    // resubmit natively (submit() bypasses the delegated handler)
+    // not an address (`<endpoint>/<id>`) — not the server function convention;
+    // nothing can run it, resubmit natively (submit() bypasses the delegated
+    // handler)
     if (!handler)
         return form.submit();
     handler.call({ r: router, f: form }, form.enctype === "multipart/form-data" ? data : new URLSearchParams(data));

package/dist/index.js

@@ -1,6 +1,6 @@
 import { getOwner, runWithOwner, createMemo, createRenderEffect, onCleanup, untrack, createContext, createSignal, useContext, NotReadyError, isPending, DEV, flush, createComponent, createRoot, Show, createEffect, sharedConfig, getObserver, $TRACK, action as action$1 } from 'solid-js';
 import { registerElementClaim, delegateEvents, isServer, getRequestEvent, hasFlashCookie, clearFlashCookie, createComponent as createComponent$1, memo, isServerFunction, getServerFunctionMetadata, getServerFunctionRPC, isResponseEnvelope, REVALIDATE_HEADER } from '@solidjs/web';
-import { subscribeFlightData, decodeResponsePayload, createServerReference } from '@solidjs/web/server-functions';
+import { subscribeFlightData, decodeResponsePayload, parseServerFunctionUrl, createServerReference } from '@solidjs/web/server-functions';
 import { decodeFlashCookie } from '@solidjs/web/server-functions/server';
 
 const hasSchemeRegex = /^(?:[a-z0-9]+:)?\/\//i;
@@ -2545,8 +2545,9 @@ function handleFormAction(evt, router, actionBase) {
   if (evt.target.method.toUpperCase() !== "POST") throw new Error("Only POST forms are supported for Actions");
   // A registry miss on a server-action url is a direct bind whose module
   // never loaded client-side (server components): the url is self-describing
-  // (`?id`, bound `?args`), so a generic invocation is synthesized from it —
-  // delegation alone is sufficient, the no-JS path stays a no-JS fallback.
+  // (the id in the path, bound `?args` in the query), so a generic invocation
+  // is synthesized from it — delegation alone is sufficient, the no-JS path
+  // stays a no-JS fallback.
   // Client-only actions (`https://action/`) are their module's JS by
   // definition, so a miss there falls through to native submission.
   const handler = actions.get(actionRef) || serverAction && createServerFormAction(actionRef);
@@ -2562,16 +2563,17 @@ function handleFormAction(evt, router, actionBase) {
 
 /**
  * Synthesizes a router action for a server-rendered action url. The url
- * carries everything an invocation needs — the function id and any bound
- * `.with()` arguments (plain JSON in `?args`, which the server prepends for
- * natural-encoding bodies exactly as it does for no-JS posts) — so the
- * FormData is posted to it verbatim through the server-function transport:
+ * carries everything an invocation needs — the function id in the path
+ * (`<endpoint>/<id>`) and any bound `.with()` arguments (plain JSON in
+ * `?args`, which the server prepends for natural-encoding bodies exactly as
+ * it does for no-JS posts) — so the FormData is posted to it verbatim
+ * through the server-function transport:
  * submissions, `aria-busy`, redirects, revalidation, and single-flight all
  * flow through the normal action machinery. Registered under the url, so
  * repeat submits reuse it (and a later real registration overrides it).
  */
 function createServerFormAction(url) {
-  const id = new URL(url, mockBase).searchParams.get("id");
+  const id = parseServerFunctionUrl(url);
   if (!id) return undefined;
   // typecheck resolves the server half of the dual module; this path only
   // runs in the browser, where the client transport's signature applies
@@ -2591,8 +2593,9 @@ function createServerFormAction(url) {
  */
 function submitServerForm(router, url, form, data) {
   const handler = actions.get(url) || createServerFormAction(url);
-  // no `?id` — not the server function convention; nothing can run it,
-  // resubmit natively (submit() bypasses the delegated handler)
+  // not an address (`<endpoint>/<id>`) — not the server function convention;
+  // nothing can run it, resubmit natively (submit() bypasses the delegated
+  // handler)
   if (!handler) return form.submit();
   handler.call({
     r: router,

package/package.json

@@ -6,7 +6,7 @@
     "Ryan Turnquist"
   ],
   "license": "MIT",
-  "version": "2.0.0-next.18",
+  "version": "2.0.0-next.19",
   "homepage": "https://github.com/solidjs/solid-router#readme",
   "repository": {
     "type": "git",
@@ -37,22 +37,22 @@
     "@rollup/plugin-babel": "6.0.4",
     "@rollup/plugin-node-resolve": "15.3.0",
     "@rollup/plugin-terser": "0.4.4",
-    "@solidjs/vite-plugin": "3.0.0-next.28",
-    "@solidjs/web": "^2.0.0-rc.3",
+    "@solidjs/vite-plugin": "3.0.0-next.35",
+    "@solidjs/web": "^2.0.0-rc.4",
     "@types/jest": "^29.5.14",
     "@types/node": "^22.10.0",
     "babel-preset-solid": "^2.0.0-rc.2",
     "jsdom": "^25.0.1",
     "prettier": "^3.4.1",
     "rollup": "^4.27.4",
-    "solid-js": "^2.0.0-rc.3",
+    "solid-js": "^2.0.0-rc.4",
     "typescript": "^5.7.2",
-    "vite": "^6.0.0",
-    "vitest": "^2.1.6"
+    "vite": "^8.2.2",
+    "vitest": "^4.1.11"
   },
   "peerDependencies": {
-    "@solidjs/web": "^2.0.0-rc.3",
-    "solid-js": "^2.0.0-rc.3"
+    "@solidjs/web": "^2.0.0-rc.4",
+    "solid-js": "^2.0.0-rc.4"
   },
   "scripts": {
     "build": "rm -rf dist && tsc && rollup -c",