refactor: remove unused langDir

nuxt-modules · Aug 9, 2023 · 17500fa · 17500fa
1 parent 39c0075
commit 17500fa
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 18 deletions.
diff --git a/src/gen.ts b/src/gen.ts
@@ -25,7 +25,6 @@ const debug = createDebug('@nuxtjs/i18n:gen')
 
 export function generateLoaderOptions(
   lazy: NonNullable<NuxtI18nOptions['lazy']>,
-  langDir: NuxtI18nOptions['langDir'],
   localesRelativeBase: string,
   vueI18nConfigPathInfo: VueI18nConfigPathInfo,
   vueI18nConfigPaths: VueI18nConfigPathInfo[],

diff --git a/src/module.ts b/src/module.ts
@@ -211,7 +211,6 @@ export default defineNuxtModule<NuxtI18nOptions>({
       getContents: () => {
         return generateLoaderOptions(
           options.lazy,
-          options.langDir,
           localesRelativeBasePath,
           vueI18nConfigPathInfo,
           layerVueI18nConfigPaths,

diff --git a/src/runtime/plugins/i18n.ts b/src/runtime/plugins/i18n.ts
@@ -59,7 +59,6 @@ export default defineNuxtPlugin(async nuxt => {
     differentDomains,
     skipSettingLocaleOnNavigate,
     lazy,
-    langDir,
     routesNameSeparator,
     defaultLocaleRouteNameSuffix,
     strategy,
@@ -192,8 +191,7 @@ export default defineNuxtPlugin(async nuxt => {
             differentDomains,
             initial: localeSetup,
             skipSettingLocaleOnNavigate,
-            lazy,
-            langDir
+            lazy
           })
 
           if (modified && localeSetup) {
@@ -440,8 +438,7 @@ export default defineNuxtPlugin(async nuxt => {
         differentDomains,
         initial: localeSetup,
         skipSettingLocaleOnNavigate,
-        lazy,
-        langDir
+        lazy
       })
 
       if (modified && localeSetup) {

diff --git a/src/runtime/utils.ts b/src/runtime/utils.ts
@@ -135,11 +135,9 @@ export async function loadAndSetLocale<Context extends NuxtApp = NuxtApp>(
     skipSettingLocaleOnNavigate = nuxtI18nOptionsDefault.skipSettingLocaleOnNavigate,
     differentDomains = nuxtI18nOptionsDefault.differentDomains,
     initial = false,
-    lazy = false,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    langDir = null
+    lazy = false
   }: Pick<DetectBrowserLanguageOptions, 'useCookie'> &
-    Pick<NuxtI18nOptions<Context>, 'lazy' | 'langDir' | 'skipSettingLocaleOnNavigate' | 'differentDomains'> & {
+    Pick<NuxtI18nOptions<Context>, 'lazy' | 'skipSettingLocaleOnNavigate' | 'differentDomains'> & {
       initial?: boolean
     } = {}
 ): Promise<[boolean, string]> {

diff --git a/test/gen.test.ts b/test/gen.test.ts
@@ -70,7 +70,6 @@ test('basic', async () => {
   const { generateLoaderOptions } = await import('../src/gen')
   const code = generateLoaderOptions(
     false,
-    'locales',
     '..',
     NUXT_I18N_VUE_I18N_CONFIG,
     [],
@@ -90,7 +89,6 @@ test('basic', async () => {
 test('lazy', () => {
   const code = generateLoaderOptions(
     true,
-    'locales',
     '..',
     NUXT_I18N_VUE_I18N_CONFIG,
     [],
@@ -109,7 +107,6 @@ test('lazy', () => {
 test('multiple files', () => {
   const code = generateLoaderOptions(
     true,
-    'locales',
     '..',
     NUXT_I18N_VUE_I18N_CONFIG,
     [],
@@ -142,7 +139,6 @@ test('multiple files', () => {
 test('locale file in nested', () => {
   const code = generateLoaderOptions(
     true,
-    'locales',
     '..',
     NUXT_I18N_VUE_I18N_CONFIG,
     [],
@@ -177,7 +173,6 @@ test('locale file in nested', () => {
 test('vueI18n option', () => {
   const code = generateLoaderOptions(
     false,
-    'locales',
     '..',
     NUXT_I18N_VUE_I18N_CONFIG,
     [
@@ -211,7 +206,6 @@ test('vueI18n option', () => {
 test('toCode: function (arrow)', () => {
   const code = generateLoaderOptions(
     false,
-    'locales',
     '..',
     NUXT_I18N_VUE_I18N_CONFIG,
     [],
@@ -236,7 +230,7 @@ test('toCode: function (arrow)', () => {
 })
 
 test('toCode: function (named)', () => {
-  const code = generateLoaderOptions(false, 'locales', '..', NUXT_I18N_VUE_I18N_CONFIG, [], {
+  const code = generateLoaderOptions(false, '..', NUXT_I18N_VUE_I18N_CONFIG, [], {
     localeCodes: LOCALE_CODES,
     nuxtI18nOptions: {
       ...NUXT_I18N_OPTIONS,