@solidjs/router 2.0.0-next.28 → 2.0.0-next.30

package/dist/data/action.js

@@ -1,9 +1,6 @@
 import { $TRACK, action as createSolidAction, createMemo, onCleanup, getOwner } from "solid-js";
 import { isResponseEnvelope, isServer, REVALIDATE_HEADER } from "@solidjs/web";
 import { createServerReference, decodeRedirectHeaderValue, decodeResponsePayload, parseServerFunctionActionUrl, REDIRECT_HEADER, 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";
 import { provideFlashDecoder, provideFlightConsumer, useRouter } from "../routing.js";
 import { setRouterFormHandler } from "./events.js";
 import { mockBase, setFunctionName } from "../utils.js";
@@ -116,10 +113,16 @@ function installRouterIntegrations() {
         return;
     integrationsInstalled = true;
     if (isServer) {
-        // Server-only: initSubmissions only decodes during SSR, so client builds
-        // tree-shake the codec (which now lives behind the runtime's server entry).
-        // The codec is async from @solidjs/web 2.0.0-rc.7 (encrypted cookie).
-        provideFlashDecoder(decodeFlashCookie);
+        // The codec lives behind the runtime's SERVER entry, which must stay off
+        // the client module graph entirely — a static import here shipped it to
+        // every Vite dev page (#616; prod tree-shook it, dev doesn't shake). The
+        // decoder slot must still fill synchronously (a cold-start POST-redirect-
+        // GET reads submissions on the very first render), so install a wrapper
+        // and let the first decode pull the module: the codec is async anyway
+        // (encrypted cookie, @solidjs/web 2.0.0-rc.7+) and the seeding read
+        // already parks on the decode promise; a failed load reads as "no flash",
+        // the runtime's own malformed-cookie semantics.
+        provideFlashDecoder(cookieHeader => import("@solidjs/web/server-functions/server").then(m => m.decodeFlashCookie(cookieHeader)));
     }
     else {
         setRouterFormHandler(handleFormAction);

package/dist/index.js

@@ -1,7 +1,6 @@
 import { getOwner, runWithOwner, createMemo, createRenderEffect, onCleanup, untrack, createContext, createSignal, useContext, NotReadyError, isPending, DEV, latest, createComponent, createRoot, Show, createEffect, sharedConfig, OBSERVE, onSettled, getObserver, $TRACK, action as action$1 } from 'solid-js';
 import { registerElementClaim, delegateEvents, isServer, getRequestEvent, hasFlashCookie, clearFlashCookie, createComponent as createComponent$1, memo, dynamic, isServerFunction, getServerFunctionMetadata, getServerFunctionRPC, isResponseEnvelope, REVALIDATE_HEADER } from '@solidjs/web';
 import { REDIRECT_HEADER, decodeRedirectHeaderValue, subscribeFlightData, decodeResponsePayload, parseServerFunctionActionUrl, createServerReference } from '@solidjs/web/server-functions';
-import { decodeFlashCookie } from '@solidjs/web/server-functions/server';
 
 const hasSchemeRegex = /^(?:[a-z0-9]+:)?\/\//i;
 const trimPathRegex = /^\/+|(\/)\/+$/g;
@@ -554,7 +553,6 @@ function serverRouteOf(component) {
  */
 function serverRouteArgs(route, params, query) {
   const schema = route.key?.search;
-  let search;
   if (schema) {
     const raw = {
       ...query
@@ -562,13 +560,22 @@ function serverRouteArgs(route, params, query) {
     const outcome = validateSearch(schema, raw);
     // Issues leave the raw values in place, matching useSearchParams: search
     // strings are user input, so defaults belong in the schema itself.
-    search = outcome.issues ? raw : outcome.value;
+    return {
+      params: {
+        ...params
+      },
+      search: outcome.issues ? raw : outcome.value
+    };
   }
+  // No schema: leave the key out rather than carrying `search: undefined` —
+  // the args are sent as plain JSON by default and the runtime's JSON-safety
+  // check rejects explicit `undefined` (#615). Destructuring on the server
+  // reads the same either way, and the args-memo equality treats an absent
+  // key and undefined alike.
   return {
     params: {
       ...params
-    },
-    search
+    }
   };
 }
 const shallowEqual = (a, b) => a === b || !!a && !!b && typeof a === "object" && typeof b === "object" && Object.keys(a).length === Object.keys(b).length && Object.keys(a).every(k => a[k] === b[k]);
@@ -3075,10 +3082,16 @@ function installRouterIntegrations() {
   if (integrationsInstalled) return;
   integrationsInstalled = true;
   if (isServer) {
-    // Server-only: initSubmissions only decodes during SSR, so client builds
-    // tree-shake the codec (which now lives behind the runtime's server entry).
-    // The codec is async from @solidjs/web 2.0.0-rc.7 (encrypted cookie).
-    provideFlashDecoder(decodeFlashCookie);
+    // The codec lives behind the runtime's SERVER entry, which must stay off
+    // the client module graph entirely — a static import here shipped it to
+    // every Vite dev page (#616; prod tree-shook it, dev doesn't shake). The
+    // decoder slot must still fill synchronously (a cold-start POST-redirect-
+    // GET reads submissions on the very first render), so install a wrapper
+    // and let the first decode pull the module: the codec is async anyway
+    // (encrypted cookie, @solidjs/web 2.0.0-rc.7+) and the seeding read
+    // already parks on the decode promise; a failed load reads as "no flash",
+    // the runtime's own malformed-cookie semantics.
+    provideFlashDecoder(cookieHeader => import('@solidjs/web/server-functions/server').then(m => m.decodeFlashCookie(cookieHeader)));
   } else {
     setRouterFormHandler(handleFormAction);
     provideFlightConsumer(setupFlightDataConsumer);

package/dist/serverRouteShared.js

@@ -12,15 +12,19 @@ export function serverRouteOf(component) {
  */
 export function serverRouteArgs(route, params, query) {
     const schema = route.key?.search;
-    let search;
     if (schema) {
         const raw = { ...query };
         const outcome = validateSearch(schema, raw);
         // Issues leave the raw values in place, matching useSearchParams: search
         // strings are user input, so defaults belong in the schema itself.
-        search = outcome.issues ? raw : outcome.value;
+        return { params: { ...params }, search: outcome.issues ? raw : outcome.value };
     }
-    return { params: { ...params }, search };
+    // No schema: leave the key out rather than carrying `search: undefined` —
+    // the args are sent as plain JSON by default and the runtime's JSON-safety
+    // check rejects explicit `undefined` (#615). Destructuring on the server
+    // reads the same either way, and the args-memo equality treats an absent
+    // key and undefined alike.
+    return { params: { ...params } };
 }
 const shallowEqual = (a, b) => a === b ||
     (!!a &&

package/dist/types.d.ts

@@ -144,12 +144,21 @@ export type RouteSectionComponent<T = unknown, P extends Params = Params> = Comp
 /**
  * What a server component route is called with (experimental): the params
  * the route's pattern (and its ancestors') declares, plus — only when the
- * route declares a `search` schema — that schema's validated output.
+ * route declares a `search` schema — that schema's validated output. Without
+ * a schema the `search` key is ABSENT, not `undefined`: the args travel as
+ * plain JSON by default, and the runtime's JSON-safety check rejects
+ * explicit `undefined` (#615). The type mirrors that — optional exactly when
+ * the search type admits undefined, required when a schema narrows it.
  */
-export interface ServerRouteArgs<P extends Params | TypedRouteConfig = Params, S = undefined> {
+export type ServerRouteArgs<P extends Params | TypedRouteConfig = Params, S = undefined> = {
     params: ServerRouteParams<P>;
-    search: P extends TypedRouteConfig ? SearchOutputOf<P> : S;
-}
+} & (undefined extends ServerRouteSearch<P, S> ? {
+    search?: ServerRouteSearch<P, S>;
+} : {
+    search: ServerRouteSearch<P, S>;
+});
+/** The search half of {@link ServerRouteArgs}: schema output when declared. */
+export type ServerRouteSearch<P, S> = P extends TypedRouteConfig ? SearchOutputOf<P> : S;
 /**
  * `ServerRouteArgs<typeof route>`: a `defineFileRoute` config is a witness —
  * params from its pattern, search from its schema — the way

package/package.json

@@ -6,7 +6,7 @@
     "Ryan Turnquist"
   ],
   "license": "MIT",
-  "version": "2.0.0-next.28",
+  "version": "2.0.0-next.30",
   "homepage": "https://github.com/solidjs/solid-router#readme",
   "repository": {
     "type": "git",