Skip to content
This repository has been archived by the owner on Apr 6, 2023. It is now read-only.

fix(nuxt): avoid directly importing vue-router inside <NuxtLayout> #8421

Merged
merged 3 commits into from Oct 24, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion packages/nuxt/src/app/components/layout.ts
@@ -1,8 +1,10 @@
import { computed, defineComponent, h, inject, nextTick, onMounted, Ref, Transition, unref, VNode } from 'vue'
import { RouteLocationNormalizedLoaded, useRoute as useVueRouterRoute } from 'vue-router'
import type { RouteLocationNormalizedLoaded } from 'vue-router'
import { _wrapIf } from './utils'
import { useRoute } from '#app'
// @ts-ignore
import { useRoute as useVueRouterRoute } from '#build/vue-router-imports'
// @ts-ignore
import layouts from '#build/layouts'
// @ts-ignore
import { appLayoutTransition as defaultLayoutTransition } from '#build/nuxt.config.mjs'
Expand Down
11 changes: 11 additions & 0 deletions packages/nuxt/src/pages/module.ts
Expand Up @@ -23,6 +23,11 @@ export default defineNuxtModule({
// Disable module (and use universal router) if pages dir do not exists or user has disabled it
if ((nuxt.options.pages === false || (nuxt.options.pages !== true && !pagesDirs.some(dir => existsSync(dir)))) && !isRouterOptionsPresent) {
addPlugin(resolve(distDir, 'app/plugins/router'))
// Add vue-router import for `<NuxtLayout>` integration
addTemplate({
filename: 'vue-router-imports.mjs',
getContents: () => 'export { useRoute } from \'#app\''
danielroe marked this conversation as resolved.
Show resolved Hide resolved
})
return
}

Expand Down Expand Up @@ -135,6 +140,12 @@ export default defineNuxtModule({
}
})

// Add vue-router import for `<NuxtLayout>` integration
addTemplate({
filename: 'vue-router-imports.mjs',
getContents: () => 'export { useRoute } from \'vue-router\''
})

// Add router options template
addTemplate({
filename: 'router.options.mjs',
Expand Down