dogsbay 0.2.0-beta.19 → 0.2.0-beta.20

package/dist/commands/site-build.js

@@ -17,7 +17,7 @@
 import { existsSync } from "node:fs";
 import { dirname, isAbsolute, resolve } from "node:path";
 import pc from "picocolors";
-import { emitAstroPages, emitPassthroughAstroPages, emitSiteConfig, emitConfigDerivedFiles, emitDeployArtifacts, emitAgentReadinessFiles, emitMissingTranslationStubs, emitSwitcherMap, emitTaxonomyRoutes, emitPluginRuntime, normalizeBasePath, basePathSegments, } from "@dogsbay/format-astro";
+import { emitAstroPages, emitPassthroughAstroPages, emitSiteConfig, emitConfigDerivedFiles, emitDeployArtifacts, emitAgentReadinessFiles, emitMissingTranslationStubs, emitSwitcherMap, emitTaxonomyRoutes, emitPluginRuntime, normalizeBasePath, basePathSegments, resolvePrefixes, } from "@dogsbay/format-astro";
 import { collectPassthroughEntries } from "../passthrough-astro.js";
 import { configToAstroOptions, findConfig, loadConfig, resolveOutputDir, } from "../config/index.js";
 import { filterSourcesForMode, importContent, primaryModeFiltersAnything, } from "../import-content.js";
@@ -167,6 +167,11 @@ export async function siteBuild(cwd, options) {
     // generalize this to copy assets per-source.
     const astroOpts = configToAstroOptions(config);
     astroOpts.sourceDir = resolvedSources[0];
+    // siteRoot = repo root (where dogsbay.config.yml lives). Used by
+    // emitDeployArtifacts to drop GH Actions workflows at
+    // <siteRoot>/.github/ rather than inside the Astro subdir, where
+    // GitHub wouldn't find them.
+    astroOpts.projectDir = siteRoot;
     // Refresh src/data/site.json from the current config — purely
     // config-derived, so changes in dogsbay.config.yml propagate without
     // re-running site init.
@@ -245,9 +250,13 @@ export async function siteBuild(cwd, options) {
                 labels: raw.labels,
             };
         }
+        // Pass the combined prefix as basePath to taxonomy — term URLs
+        // need to include both urlBase (host subpath) and dogsbay
+        // basePath so they resolve correctly under the served URL.
+        const taxoCombined = resolvePrefixes(config.site.url, config.site.basePath).combined;
         const emitted = emitTaxonomyRoutes(pages, outputDir, taxonomyConfigs, {
             section: config.content.section,
-            basePath: config.site.basePath,
+            basePath: taxoCombined,
         });
         if (emitted.length > 0) {
             console.log(`  Emitted taxonomy routes: ${emitted.join(", ")}`);

package/dist/commands/site-init.js

@@ -101,9 +101,12 @@ export async function siteInit(targetDir, options) {
     }
     // Emit the static scaffold into the configured output dir
     // (default ./astro). The project root keeps only the config and
-    // human-edited files (content/, theme/, public/).
+    // human-edited files (content/, theme/, public/). projectDir
+    // (= absTarget) lets deploy emitters write artifacts that GitHub
+    // Actions reads from the repo root rather than the Astro subdir.
     const outputDir = resolveOutputDir(config, configPath);
     const astroOpts = configToAstroOptions(config);
+    astroOpts.projectDir = absTarget;
     if (options.local)
         astroOpts.local = true;
     emitSiteScaffold(outputDir, config.site.name, astroOpts, true);

package/dist/config/load.js

@@ -260,38 +260,12 @@ function validateSite(site, sourcePath) {
                 `or repeated slashes. Got ${JSON.stringify(s.basePath)}`);
         }
     }
-    // Cross-field check: site.url must be host-only (no path) when
-    // a non-empty basePath is set. Astro itself splits these as
-    // `site` (origin) + `base` (path); double-counting the prefix
-    // produces canonical URLs like https://example.com/docs/docs/.
-    // Detect by parsing site.url as a URL and rejecting any non-`/`
-    // pathname when basePath is configured.
-    if (typeof s.url === "string" && s.url.length > 0) {
-        let parsedUrl;
-        try {
-            parsedUrl = new URL(s.url);
-        }
-        catch {
-            // Invalid URL — leave further checks for downstream Astro;
-            // we only want to catch the host+path overlap here.
-        }
-        const basePath = typeof s.basePath === "string" ? s.basePath : undefined;
-        const basePathIsSet = basePath !== undefined && basePath !== "" && basePath !== "/";
-        if (parsedUrl && basePathIsSet) {
-            const urlPath = parsedUrl.pathname.replace(/\/+$/, ""); // strip trailing /
-            if (urlPath !== "" && urlPath !== "/") {
-                const origin = `${parsedUrl.protocol}//${parsedUrl.host}`;
-                throw new Error(`site.url must be host-only when site.basePath is set in ${sourcePath}; ` +
-                    `got ${JSON.stringify(s.url)}, expected ${JSON.stringify(origin)} ` +
-                    `with basePath ${JSON.stringify(basePath)}.\n\n` +
-                    `Astro splits these into:\n` +
-                    `  site: ${JSON.stringify(origin)}\n` +
-                    `  base: ${JSON.stringify(basePath)}\n` +
-                    `Without this fix, canonical URLs double-count the prefix ` +
-                    `(e.g. ${origin}${urlPath}${basePath}/).`);
-            }
-        }
-    }
+    // site.url and site.basePath are now independent prefixes that
+    // compose at emit time. The path component of site.url drives
+    // Astro's `base` (where the served space sits in the host);
+    // basePath stays as content's filesystem position within that
+    // served space. See plans/astro-base-from-site-url.md and
+    // packages/format-astro/src/base-path.ts:resolvePrefixes.
     return s;
 }
 const VALID_FROM = [

package/dist/import-content.js

@@ -1,4 +1,4 @@
-import { normalizeBasePath } from "@dogsbay/format-astro";
+import { normalizeBasePath, resolvePrefixes } from "@dogsbay/format-astro";
 import { plugin as mkdocsPlugin } from "@dogsbay/format-mkdocs/cli";
 import { plugin as astroPlugin } from "@dogsbay/format-astro/cli";
 import { plugin as obsidianPlugin } from "@dogsbay/format-obsidian/cli";
@@ -396,16 +396,17 @@ function buildImportOptions(config, source) {
     if (config.taxonomies) {
         opts.taxonomyNames = Object.keys(config.taxonomies);
     }
-    // Pass site.basePath through as `hrefPrefix` so nav-builders
-    // produce hrefs matching where pages will actually be emitted.
-    // `normalizeBasePath(undefined)` returns the platform default
-    // (`/docs`) so we ALWAYS thread a value — leaving it unset would
-    // force every importer to invent its own fallback (which they did,
-    // inconsistently). Importers that care about basePath are free to
-    // ignore it, but the default makes "namespace-prefixed nav builds
-    // correctly" the path of least resistance. See
-    // plans/configurable-base-path.md and the api-docs example in
-    // plans/openapi-builtin.md.
-    opts.hrefPrefix = normalizeBasePath(config.site.basePath);
+    // Pass the COMBINED URL prefix (urlBase from site.url's path +
+    // site.basePath) as `hrefPrefix` so nav-builders produce hrefs
+    // matching the served URL of each page. Two prefix layers
+    // because subpath-mounted deploys (GH Pages project pages,
+    // multi-mount Cloudflare under one Worker) add a host-level
+    // prefix on top of dogsbay's basePath. See
+    // plans/astro-base-from-site-url.md.
+    //
+    // Back-compat: when site.url is origin-only (no path), urlBase
+    // is empty and combined === basePath, so existing sites see no
+    // change.
+    opts.hrefPrefix = resolvePrefixes(config.site.url, config.site.basePath).combined;
     return opts;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dogsbay",
-  "version": "0.2.0-beta.19",
+  "version": "0.2.0-beta.20",
   "description": "CLI for Dogsbay — scaffold, build, and serve documentation sites with markdown / MkDocs / Obsidian / OpenAPI sources",
   "type": "module",
   "bin": {
@@ -32,14 +32,14 @@
     "picocolors": "^1.1.0",
     "prompts": "^2.4.2",
     "yaml": "^2.8.3",
-    "@dogsbay/format-astro": "0.2.0-beta.19",
-    "@dogsbay/format-obsidian": "0.2.0-beta.19",
-    "@dogsbay/format-mkdocs": "0.2.0-beta.19",
-    "@dogsbay/format-mdx": "0.2.0-beta.19",
-    "@dogsbay/format-starlight": "0.2.0-beta.19",
-    "@dogsbay/format-dogsbay-md": "0.2.0-beta.19",
-    "@dogsbay/format-openapi": "0.2.0-beta.19",
-    "@dogsbay/types": "0.2.0-beta.19"
+    "@dogsbay/format-mkdocs": "0.2.0-beta.20",
+    "@dogsbay/format-astro": "0.2.0-beta.20",
+    "@dogsbay/format-mdx": "0.2.0-beta.20",
+    "@dogsbay/format-obsidian": "0.2.0-beta.20",
+    "@dogsbay/format-dogsbay-md": "0.2.0-beta.20",
+    "@dogsbay/format-starlight": "0.2.0-beta.20",
+    "@dogsbay/format-openapi": "0.2.0-beta.20",
+    "@dogsbay/types": "0.2.0-beta.20"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",