@uniformdev/cli 19.207.0 → 19.207.1-alpha.20

package/dist/index.mjs

@@ -481,6 +481,7 @@ import { UncachedFileClient } from "@uniformdev/files";
 import { preferredType } from "@thi.ng/mime";
 import { FILE_READY_STATE, getFileNameFromUrl } from "@uniformdev/files";
 import { createHash } from "crypto";
+import { fileTypeFromBuffer } from "file-type";
 import fsj from "fs-jetpack";
 import sizeOf from "image-size";
 import PQueue from "p-queue";
@@ -505,7 +506,9 @@ var hashToPartialPathname = (hash) => {
 };
 var findUrlMatchingPartialPathname = (source, pathname) => {
   const escapedPathname = escapeRegExp(pathname);
-  const regex = new RegExp(`"(https://([^"]*?)?img.uniform.(rocks|global)${escapedPathname}([^"]*?))"`);
+  const regex = new RegExp(
+    `"(https://([^"]*?)?(img|files).uniform.(rocks|global)${escapedPathname}([^"]*?))"`
+  );
   const match = source.match(regex);
   if (match && match[1]) {
     return match[1];
@@ -536,7 +539,7 @@ var getFilesDirectory = (directory) => {
   );
 };
 var getUniformFileUrlMatches = (string) => {
-  return string.matchAll(/"(https:\/\/([^"]*?)?img\.uniform\.(rocks|global)\/([^"]*?))"/g);
+  return string.matchAll(/"(https:\/\/([^"]*?)?(img|files)\.uniform\.(rocks|global)\/([^"]*?))"/g);
 };
 var deleteDownloadedFileByUrl = async (url, options) => {
   const writeDirectory = getFilesDirectory(options.directory);
@@ -641,7 +644,17 @@ var extractAndUploadUniformFilesForObject = async (object, options) => {
             return;
           }
           const fileName = getFileNameFromUrl(url);
+          let mimeType = (await fileTypeFromBuffer(fileBuffer))?.mime;
+          if (!mimeType) {
+            mimeType = preferredType(url.split(".").at(-1) ?? "");
+          }
           const { width, height } = (() => {
+            if (!mimeType.startsWith("image/")) {
+              return {
+                width: void 0,
+                height: void 0
+              };
+            }
             try {
               return sizeOf(fileBuffer);
             } catch {
@@ -651,7 +664,6 @@ var extractAndUploadUniformFilesForObject = async (object, options) => {
               };
             }
           })();
-          const mimeType = preferredType(url.split(".").at(-1) ?? "");
           const { id, method, uploadUrl } = await options.fileClient.insert({
             name: fileName,
             mediaType: mimeType,
@@ -8418,6 +8430,7 @@ var package_default = {
     diff: "^5.0.0",
     dotenv: "^16.0.3",
     execa: "5.1.1",
+    "file-type": "^19.6.0",
     "fs-jetpack": "5.1.0",
     graphql: "16.9.0",
     "graphql-request": "6.1.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "19.207.0",
+  "version": "19.207.1-alpha.20+9dc4b12464",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -27,12 +27,12 @@
   },
   "dependencies": {
     "@thi.ng/mime": "^2.2.23",
-    "@uniformdev/assets": "19.207.0",
-    "@uniformdev/canvas": "19.207.0",
-    "@uniformdev/context": "19.207.0",
-    "@uniformdev/files": "19.207.0",
-    "@uniformdev/project-map": "19.207.0",
-    "@uniformdev/redirect": "19.207.0",
+    "@uniformdev/assets": "19.207.1-alpha.20+9dc4b12464",
+    "@uniformdev/canvas": "19.207.1-alpha.20+9dc4b12464",
+    "@uniformdev/context": "19.207.1-alpha.20+9dc4b12464",
+    "@uniformdev/files": "19.207.1-alpha.20+9dc4b12464",
+    "@uniformdev/project-map": "19.207.1-alpha.20+9dc4b12464",
+    "@uniformdev/redirect": "19.207.1-alpha.20+9dc4b12464",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "9.0.0",
@@ -40,6 +40,7 @@
     "diff": "^5.0.0",
     "dotenv": "^16.0.3",
     "execa": "5.1.1",
+    "file-type": "^19.6.0",
     "fs-jetpack": "5.1.0",
     "graphql": "16.9.0",
     "graphql-request": "6.1.0",
@@ -78,5 +79,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e90334452c3b50b7657f7ae55ffb9c6fe97febb3"
+  "gitHead": "9dc4b1246494bc273e86dd22cd4818aa4ebd1c24"
 }