@hpcc-js/esbuild-plugins 1.8.3 → 1.8.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hpcc-js/esbuild-plugins",
-  "version": "1.8.3",
+  "version": "1.8.4",
   "description": "Various esbuild plugins",
   "type": "module",
   "exports": {
@@ -38,7 +38,7 @@
     "update-major": "npx --yes npm-check-updates -u"
   },
   "dependencies": {
-    "esbuild": "0.27.2",
+    "esbuild": "0.27.3",
     "esbuild-copy-static-files": "0.1.0",
     "esbuild-plugin-inline-css": "0.0.1",
     "esbuild-plugin-umd-wrapper": "3.0.0",
@@ -47,8 +47,8 @@
     "vite-plugin-static-copy": "3.2.0"
   },
   "devDependencies": {
-    "@hpcc-js/wasm-base91": "1.12.1",
-    "@hpcc-js/wasm-zstd": "1.11.1"
+    "@hpcc-js/wasm-base91": "1.13.1",
+    "@hpcc-js/wasm-zstd": "1.12.1"
   },
   "keywords": [
     "esbuild",
@@ -64,5 +64,5 @@
   },
   "homepage": "https://hpcc-systems.github.io/hpcc-js-wasm/",
   "license": "Apache-2.0",
-  "gitHead": "34c404f172efc43a9caf59e8e463d1f07d469578"
+  "gitHead": "04460c76008934053c9957c361693aac862ca7dc"
 }

package/src/build.ts

@@ -1,177 +1,177 @@
-import * as process from "process";
-import { readFileSync } from "fs";
-import * as path from "path";
-import * as esbuild from "esbuild";
-import type { BuildOptions, Format, Loader, Plugin } from "esbuild";
-import { umdWrapper } from "esbuild-plugin-umd-wrapper";
-import * as copyStaticFiles from "esbuild-copy-static-files";
-import { inlineCSS } from "./inline-css.ts";
-import { rebuildLogger } from "./rebuild-logger.ts";
-
-export { copyStaticFiles };
-
-export const pkg = JSON.parse(readFileSync(path.join(process.cwd(), "./package.json"), "utf8"));
-export const NODE_MJS = pkg.type === "module" ? "js" : "mjs";
-export const NODE_CJS = pkg.type === "module" ? "cjs" : "js";
-
-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;
-
-    config = {
-        entryPoints: inputs,
-        format: config.format ?? "esm",
-        bundle: true,
-        minify: isProduction,
-        sourcemap: true,
-        external: [
-            ...config.external ?? []
-        ],
-        ...config,
-        loader: {
-            ...config.loader
-        },
-        outExtension: {
-            ...config.outExtension
-        },
-        banner: {
-            ...config.banner
-        },
-        footer: {
-            ...config.footer
-        },
-        plugins: [
-            ...(isWatch ? [rebuildLogger(config)] : []),
-            ...config.plugins ?? [],
-            inlineCSS()
-        ],
-        nodePaths: [
-            ...config.nodePaths ?? []
-        ]
-    };
-    const ctx = await esbuild.context(config as BuildOptions);
-
-    if (isWatch) {
-        await ctx.watch();
-    } else {
-        if (isDevelopment && Array.isArray(config.entryPoints)) {
-            // eslint-disable-next-line no-console
-            console.log("Start:  ", config.entryPoints[0], config.outfile);
-        }
-        await ctx.rebuild();
-        await ctx.dispose();
-        if (isDevelopment && Array.isArray(config.entryPoints)) {
-            // eslint-disable-next-line no-console
-            console.log("Stop:   ", config.entryPoints[0], config.outfile);
-        }
-    }
-}
-
-export type TplOptions = {
-    format?: Format | "umd";
-    globalName?: string;
-    libraryName?: string;
-    keepNames?: boolean;
-    external?: string[];
-    plugins?: Plugin[];
-    loader?: { [ext: string]: Loader };
-    supported?: Record<string, boolean>;
-    alias?: Record<string, string>;
-    define?: { [key: string]: string };
-    packages?: "bundle" | "external" | "auto";
-};
-
-function autoExternal(external?: string[]): string[] {
-    return [
-        ...pkg.dependencies ? Object.keys(pkg.dependencies) : [], ...pkg.peerDependencies ? Object.keys(pkg.peerDependencies) : [],
-        ...external ?? []
-    ];
-}
-
-export function browserTpl(input: string, output: string, options: TplOptions = {}) {
-    options.format = options.format ?? "esm";
-
-    return buildWatch([input], {
-        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" ? [umdWrapper({ libraryName: options.libraryName }) as Plugin, ...options.plugins ?? []] : options.plugins,
-        alias: options.alias,
-        define: options.define,
-        loader: options.loader,
-        supported: options.supported,
-    });
-}
-
-export function nodeTpl(input: string, output: string, options: TplOptions = {}) {
-    options.format = options.format ?? "esm";
-    options.packages = options.packages ?? "external";
-    if (options.packages === "auto") {
-        options.external = autoExternal(options.external);
-    }
-
-    return buildWatch([input], {
-        format: options.format,
-        external: options.external ?? [],
-        outfile: `${output}.${options.format === "esm" ? NODE_MJS : NODE_CJS}`,
-        platform: "node",
-        target: "node22",
-        packages: options.packages === "auto" ? "bundle" : options.packages,
-        globalName: options.globalName,
-        keepNames: options.keepNames,
-        plugins: options.plugins,
-        alias: options.alias,
-        define: options.define,
-        loader: options.loader,
-        supported: options.supported,
-    });
-}
-
-export function neutralTpl(input: string, output: string, options: TplOptions = {}) {
-    options.format = options.format ?? "esm";
-
-    return buildWatch([input], {
-        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" ? [umdWrapper({ libraryName: options.libraryName }) as Plugin, ...options.plugins ?? []] : options.plugins,
-        alias: options.alias,
-        define: options.define,
-        loader: options.loader,
-        supported: options.supported,
-    });
-}
-
-export function browserBoth(input: string, output: string, options: TplOptions = {}) {
-    return Promise.all([
-        browserTpl(input, output, { format: "esm", ...options }),
-        browserTpl(input, output, { format: "umd", ...options })
-    ]);
-}
-
-export function nodeBoth(input: string, output: string, options: TplOptions = {}) {
-    return Promise.all([
-        nodeTpl(input, output, { format: "esm", ...options }),
-        nodeTpl(input, output, { format: "cjs", ...options })
-    ]);
-}
-
-export function bothTpl(input: string, output: string, options: TplOptions = {}) {
-    return Promise.all([
-        browserBoth(input, output, { ...options }),
-        nodeTpl(input, output, { format: "cjs", ...options })
-    ]);
-}
+import * as process from "process";
+import { readFileSync } from "fs";
+import * as path from "path";
+import * as esbuild from "esbuild";
+import type { BuildOptions, Format, Loader, Plugin } from "esbuild";
+import { umdWrapper } from "esbuild-plugin-umd-wrapper";
+import * as copyStaticFiles from "esbuild-copy-static-files";
+import { inlineCSS } from "./inline-css.ts";
+import { rebuildLogger } from "./rebuild-logger.ts";
+
+export { copyStaticFiles };
+
+export const pkg = JSON.parse(readFileSync(path.join(process.cwd(), "./package.json"), "utf8"));
+export const NODE_MJS = pkg.type === "module" ? "js" : "mjs";
+export const NODE_CJS = pkg.type === "module" ? "cjs" : "js";
+
+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;
+
+    config = {
+        entryPoints: inputs,
+        format: config.format ?? "esm",
+        bundle: true,
+        minify: isProduction,
+        sourcemap: true,
+        external: [
+            ...config.external ?? []
+        ],
+        ...config,
+        loader: {
+            ...config.loader
+        },
+        outExtension: {
+            ...config.outExtension
+        },
+        banner: {
+            ...config.banner
+        },
+        footer: {
+            ...config.footer
+        },
+        plugins: [
+            ...(isWatch ? [rebuildLogger(config)] : []),
+            ...config.plugins ?? [],
+            inlineCSS()
+        ],
+        nodePaths: [
+            ...config.nodePaths ?? []
+        ]
+    };
+    const ctx = await esbuild.context(config as BuildOptions);
+
+    if (isWatch) {
+        await ctx.watch();
+    } else {
+        if (isDevelopment && Array.isArray(config.entryPoints)) {
+            // eslint-disable-next-line no-console
+            console.log("Start:  ", config.entryPoints[0], config.outfile);
+        }
+        await ctx.rebuild();
+        await ctx.dispose();
+        if (isDevelopment && Array.isArray(config.entryPoints)) {
+            // eslint-disable-next-line no-console
+            console.log("Stop:   ", config.entryPoints[0], config.outfile);
+        }
+    }
+}
+
+export type TplOptions = {
+    format?: Format | "umd";
+    globalName?: string;
+    libraryName?: string;
+    keepNames?: boolean;
+    external?: string[];
+    plugins?: Plugin[];
+    loader?: { [ext: string]: Loader };
+    supported?: Record<string, boolean>;
+    alias?: Record<string, string>;
+    define?: { [key: string]: string };
+    packages?: "bundle" | "external" | "auto";
+};
+
+function autoExternal(external?: string[]): string[] {
+    return [
+        ...pkg.dependencies ? Object.keys(pkg.dependencies) : [], ...pkg.peerDependencies ? Object.keys(pkg.peerDependencies) : [],
+        ...external ?? []
+    ];
+}
+
+export function browserTpl(input: string, output: string, options: TplOptions = {}) {
+    options.format = options.format ?? "esm";
+
+    return buildWatch([input], {
+        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" ? [umdWrapper({ libraryName: options.libraryName }) as Plugin, ...options.plugins ?? []] : options.plugins,
+        alias: options.alias,
+        define: options.define,
+        loader: options.loader,
+        supported: options.supported,
+    });
+}
+
+export function nodeTpl(input: string, output: string, options: TplOptions = {}) {
+    options.format = options.format ?? "esm";
+    options.packages = options.packages ?? "external";
+    if (options.packages === "auto") {
+        options.external = autoExternal(options.external);
+    }
+
+    return buildWatch([input], {
+        format: options.format,
+        external: options.external ?? [],
+        outfile: `${output}.${options.format === "esm" ? NODE_MJS : NODE_CJS}`,
+        platform: "node",
+        target: "node22",
+        packages: options.packages === "auto" ? "bundle" : options.packages,
+        globalName: options.globalName,
+        keepNames: options.keepNames,
+        plugins: options.plugins,
+        alias: options.alias,
+        define: options.define,
+        loader: options.loader,
+        supported: options.supported,
+    });
+}
+
+export function neutralTpl(input: string, output: string, options: TplOptions = {}) {
+    options.format = options.format ?? "esm";
+
+    return buildWatch([input], {
+        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" ? [umdWrapper({ libraryName: options.libraryName }) as Plugin, ...options.plugins ?? []] : options.plugins,
+        alias: options.alias,
+        define: options.define,
+        loader: options.loader,
+        supported: options.supported,
+    });
+}
+
+export function browserBoth(input: string, output: string, options: TplOptions = {}) {
+    return Promise.all([
+        browserTpl(input, output, { format: "esm", ...options }),
+        browserTpl(input, output, { format: "umd", ...options })
+    ]);
+}
+
+export function nodeBoth(input: string, output: string, options: TplOptions = {}) {
+    return Promise.all([
+        nodeTpl(input, output, { format: "esm", ...options }),
+        nodeTpl(input, output, { format: "cjs", ...options })
+    ]);
+}
+
+export function bothTpl(input: string, output: string, options: TplOptions = {}) {
+    return Promise.all([
+        browserBoth(input, output, { ...options }),
+        nodeTpl(input, output, { format: "cjs", ...options })
+    ]);
+}

package/src/exclude-sourcemap.ts

@@ -1,20 +1,20 @@
-import { readFile } from "fs/promises";
-import type { PluginBuild, Plugin } from "esbuild";
-
-export interface ExcludeSourcemapOptions {
-    filter: RegExp;
-}
-export function excludeSourcemap(opts: ExcludeSourcemapOptions): Plugin {
-    return {
-        name: "exclude-sourcemap",
-
-        setup(build: PluginBuild) {
-            build.onLoad({ filter: opts.filter }, async args => {
-                return {
-                    contents: await readFile(args.path, "utf8") + "\n//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIiJdLCJtYXBwaW5ncyI6IkEifQ==",
-                    loader: "default",
-                };
-            });
-        },
-    };
-}
+import { readFile } from "fs/promises";
+import type { PluginBuild, Plugin } from "esbuild";
+
+export interface ExcludeSourcemapOptions {
+    filter: RegExp;
+}
+export function excludeSourcemap(opts: ExcludeSourcemapOptions): Plugin {
+    return {
+        name: "exclude-sourcemap",
+
+        setup(build: PluginBuild) {
+            build.onLoad({ filter: opts.filter }, async args => {
+                return {
+                    contents: await readFile(args.path, "utf8") + "\n//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIiJdLCJtYXBwaW5ncyI6IkEifQ==",
+                    loader: "default",
+                };
+            });
+        },
+    };
+}

package/src/index.ts

@@ -1,8 +1,8 @@
-export * from "./build.ts";
-export * from "./exclude-sourcemap.ts";
-export * from "./problem-matcher.ts";
-export * from "./rebuild-logger.ts";
-export * from "./remove-strict.ts";
-export * from "./inline-css.ts";
-export * from "./vite-utils.ts";
-export * from "./package-version-plugin.ts";
+export * from "./build.ts";
+export * from "./exclude-sourcemap.ts";
+export * from "./problem-matcher.ts";
+export * from "./rebuild-logger.ts";
+export * from "./remove-strict.ts";
+export * from "./inline-css.ts";
+export * from "./vite-utils.ts";
+export * from "./package-version-plugin.ts";

package/src/inline-css.ts

@@ -1,44 +1,44 @@
-import type { PluginBuild, Plugin } from "esbuild";
-import path from "path";
-import crypto from "crypto";
-import { readFile } from "fs/promises";
-
-export function inlineCSS(options = {}) {
-    return {
-        name: "inline-css",
-
-        setup(build: PluginBuild) {
-
-            build.onLoad({ filter: /\.(css)$/ }, async (args) => {
-                if (build.initialOptions.platform === "browser") {
-                    const sourcePath = path.resolve(args.path);
-                    const sourceJS = await generateInjectCSS(sourcePath);
-                    return {
-                        contents: sourceJS,
-                        loader: "js"
-                    };
-                }
-            });
-        },
-    };
-}
-
-async function generateInjectCSS(sourcePath: string) {
-    const styleID = sha256(sourcePath);
-    const sourceCSS = await readFile(sourcePath, "utf8");
-
-    return `(function(){
-        if (!document.getElementById('${styleID}')) {
-            var e = document.createElement('style');
-            e.id = '${styleID}';
-            e.textContent = \`${sourceCSS.split("\\25").join("\\x15")}\`;
-            document.head.appendChild(e);
-        }
-    })();`;
-}
-
-function sha256(sourcePath: string) {
-    const hash = crypto.createHash("sha256").update(sourcePath).digest("hex");
-    return hash.slice(0, 8); // Use the first 8 characters of the hash
-}
-
+import type { PluginBuild, Plugin } from "esbuild";
+import path from "path";
+import crypto from "crypto";
+import { readFile } from "fs/promises";
+
+export function inlineCSS(options = {}) {
+    return {
+        name: "inline-css",
+
+        setup(build: PluginBuild) {
+
+            build.onLoad({ filter: /\.(css)$/ }, async (args) => {
+                if (build.initialOptions.platform === "browser") {
+                    const sourcePath = path.resolve(args.path);
+                    const sourceJS = await generateInjectCSS(sourcePath);
+                    return {
+                        contents: sourceJS,
+                        loader: "js"
+                    };
+                }
+            });
+        },
+    };
+}
+
+async function generateInjectCSS(sourcePath: string) {
+    const styleID = sha256(sourcePath);
+    const sourceCSS = await readFile(sourcePath, "utf8");
+
+    return `(function(){
+        if (!document.getElementById('${styleID}')) {
+            var e = document.createElement('style');
+            e.id = '${styleID}';
+            e.textContent = \`${sourceCSS.split("\\25").join("\\x15")}\`;
+            document.head.appendChild(e);
+        }
+    })();`;
+}
+
+function sha256(sourcePath: string) {
+    const hash = crypto.createHash("sha256").update(sourcePath).digest("hex");
+    return hash.slice(0, 8); // Use the first 8 characters of the hash
+}
+