@hpcc-js/esbuild-plugins 1.4.6 → 1.4.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hpcc-js/esbuild-plugins",
-  "version": "1.4.6",
+  "version": "1.4.8",
   "description": "Various esbuild plugins",
   "type": "module",
   "exports": {
@@ -41,14 +41,14 @@
     "esbuild-copy-static-files": "0.1.0",
     "esbuild-plugin-inline-css": "0.0.1",
     "esbuild-plugin-umd-wrapper": "3.0.0",
+    "fzstd": "0.1.1",
     "vite": "7.0.0",
     "vite-plugin-css-injected-by-js": "3.5.2",
     "vite-plugin-static-copy": "3.1.0"
   },
   "devDependencies": {
     "@hpcc-js/wasm-base91": "1.3.1",
-    "@hpcc-js/wasm-zstd": "1.2.1",
-    "fzstd": "0.1.1"
+    "@hpcc-js/wasm-zstd": "1.2.1"
   },
   "keywords": [
     "esbuild",
@@ -64,5 +64,5 @@
   },
   "homepage": "https://hpcc-systems.github.io/hpcc-js-wasm/",
   "license": "Apache-2.0",
-  "gitHead": "e479519e4c888f5ee893ec968b3b9014d8dc0497"
+  "gitHead": "ef271e12a3730c4503a82f80a37aaaa29643e1e3"
 }

package/src/build.ts

@@ -14,7 +14,11 @@ export const pkg = JSON.parse(readFileSync(path.join(process.cwd(), "./package.j
 export const NODE_MJS = pkg.type === "module" ? "js" : "mjs";
 export const NODE_CJS = pkg.type === "module" ? "cjs" : "js";
 
-export async function buildWatch(inputs: string[] | Record<string, string> | { in: string, out: string }[], config: BuildOptions): Promise<void> {
+interface BuildOptionsEx extends Omit<BuildOptions, "format"> {
+    format?: Format | "umd";
+}
+
+export async function buildWatch(inputs: string[] | Record<string, string> | { in: string, out: string }[], config: BuildOptionsEx): Promise<void> {
     const isDevelopment = process.argv.includes("--development");
     const isWatch = process.argv.includes("--watch");
     const isProduction = !isDevelopment;
@@ -30,7 +34,7 @@ export const BUILD_VERSION = "${rootPkg.version}";
 
     config = {
         entryPoints: inputs,
-        format: "esm",
+        format: config.format ?? "esm",
         bundle: true,
         minify: isProduction,
         sourcemap: true,
@@ -59,7 +63,7 @@ export const BUILD_VERSION = "${rootPkg.version}";
             ...config.nodePaths ?? []
         ]
     };
-    const ctx = await esbuild.context(config);
+    const ctx = await esbuild.context(config as BuildOptions);
 
     if (isWatch) {
         await ctx.watch();
@@ -102,14 +106,14 @@ export function browserTpl(input: string, output: string, options: TplOptions =
     options.format = options.format ?? "esm";
 
     return buildWatch([input], {
-        format: options.format === "umd" ? "esm" : options.format,
+        format: options.format,
         external: options.external ?? [],
         outfile: `${output}.${options.format === "esm" ? "js" : `${options.format}.js`}`,
         platform: "browser",
         target: "es2022",
         globalName: options.globalName,
         keepNames: options.keepNames,
-        plugins: options.format === "umd" ? [...options.plugins ?? [], umdWrapper({ libraryName: options.libraryName })] : options.plugins,
+        plugins: options.format === "umd" ? [umdWrapper({ libraryName: options.libraryName }), ...options.plugins ?? []] : options.plugins,
         alias: options.alias,
         define: options.define,
         loader: options.loader,
@@ -125,7 +129,7 @@ export function nodeTpl(input: string, output: string, options: TplOptions = {})
     }
 
     return buildWatch([input], {
-        format: options.format === "umd" ? "esm" : options.format,
+        format: options.format,
         external: options.external ?? [],
         outfile: `${output}.${options.format === "esm" ? NODE_MJS : NODE_CJS}`,
         platform: "node",
@@ -145,14 +149,14 @@ export function neutralTpl(input: string, output: string, options: TplOptions =
     options.format = options.format ?? "esm";
 
     return buildWatch([input], {
-        format: options.format === "umd" ? "esm" : options.format,
+        format: options.format,
         external: options.external ?? [],
         outfile: `${output}.${options.format === "esm" ? "js" : `${options.format}.js`}`,
         platform: "neutral",
         target: "es2022",
         globalName: options.globalName,
         keepNames: options.keepNames,
-        plugins: options.format === "umd" ? [...options.plugins ?? [], umdWrapper({ libraryName: options.libraryName })] : options.plugins,
+        plugins: options.format === "umd" ? [umdWrapper({ libraryName: options.libraryName }), ...options.plugins ?? []] : options.plugins,
         alias: options.alias,
         define: options.define,
         loader: options.loader,

package/src/sfx-wrapper.ts

@@ -63,7 +63,7 @@ ${!wasmJsExists ? `\
     if (!g_module) {
         g_module = wrapper({
             wasmBinary: g_wasmBinary,
-            locateFile: undefined
+            locateFile: (name: string) => "sfx-wrapper nop"
         });
     }
     return g_module;

package/types/build.d.ts

@@ -4,10 +4,13 @@ export { copyStaticFiles };
 export declare const pkg: any;
 export declare const NODE_MJS: string;
 export declare const NODE_CJS: string;
+interface BuildOptionsEx extends Omit<BuildOptions, "format"> {
+    format?: Format | "umd";
+}
 export declare function buildWatch(inputs: string[] | Record<string, string> | {
     in: string;
     out: string;
-}[], config: BuildOptions): Promise<void>;
+}[], config: BuildOptionsEx): Promise<void>;
 export type TplOptions = {
     format?: Format | "umd";
     globalName?: string;