@superblocksteam/sdk 2.0.6-next.39 → 2.0.6-next.4

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,
@@ -133,7 +133,7 @@ async function buildWithVite({
     logLevel: "info",
     plugins: [
       tsconfigPaths(),
-      injectIndexVitePlugin({ assetsCdnUrl, logger }),
+      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 { getLogger } from "../dev-utils/dev-logger.mjs";
-import tracer from "../dev-utils/dev-tracer.js";
 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";
@@ -202,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}`);
@@ -258,170 +256,106 @@ export async function checkVersionsAndUpgrade(
   lockService: LockService,
   config?: ApplicationConfig,
 ) {
-  const cliUpdated = false;
-  const libraryUpdated = false;
-  let hasFailedToUpgrade = false;
-
-  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 currentCliVersion = 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 (
-        !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 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, 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 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;
-
-      // Upgrade CLI if needed
-      if (cliNeedsUpgrade) {
-        const oclifUpgradeSucceeded = await traceFunction({
-          name: "upgradeCliWithOclif",
-          tracer,
-          fn: async () => {
-            return await upgradeCliWithOclif(targetVersions.cli);
-          },
-        });
-        if (!oclifUpgradeSucceeded) {
-          // Fall back to package manager upgrade
-          await traceFunction({
-            name: "upgradePackageWithPackageManager",
-            tracer,
-            fn: async () => {
-              await upgradePackageWithPackageManager(
-                pm,
-                "cli",
-                targetVersions.cli,
-              );
-            },
-          });
-          cliUpdated = true;
-        }
-      }
-
-      // Upgrade library if needed
-      if (libraryNeedsUpgrade) {
-        await traceFunction({
-          name: "upgradePackageWithPackageManager",
-          tracer,
-          fn: async () => {
-            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.");
-      }
-    },
+  // 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);
-  } else if (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);

package/src/dev-utils/dev-server.mts

@@ -19,7 +19,6 @@ import {
   isCustomComponentsEnabled,
 } from "./custom-build.mjs";
 import { getLogger } from "./dev-logger.mjs";
-import { buildManifestStubPlugin } from "./vite-plugin-build-manifest-stub.mjs";
 import { ddRumPlugin } from "./vite-plugin-dd-rum.mjs";
 import { superblocksCdnPlugin } from "./vite-plugin-sb-cdn.mjs";
 import type { AiService } from "@superblocksteam/vite-plugin-file-sync/ai-service";
@@ -277,8 +276,6 @@ async function startVite({
   const isCustomBuildEnabled = await isCustomComponentsEnabled();
   const customFolder = path.join(root, "custom");
 
-  const draftsFolder = path.join(root, ".superblocks");
-
   const cdnUrl = process.env.SUPERBLOCKS_CDN_URL ?? "http://localhost:4040/cdn";
 
   const env = loadEnv(mode, root, "");
@@ -316,7 +313,7 @@ async function startVite({
     server: {
       middlewareMode: true,
       watch: {
-        ignored: [`${customFolder}/**/*`, `${draftsFolder}/**/*`],
+        ignored: [`${customFolder}/**/*`],
       },
       hmr: hmrOptions,
       cors: {
@@ -350,9 +347,6 @@ async function startVite({
         { isCustomBuildEnabled },
       ) as Plugin,
 
-      // Add a virtual "stub" module for the build manifest
-      buildManifestStubPlugin(),
-
       // for now, only use the CDN locally
       superblocksCdnPlugin({
         imports: {

package/src/dev-utils/vite-plugin-sb-cdn.mts

@@ -224,8 +224,8 @@ async function analyzeModuleGraph(
     { content: string; binary: ArrayBuffer }
   > = new Map(),
 ): Promise<AnalysisResult> {
-  // Avoid circular dependencies and skip the shared library's build manifest reference
-  if (visited.has(url) || url.endsWith("/user-facing/build-manifest.js")) {
+  // Avoid circular dependencies
+  if (visited.has(url)) {
     return {
       dependencies: new Set(),
       content: "",
@@ -474,13 +474,6 @@ const wellKnownPackages = new Map<string, string>([
   ["react-dom", "https://esm.sh/react-dom@18.2.0"],
   ["react/jsx-runtime", "https://esm.sh/react@18.2.0/jsx-runtime"],
   ["react/jsx-dev-runtime", "https://esm.sh/react@18.2.0/jsx-dev-runtime"],
-  ["./user-facing/build-manifest.js", "/assets/build-manifest.js"],
-  ["/assets/user-facing/build-manifest.js", "/assets/build-manifest.js"],
-]);
-
-const packagesToExcludeFromCdnRedirect = new Set<string>([
-  "./user-facing/build-manifest.js",
-  "/assets/user-facing/build-manifest.js",
 ]);
 
 const react18CdnUrl = "https://esm.sh/react@18.2.0";
@@ -780,12 +773,8 @@ export async function superblocksCdnPlugin(
         // Externalize modules specified in the import map
         // The cdn: prefix ensures they're properly resolved to the CDN URL
         if (imports.includes(id)) {
-          const shouldRedirectToCdn = !packagesToExcludeFromCdnRedirect.has(id);
           debug(`Externalizing module for CDN resolution: ${id}`);
-          return {
-            id: `${shouldRedirectToCdn ? "cdn:" : ""}${id}`,
-            external: true,
-          };
+          return { id: `cdn:${id}`, external: true };
         }
 
         return null;