feat: update to solid-js@2.0.0-beta.14

.changeset/chilly-bottles-change.md

@@ -0,0 +1,5 @@
+---
+"@solidjs/router": minor
+---
+
+update to solid-js@2.0.0-beta.14

package.json

@@ -38,7 +38,7 @@
     "release": "pnpm build && changeset publish"
   },
   "devDependencies": {
-    "@solidjs/web": "2.0.0-beta.7",
+    "@solidjs/web": "2.0.0-beta.14",
     "@babel/core": "^7.26.0",
     "@babel/preset-typescript": "^7.26.0",
     "@changesets/cli": "^2.27.10",
@@ -47,14 +47,14 @@
     "@rollup/plugin-terser": "0.4.4",
     "@types/jest": "^29.5.14",
     "@types/node": "^22.10.0",
-    "babel-preset-solid": "2.0.0-beta.7",
+    "babel-preset-solid": "2.0.0-beta.14",
     "jsdom": "^25.0.1",
     "prettier": "^3.4.1",
     "rollup": "^4.27.4",
-    "solid-js": "2.0.0-beta.7",
+    "solid-js": "2.0.0-beta.14",
     "typescript": "^5.7.2",
     "vite": "^6.0.0",
-    "vite-plugin-solid": "3.0.0-next.4",
+    "vite-plugin-solid": "3.0.0-next.5",
     "vitest": "^2.1.6"
   },
   "peerDependencies": {

pnpm-workspace.yaml

@@ -0,0 +1,2 @@
+onlyBuiltDependencies:
+  - esbuild

src/components.tsx

@@ -1,5 +1,5 @@
 /*@refresh skip*/
-import type { JSX } from "solid-js";
+import type { JSX } from "@solidjs/web";
 import { createMemo, merge, omit } from "solid-js";
 import {
   useHref,
@@ -13,7 +13,7 @@ import type {
 } from "./types.js";
 import { normalizePath } from "./utils.js";
 
-declare module "solid-js" {
+declare module "@solidjs/web" {
   namespace JSX {
     interface AnchorHTMLAttributes<T> {
       state?: string;

src/data/action.ts

@@ -1,5 +1,5 @@
-import { $TRACK, action as createSolidAction, createMemo, JSX, onCleanup, getOwner } from "solid-js";
-import { isServer } from "@solidjs/web";
+import { $TRACK, action as createSolidAction, createMemo, onCleanup, getOwner } from "solid-js";
+import { isServer, type JSX } from "@solidjs/web";
 import { useRouter } from "../routing.js";
 import type {
   RouterContext,

src/routers/HashRouter.ts

@@ -1,4 +1,4 @@
-import type { JSX } from "solid-js";
+import type { JSX } from "@solidjs/web";
 import { setupNativeEvents } from "../data/events.js";
 import type { BaseRouterProps } from "./components.jsx";
 import { createRouter, scrollToHash, bindEvent } from "./createRouter.js";

src/routers/MemoryRouter.ts

@@ -2,7 +2,7 @@ import { createRouter, scrollToHash } from "./createRouter.js";
 import { setupNativeEvents } from "../data/events.js";
 import type { LocationChange } from "../types.js";
 import type { BaseRouterProps } from "./components.jsx";
-import type { JSX } from "solid-js";
+import type { JSX } from "@solidjs/web";
 
 export type MemoryHistory = {
   get: () => string;

src/routers/Router.ts

@@ -3,7 +3,7 @@ import { createRouter, scrollToHash, bindEvent } from "./createRouter.js";
 import { StaticRouter } from "./StaticRouter.js";
 import { setupNativeEvents } from "../data/events.js";
 import type { BaseRouterProps } from "./components.jsx";
-import type { JSX } from "solid-js";
+import type { JSX } from "@solidjs/web";
 import { createBeforeLeave, keepDepth, notifyIfNotBlocked, saveCurrentDepth } from "../lifecycle.js";
 
 export type RouterProps = BaseRouterProps & { url?: string, actionBase?: string, explicitLinks?: boolean, preload?: boolean };

src/routers/StaticRouter.ts

@@ -1,6 +1,5 @@
-import { getRequestEvent } from "@solidjs/web";
+import { getRequestEvent, type JSX } from "@solidjs/web";
 import { type BaseRouterProps, createRouterComponent } from "./components.jsx";
-import type { JSX } from "solid-js";
 
 function getPath(url: string) {
   const u = new URL(url);

src/routers/components.tsx

@@ -1,8 +1,8 @@
 /*@refresh skip*/
 
-import type {Component, JSX, Owner} from "solid-js";
+import type {Component, Owner} from "solid-js";
 import {children, createMemo, createRoot, getOwner, merge, untrack} from "solid-js";
-import {getRequestEvent, isServer, type RequestEvent} from "@solidjs/web";
+import {getRequestEvent, isServer, type JSX, type RequestEvent} from "@solidjs/web";
 import {
     createBranches,
     createRouteContext,

src/routing.ts

@@ -1,14 +1,16 @@
-import { JSX, Accessor, flush, runWithOwner } from "solid-js";
 import {
+  type Accessor,
   createComponent,
   createContext,
   createMemo,
   createSignal,
+  flush,
   onCleanup,
+  runWithOwner,
   untrack,
-  useContext
+  useContext,
 } from "solid-js";
-import { isServer, getRequestEvent } from "@solidjs/web";
+import { isServer, getRequestEvent, type JSX } from "@solidjs/web";
 import { createBeforeLeave } from "./lifecycle.js";
 import type {
   BeforeLeaveEventArgs,

src/types.ts

@@ -1,4 +1,5 @@
-import type { Component, JSX, Signal } from "solid-js";
+import type { Accessor, Component, Setter, Signal } from "solid-js";
+import type { JSX } from "@solidjs/web";
 
 declare module "@solidjs/web" {
   interface RequestEvent {
@@ -70,7 +71,7 @@ export interface LocationChange<S = unknown> {
   rawPath?: string;
 }
 export interface RouterIntegration {
-  signal: Signal<LocationChange>;
+  signal: [Accessor<LocationChange>, Setter<LocationChange>];
   create?: (router: RouterContext) => void;
   utils?: Partial<RouterUtils>;
 }