Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(nuxt): augment GlobalComponents in multiple vue modules #26541

Merged
merged 1 commit into from
Mar 29, 2024
+31 −6
Merged

fix(nuxt): augment GlobalComponents in multiple vue modules #26541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 15 additions & 5 deletions packages/nuxt/src/components/templates.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,22 @@ export const componentsTypeTemplate = {
: c.filePath.replace(/(?<=\w)\.(?!vue)\w+$/g, ''), { wrapper: false })}['${c.export}']`
])

return `// Generated by components discovery
return `
interface _GlobalComponents {
${componentTypes.map(([pascalName, type]) => ` '${pascalName}': ${type}`).join('\n')}
${componentTypes.map(([pascalName, type]) => ` 'Lazy${pascalName}': ${type}`).join('\n')}
}

declare module '@vue/runtime-core' {
export interface GlobalComponents extends _GlobalComponents { }
}

declare module '@vue/runtime-dom' {
export interface GlobalComponents extends _GlobalComponents { }
}

declare module 'vue' {
export interface GlobalComponents {
${componentTypes.map(([pascalName, type]) => ` '${pascalName}': ${type}`).join('\n')}
${componentTypes.map(([pascalName, type]) => ` 'Lazy${pascalName}': ${type}`).join('\n')}
}
export interface GlobalComponents extends _GlobalComponents { }
}

${componentTypes.map(([pascalName, type]) => `export const ${pascalName}: ${type}`).join('\n')}
Expand Down
17 changes: 16 additions & 1 deletion packages/schema/src/config/typescript.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,22 @@ export default defineUntypedSchema({
*/
hoist: {
$resolve: (val) => {
const defaults = ['nitropack', 'defu', 'h3', '@unhead/vue', 'vue', 'vue-router', '@nuxt/schema', 'nuxt', 'consola', 'ofetch']
const defaults = [
// Nitro auto-imported/augmented dependencies
'nitropack',
'defu',
'h3',
'consola',
'ofetch',
// Key nuxt dependencies
'@unhead/vue',
'vue',
'@vue/runtime-core',
'@vue/runtime-dom',
'vue-router',
'@nuxt/schema',
'nuxt'
]
return val === false ? [] : (Array.isArray(val) ? val.concat(defaults) : defaults)
}
},
Expand Down