fix: strip public prefix correctly on the client (#1065)

Co-authored-by: Isaac Hinman <isaac@isaachinman.com>
i18next · Mar 15, 2021 · ff9b5fa · ff9b5fa · vercel · Mar 15, 2021
1 parent a688ed6
commit ff9b5fa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/config/createConfig.test.ts b/src/config/createConfig.test.ts
@@ -150,8 +150,8 @@ describe('createConfig', () => {
     it('returns a valid config when only lng is provided', () => {
       const config = createConfig({ lng: 'en' } as UserConfig)
 
-      expect((config.backend as any).addPath).toMatch('/public/locales/{{lng}}/{{ns}}.missing.json')
-      expect((config.backend as any).loadPath).toMatch('/public/locales/{{lng}}/{{ns}}.json')
+      expect((config.backend as any).addPath).toMatch('/locales/{{lng}}/{{ns}}.missing.json')
+      expect((config.backend as any).loadPath).toMatch('/locales/{{lng}}/{{ns}}.json')
       expect(config.defaultLocale).toEqual('en')
       expect(config.defaultNS).toEqual('common')
       expect(config.errorStackTraceLimit).toEqual(0)
@@ -175,7 +175,7 @@ describe('createConfig', () => {
         lng: 'en',
       } as UserConfig)
       expect((config.backend as any).hello).toEqual('world')
-      expect((config.backend as any).loadPath).toMatch('/public/locales/{{lng}}/{{ns}}.json')
+      expect((config.backend as any).loadPath).toMatch('/locales/{{lng}}/{{ns}}.json')
     })
   })
 })
diff --git a/src/config/createConfig.ts b/src/config/createConfig.ts
@@ -91,8 +91,8 @@ export const createConfig = (userConfig: UserConfig): InternalConfig => {
     //
     // Remove public prefix from client site config
     //
-    if (localePath.startsWith('/public/')) {
-      clientLocalePath = localePath.replace(/^\/public/, '')
+    if (localePath.match(/^\.?\/public\//)) {
+      clientLocalePath = localePath.replace(/^\.?\/public/, '')
     }
 
     //