@uniformdev/cli 20.26.1-alpha.0 → 20.26.2

package/dist/index.mjs

@@ -857,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
@@ -4196,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
@@ -4219,6 +4224,7 @@ var EntryGetModule = {
     resolveData,
     diagnostics,
     resolutionDepth,
+    withComponentIDs,
     verbose
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
@@ -4232,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`);
@@ -4259,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"
@@ -4281,6 +4293,7 @@ var EntryListModule = {
     limit: limit2,
     offset,
     search,
+    withComponentIDs,
     verbose
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
@@ -4293,7 +4306,8 @@ var EntryListModule = {
       state: convertStateOption(state),
       skipOverridesResolution: true,
       skipPatternResolution: true,
-      skipDataResolution: true
+      skipDataResolution: true,
+      withComponentIDs
     });
     emitWithFormat(res.entries, format, filename);
   }
@@ -4830,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"
             )
@@ -4838,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({
@@ -4849,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`);
@@ -4864,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 ({
@@ -4876,6 +4923,7 @@ var EntryPatternListModule = {
     filename,
     project: projectId,
     state,
+    withComponentIDs,
     verbose
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
@@ -4887,7 +4935,8 @@ var EntryPatternListModule = {
       skipOverridesResolution: true,
       skipPatternResolution: true,
       skipDataResolution: true,
-      pattern: true
+      pattern: true,
+      withComponentIDs
     });
     emitWithFormat(res.entries, format, filename);
   }
@@ -8548,7 +8597,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "20.26.0",
+  version: "20.26.2",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -9291,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",
@@ -9301,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,
@@ -9409,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.26.1-alpha.0+ff834f63d0",
+  "version": "20.26.2",
   "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.1-alpha.0+ff834f63d0",
-    "@uniformdev/canvas": "20.26.1-alpha.0+ff834f63d0",
-    "@uniformdev/context": "20.26.1-alpha.0+ff834f63d0",
-    "@uniformdev/files": "20.26.1-alpha.0+ff834f63d0",
-    "@uniformdev/project-map": "20.26.1-alpha.0+ff834f63d0",
-    "@uniformdev/redirect": "20.26.1-alpha.0+ff834f63d0",
-    "@uniformdev/richtext": "20.26.1-alpha.0+ff834f63d0",
+    "@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",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "9.0.0",
@@ -79,5 +79,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ff834f63d07f7f709e42f69705b93ae20f6b7ddf"
+  "gitHead": "e9f8f8081d816af23d625d40d1a0557979b85feb"
 }