From 9f14b12b59e829bc0190cdf1113d4935a3df1530 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 1 Sep 2026 18:05:45 +0000
Subject: [PATCH] Version Packages (next)

---
 .changeset/pre.json | 2 ++
 CHANGELOG.md        | 7 +++++++
 package.json        | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index 52a432e9..4db0fd9b 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -18,6 +18,7 @@
     "dev-gate-diagnostics",
     "drop-leaving-section-gate",
     "drop-scroll-growth-chasing",
+    "expect-server-function-data-address",
     "export-default-search-types",
     "fix-navigate-commit-window-drop",
     "fix-stale-params-on-navigation",
@@ -41,6 +42,7 @@
     "preserve-layouts-between-child-routes",
     "query-implies-get",
     "query-redirect-revalidate-pending",
+    "redirect-carrier-semantics",
     "redirect-sweep-retained-sections",
     "remove-legacy-apis",
     "renumber-next-line-two-x",
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2ebcfb0..3a0959f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @solidjs/router
 
+## 2.0.0-next.21
+
+### Patch Changes
+
+- 7ff74bf: Track the server-function data address (solidjs/solid#3094). Scripted calls now go to `<endpoint>/data/<id>` while rendered action urls stay at the bare `<endpoint>/<id>`; the router needed no functional change — synthesized form actions already hand the rendered url to `createServerReference`, and the transport re-addresses its own calls — so this updates the wire-shape expectations in tests and the synthesis doc comment. Requires `@solidjs/web` 2.0.0-rc.5 (the release carrying the data-address split); the peer floor is raised to `^2.0.0-rc.5`.
+- 033b6f1: Navigate from the redirect carrier instead of sniffing Location. Server-function redirects now arrive as `X-Server-Function-Redirect: <status> <resolved-url>` (solidjs/solid#3102), so the soft/hard split is a real origin comparison — same-origin targets navigate softly with `replace: true` (the target takes the submission's place in history, matching HTTP's form-post semantics), anything else hard-navigates — never a guess from how the author spelled the target, which sent relative and absolute spellings down different navigation paths (solidjs/solid#3107). A locally-produced `redirect()` (a client-side action) still navigates from its real 3xx + Location; a `Location` on any other status is the author's data and never navigates.
+
 ## 2.0.0-next.20
 
 ### Patch Changes
diff --git a/package.json b/package.json
index 1c7fb642..f2eb90c8 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
     "Ryan Turnquist"
   ],
   "license": "MIT",
-  "version": "2.0.0-next.20",
+  "version": "2.0.0-next.21",
   "homepage": "https://github.com/solidjs/solid-router#readme",
   "repository": {
     "type": "git",