Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-29 09:02:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(nuxt): ensure url is not empty string (#4781)

Browse Source
This commit is contained in:
pooya parsa 2022-05-05 22:46:54 +02:00 committed by GitHub
parent 5b63ae8ad5
commit ebc27ce997
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/nuxt/src/app/composables/router.ts
View File

@ -56,6 +56,9 @@ export interface NavigateToOptions {
} }
export const navigateTo = (to: RouteLocationRaw, options: NavigateToOptions = {}): Promise<void | NavigationFailure> | RouteLocationRaw => { export const navigateTo = (to: RouteLocationRaw, options: NavigateToOptions = {}): Promise<void | NavigationFailure> | RouteLocationRaw => {
if (!to) {
to = '/'
}
if (isProcessingMiddleware()) { if (isProcessingMiddleware()) {
return to return to
} }
@ -63,7 +66,7 @@ export const navigateTo = (to: RouteLocationRaw, options: NavigateToOptions = {}
if (process.server) { if (process.server) {
const nuxtApp = useNuxtApp() const nuxtApp = useNuxtApp()
if (nuxtApp.ssrContext && nuxtApp.ssrContext.event) { if (nuxtApp.ssrContext && nuxtApp.ssrContext.event) {
const redirectLocation = router.resolve(to).fullPath const redirectLocation = router.resolve(to).fullPath || '/'
return nuxtApp.callHook('app:redirected').then(() => sendRedirect(nuxtApp.ssrContext.event, redirectLocation, options.redirectCode || 301)) return nuxtApp.callHook('app:redirected').then(() => sendRedirect(nuxtApp.ssrContext.event, redirectLocation, options.redirectCode || 301))
} }
} }

5
packages/nuxt/src/pages/runtime/router.ts
View File

@ -176,8 +176,9 @@ export default defineNuxtPlugin(async (nuxtApp) => {
delete nuxtApp._processingMiddleware delete nuxtApp._processingMiddleware
if (process.server) { if (process.server) {
if (to.fullPath !== initialURL) { const currentURL = to.fullPath || '/'
await callWithNuxt(nuxtApp, navigateTo, [to.fullPath]) if (currentURL !== initialURL) {
await callWithNuxt(nuxtApp, navigateTo, [currentURL])
} }
} }
}) })