@hpcc-js/esbuild-plugins 1.0.6 → 1.0.8

package/package.json

@@ -1,64 +1,63 @@
-{
-  "name": "@hpcc-js/esbuild-plugins",
-  "version": "1.0.6",
-  "description": "Various esbuild plugins",
-  "type": "module",
-  "exports": {
-    ".": {
-      "types": "./types/index.d.ts",
-      "default": "./dist/index.js"
-    },
-    "./sfx-wrapper": {
-      "types": "./types/sfx-wrapper.d.ts",
-      "default": "./dist/sfx-wrapper.js"
-    }
-  },
-  "main": "./dist/index.js",
-  "types": "./types/index.d.ts",
-  "files": [
-    "dist/**/*",
-    "src/**/*",
-    "types/**/*"
-  ],
-  "scripts": {
-    "clean": "rimraf ./dist ./types",
-    "build-types": "tsc --project tsconfig.json --emitDeclarationOnly",
-    "build-types-watch": "npm run build-types -- --watch",
-    "build-ts-dev": "esbuild ./src/index.ts --platform=node --format=esm --bundle --sourcemap --outfile=./dist/index.js",
-    "build-ts": "npm run build-ts-dev -- --minify",
-    "build-ts-watch": "npm run build-ts-dev -- --watch",
-    "build-dev": "run-p build-types build-ts-dev",
-    "build-sfx-wrapper-dev": "esbuild ./src/sfx-wrapper.ts --platform=node --format=esm --bundle --sourcemap --outfile=./dist/sfx-wrapper.js",
-    "build-sfx-wrapper": "npm run build-sfx-wrapper-dev -- --minify",
-    "build": "run-p build-types build-ts build-sfx-wrapper",
-    "lint-skypack": "npx -y @skypack/package-check",
-    "lint-eslint": "eslint src/**/*.ts",
-    "lint": "run-p lint-eslint lint-skypack",
-    "test-cli": "npx . -v",
-    "test-cli-help": "npx .",
-    "test-node": "npx . -v",
-    "update": "npx --yes npm-check-updates -u -t minor"
-  },
-  "dependencies": {
-    "yargs": "17.7.2",
-    "fzstd": "0.1.1"
-  },
-  "devDependencies": {
-    "@hpcc-js/wasm-base91": "1.0.1",
-    "@hpcc-js/wasm-zstd": "1.0.1"
-  },
-  "keywords": [
-    "esbuild",
-    "plugins",
-    "WebAssembly",
-    "wasm",
-    "sfx"
-  ],
-  "author": "hpcc-systems",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/hpcc-systems/hpcc-js-wasm.git"
-  },
-  "homepage": "https://hpcc-systems.github.io/hpcc-js-wasm/",
-  "license": "Apache-2.0"
+{
+  "name": "@hpcc-js/esbuild-plugins",
+  "version": "1.0.8",
+  "description": "Various esbuild plugins",
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": "./types/index.d.ts",
+      "default": "./dist/index.js"
+    },
+    "./sfx-wrapper": {
+      "types": "./types/sfx-wrapper.d.ts",
+      "default": "./dist/sfx-wrapper.js"
+    }
+  },
+  "main": "./dist/index.js",
+  "types": "./types/index.d.ts",
+  "files": [
+    "dist/**/*",
+    "src/**/*",
+    "types/**/*"
+  ],
+  "scripts": {
+    "clean": "rimraf ./dist ./types",
+    "build-types": "tsc --project tsconfig.json --emitDeclarationOnly",
+    "build-types-watch": "npm run build-types -- --watch",
+    "build-ts-dev": "esbuild ./src/index.ts --platform=node --format=esm --bundle --packages=external --sourcemap --outfile=./dist/index.js",
+    "build-ts": "npm run build-ts-dev -- --minify",
+    "build-ts-watch": "npm run build-ts-dev -- --watch",
+    "build-dev": "run-p build-types build-ts-dev",
+    "build-sfx-wrapper-dev": "esbuild ./src/sfx-wrapper.ts --platform=node --format=esm --bundle --packages=external --sourcemap --outfile=./dist/sfx-wrapper.js",
+    "build-sfx-wrapper": "npm run build-sfx-wrapper-dev -- --minify",
+    "build": "run-p build-types build-ts build-sfx-wrapper",
+    "lint-skypack": "npx -y @skypack/package-check",
+    "lint-eslint": "eslint src/**/*.ts",
+    "lint": "run-p lint-eslint lint-skypack",
+    "test-cli": "npx . -v",
+    "test-cli-help": "npx .",
+    "test-node": "npx . -v",
+    "update": "npx --yes npm-check-updates -u -t minor"
+  },
+  "dependencies": {
+    "@hpcc-js/wasm-base91": "1.0.1",
+    "@hpcc-js/wasm-zstd": "1.0.1",
+    "yargs": "17.7.2",
+    "fzstd": "0.1.1"
+  },
+  "devDependencies": {},
+  "keywords": [
+    "esbuild",
+    "plugins",
+    "WebAssembly",
+    "wasm",
+    "sfx"
+  ],
+  "author": "hpcc-systems",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/hpcc-systems/hpcc-js-wasm.git"
+  },
+  "homepage": "https://hpcc-systems.github.io/hpcc-js-wasm/",
+  "license": "Apache-2.0"
 }

package/src/build.ts

@@ -1,140 +1,143 @@
-import * as process from "process";
-import { readFileSync } from "fs";
-import * as path from "path";
-import * as esbuild from "esbuild";
-import type { BuildOptions, Format } from "esbuild";
-import { umdWrapper } from "esbuild-plugin-umd-wrapper";
-import yargs from "yargs";
-import { hideBin } from "yargs/helpers";
-import { rebuildLogger } from "./rebuild-logger.ts";
-import { sfxWasm } from "./sfx-wrapper.ts";
-
-const pkg = JSON.parse(readFileSync(path.join(process.cwd(), "./package.json"), "utf8"));
-const NODE_MJS = pkg.type === "module" ? "js" : "mjs";
-const NODE_CJS = pkg.type === "module" ? "cjs" : "js";
-
-const myYargs = yargs(hideBin(process.argv));
-myYargs
-    .usage("Usage: node esbuild.mjs [options]")
-    .demandCommand(0, 0)
-    .example("node esbuild.mjs --watch", "Bundle and watch for changes")
-    .option("mode", {
-        alias: "m",
-        describe: "Build mode",
-        choices: ["development", "production"],
-        default: "production"
-    })
-    .option("w", {
-        alias: "watch",
-        describe: "Watch for changes",
-        type: "boolean"
-    })
-    .help("h")
-    .alias("h", "help")
-    .epilog("https://github.com/hpcc-systems/hpcc-js-wasm")
-    ;
-const argv = await myYargs.argv;
-const isDevelopment = argv.mode === "development";
-const isProduction = !isDevelopment;
-const isWatch = argv.watch;
-
-export function build(config: BuildOptions) {
-    if (isDevelopment && Array.isArray(config.entryPoints)) {
-        console.log("Start:  ", config.entryPoints[0], config.outfile);
-    }
-    return esbuild.build({
-        ...config,
-        sourcemap: "linked",
-        plugins: [
-            ...(config.plugins ?? []),
-            sfxWasm()
-        ]
-    }).finally(() => {
-        if (isDevelopment && Array.isArray(config.entryPoints)) {
-            console.log("Stop:   ", config.entryPoints[0], config.outfile);
-        }
-    });
-}
-
-export async function watch(config: BuildOptions) {
-    await build(config);
-    return esbuild.context({
-        ...config,
-        sourcemap: "external",
-        plugins: [
-            ...(config.plugins ?? []),
-            rebuildLogger(config),
-            sfxWasm()
-        ]
-    }).then(ctx => {
-        return ctx.watch();
-    });
-}
-
-export function buildWatch(config: BuildOptions) {
-    return isWatch ? watch(config) : build(config);
-}
-
-export function browserTpl(input: string, output: string, format: Format | "umd" = "esm", globalName?: string, external: string[] = []) {
-    return buildWatch({
-        entryPoints: [input],
-        outfile: `${output}.${format === "esm" ? "js" : "umd.js"}`,
-        platform: "browser",
-        target: "es2022",
-        format: format as Format,
-        globalName,
-        bundle: true,
-        minify: isProduction,
-        external,
-        plugins: format === "umd" ? [umdWrapper()] : []
-    });
-}
-
-export function browserBoth(input: string, output: string, globalName?: string, external: string[] = []) {
-    return Promise.all([
-        browserTpl(input, output, "esm", globalName, external),
-        browserTpl(input, output, "umd", globalName, external)
-    ]);
-}
-
-export function nodeTpl(input: string, output: string, format: Format | "umd" = "esm", external: string[] = []) {
-    return buildWatch({
-        entryPoints: [input],
-        outfile: `${output}.${format === "esm" ? NODE_MJS : NODE_CJS}`,
-        platform: "node",
-        target: "node20",
-        format: format as Format,
-        bundle: true,
-        minify: isProduction,
-        external
-    });
-}
-
-export function neutralTpl(input: string, output: string, format: Format | "umd" = "esm", globalName?: string, external: string[] = []) {
-    return buildWatch({
-        entryPoints: [input],
-        outfile: `${output}.${format === "esm" ? "js" : "umd.js"}`,
-        platform: "neutral",
-        target: "es2022",
-        format: format as Format,
-        globalName,
-        bundle: true,
-        minify: isProduction,
-        external,
-        plugins: format === "umd" ? [umdWrapper()] : []
-    });
-}
-
-export function nodeBoth(input: string, output: string, external: string[] = []) {
-    return Promise.all([
-        nodeTpl(input, output, "esm", external),
-        nodeTpl(input, output, "cjs", external)
-    ]);
-}
-
-export function bothTpl(input: string, output: string, globalName?: string, external: string[] = []) {
-    return Promise.all([
-        browserBoth(input, output, globalName, external),
-        nodeTpl(input, output, "cjs", external)
-    ]);
-}
+import * as process from "process";
+import { readFileSync } from "fs";
+import * as path from "path";
+import * as esbuild from "esbuild";
+import type { BuildOptions, Format } from "esbuild";
+import { umdWrapper } from "esbuild-plugin-umd-wrapper";
+import yargs from "yargs";
+import { hideBin } from "yargs/helpers";
+import { rebuildLogger } from "./rebuild-logger.ts";
+import { sfxWasm } from "./sfx-wrapper.ts";
+
+const myYargs = yargs(hideBin(process.argv));
+myYargs
+    .usage("Usage: node esbuild.mjs [options]")
+    .demandCommand(0, 0)
+    .example("node esbuild.mjs --watch", "Bundle and watch for changes")
+    .option("mode", {
+        alias: "m",
+        describe: "Build mode",
+        choices: ["development", "production"],
+        default: "production"
+    })
+    .option("w", {
+        alias: "watch",
+        describe: "Watch for changes",
+        type: "boolean"
+    })
+    .help("h")
+    .alias("h", "help")
+    .epilog("https://github.com/hpcc-systems/hpcc-js-wasm")
+    ;
+
+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";
+
+export const argv = await myYargs.argv;
+export const isDevelopment = argv.mode === "development";
+export const isProduction = !isDevelopment;
+export const isWatch = argv.watch;
+
+export function build(config: BuildOptions) {
+    if (isDevelopment && Array.isArray(config.entryPoints)) {
+        // eslint-disable-next-line no-console
+        console.log("Start:  ", config.entryPoints[0], config.outfile);
+    }
+    return esbuild.build({
+        sourcemap: "linked",
+        ...config,
+        plugins: [
+            ...(config.plugins ?? []),
+            sfxWasm()
+        ]
+    }).finally(() => {
+        if (isDevelopment && Array.isArray(config.entryPoints)) {
+            // eslint-disable-next-line no-console
+            console.log("Stop:   ", config.entryPoints[0], config.outfile);
+        }
+    });
+}
+
+export async function watch(config: BuildOptions) {
+    await build(config);
+    return esbuild.context({
+        sourcemap: "external",
+        ...config,
+        plugins: [
+            ...(config.plugins ?? []),
+            rebuildLogger(config),
+            sfxWasm()
+        ]
+    }).then(ctx => {
+        return ctx.watch();
+    });
+}
+
+export function buildWatch(config: BuildOptions) {
+    return isWatch ? watch(config) : build(config);
+}
+
+export function browserTpl(input: string, output: string, format: Format | "umd" = "esm", globalName?: string, external: string[] = []) {
+    return buildWatch({
+        entryPoints: [input],
+        outfile: `${output}.${format === "esm" ? "js" : "umd.js"}`,
+        platform: "browser",
+        target: "es2022",
+        format: format as Format,
+        globalName,
+        bundle: true,
+        minify: isProduction,
+        external,
+        plugins: format === "umd" ? [umdWrapper({ libraryName: globalName })] : []
+    });
+}
+
+export function browserBoth(input: string, output: string, globalName?: string, external: string[] = []) {
+    return Promise.all([
+        browserTpl(input, output, "esm", globalName, external),
+        browserTpl(input, output, "umd", globalName, external)
+    ]);
+}
+
+export function nodeTpl(input: string, output: string, format: Format | "umd" = "esm", external: string[] = []) {
+    return buildWatch({
+        entryPoints: [input],
+        outfile: `${output}.${format === "esm" ? NODE_MJS : NODE_CJS}`,
+        platform: "node",
+        target: "node20",
+        format: format as Format,
+        bundle: true,
+        minify: isProduction,
+        external
+    });
+}
+
+export function neutralTpl(input: string, output: string, format: Format | "umd" = "esm", globalName?: string, external: string[] = []) {
+    return buildWatch({
+        entryPoints: [input],
+        outfile: `${output}.${format === "esm" ? "js" : "umd.js"}`,
+        platform: "neutral",
+        target: "es2022",
+        format: format as Format,
+        globalName,
+        bundle: true,
+        minify: isProduction,
+        external,
+        plugins: format === "umd" ? [umdWrapper()] : []
+    });
+}
+
+export function nodeBoth(input: string, output: string, external: string[] = []) {
+    return Promise.all([
+        nodeTpl(input, output, "esm", external),
+        nodeTpl(input, output, "cjs", external)
+    ]);
+}
+
+export function bothTpl(input: string, output: string, globalName?: string, external: string[] = []) {
+    return Promise.all([
+        browserBoth(input, output, globalName, external),
+        nodeTpl(input, output, "cjs", external)
+    ]);
+}

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,5 +1,5 @@
-export * from "./build.ts";
-export * from "./exclude-sourcemap.ts";
-export * from "./problem-matcher.ts";
-export * from "./rebuild-logger.ts";
-export * from "./sfx-wrapper.ts";
+export * from "./build.ts";
+export * from "./exclude-sourcemap.ts";
+export * from "./problem-matcher.ts";
+export * from "./rebuild-logger.ts";
+export * from "./sfx-wrapper.ts";

package/src/problem-matcher.ts

@@ -1,22 +1,24 @@
-import type { PluginBuild, Plugin } from "esbuild";
-
-export function problemMatcher(): Plugin {
-    return {
-        name: "problem-matcher",
-
-        setup(build: PluginBuild) {
-
-            build.onStart(() => {
-                console.log("[watch] build started");
-            });
-
-            build.onEnd((result) => {
-                result.errors.forEach(({ text, location }) => {
-                    console.error(`✘ [ERROR] ${text}`);
-                    console.error(`    ${location?.file}:${location?.line}:${location?.column}:`);
-                });
-                console.log("[watch] build finished");
-            });
-        }
-    };
-}
+import type { PluginBuild, Plugin } from "esbuild";
+
+export function problemMatcher(): Plugin {
+    return {
+        name: "problem-matcher",
+
+        setup(build: PluginBuild) {
+
+            build.onStart(() => {
+                // eslint-disable-next-line no-console
+                console.log("[watch] build started");
+            });
+
+            build.onEnd((result) => {
+                result.errors.forEach(({ text, location }) => {
+                    console.error(`✘ [ERROR] ${text}`);
+                    console.error(`    ${location?.file}:${location?.line}:${location?.column}:`);
+                });
+                // eslint-disable-next-line no-console
+                console.log("[watch] build finished");
+            });
+        }
+    };
+}

package/src/rebuild-logger.ts

@@ -1,22 +1,24 @@
-import type { PluginBuild, Plugin } from "esbuild";
-
-export interface RebuildLoggerOptions {
-    outfile?: string;
-}
-
-export function rebuildLogger(opts: RebuildLoggerOptions): Plugin {
-    return {
-        name: "rebuild-logger",
-
-        setup(build: PluginBuild) {
-
-            build.onStart(() => {
-                console.log("[watch] build started");
-            });
-
-            build.onEnd(() => {
-                console.log(`Rebuilt ${opts.outfile ?? "Unknown"}`);
-            });
-        }
-    };
-}
+import type { PluginBuild, Plugin } from "esbuild";
+
+export interface RebuildLoggerOptions {
+    outfile?: string;
+}
+
+export function rebuildLogger(opts: RebuildLoggerOptions): Plugin {
+    return {
+        name: "rebuild-logger",
+
+        setup(build: PluginBuild) {
+
+            build.onStart(() => {
+                // eslint-disable-next-line no-console
+                console.log("[watch] build started");
+            });
+
+            build.onEnd(() => {
+                // eslint-disable-next-line no-console
+                console.log(`Rebuilt ${opts.outfile ?? "Unknown"}`);
+            });
+        }
+    };
+}