fix: fixed Regxp extractor to format all locales words #77

victorgarciaesgi · Mar 6, 2023 · c08765f · c08765f · vercel · Mar 6, 2023
1 parent f576eab
commit c08765f
Show file tree

Hide file tree

Showing 9 changed files with 816 additions and 227 deletions.
diff --git a/docs/package.json b/docs/package.json
@@ -10,6 +10,6 @@
   },
   "devDependencies": {
     "@nuxt-themes/docus": "1.8.3",
-    "nuxt": "3.2.2"
+    "nuxt": "3.2.3"
   }
 }
diff --git a/docs/yarn.lock b/docs/yarn.lock
diff --git a/package.json b/package.json
@@ -79,7 +79,6 @@
     "@nuxtjs/i18n": "8.0.0-beta.9",
     "@nuxtjs/web-vitals": "^0.2.2",
     "@types/lodash-es": "^4.17.6",
-    "@types/mkdirp": "^2.0.0",
     "@types/node": "^18.14.0",
     "@types/prettier": "^2.7.2",
     "@typescript-eslint/eslint-plugin": "^5.53.0",

diff --git a/playground/nuxt.config.ts b/playground/nuxt.config.ts
@@ -11,7 +11,7 @@ export default defineNuxtConfig({
   i18n: {
     locales: [
       { code: 'en', name: 'en' },
-      { code: 'fr', name: 'fr' },
+      { code: 'fr-FR', name: 'fr' },
     ],
     defaultLocale: 'en',
     strategy: 'prefix_and_default',

diff --git a/playground/src/pages/[foo].vue b/playground/src/pages/[foo].vue
diff --git a/playground/src/pages/index.vue b/playground/src/pages/index.vue
@@ -33,6 +33,7 @@ const localeRoute = useLocaleRoute();
 
 function navigate() {
   router.push({ name: 'user-id-slug', params: { slug: 'bar', id: 1 } });
+  router.push('/fr-FR?bar');
 
   router.push(localePath('/admin/888'));
 

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/core/parser/base.ts b/src/core/parser/base.ts
@@ -26,7 +26,7 @@ export function constructRouteMap(routesConfig: NuxtPage[]): GeneratorOutput {
 
     return output;
   } catch (e) {
-    throw new Error('Generation failed', e as any);
+    throw new Error(`Generation failed: ${e}`);
   }
 }
 

diff --git a/src/core/parser/i18n.modifiers.ts b/src/core/parser/i18n.modifiers.ts
@@ -14,7 +14,14 @@ export function hasi18nSibling(
       return (
         route.name?.match(new RegExp(`^(${rt.name})${separator}[a-zA-Z]+`, 'g')) ||
         (rt.path !== '/' &&
-          route.path?.match(new RegExp(`/?[${i18nLocales?.join('|')}]${rt.path}`, 'g')))
+          route.path?.match(
+            new RegExp(
+              `/?[${i18nLocales?.map((m) => m.replace(/[^a-zA-Z0-9_]/gm, '\\$&')).join('|')}]${
+                rt.path
+              }`,
+              'g'
+            )
+          ))
       );
     });
   }