feat: add basepath to preview generation (#3877)

* feat: add basepath to preview generation * use whatwg parser
fern-api · Jun 19, 2024 · 94cccaf · 94cccaf
1 parent 292c2ce
commit 94cccaf
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 26 deletions.
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/....98.2-d590e2c8a-7fd0ca2aac-40586b9a27.zip → ....98.2-feb732f15-5b88c7b57e-2480ba175c.zip b/....98.2-d590e2c8a-7fd0ca2aac-40586b9a27.zip → ....98.2-feb732f15-5b88c7b57e-2480ba175c.zip
diff --git a/packages/cli/configuration/package.json b/packages/cli/configuration/package.json
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@fern-api/core-utils": "workspace:*",
-    "@fern-api/fdr-sdk": "0.98.2-d590e2c8a",
+    "@fern-api/fdr-sdk": "0.98.2-feb732f15",
     "@fern-api/fs-utils": "workspace:*",
     "@fern-api/task-context": "workspace:*",
     "@fern-fern/fiddle-sdk": "^0.0.552",

diff --git a/packages/cli/docs-preview/package.json b/packages/cli/docs-preview/package.json
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@fern-api/docs-resolver": "workspace:*",
-    "@fern-api/fdr-sdk": "0.98.2-d590e2c8a",
+    "@fern-api/fdr-sdk": "0.98.2-feb732f15",
     "@fern-api/fs-utils": "workspace:*",
     "@fern-api/ir-sdk": "workspace:*",
     "@fern-api/logger": "workspace:*",

diff --git a/packages/cli/docs-resolver/package.json b/packages/cli/docs-resolver/package.json
@@ -29,7 +29,7 @@
   "dependencies": {
     "@fern-api/configuration": "workspace:*",
     "@fern-api/core-utils": "workspace:*",
-    "@fern-api/fdr-sdk": "0.98.2-d590e2c8a",
+    "@fern-api/fdr-sdk": "0.98.2-feb732f15",
     "@fern-api/fs-utils": "workspace:*",
     "@fern-api/ir-generator": "workspace:*",
     "@fern-api/ir-sdk": "workspace:*",

diff --git a/packages/cli/generation/remote-generation/remote-workspace-runner/package.json b/packages/cli/generation/remote-generation/remote-workspace-runner/package.json
@@ -32,7 +32,7 @@
     "@fern-api/core": "workspace:*",
     "@fern-api/core-utils": "workspace:*",
     "@fern-api/docs-resolver": "workspace:*",
-    "@fern-api/fdr-sdk": "0.98.2-d590e2c8a",
+    "@fern-api/fdr-sdk": "0.98.2-feb732f15",
     "@fern-api/fs-utils": "workspace:*",
     "@fern-api/ir-generator": "workspace:*",
     "@fern-api/ir-migrations": "workspace:*",

diff --git a/packages/cli/generation/remote-generation/remote-workspace-runner/src/publishDocs.ts b/packages/cli/generation/remote-generation/remote-workspace-runner/src/publishDocs.ts
@@ -55,6 +55,7 @@ export async function publishDocs({
 
     let docsRegistrationId: string | undefined;
     let urlToOutput = customDomains[0] ?? domain;
+    const basePath = parseBasePath(domain);
     const resolver = new DocsDefinitionResolver(
         domain,
         docsWorkspace,
@@ -101,7 +102,8 @@ export async function publishDocs({
                     orgId: organization,
                     authConfig: isPrivate ? { type: "private", authType: "sso" } : { type: "public" },
                     filepaths,
-                    images
+                    images,
+                    basePath
                 });
                 if (startDocsRegisterResponse.ok) {
                     urlToOutput = startDocsRegisterResponse.body.previewUrl;
@@ -275,3 +277,11 @@ function startDocsRegisterFailed(
             return context.failAndThrow("Failed to publish docs.", error);
     }
 }
+
+function parseBasePath(domain: string): string | undefined {
+    try {
+        return new URL(wrapWithHttps(domain)).pathname;
+    } catch (e) {
+        return undefined;
+    }
+}
diff --git a/packages/cli/register/package.json b/packages/cli/register/package.json
@@ -31,7 +31,7 @@
     "@fern-api/configuration": "workspace:*",
     "@fern-api/core": "workspace:*",
     "@fern-api/core-utils": "workspace:*",
-    "@fern-api/fdr-sdk": "0.98.2-d590e2c8a",
+    "@fern-api/fdr-sdk": "0.98.2-feb732f15",
     "@fern-api/ir-generator": "workspace:*",
     "@fern-api/ir-sdk": "workspace:*",
     "@fern-api/task-context": "workspace:*",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -27,7 +27,7 @@
     "depcheck": "depcheck"
   },
   "dependencies": {
-    "@fern-api/fdr-sdk": "0.98.2-d590e2c8a",
+    "@fern-api/fdr-sdk": "0.98.2-feb732f15",
     "@fern-api/venus-api-sdk": "0.0.38",
     "@fern-fern/fdr-test-sdk": "^0.0.5297",
     "@fern-fern/fiddle-sdk": "^0.0.552"

diff --git a/yarn.lock b/yarn.lock
@@ -3450,7 +3450,7 @@ __metadata:
   resolution: "@fern-api/configuration@workspace:packages/cli/configuration"
   dependencies:
     "@fern-api/core-utils": "workspace:*"
-    "@fern-api/fdr-sdk": 0.98.2-d590e2c8a
+    "@fern-api/fdr-sdk": 0.98.2-feb732f15
     "@fern-api/fs-utils": "workspace:*"
     "@fern-api/task-context": "workspace:*"
     "@fern-fern/fiddle-sdk": ^0.0.552
@@ -3497,7 +3497,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@fern-api/core@workspace:packages/core"
   dependencies:
-    "@fern-api/fdr-sdk": 0.98.2-d590e2c8a
+    "@fern-api/fdr-sdk": 0.98.2-feb732f15
     "@fern-api/venus-api-sdk": 0.0.38
     "@fern-fern/fdr-test-sdk": ^0.0.5297
     "@fern-fern/fiddle-sdk": ^0.0.552
@@ -3559,7 +3559,7 @@ __metadata:
   resolution: "@fern-api/docs-preview@workspace:packages/cli/docs-preview"
   dependencies:
     "@fern-api/docs-resolver": "workspace:*"
-    "@fern-api/fdr-sdk": 0.98.2-d590e2c8a
+    "@fern-api/fdr-sdk": 0.98.2-feb732f15
     "@fern-api/fs-utils": "workspace:*"
     "@fern-api/ir-sdk": "workspace:*"
     "@fern-api/logger": "workspace:*"
@@ -3599,7 +3599,7 @@ __metadata:
   dependencies:
     "@fern-api/configuration": "workspace:*"
     "@fern-api/core-utils": "workspace:*"
-    "@fern-api/fdr-sdk": 0.98.2-d590e2c8a
+    "@fern-api/fdr-sdk": 0.98.2-feb732f15
     "@fern-api/fs-utils": "workspace:*"
     "@fern-api/ir-generator": "workspace:*"
     "@fern-api/ir-sdk": "workspace:*"
@@ -3681,9 +3681,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@fern-api/fdr-sdk@npm:0.98.2-d590e2c8a":
-  version: 0.98.2-d590e2c8a
-  resolution: "@fern-api/fdr-sdk@npm:0.98.2-d590e2c8a"
+"@fern-api/fdr-sdk@npm:0.98.2-feb732f15":
+  version: 0.98.2-feb732f15
+  resolution: "@fern-api/fdr-sdk@npm:0.98.2-feb732f15"
   dependencies:
     dayjs: ^1.11.11
     fast-deep-equal: ^3.1.3
@@ -3695,7 +3695,7 @@ __metadata:
     tinycolor2: ^1.6.0
     title: ^3.5.3
     url-join: 5.0.0
-  checksum: 40586b9a273aee33a4b003ee37117d81cfaf8970f2abaaf482e2ec4a7d4882c0393ef63c6b034e216b1ea61a6c075a984248829e63386d03b76e698547e92ec6
+  checksum: 2480ba175cfa6dc3a12630c7ef0cdcd740cc48e12e6362ce7c7aa8304ab9032501e90ddaabf84f3d4bd89c06b6127211350af1ca3c6023982246bcf3542b0be1
   languageName: node
   linkType: hard
 
@@ -4340,7 +4340,7 @@ __metadata:
     "@fern-api/configuration": "workspace:*"
     "@fern-api/core": "workspace:*"
     "@fern-api/core-utils": "workspace:*"
-    "@fern-api/fdr-sdk": 0.98.2-d590e2c8a
+    "@fern-api/fdr-sdk": 0.98.2-feb732f15
     "@fern-api/ir-generator": "workspace:*"
     "@fern-api/ir-sdk": "workspace:*"
     "@fern-api/task-context": "workspace:*"
@@ -4367,7 +4367,7 @@ __metadata:
     "@fern-api/core": "workspace:*"
     "@fern-api/core-utils": "workspace:*"
     "@fern-api/docs-resolver": "workspace:*"
-    "@fern-api/fdr-sdk": 0.98.2-d590e2c8a
+    "@fern-api/fdr-sdk": 0.98.2-feb732f15
     "@fern-api/fs-utils": "workspace:*"
     "@fern-api/ir-generator": "workspace:*"
     "@fern-api/ir-migrations": "workspace:*"