@uniformdev/cli 19.89.0 → 19.90.0

package/dist/index.mjs

@@ -810,7 +810,9 @@ var extractAndUploadUniformFilesForObject = async (object, options) => {
             options.fileClient.get({ sourceId: hash }).catch(() => null),
             options.fileClient.get({ sourceId: legacyHash }).catch(() => null)
           ]);
-          if (fileAlreadyExistsChecks.some((check) => check !== null)) {
+          const file = fileAlreadyExistsChecks.find((check) => check !== null);
+          if (file) {
+            objectAsString = objectAsString.replaceAll(`"${url}"`, `"${file.url}"`);
             return;
           }
           const localFileName = urlToFileName(url);
@@ -829,7 +831,7 @@ var extractAndUploadUniformFilesForObject = async (object, options) => {
           }
           const fileBuffer = await fsj.readAsync(expectedFilePath, "buffer");
           if (!fileBuffer) {
-            console.warn(`Skipping file ${url} as we couldn't read it`);
+            console.warn(`Skipping file ${url} (${expectedFilePath}) as we couldn't read it`);
             return;
           }
           const fileName = getFileNameFromUrl(url);
@@ -861,19 +863,19 @@ var extractAndUploadUniformFilesForObject = async (object, options) => {
             }
           });
           if (!uploadResponse.ok) {
-            console.warn(`Failed to upload file ${url}`);
+            console.warn(`Failed to upload file ${url} (${expectedFilePath})`);
             return;
           }
           const checkForFile = async () => {
-            const file = await options.fileClient.get({ id });
-            if (!file || file.state !== FILE_READY_STATE || !file.url) {
+            const file2 = await options.fileClient.get({ id });
+            if (!file2 || file2.state !== FILE_READY_STATE || !file2.url) {
               await new Promise((resolve2) => setTimeout(resolve2, 500));
               return checkForFile();
             }
-            return file.url;
+            return file2.url;
           };
           const abortTimeout = setTimeout(() => {
-            throw new Error(`Failed to upload file ${url} (upload timed out)`);
+            throw new Error(`Failed to upload file ${url} (${expectedFilePath}) - upload timed out`);
           }, 3e4);
           const uploadedFileUrl = await checkForFile();
           clearTimeout(abortTimeout);
@@ -1277,15 +1279,10 @@ var AssetPushModule = {
         return sourceObjectWithNewFileUrls;
       },
       onBeforeWriteObject: async (sourceObject) => {
-        const sourceObjectWithNewFileUrls = await swapOutUniformFileUrlsForTargetProject(
-          await extractAndUploadUniformFilesForObject(sourceObject, {
-            directory,
-            fileClient
-          }),
-          {
-            fileClient
-          }
-        );
+        const sourceObjectWithNewFileUrls = await extractAndUploadUniformFilesForObject(sourceObject, {
+          directory,
+          fileClient
+        });
         sourceObjectWithNewFileUrls.object = await updateAssetFileIdBasedOnUrl(
           sourceObjectWithNewFileUrls.object,
           {
@@ -3177,7 +3174,9 @@ var EntryGetModule = {
       offset: 0,
       limit: 1,
       entryIDs: [id],
-      skipOverridesResolution: true
+      skipOverridesResolution: true,
+      skipPatternResolution: true,
+      skipDataResolution: true
     });
     if (res.entries.length !== 1) {
       throw new Error(`Entry with ID ${id} not found`);
@@ -3195,7 +3194,13 @@ var EntryListModule = {
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new ContentClient8({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
-    const res = await client.getEntries({ offset: 0, limit: 1e3, skipOverridesResolution: true });
+    const res = await client.getEntries({
+      offset: 0,
+      limit: 1e3,
+      skipOverridesResolution: true,
+      skipPatternResolution: true,
+      skipDataResolution: true
+    });
     emitWithFormat(res.entries, format, filename);
   }
 };
@@ -3223,6 +3228,7 @@ function createEntryEngineDataSource({
       limit: 1e3,
       skipDataResolution: true,
       skipOverridesResolution: true,
+      skipPatternResolution: true,
       state: stateId,
       withComponentIDs: true
     });
@@ -5826,7 +5832,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "19.89.0",
+  version: "19.90.0",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "19.89.0",
+  "version": "19.90.0",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -17,12 +17,12 @@
   },
   "dependencies": {
     "@thi.ng/mime": "^2.2.23",
-    "@uniformdev/assets": "19.89.0",
-    "@uniformdev/canvas": "19.89.0",
-    "@uniformdev/context": "19.89.0",
-    "@uniformdev/files": "19.89.0",
-    "@uniformdev/project-map": "19.89.0",
-    "@uniformdev/redirect": "19.89.0",
+    "@uniformdev/assets": "19.90.0",
+    "@uniformdev/canvas": "19.90.0",
+    "@uniformdev/context": "19.90.0",
+    "@uniformdev/files": "19.90.0",
+    "@uniformdev/project-map": "19.90.0",
+    "@uniformdev/redirect": "19.90.0",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "8.3.6",
@@ -69,5 +69,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "247189fb1039d0f81498949534646baaffb8bca7"
+  "gitHead": "5fcbc2f570abedb01f09730eb986f024429e2422"
 }