@superblocksteam/sdk 2.0.6-next.113 → 2.0.6-next.12

package/src/client.ts

@@ -11,7 +11,6 @@ import {
   NotFoundError,
   BadRequestError,
   unreachable,
-  getSuperblocksDevEnvironmentConfigJson,
 } from "@superblocksteam/util";
 import axios, { AxiosError } from "axios";
 import FormData from "form-data";
@@ -25,10 +24,6 @@ import { signingEnabled } from "./flag.js";
 import { connectToISocketRPCServer } from "./socket/index.js";
 import { AgentType } from "./types/index.js";
 import { getAgentUrl } from "./utils.js";
-import {
-  DEFAULT_BRANCH,
-  getCurrentGitBranchIfGit,
-} from "./version-control.mjs";
 import type { StdISocketRPCClient } from "./socket/index.js";
 import type {
   ApiWithPb,
@@ -138,116 +133,6 @@ enum ResourceType {
   BACKEND = "BACKEND",
 }
 
-export enum BranchSource {
-  DEV_ENVIRONMENT = "dev environment config file",
-  COMMAND_LINE = "command line",
-  GIT_REPO = "current git repository",
-  DEFAULT = "default",
-}
-
-export class CurrentBranch {
-  public readonly branchName: string;
-  public readonly source: BranchSource;
-  public readonly sourcePath?: string;
-  public readonly userSpecifiedBranch?: string;
-
-  constructor({
-    branchName,
-    source,
-    sourcePath,
-    userSpecifiedBranch,
-  }: {
-    branchName: string;
-    source: BranchSource;
-    sourcePath?: string;
-    userSpecifiedBranch?: string;
-  }) {
-    this.branchName = branchName;
-    this.source = source;
-    this.sourcePath = sourcePath;
-    this.userSpecifiedBranch = userSpecifiedBranch;
-  }
-  isDevEnvironmentWithUserSpecifiedBranch() {
-    return (
-      this.isDefinedInDevEnvironmentConfig() &&
-      this.userSpecifiedBranch !== undefined
-    );
-  }
-  isDefinedInDevEnvironmentConfig(): boolean {
-    return this.source === BranchSource.DEV_ENVIRONMENT;
-  }
-  isDefaultBranch(): boolean {
-    return this.source === BranchSource.DEFAULT;
-  }
-  isGitBranch(): boolean {
-    return this.source === BranchSource.GIT_REPO;
-  }
-}
-
-const DEFAULT_BRANCH_INFO = new CurrentBranch({
-  branchName: DEFAULT_BRANCH,
-  source: BranchSource.DEFAULT,
-});
-
-// TODO (randall): Remove this and the 'index.ts' export when it is no longer needed in the CLI.
-export function getDefaultBranchInfo(): CurrentBranch {
-  return DEFAULT_BRANCH_INFO;
-}
-
-/**
- * Returns the current branch name, in the following order of precedence:
- * 1. If a branch name is specified in the dev environment config, use that
- * 2. If a branch name is specified, use that
- * 3. If this is in a git repo, use the current branch
- * 4. If this is not in a git repo, use the default branch
- * @param userSpecifiedBranch - The branch name specified by the user
- * @param pathPrefix - The path prefix to use when looking for the dev environment config
- * @returns The current branch information
- */
-export async function getCurrentBranchInfo(
-  userSpecifiedBranch?: string,
-  pathPrefix?: string,
-): Promise<CurrentBranch> {
-  // First, if there is a dev environment config and a branch name is specified, use that
-  try {
-    const [devEnvironmentConfig, devEnvConfigPath] =
-      await getSuperblocksDevEnvironmentConfigJson(true, pathPrefix);
-    if (devEnvironmentConfig.branch) {
-      return new CurrentBranch({
-        branchName: devEnvironmentConfig.branch,
-        source: BranchSource.DEV_ENVIRONMENT,
-        sourcePath: devEnvConfigPath,
-        userSpecifiedBranch: userSpecifiedBranch,
-      });
-    }
-  } catch {
-    // Did not find or could not parse the dev environment config, so continue
-  }
-  // Second, if the user specified a branch name, use that
-  if (userSpecifiedBranch) {
-    return new CurrentBranch({
-      branchName: userSpecifiedBranch,
-      source: BranchSource.COMMAND_LINE,
-      userSpecifiedBranch: userSpecifiedBranch,
-    });
-  }
-  // Third, if this is in a git repo, use the current branch
-  const currentGitBranch = await getCurrentGitBranchIfGit();
-  if (currentGitBranch) {
-    return new CurrentBranch({
-      branchName: currentGitBranch,
-      source: BranchSource.GIT_REPO,
-      userSpecifiedBranch: userSpecifiedBranch,
-    });
-  }
-  // Fourth, if this is not in a git repo, use the default branch
-  return new CurrentBranch({
-    branchName: DEFAULT_BRANCH,
-    source: BranchSource.DEFAULT,
-    userSpecifiedBranch: userSpecifiedBranch,
-  });
-}
-
 export async function fetchApplication({
   cliVersion,
   applicationId,

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

@@ -1,113 +1,39 @@
 import { createLogger, format, transports } from "winston";
-import type winston from "winston";
 
-const activeTransports: winston.transport[] = [];
-
-if (process.env.SUPERBLOCKS_IS_CSB === "true") {
-  activeTransports.push(
-    new transports.File({
-      format: format.json(),
-      filename: `/tmp/dev-server.log`,
-      level: "info",
-    }),
-  );
-}
-
-activeTransports.push(
-  new transports.Console({
-    format: format.combine(
-      format.colorize(),
-      format.timestamp({
-        format: "HH:mm:ss.SSS",
-      }),
-      format.printf((props) => {
-        const { message, timestamp, error, level } = props;
-        const base =
-          process.env.SUPERBLOCKS_IS_CSB === "true"
-            ? `${timestamp} ${message}`
-            : `${message}`;
-        if (level === "error") {
-          return `${base} ${(error as ErrorMeta["error"]).message} ${(error as ErrorMeta["error"]).stack}`;
-        }
-        return base;
-      }),
-    ),
-  }),
-);
+export type DevLogger = {
+  debug: (message: string, ...meta: any[]) => void;
+  info: (message: string, ...meta: any[]) => void;
+  warn: (message: string, ...meta: any[]) => void;
+  error: (message: string, ...meta: any[]) => void;
+};
 
 const winstonLogger = createLogger({
-  level: "debug",
+  level: "info",
   exitOnError: false,
   format: format.json(),
-  transports: activeTransports,
-});
-
-interface ErrorMeta {
-  error: {
-    kind: string;
-    message: string;
-    stack?: string;
-  };
-}
-
-export interface DevLogger {
-  log: (...messages: string[]) => void;
-  debug: (...messages: string[]) => void;
-  info: (...messages: string[]) => void;
-  warn: (...messages: string[]) => void;
-  error: (message: string, meta?: ErrorMeta) => void;
-}
-const logger: DevLogger = Object.freeze({
-  debug: (...messages: string[]) =>
-    winstonLogger.debug(
-      messages.length > 0 ? messages.join(" ") : (messages[0] as string),
-    ),
-  log: (...messages: string[]) =>
-    winstonLogger.info(
-      messages.length > 0 ? messages.join(" ") : (messages[0] as string),
-    ),
-  info: (...messages: string[]) =>
-    winstonLogger.info(
-      messages.length > 0 ? messages.join(" ") : (messages[0] as string),
-    ),
-  warn: (...messages: string[]) =>
-    winstonLogger.warn(
-      messages.length > 0 ? messages.join(" ") : (messages[0] as string),
-    ),
-  error: (message: string, meta?: ErrorMeta) =>
-    winstonLogger.error(message, meta),
+  transports: [
+    new transports.File({ filename: `/tmp/dev-server.log`, level: "info" }),
+    new transports.Console({
+      format: format.combine(
+        format.printf(({ message }) => `${message}`),
+        format.colorize({ message: true }),
+      ),
+      level: "debug",
+    }),
+  ],
 });
 
 export function getLogger(
-  loggerOverride?: (...messages: string[]) => void,
+  loggerOverride?: (message: string) => void,
 ): DevLogger {
   if (!loggerOverride) {
-    return logger;
+    return winstonLogger;
   }
 
   return {
     debug: loggerOverride,
     info: loggerOverride,
     warn: loggerOverride,
-    log: loggerOverride,
-    error: loggerOverride as any,
-  };
-}
-
-export function getErrorMeta(error: unknown): ErrorMeta {
-  if (error instanceof Error) {
-    return {
-      error: {
-        kind: error.name,
-        message: error.message,
-        stack: error.stack,
-      },
-    };
-  }
-  return {
-    error: {
-      kind: "Unknown Error",
-      message: JSON.stringify(error),
-    },
+    error: loggerOverride,
   };
 }

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

@@ -18,8 +18,7 @@ import {
   customComponentsPlugin,
   isCustomComponentsEnabled,
 } from "./custom-build.mjs";
-import { getErrorMeta, getLogger } from "./dev-logger.mjs";
-import { buildManifestStubPlugin } from "./vite-plugin-build-manifest-stub.mjs";
+import { getLogger } from "./dev-logger.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";
@@ -188,6 +187,13 @@ export async function createDevServer({
     }, viteReject);
   });
 
+  // TODO(code-mode): remove this soon
+  app.get("/_sb_disconnect", async (_req, res) => {
+    console.log("GET /_sb_disconnect");
+    // TODO(code-mode): should this include any validation checks, such as getting a token?
+    await gracefulShutdown({ logger, serverInitiated: false });
+    res.send("ok");
+  });
   app.post("/_sb_disconnect", async (req, res) => {
     const { initiatedByEmail, switchingTo } = req.body;
     // TODO(code-mode): should this include any validation checks, such as getting a token?
@@ -200,7 +206,7 @@ export async function createDevServer({
       });
       res.send("ok");
     } catch (e) {
-      logger.error("Error disconnecting from dev server", getErrorMeta(e));
+      console.error("Error disconnecting from dev server", e);
       res.status(500).send("Error disconnecting from dev server");
     }
   });
@@ -254,7 +260,7 @@ async function startVite({
 }) {
   const viteLogger = createLogger();
   const logger = getLogger(loggerOverride);
-  viteLogger.info = (msg: string) => logger.info(msg);
+  viteLogger.info = logger.info;
   viteLogger.warn = (msg: string) => {
     logger.warn(yellow(msg));
   };
@@ -270,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, "");
@@ -309,7 +313,10 @@ async function startVite({
     server: {
       middlewareMode: true,
       watch: {
-        ignored: [`${customFolder}/**/*`, `${draftsFolder}/**/*`],
+        ignored: [
+          `${customFolder}/**/*`,
+          `${root}/.superblocks/{generations,drafts}/**/*`,
+        ],
       },
       hmr: hmrOptions,
       cors: {
@@ -338,13 +345,11 @@ async function startVite({
           aiService,
           httpServer,
           tracer,
+          logger,
         },
         { 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/dev-tracer.ts

@@ -6,13 +6,8 @@ import { HttpInstrumentation } from "@opentelemetry/instrumentation-http";
 import { Resource } from "@opentelemetry/resources";
 import { NodeSDK } from "@opentelemetry/sdk-node";
 import { ATTR_SERVICE_NAME } from "@opentelemetry/semantic-conventions";
-import {
-  OBS_TAG_APPLICATION_ID,
-  OBS_TAG_BRANCH,
-} from "@superblocksteam/shared";
 import { getLocalTokenWithUrl } from "@superblocksteam/util";
 import packageJson from "../../package.json" with { type: "json" };
-import type { ApplicationConfig } from "../types/index.js";
 import type { Span } from "@opentelemetry/api";
 
 // NOTE: @joeyagreco - this is how the "env" facet is determined in datadog: https://docs.datadoghq.com/opentelemetry/setup/collector_exporter/#3---configure-your-application
@@ -20,7 +15,6 @@ 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";
-const ATTR_SUPERBLOCKS_IS_CSB = "superblocks.is_csb";
 let superblocksTracesUrl = undefined;
 let superblocksHostname = "unknown";
 let token = "unknown";
@@ -36,50 +30,45 @@ try {
   console.error("[tracing init] could not determine superblocks base url", e);
 }
 
-export const initializeTracingSdk = (applicationConfig?: ApplicationConfig) => {
-  // Initialize the OpenTelemetry SDK
-  const sdk = new NodeSDK({
-    resource: Resource.default().merge(
-      new Resource({
-        [ATTR_SERVICE_NAME]: "sdk-dev-server",
-        [ATTR_DEPLOYMENT_ENVIRONMENT]: process.env.SUPERBLOCKS_CLI_ENV,
-        [ATTR_SUPERBLOCKS_BASE_URL]: superblocksHostname,
-        [ATTR_SUPERBLOCKS_CLI_TOKEN]: token,
-        [OBS_TAG_APPLICATION_ID]: applicationConfig?.id,
-        [OBS_TAG_BRANCH]: applicationConfig?.branchName,
-        [ATTR_SUPERBLOCKS_IS_CSB]: process.env.SUPERBLOCKS_IS_CSB,
-      }),
-    ),
-    traceExporter: new OTLPTraceExporter({
-      url: superblocksTracesUrl, // OTLPTraceExporter defaults to sending traffic to http://localhost:4318/v1/traces
+// Initialize the OpenTelemetry SDK
+const sdk = new NodeSDK({
+  resource: Resource.default().merge(
+    new Resource({
+      [ATTR_SERVICE_NAME]: "sdk-dev-server",
+      [ATTR_DEPLOYMENT_ENVIRONMENT]: process.env.SUPERBLOCKS_CLI_ENV,
+      [ATTR_SUPERBLOCKS_BASE_URL]: superblocksHostname,
+      [ATTR_SUPERBLOCKS_CLI_TOKEN]: token,
     }),
-    contextManager: new AsyncLocalStorageContextManager(),
-    instrumentations: [
-      // Configure HTTP instrumentation with custom attributes
-      new HttpInstrumentation({
-        requestHook: (span: Span, request: any) => {
-          let resource = "GET";
-          if (request) {
-            resource = `${request.method} ${request.url || request.path}`;
-          }
-          span.setAttributes({
-            "resource.name": resource,
-          });
-        },
-      }),
-      // Configure Express instrumentation
-      new ExpressInstrumentation({
-        requestHook: (span: Span, request: any) => {
-          span.setAttributes({
-            "resource.name": `${request.method} ${request.url}`,
-          });
-        },
-      }),
-    ],
-  });
+  ),
+  traceExporter: new OTLPTraceExporter({
+    url: superblocksTracesUrl, // OTLPTraceExporter defaults to sending traffic to http://localhost:4318/v1/traces
+  }),
+  contextManager: new AsyncLocalStorageContextManager(),
+  instrumentations: [
+    // Configure HTTP instrumentation with custom attributes
+    new HttpInstrumentation({
+      requestHook: (span: Span, request: any) => {
+        let resource = "GET";
+        if (request) {
+          resource = `${request.method} ${request.url || request.path}`;
+        }
+        span.setAttributes({
+          "resource.name": resource,
+        });
+      },
+    }),
+    // Configure Express instrumentation
+    new ExpressInstrumentation({
+      requestHook: (span: Span, request: any) => {
+        span.setAttributes({
+          "resource.name": `${request.method} ${request.url}`,
+        });
+      },
+    }),
+  ],
+});
 
-  sdk.start();
-};
+sdk.start();
 
 // Get a tracer instance
 const tracer = trace.getTracer("sdk-dev-server", packageJson.version);

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;

package/src/index.ts

@@ -11,8 +11,6 @@ export {
   fetchApplicationWithComponents,
   fetchApplications,
   fetchCurrentUser,
-  getDefaultBranchInfo,
-  getCurrentBranchInfo,
   pushApi,
   pushApplication,
   registerComponents,
@@ -22,10 +20,8 @@ export {
   type ApplicationWrapper,
   type Branch,
   type Branches,
-  type BranchSource,
   type CodeModeApplicationWrapper,
   type CommitDto,
-  type CurrentBranch,
   type GetCommitsResponseBody,
   type MultiPageApplicationWrapper,
   type MultiPageApplicationWrapperWithComponents,

package/src/vite-plugin-inject-sb-ids-transform.mts

@@ -29,7 +29,7 @@ const routesFileBaseName = "routes.json";
 export async function injectSuperblocksIdsPlugin(root: string) {
   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));
   };