Skip to content

Commit f6f2a47

Browse files
authored
fix: replace deprecated tryResolveModule with resolveModule (#3494)
1 parent 2c4905c commit f6f2a47

2 files changed

Lines changed: 22 additions & 19 deletions

File tree

src/alias.ts

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { tryResolveModule } from '@nuxt/kit'
1+
import { directoryToURL, resolveModule } from '@nuxt/kit'
22
import createDebug from 'debug'
33
import {
44
VUE_I18N_PKG,
@@ -17,26 +17,29 @@ import type { I18nNuxtContext } from './context'
1717

1818
const debug = createDebug('@nuxtjs/i18n:alias')
1919

20-
export async function setupAlias({ userOptions: options, isDev, isPrepare }: I18nNuxtContext, nuxt: Nuxt) {
21-
const runtimeOnly = options.bundle?.runtimeOnly
22-
const modules: Record<string, string> = {}
20+
export function setupAlias({ userOptions: options, isDev, isPrepare }: I18nNuxtContext, nuxt: Nuxt) {
21+
const modules = {
22+
[VUE_I18N_PKG]:
23+
isDev || isPrepare
24+
? `${VUE_I18N_PKG}/dist/vue-i18n.mjs`
25+
: `${VUE_I18N_PKG}/dist/vue-i18n${options.bundle?.runtimeOnly ? '.runtime' : ''}.mjs`,
26+
[SHARED_PKG]: `${SHARED_PKG}/dist/shared.mjs`,
27+
[MESSAGE_COMPILER_PKG]: `${MESSAGE_COMPILER_PKG}/dist/message-compiler.mjs`,
28+
[CORE_BASE_PKG]: `${CORE_BASE_PKG}/dist/core-base.mjs`,
29+
[CORE_PKG]: `${CORE_PKG}/dist/core.node.mjs`,
30+
[UTILS_H3_PKG]: `${UTILS_PKG}/dist/h3.mjs`, // for `@intlify/utils/h3`
31+
[UFO_PKG]: UFO_PKG
32+
} as const
2333

24-
modules[VUE_I18N_PKG] =
25-
isDev || isPrepare
26-
? `${VUE_I18N_PKG}/dist/vue-i18n.mjs`
27-
: `${VUE_I18N_PKG}/dist/vue-i18n${runtimeOnly ? '.runtime' : ''}.mjs`
28-
modules[SHARED_PKG] = `${SHARED_PKG}/dist/shared.mjs`
29-
modules[MESSAGE_COMPILER_PKG] = `${MESSAGE_COMPILER_PKG}/dist/message-compiler.mjs`
30-
modules[CORE_BASE_PKG] = `${CORE_BASE_PKG}/dist/core-base.mjs`
31-
modules[CORE_PKG] = `${CORE_PKG}/dist/core.node.mjs`
32-
modules[UTILS_H3_PKG] = `${UTILS_PKG}/dist/h3.mjs` // for `@intlify/utils/h3`
33-
modules[UFO_PKG] = UFO_PKG
34-
35-
const moduleDirs: string[] = nuxt.options.modulesDir || []
36-
const enhancedModulesDirs = [...moduleDirs, ...moduleDirs.map(dir => `${dir}/${NUXT_I18N_MODULE_ID}/node_modules`)]
34+
const moduleDirs = ([] as string[])
35+
.concat(
36+
nuxt.options.modulesDir,
37+
nuxt.options.modulesDir.map(dir => `${dir}/${NUXT_I18N_MODULE_ID}/node_modules`)
38+
)
39+
.map(x => directoryToURL(x))
3740

3841
for (const [moduleName, moduleFile] of Object.entries(modules)) {
39-
const module = await tryResolveModule(moduleFile, enhancedModulesDirs)
42+
const module = resolveModule(moduleFile, { url: moduleDirs })
4043
if (!module) throw new Error(`Could not resolve module "${moduleFile}"`)
4144
nuxt.options.alias[moduleName] = module
4245
nuxt.options.build.transpile.push(moduleName)

src/module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export default defineNuxtModule<NuxtI18nOptions>({
7272
/**
7373
* setup module alias
7474
*/
75-
await setupAlias(ctx, nuxt)
75+
setupAlias(ctx, nuxt)
7676

7777
/**
7878
* add plugin and templates

0 commit comments

Comments
 (0)