Skip to content

Commit e5ec8c1

Browse files
authored
Merge branch 'next' into fix/498-hash-navigation-null-history-state
2 parents 563d89f + 3605e14 commit e5ec8c1

File tree

4 files changed

+170
-17
lines changed

4 files changed

+170
-17
lines changed

Diff for: package.json

+3
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@
8181
"isarray": "npm:@nolyfill/isarray@latest",
8282
"side-channel": "npm:@nolyfill/side-channel@latest",
8383
"string.prototype.padend": "npm:@nolyfill/string.prototype.padend@latest"
84+
},
85+
"patchedDependencies": {
86+
"next@14.1.1-canary.0": "patches/next@14.1.1-canary.0.patch"
8487
}
8588
}
8689
}

Diff for: packages/docs/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"clsx": "^2.1.0",
2525
"dayjs": "^1.11.10",
2626
"lucide-react": "^0.323.0",
27-
"next": "14.1.0",
27+
"next": "14.1.1-canary.0",
2828
"next-docs-mdx": "6.0.2",
2929
"next-docs-ui": "6.0.2",
3030
"next-docs-zeta": "6.0.2",

Diff for: patches/next@14.1.1-canary.0.patch

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
diff --git a/.prettierignore b/.prettierignore
2+
new file mode 100644
3+
index 0000000000000000000000000000000000000000..fa29cdfff915566d202c195607a42b9445919261
4+
--- /dev/null
5+
+++ b/.prettierignore
6+
@@ -0,0 +1 @@
7+
+**
8+
\ No newline at end of file
9+
diff --git a/dist/client/components/app-router.js b/dist/client/components/app-router.js
10+
index aa2818d8ead9ed713077ff715a411d04dc149ee5..b15f914df85079a31870b0a09279be08019e503f 100644
11+
--- a/dist/client/components/app-router.js
12+
+++ b/dist/client/components/app-router.js
13+
@@ -376,6 +376,7 @@ function Head(param) {
14+
const originalReplaceState = window.history.replaceState.bind(window.history);
15+
// Ensure the canonical URL in the Next.js Router is updated when the URL is changed so that `usePathname` and `useSearchParams` hold the pushed values.
16+
const applyUrlFromHistoryPushReplace = (url)=>{
17+
+ if (!window.history.state) return;
18+
const href = window.location.href;
19+
(0, _react.startTransition)(()=>{
20+
dispatch({

Diff for: pnpm-lock.yaml

+146-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)