@embeddable.com/sdk-core 3.6.0 → 3.7.0

package/loader/custom-esm-loader.mjs

@@ -9,12 +9,34 @@
 import { fileURLToPath, pathToFileURL } from "url";
 import { dirname, join } from "path";
 import ts from "typescript";
-// @ts-expect-error
 import { readDefaultTsConfig } from "@swc-node/register/read-default-tsconfig";
 import { compile } from "./custom-esm-register.cjs";
+import fs from "fs";
 
-// @ts-expect-error
-const tsconfig = readDefaultTsConfig();
+// Find the tsconfig.json in the customer's project directory
+const tsconfigPath = ts.findConfigFile(
+  process.cwd(),
+  fs.existsSync,
+  "tsconfig.json",
+);
+
+let tsconfig;
+if (tsconfigPath) {
+  // Read and parse the tsconfig.json
+  const configFile = ts.readConfigFile(tsconfigPath, ts.sys.readFile);
+
+  const parsedConfig = ts.parseJsonConfigFileContent(
+    configFile.config,
+    ts.sys,
+    dirname(tsconfigPath),
+  );
+
+  tsconfig = parsedConfig.options;
+} else {
+  tsconfig = await readDefaultTsConfig();
+}
+
+// Set necessary compiler options
 tsconfig.module = ts.ModuleKind.ESNext;
 tsconfig.moduleResolution = ts.ModuleResolutionKind.Node16;
 
@@ -23,10 +45,12 @@ const moduleResolutionCache = ts.createModuleResolutionCache(
   (x) => x,
   tsconfig,
 );
+
 const host = {
   fileExists: ts.sys.fileExists,
   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|woff|woff2|png|jpg|jpeg|gif|webp|md|yml|yaml)$/;
@@ -50,7 +74,7 @@ export const resolve = async (specifier, context, nextResolve) => {
 
   const isTS = EXTENSIONS.some((ext) => specifier.endsWith(ext));
 
-  // entrypoint
+  // Entry point
   if (!context.parentURL) {
     const processCwd = pathToFileURL(process.cwd()).href;
 
@@ -65,12 +89,13 @@ export const resolve = async (specifier, context, nextResolve) => {
     };
   }
 
-  // define if this is a package import
+  // Determine if this is a package import
   const isPackageImport =
     !specifier.startsWith(".") &&
     !specifier.startsWith("/") &&
-    !/^[A-Z]:/.test(specifier); // windows path
-  // import/require from external library
+    !/^[A-Z]:/.test(specifier); // Windows path
+
+  // External library import
   if (
     (context.parentURL.includes("/node_modules/") || isPackageImport) &&
     !isTS
@@ -80,6 +105,8 @@ export const resolve = async (specifier, context, nextResolve) => {
 
   const isFileUrl = specifier.startsWith("file://");
   const isParentFileUrl = context.parentURL.startsWith("file://");
+
+  // Resolve the module using TypeScript's module resolution
   const { resolvedModule } = ts.resolveModuleName(
     isFileUrl ? fileURLToPath(specifier) : specifier,
     isParentFileUrl ? fileURLToPath(context.parentURL) : context.parentURL,
@@ -87,7 +114,8 @@ export const resolve = async (specifier, context, nextResolve) => {
     host,
     moduleResolutionCache,
   );
-  // import from local project to local project TS file
+
+  // Local project TS file
   if (
     resolvedModule &&
     !resolvedModule.resolvedFileName.includes("/node_modules/") &&
@@ -101,10 +129,8 @@ export const resolve = async (specifier, context, nextResolve) => {
       shortCircuit: true,
     };
   }
-  // import from local project to either:
-  // - something TS couldn't resolve
-  // - external library
-  // - local project non-TS file
+
+  // Fallback for non-TS files or unresolved modules
   const specifierPathOrUrl =
     !resolvedModule?.resolvedFileName?.includes("/node_modules/") && isWindows
       ? pathToFileURL(specifier).href
@@ -112,32 +138,28 @@ export const resolve = async (specifier, context, nextResolve) => {
 
   return nextResolve(specifierPathOrUrl);
 };
-const tsconfigForSWCNode = {
-  ...tsconfig,
-  paths: undefined,
-  baseUrl: undefined,
-};
 
 export const load = async (url, context, nextLoad) => {
   if (context.format === "ts") {
     const { source } = await nextLoad(url, context);
     const code =
       typeof source === "string" ? source : Buffer.from(source).toString();
-    const compiled = await compile(
-      code,
-      fileURLToPath(url),
-      tsconfigForSWCNode,
-      true,
-    );
+
+    // Compile the code using @swc-node with the customer's tsconfig
+    const compiled = await compile(code, fileURLToPath(url), tsconfig, true);
     return {
       format: "module",
       source: compiled,
       shortCircuit: true,
     };
   } else {
-    if (isWindows && !url.startsWith("file://") && url.includes("node_modules")) {
+    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.6.0",
+  "version": "3.7.0",
   "description": "Core Embeddable SDK module responsible for web-components bundling and publishing.",
   "keywords": [
     "embeddable",
@@ -18,7 +18,8 @@
   "scripts": {
     "build": "rollup -c",
     "test": "vitest run",
-    "test:watch": "vitest"
+    "test:watch": "vitest",
+    "license-report": "license-report --output=csv --csvHeaders --fields name --fields link --fields licenseType --fields installedVersion --fields author > license-report-sdk-core-sdk.csv"
   },
   "author": "Embeddable.com <engineering@embeddable.com>",
   "files": [

package/src/defineConfig.test.ts

@@ -54,6 +54,7 @@ describe("defineConfig", () => {
           "componentDir": "/embeddable-sdk/packages/core-sdk",
           "errorFallbackComponent": "/embeddable-sdk/packages/core-sdk",
           "modelsSrc": "/embeddable-sdk/packages/core-sdk",
+          "rollupOptions": {},
           "rootDir": "/embeddable-sdk/packages/core-sdk",
           "srcDir": "/embeddable-sdk/packages/core-sdk",
           "stencilBuild": "/embeddable-sdk/packages/core-sdk",

package/src/defineConfig.ts

@@ -1,5 +1,6 @@
 import * as path from "node:path";
 import { existsSync } from "node:fs";
+import { RollupOptions } from "rollup";
 
 export type EmbeddableConfig = {
   plugins: (() => {
@@ -23,6 +24,7 @@ export type EmbeddableConfig = {
       alias?: Record<string, string>;
     };
   };
+  rollupOptions?: RollupOptions;
 };
 
 export default ({
@@ -38,6 +40,7 @@ export default ({
   modelsSrc = "src",
   componentsSrc = "src",
   viteConfig = {},
+  rollupOptions = {},
 }: EmbeddableConfig) => {
   const coreRoot = path.resolve(__dirname, "..");
   const clientRoot = process.cwd();
@@ -85,6 +88,7 @@ export default ({
         : undefined,
       bundleHash: undefined, // This will be set by the build process
       viteConfig,
+      rollupOptions,
     },
     outputOptions: {
       typesEntryPointFilename: "embeddable-types-entry-point.js",