fix: only import default config if no userConfig is passed (#1302)

* only import default config if no userConfig is passed #1202 * test: only import default config if no userConfig is passed
i18next · Jul 6, 2021 · 28cd9c6 · 28cd9c6 · vercel · Jul 6, 2021
1 parent 45617ca
commit 28cd9c6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/serverSideTranslations.test.ts b/src/serverSideTranslations.test.ts
@@ -33,6 +33,7 @@ describe('serverSideTranslations', () => {
           locales: ['en-US', 'fr-CA'],
         },
       } as UserConfig)
+      expect(fs.existsSync).toHaveBeenCalledTimes(0)
       expect(fs.readdirSync).toHaveBeenCalledTimes(1)
       expect(fs.readdirSync).toHaveBeenCalledWith(expect.stringMatching('/public/locales/en-US'))
       expect(props._nextI18Next.initialI18nStore)

diff --git a/src/serverSideTranslations.ts b/src/serverSideTranslations.ts
@@ -43,7 +43,7 @@ export const serverSideTranslations = async (
 
   let userConfig = configOverride
 
-  if (fs.existsSync(path.resolve(DEFAULT_CONFIG_PATH))) {
+  if (!userConfig && fs.existsSync(path.resolve(DEFAULT_CONFIG_PATH))) {
     userConfig = await import(path.resolve(DEFAULT_CONFIG_PATH))
   }