@superblocksteam/sdk 2.0.6-next.89 → 2.0.6-next.9

package/src/application-build.mts

@@ -9,8 +9,8 @@ import { customComponentsPlugin } from "./dev-utils/custom-build.mjs";
 import { getLogger } from "./dev-utils/dev-logger.mjs";
 import { ddRumPlugin } from "./dev-utils/vite-plugin-dd-rum.mjs";
 import { superblocksCdnPlugin } from "./dev-utils/vite-plugin-sb-cdn.mjs";
-import { generateBuildManifestPlugin } from "./vite-plugin-generate-build-manifest.mjs";
 import { injectSuperblocksIdsPlugin } from "./vite-plugin-inject-sb-ids-transform.mjs";
+import type { Plugin } from "vite";
 
 export async function buildApplication({
   root,
@@ -81,7 +81,7 @@ async function buildWithVite({
 }) {
   const viteLogger = createLogger();
   const logger = getLogger();
-  viteLogger.info = (msg: string) => logger.info(msg);
+  viteLogger.info = logger.info;
   viteLogger.warn = (msg: string) => {
     logger.warn(yellow(msg));
   };
@@ -133,7 +133,7 @@ async function buildWithVite({
     logLevel: "info",
     plugins: [
       tsconfigPaths(),
-      injectIndexVitePlugin({ assetsCdnUrl }),
+      injectIndexVitePlugin({ assetsCdnUrl, logger }) as Plugin,
       customComponentsPlugin(),
       injectSuperblocksIdsPlugin(root),
       superblocksCdnPlugin({
@@ -142,15 +142,12 @@ async function buildWithVite({
           "react/jsx-runtime": "https://esm.sh/react@18.2.0/jsx-runtime.mjs",
           "react/jsx-dev-runtime":
             "https://esm.sh/react@18.2.0/jsx-dev-runtime.mjs",
-          "./user-facing/build-manifest.js": "/assets/build-manifest.js",
-          "/assets/user-facing/build-manifest.js": "/assets/build-manifest.js",
         },
         cssImports: {
           "@superblocksteam/library/index.css": `${libraryUrl}/index.css`,
         },
       }),
       react(),
-      generateBuildManifestPlugin(root),
 
       ddRumPlugin({
         clientToken: ddClientToken ?? "",

package/src/cli-replacement/automatic-upgrades.ts

@@ -1,13 +1,11 @@
 import * as child_process from "node:child_process";
 import { promisify } from "node:util";
 import { isNativeError } from "node:util/types";
-import { traceFunction } from "@superblocksteam/shared";
 import { resolveCommand, type DetectResult } from "package-manager-detector";
 import { detect } from "package-manager-detector/detect";
 import gt from "semver/functions/gt.js";
 import valid from "semver/functions/valid.js";
-import { getErrorMeta, getLogger } from "../dev-utils/dev-logger.mjs";
-import tracer from "../dev-utils/dev-tracer.js";
+import { getLogger } from "../dev-utils/dev-logger.mjs";
 import type { ResponseMeta } from "../socket/handlers.js";
 import type { ApplicationConfig } from "../types/common.js";
 import type { LockService } from "@superblocksteam/vite-plugin-file-sync/lock-service";
@@ -57,7 +55,7 @@ async function getRemoteVersions(
       return data.data;
     } else {
       const error = (await response.json()) as CheckVersionsErrorResponse;
-      logger.error(
+      console.log(
         `Could not get latest CLI version: ${error.responseMeta.message}`,
       );
     }
@@ -70,9 +68,7 @@ async function getRemoteVersions(
   }
 }
 
-export async function getCurrentCliVersion(): Promise<
-  PackageVersionInfo | undefined
-> {
+export async function getCurrentCliVersion(): Promise<string | undefined> {
   try {
     const command = process.platform === "win32" ? "where" : "which";
     const { stdout } = await exec(`${command} superblocks`);
@@ -89,16 +85,7 @@ export async function getCurrentCliVersion(): Promise<
       /@superblocksteam\/cli(-ephemeral)?\//,
       "",
     );
-
-    const aliasMatch = json.cliVersion?.match(/@superblocksteam\/([^\/]+)/);
-    if (aliasMatch && aliasMatch[1] !== "cli") {
-      return {
-        version: version,
-        alias: `@superblocksteam/${aliasMatch[1]}`,
-      };
-    }
-
-    return { version };
+    return version;
   } catch (error) {
     if (isNativeError(error)) {
       logger.error(`Error getting CLI version: ${error.message}`);
@@ -117,16 +104,16 @@ export async function getCurrentLibraryVersion(
       case "pnpm":
         return await getPnpmLibraryVersion();
       default:
-        logger.error(
+        console.error(
           `${pm.agent} is currently not supported for automatic upgrades.`,
         );
         return undefined;
     }
   } catch (error) {
-    logger.error(
+    console.error(
       "Could not resolve current library version. Skipping automatic upgrade.",
-      getErrorMeta(error),
     );
+    console.error(error);
     return undefined;
   }
 }
@@ -213,10 +200,10 @@ async function upgradeCliWithOclif(targetVersion: string): Promise<boolean> {
 
     if (!superblocksPath) return false;
 
-    const { stdout: updateOutput, stderr: updateErrorOutput } = await exec(
+    const { stdout: updateOutput } = await exec(
       `${superblocksPath} update --version=${targetVersion}`,
     );
-    return !(updateOutput + updateErrorOutput).includes("not updatable");
+    return !updateOutput.includes("not updatable");
   } catch (error) {
     if (isNativeError(error)) {
       logger.error(`Error checking CLI updatability: ${error.message}`);
@@ -229,70 +216,21 @@ async function upgradePackageWithPackageManager(
   pm: DetectResult,
   packageName: string,
   targetVersion: string,
-  {
-    alias,
-    global,
-  }: {
-    alias?: string;
-    global?: boolean;
-  },
+  alias?: string,
 ): Promise<void> {
   const packageSpec = alias
     ? `@superblocksteam/${packageName}@npm:${alias}@${targetVersion}`
     : `@superblocksteam/${packageName}@${targetVersion}`;
 
-  // --prefer-offline will skip some staleness checks that are slow
-  const installArgs = [packageSpec, "--fund=false"];
-  if (pm.agent === "npm") {
-    installArgs.push("--audit=false");
-  }
-  if (packageName === "cli") {
-    installArgs.push("--force");
-  }
-
-  const installCommand = resolveCommand(
-    pm.agent,
-    global ? "global" : "install",
-    installArgs,
-  );
+  const installCommand = resolveCommand(pm.agent, "install", [packageSpec]);
 
   if (!installCommand) {
-    logger.error("Could not determine how to upgrade Superblocks packages.");
+    console.error("Could not determine how to upgrade Superblocks packages.");
     return;
   }
 
   const { command, args } = installCommand;
-  logger.info(
-    `Running ${command} ${args.join(" ")} to upgrade ${packageName}...`,
-  );
-  let resolver: (value: void | PromiseLike<void>) => void;
-  let rejecter: (reason?: any) => void;
-  const promise = new Promise<void>((resolve, reject) => {
-    resolver = resolve;
-    rejecter = reject;
-  });
-  const cp = child_process.exec(
-    `${command} ${args.join(" ")}`,
-    {
-      cwd: process.cwd(),
-    },
-    (error) => {
-      if (error) {
-        logger.error(`Failed to upgrade ${packageName} to ${targetVersion}`);
-        rejecter(error);
-      } else {
-        logger.info(`Successfully upgraded ${packageName} to ${targetVersion}`);
-        resolver();
-      }
-    },
-  );
-  cp.stdout?.on("data", (data) => {
-    logger.info(data);
-  });
-  cp.stderr?.on("data", (data) => {
-    logger.warn(data);
-  });
-  return promise;
+  await exec(`${command} ${args.join(" ")}`);
 }
 
 export async function getCurrentLibraryVersionWithoutPM(): Promise<
@@ -317,212 +255,109 @@ export async function getCurrentLibraryVersionWithoutPM(): Promise<
 export async function checkVersionsAndUpgrade(
   lockService: LockService,
   config?: ApplicationConfig,
-): Promise<{
-  cliUpdated: boolean;
-  libraryUpdated: boolean;
-}> {
-  const cliUpdated = false;
-  const libraryUpdated = false;
-  let hasFailedToUpgrade = false;
-
-  logger.info("Checking versions");
-
-  await traceFunction({
-    name: "checkVersionsAndUpgrade",
-    tracer,
-    fn: async () => {
-      // Detect package manager
-      const pm = await traceFunction({
-        name: "detectPackageManager",
-        tracer,
-        fn: async () => {
-          return await detect({
-            strategies: [
-              "packageManager-field",
-              "lockfile",
-              "install-metadata",
-              "devEngines-field",
-            ],
-            cwd: process.cwd(),
-          });
-        },
-      });
-
-      if (!pm || !config?.id) return;
-
-      // Get current versions
-      const currentCliInfo = await traceFunction({
-        name: "getCurrentCliVersion",
-        tracer,
-        fn: async () => {
-          return await getCurrentCliVersion();
-        },
-      });
-      const currentLibraryInfo = await traceFunction({
-        name: "getCurrentLibraryVersion",
-        tracer,
-        fn: async () => {
-          return await getCurrentLibraryVersion(pm);
-        },
-      });
-
-      // Skip if we're in local development
-      if (
-        !currentCliInfo ||
-        !valid(currentCliInfo.version) ||
-        currentCliInfo.version.startsWith("file:") ||
-        currentCliInfo.version.startsWith("link:") ||
-        !currentLibraryInfo ||
-        !valid(currentLibraryInfo.version) ||
-        currentLibraryInfo.version.startsWith("file:") ||
-        currentLibraryInfo.version.startsWith("link:")
-      ) {
-        return;
-      }
-
-      // Get target versions from server
-      const targetVersions = await traceFunction({
-        name: "getRemoteVersions",
-        tracer,
-        fn: async () => {
-          return await getRemoteVersions(config);
-        },
-      });
-      if (!targetVersions) return;
-
-      let cliNeedsUpgrade: boolean | string;
-      let libraryNeedsUpgrade: boolean | string;
-      try {
-        // If version is latest, then semver can throw an error
-        // Check if CLI needs upgrade
-        cliNeedsUpgrade =
-          targetVersions.cli && gt(targetVersions.cli, currentCliInfo.version);
-
-        // Check if library needs upgrade
-        libraryNeedsUpgrade =
-          targetVersions.library &&
-          gt(targetVersions.library, currentLibraryInfo.version);
-      } catch (error) {
-        logger.error(
-          "Error checking versions to upgrade, releasing lock and exiting",
-          getErrorMeta(error),
-        );
-        await traceFunction({
-          name: "shutdownLockService",
-          tracer,
-          fn: async () => {
-            await lockService.shutdown({
-              serverInitiated: false,
-            });
-          },
-        });
-        hasFailedToUpgrade = true;
-        return;
-      }
-
-      if (!cliNeedsUpgrade && !libraryNeedsUpgrade) {
-        return; // Everything is up to date
-      }
-
-      let cliUpdated = false;
-      let libraryUpdated = false;
-
-      try {
-        const upgradePromises = [];
-
-        if (cliNeedsUpgrade) {
-          const cliUpgradePromise = traceFunction({
-            name: "upgradeCli",
-            tracer,
-            fn: async () => {
-              logger.info(
-                `Beginning CLI upgrade from ${currentCliInfo.version} to ${targetVersions.cli}`,
-              );
-              const oclifUpgradeSucceeded = await traceFunction({
-                name: "upgradeCliWithOclif",
-                tracer,
-                fn: async () => {
-                  return await upgradeCliWithOclif(targetVersions.cli);
-                },
-              });
-              if (!oclifUpgradeSucceeded) {
-                logger.info(`Falling back to package manager upgrade for CLI`);
-                // Fall back to package manager upgrade
-                await traceFunction({
-                  name: "upgradePackageWithPackageManager - cli",
-                  tracer,
-                  fn: async () => {
-                    await upgradePackageWithPackageManager(
-                      pm,
-                      "cli",
-                      targetVersions.cli,
-                      {
-                        alias: currentCliInfo.alias,
-                        global: true,
-                      },
-                    );
-                  },
-                });
-                cliUpdated = true;
-              }
-            },
-          });
-          upgradePromises.push(cliUpgradePromise);
-        }
-
-        if (libraryNeedsUpgrade) {
-          const libraryUpgradePromise = traceFunction({
-            name: "upgradePackageWithPackageManager - library",
-            tracer,
-            fn: async () => {
-              logger.info(
-                `Beginning library upgrade from ${currentLibraryInfo.version} to ${targetVersions.library}`,
-              );
-              await upgradePackageWithPackageManager(
-                pm,
-                "library",
-                targetVersions.library,
-                {
-                  alias: currentLibraryInfo.alias,
-                  global: false,
-                },
-              );
-              libraryUpdated = true;
-            },
-          });
-          upgradePromises.push(libraryUpgradePromise);
-        }
-        await Promise.all(upgradePromises);
-      } catch (error) {
-        logger.error(
-          "Error upgrading packages, releasing lock and exiting",
-          getErrorMeta(error),
-        );
-        hasFailedToUpgrade = true;
-      }
-
-      // Log what was updated
-      if (cliUpdated && libraryUpdated) {
-        logger.info(
-          "@superblocksteam/cli and @superblocksteam/library have been updated.",
-        );
-      } else if (cliUpdated) {
-        logger.info("@superblocksteam/cli has been updated.");
-      } else if (libraryUpdated) {
-        logger.info("@superblocksteam/library has been updated.");
-      } else {
-        logger.info("No upgrades needed");
-      }
-    },
+) {
+  // Detect package manager
+  const pm = await detect({
+    strategies: [
+      "packageManager-field",
+      "lockfile",
+      "install-metadata",
+      "devEngines-field",
+    ],
+    cwd: process.cwd(),
   });
 
-  // Restart CLI if anything was updated
-  if (hasFailedToUpgrade) {
+  if (!pm || !config?.id) return;
+
+  // Get current versions
+  const currentCliVersion = await getCurrentCliVersion();
+  const currentLibraryInfo = await getCurrentLibraryVersion(pm);
+
+  // Skip if we're in local development
+  if (
+    !currentCliVersion ||
+    !valid(currentCliVersion) ||
+    currentCliVersion.startsWith("file:") ||
+    currentCliVersion.startsWith("link:") ||
+    !currentLibraryInfo ||
+    !valid(currentLibraryInfo.version) ||
+    currentLibraryInfo.version.startsWith("file:") ||
+    currentLibraryInfo.version.startsWith("link:")
+  ) {
+    return;
+  }
+
+  // Get target versions from server
+  const targetVersions = await getRemoteVersions(config);
+  if (!targetVersions) return;
+
+  let cliNeedsUpgrade: boolean | string;
+  let libraryNeedsUpgrade: boolean | string;
+  try {
+    // If version is latest, then semver can throw an error
+    // Check if CLI needs upgrade
+    cliNeedsUpgrade =
+      targetVersions.cli && gt(targetVersions.cli, currentCliVersion);
+
+    // Check if library needs upgrade
+    libraryNeedsUpgrade =
+      targetVersions.library &&
+      gt(targetVersions.library, currentLibraryInfo.version);
+  } catch (error) {
+    console.warn(
+      "Error checking versions to upgrade, releasing lock and exiting",
+      error,
+    );
+    await lockService.shutdown({
+      serverInitiated: false,
+    });
     process.exit(1);
   }
 
-  return {
-    cliUpdated,
-    libraryUpdated,
-  };
+  if (!cliNeedsUpgrade && !libraryNeedsUpgrade) {
+    return; // Everything is up to date
+  }
+
+  let cliUpdated = false;
+  let libraryUpdated = false;
+
+  // Upgrade CLI if needed
+  if (cliNeedsUpgrade) {
+    const oclifUpgradeSucceeded = await upgradeCliWithOclif(targetVersions.cli);
+
+    if (!oclifUpgradeSucceeded) {
+      // Fall back to package manager upgrade
+      await upgradePackageWithPackageManager(pm, "cli", targetVersions.cli);
+      cliUpdated = true;
+    }
+  }
+
+  // Upgrade library if needed
+  if (libraryNeedsUpgrade) {
+    await upgradePackageWithPackageManager(
+      pm,
+      "library",
+      targetVersions.library,
+      currentLibraryInfo.alias,
+    );
+    libraryUpdated = true;
+  }
+
+  // Log what was updated
+  if (cliUpdated && libraryUpdated) {
+    logger.info(
+      "@superblocksteam/cli and @superblocksteam/library have been updated.",
+    );
+  } else if (cliUpdated) {
+    logger.info("@superblocksteam/cli has been updated.");
+  } else if (libraryUpdated) {
+    logger.info("@superblocksteam/library has been updated.");
+  }
+
+  // Restart CLI if anything was updated
+  if (cliUpdated || libraryUpdated) {
+    logger.info("Restarting the CLI…");
+    await lockService.releaseLock();
+    process.exit(AUTO_UPGRADE_EXIT_CODE);
+  }
 }