@fern-api/fern-api-dev 4.65.3-4-g72908b63716 → 4.65.3-5-gd8cee996921

package/cli.cjs

@@ -363152,9 +363152,9 @@ var require_diff3 = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/@fern-api+replay@0.10.1/node_modules/@fern-api/replay/dist/index.cjs
+// ../../../node_modules/.pnpm/@fern-api+replay@0.10.2/node_modules/@fern-api/replay/dist/index.cjs
 var require_dist14 = __commonJS({
-  "../../../node_modules/.pnpm/@fern-api+replay@0.10.1/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
+  "../../../node_modules/.pnpm/@fern-api+replay@0.10.2/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
     "use strict";
     var __defProp4 = Object.defineProperty;
     var __getOwnPropDesc4 = Object.getOwnPropertyDescriptor;
@@ -364389,9 +364389,10 @@ var require_dist14 = __commonJS({
             const resolvedPath = await this.resolveFilePath(filePath, baseGen.tree_hash, currentTreeHash);
             const base4 = await this.git.showFile(baseGen.tree_hash, filePath);
             const theirs = await this.applyPatchToContent(base4, patch5.patch_content, filePath, tempGit, tempDir2);
-            if (theirs) {
+            const effectiveTheirs = theirs ?? await (0, import_promises182.readFile)((0, import_node_path210.join)(this.outputDir, resolvedPath), "utf-8").catch(() => null);
+            if (effectiveTheirs) {
               this.fileTheirsAccumulator.set(resolvedPath, {
-                content: theirs,
+                content: effectiveTheirs,
                 baseGeneration: patch5.base_generation
               });
             }
@@ -364435,8 +364436,12 @@ var require_dist14 = __commonJS({
             };
           } catch {
             for (const [resolvedPath, content5] of snapshots) {
+              const fullPath = (0, import_node_path210.join)(this.outputDir, resolvedPath);
               if (content5 != null) {
-                await (0, import_promises182.writeFile)((0, import_node_path210.join)(this.outputDir, resolvedPath), content5);
+                await (0, import_promises182.writeFile)(fullPath, content5);
+              } else {
+                await (0, import_promises182.unlink)(fullPath).catch(() => {
+                });
               }
             }
           }
@@ -627383,7 +627388,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "4.65.3-4-g72908b63716",
+          version: "4.65.3-5-gd8cee996921",
           usingAccessToken: true
         }
       });
@@ -627434,7 +627439,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.65.3-4-g72908b63716",
+        version: "4.65.3-5-gd8cee996921",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -843663,7 +843668,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 = "4.65.3-4-g72908b63716";
+  const version7 = "4.65.3-5-gd8cee996921";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -854861,7 +854866,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.65.3-4-g72908b63716"
+        cliVersion: "4.65.3-5-gd8cee996921"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
         return { success: false };
@@ -928419,7 +928424,7 @@ var CliContext = class {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "4.65.3-4-g72908b63716";
+    return "4.65.3-5-gd8cee996921";
   }
   getCliName() {
     if (false) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.65.3-4-g72908b63716",
+  "version": "4.65.3-5-gd8cee996921",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",