Skip to content

Commit 6be8e6c

Browse files
brophdawg11brophdawg11
committedJan 11, 2024
Merge branch 'release-next'
·
v0.0.0-nightly-fa0068005-20250131create-react-router@6.26.2
2 parents ef0d0d7 + 4e528c0 commit 6be8e6c

18 files changed

+289
-76
lines changed
 

‎CHANGELOG.md

+154-42
Large diffs are not rendered by default.

‎packages/react-router-dom-v5-compat/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# `react-router-dom-v5-compat`
22

3+
## 6.21.2
4+
5+
### Patch Changes
6+
7+
- Updated dependencies:
8+
- `react-router-dom@6.21.2`
9+
- `react-router@6.21.2`
10+
311
## 6.21.1
412

513
### Patch Changes

‎packages/react-router-dom-v5-compat/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-router-dom-v5-compat",
3-
"version": "6.21.1",
3+
"version": "6.21.2",
44
"description": "Migration path to React Router v6 from v4/5",
55
"keywords": [
66
"react",
@@ -24,7 +24,7 @@
2424
"types": "./dist/index.d.ts",
2525
"dependencies": {
2626
"history": "^5.3.0",
27-
"react-router": "6.21.1"
27+
"react-router": "6.21.2"
2828
},
2929
"peerDependencies": {
3030
"react": ">=16.8",

‎packages/react-router-dom/CHANGELOG.md

+9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# `react-router-dom`
22

3+
## 6.21.2
4+
5+
### Patch Changes
6+
7+
- Leverage `useId` for internal fetcher keys when available ([#11166](https://github.com/remix-run/react-router/pull/11166))
8+
- Updated dependencies:
9+
- `@remix-run/router@1.14.2`
10+
- `react-router@6.21.2`
11+
312
## 6.21.1
413

514
### Patch Changes

‎packages/react-router-dom/__tests__/data-browser-router-test.tsx

+4-2
Original file line numberDiff line numberDiff line change
@@ -5368,9 +5368,11 @@ function testDomRouter(
53685368
{ window: getWindow("/") }
53695369
);
53705370
let { container } = render(<RouterProvider router={router} />);
5371-
expect(container.innerHTML).not.toMatch(/__\d+__,my-key/);
5371+
expect(container.innerHTML).not.toMatch(/my-key/);
53725372
await waitFor(() =>
5373-
expect(container.innerHTML).toMatch(/__\d+__,my-key/)
5373+
// React `useId()` results in either `:r2a:` or `:rp:` depending on
5374+
// `DataBrowserRouter`/`DataHashRouter`
5375+
expect(container.innerHTML).toMatch(/(:r2a:|:rp:),my-key/)
53745376
);
53755377
});
53765378
});

‎packages/react-router-dom/index.tsx

+7-1
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,8 @@ const START_TRANSITION = "startTransition";
396396
const startTransitionImpl = React[START_TRANSITION];
397397
const FLUSH_SYNC = "flushSync";
398398
const flushSyncImpl = ReactDOM[FLUSH_SYNC];
399+
const USE_ID = "useId";
400+
const useIdImpl = React[USE_ID];
399401

400402
function startTransitionSafe(cb: () => void) {
401403
if (startTransitionImpl) {
@@ -1634,10 +1636,14 @@ export function useFetcher<TData = any>({
16341636
);
16351637

16361638
// Fetcher key handling
1637-
let [fetcherKey, setFetcherKey] = React.useState<string>(key || "");
1639+
// OK to call conditionally to feature detect `useId`
1640+
// eslint-disable-next-line react-hooks/rules-of-hooks
1641+
let defaultKey = useIdImpl ? useIdImpl() : "";
1642+
let [fetcherKey, setFetcherKey] = React.useState<string>(key || defaultKey);
16381643
if (key && key !== fetcherKey) {
16391644
setFetcherKey(key);
16401645
} else if (!fetcherKey) {
1646+
// We will only fall through here when `useId` is not available
16411647
setFetcherKey(getUniqueFetcherId());
16421648
}
16431649

‎packages/react-router-dom/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-router-dom",
3-
"version": "6.21.1",
3+
"version": "6.21.2",
44
"description": "Declarative routing for React web applications",
55
"keywords": [
66
"react",
@@ -23,8 +23,8 @@
2323
"module": "./dist/index.js",
2424
"types": "./dist/index.d.ts",
2525
"dependencies": {
26-
"@remix-run/router": "1.14.1",
27-
"react-router": "6.21.1"
26+
"@remix-run/router": "1.14.2",
27+
"react-router": "6.21.2"
2828
},
2929
"devDependencies": {
3030
"react": "^18.2.0",

‎packages/react-router-native/CHANGELOG.md

+7-14
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# `react-router-native`
22

3+
## 6.21.2
4+
5+
### Patch Changes
6+
7+
- Updated dependencies:
8+
- `react-router@6.21.2`
9+
310
## 6.21.1
411

512
### Patch Changes
@@ -219,20 +226,6 @@
219226
- Updated dependencies:
220227
- `react-router@6.14.1`
221228

222-
## 6.14.1-pre.1
223-
224-
### Patch Changes
225-
226-
- Updated dependencies:
227-
- `react-router@6.14.1-pre.1`
228-
229-
## 6.14.1-pre.0
230-
231-
### Patch Changes
232-
233-
- Updated dependencies:
234-
- `react-router@6.14.1-pre.0`
235-
236229
## 6.14.0
237230

238231
### Patch Changes

‎packages/react-router-native/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-router-native",
3-
"version": "6.21.1",
3+
"version": "6.21.2",
44
"description": "Declarative routing for React Native applications",
55
"keywords": [
66
"react",
@@ -22,7 +22,7 @@
2222
"types": "./dist/index.d.ts",
2323
"dependencies": {
2424
"@ungap/url-search-params": "^0.2.2",
25-
"react-router": "6.21.1"
25+
"react-router": "6.21.2"
2626
},
2727
"devDependencies": {
2828
"react": "^18.2.0",

‎packages/react-router/CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# `react-router`
22

3+
## 6.21.2
4+
5+
### Patch Changes
6+
7+
- Updated dependencies:
8+
- `@remix-run/router@1.14.2`
9+
310
## 6.21.1
411

512
### Patch Changes

‎packages/react-router/__tests__/generatePath-test.tsx

+6
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@ describe("generatePath", () => {
5252
// incorrect usage but worked in 6.3.0 so keep it to avoid the regression
5353
expect(generatePath("/courses/*", { "*": 0 })).toBe("/courses/0");
5454
});
55+
56+
it("handles dashes in dynamic params", () => {
57+
expect(generatePath("/courses/:foo-bar", { "foo-bar": "baz" })).toBe(
58+
"/courses/baz"
59+
);
60+
});
5561
});
5662

5763
describe("with extraneous params", () => {

‎packages/react-router/__tests__/path-matching-test.tsx

+38
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,44 @@ describe("path matching", () => {
130130

131131
expect(pickPaths(routes, "/page")).toEqual(["page"]);
132132
});
133+
134+
test("dynamic segments can contain dashes", () => {
135+
let routes = [
136+
{
137+
path: ":foo-bar",
138+
},
139+
{
140+
path: "foo-bar",
141+
},
142+
];
143+
144+
expect(matchRoutes(routes, "/foo-bar")).toMatchInlineSnapshot(`
145+
[
146+
{
147+
"params": {},
148+
"pathname": "/foo-bar",
149+
"pathnameBase": "/foo-bar",
150+
"route": {
151+
"path": "foo-bar",
152+
},
153+
},
154+
]
155+
`);
156+
expect(matchRoutes(routes, "/whatever")).toMatchInlineSnapshot(`
157+
[
158+
{
159+
"params": {
160+
"foo-bar": "whatever",
161+
},
162+
"pathname": "/whatever",
163+
"pathnameBase": "/whatever",
164+
"route": {
165+
"path": ":foo-bar",
166+
},
167+
},
168+
]
169+
`);
170+
});
133171
});
134172

135173
describe("path matching with a basename", () => {

‎packages/react-router/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-router",
3-
"version": "6.21.1",
3+
"version": "6.21.2",
44
"description": "Declarative routing for React",
55
"keywords": [
66
"react",
@@ -23,7 +23,7 @@
2323
"module": "./dist/index.js",
2424
"types": "./dist/index.d.ts",
2525
"dependencies": {
26-
"@remix-run/router": "1.14.1"
26+
"@remix-run/router": "1.14.2"
2727
},
2828
"devDependencies": {
2929
"react": "^18.2.0"

‎packages/router/CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# `@remix-run/router`
22

3+
## 1.14.2
4+
5+
### Patch Changes
6+
7+
- Fix bug where dashes were not picked up in dynamic parameter names ([#11160](https://github.com/remix-run/react-router/pull/11160))
8+
- Do not attempt to deserialize empty JSON responses ([#11164](https://github.com/remix-run/react-router/pull/11164))
9+
310
## 1.14.1
411

512
### Patch Changes

‎packages/router/__tests__/navigation-test.ts

+18
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,24 @@ describe("navigations", () => {
114114
});
115115
});
116116

117+
// See: https://github.com/remix-run/react-router/issues/11145
118+
it("does not attempt to deserialize empty json responses", async () => {
119+
let t = initializeTest();
120+
let A = await t.navigate("/foo");
121+
await A.loaders.foo.resolve(
122+
new Response(null, {
123+
headers: {
124+
"Content-Type": "application/json",
125+
},
126+
})
127+
);
128+
expect(t.router.state.errors).toBeNull();
129+
expect(t.router.state.loaderData).toMatchObject({
130+
root: "ROOT",
131+
foo: null,
132+
});
133+
});
134+
117135
it("unwraps non-redirect text Responses", async () => {
118136
let t = initializeTest();
119137
let A = await t.navigate("/foo");

‎packages/router/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-run/router",
3-
"version": "1.14.1",
3+
"version": "1.14.2",
44
"description": "Nested/Data-driven/Framework-agnostic Routing",
55
"keywords": [
66
"remix",

‎packages/router/router.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -4098,7 +4098,11 @@ async function callLoaderOrAction(
40984098
// Check between word boundaries instead of startsWith() due to the last
40994099
// paragraph of https://httpwg.org/specs/rfc9110.html#field.content-type
41004100
if (contentType && /\bapplication\/json\b/.test(contentType)) {
4101-
data = await result.json();
4101+
if (result.body == null) {
4102+
data = null;
4103+
} else {
4104+
data = await result.json();
4105+
}
41024106
} else {
41034107
data = await result.text();
41044108
}

‎packages/router/utils.ts

+9-6
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,7 @@ function rankRouteBranches(branches: RouteBranch[]): void {
685685
);
686686
}
687687

688-
const paramRe = /^:\w+$/;
688+
const paramRe = /^:[\w-]+$/;
689689
const dynamicSegmentValue = 3;
690690
const indexRouteValue = 2;
691691
const emptySegmentValue = 1;
@@ -822,7 +822,7 @@ export function generatePath<Path extends string>(
822822
return stringify(params[star]);
823823
}
824824

825-
const keyMatch = segment.match(/^:(\w+)(\??)$/);
825+
const keyMatch = segment.match(/^:([\w-]+)(\??)$/);
826826
if (keyMatch) {
827827
const [, key, optional] = keyMatch;
828828
let param = params[key as PathParam<Path>];
@@ -967,10 +967,13 @@ function compilePath(
967967
.replace(/\/*\*?$/, "") // Ignore trailing / and /*, we'll handle it below
968968
.replace(/^\/*/, "/") // Make sure it has a leading /
969969
.replace(/[\\.*+^${}|()[\]]/g, "\\$&") // Escape special regex chars
970-
.replace(/\/:(\w+)(\?)?/g, (_: string, paramName: string, isOptional) => {
971-
params.push({ paramName, isOptional: isOptional != null });
972-
return isOptional ? "/?([^\\/]+)?" : "/([^\\/]+)";
973-
});
970+
.replace(
971+
/\/:([\w-]+)(\?)?/g,
972+
(_: string, paramName: string, isOptional) => {
973+
params.push({ paramName, isOptional: isOptional != null });
974+
return isOptional ? "/?([^\\/]+)?" : "/([^\\/]+)";
975+
}
976+
);
974977

975978
if (path.endsWith("*")) {
976979
params.push({ paramName: "*" });

0 commit comments

Comments
 (0)
Please sign in to comment.