@solidjs/router 2.0.0-next.36 → 2.0.0-next.37

package/dist/serverRouteComponent.js

@@ -8,7 +8,7 @@
 //   // before: a client component exists only to make the call
 //   const getStory = query(storyView, "story");
 //   component: props => {
-//     const View = dynamic(() => getStory(props.params.id));
+//     const View = dynamicComponent(() => getStory(props.params.id));
 //     return <View>{props.children}</View>;
 //   }
 //   // after
@@ -36,7 +36,7 @@
 // A server component that takes other client positions — handlers, refs,
 // named slots — has a client half, and that half is a client component; the
 // helper does not pretend otherwise. Write the wrapper for that route.
-import { dynamic } from "@solidjs/web";
+import { dynamicComponent } from "@solidjs/web";
 import { createComponent, DEV } from "solid-js";
 import { SERVER_ROUTE } from "./serverRouteShared.js";
 /**
@@ -77,8 +77,9 @@ source) {
     };
     function render(args, routeProps) {
         // The source may answer a component, a promise of one, or (a live query)
-        // successive components; `dynamic`'s memo lands each the same way.
-        const View = dynamic(() => call(args()));
+        // successive components; `dynamicComponent`'s memo lands each the same
+        // way. Never a tag, so the element runtime `dynamic` retains stays out.
+        const View = dynamicComponent(() => call(args()));
         return createComponent(View, {
             get children() {
                 return routeProps.children;

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-import type { Component, Signal } from "solid-js";
+import type { Component, Owner, Signal } from "solid-js";
 import type { JSX, ResponseEnvelope } from "@solidjs/web";
 declare module "@solidjs/web" {
     interface RequestEvent {
@@ -118,13 +118,13 @@ export interface LocationWrite<S = unknown> extends Omit<LocationChange<S>, "val
 export interface RouterIntegration {
     signal: [get: () => LocationChange, set: (next: LocationWrite) => void];
     /**
-     * The navigation written but not yet committed to history — the window
-     * between its location write and the settle that pushes it. A destination
-     * in that window was never shown, so a `navigate()` issued inside it (a
-     * guard redirecting as the held route lands) is a hop of that navigation
-     * rather than a new one, exactly as one issued while it is still pending.
+     * Whether a navigation write's settle has run: Solid's `onSettled`,
+     * registered beside the write, fired for the transition that carried it.
+     * Until then the write is in flight: its destination was never shown, so a
+     * `navigate()` issued meanwhile (a guard redirecting as the held route
+     * lands) is a hop of that navigation rather than a new one.
      */
-    inflight?: () => LocationChange | undefined;
+    settled?: (write: LocationChange) => boolean;
     utils?: Partial<RouterUtils>;
 }
 export type Intent = "initial" | "native" | "navigate" | "preload";
@@ -330,11 +330,12 @@ export interface RouterContext {
     params: Params;
     wrapParams: (getParams: () => Params) => Params;
     navigatorFactory: NavigatorFactory;
-    isRouting: () => boolean;
     /** @internal Intent of the in-flight canonical location transition. */
     intent?: () => Intent | undefined;
-    /** The target of the in-flight navigation transition, if any. Not reactive. */
-    readonly pendingTarget?: LocationChange;
+    /** @internal The integration's location signal: the last flushed write. */
+    _source: () => LocationChange;
+    /** @internal The owner the router's own computations live under. */
+    _owner: Owner | null;
     matches: () => RouteMatch[];
     renderPath(path: string): string;
     parsePath(str: string): string;
@@ -343,6 +344,22 @@ export interface RouterContext {
     singleFlight: boolean;
     submissions: Signal<Submission<any, any>[]>;
 }
+/**
+ * A plugin for the router's `links` option that extends the state it writes
+ * onto claimed anchors. Built once per router with its base path. The router
+ * ships `pendingLinks`, which adds `data-pending`.
+ *
+ * @example
+ * ```ts
+ * const Router = createRouter({ routes, links: pendingLinks });
+ * ```
+ */
+export type LinksPlugin = (router: RouterContext, base: string) => {
+    /** The reactive read the claims sweep re-runs on. */
+    track(): unknown;
+    /** Whether an anchor resolving to `target` is the in-flight destination; read when `track()` is truthy. */
+    pending(target: string | undefined): boolean;
+};
 export interface BeforeLeaveEventArgs {
     from: Location;
     to: string | number;

package/package.json

@@ -6,7 +6,7 @@
     "Ryan Turnquist"
   ],
   "license": "MIT",
-  "version": "2.0.0-next.36",
+  "version": "2.0.0-next.37",
   "homepage": "https://github.com/solidjs/solid-router#readme",
   "repository": {
     "type": "git",
@@ -37,23 +37,23 @@
     "@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.35",
-    "@solidjs/web": "^2.0.0-rc.13",
+    "@solidjs/vite-plugin": "3.0.0-next.47",
+    "@solidjs/web": "^2.0.0-rc.14",
     "@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.13",
+    "solid-js": "^2.0.0-rc.14",
     "typescript": "^5.7.2",
     "vite": "^8.2.2",
     "vitest": "^4.1.11"
   },
   "peerDependencies": {
-    "@solidjs/web": "^2.0.0-rc.13",
+    "@solidjs/web": "^2.0.0-rc.14",
     "filesystem-routing": ">=0.4.0",
-    "solid-js": "^2.0.0-rc.13"
+    "solid-js": "^2.0.0-rc.14"
   },
   "peerDependenciesMeta": {
     "filesystem-routing": {