refactor(nuxt): use direct import of installNuxtModule

danielroe · danielroe · commit 501ccc37503c · 2024-12-09T20:05:45.000Z
diff --git a/packages/nuxt/src/components/plugins/loader.ts b/packages/nuxt/src/components/plugins/loader.ts
@@ -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)
diff --git a/packages/nuxt/src/core/nuxt.ts b/packages/nuxt/src/core/nuxt.ts
@@ -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')
     }
   }
 
diff --git a/packages/nuxt/src/imports/transform.ts b/packages/nuxt/src/imports/transform.ts
@@ -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()) {

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import type { Component, ComponentsOptions } from 'nuxt/schema'`
`7`	`7`
`8`	`8`	`import { logger, tryUseNuxt } from '@nuxt/kit'`
`9`	`9`	`import { QUOTE_RE, SX_RE, isVue } from '../../core/utils'`
	`10`	`+import { installNuxtModule } from '../../core/features'`
`10`	`11`
`11`	`12`	`interface LoaderOptions {`
`12`	`13`	`getComponents (): Component[]`
`@@ -54,7 +55,7 @@ export const LoaderPlugin = (options: LoaderOptions) => createUnplugin(() => {`
`54`	`55`	`const relativePath = relative(nuxt.options.rootDir, id)`
`55`	`56`	throw new Error(`[nuxt] \`~/${relativePath}\` is using \`${component.pascalName}\` which requires \`${internalInstall}\``)
`56`	`57`	`}`
`57`		`- import('../../core/features').then(({ installNuxtModule }) => installNuxtModule(internalInstall))`
	`58`	`+ installNuxtModule(internalInstall)`
`58`	`59`	`}`
`59`	`60`	let identifier = map.get(component) \|\| `__nuxt_component_${num++}`
`60`	`61`	`map.set(component, identifier)`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ import defu from 'defu'`
`21`	`21`	`import { gt, satisfies } from 'semver'`
`22`	`22`	`import { hasTTY, isCI } from 'std-env'`
`23`	`23`
	`24`	`+import { installNuxtModule } from '../core/features'`
`24`	`25`	`import pagesModule from '../pages/module'`
`25`	`26`	`import metaModule from '../head/module'`
`26`	`27`	`import componentsModule from '../components/module'`
`@@ -237,7 +238,7 @@ async function initNuxt (nuxt: Nuxt) {`
`237`	`238`	`// @ts-expect-error scripts types are not present as the module is not installed`
`238`	`239`	`if (nuxt.options.scripts) {`
`239`	`240`	`if (!nuxt.options._modules.some(m => m === '@nuxt/scripts' \|\| m === '@nuxt/scripts-nightly')) {`
`240`		`- await import('../core/features').then(({ installNuxtModule }) => installNuxtModule('@nuxt/scripts'))`
	`241`	`+ installNuxtModule('@nuxt/scripts')`
`241`	`242`	`}`
`242`	`243`	`}`
`243`	`244`