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

feat(nuxt)!: add NuxtPage to #components #8145

Merged
merged 5 commits into from Oct 14, 2022
Merged

feat(nuxt)!: add NuxtPage to #components #8145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
747ed76
feat(nuxt): add NuxtPage to #components
huang-julien Oct 12, 2022
be28db9
fix(nuxt): prefer add NuxtPage in page module
huang-julien Oct 12, 2022
78b31a0
perf(nuxt): remove NuxtPage manual register in router
huang-julien Oct 13, 2022
0b0bee8
refactor(nuxt): prefer relative path for NuxtPage
huang-julien Oct 13, 2022
6beb099
revert(nuxt): rely on component loader for App.vue
huang-julien Oct 13, 2022
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
8 changes: 7 additions & 1 deletion packages/nuxt/src/pages/module.ts
View file
Open in desktop
@@ -1,5 +1,5 @@
import { existsSync } from 'node:fs'
import { defineNuxtModule, addTemplate, addPlugin, addVitePlugin, addWebpackPlugin, findPath } from '@nuxt/kit'
import { defineNuxtModule, addTemplate, addPlugin, addVitePlugin, addWebpackPlugin, findPath, addComponent } from '@nuxt/kit'
import { relative, resolve } from 'pathe'
import { genString, genImport, genObjectFromRawEntries } from 'knitwork'
import escapeRE from 'escape-string-regexp'
Expand Down Expand Up @@ -185,6 +185,12 @@ export default defineNuxtModule({
}
})

// Add <NuxtPage>
addComponent({
name: 'NuxtPage',
filePath: resolve(distDir, 'pages/runtime/page')
})

// Add declarations for middleware keys
nuxt.hook('prepare:types', ({ references }) => {
references.push({ path: resolve(nuxt.options.buildDir, 'types/middleware.d.ts') })
Expand Down
5 changes: 0 additions & 5 deletions packages/nuxt/src/pages/runtime/router.ts
View file
Open in desktop
Expand Up @@ -50,11 +50,6 @@ function createCurrentLocation (
}

export default defineNuxtPlugin(async (nuxtApp) => {
nuxtApp.vueApp.component('NuxtPage', NuxtPage)
// TODO: remove before release - present for backwards compatibility & intentionally undocumented
nuxtApp.vueApp.component('NuxtNestedPage', NuxtPage)
nuxtApp.vueApp.component('NuxtChild', NuxtPage)

let routerBase = useRuntimeConfig().app.baseURL
if (routerOptions.hashMode && !routerBase.includes('#')) {
// allow the user to provide a `#` in the middle: `/base/#/app`
Expand Down