@superblocksteam/sdk 2.0.41-next.9 → 2.0.42-next.0

package/dist/vite-plugin-optimize-lucide-imports.js

@@ -0,0 +1,96 @@
+// Pre-compile regex for better performance
+const LUCIDE_IMPORT_PATTERN = /([ \t]*)import\s+\{\s*([^}]+)\s*\}\s+from\s+['"]lucide-react['"]/g;
+/**
+ * A Vite plugin that optimizes lucide-react imports by converting
+ * destructured imports to direct imports for better tree-shaking
+ */
+function createLucideReactImportOptimizer() {
+    return {
+        name: "lucide-react-import-optimizer",
+        transform(sourceCode, filePath) {
+            if (!isValidInput(sourceCode, filePath))
+                return null;
+            try {
+                // Quick check if the file contains lucide-astro imports
+                if (!sourceCode.includes("lucide-react"))
+                    return null;
+                const { transformedCode, hasChanges } = transformLucideImports(sourceCode);
+                if (hasChanges) {
+                    return {
+                        code: transformedCode,
+                        map: null, // No source maps in this implementation
+                    };
+                }
+                return null;
+            }
+            catch (error) {
+                handleTransformError(error);
+                return null;
+            }
+        },
+    };
+}
+/**
+ * Validates the input parameters for processing
+ */
+function isValidInput(code, id) {
+    return Boolean(code && id);
+}
+/**
+ * Transforms lucide-react imports from destructured to individual imports
+ */
+function transformLucideImports(sourceCode) {
+    let hasChanges = false;
+    const transformedCode = sourceCode.replace(LUCIDE_IMPORT_PATTERN, (match, indentation, importNames) => {
+        if (!importNames.trim())
+            return match;
+        const semicolonAtEnd = match.endsWith(";");
+        const individualImports = convertToIndividualImports(importNames, indentation, semicolonAtEnd);
+        if (individualImports) {
+            hasChanges = true;
+            return individualImports;
+        }
+        return match;
+    });
+    return { transformedCode, hasChanges };
+}
+/**
+ * Converts a comma-separated list of imports to individual import statements
+ */
+function convertToIndividualImports(importNames, indentation, withSemicolon) {
+    return importNames
+        .split(",")
+        .map((name) => name.trim())
+        .filter(Boolean)
+        .map((name) => {
+        const kebabCasePath = convertToKebabCase(name);
+        const semicolon = withSemicolon ? ";" : "";
+        return `${indentation}import ${name} from "lucide-react/dist/esm/icons/${kebabCasePath}"${semicolon}`;
+    })
+        .join("\n");
+}
+/**
+ * Converts a camelCase or PascalCase string to kebab-case
+ * Should handle cases like:
+ * - CheckIcon -> check
+ * - BluetoothConnectedIcon -> bluetooth-connected
+ * - XIcon -> x
+ * - Loader2Icon -> loader-2
+ * - Grid2X2CheckIcon -> grid-2-x-2-check
+ */
+function convertToKebabCase(str) {
+    return str
+        .replace("Icon", "")
+        .replace(/([a-z0-9])([A-Z])/g, "$1-$2")
+        .replace(/([a-zA-Z])([0-9])/g, "$1-$2")
+        .toLowerCase();
+}
+/**
+ * Handles and logs transformation errors
+ */
+function handleTransformError(error) {
+    const typedError = error instanceof Error ? error : new Error(String(error));
+    console.error("Error in lucide-react-import-optimizer plugin:", typedError);
+}
+export default createLucideReactImportOptimizer;
+//# sourceMappingURL=vite-plugin-optimize-lucide-imports.js.map

package/dist/vite-plugin-optimize-lucide-imports.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"vite-plugin-optimize-lucide-imports.js","sourceRoot":"","sources":["../src/vite-plugin-optimize-lucide-imports.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superblocksteam/sdk",
-  "version": "2.0.41-next.9",
+  "version": "2.0.42-next.0",
   "type": "module",
   "description": "Superblocks JS SDK",
   "homepage": "https://www.superblocks.com",
@@ -34,11 +34,11 @@
     "@opentelemetry/semantic-conventions": "^1.28.0",
     "@rollup/wasm-node": "^4.35.0",
     "@superblocksteam/bucketeer-sdk": "0.5.0",
-    "@superblocksteam/library": "2.0.41-next.9",
-    "@superblocksteam/library-shared": "2.0.41-next.9",
-    "@superblocksteam/shared": "0.9460.0",
-    "@superblocksteam/util": "2.0.41-next.9",
-    "@superblocksteam/vite-plugin-file-sync": "2.0.41-next.9",
+    "@superblocksteam/library": "2.0.42-next.0",
+    "@superblocksteam/library-shared": "2.0.42-next.0",
+    "@superblocksteam/shared": "0.9484.0",
+    "@superblocksteam/util": "2.0.42-next.0",
+    "@superblocksteam/vite-plugin-file-sync": "2.0.42-next.0",
     "@vitejs/plugin-react": "4.3.4",
     "axios": "^1.4.0",
     "chokidar": "^4.0.3",

package/src/application-build.mts

@@ -10,6 +10,7 @@ import { ddRumPlugin } from "./dev-utils/vite-plugin-dd-rum.mjs";
 import { getLogger } from "./telemetry/logging.js";
 import { generateBuildManifestPlugin } from "./vite-plugin-generate-build-manifest.mjs";
 import { injectSuperblocksIdsPlugin } from "./vite-plugin-inject-sb-ids-transform.mjs";
+import createLucideReactImportOptimizer from "./vite-plugin-optimize-lucide-imports.js";
 
 export async function buildApplication({
   root,
@@ -112,8 +113,8 @@ async function buildWithVite({
       customComponentsPlugin(),
       injectSuperblocksIdsPlugin(root),
       react(),
+      createLucideReactImportOptimizer(),
       generateBuildManifestPlugin(root),
-
       ddRumPlugin({
         clientToken: ddClientToken ?? "",
         applicationId: ddApplicationId ?? "",

package/src/client.ts

@@ -28,6 +28,7 @@ import { AgentType } from "./types/index.js";
 import { getAgentUrl } from "./utils.js";
 import {
   DEFAULT_BRANCH,
+  findGitRepositoryRoot,
   getCurrentGitBranchIfGit,
 } from "./version-control.mjs";
 import type { StdISocketRPCClient } from "./socket/index.js";
@@ -327,9 +328,24 @@ export async function fetchApplication({
     return data;
   } catch (e) {
     if (axios.isAxiosError(e) && e.response?.status === 404) {
-      throw new NotFoundError(
-        `Application ${applicationId} was not found with branch ${branch}, are you sure you are on the correct application and branch?`,
-      );
+      let errorMessage = `Application ${applicationId} was not found on branch '${branch}'. `;
+
+      // Try to get the actual current branch to provide more helpful context
+      try {
+        const [actualBranch, gitRoot] = await Promise.all([
+          getCurrentGitBranchIfGit(),
+          findGitRepositoryRoot(),
+        ]);
+        if (actualBranch && gitRoot) {
+          errorMessage += `You are currently on branch '${actualBranch}' in a git repository at '${gitRoot}'. `;
+        }
+      } catch {
+        // Ignore errors getting current branch
+      }
+
+      errorMessage +=
+        "Are you sure you are on the correct application and branch?";
+      throw new NotFoundError(errorMessage);
     }
     throw new Error(
       `Could not fetch application: ${

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

@@ -13,6 +13,7 @@ import pkg from "../../package.json" with { type: "json" };
 import { getTracer } from "../telemetry/index.js";
 import { getErrorMeta, getLogger } from "../telemetry/logging.js";
 import { getCurrentGitBranchIfGit } from "../version-control.mjs";
+import createLucideReactImportOptimizer from "../vite-plugin-optimize-lucide-imports.js";
 import {
   customComponentsPlugin,
   isCustomComponentsEnabled,
@@ -211,11 +212,11 @@ export async function createDevServer({
         req.headers["x-superblocks-branch"] !== currentBranch
       ) {
         logger.error(
-          `Branch header mismatch, expected ${currentBranch}, received ${req.headers["x-superblocks-branch"]}`,
+          `Dev server expects branch ${currentBranch}, but received ${req.headers["x-superblocks-branch"]}. Check your current branch with 'git branch' and try again.`,
         );
         res.status(401).send(
           JSON.stringify({
-            error: `Branch header mismatch. Expected ${currentBranch}, received ${req.headers["x-superblocks-branch"]}`,
+            error: `Dev server expects branch ${currentBranch}, but received ${req.headers["x-superblocks-branch"]}. Check your current branch with 'git branch' and try again.`,
           }),
         );
         return;
@@ -481,7 +482,6 @@ async function startVite({
       fileSyncPluginCreator.plugin,
       // Add a virtual "stub" module for the build manifest
       buildManifestStubPlugin(),
-
       react({
         babel: {
           plugins: [
@@ -494,6 +494,7 @@ async function startVite({
           ],
         },
       }),
+      createLucideReactImportOptimizer(),
       ddRumPlugin({
         clientToken: env.SUPERBLOCKS_LIBRARY_DD_CLIENT_TOKEN ?? "",
         applicationId: env.SUPERBLOCKS_LIBRARY_DD_APPLICATION_ID ?? "",

package/src/version-control.mts

@@ -1033,6 +1033,19 @@ export async function getLocalGitRepoState(
   };
 }
 
+/**
+ * Returns the root directory of the git repository, or null if not in a git repo
+ */
+export async function findGitRepositoryRoot(): Promise<string | null> {
+  const git: SimpleGit = simpleGit();
+  try {
+    const rootDir = await git.revparse(["--show-toplevel"]);
+    return rootDir.trim();
+  } catch {
+    return null;
+  }
+}
+
 /**
  * Returns the current git branch, or undefined if not in a git repo
  */

package/src/vite-plugin-optimize-lucide-imports.ts

@@ -0,0 +1,128 @@
+import type { TransformResult, Plugin } from "vite";
+
+// Pre-compile regex for better performance
+const LUCIDE_IMPORT_PATTERN =
+  /([ \t]*)import\s+\{\s*([^}]+)\s*\}\s+from\s+['"]lucide-react['"]/g;
+
+/**
+ * A Vite plugin that optimizes lucide-react imports by converting
+ * destructured imports to direct imports for better tree-shaking
+ */
+function createLucideReactImportOptimizer(): Plugin {
+  return {
+    name: "lucide-react-import-optimizer",
+    transform(
+      sourceCode: string,
+      filePath: string,
+    ): TransformResult | null | undefined {
+      if (!isValidInput(sourceCode, filePath)) return null;
+
+      try {
+        // Quick check if the file contains lucide-astro imports
+        if (!sourceCode.includes("lucide-react")) return null;
+
+        const { transformedCode, hasChanges } =
+          transformLucideImports(sourceCode);
+
+        if (hasChanges) {
+          return {
+            code: transformedCode,
+            map: null, // No source maps in this implementation
+          };
+        }
+
+        return null;
+      } catch (error) {
+        handleTransformError(error);
+        return null;
+      }
+    },
+  };
+}
+
+/**
+ * Validates the input parameters for processing
+ */
+function isValidInput(code: string, id: string): boolean {
+  return Boolean(code && id);
+}
+
+/**
+ * Transforms lucide-react imports from destructured to individual imports
+ */
+function transformLucideImports(sourceCode: string): {
+  transformedCode: string;
+  hasChanges: boolean;
+} {
+  let hasChanges = false;
+
+  const transformedCode = sourceCode.replace(
+    LUCIDE_IMPORT_PATTERN,
+    (match: string, indentation: string, importNames: string): string => {
+      if (!importNames.trim()) return match;
+
+      const semicolonAtEnd = match.endsWith(";");
+      const individualImports = convertToIndividualImports(
+        importNames,
+        indentation,
+        semicolonAtEnd,
+      );
+
+      if (individualImports) {
+        hasChanges = true;
+        return individualImports;
+      }
+
+      return match;
+    },
+  );
+
+  return { transformedCode, hasChanges };
+}
+
+/**
+ * Converts a comma-separated list of imports to individual import statements
+ */
+function convertToIndividualImports(
+  importNames: string,
+  indentation: string,
+  withSemicolon: boolean,
+): string {
+  return importNames
+    .split(",")
+    .map((name) => name.trim())
+    .filter(Boolean)
+    .map((name) => {
+      const kebabCasePath = convertToKebabCase(name);
+      const semicolon = withSemicolon ? ";" : "";
+      return `${indentation}import ${name} from "lucide-react/dist/esm/icons/${kebabCasePath}"${semicolon}`;
+    })
+    .join("\n");
+}
+
+/**
+ * Converts a camelCase or PascalCase string to kebab-case
+ * Should handle cases like:
+ * - CheckIcon -> check
+ * - BluetoothConnectedIcon -> bluetooth-connected
+ * - XIcon -> x
+ * - Loader2Icon -> loader-2
+ * - Grid2X2CheckIcon -> grid-2-x-2-check
+ */
+function convertToKebabCase(str: string): string {
+  return str
+    .replace("Icon", "")
+    .replace(/([a-z0-9])([A-Z])/g, "$1-$2")
+    .replace(/([a-zA-Z])([0-9])/g, "$1-$2")
+    .toLowerCase();
+}
+
+/**
+ * Handles and logs transformation errors
+ */
+function handleTransformError(error: unknown): void {
+  const typedError = error instanceof Error ? error : new Error(String(error));
+  console.error("Error in lucide-react-import-optimizer plugin:", typedError);
+}
+
+export default createLucideReactImportOptimizer;