Skip to content

fix: correct auto-imports #359

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

Merged
danielroe merged 4 commits into from
May 31, 2022
Merged

fix: correct auto-imports #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da31737
fix: export `useRequestEvent` from `#app`
danielroe May 31, 2022
09f5b6f
fix: export both `useHead` and `useMeta` when meta isn't enabled
danielroe May 31, 2022
4688c8a
fix: update unimport presets for bridge
danielroe May 31, 2022
510f20c
style: lint
danielroe May 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions src/auto-imports.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import * as CompositionApi from '@vue/composition-api'
import type { Preset } from 'unimport'
import autoImports from './auto-imports/module'

const UnsupportedImports = new Set(['useAsyncData', 'useFetch', 'useError', 'throwError', 'clearError', 'defineNuxtLink', 'useActiveRoute'])
const CapiHelpers = new Set(Object.keys(CompositionApi))

export function setupAutoImports () {
Expand All @@ -17,17 +16,6 @@ export function setupAutoImports () {
nuxt.hook('autoImports:sources', (presets) => {
const vuePreset = presets.find(p => p.from === 'vue')
if (vuePreset) { vuePreset.disabled = true }

const appPreset = presets.find(p => p.from === '#app')
if (!appPreset) { return }

for (const [index, i] of Object.entries(appPreset.imports).reverse()) {
if (typeof i === 'string' && UnsupportedImports.has(i)) {
appPreset.imports.splice(Number(index), 1)
}
}

appPreset.imports.push('useNuxt2Meta')
})

nuxt.hook('modules:done', () => installModule(autoImports, { presets: bridgePresets }))
Expand Down
10 changes: 2 additions & 8 deletions src/auto-imports/presets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export const commonPresets: Preset[] = [
}),
// vue-demi (mocked)
defineUnimportPreset({
from: 'vue-demi',
from: '#app',
imports: [
'isVue2',
'isVue3'
Expand All @@ -22,30 +22,24 @@ export const commonPresets: Preset[] = [
export const appPreset = defineUnimportPreset({
from: '#app',
imports: [
'useAsyncData',
'useLazyAsyncData',
'refreshNuxtData',
'defineNuxtComponent',
'useNuxtApp',
'defineNuxtPlugin',
'useRuntimeConfig',
'useState',
'useFetch',
'useLazyFetch',
'useCookie',
'useRequestHeaders',
'useRequestEvent',
'useRouter',
'useRoute',
'useActiveRoute',
'defineNuxtRouteMiddleware',
'navigateTo',
'abortNavigation',
'addRouteMiddleware',
'throwError',
'clearError',
'useError',
'defineNuxtLink'
'useNuxt2Meta'
]
})

Expand Down
4 changes: 3 additions & 1 deletion src/meta.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ export const setupMeta = async (opts: SetupMetaOptions) => {
if (opts.needsExplicitEnable) {
const metaPath = addTemplate({
filename: 'meta.mjs',
getContents: () => `export const useHead = () => console.warn('${msgPrefix} To enable experimental \`useHead\` support, set \`bridge.meta\` to \`true\` in your \`nuxt.config\`. ${checkDocsMsg}')`
getContents: () => ['useHead', 'useMeta'].map(fnName =>
`export const ${fnName} = () => console.warn('${msgPrefix} To enable experimental \`useHead\` support, set \`bridge.meta\` to \`true\` in your \`nuxt.config\`. ${checkDocsMsg}')`)
.join('\n')
})
nuxt.options.alias['#head'] = metaPath.dst
return
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/composables.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { useNuxtApp } from './app'
export { useLazyAsyncData, refreshNuxtData } from './asyncData'
export { useLazyFetch } from './fetch'
export { useCookie } from './cookie'
export { useRequestHeaders } from './ssr'
export { useRequestHeaders, useRequestEvent } from './ssr'

export * from '@vue/composition-api'

Expand Down