@embeddable.com/sdk-core 3.12.4 → 3.12.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embeddable.com/sdk-core",
-  "version": "3.12.4",
+  "version": "3.12.5",
   "description": "Core Embeddable SDK module responsible for web-components bundling and publishing.",
   "keywords": [
     "embeddable",
@@ -38,7 +38,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@embeddable.com/sdk-utils": "0.6.1",
+    "@embeddable.com/sdk-utils": "0.6.2",
     "@inquirer/prompts": "^7.2.1",
     "@stencil/core": "^4.23.0",
     "@swc-node/register": "^1.10.9",

package/src/dev.ts

@@ -10,7 +10,6 @@ import {
   createNodeLogger,
   createNodeSys,
 } from "@stencil/core/sys/node";
-import { glob } from "node:fs/promises";
 import { RollupWatcher } from "rollup";
 import * as http from "node:http";
 import { IncomingMessage, Server, ServerResponse } from "http";
@@ -32,6 +31,7 @@ const minimist = require("minimist");
 import { initLogger, logError } from "./logger";
 import fg from "fast-glob";
 import * as dotenv from "dotenv";
+import { pathToFileURL } from "node:url";
 
 dotenv.config();
 
@@ -121,7 +121,7 @@ export default async () => {
 
     const serve = serveStatic(config.client.buildDir);
 
-    const workspacePreparation = ora("Preparing workspace...").start();
+    let workspacePreparation = ora("Preparing workspace...").start();
 
     breadcrumbs.push("get preview workspace");
     try {
@@ -130,10 +130,20 @@ export default async () => {
         config,
       );
     } catch (e: any) {
-      workspacePreparation.fail(
-        e.response?.data?.errorMessage || "Unknown error: " + e.message,
-      );
-      process.exit(1);
+      if (e.response?.status === 401) {
+        // login and retry
+        await login();
+        workspacePreparation = ora("Preparing workspace...").start();
+        previewWorkspace = await getPreviewWorkspace(
+          workspacePreparation,
+          config,
+        );
+      } else {
+        workspacePreparation.fail(
+          e.response?.data?.errorMessage || "Unknown error: " + e.message,
+        );
+        process.exit(1);
+      }
     }
 
     workspacePreparation.succeed("Workspace is ready");
@@ -325,11 +335,14 @@ const sendDataModelsAndContextsChanges = async (ctx: any) => {
       PRESET_FILES,
     );
 
-    const filesList = [...cubeFilesList, ...contextFilesList];
+    // Map the files to include their full filenames
+    const filesList = [...cubeFilesList, ...contextFilesList].map(
+      (entry): [string, string] => [path.basename(entry[1]), entry[1]],
+    );
 
     // add manifest to the archive
     filesList.push([
-      "embeddable-manifest",
+      "embeddable-manifest.json",
       path.resolve(ctx.client.buildDir, "embeddable-manifest.json"),
     ]);
 

package/src/generate.test.ts

@@ -140,7 +140,7 @@ describe("generate", () => {
       config: {
         configPath: "buildDir/stencil.config.ts",
         devMode: true,
-        maxConcurrentWorkers: 8,
+        maxConcurrentWorkers: process.platform === "win32" ? 0 : 8,
         minifyCss: false,
         minifyJs: false,
         namespace: "embeddable-wrapper",

package/src/logger.test.ts

@@ -14,7 +14,11 @@ describe("Logger", () => {
     it("should create log directory if it does not exist", async () => {
       await initLogger("test");
       expect(fs.mkdir).toHaveBeenCalledWith(
-        expect.stringContaining(".embeddable/logs"),
+        expect.stringContaining(
+          process.platform === "win32"
+            ? ".embeddable\\logs"
+            : ".embeddable/logs",
+        ),
         { recursive: true },
       );
     });

package/src/login.test.ts

@@ -3,6 +3,7 @@ import login, { resolveFiles, getToken } from "./login";
 import { vi } from "vitest";
 import { pathToFileURL } from "node:url";
 import { existsSync } from "node:fs";
+import { PathLike } from "node:fs";
 import { mkdir, access, writeFile, readFile } from "fs/promises";
 import { CREDENTIALS_DIR, CREDENTIALS_FILE } from "./credentials";
 import { http, HttpResponse } from "msw";
@@ -48,14 +49,21 @@ vi.mock("node:url", () => ({
   pathToFileURL: vi.fn(),
 }));
 
-vi.mock(`${process.cwd()}/embeddable.config.ts`, () => ({
+// Create a mock module factory
+const mockConfigModule = {
   default: {
     authDomain: "test-domain.com",
   },
-}));
+};
+
+// Mock both possible config paths
+vi.mock(`${process.cwd()}/embeddable.config.js`, () => mockConfigModule);
+vi.mock(`${process.cwd()}/embeddable.config.ts`, () => mockConfigModule);
 
 describe("login", () => {
   beforeEach(async () => {
+    vi.resetModules();
+
     vi.mocked(readFile).mockImplementation(async () =>
       Buffer.from(`{"access_token":"mocked-token"}`),
     );
@@ -68,9 +76,14 @@ describe("login", () => {
 
     vi.mocked(writeFile).mockImplementation(async () => undefined);
 
-    vi.mocked(existsSync).mockImplementation(() => true);
+    // Mock that only the TS config exists
+    vi.mocked(existsSync).mockImplementation((path: PathLike) =>
+      path.toString().endsWith("embeddable.config.ts"),
+    );
+
+    // Mock URL creation
     vi.mocked(pathToFileURL).mockImplementation(
-      () => new URL("mocked-config-path"),
+      (path) => new URL(`file://${path}`),
     );
   });
 

package/src/provideConfig.test.ts

@@ -1,32 +1,43 @@
 import { pathToFileURL } from "node:url";
 import { existsSync } from "node:fs";
+import { PathLike } from "node:fs";
 import provideConfig from "./provideConfig";
 import { vi } from "vitest";
 
+// Mock fs module
 vi.mock("node:fs", () => ({
   existsSync: vi.fn(),
 }));
 
+// Mock url module
 vi.mock("node:url", () => ({
   pathToFileURL: vi.fn(),
 }));
 
-vi.mock(`${process.cwd()}/embeddable.config.ts`, () => ({
+// Create a mock module factory
+const mockConfigModule = {
   default: "mocked-config",
-}));
+};
+
+// Mock both possible config paths
+vi.mock(`${process.cwd()}/embeddable.config.js`, () => mockConfigModule);
+vi.mock(`${process.cwd()}/embeddable.config.ts`, () => mockConfigModule);
 
 describe("provideConfig", () => {
   beforeEach(() => {
-    vi.mocked(existsSync).mockImplementation(() => true);
+    vi.resetModules();
+    // Mock that only the TS config exists
+    vi.mocked(existsSync).mockImplementation((path: PathLike) =>
+      path.toString().endsWith("embeddable.config.ts"),
+    );
+    // Mock URL creation
     vi.mocked(pathToFileURL).mockImplementation(
-      () => new URL("mocked-config-path"),
+      (path) => new URL(`file://${path}`),
     );
   });
 
   it("should return the default config when the config file exists", async () => {
     const result = await provideConfig();
-
-    // Assert the result
     expect(result).toEqual("mocked-config");
   });
 });

package/src/push.test.ts

@@ -155,6 +155,7 @@ describe("push", () => {
   });
 
   it("should fail if the build is not successful", async () => {
+    vi.spyOn(console, "error").mockImplementation(() => undefined);
     vi.mocked(checkBuildSuccess).mockResolvedValue(false);
 
     await push();

package/src/push.ts

@@ -148,7 +148,12 @@ async function buildArchive(config: any) {
     PRESET_FILES,
   );
 
-  await archive(config, [...cubeFilesList, ...contextFilesList]);
+  // Map the files to include their full filenames
+  const filesList = [...cubeFilesList, ...contextFilesList].map(
+    (entry): [string, string] => [path.basename(entry[1]), entry[1]],
+  );
+
+  await archive(config, filesList);
   return spinnerArchive.succeed("Bundling completed");
 }
 
@@ -172,10 +177,8 @@ export async function archive(
   }
 
   for (const fileData of yamlFiles) {
-    const fileName = fileData[1].split("/").pop();
-
     _archiver.file(fileData[1], {
-      name: fileName!,
+      name: fileData[0],
     });
   }
 

package/src/workspaceUtils.test.ts

@@ -1,4 +1,4 @@
-import { describe, it, expect, vi } from "vitest";
+import { describe, it, expect, vi, beforeEach } from "vitest";
 import axios from "axios";
 import { getWorkspaces, selectWorkspace } from "./workspaceUtils";
 import { select } from "@inquirer/prompts";

package/src/workspaceUtils.ts

@@ -15,6 +15,10 @@ export async function getWorkspaces(
 
     return response.data?.filter((w: any) => !w.devWorkspace);
   } catch (e: any) {
+    if (ctx.dev?.watch) {
+      workspaceSpinner.stop();
+      throw e;
+    }
     if (e.response?.status === 401) {
       workspaceSpinner.fail(
         'Unauthorized. Please login using "embeddable login" command.',