@embeddable.com/sdk-core 3.14.7-next.2 → 4.0.0-next.0

package/src/dev.ts

@@ -53,65 +53,14 @@ let browserWindow: ChildProcess | null = null;
 
 let previewWorkspace: string;
 
-// Build coordination to prevent duplicate plugin builds
-let pluginBuildInProgress = false;
-let pendingPluginBuilds: (() => Promise<void>)[] = [];
-
 const SERVER_PORT = 8926;
 const BUILD_DEV_DIR = ".embeddable-dev-build";
-// NOTE: for backward compatibility, keep the file name as global.css
-const CUSTOM_CANVAS_CSS = "/global.css";
+const CUSTOM_CANVAS_CSS = "/custom-canvas.css";
 
 export const buildWebComponent = async (config: any) => {
   await generate(config, "sdk-react");
 };
 
-const executePluginBuilds = async (
-  config: ResolvedEmbeddableConfig,
-  watchers: Array<RollupWatcher | FSWatcher>,
-) => {
-  if (pluginBuildInProgress) {
-    // If a plugin build is already in progress, queue this one
-    return new Promise<void>((resolve) => {
-      pendingPluginBuilds.push(async () => {
-        await doPluginBuilds(config, watchers);
-        resolve();
-      });
-    });
-  } else {
-    // Start the plugin build immediately
-    await doPluginBuilds(config, watchers);
-  }
-};
-
-const doPluginBuilds = async (
-  config: ResolvedEmbeddableConfig,
-  watchers: Array<RollupWatcher | FSWatcher>,
-) => {
-  pluginBuildInProgress = true;
-
-  try {
-    for (const getPlugin of config.plugins) {
-      const plugin = getPlugin();
-
-      await plugin.validate(config);
-      const watcher = await plugin.build(config);
-      await configureWatcher(watcher as RollupWatcher, config);
-      watchers.push(watcher as RollupWatcher);
-    }
-  } finally {
-    pluginBuildInProgress = false;
-
-    // Process any pending builds
-    if (pendingPluginBuilds.length > 0) {
-      const nextBuild = pendingPluginBuilds.shift();
-      if (nextBuild) {
-        await nextBuild();
-      }
-    }
-  }
-};
-
 const addToGitingore = async () => {
   try {
     const gitignorePath = path.resolve(process.cwd(), ".gitignore");
@@ -265,8 +214,17 @@ export default async () => {
       await sendBuildChanges(config);
 
       if (config.pushComponents) {
-        breadcrumbs.push("build plugins with coordination");
-        await executePluginBuilds(config, watchers);
+        for (const getPlugin of config.plugins) {
+          const plugin = getPlugin();
+
+          breadcrumbs.push("validate plugin");
+          await plugin.validate(config);
+          breadcrumbs.push("build plugin");
+          const watcher = await plugin.build(config);
+          breadcrumbs.push("configure watcher");
+          await configureWatcher(watcher as RollupWatcher, config);
+          watchers.push(watcher as RollupWatcher);
+        }
 
         const customCanvasCssWatch = globalCustomCanvasWatcher(config);
         watchers.push(customCanvasCssWatch);

package/src/push.test.ts

@@ -151,7 +151,7 @@ describe("push", () => {
 
     expect(archiveMock.pipe).toHaveBeenCalled();
     expect(archiveMock.file).toHaveBeenCalledWith("src/custom-canvas.css", {
-      name: "global.css",
+      name: "custom-canvas.css",
     });
     expect(archiveMock.directory).toHaveBeenCalledWith("buildDir", false);
     expect(archiveMock.finalize).toHaveBeenCalled();
@@ -248,10 +248,10 @@ describe("push", () => {
 
       // Should include component build directory
       expect(mockArchiver.directory).toHaveBeenCalled();
-      // Should not include model files (except global.css which is part of components)
+      // Should not include model files (except custom-canvas.css which is part of components)
       expect(mockArchiver.file).toHaveBeenCalledTimes(2);
       expect(mockArchiver.file).toHaveBeenCalledWith(expect.anything(), {
-        name: "global.css",
+        name: "custom-canvas.css",
       });
     });
   });
@@ -452,11 +452,11 @@ describe("push", () => {
         testConfig.client.buildDir,
         false
       );
-      // Should include global.css
+      // Should include custom-canvas.css
       expect(mockArchiver.file).toHaveBeenCalledWith(
         testConfig.client.customCanvasCss,
         {
-          name: "global.css",
+          name: "custom-canvas.css",
         }
       );
       // Should include all model files
@@ -505,11 +505,11 @@ describe("push", () => {
         testConfig.client.buildDir,
         false
       );
-      // Should include global.css
+      // Should include custom-canvas.css
       expect(mockArchiver.file).toHaveBeenCalledWith(
         testConfig.client.customCanvasCss,
         {
-          name: "global.css",
+          name: "custom-canvas.css",
         }
       );
       // Should only find client context files

package/src/push.ts

@@ -36,7 +36,7 @@ export default async () => {
 
     if (!isBuildSuccess && config.pushComponents) {
       console.error(
-        "Build failed or not completed. Please run `embeddable:build` first.",
+        "Build failed or not completed. Please run `embeddable:build` first."
       );
       process.exit(1);
     }
@@ -52,7 +52,7 @@ export default async () => {
             `Authentication failure. Server responded with: "${error.response?.data?.errorMessage}".
 Ensure that your API key is valid for the region specified in the embeddable.config.ts|js file.
 You are using the following region: ${config.region.replace("legacy-", "")} (${config.previewBaseUrl.replace("https://", "")} via ${config.pushBaseUrl})
-Read more about deployment regions at https://docs.embeddable.com/deployment/deployment-regions`,
+Read more about deployment regions at https://docs.embeddable.com/deployment/deployment-regions`
           );
           process.exit(1);
         }
@@ -76,7 +76,7 @@ Read more about deployment regions at https://docs.embeddable.com/deployment/dep
     const { workspaceId, name: workspaceName } = await selectWorkspace(
       ora,
       config,
-      token,
+      token
     );
 
     const workspacePreviewUrl = `${config.previewBaseUrl}/workspace/${workspaceId}`;
@@ -85,7 +85,7 @@ Read more about deployment regions at https://docs.embeddable.com/deployment/dep
     breadcrumbs.push("build archive");
     await buildArchive(config);
     spinnerPushing.info(
-      `Publishing to ${workspaceName} using ${workspacePreviewUrl}...`,
+      `Publishing to ${workspaceName} using ${workspacePreviewUrl}...`
     );
 
     breadcrumbs.push("send build");
@@ -93,7 +93,7 @@ Read more about deployment regions at https://docs.embeddable.com/deployment/dep
 
     publishedSectionFeedback(config, spinnerPushing);
     spinnerPushing.succeed(
-      `Published to ${workspaceName} using ${workspacePreviewUrl}`,
+      `Published to ${workspaceName} using ${workspacePreviewUrl}`
     );
   } catch (error: any) {
     spinnerPushing?.fail("Publishing failed");
@@ -106,7 +106,7 @@ Read more about deployment regions at https://docs.embeddable.com/deployment/dep
 
 const publishedSectionFeedback = (
   config: ResolvedEmbeddableConfig,
-  spinnerPushing: Ora,
+  spinnerPushing: Ora
 ) => {
   config.pushModels && spinnerPushing.succeed("Models published");
   config.pushComponents && spinnerPushing.succeed("Components published");
@@ -115,7 +115,7 @@ const publishedSectionFeedback = (
 async function pushByApiKey(
   config: ResolvedEmbeddableConfig,
   spinner: any,
-  cubeVersion?: string,
+  cubeVersion?: string
 ) {
   const apiKey = getArgumentByKey(["--api-key", "-k"]);
 
@@ -128,7 +128,7 @@ async function pushByApiKey(
 
   if (!email || !/\S+@\S+\.\S+/.test(email)) {
     spinner.fail(
-      "Invalid email provided. Please provide a valid email using --email (-e) flag",
+      "Invalid email provided. Please provide a valid email using --email (-e) flag"
     );
     process.exit(1);
   }
@@ -172,7 +172,7 @@ export async function buildArchive(config: ResolvedEmbeddableConfig) {
 
   if (!config.pushModels && !config.pushComponents) {
     spinnerArchive.fail(
-      "Cannot push: both pushModels and pushComponents are disabled",
+      "Cannot push: both pushModels and pushComponents are disabled"
     );
     process.exit(1);
   }
@@ -182,12 +182,12 @@ export async function buildArchive(config: ResolvedEmbeddableConfig) {
   if (config.pushModels) {
     const cubeFilesList = await findFiles(
       config.client.modelsSrc || config.client.srcDir,
-      CUBE_FILES,
+      CUBE_FILES
     );
 
     const securityContextFilesList = await findFiles(
       config.client.presetsSrc || config.client.srcDir,
-      SECURITY_CONTEXT_FILES,
+      SECURITY_CONTEXT_FILES
     );
 
     filesList.push(
@@ -199,21 +199,21 @@ export async function buildArchive(config: ResolvedEmbeddableConfig) {
       ...securityContextFilesList.map((entry): [string, string] => [
         path.basename(entry[1]),
         entry[1],
-      ]),
+      ])
     );
   }
 
   if (config.pushComponents) {
     const clientContextFilesList = await findFiles(
       config.client.presetsSrc || config.client.srcDir,
-      CLIENT_CONTEXT_FILES,
+      CLIENT_CONTEXT_FILES
     );
 
     filesList.push(
       ...clientContextFilesList.map((entry): [string, string] => [
         path.basename(entry[1]),
         entry[1],
-      ]),
+      ])
     );
   }
 
@@ -240,9 +240,8 @@ export async function archive(args: {
   archive.pipe(output);
   if (!isDev) {
     archive.directory(ctx.client.buildDir, false);
-    // NOTE: for backward compatibility, keep the file name as global.css
     archive.file(ctx.client.customCanvasCss, {
-      name: "global.css",
+      name: "custom-canvas.css",
     });
   }
 
@@ -261,7 +260,7 @@ export async function archive(args: {
 
 export async function createFormData(
   filePath: string,
-  metadata: Record<string, any>,
+  metadata: Record<string, any>
 ) {
   const { FormData, Blob } = await import("formdata-node");
   const { fileFromPath } = await import("formdata-node/file-from-path");
@@ -285,7 +284,7 @@ export async function sendBuildByApiKey(
     email,
     message,
     cubeVersion,
-  }: { apiKey: string; email: string; message?: string; cubeVersion?: string },
+  }: { apiKey: string; email: string; message?: string; cubeVersion?: string }
 ) {
   const form = await createFormData(ctx.client.archiveFile, {
     pushModels: ctx.pushModels,
@@ -298,7 +297,7 @@ export async function sendBuildByApiKey(
   const response = await uploadFile(
     form,
     `${ctx.pushBaseUrl}/api/v1/bundle/upload`,
-    apiKey,
+    apiKey
   );
   await fs.rm(ctx.client.archiveFile);
 
@@ -317,7 +316,7 @@ export async function sendBuild(
     token: string;
     message?: string;
     cubeVersion?: string;
-  },
+  }
 ) {
   const form = await createFormData(ctx.client.archiveFile, {
     pushModels: ctx.pushModels,
@@ -330,7 +329,7 @@ export async function sendBuild(
   await uploadFile(
     form,
     `${ctx.pushBaseUrl}/bundle/${workspaceId}/upload`,
-    token,
+    token
   );
 
   await fs.rm(ctx.client.archiveFile);