Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-01-22 11:22:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into feat/oxc

Browse Source
This commit is contained in:
Daniel Roe 2024-12-09 16:33:25 +00:00
commit d39e64964e
No known key found for this signature in database
GPG Key ID: 3714AB03996F442B
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/nuxt/src/pages/runtime/validate.ts
View File

@ -29,7 +29,9 @@ export default defineNuxtRouteMiddleware(async (to) => {
// We pretend to have navigated to the invalid route so // We pretend to have navigated to the invalid route so
// that the user can return to the previous page with // that the user can return to the previous page with
// the back button. // the back button.
window?.history.pushState({}, '', to.fullPath) if (typeof window !== 'undefined') {
window.history.pushState({}, '', to.fullPath)
}
}) })
// We stop the navigation immediately before it resolves // We stop the navigation immediately before it resolves
// if there is no other route matching it. // if there is no other route matching it.

2
packages/schema/src/config/experimental.ts
View File

@ -420,7 +420,7 @@ export default defineUntypedSchema({
/** /**
* Keep showing the spa-loading-template until suspense:resolve * Keep showing the spa-loading-template until suspense:resolve
* @see [Nuxt Issues #24770](https://github.com/nuxt/nuxt/issues/21721) * @see [Nuxt Issues #21721](https://github.com/nuxt/nuxt/issues/21721)
* @type {'body' | 'within'} * @type {'body' | 'within'}
*/ */
spaLoadingTemplateLocation: { spaLoadingTemplateLocation: {