@embeddable.com/sdk-core 4.0.1 → 4.0.2-next.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embeddable.com/sdk-core",
-  "version": "4.0.1",
+  "version": "4.0.2-next.1",
   "description": "Core Embeddable SDK module responsible for web-components bundling and publishing.",
   "keywords": [
     "embeddable",
@@ -40,8 +40,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@embeddable.com/core": "2.10.6",
-    "@embeddable.com/sdk-utils": "0.8.1",
+    "@embeddable.com/core": "2.10.7-next.0",
+    "@embeddable.com/sdk-utils": "0.8.2-next.0",
     "@inquirer/prompts": "^7.2.1",
     "@stencil/core": "^4.23.0",
     "@swc-node/register": "^1.10.9",

package/src/defineConfig.test.ts

@@ -67,6 +67,7 @@ describe("defineConfig", () => {
           "stencilBuild": "/embeddable-sdk/packages/core-sdk",
           "tmpDir": "/embeddable-sdk/packages/core-sdk",
           "viteConfig": {},
+          "webComponentRoot": "/embeddable-sdk/packages/core-sdk",
         },
         "core": {
           "configsDir": "/embeddable-sdk/packages/core-sdk",

package/src/defineConfig.ts

@@ -60,6 +60,7 @@ export type ResolvedEmbeddableConfig = {
     buildDir: string;
     tmpDir: string;
     customCanvasCss: string;
+    webComponentRoot: string;
     componentDir: string;
     stencilBuild: string;
     archiveFile: string;
@@ -258,7 +259,17 @@ export default (config: EmbeddableConfig) => {
       buildDir: path.resolve(clientRoot, ".embeddable-build"),
       tmpDir: path.resolve(clientRoot, ".embeddable-tmp"),
       customCanvasCss: path.resolve(clientRoot, customCanvasCss),
-      componentDir: path.resolve(clientRoot, ".embeddable-build", "component"),
+      webComponentRoot: path.resolve(
+        clientRoot,
+        ".embeddable-build",
+        "web-component",
+      ),
+      componentDir: path.resolve(
+        clientRoot,
+        ".embeddable-build",
+        "web-component",
+        "component",
+      ),
       stencilBuild: path.resolve(
         clientRoot,
         ".embeddable-build",

package/src/dev.ts

@@ -162,7 +162,8 @@ export default async () => {
       client: {
         ...defaultConfig.client,
         buildDir,
-        componentDir: path.resolve(buildDir, "component"),
+        webComponentRoot: path.resolve(buildDir, "web-component"),
+        componentDir: path.resolve(buildDir, "web-component", "component"),
         stencilBuild: path.resolve(buildDir, "dist", "embeddable-wrapper"),
         tmpDir: path.resolve(
           defaultConfig.client.rootDir,
@@ -481,7 +482,7 @@ export const sendBuildChanges = async (ctx: ResolvedEmbeddableConfig) => {
     filesList = [...filesList, ...cubeAndSecurityContextFileList];
   }
 
-    try {
+  try {
     const token = await getToken();
     await archive({
       ctx,
@@ -491,11 +492,11 @@ export const sendBuildChanges = async (ctx: ResolvedEmbeddableConfig) => {
     await sendBuild(ctx, { workspaceId: previewWorkspace, token });
   } catch (e: any) {
     sending.fail(
-      `Data models and/or security context synchronization failed with error: ${e.response?.data?.errorMessage ?? e.message ?? 'Unknown error'}`
+      `Data models and/or security context synchronization failed with error: ${e.response?.data?.errorMessage ?? e.message ?? "Unknown error"}`,
     );
     return sendMessage("dataModelsAndOrSecurityContextUpdateError");
   }
-  
+
   sending.succeed(`Data models and/or security context synchronized`);
   sendMessage("dataModelsAndOrSecurityContextUpdateSuccess");
 };

package/src/generate.test.ts

@@ -13,6 +13,7 @@ const config = {
     tmpDir: "tmpDir",
     stencilBuild: "stencilBuild",
     componentDir: "componentDir",
+    webComponentRoot: "webComponentRoot",
     bundleHash: "hash",
     componentLibraries: [],
   },
@@ -141,7 +142,7 @@ describe("generate", () => {
 
     expect(loadConfig).toHaveBeenCalledWith({
       config: {
-        configPath: "buildDir/stencil.config.ts",
+        configPath: "webComponentRoot/stencil.config.ts",
         devMode: true,
         maxConcurrentWorkers: process.platform === "win32" ? 0 : 8,
         minifyCss: false,
@@ -150,13 +151,13 @@ describe("generate", () => {
         outputTargets: [
           {
             type: "dist",
+            buildDir: "buildDir/dist",
           },
         ],
-        rootDir: "buildDir",
+        rootDir: "webComponentRoot",
         sourceMap: true,
-        srcDir: "buildDir/component",
-        tsconfig: "buildDir/tsconfig.json",
-        watchDirs: ["buildDir/buildName"],
+        srcDir: "componentDir",
+        tsconfig: "webComponentRoot/tsconfig.json",
       },
       initTsConfig: true,
       logger: expect.any(Function),

package/src/generate.ts

@@ -43,7 +43,7 @@ async function injectCSS(
     .filter((fileName) => fileName.endsWith(".css"))
     .map(
       (fileName) =>
-        `@import '../${ctx[pluginName].outputOptions.buildName}/${fileName}';`,
+        `@import '../../${ctx[pluginName].outputOptions.buildName}/${fileName}';`,
     );
 
   const componentLibraries = ctx.client.componentLibraries;
@@ -76,7 +76,7 @@ async function injectBundleRender(
   ctx: ResolvedEmbeddableConfig,
   pluginName: PluginName,
 ) {
-  const importStr = `import render from '../${ctx[pluginName].outputOptions.buildName}/${ctx[pluginName].outputOptions.fileName}';`;
+  const importStr = `import render from '../../${ctx[pluginName].outputOptions.buildName}/${ctx[pluginName].outputOptions.fileName}';`;
 
   let content = await fs.readFile(
     path.resolve(ctx.core.templatesDir, "component.tsx.template"),
@@ -137,25 +137,23 @@ async function runStencil(ctx: ResolvedEmbeddableConfig): Promise<void> {
     config: {
       devMode,
       maxConcurrentWorkers: isWindows ? 0 : 8, // workers break on windows
-      rootDir: ctx.client.buildDir,
-      configPath: path.resolve(ctx.client.buildDir, "stencil.config.ts"),
-      tsconfig: path.resolve(ctx.client.buildDir, "tsconfig.json"),
+      rootDir: ctx.client.webComponentRoot,
+      configPath: path.resolve(
+        ctx.client.webComponentRoot,
+        "stencil.config.ts",
+      ),
+      tsconfig: path.resolve(ctx.client.webComponentRoot, "tsconfig.json"),
       namespace: "embeddable-wrapper",
-      srcDir: path.resolve(ctx.client.buildDir, "component"),
+      srcDir: ctx.client.componentDir,
       sourceMap: true, // always generate source maps in both dev and prod
       minifyJs: !devMode,
       minifyCss: !devMode,
       outputTargets: [
         {
           type: "dist",
+          buildDir: path.resolve(ctx.client.buildDir, "dist"),
         },
       ],
-      watchDirs: [
-        path.resolve(
-          ctx.client.buildDir,
-          ctx["sdk-react"].outputOptions.buildName,
-        ),
-      ],
     },
   });
 

package/src/prepare.ts

@@ -22,9 +22,11 @@ export async function removeIfExists(ctx: ResolvedEmbeddableConfig) {
 }
 
 async function copyStencilConfigsToClient(ctx: ResolvedEmbeddableConfig) {
-  await fs.cp(ctx.core.configsDir, ctx.client.buildDir, { recursive: true });
+  await fs.cp(ctx.core.configsDir, ctx.client.webComponentRoot, {
+    recursive: true,
+  });
 }
 
 async function createComponentDir(dir: string) {
-  await fs.mkdir(dir);
+  await fs.mkdir(dir, { recursive: true });
 }