jamdesk 1.1.164 → 1.1.165

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jamdesk",
-  "version": "1.1.164",
+  "version": "1.1.165",
   "description": "CLI for Jamdesk — build, preview, and deploy documentation sites from MDX. Dev server with hot reload, 50+ components, OpenAPI support, AI search, and Mintlify migration",
   "keywords": [
     "jamdesk",

package/vendored/lib/middleware-helpers.ts

@@ -684,14 +684,23 @@ const TRUSTED_PROXY_HEADERS = [
   'x-jd-project-name',
   'x-jd-project-logo',
   // Canonical override: middleware writes this when serving *.jamdesk.app
-  // directly for a hostAtDocs project that has a registered custom
-  // domain. The page render path uses it to emit the public-face canonical
-  // instead of the upstream subdomain URL.
+  // directly for a project (ANY hosting mode) whose registered custom
+  // domain passed domain-side validation (domain:<host> mapping points back
+  // at the slug + domainStatus active). The page render path uses it to
+  // emit the public-face canonical instead of the upstream subdomain URL.
   'x-jd-canonical-host',
-  // Set when *.jamdesk.app serves a hostAtDocs project that has NOT
-  // registered a custom domain yet — page emits robots: noindex so the
-  // upstream URL doesn't compete with the (yet-to-arrive) public face
-  // in search results.
+  // The registered domain's OWN serving mode ('true' | 'false', from
+  // domainCfg:<host>) — decides whether the canonical URL carries the
+  // /docs prefix. Only meaningful alongside x-jd-canonical-host; absent
+  // for legacy domains without a domainCfg record (page falls back to the
+  // projectCfg-derived hostAtDocs).
+  'x-jd-canonical-at-docs',
+  // Set when *.jamdesk.app serves a hostAtDocs project with no
+  // domain-validated custom domain (none registered, or the projectCfg
+  // mirror failed domain-side validation) — page emits robots: noindex so
+  // the upstream URL doesn't compete with the public face in search
+  // results. NEVER set for hostAtDocs=false tenants without a domain:
+  // their subdomain IS the public site.
   'x-jd-noindex',
 ] as const;
 
@@ -703,15 +712,25 @@ const TRUSTED_PROXY_HEADERS = [
 export interface BuildProjectHeadersOptions {
   /**
    * Public-face canonical host. Set when serving *.jamdesk.app directly
-   * for a hostAtDocs project that has a registered custom domain — the
-   * page render path emits this host in <link rel="canonical"> instead
-   * of the upstream subdomain.
+   * for a project (any hosting mode) whose registered custom domain passed
+   * domain-side validation — the page render path emits this host in
+   * <link rel="canonical"> instead of the upstream subdomain.
    */
   canonicalHost?: string;
+  /**
+   * The registered domain's OWN serving mode (domainCfg:<host>.hostAtDocs).
+   * Decides whether the canonical URL carries the /docs prefix — the
+   * projectCfg-side hostAtDocs describes how the SUBDOMAIN serves, which
+   * can diverge from the domain's live mode. undefined = legacy domain
+   * with no domainCfg record; the page falls back to the projectCfg-derived
+   * hostAtDocs. Only emitted when canonicalHost is set.
+   */
+  canonicalAtDocs?: boolean;
   /**
    * When true, emit `x-jd-noindex: true` so the page emits a robots
-   * noindex tag. Used for *.jamdesk.app subdomains of hostAtDocs
-   * projects without a custom domain yet.
+   * noindex tag. Used for *.jamdesk.app subdomains of hostAtDocs projects
+   * without a domain-validated custom domain. Never set for
+   * hostAtDocs=false tenants — their subdomain is the public site.
    */
   noindex?: boolean;
 }
@@ -724,6 +743,8 @@ export interface BuildProjectHeadersOptions {
  *   - x-host-at-docs       — whether docs are mounted at /docs
  *   - x-jd-language        — locale code if the path starts with one (e.g. /fr/...)
  *   - x-jd-canonical-host  — public-face host (opts.canonicalHost)
+ *   - x-jd-canonical-at-docs — domain's own /docs mode (opts.canonicalAtDocs;
+ *     only alongside x-jd-canonical-host)
  *   - x-jd-noindex         — "true" when opts.noindex is set
  *
  * Strips any client-supplied copies of those headers from the inbound
@@ -763,6 +784,10 @@ export function buildProjectHeaders(
 
   if (opts.canonicalHost) {
     newHeaders.set('x-jd-canonical-host', opts.canonicalHost);
+    // Only meaningful with a canonical host; getBaseUrl ignores it otherwise.
+    if (opts.canonicalAtDocs !== undefined) {
+      newHeaders.set('x-jd-canonical-at-docs', opts.canonicalAtDocs ? 'true' : 'false');
+    }
   }
   if (opts.noindex) {
     newHeaders.set('x-jd-noindex', 'true');

package/vendored/lib/page-isr-helpers.ts

@@ -132,14 +132,21 @@ export function parseCacheKey(cacheKey: string): { projectSlug: string; pagePath
  *
  * Header priority (highest first):
  *   1. x-jd-canonical-host  — internal override set by middleware when a
- *      hostAtDocs project is served directly via *.jamdesk.app and has a
- *      registered customDomain. Forces the canonical to the public face.
+ *      project (any hosting mode) is served directly via *.jamdesk.app and
+ *      its registered customDomain passed domain-side validation. Forces
+ *      the canonical to the public face. When present, the companion
+ *      x-jd-canonical-at-docs header (the DOMAIN's own serving mode, from
+ *      domainCfg:<host>) overrides the hostAtDocs param for the /docs
+ *      prefix decision — projectCfg's hostAtDocs describes how the
+ *      subdomain serves, which can diverge from the live domain mode.
+ *      Companion header absent (legacy domains without a domainCfg record)
+ *      → the hostAtDocs param decides, as before.
  *   2. x-jamdesk-forwarded-host — set by the Cloudflare Worker proxy
  *      (e.g. jamdesk.com → forwarded `jamdesk.com`).
  *   3. host header — direct request hostname.
  *   4. Subdomain fallback `<slug>.jamdesk.app` (no headers available).
  *
- * Both override headers are in TRUSTED_PROXY_HEADERS so a client can't
+ * All override headers are in TRUSTED_PROXY_HEADERS so a client can't
  * spoof them.
  *
  * When hostAtDocs=true, includes /docs path prefix (forwarded-host and
@@ -157,7 +164,13 @@ export function getBaseUrl(headers: Headers, projectSlug: string, hostAtDocs = f
 
   if (host) {
     const hostname = host.split(':')[0];
-    return hostAtDocs ? `https://${hostname}/docs` : `https://${hostname}`;
+    // Domain-mode override: only consulted when the canonical-host override
+    // is active (the companion header is only ever set alongside it).
+    const canonicalAtDocs = canonicalHost
+      ? headers.get('x-jd-canonical-at-docs')
+      : null;
+    const atDocs = canonicalAtDocs !== null ? canonicalAtDocs === 'true' : hostAtDocs;
+    return atDocs ? `https://${hostname}/docs` : `https://${hostname}`;
   }
 
   // Fallback to subdomain URL (subdomains always serve at root, never /docs)

package/vendored/lib/render-doc-page.tsx

@@ -256,10 +256,11 @@ export async function buildDocMetadata(input: RenderInput): Promise<Metadata> {
   const { slug: slugInput, projectSlug, hostAtDocs, requestHeaders } = input;
 
   // Middleware sets `x-jd-noindex: true` when serving a hostAtDocs project
-  // directly via *.jamdesk.app and the project has no registered custom
-  // domain yet. The upstream subdomain shouldn't compete with the (yet-to-
-  // arrive) public face in search results — emit robots noindex so Google
-  // skips it. See proxy.ts → projectHeaderOptsForCanonical for the source.
+  // directly via *.jamdesk.app and the project has no domain-validated
+  // custom domain (none registered, or the registration is stale/inactive).
+  // The upstream subdomain shouldn't compete with the public face in search
+  // results — emit robots noindex so Google skips it. See proxy.ts →
+  // projectHeaderOptsForCanonical for the source.
   const noindexHeader = requestHeaders?.get('x-jd-noindex') === 'true';
 
   if (isIsrMode()) {

package/vendored/lib/static-file-route.ts

@@ -43,10 +43,11 @@ const CONTENT_TYPES: Record<string, string> = {
  * have no business being served from a non-canonical host.
  *
  * `x-jd-noindex: true` is set by `proxy.ts` (`projectHeaderOptsForCanonical`)
- * when a project uses `hostAtDocs` WITHOUT a custom domain — i.e. its public
- * face is the raw `<slug>.jamdesk.app` subdomain with no canonical elsewhere.
- * Once a custom domain is registered, the header is replaced by a canonical-
- * host override and noindex is no longer set.
+ * when a project uses `hostAtDocs` WITHOUT a domain-validated custom domain
+ * — i.e. its public face is the raw `<slug>.jamdesk.app` subdomain with no
+ * canonical elsewhere. Once a custom domain is registered AND active, the
+ * header is replaced by a canonical-host override and noindex is no longer
+ * set.
  *
  * `robots.txt` is handled separately — it returns a Disallow-all directive,
  * not a 404, so crawlers get an explicit "don't crawl" signal.