refactor: remove aliases

evdeveloper · Nov 23, 2023 · 8e3fab2 · 8e3fab2
1 parent 395e573
commit 8e3fab2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 25 deletions.
diff --git a/src/module.ts b/src/module.ts
@@ -193,21 +193,6 @@ export default defineNuxtModule<NuxtI18nOptions>({
     nuxt.options.alias['#i18n'] = resolve(distDir, 'runtime/composables.mjs')
     nuxt.options.build.transpile.push('#i18n')
 
-    // TODO: We don't want to resolve the following as a template,
-    //  but in the runtime dir we want to use as an ESM (e.g. internal and utils)
-
-    // for internal
-    addTemplate({
-      filename: 'i18n.internal.mjs',
-      src: resolve(distDir, 'runtime/internal.mjs')
-    })
-
-    // for utils
-    addTemplate({
-      filename: 'i18n.utils.mjs',
-      src: resolve(distDir, 'runtime/utils.mjs')
-    })
-
     addTemplate({
       filename: NUXT_I18N_TEMPLATE_OPTIONS_KEY,
       src: resolve(distDir, 'runtime/templates/options.template.mjs'),

diff --git a/src/runtime/composables.ts b/src/runtime/composables.ts
@@ -1,9 +1,10 @@
-import { findBrowserLocale, getComposer } from 'vue-i18n-routing'
 import { useRoute, useRouter, useRequestHeaders, useCookie, useNuxtApp } from '#imports'
 import { ref } from 'vue'
-import { parseAcceptLanguage } from '#build/i18n.internal.mjs'
+import { parseAcceptLanguage } from './internal'
 import { nuxtI18nInternalOptions, nuxtI18nOptionsDefault, localeCodes as _localeCodes } from '#build/i18n.options.mjs'
 import {
+  getComposer,
+  findBrowserLocale,
   useRouteBaseName as _useRouteBaseName,
   useLocalePath as _useLocalePath,
   useLocaleRoute as _useLocaleRoute,

diff --git a/src/runtime/plugins/i18n.ts b/src/runtime/plugins/i18n.ts
@@ -34,14 +34,14 @@ import {
   extendPrefixable,
   extendSwitchLocalePathIntercepter,
   _setLocale
-} from '#build/i18n.utils.mjs'
+} from '../utils'
 import {
   getBrowserLocale as _getBrowserLocale,
   getLocaleCookie as _getLocaleCookie,
   setLocaleCookie as _setLocaleCookie,
   detectBrowserLanguage,
   DefaultDetectBrowserLanguageFromResult
-} from '#build/i18n.internal.mjs'
+} from '../internal'
 
 import type { Composer, Locale, I18nOptions } from 'vue-i18n'
 import type { LocaleObject, ExtendProperyDescripters, VueI18nRoutingPluginOptions } from 'vue-i18n-routing'

diff --git a/src/runtime/utils.ts b/src/runtime/utils.ts
@@ -29,7 +29,7 @@ import {
   getDomainFromLocale,
   proxyNuxt,
   DefaultDetectBrowserLanguageFromResult
-} from '#build/i18n.internal.mjs'
+} from './internal'
 import { joinURL, isEqual } from 'ufo'
 
 import type {
@@ -44,7 +44,7 @@ import type {
 import type { NuxtApp } from '#app'
 import type { I18n, I18nOptions, Locale, FallbackLocale, LocaleMessages, DefineLocaleMessage } from 'vue-i18n'
 import type { NuxtI18nOptions, DetectBrowserLanguageOptions, RootRedirectOptions } from '#build/i18n.options.mjs'
-import type { DetectLocaleContext } from '#build/i18n.internal.mjs'
+import type { DetectLocaleContext } from './internal'
 import type { DeepRequired } from 'ts-essentials'
 
 export function _setLocale(i18n: I18n, locale: Locale) {

diff --git a/tsconfig.json b/tsconfig.json
@@ -37,10 +37,7 @@
       "#head": ["./node_modules/nuxt/dist/index.d.ts"],
       "#i18n": ["./src/runtime/composables.ts"],
       "#vue-router": ["./node_modules/vue-router"],
-      "#build/i18n.shared.mjs": ["./src/runtime/shared.ts"],
-      "#build/i18n.options.mjs": ["./src/options.d.ts"],
-      "#build/i18n.internal.mjs": ["./src/runtime/internal.ts"],
-      "#build/i18n.utils.mjs": ["./src/runtime/utils.ts"]
+      "#build/i18n.options.mjs": ["./src/options.d.ts"]
     } /* Specify a set of entries that re-map imports to additional lookup locations. */,
     // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
     // "typeRoots": [],                                  /* Specify multiple folders that act like `./node_modules/@types`. */