refactor: cleanup dep constants and configuration (#3854)

Author: BobbieGoede

src/alias.ts

@@ -1,14 +1,5 @@
 import { directoryToURL, resolveModule } from '@nuxt/kit'
-import {
-  CORE_BASE_PKG,
-  CORE_PKG,
-  MESSAGE_COMPILER_PKG,
-  NUXT_I18N_MODULE_ID,
-  SHARED_PKG,
-  UTILS_H3_PKG,
-  UTILS_PKG,
-  VUE_I18N_PKG,
-} from './constants'
+import { NUXT_I18N_MODULE_ID } from './constants'
 import { defu } from 'defu'
 import { resolveI18nDir } from './layers'
 import { getLayerI18n } from './utils'
@@ -17,14 +8,14 @@ import { relative, resolve } from 'pathe'
 import type { Nuxt } from '@nuxt/schema'
 import type { I18nNuxtContext } from './context'
 
-export function setupAlias({ userOptions: options }: I18nNuxtContext, nuxt: Nuxt) {
+export function setupAlias({ vueI18nRuntimeOnly }: I18nNuxtContext, nuxt: Nuxt) {
   const modules = {
-    [VUE_I18N_PKG]: `${VUE_I18N_PKG}/dist/vue-i18n${!nuxt.options.dev && !nuxt.options._prepare && options.bundle?.runtimeOnly ? '.runtime' : ''}.mjs`,
-    [SHARED_PKG]: `${SHARED_PKG}/dist/shared.mjs`,
-    [MESSAGE_COMPILER_PKG]: `${MESSAGE_COMPILER_PKG}/dist/message-compiler.mjs`,
-    [CORE_BASE_PKG]: `${CORE_BASE_PKG}/dist/core-base.mjs`,
-    [CORE_PKG]: `${CORE_PKG}/dist/core.node.mjs`,
-    [UTILS_H3_PKG]: `${UTILS_PKG}/dist/h3.mjs`, // for `@intlify/utils/h3`
+    'vue-i18n': `vue-i18n/dist/vue-i18n${vueI18nRuntimeOnly ? '.runtime' : ''}`,
+    '@intlify/shared': `@intlify/shared/dist/shared`,
+    '@intlify/message-compiler': `@intlify/message-compiler/dist/message-compiler`,
+    '@intlify/core': `@intlify/core/dist/core.node`,
+    '@intlify/core-base': `@intlify/core-base/dist/core-base`,
+    '@intlify/utils/h3': `@intlify/utils/dist/h3`,
   } as const
 
   const layerI18nDirs = nuxt.options._layers
@@ -42,10 +33,6 @@ export function setupAlias({ userOptions: options }: I18nNuxtContext, nuxt: Nuxt
     },
   })
 
-  // Exclude ESM dependencies from optimization
-  // @see https://github.com/nuxt/nuxt/blob/8db24c6a7fbcff7ab74b3ce1a196daece2f8c701/packages/vite/src/shared/client.ts#L9-L20
-  nuxt.options.vite = defu(nuxt.options.vite, { optimizeDeps: { exclude: [UTILS_PKG, ...moduleIds] } })
-
   const moduleDirs = ([] as string[])
     .concat(
       nuxt.options.modulesDir,

src/constants.ts

@@ -1,11 +1,5 @@
 export const NUXT_I18N_MODULE_ID = '@nuxtjs/i18n'
-export const VUE_I18N_PKG = 'vue-i18n'
-export const SHARED_PKG = '@intlify/shared'
-export const MESSAGE_COMPILER_PKG = '@intlify/message-compiler'
-export const CORE_PKG = '@intlify/core'
-export const CORE_BASE_PKG = '@intlify/core-base'
 export const H3_PKG = '@intlify/h3'
-export const UTILS_PKG = '@intlify/utils'
 export const UTILS_H3_PKG = '@intlify/utils/h3'
 export const STRATEGY_PREFIX = 'prefix'
 export const STRATEGY_PREFIX_EXCEPT_DEFAULT = 'prefix_except_default'

src/context.ts

@@ -4,6 +4,7 @@ import { dirname } from 'pathe'
 import { hash } from 'ohash'
 import type { Resolver } from '@nuxt/kit'
 import type { FileMeta, LocaleInfo, LocaleObject, NuxtI18nOptions } from './types'
+import type { Nuxt } from 'nuxt/schema'
 
 export interface I18nNuxtContext {
   resolver: Resolver
@@ -13,6 +14,7 @@ export interface I18nNuxtContext {
   localeCodes: string[]
   localeInfo: LocaleInfo[]
   vueI18nConfigPaths: FileMeta[]
+  vueI18nRuntimeOnly: boolean
   distDir: string
   runtimeDir: string
   fullStatic: boolean
@@ -23,7 +25,7 @@ const resolver = createResolver(import.meta.url)
 const distDir = dirname(fileURLToPath(import.meta.url))
 const runtimeDir = fileURLToPath(new URL('./runtime', import.meta.url))
 
-export function createContext(userOptions: NuxtI18nOptions): I18nNuxtContext {
+export function createContext(userOptions: NuxtI18nOptions, nuxt: Nuxt): I18nNuxtContext {
   const options = userOptions as Required<NuxtI18nOptions>
 
   return {
@@ -36,6 +38,7 @@ export function createContext(userOptions: NuxtI18nOptions): I18nNuxtContext {
     localeCodes: undefined!,
     normalizedLocales: undefined!,
     vueI18nConfigPaths: undefined!,
+    vueI18nRuntimeOnly: !!(!nuxt.options.dev && !nuxt.options._prepare && options.bundle?.runtimeOnly),
     fullStatic: undefined!,
     deploymentHash: hash(Date.now()).slice(0, 8),
   }

src/module.ts

@@ -32,7 +32,7 @@ export default defineNuxtModule<NuxtI18nOptions>({
   },
   defaults: DEFAULT_OPTIONS,
   async setup(i18nOptions, nuxt) {
-    const ctx = createContext(i18nOptions)
+    const ctx = createContext(i18nOptions, nuxt)
 
     /**
      * prepare options
@@ -53,14 +53,22 @@ export default defineNuxtModule<NuxtI18nOptions>({
      * transpile @nuxtjs/i18n
      */
     nuxt.options.build.transpile.push('@nuxtjs/i18n')
-    nuxt.options.build.transpile.push('@nuxtjs/i18n-edge')
 
     /**
-     * optimize vue-i18n to ensure we share the same symbol
+     * exclude ESM dependencies from optimization
+     * @see https://github.com/nuxt/nuxt/blob/8db24c6a7fbcff7ab74b3ce1a196daece2f8c701/packages/vite/src/shared/client.ts#L9-L20
      */
     nuxt.options.vite.optimizeDeps ||= {}
     nuxt.options.vite.optimizeDeps.exclude ||= []
-    nuxt.options.vite.optimizeDeps.exclude.push('vue-i18n')
+    nuxt.options.vite.optimizeDeps.exclude.push(
+      'vue-i18n',
+      '@intlify/shared',
+      '@intlify/core',
+      '@intlify/core-base',
+      '@intlify/message-compiler',
+      '@intlify/utils',
+      '@intlify/utils/h3',
+    )
 
     /**
      * add plugin and templates

src/prepare/auto-imports.ts

@@ -1,8 +1,8 @@
-import { DEFINE_I18N_CONFIG_FN, DEFINE_I18N_LOCALE_FN, DEFINE_I18N_ROUTE_FN, VUE_I18N_PKG } from '../constants'
-import { addComponent, addImports, resolveModule, useNuxt } from '@nuxt/kit'
+import { DEFINE_I18N_CONFIG_FN, DEFINE_I18N_LOCALE_FN, DEFINE_I18N_ROUTE_FN } from '../constants'
+import { addComponent, addImports, resolveModule } from '@nuxt/kit'
 import type { I18nNuxtContext } from '../context'
 
-export function prepareAutoImports({ resolver, userOptions: options, runtimeDir }: I18nNuxtContext, nuxt = useNuxt()) {
+export function prepareAutoImports({ resolver, runtimeDir, vueI18nRuntimeOnly }: I18nNuxtContext) {
   addComponent({
     name: 'NuxtLinkLocale',
     filePath: resolver.resolve(runtimeDir, 'components/NuxtLinkLocale'),
@@ -13,7 +13,7 @@ export function prepareAutoImports({ resolver, userOptions: options, runtimeDir
     filePath: resolver.resolve(runtimeDir, 'components/SwitchLocalePathLink'),
   })
 
-  const vueI18nPath = `${VUE_I18N_PKG}/dist/vue-i18n${!nuxt.options.dev && !nuxt.options._prepare && options.bundle?.runtimeOnly ? '.runtime' : ''}.mjs`
+  const vueI18nPath = `vue-i18n/dist/vue-i18n${vueI18nRuntimeOnly ? '.runtime' : ''}`
   const composablesIndex = resolver.resolve(runtimeDir, 'composables/index')
   addImports([
     { name: 'useI18n', from: resolveModule(vueI18nPath) },