@superblocksteam/cli 2.0.3-next.162 → 2.0.3-next.164

package/dist/index.js

@@ -9,12 +9,11 @@ import {
   isEqual_default,
   isObject_default,
   isString_default,
-  pickBy_default,
   require_constants,
   require_dist,
   require_lib,
   require_slugify
-} from "./chunk-LHELDOWV.js";
+} from "./chunk-JOXVTBHC.js";
 import {
   __commonJS,
   __esm,
@@ -96096,11 +96095,11 @@ var require_api_files = __commonJS({
     exports2.writeApiFiles = writeApiFiles3;
     exports2.readAppApiYamlFile = readAppApiYamlFile4;
     async function writeApiFiles3(...args) {
-      const esmFunction = await import("./api-CNGTM444.js");
+      const esmFunction = await import("./api-CHKMPXFE.js");
       return esmFunction.writeApiFiles(...args);
     }
     async function readAppApiYamlFile4(...args) {
-      const esmFunction = await import("./api-CNGTM444.js");
+      const esmFunction = await import("./api-CHKMPXFE.js");
       return esmFunction.readAppApiYamlFile(...args);
     }
   }
@@ -331437,7 +331436,7 @@ var import_dd_trace = __toESM(require_dd_trace2(), 1);
 // ../sdk/package.json
 var package_default = {
   name: "@superblocksteam/sdk",
-  version: "2.0.3-next.162",
+  version: "2.0.3-next.164",
   type: "module",
   description: "Superblocks JS SDK",
   homepage: "https://www.superblocks.com",
@@ -331467,8 +331466,8 @@ var package_default = {
     "@rollup/wasm-node": "^4.35.0",
     "@superblocksteam/bucketeer-sdk": "0.4.1",
     "@superblocksteam/shared": "0.9120.0",
-    "@superblocksteam/util": "2.0.3-next.162",
-    "@superblocksteam/vite-plugin-file-sync": "2.0.3-next.162",
+    "@superblocksteam/util": "2.0.3-next.164",
+    "@superblocksteam/vite-plugin-file-sync": "2.0.3-next.164",
     "@vitejs/plugin-react": "^4.3.4",
     axios: "^1.4.0",
     chokidar: "^4.0.3",
@@ -376169,7 +376168,7 @@ async function startVite({ app, httpServer: httpServer2, root: root2, mode, port
   };
   const isCustomBuildEnabled2 = await isCustomComponentsEnabled();
   const customFolder = path21.join(root2, "custom");
-  const cdnUrl = "https://assets-cdn.superblocks.com/library/2.0.3-next.162";
+  const cdnUrl = "https://assets-cdn.superblocks.com/library/2.0.3-next.164";
   const env3 = loadEnv(mode, root2, "");
   const hmrPort = await getFreePort();
   const hmrOptions = {
@@ -392093,7 +392092,6 @@ async function readPackage({ cwd, normalize: normalize3 = true } = {}) {
 
 // ../sdk/dist/cli-replacement/automatic-upgrades.js
 init_cjs_shims();
-init_lodash();
 import * as child_process from "node:child_process";
 import { promisify } from "node:util";
 import { isNativeError } from "node:util/types";
@@ -392101,14 +392099,12 @@ var import_gt = __toESM(require_gt(), 1);
 var import_valid = __toESM(require_valid(), 1);
 var exec3 = promisify(child_process.exec);
 var logger2 = getLogger2();
-async function getRemoteCliLibraryVersions(config2) {
+async function getRemoteVersions(config2) {
   const { token: token2, superblocksBaseUrl, id: id2 } = config2;
   try {
     const response = await fetch(new URL(`api/v3/applications/${id2}/cli-library-versions`, superblocksBaseUrl), {
       method: "GET",
-      headers: {
-        Authorization: `Bearer ${token2}`
-      }
+      headers: { Authorization: `Bearer ${token2}` }
     });
     if (response.ok) {
       const data = await response.json();
@@ -392125,38 +392121,15 @@ async function getRemoteCliLibraryVersions(config2) {
     }
   }
 }
-async function installPackageVersions(pm, versions) {
-  const installCommand = resolveCommand(pm.agent, "install", Object.entries(versions).map(([pkg, version2]) => `@superblocksteam/${pkg}@${version2}`));
-  if (!installCommand) {
-    console.error("We could not determine how to upgrade your Superblocks packages.");
-    return;
-  }
-  const { command, args } = installCommand;
-  return await exec3(`${command} ${args.join(" ")}`);
-}
-async function findSuperblocksExecutable() {
+async function getCurrentCliVersion() {
   try {
     const command = process.platform === "win32" ? "where" : "which";
     const { stdout } = await exec3(`${command} superblocks`);
-    return stdout.trim();
-  } catch {
-    return void 0;
-  }
-}
-async function getLocalCliLibraryVersions(pm) {
-  return {
-    cli: await getLocalCliVersion(),
-    library: await getLocalPackageVersion(pm, "library")
-  };
-}
-async function getLocalCliVersion() {
-  try {
-    const superblocksPath = await findSuperblocksExecutable();
-    if (!superblocksPath) {
+    const superblocksPath = stdout.trim();
+    if (!superblocksPath)
       return void 0;
-    }
-    const { stdout } = await exec3(`${superblocksPath} version --json`);
-    const json2 = JSON.parse(stdout);
+    const { stdout: versionOutput } = await exec3(`${superblocksPath} version --json`);
+    const json2 = JSON.parse(versionOutput);
     return json2.cliVersion?.replace(/@superblocksteam\/cli(-ephemeral)?\//, "");
   } catch (error) {
     if (isNativeError(error)) {
@@ -392165,46 +392138,99 @@ async function getLocalCliVersion() {
     return void 0;
   }
 }
-async function getLocalPackageVersion(pm, pkg, global2) {
+async function getCurrentLibraryVersion(pm) {
   try {
     switch (pm.agent) {
-      case "npm": {
-        const { stdout } = await exec3(`npm list ${global2 ? "--global" : ""} @superblocksteam/${pkg} --json`, {
-          cwd: process.cwd()
-        });
-        const parsed = JSON.parse(stdout);
-        return parsed.dependencies?.[`@superblocksteam/${pkg}`]?.version ?? parsed.devDependencies?.[`@superblocksteam/${pkg}`]?.version;
-      }
-      case "pnpm": {
-        const { stdout } = await exec3(`pnpm list ${global2 ? "--global" : ""} @superblocksteam/${pkg} --json`, { cwd: process.cwd() });
-        const parsed = JSON.parse(stdout);
-        return parsed[0]?.dependencies?.[`@superblocksteam/${pkg}`]?.version ?? parsed[0]?.devDependencies?.[`@superblocksteam/${pkg}`]?.version;
-      }
+      case "npm":
+        return await getNpmLibraryVersion();
+      case "pnpm":
+        return await getPnpmLibraryVersion();
       default:
-        console.error(`${pm.agent} is currently not supported. Your application will not be upgraded automatically.`);
-        return;
+        console.error(`${pm.agent} is currently not supported for automatic upgrades.`);
+        return void 0;
     }
-  } catch (e) {
-    console.error("We couldn't resolve your current Superblocks package versions. Your application will not be upgraded automatically.");
-    console.error(e);
-    return;
+  } catch (error) {
+    console.error("Could not resolve current library version. Skipping automatic upgrade.");
+    console.error(error);
+    return void 0;
   }
 }
-async function tryCliUpdateCommand(version2) {
+async function getNpmLibraryVersion() {
+  const { stdout } = await exec3("npm list @superblocksteam/library --json", {
+    cwd: process.cwd()
+  });
+  const parsed = JSON.parse(stdout);
+  const packageData = parsed.dependencies?.["@superblocksteam/library"] ?? parsed.devDependencies?.["@superblocksteam/library"];
+  if (!packageData?.version)
+    return void 0;
+  const resolved = packageData.resolved;
+  if (resolved && resolved.includes("@superblocksteam/")) {
+    const aliasMatch = resolved.match(/@superblocksteam\/([^\/]+)/);
+    if (aliasMatch && aliasMatch[1] !== "library") {
+      return {
+        version: packageData.version,
+        alias: `@superblocksteam/${aliasMatch[1]}`
+      };
+    }
+  }
+  return { version: packageData.version };
+}
+async function getPnpmLibraryVersion() {
+  let packageData;
   try {
-    const superblocksPath = await findSuperblocksExecutable();
-    if (!superblocksPath) {
-      return false;
+    const result = await exec3("pnpm list @superblocksteam/library --json", {
+      cwd: process.cwd()
+    });
+    const parsed = JSON.parse(result.stdout);
+    packageData = parsed[0]?.dependencies?.["@superblocksteam/library"] ?? parsed[0]?.devDependencies?.["@superblocksteam/library"];
+  } catch {
+  }
+  if (!packageData?.version) {
+    try {
+      const aliasResult = await exec3("pnpm list @superblocksteam/library-ephemeral --json", { cwd: process.cwd() });
+      const aliasParsed = JSON.parse(aliasResult.stdout);
+      packageData = aliasParsed[0]?.dependencies?.["@superblocksteam/library"] ?? aliasParsed[0]?.devDependencies?.["@superblocksteam/library"];
+    } catch {
+      return void 0;
     }
-    const { stdout } = await exec3(`${superblocksPath} update --version=${version2}`);
-    return !stdout.includes("not updatable");
+  }
+  if (!packageData?.version)
+    return void 0;
+  const from = packageData.from;
+  if (from && from !== "@superblocksteam/library") {
+    return {
+      version: packageData.version,
+      alias: from
+    };
+  }
+  return { version: packageData.version };
+}
+async function upgradeCliWithOclif(targetVersion) {
+  try {
+    const command = process.platform === "win32" ? "where" : "which";
+    const { stdout } = await exec3(`${command} superblocks`);
+    const superblocksPath = stdout.trim();
+    if (!superblocksPath)
+      return false;
+    const { stdout: updateOutput } = await exec3(`${superblocksPath} update --version=${targetVersion}`);
+    return !updateOutput.includes("not updatable");
   } catch (error) {
     if (isNativeError(error)) {
-      logger2.error(`Error checking updatability: ${error.message}`);
+      logger2.error(`Error checking CLI updatability: ${error.message}`);
     }
     return false;
   }
 }
+async function upgradePackageWithPackageManager(pm, packageName, targetVersion, alias) {
+  const packageSpec = alias ? `@superblocksteam/${packageName}@npm:${alias}@${targetVersion}` : `@superblocksteam/${packageName}@${targetVersion}`;
+  const installCommand = resolveCommand(pm.agent, "install", [packageSpec]);
+  if (!installCommand) {
+    console.error("Could not determine how to upgrade Superblocks packages.");
+    return;
+  }
+  const { command, args } = installCommand;
+  await exec3(`${command} ${args.join(" ")}`);
+}
 async function restartCli() {
   const args = process.argv.slice(1);
   const child = child_process.spawn(process.execPath, [...args], {
@@ -392225,49 +392251,32 @@ async function checkVersionsAndUpgrade(lockService, config2) {
     ],
     cwd: process.cwd()
   });
-  if (!pm)
-    return;
-  if (!config2?.id)
+  if (!pm || !config2?.id)
     return;
-  const localVersions = await getLocalCliLibraryVersions(pm);
-  if (
-    // don't attempt upgrades in local development
-    Object.values(localVersions).some((x) => !x || !(0, import_valid.default)(x) || x.startsWith("file:") || x.startsWith("link:"))
-  ) {
+  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 serverVersions = await getRemoteCliLibraryVersions(config2);
-  if (
-    // server versions could not be fetched, or
-    !serverVersions || // we have a different # of libraries in server/local
-    Object.keys(localVersions).length !== Object.keys(serverVersions).length
-  ) {
+  const targetVersions = await getRemoteVersions(config2);
+  if (!targetVersions)
     return;
-  }
-  const isUpToDate = isEqual_default(localVersions, serverVersions);
-  if (isUpToDate)
-    return;
-  const packagesToUpdate = pickBy_default(localVersions, (_, key2) => {
-    try {
-      return (0, import_gt.default)(serverVersions[key2], localVersions[key2]);
-    } catch {
-      return false;
-    }
-  });
-  if (Object.keys(packagesToUpdate).length === 0) {
+  const cliNeedsUpgrade = targetVersions.cli && (0, import_gt.default)(targetVersions.cli, currentCliVersion);
+  const libraryNeedsUpgrade = targetVersions.library && (0, import_gt.default)(targetVersions.library, currentLibraryInfo.version);
+  if (!cliNeedsUpgrade && !libraryNeedsUpgrade) {
     return;
   }
   let cliUpdated = false;
   let libraryUpdated = false;
-  if (packagesToUpdate.cli) {
-    const isUpdated = await tryCliUpdateCommand(serverVersions.cli);
-    if (!isUpdated) {
-      await installPackageVersions(pm, { cli: serverVersions.cli });
+  if (cliNeedsUpgrade) {
+    const oclifUpgradeSucceeded = await upgradeCliWithOclif(targetVersions.cli);
+    if (!oclifUpgradeSucceeded) {
+      await upgradePackageWithPackageManager(pm, "cli", targetVersions.cli);
       cliUpdated = true;
     }
   }
-  if (packagesToUpdate.library) {
-    await installPackageVersions(pm, { library: serverVersions.library });
+  if (libraryNeedsUpgrade) {
+    await upgradePackageWithPackageManager(pm, "library", targetVersions.library, currentLibraryInfo.alias);
     libraryUpdated = true;
   }
   if (cliUpdated && libraryUpdated) {
@@ -392277,9 +392286,11 @@ async function checkVersionsAndUpgrade(lockService, config2) {
   } else if (libraryUpdated) {
     logger2.info("@superblocksteam/library has been updated.");
   }
-  logger2.info("Restarting the CLI\u2026");
-  await lockService.releaseLock();
-  await restartCli();
+  if (cliUpdated || libraryUpdated) {
+    logger2.info("Restarting the CLI\u2026");
+    await lockService.releaseLock();
+    await restartCli();
+  }
 }
 
 // ../sdk/dist/cli-replacement/dev.mjs

package/oclif.manifest.json

@@ -509,5 +509,5 @@
       "strict": true
     }
   },
-  "version": "2.0.3-next.162"
+  "version": "2.0.3-next.164"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superblocksteam/cli",
-  "version": "2.0.3-next.162",
+  "version": "2.0.3-next.164",
   "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.3-next.162",
+    "@superblocksteam/sdk": "2.0.3-next.164",
     "@superblocksteam/shared": "0.9120.0",
-    "@superblocksteam/util": "2.0.3-next.162",
+    "@superblocksteam/util": "2.0.3-next.164",
     "@types/babel__core": "^7.20.0",
     "@types/chai": "^4",
     "@types/fs-extra": "^11.0.1",