fix(cli): properly map next.js path export for GitHub Pages and user paths

Vidigal-code · Vidigal-code · commit 78616ffa8be6 · 2026-04-05T23:21:46.000-03:00
diff --git a/cli/application/home/handler.mjs b/cli/application/home/handler.mjs
@@ -35,7 +35,7 @@ export async function executeHome(params, runtime) {
     ...process.env,
     GITHUB_ACTIONS: "true",
     GITPAGEDOCS_REPOSITORY_SEARCH: String(repositorySearch),
-    GITPAGEDOCS_BASE_PATH: pathSegment ? `/${pathSegment}` : "",
+    GITPAGEDOCS_BASE_PATH: pathSegment ? `/${pathSegment}` : "/",
     GITPAGEDOCS_PATH: pathSegment,
   };
 
diff --git a/cli/runtime/workflow.mjs b/cli/runtime/workflow.mjs
@@ -11,7 +11,7 @@ export async function ensureGitHubPagesWorkflow(getCurrentGitBranch, writeText,
       ? `        env:
           GITHUB_ACTIONS: "true"
           GITHUB_REPOSITORY: \${{ github.repository }}
-          GITPAGEDOCS_BASE_PATH: "/\${{ github.event.repository.name }}/${pathSegment}"`
+          GITPAGEDOCS_PATH: "${pathSegment}"`
       : `        env:
           GITHUB_ACTIONS: "true"
           GITHUB_REPOSITORY: \${{ github.repository }}`;
@@ -74,6 +74,14 @@ jobs:
         working-directory: .gitpagedocs-runtime
 ${buildEnvBlock}
 
+      - name: Relocate output to custom docs path
+        if: \${{ env.GITPAGEDOCS_PATH != '' }}
+        run: |
+          mkdir -p .gitpagedocs-runtime/out_new/\${{ env.GITPAGEDOCS_PATH }}
+          mv .gitpagedocs-runtime/out/* .gitpagedocs-runtime/out_new/\${{ env.GITPAGEDOCS_PATH }}/
+          rm -rf .gitpagedocs-runtime/out
+          mv .gitpagedocs-runtime/out_new .gitpagedocs-runtime/out
+
       - name: Force root URL to docs entrypoint
         env:
           GITHUB_REPOSITORY: \${{ github.repository }}
@@ -83,6 +91,7 @@ ${buildEnvBlock}
           const path = require('path');
           const pathSegment = ${JSON.stringify(pathSegment)};
           const repoName = (process.env.GITHUB_REPOSITORY || '').split('/')[1] || '';
+          const isUserPage = repoName.toLowerCase().endsWith('.github.io');
           const rootRedirectBase = pathSegment;
           const cfgPath = path.join('.gitpagedocs-runtime', 'gitpagedocs', 'config.json');
           if (!fs.existsSync(cfgPath)) process.exit(0);
@@ -96,7 +105,7 @@ ${buildEnvBlock}
           const rootHtml = '<!doctype html><html><head><meta charset="utf-8"><meta http-equiv="refresh" content="0;url=' + redirectTargetRoot + '"/><script>window.location.replace("' + redirectTargetRoot + '" + (window.location.search || ""));</script></head><body>Redirecting...</body></html>';
           fs.writeFileSync(path.join('.gitpagedocs-runtime', 'out', 'index.html'), rootHtml);
           const projectPathSegments = [];
-          if (repoName) projectPathSegments.push(repoName);
+          if (repoName && !isUserPage) projectPathSegments.push(repoName);
           if (pathSegment) projectPathSegments.push(pathSegment);
           if (projectPathSegments.length > 0) {
             const projectIndexPath = path.join('.gitpagedocs-runtime', 'out', ...projectPathSegments, 'index.html');
diff --git a/next.config.ts b/next.config.ts
@@ -4,23 +4,29 @@ const isGithubPagesBuild = process.env.GITHUB_ACTIONS === "true";
 const repositorySearchEnabledByEnv = process.env.GITPAGEDOCS_REPOSITORY_SEARCH === "true";
 const emulateGithubPagesRuntime = isGithubPagesBuild || repositorySearchEnabledByEnv;
 const repositoryName = process.env.GITHUB_REPOSITORY?.split("/")[1] ?? "git-page-docs";
-const basePathFromEnv = process.env.GITPAGEDOCS_BASE_PATH;
+const isUserPage = repositoryName.toLowerCase().endsWith(".github.io");
+
+const rawDocsPath = process.env.GITPAGEDOCS_PATH?.trim();
+const docsPathSegment = rawDocsPath ? rawDocsPath.replace(/^\/+|\/+$/g, "") : "";
 
 // Local path: only when GITPAGEDOCS_REPOSITORY_SEARCH=false and GITPAGEDOCS_PATH is set
 const isLocalMode = !repositorySearchEnabledByEnv && !isGithubPagesBuild;
-const localPathRaw = process.env.GITPAGEDOCS_PATH?.trim();
-const localBasePath =
-  isLocalMode && localPathRaw
-    ? "/" + localPathRaw.replace(/^\/+|\/+$/g, "")
-    : undefined;
 
-// Treat empty string as "not set" so fallback to /repositoryName is used for project sites
+// Explicit base path definition taking precedence (interprets "/" and "" as root/undefined)
+const explicitBasePath = "GITPAGEDOCS_BASE_PATH" in process.env
+  ? (process.env.GITPAGEDOCS_BASE_PATH === "/" || process.env.GITPAGEDOCS_BASE_PATH === ""
+    ? undefined
+    : process.env.GITPAGEDOCS_BASE_PATH)
+  : null;
+
 const basePath =
-  localBasePath ??
-  (basePathFromEnv !== undefined && basePathFromEnv !== ""
-    ? basePathFromEnv
+  explicitBasePath ??
+  (isLocalMode
+    ? (docsPathSegment ? `/${docsPathSegment}` : undefined)
     : emulateGithubPagesRuntime
-      ? `/${repositoryName}`
+      ? (isUserPage
+        ? (docsPathSegment ? `/${docsPathSegment}` : undefined)
+        : `/${repositoryName}${docsPathSegment ? `/${docsPathSegment}` : ""}`)
       : undefined);
 
 const nextConfig: NextConfig = {
