@embeddable.com/sdk-core 3.9.0 → 3.9.1

package/lib/push.d.ts

@@ -1,8 +1,7 @@
 export declare const YAML_OR_JS_FILES: RegExp;
-export declare const SELF_SERVE_CUSTOM_FILES: RegExp;
 declare const _default: () => Promise<void>;
 export default _default;
-export declare function archive(ctx: any, yamlFiles: [string, string][], selfServeFiles?: [string, string][], includeBuild?: boolean): Promise<unknown>;
+export declare function archive(ctx: any, yamlFiles: [string, string][], isDev?: boolean): Promise<unknown>;
 export declare function sendBuildByApiKey(ctx: any, { apiKey, email, message }: any): Promise<{
     bundleId: any;
     email: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embeddable.com/sdk-core",
-  "version": "3.9.0",
+  "version": "3.9.1",
   "description": "Core Embeddable SDK module responsible for web-components bundling and publishing.",
   "keywords": [
     "embeddable",

package/src/defineConfig.test.ts

@@ -53,10 +53,10 @@ describe("defineConfig", () => {
           "bundleHash": undefined,
           "componentDir": "/embeddable-sdk/packages/core-sdk",
           "errorFallbackComponent": "/embeddable-sdk/packages/core-sdk",
+          "globalCss": "/embeddable-sdk/packages/core-sdk",
           "modelsSrc": "/embeddable-sdk/packages/core-sdk",
           "rollupOptions": {},
           "rootDir": "/embeddable-sdk/packages/core-sdk",
-          "selfServeCustomizationDir": "/embeddable-sdk/packages/core-sdk",
           "srcDir": "/embeddable-sdk/packages/core-sdk",
           "stencilBuild": "/embeddable-sdk/packages/core-sdk",
           "tmpDir": "/embeddable-sdk/packages/core-sdk",

package/src/defineConfig.ts

@@ -19,7 +19,7 @@ export type EmbeddableConfig = {
   previewBaseUrl?: string;
   componentsSrc?: string;
   modelsSrc?: string;
-  selfServeCustomizationSrc?: string;
+  globalCss?: string;
   viteConfig?: {
     resolve?: {
       alias?: Record<string, string>;
@@ -40,7 +40,7 @@ export default ({
   previewBaseUrl,
   modelsSrc = "src",
   componentsSrc = "src",
-  selfServeCustomizationSrc = "src/self-serve-customization",
+  globalCss = "src/global.css",
   viteConfig = {},
   rollupOptions = {},
 }: EmbeddableConfig) => {
@@ -77,10 +77,7 @@ export default ({
       modelsSrc: modelsSrc ? path.resolve(clientRoot, modelsSrc) : undefined,
       buildDir: path.resolve(clientRoot, ".embeddable-build"),
       tmpDir: path.resolve(clientRoot, ".embeddable-tmp"),
-      selfServeCustomizationDir: path.resolve(
-        clientRoot,
-        selfServeCustomizationSrc,
-      ),
+      globalCss: path.resolve(clientRoot, globalCss),
       componentDir: path.resolve(clientRoot, ".embeddable-build", "component"),
       stencilBuild: path.resolve(
         clientRoot,

package/src/dev.test.ts

@@ -39,7 +39,7 @@ const mockConfig = {
     componentDir: "/mock/root/.embeddable-dev-build/component",
     stencilBuild: "/mock/root/.embeddable-dev-build/dist/embeddable-wrapper",
     tmpDir: "/mock/root/.embeddable-dev-tmp",
-    selfServeCustomizationDir: "/mock/root/self-serve",
+    globalCss: "/mock/root/global.css",
     modelsSrc: "/mock/root/models",
   },
   plugins: [],

package/src/dev.ts

@@ -26,6 +26,7 @@ import validate from "./validate";
 import { checkNodeVersion } from "./utils";
 import { createManifest } from "./cleanup";
 import { selectWorkspace } from "./workspaceUtils";
+import * as fs from "fs";
 const minimist = require("minimist");
 
 const oraP = import("ora");
@@ -38,7 +39,7 @@ let previewWorkspace: string;
 
 const SERVER_PORT = 8926;
 const BUILD_DEV_DIR = ".embeddable-dev-build";
-const SELF_SERVE_CUSTOMIZATION_REQUEST_URL = "/self-serve-customization";
+const GLOBAL_CSS = "/global.css";
 
 const buildWebComponent = async (config: any) => {
   await generate(config, "sdk-react");
@@ -104,7 +105,6 @@ export default async () => {
   const serveStatic = require("serve-static");
 
   const serve = serveStatic(config.client.buildDir);
-  const serveSelfeServe = serveStatic(config.client.selfServeCustomizationDir);
 
   const workspacePreparation = ora("Preparing workspace...").start();
 
@@ -140,20 +140,16 @@ export default async () => {
 
       const done = finalhandler(request, res);
 
-      const selectedServe = request.url?.startsWith(
-        SELF_SERVE_CUSTOMIZATION_REQUEST_URL,
-      )
-        ? serveSelfeServe
-        : serve;
-
-      request.url = request.url?.replace(
-        SELF_SERVE_CUSTOMIZATION_REQUEST_URL,
-        "",
-      );
+      if (request.url?.endsWith(GLOBAL_CSS)) {
+        res.writeHead(200, { "Content-Type": "text/css" });
+        res.end(fs.readFileSync(config.client.globalCss));
+        return;
+      }
 
-      selectedServe(request, res, done);
+      serve(request, res, done);
     },
   );
+
   wss = new WebSocketServer({ server });
 
   server.listen(SERVER_PORT, async () => {
@@ -193,9 +189,9 @@ export default async () => {
     const dataModelAndSecurityContextWatch =
       dataModelAndSecurityContextWatcher(config);
 
-    const customSelfServeWatch = customSelfServeWatcher(config);
+    const customGlobalCssWatch = globalCssWatcher(config);
     watchers.push(dataModelAndSecurityContextWatch);
-    watchers.push(customSelfServeWatch);
+    watchers.push(customGlobalCssWatch);
   });
 };
 
@@ -265,17 +261,11 @@ const dataModelAndSecurityContextWatcher = (ctx: any): FSWatcher => {
   return fsWatcher;
 };
 
-const customSelfServeWatcher = (ctx: any): FSWatcher => {
-  const fsWatcher = chokidar.watch(
-    [
-      path.resolve(ctx.client.selfServeCustomizationDir, "style.css"),
-      path.resolve(ctx.client.selfServeCustomizationDir, "*.svg"),
-    ],
-    chokidarWatchOptions,
-  );
+const globalCssWatcher = (ctx: any): FSWatcher => {
+  const fsWatcher = chokidar.watch(ctx.client.globalCss, chokidarWatchOptions);
 
   fsWatcher.on("all", async () => {
-    sendMessage("customSelfServeUpdateSuccess");
+    sendMessage("globalCssUpdateSuccess");
   });
 
   return fsWatcher;
@@ -297,7 +287,7 @@ const sendDataModelsAndSecurityContextsChanges = async (ctx: any) => {
       path.resolve(ctx.client.buildDir, "embeddable-manifest.json"),
     ]);
 
-    await archive(ctx, filesList, [], false);
+    await archive(ctx, filesList, true);
     await sendBuild(ctx, { workspaceId: previewWorkspace, token });
     sending.succeed(`Data models and/or security context synchronized`);
     sendMessage("dataModelsAndOrSecurityContextUpdateSuccess");

package/src/push.ts

@@ -16,11 +16,6 @@ import { selectWorkspace } from "./workspaceUtils";
 // grab .cube.yml|js and .sc.yml|js files
 export const YAML_OR_JS_FILES = /^(.*)\.(cube|sc)\.(ya?ml|js)$/;
 
-// grab all files in self-serve-customization folder
-export const SELF_SERVE_CUSTOM_FILES = /^(style\.css|.*\.svg)$/;
-
-const customSelfServeFolder = "self-serve-customization/";
-
 let ora: any;
 export default async () => {
   let spinnerPushing;
@@ -139,26 +134,14 @@ async function buildArchive(config: any) {
     YAML_OR_JS_FILES,
   );
 
-  let selfServeFiles: [string, string][] = [];
-
-  // check existance of self-serve-customization folder
-  try {
-    await fs.access(config.client.selfServeCustomizationDir);
-    selfServeFiles = await findFiles(
-      `${config.client.selfServeCustomizationDir}`,
-      SELF_SERVE_CUSTOM_FILES,
-    );
-  } catch (e: any) {}
-
-  await archive(config, filesList, selfServeFiles);
+  await archive(config, filesList);
   return spinnerArchive.succeed("Bundling completed");
 }
 
 export async function archive(
   ctx: any,
   yamlFiles: [string, string][],
-  selfServeFiles: [string, string][] = [],
-  includeBuild: boolean = true,
+  isDev: boolean = false,
 ) {
   const output = fsSync.createWriteStream(ctx.client.archiveFile);
 
@@ -167,8 +150,11 @@ export async function archive(
   });
 
   _archiver.pipe(output);
-  if (includeBuild) {
+  if (!isDev) {
     _archiver.directory(ctx.client.buildDir, false);
+    _archiver.file(ctx.client.globalCss, {
+      name: "global.css",
+    });
   }
 
   for (const fileData of yamlFiles) {
@@ -179,16 +165,6 @@ export async function archive(
     });
   }
 
-  if (selfServeFiles.length > 0) {
-    for (const fileData of selfServeFiles) {
-      const fileName = fileData[1].split("/").pop();
-
-      _archiver.file(fileData[1], {
-        name: `${customSelfServeFolder}${fileName!}`,
-      });
-    }
-  }
-
   await _archiver.finalize();
 
   return new Promise((resolve, _reject) => {