@superblocksteam/cli 2.0.6-next.0 → 2.0.6-next.10

package/README.md

@@ -14,7 +14,7 @@ $ npm install -g @superblocksteam/cli
 $ superblocks COMMAND
 running command...
 $ superblocks (--version)
-@superblocksteam/cli/2.0.6-next.0 linux-x64 node-v20.19.0
+@superblocksteam/cli/2.0.6-next.10 linux-x64 node-v20.19.0
 $ superblocks --help [COMMAND]
 USAGE
   $ superblocks COMMAND

package/dist/index.js

@@ -124235,7 +124235,7 @@ var require_methodTracing = __commonJS({
       return descriptor;
     }
     exports2.traceMethod = traceMethod;
-    function traceFunction({ name: name18, tracer: tracer2, fn, parent }) {
+    function traceFunction2({ name: name18, tracer: tracer2, fn, parent }) {
       const parentSpan = parent ?? api_1.trace.getActiveSpan();
       const ctx = parentSpan ? api_1.trace.setSpan(api_1.context.active(), parentSpan) : api_1.context.active();
       return api_1.context.with(ctx, () => tracer2.startActiveSpan(name18, {}, async (span) => {
@@ -124260,7 +124260,7 @@ var require_methodTracing = __commonJS({
         }
       }));
     }
-    exports2.traceFunction = traceFunction;
+    exports2.traceFunction = traceFunction2;
     function executeTraced(name18, tracer2, fn, parent) {
       const parentSpan = parent ?? api_1.trace.getActiveSpan();
       if (parentSpan) {
@@ -418528,7 +418528,7 @@ var import_util28 = __toESM(require_dist3(), 1);
 // ../sdk/package.json
 var package_default = {
   name: "@superblocksteam/sdk",
-  version: "2.0.6-next.0",
+  version: "2.0.6-next.10",
   type: "module",
   description: "Superblocks JS SDK",
   homepage: "https://www.superblocks.com",
@@ -418570,8 +418570,8 @@ var package_default = {
     "@rollup/wasm-node": "^4.35.0",
     "@superblocksteam/bucketeer-sdk": "0.5.0",
     "@superblocksteam/shared": "0.9160.0",
-    "@superblocksteam/util": "2.0.6-next.0",
-    "@superblocksteam/vite-plugin-file-sync": "2.0.6-next.0",
+    "@superblocksteam/util": "2.0.6-next.10",
+    "@superblocksteam/vite-plugin-file-sync": "2.0.6-next.10",
     "@vitejs/plugin-react": "^4.3.4",
     axios: "^1.4.0",
     chokidar: "^4.0.3",
@@ -425375,6 +425375,7 @@ function relativeToCurrentDir(applicationConfigPath) {
 
 // ../sdk/dist/cli-replacement/automatic-upgrades.js
 init_cjs_shims();
+var import_shared40 = __toESM(require_dist2(), 1);
 import * as child_process from "node:child_process";
 import { promisify } from "node:util";
 import { isNativeError } from "node:util/types";
@@ -425824,61 +425825,121 @@ async function getCurrentLibraryVersionWithoutPM() {
   return await getCurrentLibraryVersion(pm);
 }
 async function checkVersionsAndUpgrade(lockService, config2) {
-  const pm = await detect({
-    strategies: [
-      "packageManager-field",
-      "lockfile",
-      "install-metadata",
-      "devEngines-field"
-    ],
-    cwd: process.cwd()
+  const cliUpdated = false;
+  const libraryUpdated = false;
+  let hasFailedToUpgrade = false;
+  await (0, import_shared40.traceFunction)({
+    name: "checkVersionsAndUpgrade",
+    tracer: dev_tracer_default,
+    fn: async () => {
+      const pm = await (0, import_shared40.traceFunction)({
+        name: "detectPackageManager",
+        tracer: dev_tracer_default,
+        fn: async () => {
+          return await detect({
+            strategies: [
+              "packageManager-field",
+              "lockfile",
+              "install-metadata",
+              "devEngines-field"
+            ],
+            cwd: process.cwd()
+          });
+        }
+      });
+      if (!pm || !config2?.id)
+        return;
+      const currentCliVersion = await (0, import_shared40.traceFunction)({
+        name: "getCurrentCliVersion",
+        tracer: dev_tracer_default,
+        fn: async () => {
+          return await getCurrentCliVersion();
+        }
+      });
+      const currentLibraryInfo = await (0, import_shared40.traceFunction)({
+        name: "getCurrentLibraryVersion",
+        tracer: dev_tracer_default,
+        fn: async () => {
+          return await getCurrentLibraryVersion(pm);
+        }
+      });
+      if (!currentCliVersion || !(0, import_valid.default)(currentCliVersion) || currentCliVersion.startsWith("file:") || currentCliVersion.startsWith("link:") || !currentLibraryInfo || !(0, import_valid.default)(currentLibraryInfo.version) || currentLibraryInfo.version.startsWith("file:") || currentLibraryInfo.version.startsWith("link:")) {
+        return;
+      }
+      const targetVersions = await (0, import_shared40.traceFunction)({
+        name: "getRemoteVersions",
+        tracer: dev_tracer_default,
+        fn: async () => {
+          return await getRemoteVersions(config2);
+        }
+      });
+      if (!targetVersions)
+        return;
+      let cliNeedsUpgrade;
+      let libraryNeedsUpgrade;
+      try {
+        cliNeedsUpgrade = targetVersions.cli && (0, import_gt.default)(targetVersions.cli, currentCliVersion);
+        libraryNeedsUpgrade = targetVersions.library && (0, import_gt.default)(targetVersions.library, currentLibraryInfo.version);
+      } catch (error) {
+        console.warn("Error checking versions to upgrade, releasing lock and exiting", error);
+        await (0, import_shared40.traceFunction)({
+          name: "shutdownLockService",
+          tracer: dev_tracer_default,
+          fn: async () => {
+            await lockService.shutdown({
+              serverInitiated: false
+            });
+          }
+        });
+        hasFailedToUpgrade = true;
+        return;
+      }
+      if (!cliNeedsUpgrade && !libraryNeedsUpgrade) {
+        return;
+      }
+      let cliUpdated2 = false;
+      let libraryUpdated2 = false;
+      if (cliNeedsUpgrade) {
+        const oclifUpgradeSucceeded = await (0, import_shared40.traceFunction)({
+          name: "upgradeCliWithOclif",
+          tracer: dev_tracer_default,
+          fn: async () => {
+            return await upgradeCliWithOclif(targetVersions.cli);
+          }
+        });
+        if (!oclifUpgradeSucceeded) {
+          await (0, import_shared40.traceFunction)({
+            name: "upgradePackageWithPackageManager",
+            tracer: dev_tracer_default,
+            fn: async () => {
+              await upgradePackageWithPackageManager(pm, "cli", targetVersions.cli);
+            }
+          });
+          cliUpdated2 = true;
+        }
+      }
+      if (libraryNeedsUpgrade) {
+        await (0, import_shared40.traceFunction)({
+          name: "upgradePackageWithPackageManager",
+          tracer: dev_tracer_default,
+          fn: async () => {
+            await upgradePackageWithPackageManager(pm, "library", targetVersions.library, currentLibraryInfo.alias);
+          }
+        });
+        libraryUpdated2 = true;
+      }
+      if (cliUpdated2 && libraryUpdated2) {
+        logger2.info("@superblocksteam/cli and @superblocksteam/library have been updated.");
+      } else if (cliUpdated2) {
+        logger2.info("@superblocksteam/cli has been updated.");
+      } else if (libraryUpdated2) {
+        logger2.info("@superblocksteam/library has been updated.");
+      }
+    }
   });
-  if (!pm || !config2?.id)
-    return;
-  const currentCliVersion = await getCurrentCliVersion();
-  const currentLibraryInfo = await getCurrentLibraryVersion(pm);
-  if (!currentCliVersion || !(0, import_valid.default)(currentCliVersion) || currentCliVersion.startsWith("file:") || currentCliVersion.startsWith("link:") || !currentLibraryInfo || !(0, import_valid.default)(currentLibraryInfo.version) || currentLibraryInfo.version.startsWith("file:") || currentLibraryInfo.version.startsWith("link:")) {
-    return;
-  }
-  const targetVersions = await getRemoteVersions(config2);
-  if (!targetVersions)
-    return;
-  let cliNeedsUpgrade;
-  let libraryNeedsUpgrade;
-  try {
-    cliNeedsUpgrade = targetVersions.cli && (0, import_gt.default)(targetVersions.cli, currentCliVersion);
-    libraryNeedsUpgrade = targetVersions.library && (0, import_gt.default)(targetVersions.library, currentLibraryInfo.version);
-  } catch (error) {
-    console.warn("Error checking versions to upgrade, releasing lock and exiting", error);
-    await lockService.shutdown({
-      serverInitiated: false
-    });
+  if (hasFailedToUpgrade) {
     process.exit(1);
-  }
-  if (!cliNeedsUpgrade && !libraryNeedsUpgrade) {
-    return;
-  }
-  let cliUpdated = false;
-  let libraryUpdated = false;
-  if (cliNeedsUpgrade) {
-    const oclifUpgradeSucceeded = await upgradeCliWithOclif(targetVersions.cli);
-    if (!oclifUpgradeSucceeded) {
-      await upgradePackageWithPackageManager(pm, "cli", targetVersions.cli);
-      cliUpdated = true;
-    }
-  }
-  if (libraryNeedsUpgrade) {
-    await upgradePackageWithPackageManager(pm, "library", targetVersions.library, currentLibraryInfo.alias);
-    libraryUpdated = true;
-  }
-  if (cliUpdated && libraryUpdated) {
-    logger2.info("@superblocksteam/cli and @superblocksteam/library have been updated.");
-  } else if (cliUpdated) {
-    logger2.info("@superblocksteam/cli has been updated.");
-  } else if (libraryUpdated) {
-    logger2.info("@superblocksteam/library has been updated.");
-  }
-  if (cliUpdated || libraryUpdated) {
+  } else if (cliUpdated || libraryUpdated) {
     logger2.info("Restarting the CLI\u2026");
     await lockService.releaseLock();
     process.exit(AUTO_UPGRADE_EXIT_CODE);
@@ -426057,7 +426118,7 @@ async function startVite({ app, httpServer: httpServer2, root: root2, mode, port
   };
   const isCustomBuildEnabled2 = await isCustomComponentsEnabled();
   const customFolder = path36.join(root2, "custom");
-  const cdnUrl = "https://assets-cdn.superblocks.com/library/2.0.6-next.0";
+  const cdnUrl = "https://assets-cdn.superblocks.com/library/2.0.6-next.10";
   const env3 = loadEnv(mode, root2, "");
   const hmrPort = await getFreePort();
   const hmrOptions = {
@@ -426343,11 +426404,11 @@ async function dev(options9) {
 
 // ../sdk/dist/cli-replacement/init.js
 init_cjs_shims();
-var import_shared40 = __toESM(require_dist2(), 1);
+var import_shared41 = __toESM(require_dist2(), 1);
 var import_util35 = __toESM(require_dist3(), 1);
 async function fetchAndWriteApplication({ resourceId, viewMode, featureFlags, projectRootFolder, appRelativePath, sdk: sdk2, skipSigningVerification }) {
   const headers = {
-    [import_util35.COMPONENT_EVENT_HEADER]: import_shared40.ComponentEvent.INIT
+    [import_util35.COMPONENT_EVENT_HEADER]: import_shared41.ComponentEvent.INIT
   };
   const application = await sdk2.fetchApplicationWithComponents({
     applicationId: resourceId,
@@ -426368,7 +426429,7 @@ async function fetchAndWriteApplication({ resourceId, viewMode, featureFlags, pr
 }
 
 // ../sdk/dist/index.js
-var import_shared41 = __toESM(require_dist2(), 1);
+var import_shared42 = __toESM(require_dist2(), 1);
 
 // src/commands/commits.mts
 var import_util38 = __toESM(require_dist3(), 1);
@@ -431608,7 +431669,7 @@ ${error.message}.`
             task.title = `Pulling resources from branch ${ctx.localBranchName}...`;
             let viewMode;
             if (commitId) {
-              viewMode = import_shared41.ExportViewMode.EXPORT_COMMIT;
+              viewMode = import_shared42.ExportViewMode.EXPORT_COMMIT;
             } else {
               viewMode = await getMode(task, mode);
             }

package/oclif.manifest.json

@@ -585,5 +585,5 @@
       "strict": true
     }
   },
-  "version": "2.0.6-next.0"
+  "version": "2.0.6-next.10"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superblocksteam/cli",
-  "version": "2.0.6-next.0",
+  "version": "2.0.6-next.10",
   "type": "module",
   "description": "Official Superblocks CLI",
   "homepage": "https://www.superblocks.com",
@@ -42,9 +42,9 @@
   "devDependencies": {
     "@eslint/js": "^9.16.0",
     "@oclif/test": "^4.1.11",
-    "@superblocksteam/sdk": "2.0.6-next.0",
+    "@superblocksteam/sdk": "2.0.6-next.10",
     "@superblocksteam/shared": "0.9160.0",
-    "@superblocksteam/util": "2.0.6-next.0",
+    "@superblocksteam/util": "2.0.6-next.10",
     "@types/babel__core": "^7.20.0",
     "@types/chai": "^4",
     "@types/fs-extra": "^11.0.1",