@embeddable.com/sdk-core 3.2.0-next.0 → 3.2.0-next.10

package/loader/custom-esm-loader.mjs

@@ -28,10 +28,13 @@ const host = {
   readFile: ts.sys.readFile,
 };
 const EXTENSIONS = [ts.Extension.Ts, ts.Extension.Tsx, ts.Extension.Mts];
-const NON_JS_TS_EXTENSIONS = /\.(css|scss|less|sass|styl|json|svg)$/;
+const NON_JS_TS_EXTENSIONS =
+  /\.(css|scss|less|sass|styl|json|svg|woff|woff2|png|jpg|jpeg|gif|webp|md|yml|yaml)$/;
 
 const currentDir = dirname(fileURLToPath(import.meta.url));
 
+const isWindows = process.platform === "win32";
+
 export const resolve = async (specifier, context, nextResolve) => {
   if (NON_JS_TS_EXTENSIONS.test(specifier)) {
     const mockModulePath = pathToFileURL(
@@ -44,22 +47,42 @@ export const resolve = async (specifier, context, nextResolve) => {
       shortCircuit: true,
     };
   }
+
   const isTS = EXTENSIONS.some((ext) => specifier.endsWith(ext));
+
   // entrypoint
   if (!context.parentURL) {
+    const processCwd = pathToFileURL(process.cwd()).href;
+
+    const entryPointPath = isWindows
+      ? pathToFileURL(specifier.replace(`${processCwd}/file:/`, "")).href
+      : specifier;
+
     return {
       format: isTS ? "ts" : undefined,
-      url: specifier,
+      url: entryPointPath,
       shortCircuit: true,
     };
   }
+
+  // define if this is a package import
+  const isPackageImport =
+    !specifier.startsWith(".") &&
+    !specifier.startsWith("/") &&
+    !specifier.startsWith("C:");
   // import/require from external library
-  if (context.parentURL.includes("/node_modules/") && !isTS) {
+  if (
+    (context.parentURL.includes("/node_modules/") || isPackageImport) &&
+    !isTS
+  ) {
     return nextResolve(specifier);
   }
+
+  const isFileUrl = specifier.startsWith("file://");
+  const isParentFileUrl = context.parentURL.startsWith("file://");
   const { resolvedModule } = ts.resolveModuleName(
-    specifier,
-    fileURLToPath(context.parentURL),
+    isFileUrl ? fileURLToPath(specifier) : specifier,
+    isParentFileUrl ? fileURLToPath(context.parentURL) : context.parentURL,
     tsconfig,
     host,
     moduleResolutionCache,
@@ -72,7 +95,9 @@ export const resolve = async (specifier, context, nextResolve) => {
   ) {
     return {
       format: "ts",
-      url: pathToFileURL(resolvedModule.resolvedFileName).href,
+      url:
+        pathToFileURL(resolvedModule.resolvedFileName).href +
+        `?update=${Date.now()}`,
       shortCircuit: true,
     };
   }
@@ -80,7 +105,12 @@ export const resolve = async (specifier, context, nextResolve) => {
   // - something TS couldn't resolve
   // - external library
   // - local project non-TS file
-  return nextResolve(specifier);
+  const specifierPathOrUrl =
+    !resolvedModule?.resolvedFileName?.includes("/node_modules/") && isWindows
+      ? pathToFileURL(specifier).href
+      : specifier;
+
+  return nextResolve(specifierPathOrUrl);
 };
 const tsconfigForSWCNode = {
   ...tsconfig,
@@ -105,6 +135,9 @@ export const load = async (url, context, nextLoad) => {
       shortCircuit: true,
     };
   } else {
+    if (isWindows && !url.startsWith("file://") && url.includes("node_modules")) {
+      return nextLoad(pathToFileURL(url).href, context);
+  }
     return nextLoad(url, context);
   }
 };

package/package.json

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

package/src/defineConfig.ts

@@ -3,9 +3,9 @@ import * as path from "node:path";
 export type EmbeddableConfig = {
   plugins: (() => {
     pluginName: string;
-    build: (config: EmbeddableConfig) => Promise<void>;
-    cleanup: (config: EmbeddableConfig) => Promise<void>;
-    validate: (config: EmbeddableConfig) => Promise<void>;
+    build: (config: EmbeddableConfig) => Promise<unknown>;
+    cleanup: (config: EmbeddableConfig) => Promise<unknown>;
+    validate: (config: EmbeddableConfig) => Promise<unknown>;
   })[];
   pushBaseUrl?: string;
   audienceUrl?: string;

package/src/entryPoint.js

@@ -0,0 +1,12 @@
+const COMMANDS_MAP = require("../lib/index.js");
+
+async function main() {
+  const command = process.argv[2];
+  const runScript = COMMANDS_MAP[command];
+
+  if (!runScript) process.exit(1);
+
+  await runScript();
+}
+
+main();

package/src/generate.ts

@@ -63,12 +63,15 @@ async function runStencil(ctx: any) {
   const sys = ctx.dev?.sys || createNodeSys({ process });
   const devMode = !!ctx.dev;
 
+  const isWindows = process.platform === "win32";
+
   const validated = await loadConfig({
     initTsConfig: true,
     logger,
     sys,
     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"),

package/src/login.ts

@@ -1,9 +1,7 @@
-import * as path from "node:path";
-import * as os from "node:os";
 import * as fs from "node:fs/promises";
 import axios from "axios";
 import provideConfig from "./provideConfig";
-import { jwtDecode } from "jwt-decode";
+
 // @ts-ignore
 import reportErrorToRollbar from "./rollbar.mjs";
 import { CREDENTIALS_DIR, CREDENTIALS_FILE } from "./credentials";

package/src/provideConfig.ts

@@ -3,12 +3,21 @@ import * as url from "node:url";
 
 export default async () => {
   const configFilePath = `${process.cwd()}/embeddable.config.js`;
+  const tsConfigFilePath = `${process.cwd()}/embeddable.config.ts`;
 
-  if (!fs.existsSync(configFilePath)) {
-    console.log("Please create a proper `embeddable.config.js` file first.");
+  if (!fs.existsSync(configFilePath) && !fs.existsSync(tsConfigFilePath)) {
+    console.log(
+      "Please create a proper `embeddable.config.js` or `embeddable.config.ts` file in the root of your project.",
+    );
     process.exit(1);
   }
 
-  const configFileUrl = url.pathToFileURL(configFilePath).href;
-  return (await import(configFileUrl)).default;
+  const isWindows = process.platform === "win32";
+  const configPath = fs.existsSync(tsConfigFilePath)
+    ? tsConfigFilePath
+    : configFilePath;
+
+  const pathOrUrl = isWindows ? url.pathToFileURL(configPath).href : configPath;
+
+  return (await import(pathOrUrl)).default;
 };

package/src/push.ts

@@ -17,6 +17,8 @@ export const YAML_OR_JS_FILES = /^(.*)\.(cube|sc)\.(ya?ml|js)$/;
 
 let ora: any;
 export default async () => {
+  let spinnerPushing;
+
   try {
     checkNodeVersion();
     ora = (await oraP).default;
@@ -37,7 +39,7 @@ export default async () => {
     await archive(config, filesList);
     spinnerArchive.succeed("Bundling completed");
 
-    const spinnerPushing = ora(
+    spinnerPushing = ora(
       `Publishing to ${workspaceName} using ${config.pushBaseUrl}...`,
     ).start();
 
@@ -46,9 +48,10 @@ export default async () => {
       `Published to ${workspaceName} using ${config.pushBaseUrl}`,
     );
   } catch (error: any) {
-    console.log(error);
+    spinnerPushing?.fail("Publishing failed");
+    console.error(error.response?.data || error?.message || error);
     await reportErrorToRollbar(error);
-    throw error;
+    process.exit(1);
   }
 };
 

package/lib/entryPoint.d.ts

@@ -1 +0,0 @@
-export {};

package/src/entryPoint.ts

@@ -1,16 +0,0 @@
-import path from "path";
-import { fileURLToPath } from "url";
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const COMMANDS_MAP = await import(path.join(__dirname, "../lib/index.js"));
-
-async function main() {
-  const command = process.argv[2];
-  const runScript = COMMANDS_MAP[command];
-
-  if (!runScript) process.exit(1);
-
-  await runScript();
-}
-
-main();