@superblocksteam/sdk 2.0.4 → 2.0.5

package/src/cli-replacement/dev.mts

@@ -22,7 +22,11 @@ import { getLogger } from "../dev-utils/dev-logger.mjs";
 import { createDevServer } from "../dev-utils/dev-server.mjs";
 import tracer from "../dev-utils/dev-tracer.js";
 import { SuperblocksSdk } from "../sdk.js";
-import { checkVersionsAndUpgrade } from "./automatic-upgrades.js";
+import {
+  checkVersionsAndUpgrade,
+  getCurrentCliVersion,
+  getCurrentLibraryVersionWithoutPM,
+} from "./automatic-upgrades.js";
 import type { DevLogger } from "../dev-utils/dev-logger.mjs";
 import type { ApplicationConfig } from "../types/common.js";
 import type { DraftInterface } from "@superblocksteam/vite-plugin-file-sync/draft-interface";
@@ -99,9 +103,15 @@ export async function dev(options: {
   skipSync?: boolean;
 
   applicationConfig?: ApplicationConfig;
+
+  /* For debugging purposes to get location of the cli */
+  superblocksPath?: string;
   /* For redirecting output, like when running outside of the CLI */
   logger?: (message: string) => void;
 
+  /* For a child process when restarting the dev server for automatic upgrades */
+  skipAutoUpgrade?: boolean;
+
   /* To cancel the dev server */
   signal?: AbortSignal;
 }) {
@@ -115,8 +125,15 @@ export async function dev(options: {
     uploadFirst,
     skipSync,
     applicationConfig,
+    skipAutoUpgrade,
   } = options;
 
+  const cliVersion = await getCurrentCliVersion();
+  const libraryVersion = await getCurrentLibraryVersionWithoutPM();
+  logger.info(
+    `Running command: ${options.superblocksPath} dev${options.uploadFirst ? " --upload-first" : ""}${options.downloadFirst ? " --download-first" : ""} with baseUrl: ${applicationConfig?.superblocksBaseUrl}, cliVersion: ${cliVersion}, libraryVersion: ${libraryVersion?.alias} ${libraryVersion?.version}`,
+  );
+
   // Add check for node_modules
   if (!fs.existsSync(path.join(cwd, "node_modules"))) {
     throw new Error(
@@ -175,7 +192,8 @@ export async function dev(options: {
             // TODO(code-mode): package naming is preventing upgrade in ephemeral environments
             if (
               !process.env.PACKAGE_SUFFIX ||
-              process.env.PACKAGE_SUFFIX === ""
+              process.env.PACKAGE_SUFFIX === "" ||
+              !skipAutoUpgrade
             ) {
               await checkVersionsAndUpgrade(lockService, applicationConfig);
             }

package/src/dev-utils/dev-tracer.ts

@@ -14,13 +14,18 @@ import type { Span } from "@opentelemetry/api";
 const ATTR_DEPLOYMENT_ENVIRONMENT = "deployment.environment";
 // NOTE: @joeyagreco - this can be used to determine if we are using mock-csb, staging-csb, prod-csb, etc
 const ATTR_SUPERBLOCKS_BASE_URL = "superblocks.base_url";
+const ATTR_SUPERBLOCKS_CLI_TOKEN = "superblocks.cli_token";
 let superblocksTracesUrl = undefined;
 let superblocksHostname = "unknown";
+let token = "unknown";
 try {
   const tokenWithUrl = await getLocalTokenWithUrl();
   const superblocksBaseUrl = new URL(tokenWithUrl.superblocksBaseUrl);
   superblocksTracesUrl = superblocksBaseUrl.origin + "/api/v1/traces";
   superblocksHostname = superblocksBaseUrl.hostname;
+  if ("token" in tokenWithUrl) {
+    token = tokenWithUrl.token.substring(0, 8);
+  }
 } catch (e) {
   console.error("[tracing init] could not determine superblocks base url", e);
 }
@@ -32,6 +37,7 @@ const sdk = new NodeSDK({
       [ATTR_SERVICE_NAME]: "sdk-dev-server",
       [ATTR_DEPLOYMENT_ENVIRONMENT]: process.env.SUPERBLOCKS_CLI_ENV,
       [ATTR_SUPERBLOCKS_BASE_URL]: superblocksHostname,
+      [ATTR_SUPERBLOCKS_CLI_TOKEN]: token,
     }),
   ),
   traceExporter: new OTLPTraceExporter({

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

@@ -693,9 +693,6 @@ export async function superblocksCdnPlugin(
     {
       name: "vite-plugin-superblocks-cdn",
 
-      // run before Vite's module resolution
-      enforce: "pre",
-
       /**
        * Configure Vite to properly handle CDN modules
        * - Exclude CDN modules from optimization
@@ -759,6 +756,8 @@ export async function superblocksCdnPlugin(
 
           cdnDependencyChunks.set(dep, resolved);
         }
+
+        debug("dependencies of CDN modules", cdnDependencyChunks);
       },
 
       resolveId(id, importer) {
@@ -786,6 +785,8 @@ export async function superblocksCdnPlugin(
        * These modules will be loaded from CDN at runtime, so we return empty content
        */
       async load(id: string) {
+        debug("loading module", id);
+
         if (id.startsWith("cdn:")) {
           debug(`Providing empty module for CDN import: ${id}`);
           return "";
@@ -816,9 +817,13 @@ export async function superblocksCdnPlugin(
             }
           }
         }
+
+        debug({ moduleToChunkMap, importToChunkMap });
       },
 
       async transformIndexHtml(html, { server }) {
+        debug("transforming index.html");
+
         const isDevMode = !!server;
 
         // Create the base import map with explicit ordering for proper resolution
@@ -877,7 +882,6 @@ export async function superblocksCdnPlugin(
 
                   // Get the asset URL as it would be served to the browser
                   // For Vite to correctly resolve this module in the browser
-
                   if (resolvedChunkUrl.startsWith("/")) {
                     // For paths starting with /, they're already root-relative
                     // Make sure we don't duplicate the base path
@@ -912,6 +916,8 @@ export async function superblocksCdnPlugin(
                 debug(`Resolved %s to %s`, moduleName, dependencyChunkUrl);
                 // Store in the import map scope
                 importMap.scopes[baseUrl][moduleName] = dependencyChunkUrl;
+                // Also add to main imports for external dependencies
+                importMap.imports[moduleName] = dependencyChunkUrl;
               }
             }
           }

package/src/index.ts

@@ -114,6 +114,8 @@ export {
   type ModeFlag,
 } from "./version-control.mjs";
 
+export { AUTO_UPGRADE_EXIT_CODE } from "./cli-replacement/automatic-upgrades.js";
+
 export { createDevServer } from "./dev-utils/dev-server.mjs";
 
 export { dev } from "./cli-replacement/dev.mjs";