fix: fixed ouptut when using nuxtjs/i18n without options #87

victorgarciaesgi · Apr 22, 2023 · 21cb5ff · 21cb5ff · vercel · Apr 22, 2023
1 parent dd4142d
commit 21cb5ff
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 19 deletions.
diff --git a/playground/nuxt.config.ts b/playground/nuxt.config.ts
@@ -10,21 +10,21 @@ export default defineNuxtConfig({
     experimentalRemoveNuxtDefs: true,
   },
   srcDir: './src',
-  i18n: {
-    locales: ['en', 'fr-FR'],
-    defaultLocale: 'en',
-    strategy: 'no_prefix',
-    vueI18n: {
-      legacy: false,
-      locale: 'en',
-      messages: {
-        en: {
-          welcome: 'Welcome',
-        },
-        fr: {
-          welcome: 'Bienvenue',
-        },
-      },
-    },
-  },
+  // i18n: {
+  //   locales: ['en', 'fr-FR'],
+  //   defaultLocale: 'en',
+  //   strategy: 'no_prefix',
+  //   vueI18n: {
+  //     legacy: false,
+  //     locale: 'en',
+  //     messages: {
+  //       en: {
+  //         welcome: 'Welcome',
+  //       },
+  //       fr: {
+  //         welcome: 'Bienvenue',
+  //       },
+  //     },
+  //   },
+  // },
 });
diff --git a/src/core/index.ts b/src/core/index.ts
@@ -45,6 +45,7 @@ export async function createTypedRouter({
 
     // We use extendPages here to access the NuxtPage, not accessible in the `pages:extend` hook
     extendPages(async (routes: NuxtPage[]) => {
+      // console.log(JSON.stringify(routes));
       hasRoutesDefined = true;
       const outputData = constructRouteMap(routes);
 

diff --git a/src/core/parser/i18n.modifiers.ts b/src/core/parser/i18n.modifiers.ts
@@ -9,7 +9,7 @@ export function is18Sibling(
   route: NuxtPage
 ) {
   const { i18n, i18nOptions, i18nLocales } = moduleOptionStore;
-  if (i18n && i18nOptions?.strategy !== 'no_prefix') {
+  if (i18n && i18nOptions && i18nOptions?.strategy !== 'no_prefix') {
     const separator = i18nOptions?.routesNameSeparator ?? '___';
 
     const i18LocalesRecognizer = i18nLocales
@@ -43,7 +43,7 @@ export function is18Sibling(
 
 export function modifyRoutePrefixDefaultIfI18n(route: NuxtPage) {
   const { i18n, i18nOptions, i18nLocales } = moduleOptionStore;
-  if (i18n && route.name) {
+  if (i18n && i18nOptions && route.name) {
     const separator = i18nOptions?.routesNameSeparator ?? '___';
     const i18LocalesRecognizer = i18nLocales
       ?.map((m) => m.replace(specialCharacterRegxp, '\\$&'))