fix: get astro pages' full paths using fdir's withFullPaths instead o…

…f withRelativePaths fixes #135
yassinedoghri · Mar 9, 2023 · 92a5178 · 92a5178
1 parent 9288efe
commit 92a5178
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/cli/generate.ts b/src/cli/generate.ts
@@ -2,7 +2,7 @@ import fs from "fs";
 import { resolve } from "pathe";
 import { AstroI18nextConfig } from "../types";
 import {
-  getAstroPagesPath,
+  getAstroPagesFullPaths,
   createFiles,
   FileToGenerate,
   generateLocalizedFrontmatter,
@@ -30,12 +30,14 @@ export const generate = (
   const start = process.hrtime();
 
   // default locale page paths
-  const astroPagesPaths = showDefaultLocale
-    ? getAstroPagesPath(inputPath, defaultLocale, locales)
-    : getAstroPagesPath(inputPath, undefined, locales);
+  const astroPagesFullPaths = showDefaultLocale
+    ? getAstroPagesFullPaths(inputPath, defaultLocale, locales)
+    : getAstroPagesFullPaths(inputPath, undefined, locales);
 
   const filesToGenerate: FileToGenerate[] = [];
-  astroPagesPaths.forEach(async function (astroFilePath: string) {
+  astroPagesFullPaths.forEach(async function (astroFileFullPath: string) {
+    const astroFilePath = astroFileFullPath.replace(resolve(inputPath), "");
+
     const inputFilePath = showDefaultLocale
       ? [inputPath, defaultLocale, astroFilePath].join("/")
       : [inputPath, astroFilePath].join("/");

diff --git a/src/cli/utils.ts b/src/cli/utils.ts
@@ -120,7 +120,7 @@ export const generateLocalizedFrontmatter = (
  * @param childDirToCrawl will make the function crawl inside the given
  * `childDirToCrawl` (doesn't take paths, only dirname).
  */
-export const getAstroPagesPath = (
+export const getAstroPagesFullPaths = (
   pagesDirectoryPath: string,
   childDirToCrawl: AstroI18nextConfig["defaultLocale"] | undefined = undefined,
   locales: AstroI18nextConfig["locales"] = []
@@ -131,7 +131,7 @@ export const getAstroPagesPath = (
       (filepath) => !isFileHidden(filepath) && filepath.endsWith(".astro")
     )
     .exclude((dirName) => locales.includes(dirName))
-    .withRelativePaths();
+    .withFullPaths();
 
   return childDirToCrawl
     ? (api