@superblocksteam/sdk 2.0.34 → 2.0.35-next.0

package/src/cli-replacement/dev.mts

@@ -17,18 +17,18 @@ import fs from "fs-extra";
 import { resolveCommand } from "package-manager-detector";
 import { detect } from "package-manager-detector/detect";
 
-import {
-  AUTO_UPGRADE_EXIT_CODE,
-  createDevServer,
-  SuperblocksSdk,
-} from "../index.js";
+import { AUTO_UPGRADE_EXIT_CODE, createDevServer } from "../index.js";
 import { getTracer } from "../telemetry/index.js";
 import { getErrorMeta, getLogger, type Logger } from "../telemetry/logging.js";
 import {
   checkVersionsAndWritePackageJson,
   getCurrentCliVersion,
 } from "./automatic-upgrades.js";
-import type { AuthHotReloadServer, TokenManager } from "../index.js";
+import type {
+  AuthHotReloadServer,
+  TokenManager,
+  SuperblocksSdk,
+} from "../index.js";
 import type {
   ApplicationConfig,
   ApplicationConfigWithTokenConfigAndUserInfo,
@@ -148,7 +148,6 @@ export async function dev(options: {
     applicationConfig,
     autoUpgradeMode,
     tokenManager,
-    getCurrentToken,
     authHotReloadServer,
     sdk,
   } = options;
@@ -214,12 +213,6 @@ export async function dev(options: {
 
     try {
       await maskUnixSignals(async () => {
-        const sdk = new SuperblocksSdk(
-          getCurrentToken(),
-          tokenConfig.superblocksBaseUrl,
-          "",
-        );
-
         if (lockService) {
           await tracer.startActiveSpan("acquiringInitialLock", async (span) => {
             try {
@@ -249,12 +242,12 @@ export async function dev(options: {
         const [localContents, serverHash, currentUser] =
           await tracer.startActiveSpan("fetchInitInfo", async (span) => {
             const results = await Promise.all([
-              sdk.hashLocalDirectory(cwd),
-              sdk.dbfsGetApplicationDirectoryHash({
+              sdk!.hashLocalDirectory(cwd),
+              sdk!.dbfsGetApplicationDirectoryHash({
                 applicationId: applicationConfig.id,
                 branch: applicationConfig.branchName,
               }),
-              sdk.fetchCurrentUser(),
+              sdk!.fetchCurrentUser(),
             ]);
             span.end();
             return results;

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

@@ -19,7 +19,6 @@ import {
 } from "./custom-build.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 { SuperblocksSdk } from "../sdk.js";
 import type { AiService } from "@superblocksteam/vite-plugin-file-sync/ai-service";
 import type { LockService } from "@superblocksteam/vite-plugin-file-sync/lock-service";
@@ -235,6 +234,7 @@ export async function createDevServer({
     const featureFlags = await sdk?.getFeatureFlagsForCurrentUser();
 
     // TODO(code-mode): should this include any validation checks, such as getting a token?
+
     startVite({
       port,
       app,
@@ -248,6 +248,7 @@ export async function createDevServer({
       httpServer,
       features: {
         enableSessionRecording: featureFlags?.enableSessionRecording() ?? false,
+        chakraComponents: featureFlags?.isChakraComponentsEnabled() ?? false,
       },
     }).then(
       (result) => {
@@ -372,6 +373,7 @@ async function startVite({
   httpServer: http.Server;
   features: {
     enableSessionRecording: boolean;
+    chakraComponents: boolean;
   };
 }): Promise<{
   viteServer: ViteDevServer;
@@ -399,12 +401,8 @@ async function startVite({
     `Custom components ${isCustomBuildEnabled ? "enabled" : "disabled"}`,
   );
   const customFolder = path.join(root, "custom");
-
   const draftsFolder = path.join(root, ".superblocks");
 
-  const cdnUrl = process.env.SUPERBLOCKS_CDN_URL ?? "http://localhost:4040/cdn";
-  logger.debug(`Using CDN URL: ${cdnUrl}`);
-
   const env = loadEnv(mode, root, "");
 
   const hmrPort = await getFreePort();
@@ -453,18 +451,7 @@ async function startVite({
   const viteServer = await createServer({
     root,
     mode,
-    resolve: {
-      alias: {
-        "react-router": "@superblocksteam/library",
-      },
-    },
     clearScreen: process.env.SUPERBLOCKS_CLI_ENV !== "local",
-    optimizeDeps: {
-      include: ["lodash", "react-is"],
-      exclude: [],
-    },
-    // See https://vite.dev/config/server-options.html#server-middlewaremode
-    // appType: "custom",
     server: {
       middlewareMode: true,
       watch: {
@@ -477,13 +464,17 @@ async function startVite({
       },
     },
     build: {
-      commonjsOptions: {
-        include: ["react-is"],
-      },
       rollupOptions: {
         external: [`${customFolder}/**/*`],
       },
     },
+    define: {
+      // this replaces a string in @superblocksteam/shared
+      "process.env.SUPERBLOCKS_PUBLIC_INTEGRATIONS_CDN_URL": process.env
+        .SUPERBLOCKS_PUBLIC_INTEGRATIONS_CDN_URL
+        ? JSON.stringify(process.env.SUPERBLOCKS_PUBLIC_INTEGRATIONS_CDN_URL)
+        : "undefined",
+    },
     plugins: [
       tsconfigPaths(),
       customComponentsPlugin(),
@@ -491,20 +482,18 @@ async function startVite({
       // Add a virtual "stub" module for the build manifest
       buildManifestStubPlugin(),
 
-      // for now, only use the CDN locally
-      superblocksCdnPlugin({
-        imports: {
-          "@superblocksteam/library": getValidFileUrl(cdnUrl, "index.js"),
-        },
-        cssImports: {
-          "@superblocksteam/library/index.css": getValidFileUrl(
-            cdnUrl,
-            "index.css",
-          ),
+      react({
+        babel: {
+          plugins: [
+            [
+              import.meta.resolve("@babel/plugin-proposal-decorators"),
+              {
+                version: "2023-11",
+              },
+            ],
+          ],
         },
       }),
-
-      react(),
       ddRumPlugin({
         clientToken: env.SUPERBLOCKS_LIBRARY_DD_CLIENT_TOKEN ?? "",
         applicationId: env.SUPERBLOCKS_LIBRARY_DD_APPLICATION_ID ?? "",
@@ -555,7 +544,3 @@ function getFreePort() {
     });
   });
 }
-
-function getValidFileUrl(url: string, file: string): string {
-  return new URL(file, url.endsWith("/") ? url : url + "/").href;
-}

package/src/flag.ts

@@ -27,6 +27,10 @@ export class FeatureFlags {
     );
   }
 
+  isChakraComponentsEnabled(): boolean {
+    return this.flags["ui.chakra-components"] ?? false;
+  }
+
   enableSessionRecording(): boolean {
     return this.flags["ui.code-mode.enable-session-recording"] ?? false;
   }

package/src/types/common.ts

@@ -12,6 +12,7 @@ export interface FlagBootstrap {
   "superblocks.git.split.large.steps.enabled"?: boolean;
   "superblocks.git.split.large.steps.new.enabled"?: boolean;
   "superblocks.git.split.large.step.lines"?: number;
+  "ui.chakra-components"?: boolean;
   "ui.code-mode.enable-session-recording"?: boolean;
 }