@fern-api/fern-api-dev 5.33.1 → 5.33.2

package/cli.cjs

@@ -668443,7 +668443,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.33.1",
+          version: "5.33.2",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -668507,7 +668507,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.33.1",
+        version: "5.33.2",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -860283,7 +860283,7 @@ var LOCAL_STORAGE_FOLDER4 = ".fern-dev";
 var LOGS_FOLDER_NAME = "logs";
 var MAX_LOGS_DIR_SIZE_BYTES = 100 * 1024 * 1024;
 function getCliSource() {
-  const version7 = "5.33.1";
+  const version7 = "5.33.2";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -877858,6 +877858,43 @@ async function generateOne({ generatorInvocation, interactiveTaskContext, projec
 init_lib4();
 init_lib6();
 
+// ../generation/remote-generation/remote-workspace-runner/lib/customDomainValidation.js
+init_lib6();
+var HTTPS_PREFIX = "https://";
+var HTTP_PREFIX = "http://";
+function stripCustomDomainProtocol(customDomain) {
+  if (customDomain.startsWith(HTTPS_PREFIX)) {
+    return customDomain.slice(HTTPS_PREFIX.length);
+  }
+  if (customDomain.startsWith(HTTP_PREFIX)) {
+    return customDomain.slice(HTTP_PREFIX.length);
+  }
+  return customDomain;
+}
+function getBasepath(domain3) {
+  try {
+    const url3 = domain3.startsWith(HTTPS_PREFIX) || domain3.startsWith(HTTP_PREFIX) ? domain3 : `${HTTPS_PREFIX}${domain3}`;
+    return normalizeBasepath(new URL(url3).pathname);
+  } catch {
+    return "/";
+  }
+}
+function normalizeBasepath(pathname) {
+  if (pathname === "" || pathname === "/") {
+    return "/";
+  }
+  return pathname.endsWith("/") ? pathname.slice(0, -1) : pathname;
+}
+function validateBasepathAlignment(instanceUrl, customDomains, context3) {
+  const urlBasepath = getBasepath(instanceUrl);
+  for (const customDomain of customDomains) {
+    const customDomainBasepath = getBasepath(customDomain);
+    if (urlBasepath !== customDomainBasepath) {
+      context3.failAndThrow(`Basepath mismatch between Fern url and custom-domain. When basepath-aware mode is enabled (via 'multi-source: true' or the deprecated 'experimental.basepath-aware: true'), the instance 'url' and 'custom-domain' must share the same basepath, otherwise docs will fail to resolve after DNS cutover. Instance url '${instanceUrl}' has basepath '${urlBasepath}' but custom-domain '${customDomain}' has basepath '${customDomainBasepath}'.`, void 0, { code: CliError.Code.ConfigError });
+    }
+  }
+}
+
 // ../generation/remote-generation/remote-workspace-runner/lib/publishDocs.js
 init_lib4();
 init_js();
@@ -879000,16 +879037,10 @@ async function runRemoteGenerationForDocsWorkspace({ organization, apiWorkspaces
     });
     return;
   }
-  const customDomains = [];
-  if (maybeInstance.customDomain != null) {
-    if (typeof maybeInstance.customDomain === "string") {
-      customDomains.push(maybeInstance.customDomain);
-    } else if (Array.isArray(maybeInstance.customDomain)) {
-      customDomains.push(...maybeInstance.customDomain);
-    }
-  }
-  if (maybeInstance.multiSource === true) {
-    validateMultiSourceBasepaths(maybeInstance.url, customDomains, context3);
+  const customDomains = (typeof maybeInstance.customDomain === "string" ? [maybeInstance.customDomain] : maybeInstance.customDomain ?? []).map(stripCustomDomainProtocol);
+  const isBasepathAware = maybeInstance.multiSource === true || docsWorkspace.config.experimental?.basepathAware === true;
+  if (isBasepathAware) {
+    validateBasepathAlignment(maybeInstance.url, customDomains, context3);
   }
   context3.logger.info(`Starting docs publishing for ${preview ? "preview" : "production"}: ${maybeInstance.url}`);
   context3.logger.debug(`Organization: ${organization}, Preview: ${preview}, APIs: ${apiWorkspaces.length}, OSS: ${ossWorkspaces.length}`);
@@ -879062,23 +879093,6 @@ async function runRemoteGenerationForDocsWorkspace({ organization, apiWorkspaces
   });
   return publishedUrl;
 }
-function getBasepath(domain3) {
-  try {
-    const url3 = domain3.startsWith("https://") || domain3.startsWith("http://") ? domain3 : `https://${domain3}`;
-    return new URL(url3).pathname;
-  } catch {
-    return "/";
-  }
-}
-function validateMultiSourceBasepaths(instanceUrl, customDomains, context3) {
-  const urlBasepath = getBasepath(instanceUrl);
-  for (const customDomain of customDomains) {
-    const customDomainBasepath = getBasepath(customDomain);
-    if (customDomainBasepath !== "/" && urlBasepath !== customDomainBasepath) {
-      context3.failAndThrow(`When multi-source is enabled, the url and custom-domain must share the same basepath. Instance url '${instanceUrl}' has basepath '${urlBasepath}' but custom-domain '${customDomain}' has basepath '${customDomainBasepath}'.`, void 0, { code: CliError.Code.ConfigError });
-    }
-  }
-}
 
 // ../cli-v2/lib/docs/publisher/LegacyDocsPublisher.js
 init_lib6();
@@ -879115,7 +879129,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.33.1",
+        cliVersion: "5.33.2",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -953815,7 +953829,7 @@ function getAutomationContextFromEnv() {
     config_branch: process.env.FERN_CONFIG_BRANCH,
     config_pr_number: process.env.FERN_CONFIG_PR_NUMBER,
     trigger: process.env.GITHUB_EVENT_NAME,
-    cli_version: "5.33.1"
+    cli_version: "5.33.2"
   };
 }
 function isAutomationMode() {
@@ -954641,7 +954655,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.33.1";
+    return "5.33.2";
   }
   getCliName() {
     if (false) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.33.1",
+  "version": "5.33.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",