Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-01-30 23:32:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(nuxt): use direct import of installNuxtModule

Browse Source
This commit is contained in:
Daniel Roe 2024-12-09 20:05:38 +00:00
parent 98c28db411
commit 501ccc3750
No known key found for this signature in database
GPG Key ID: CBC814C393D93268
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/nuxt/src/components/plugins/loader.ts
View File

@ -7,6 +7,7 @@ import type { Component, ComponentsOptions } from 'nuxt/schema'
import { logger, tryUseNuxt } from '@nuxt/kit'
import { QUOTE_RE, SX_RE, isVue } from '../../core/utils'
import { installNuxtModule } from '../../core/features'
interface LoaderOptions {
getComponents (): Component[]
@ -54,7 +55,7 @@ export const LoaderPlugin = (options: LoaderOptions) => createUnplugin(() => {
const relativePath = relative(nuxt.options.rootDir, id)
throw new Error(`[nuxt] \`~/${relativePath}\` is using \`${component.pascalName}\` which requires \`${internalInstall}\``)
}
import('../../core/features').then(({ installNuxtModule }) => installNuxtModule(internalInstall))
installNuxtModule(internalInstall)
}
let identifier = map.get(component) || `__nuxt_component_${num++}`
map.set(component, identifier)

3
packages/nuxt/src/core/nuxt.ts
View File

@ -21,6 +21,7 @@ import defu from 'defu'
import { gt, satisfies } from 'semver'
import { hasTTY, isCI } from 'std-env'
import { installNuxtModule } from '../core/features'
import pagesModule from '../pages/module'
import metaModule from '../head/module'
import componentsModule from '../components/module'
@ -237,7 +238,7 @@ async function initNuxt (nuxt: Nuxt) {
// @ts-expect-error scripts types are not present as the module is not installed
if (nuxt.options.scripts) {
if (!nuxt.options._modules.some(m => m === '@nuxt/scripts' || m === '@nuxt/scripts-nightly')) {
await import('../core/features').then(({ installNuxtModule }) => installNuxtModule('@nuxt/scripts'))
installNuxtModule('@nuxt/scripts')
}
}

4
packages/nuxt/src/imports/transform.ts
View File

@ -3,7 +3,9 @@ import type { Unimport } from 'unimport'
import { normalize } from 'pathe'
import { tryUseNuxt } from '@nuxt/kit'
import type { ImportsOptions } from 'nuxt/schema'
import { isJS, isVue } from '../core/utils'
import { installNuxtModule } from '../core/features'
const NODE_MODULES_RE = /[\\/]node_modules[\\/]/
const IMPORTS_RE = /(['"])#imports\1/
@ -40,7 +42,7 @@ export const TransformPlugin = ({ ctx, options, sourcemap }: { ctx: Unimport, op
const { s, imports } = await ctx.injectImports(code, id, { autoImport: options.autoImport && !isNodeModule })
if (imports.some(i => i.from === '#app/composables/script-stubs') && tryUseNuxt()?.options.test === false) {
import('../core/features').then(({ installNuxtModule }) => installNuxtModule('@nuxt/scripts'))
installNuxtModule('@nuxt/scripts')
}
if (s.hasChanged()) {