@uniformdev/cli 20.26.2 → 20.27.1

package/dist/index.mjs

@@ -737,6 +737,7 @@ import { FILE_READY_STATE, getFileNameFromUrl } from "@uniformdev/files";
 import { fileTypeFromBuffer } from "file-type";
 import fsj3 from "fs-jetpack";
 import sizeOf from "image-size";
+import normalizeNewline from "normalize-newline";
 import PQueue from "p-queue";
 import { join as join5 } from "path";
 var uploadQueueByKey = /* @__PURE__ */ new Map();
@@ -773,7 +774,7 @@ var uploadFile = async ({
         );
         return null;
       }
-      const fileBuffer = await fsj3.readAsync(expectedFilePath, "buffer");
+      let fileBuffer = await fsj3.readAsync(expectedFilePath, "buffer");
       if (!fileBuffer) {
         console.warn(`Skipping file ${fileUrl} (${expectedFilePath}) as we couldn't read it`);
         return null;
@@ -786,6 +787,12 @@ var uploadFile = async ({
       if (mimeType === "audio/x-flac") {
         mimeType = "audio/flac";
       }
+      if (mimeType === "image/svg+xml") {
+        try {
+          fileBuffer = normalizeNewline(fileBuffer);
+        } catch {
+        }
+      }
       const { width, height } = (() => {
         if (!mimeType.startsWith("image/")) {
           return {
@@ -869,7 +876,7 @@ var walkFileUrlsForCompositionOrEntry = ({
       callback({ fileUrl: thumbnail });
     }
   }
-  walkNodeTree("entry" in entity ? entity.entry : entity.composition, ({ node }) => {
+  const treeWalker = ({ node }) => {
     const properties = getPropertiesValue(node);
     if (!properties) {
       return;
@@ -889,7 +896,20 @@ var walkFileUrlsForCompositionOrEntry = ({
         callback({ fileUrl: value });
       });
     });
-  });
+  };
+  walkNodeTree("entry" in entity ? entity.entry : entity.composition, treeWalker);
+  const overrides = "entry" in entity ? entity.entry._overrides : entity.composition._overrides;
+  if (overrides) {
+    for (const [, override] of Object.entries(overrides)) {
+      walkNodeTree(
+        {
+          type: "entry" in entity ? entity.entry.type : entity.composition.type,
+          ...override
+        },
+        treeWalker
+      );
+    }
+  }
 };
 
 // src/files/files.ts
@@ -921,7 +941,7 @@ var uploadFileForAsset = async ({
   return uploadFile({ fileUrl, directory, fileClient, fileId });
 };
 var removeUrlsFromAssetParameters = (entity) => {
-  walkNodeTree2("entry" in entity ? entity.entry : entity.composition, ({ node }) => {
+  const treeWalker = ({ node }) => {
     const properties = getPropertiesValue2(node);
     if (!properties) {
       return;
@@ -958,7 +978,20 @@ var removeUrlsFromAssetParameters = (entity) => {
         });
       }
     });
-  });
+  };
+  walkNodeTree2("entry" in entity ? entity.entry : entity.composition, treeWalker);
+  const overrides = "entry" in entity ? entity.entry._overrides : entity.composition._overrides;
+  if (overrides) {
+    for (const [, override] of Object.entries(overrides)) {
+      walkNodeTree2(
+        {
+          type: "entry" in entity ? entity.entry.type : entity.composition.type,
+          ...override
+        },
+        treeWalker
+      );
+    }
+  }
   return entity;
 };
 var compareCompositionsOrEntriesWithoutAssetUrls = (source, target) => {
@@ -8597,7 +8630,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "20.26.2",
+  version: "20.27.1",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -8648,6 +8681,7 @@ var package_default = {
     "js-yaml": "^4.1.0",
     jsonwebtoken: "9.0.2",
     mitt: "^3.0.1",
+    "normalize-newline": "^4.1.0",
     open: "10.1.0",
     ora: "8.0.1",
     "p-queue": "7.3.4",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "20.26.2",
+  "version": "20.27.1",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -27,13 +27,13 @@
   },
   "dependencies": {
     "@thi.ng/mime": "^2.2.23",
-    "@uniformdev/assets": "20.26.2",
-    "@uniformdev/canvas": "20.26.2",
-    "@uniformdev/context": "20.26.2",
-    "@uniformdev/files": "20.26.2",
-    "@uniformdev/project-map": "20.26.2",
-    "@uniformdev/redirect": "20.26.2",
-    "@uniformdev/richtext": "20.26.2",
+    "@uniformdev/assets": "20.27.1",
+    "@uniformdev/canvas": "20.27.1",
+    "@uniformdev/context": "20.27.1",
+    "@uniformdev/files": "20.27.1",
+    "@uniformdev/project-map": "20.27.1",
+    "@uniformdev/redirect": "20.27.1",
+    "@uniformdev/richtext": "20.27.1",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "9.0.0",
@@ -51,6 +51,7 @@
     "js-yaml": "^4.1.0",
     "jsonwebtoken": "9.0.2",
     "mitt": "^3.0.1",
+    "normalize-newline": "^4.1.0",
     "open": "10.1.0",
     "ora": "8.0.1",
     "p-queue": "7.3.4",
@@ -79,5 +80,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e9f8f8081d816af23d625d40d1a0557979b85feb"
+  "gitHead": "b9f3e377c61ae30c4bcd3db5636faf07631de2e1"
 }