@uniformdev/cli 20.7.1-alpha.64 → 20.7.1-alpha.68

package/LICENSE.txt

@@ -1,2 +1,2 @@
-© 2024 Uniform Systems, Inc. All Rights Reserved.
+© 2025 Uniform Systems, Inc. All Rights Reserved.
 See details of Uniform Systems, Inc. Master Subscription Agreement here: https://uniform.dev/eula

package/dist/{chunk-JSQVEK7R.mjs → chunk-WMBIETON.mjs}

@@ -18,6 +18,57 @@ import { mkdirSync, readFileSync, writeFileSync } from "fs";
 import { dump, load } from "js-yaml";
 import { dirname, extname, isAbsolute, resolve, sep } from "path";
 import { fetch as undiciFetch, ProxyAgent } from "undici";
+
+// src/sync/windowsRetry.ts
+var RETRIABLE_ERRORS = [
+  "ECONNRESET",
+  "ECONNREFUSED",
+  "ENOTFOUND",
+  "ETIMEDOUT",
+  "ESOCKETTIMEDOUT",
+  "read ECONNRESET",
+  "write ECONNRESET",
+  "socket hang up",
+  "fetch failed"
+];
+var isWindows = process.platform === "win32";
+var isRetriableError = (error) => {
+  if (!(error instanceof Error)) return false;
+  const errorMessage = error.message.toLowerCase();
+  const errorCode = error.code?.toLowerCase();
+  return RETRIABLE_ERRORS.some(
+    (pattern) => errorMessage.includes(pattern.toLowerCase()) || errorCode?.includes(pattern.toLowerCase())
+  );
+};
+var retryWithBackoff = async (operation, maxRetries = isWindows ? 5 : 3, baseDelay = isWindows ? 2e3 : 1e3, verbose = false) => {
+  let lastError;
+  for (let attempt = 1; attempt <= maxRetries; attempt++) {
+    try {
+      return await operation();
+    } catch (error) {
+      lastError = error;
+      if (!isRetriableError(error) || attempt === maxRetries) {
+        throw error;
+      }
+      const delay = baseDelay * Math.pow(2, attempt - 1) + Math.random() * 1e3;
+      if (verbose) {
+        console.log(
+          `\u{1F504} Retrying operation (attempt ${attempt}/${maxRetries}) after ${Math.round(delay)}ms due to: ${error.message}`
+        );
+      }
+      await new Promise((resolve2) => setTimeout(resolve2, delay));
+    }
+  }
+  throw lastError;
+};
+var createFetchWithRetry = (baseFetch, verbose = false) => {
+  return async (input, init) => {
+    const fetchOperation = () => baseFetch(input, init);
+    return retryWithBackoff(fetchOperation, 5, 2e3, verbose);
+  };
+};
+
+// src/sync/util.ts
 function withConfiguration(yargs) {
   return yargs.option("serialization", {
     skipValidation: true,
@@ -65,7 +116,7 @@ function nodeFetchProxy(proxy, verbose) {
   if (proxy) {
     console.log(`\u{1F991} Using proxy ${proxy}`);
   }
-  const wrappedFetch = (input, init) => {
+  const baseFetch = (input, init) => {
     const handleFetchError = (e) => {
       if (e instanceof Error) {
         e.message = `Error fetching ${input.toString()}
@@ -91,6 +142,7 @@ ${e.message}`;
       handleFetchError
     );
   };
+  const wrappedFetch = createFetchWithRetry(baseFetch, verbose);
   if (verbose) {
     return async function fetchWithVerboseLogging(input, init) {
       const method = init?.method ?? "GET";

package/dist/defaultConfig.mjs

@@ -1,4 +1,4 @@
-import "./chunk-JSQVEK7R.mjs";
+import "./chunk-WMBIETON.mjs";
 
 // src/sync/allSerializableEntitiesConfig.ts
 var allSerializableEntitiesConfig = {

package/dist/index.mjs

@@ -16,7 +16,7 @@ import {
   withFormatOptions,
   withProjectOptions,
   withTeamOptions
-} from "./chunk-JSQVEK7R.mjs";
+} from "./chunk-WMBIETON.mjs";
 
 // src/index.ts
 import * as dotenv from "dotenv";
@@ -312,6 +312,7 @@ async function syncEngine({
   whatIf = false,
   log: log2 = () => {
   },
+  onBeforeProcessObject,
   onBeforeCompareObjects,
   onBeforeWriteObject,
   onError
@@ -357,6 +358,9 @@ async function syncEngine({
   let sourceHasItems = false;
   for await (let sourceObject of source.objects) {
     sourceHasItems = true;
+    if (onBeforeProcessObject) {
+      await onBeforeProcessObject(sourceObject);
+    }
     const ids = Array.isArray(sourceObject.id) ? sourceObject.id : [sourceObject.id];
     const targetObject = targetItems.get(ids[0]);
     status.compared++;
@@ -853,7 +857,7 @@ import {
   walkNodeTree,
   walkPropertyValues
 } from "@uniformdev/canvas";
-var UNIFORM_FILE_MATCH = /"(https:\/\/([^"]*?)?(img|files)\.uniform\.(rocks|global)\/([^"]*?))"/g;
+var UNIFORM_FILE_MATCH = /"(https:\/\/([^"]*?)?(img|files)\.(eu\.)?uniform\.(rocks|global)\/([^"]*?))"/g;
 var walkFileUrlsForCompositionOrEntry = ({
   entity,
   callback
@@ -2603,128 +2607,131 @@ var ComponentPatternPublishModule = {
 };
 
 // src/commands/canvas/commands/composition/pull.ts
-var CompositionPullModule = {
-  command: "pull <directory>",
-  describe: "Pulls all compositions to local files in a directory",
-  builder: (yargs35) => withConfiguration(
-    withApiOptions(
-      withProjectOptions(
-        withStateOptions(
-          withDebugOptions(
-            withDiffOptions(
-              yargs35.positional("directory", {
-                describe: "Directory to save the component definitions to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
-                type: "string"
-              }).option("format", {
-                alias: ["f"],
-                describe: "Output format",
-                default: "yaml",
-                choices: ["yaml", "json"],
-                type: "string"
-              }).option("onlyCompositions", {
-                describe: "Only pulling compositions and not patterns",
-                default: false,
-                type: "boolean"
-              }).option("onlyPatterns", {
-                describe: "Only pulling patterns and not compositions",
-                default: false,
-                type: "boolean",
-                hidden: true
-              }).option("mode", {
-                alias: ["m"],
-                describe: 'What kind of changes can be made. "create" = create new files, update nothing. "createOrUpdate" = create new files, update existing, delete nothing. "mirror" = create, update, and delete to mirror state',
-                choices: ["create", "createOrUpdate", "mirror"],
-                default: "mirror",
-                type: "string"
-              })
+var CompositionPullModule = componentInstancePullModuleFactory("compositions");
+function componentInstancePullModuleFactory(type) {
+  return {
+    command: "pull <directory>",
+    describe: "Pulls all compositions to local files in a directory",
+    builder: (yargs35) => withConfiguration(
+      withApiOptions(
+        withProjectOptions(
+          withStateOptions(
+            withDebugOptions(
+              withDiffOptions(
+                yargs35.positional("directory", {
+                  describe: "Directory to save the component definitions to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
+                  type: "string"
+                }).option("format", {
+                  alias: ["f"],
+                  describe: "Output format",
+                  default: "yaml",
+                  choices: ["yaml", "json"],
+                  type: "string"
+                }).option("onlyCompositions", {
+                  describe: "Only pulling compositions and not patterns",
+                  default: false,
+                  type: "boolean"
+                }).option("onlyPatterns", {
+                  describe: "Only pulling patterns and not compositions",
+                  default: false,
+                  type: "boolean",
+                  hidden: true
+                }).option("mode", {
+                  alias: ["m"],
+                  describe: 'What kind of changes can be made. "create" = create new files, update nothing. "createOrUpdate" = create new files, update existing, delete nothing. "mirror" = create, update, and delete to mirror state',
+                  choices: ["create", "createOrUpdate", "mirror"],
+                  default: "mirror",
+                  type: "string"
+                })
+              )
             )
           )
         )
       )
-    )
-  ),
-  handler: async ({
-    apiHost,
-    apiKey,
-    proxy,
-    directory,
-    format,
-    onlyCompositions,
-    onlyPatterns,
-    patternType = "all",
-    mode,
-    whatIf,
-    state,
-    project: projectId,
-    diff: diffMode,
-    allowEmptySource,
-    verbose
-  }) => {
-    const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    const source = createComponentInstanceEngineDataSource({
-      client,
-      state,
+    ),
+    handler: async ({
+      apiHost,
+      apiKey,
+      proxy,
+      directory,
+      format,
       onlyCompositions,
       onlyPatterns,
-      patternType,
+      patternType = "all",
+      mode,
+      whatIf,
+      state,
+      project: projectId,
+      diff: diffMode,
+      allowEmptySource,
       verbose
-    });
-    const isPackage = isPathAPackageFile(directory);
-    let target;
-    if (isPackage) {
-      const packageContents = readCanvasPackage(directory, false, verbose);
-      target = await createArraySyncEngineDataSource({
-        name: `Package file ${directory}`,
-        objects: packageContents?.compositions ?? [],
-        selectIdentifier: selectIdentifier3,
-        selectDisplayName: selectDisplayName3,
-        onSyncComplete: async (_, synced) => {
-          packageContents.compositions = synced;
-          writeCanvasPackage(directory, packageContents);
-        }
-      });
-    } else {
-      target = await createFileSyncEngineDataSource({
-        directory,
-        selectIdentifier: selectIdentifier3,
-        selectDisplayName: selectDisplayName3,
-        format,
+    }) => {
+      const fetch2 = nodeFetchProxy(proxy, verbose);
+      const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
+      const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
+      const source = createComponentInstanceEngineDataSource({
+        client,
+        state,
+        onlyCompositions,
+        onlyPatterns,
+        patternType,
         verbose
       });
-    }
-    await syncEngine({
-      source,
-      target,
-      mode,
-      whatIf,
-      allowEmptySource: allowEmptySource ?? true,
-      log: createSyncEngineConsoleLogger({ diffMode }),
-      onBeforeCompareObjects: async (sourceObject, targetObject) => {
-        return replaceRemoteUrlsWithLocalReferences({
-          sourceEntity: sourceObject,
-          targetEntity: targetObject,
-          directory,
-          fileClient
+      const isPackage = isPathAPackageFile(directory);
+      let target;
+      if (isPackage) {
+        const packageContents = readCanvasPackage(directory, false, verbose);
+        target = await createArraySyncEngineDataSource({
+          name: `Package file ${directory}`,
+          objects: packageContents?.[type] ?? [],
+          selectIdentifier: selectIdentifier3,
+          selectDisplayName: selectDisplayName3,
+          onSyncComplete: async (_, synced) => {
+            packageContents[type] = synced;
+            writeCanvasPackage(directory, packageContents);
+          }
         });
-      },
-      compareContents: compareCompositionsOrEntriesWithoutAssetUrls,
-      onBeforeWriteObject: async (sourceObject) => {
-        await downloadFilesForCompositionOrEntry({
-          entity: sourceObject.object,
+      } else {
+        target = await createFileSyncEngineDataSource({
           directory,
-          fileClient
+          selectIdentifier: selectIdentifier3,
+          selectDisplayName: selectDisplayName3,
+          format,
+          verbose
         });
-        return sourceObject;
       }
-    });
-  }
-};
+      await syncEngine({
+        source,
+        target,
+        mode,
+        whatIf,
+        allowEmptySource: allowEmptySource ?? true,
+        log: createSyncEngineConsoleLogger({ diffMode }),
+        onBeforeCompareObjects: async (sourceObject, targetObject) => {
+          return replaceRemoteUrlsWithLocalReferences({
+            sourceEntity: sourceObject,
+            targetEntity: targetObject,
+            directory,
+            fileClient
+          });
+        },
+        compareContents: compareCompositionsOrEntriesWithoutAssetUrls,
+        onBeforeWriteObject: async (sourceObject) => {
+          await downloadFilesForCompositionOrEntry({
+            entity: sourceObject.object,
+            directory,
+            fileClient
+          });
+          return sourceObject;
+        }
+      });
+    }
+  };
+}
 
 // src/commands/canvas/commands/componentPattern/pull.ts
 var ComponentPatternPullModule = {
-  ...CompositionPullModule,
+  ...componentInstancePullModuleFactory("componentPatterns"),
   describe: "Pulls all component patterns to local files in a directory",
   builder: (yargs35) => withConfiguration(
     withApiOptions(
@@ -2748,6 +2755,7 @@ var ComponentPatternPullModule = {
                 type: "boolean",
                 hidden: true
               }).option("patternType", {
+                // This default differentiate this list command from composition list command
                 default: "component",
                 choices: ["all", "component", "composition"],
                 hidden: true
@@ -2771,115 +2779,159 @@ var ComponentPatternPullModule = {
   )
 };
 
+// src/commands/canvas/util/localeValidation.ts
+import { LocaleClient } from "@uniformdev/canvas";
+async function fetchUniformLocales(options) {
+  const client = new LocaleClient({
+    ...options,
+    bypassCache: true,
+    limitPolicy: cliLimitPolicy
+  });
+  const locales = (await client.get()).results;
+  return new Set(locales.map((locale) => locale.locale));
+}
+function validateEntityLocales(entity, uniformLocales, entityName) {
+  if (!entity._locales || entity._locales.length === 0) {
+    return;
+  }
+  const invalidLocales = entity._locales.filter((locale) => !uniformLocales.has(locale));
+  if (invalidLocales.length > 0) {
+    console.warn(
+      `\u26A0\uFE0F ${entityName} enables locale${invalidLocales.length > 1 ? "s" : ""} ${invalidLocales.join(", ")} that are not registered in your Uniform project. This may cause unexpected behavior.`
+    );
+  }
+}
+function createLocaleValidationHook(uniformLocales) {
+  return async (entity) => {
+    validateEntityLocales(entity, uniformLocales, entity.displayName);
+  };
+}
+
 // src/commands/canvas/commands/composition/push.ts
-var CompositionPushModule = {
-  command: "push <directory>",
-  describe: "Pushes all compositions from files in a directory to Uniform Canvas",
-  builder: (yargs35) => withConfiguration(
-    withApiOptions(
-      withProjectOptions(
-        withStateOptions(
-          withDebugOptions(
-            withDiffOptions(
-              yargs35.positional("directory", {
-                describe: "Directory to read the compositions/patterns from. If a filename is used, a package will be read instead.",
-                type: "string"
-              }).option("mode", {
-                alias: ["m"],
-                describe: 'What kind of changes can be made. "create" = create new, update nothing. "createOrUpdate" = create new, update existing, delete nothing. "mirror" = create, update, and delete',
-                choices: ["create", "createOrUpdate", "mirror"],
-                default: "mirror",
-                type: "string"
-              }).option("onlyCompositions", {
-                describe: "Only pulling compositions and not patterns",
-                default: false,
-                type: "boolean"
-              }).option("onlyPatterns", {
-                describe: "Only pulling patterns and not compositions",
-                default: false,
-                type: "boolean",
-                hidden: true
-              })
+var CompositionPushModule = componentInstancePushModuleFactory("compositions");
+function componentInstancePushModuleFactory(type) {
+  return {
+    command: "push <directory>",
+    describe: "Pushes all compositions from files in a directory to Uniform Canvas",
+    builder: (yargs35) => withConfiguration(
+      withApiOptions(
+        withProjectOptions(
+          withStateOptions(
+            withDebugOptions(
+              withDiffOptions(
+                yargs35.positional("directory", {
+                  describe: "Directory to read the compositions/patterns from. If a filename is used, a package will be read instead.",
+                  type: "string"
+                }).option("mode", {
+                  alias: ["m"],
+                  describe: 'What kind of changes can be made. "create" = create new, update nothing. "createOrUpdate" = create new, update existing, delete nothing. "mirror" = create, update, and delete',
+                  choices: ["create", "createOrUpdate", "mirror"],
+                  default: "mirror",
+                  type: "string"
+                }).option("onlyCompositions", {
+                  describe: "Only pulling compositions and not patterns",
+                  default: false,
+                  type: "boolean"
+                }).option("onlyPatterns", {
+                  // backwards compatibility
+                  default: false,
+                  type: "boolean",
+                  hidden: true
+                })
+              )
             )
           )
         )
       )
-    )
-  ),
-  handler: async ({
-    apiHost,
-    apiKey,
-    proxy,
-    directory,
-    mode,
-    whatIf,
-    state,
-    project: projectId,
-    onlyCompositions,
-    onlyPatterns,
-    patternType,
-    diff: diffMode,
-    allowEmptySource,
-    verbose
-  }) => {
-    const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    let source;
-    const isPackage = isPathAPackageFile(directory);
-    if (isPackage) {
-      const packageContents = readCanvasPackage(directory, true, verbose);
-      source = await createArraySyncEngineDataSource({
-        name: `Package file ${directory}`,
-        objects: packageContents.compositions ?? [],
-        selectIdentifier: selectIdentifier3,
-        selectDisplayName: selectDisplayName3
-      });
-    } else {
-      source = await createFileSyncEngineDataSource({
-        directory,
-        selectIdentifier: selectIdentifier3,
-        selectDisplayName: selectDisplayName3,
-        verbose
-      });
-    }
-    const target = createComponentInstanceEngineDataSource({
-      client,
+    ),
+    handler: async ({
+      apiHost,
+      apiKey,
+      proxy,
+      directory,
+      mode,
+      whatIf,
       state,
+      project: projectId,
       onlyCompositions,
       onlyPatterns,
       patternType,
-      verbose
-    });
-    const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    await syncEngine({
-      source,
-      target,
-      mode,
-      whatIf,
-      verbose,
+      diff: diffMode,
       allowEmptySource,
-      log: createSyncEngineConsoleLogger({ diffMode }),
-      onBeforeCompareObjects: async (sourceObject) => {
-        return replaceLocalUrlsWithRemoteReferences({
-          entity: sourceObject,
-          fileClient
+      verbose
+    }) => {
+      const fetch2 = nodeFetchProxy(proxy, verbose);
+      const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
+      let source;
+      const isPackage = isPathAPackageFile(directory);
+      if (isPackage) {
+        const packageContents = readCanvasPackage(directory, true, verbose);
+        source = await createArraySyncEngineDataSource({
+          name: `Package file ${directory}`,
+          objects: packageContents[type] ?? [],
+          selectIdentifier: selectIdentifier3,
+          selectDisplayName: selectDisplayName3
         });
-      },
-      compareContents: compareCompositionsOrEntriesWithoutAssetUrls,
-      onBeforeWriteObject: async (sourceObject) => {
-        return uploadFilesForCompositionOrEntry({
-          entity: sourceObject,
+      } else {
+        source = await createFileSyncEngineDataSource({
           directory,
-          fileClient
+          selectIdentifier: selectIdentifier3,
+          selectDisplayName: selectDisplayName3,
+          verbose
         });
       }
-    });
-  }
-};
+      const target = createComponentInstanceEngineDataSource({
+        client,
+        state,
+        onlyCompositions,
+        onlyPatterns,
+        patternType,
+        verbose
+      });
+      const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
+      const uniformLocales = await fetchUniformLocales({
+        apiKey,
+        apiHost,
+        fetch: fetch2,
+        projectId
+      });
+      const localeValidationHook = createLocaleValidationHook(uniformLocales);
+      await syncEngine({
+        source,
+        target,
+        mode,
+        whatIf,
+        verbose,
+        allowEmptySource,
+        log: createSyncEngineConsoleLogger({ diffMode }),
+        onBeforeProcessObject: async (sourceObject) => {
+          await localeValidationHook({
+            _locales: sourceObject.object.composition._locales,
+            displayName: sourceObject.displayName ?? sourceObject.providerId
+          });
+        },
+        onBeforeCompareObjects: async (sourceObject) => {
+          return replaceLocalUrlsWithRemoteReferences({
+            entity: sourceObject,
+            fileClient
+          });
+        },
+        compareContents: compareCompositionsOrEntriesWithoutAssetUrls,
+        onBeforeWriteObject: async (sourceObject) => {
+          return uploadFilesForCompositionOrEntry({
+            entity: sourceObject,
+            directory,
+            fileClient
+          });
+        }
+      });
+    }
+  };
+}
 
 // src/commands/canvas/commands/componentPattern/push.ts
 var ComponentPatternPushModule = {
-  ...CompositionPushModule,
+  ...componentInstancePushModuleFactory("componentPatterns"),
   describe: "Pushes all component patterns from files in a directory to Uniform Canvas",
   builder: (yargs35) => withConfiguration(
     withApiOptions(
@@ -2903,6 +2955,7 @@ var ComponentPatternPushModule = {
                 type: "boolean",
                 hidden: true
               }).option("patternType", {
+                // This default differentiate this list command from composition list command
                 default: "component",
                 choices: ["all", "component", "composition"],
                 hidden: true
@@ -3263,7 +3316,7 @@ var CompositionPatternPublishModule = {
 
 // src/commands/canvas/commands/compositionPattern/pull.ts
 var CompositionPatternPullModule = {
-  ...CompositionPullModule,
+  ...componentInstancePullModuleFactory("compositionPatterns"),
   describe: "Pulls all composition patterns to local files in a directory",
   builder: (yargs35) => withConfiguration(
     withApiOptions(
@@ -3307,7 +3360,7 @@ var CompositionPatternPullModule = {
 
 // src/commands/canvas/commands/compositionPattern/push.ts
 var CompositionPatternPushModule = {
-  ...CompositionPushModule,
+  ...componentInstancePushModuleFactory("compositionPatterns"),
   describe: "Pushes all composition patterns from files in a directory to Uniform Canvas",
   builder: (yargs35) => withConfiguration(
     withApiOptions(
@@ -3331,6 +3384,7 @@ var CompositionPatternPushModule = {
                 type: "boolean",
                 hidden: true
               }).option("patternType", {
+                // This default differentiate this list command from composition list command
                 default: "composition",
                 choices: ["all", "component", "composition"],
                 hidden: true
@@ -4142,6 +4196,11 @@ var EntryGetModule = {
                   type: "number",
                   default: 1,
                   describe: "Controls how many levels deep content references should be resolved"
+                },
+                withComponentIDs: {
+                  type: "boolean",
+                  default: false,
+                  describe: "Include IDs of blocks in block fields"
                 }
               }),
               // for backwards compatibility, we default to the "published" state, unlike compositions
@@ -4165,6 +4224,7 @@ var EntryGetModule = {
     resolveData,
     diagnostics,
     resolutionDepth,
+    withComponentIDs,
     verbose
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
@@ -4178,7 +4238,8 @@ var EntryGetModule = {
       skipPatternResolution: true,
       skipDataResolution: !resolveData,
       diagnostics: resolveData ? diagnostics : void 0,
-      resolutionDepth: resolveData ? resolutionDepth : void 0
+      resolutionDepth: resolveData ? resolutionDepth : void 0,
+      withComponentIDs
     });
     if (res.entries.length !== 1) {
       throw new Error(`Entry with ID ${id} not found`);
@@ -4205,7 +4266,12 @@ var EntryListModule = {
                   type: "number",
                   default: LEGACY_DEFAULT_LIMIT
                 },
-                search: { describe: "Search query", type: "string", default: "" }
+                search: { describe: "Search query", type: "string", default: "" },
+                withComponentIDs: {
+                  type: "boolean",
+                  default: false,
+                  describe: "Include IDs of blocks in block fields"
+                }
               }),
               // for backwards compatibility, we default to the "published" state, unlike compositions
               "published"
@@ -4227,6 +4293,7 @@ var EntryListModule = {
     limit: limit2,
     offset,
     search,
+    withComponentIDs,
     verbose
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
@@ -4239,7 +4306,8 @@ var EntryListModule = {
       state: convertStateOption(state),
       skipOverridesResolution: true,
       skipPatternResolution: true,
-      skipDataResolution: true
+      skipDataResolution: true,
+      withComponentIDs
     });
     emitWithFormat(res.entries, format, filename);
   }
@@ -4574,6 +4642,13 @@ var EntryPushModule = {
     }
     const target = createEntryEngineDataSource({ client, state, onlyEntries: true });
     const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const uniformLocales = await fetchUniformLocales({
+      apiKey,
+      apiHost,
+      fetch: fetch2,
+      projectId
+    });
+    const localeValidationHook = createLocaleValidationHook(uniformLocales);
     await syncEngine({
       source,
       target,
@@ -4581,6 +4656,12 @@ var EntryPushModule = {
       whatIf,
       allowEmptySource,
       log: createSyncEngineConsoleLogger({ diffMode }),
+      onBeforeProcessObject: async (sourceObject) => {
+        await localeValidationHook({
+          _locales: sourceObject.object.entry._locales,
+          displayName: sourceObject.displayName ?? sourceObject.providerId
+        });
+      },
       onBeforeCompareObjects: async (sourceObject) => {
         return replaceLocalUrlsWithRemoteReferences({
           entity: sourceObject,
@@ -4763,6 +4844,12 @@ var EntryPatternGetModule = {
               yargs35.positional("id", {
                 demandOption: true,
                 describe: "Entry pattern public ID to fetch"
+              }).option({
+                withComponentIDs: {
+                  type: "boolean",
+                  default: false,
+                  describe: "Include IDs of blocks in block fields"
+                }
               }),
               "published"
             )
@@ -4771,7 +4858,18 @@ var EntryPatternGetModule = {
       )
     )
   ),
-  handler: async ({ apiHost, apiKey, proxy, id, format, filename, project: projectId, state, verbose }) => {
+  handler: async ({
+    apiHost,
+    apiKey,
+    proxy,
+    id,
+    format,
+    filename,
+    project: projectId,
+    state,
+    withComponentIDs,
+    verbose
+  }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getContentClient({ apiKey, apiHost, fetch: fetch2, projectId });
     const res = await client.getEntries({
@@ -4782,7 +4880,8 @@ var EntryPatternGetModule = {
       skipOverridesResolution: true,
       skipPatternResolution: true,
       skipDataResolution: true,
-      pattern: true
+      pattern: true,
+      withComponentIDs
     });
     if (res.entries.length !== 1) {
       throw new Error(`Entry pattern with ID ${id} not found`);
@@ -4797,7 +4896,22 @@ var EntryPatternListModule = {
   describe: "List entry patterns",
   builder: (yargs35) => withConfiguration(
     withDebugOptions(
-      withFormatOptions(withApiOptions(withProjectOptions(withStateOptions(yargs35, "published"))))
+      withFormatOptions(
+        withApiOptions(
+          withProjectOptions(
+            withStateOptions(
+              yargs35.option({
+                withComponentIDs: {
+                  type: "boolean",
+                  default: false,
+                  describe: "Include IDs of blocks in block fields"
+                }
+              }),
+              "published"
+            )
+          )
+        )
+      )
     )
   ),
   handler: async ({
@@ -4809,6 +4923,7 @@ var EntryPatternListModule = {
     filename,
     project: projectId,
     state,
+    withComponentIDs,
     verbose
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
@@ -4820,7 +4935,8 @@ var EntryPatternListModule = {
       skipOverridesResolution: true,
       skipPatternResolution: true,
       skipDataResolution: true,
-      pattern: true
+      pattern: true,
+      withComponentIDs
     });
     emitWithFormat(res.entries, format, filename);
   }
@@ -4967,11 +5083,11 @@ var EntryPatternPullModule = {
       const packageContents = readCanvasPackage(directory, false, verbose);
       target = await createArraySyncEngineDataSource({
         name: `Package file ${directory}`,
-        objects: packageContents.entries ?? [],
+        objects: packageContents.entryPatterns ?? [],
         selectIdentifier: selectEntryIdentifier,
         selectDisplayName: selectEntryDisplayName,
         onSyncComplete: async (_, synced) => {
-          packageContents.entries = synced;
+          packageContents.entryPatterns = synced;
           writeCanvasPackage(directory, packageContents);
         }
       });
@@ -5069,7 +5185,7 @@ var EntryPatternPushModule = {
       const packageContents = readCanvasPackage(directory, true, verbose);
       source = await createArraySyncEngineDataSource({
         name: `Package file ${directory}`,
-        objects: packageContents.entries ?? [],
+        objects: packageContents.entryPatterns ?? [],
         selectIdentifier: selectEntryIdentifier,
         selectDisplayName: selectEntryDisplayName
       });
@@ -5083,6 +5199,13 @@ var EntryPatternPushModule = {
     }
     const target = createEntryEngineDataSource({ client, state, onlyPatterns: true });
     const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const uniformLocales = await fetchUniformLocales({
+      apiKey,
+      apiHost,
+      fetch: fetch2,
+      projectId
+    });
+    const localeValidationHook = createLocaleValidationHook(uniformLocales);
     await syncEngine({
       source,
       target,
@@ -5090,6 +5213,12 @@ var EntryPatternPushModule = {
       whatIf,
       allowEmptySource,
       log: createSyncEngineConsoleLogger({ diffMode }),
+      onBeforeProcessObject: async (sourceObject) => {
+        await localeValidationHook({
+          _locales: sourceObject.object.entry._locales,
+          displayName: sourceObject.displayName ?? sourceObject.providerId
+        });
+      },
       onBeforeCompareObjects: async (sourceObject) => {
         return replaceLocalUrlsWithRemoteReferences({
           entity: sourceObject,
@@ -5294,9 +5423,9 @@ function createLocaleEngineDataSource({
 }
 
 // src/commands/canvas/commands/locale/_util.ts
-import { LocaleClient } from "@uniformdev/canvas";
+import { LocaleClient as LocaleClient2 } from "@uniformdev/canvas";
 function getLocaleClient(options) {
-  return new LocaleClient({ ...options, bypassCache: true, limitPolicy: cliLimitPolicy });
+  return new LocaleClient2({ ...options, bypassCache: true, limitPolicy: cliLimitPolicy });
 }
 
 // src/commands/canvas/commands/locale/pull.ts
@@ -8223,16 +8352,29 @@ var IntegrationEdgehancerDeployModule = {
           yargs35.positional("filename", {
             demandOption: true,
             describe: "ESM code file to run for the target edgehancer hook. Refer to the documentation for expected types."
+          }).option("compatibilityDate", {
+            type: "string",
+            describe: "Date indicating targeted support in the custom edgehancer runtime. Backwards incompatible fixes to the runtime following this date will not affect this custom edgehancer. Format: YYYY-MM-DD. You can check here for more information: https://developers.cloudflare.com/workers/configuration/compatibility-dates/#setting-compatibility-date"
           })
         )
       )
     )
   ),
-  handler: async ({ apiHost, apiKey, proxy, filename, team: teamId, archetype, connectorType, hook }) => {
+  handler: async ({
+    apiHost,
+    apiKey,
+    proxy,
+    filename,
+    team: teamId,
+    archetype,
+    connectorType,
+    hook,
+    compatibilityDate
+  }) => {
     const fetch2 = nodeFetchProxy(proxy);
     const client = new EdgehancerClient({ apiKey, apiHost, fetch: fetch2, teamId });
     const code = readFileSync(filename, "utf8");
-    await client.deploy({ archetype, code, connectorType, hook });
+    await client.deploy({ archetype, code, connectorType, hook, compatibilityDate });
   }
 };
 
@@ -8455,7 +8597,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "20.18.0",
+  version: "20.26.2",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -9198,8 +9340,9 @@ async function newHandler({
       }
     }
   };
+  let githubBranch = void 0;
   const {
-    starter: { githubUri, serverUrl, previewPath, installEnv, githubBranch }
+    starter: { githubUri, serverUrl, previewPath, installEnv }
   } = await inquirer4.prompt([
     {
       type: "list",
@@ -9208,7 +9351,13 @@ async function newHandler({
       choices: Object.values(starters[frontendFramework])
     }
   ]);
-  telemetry.send("starter picked", { githubUri });
+  if (process.env.UNIFORM_ALTERNATIVE_STARTER_BRANCH) {
+    console.log(
+      `Using alternative starter branch for repo ${githubUri}: "${process.env.UNIFORM_ALTERNATIVE_STARTER_BRANCH}"`
+    );
+    githubBranch = process.env.UNIFORM_ALTERNATIVE_STARTER_BRANCH;
+  }
+  telemetry.send("starter picked", { githubUri, githubBranch });
   const { projectId, targetDir } = await getOrCreateProject({
     client: uniformClient,
     createNew: true,
@@ -9316,10 +9465,15 @@ async function newMeshIntegrationHandler({
   ]);
   const name = answer.name;
   const { targetDir, typeSlug } = validateIntegrationName(answer.name, outputPath);
+  const githubBranch = process.env.UNIFORM_ALTERNATIVE_MESH_INTEGRATION_BRANCH;
+  if (githubBranch) {
+    console.log(`Using alternative mesh integration branch: "${githubBranch}"`);
+  }
   const { runNpmInstall } = await cloneStarter({
     githubPath: `uniformdev/examples/mesh/mesh-integration`,
     spin,
-    targetDir
+    targetDir,
+    githubBranch
   });
   let done = await spin("Registering integration to team...");
   const pathToManifest = path3.resolve(targetDir, "mesh-manifest.json");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "20.7.1-alpha.64+f7cc1427ba",
+  "version": "20.7.1-alpha.68+2b49fd0201",
   "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.7.1-alpha.64+f7cc1427ba",
-    "@uniformdev/canvas": "20.7.1-alpha.64+f7cc1427ba",
-    "@uniformdev/context": "20.7.1-alpha.64+f7cc1427ba",
-    "@uniformdev/files": "20.7.1-alpha.64+f7cc1427ba",
-    "@uniformdev/project-map": "20.7.1-alpha.64+f7cc1427ba",
-    "@uniformdev/redirect": "20.7.1-alpha.64+f7cc1427ba",
-    "@uniformdev/richtext": "20.7.1-alpha.64+f7cc1427ba",
+    "@uniformdev/assets": "20.7.1-alpha.68+2b49fd0201",
+    "@uniformdev/canvas": "20.7.1-alpha.68+2b49fd0201",
+    "@uniformdev/context": "20.7.1-alpha.68+2b49fd0201",
+    "@uniformdev/files": "20.7.1-alpha.68+2b49fd0201",
+    "@uniformdev/project-map": "20.7.1-alpha.68+2b49fd0201",
+    "@uniformdev/redirect": "20.7.1-alpha.68+2b49fd0201",
+    "@uniformdev/richtext": "20.7.1-alpha.68+2b49fd0201",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "9.0.0",
@@ -79,5 +79,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f7cc1427baf124f1026f76f33d741f93698be261"
+  "gitHead": "2b49fd0201aa5f68431464b7dad5a99bdb19d513"
 }