@hpcc-js/esbuild-plugins 1.4.7 → 1.4.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hpcc-js/esbuild-plugins",
-  "version": "1.4.7",
+  "version": "1.4.9",
   "description": "Various esbuild plugins",
   "type": "module",
   "exports": {
@@ -37,18 +37,18 @@
     "update": "npx --yes npm-check-updates -u -t minor"
   },
   "dependencies": {
-    "esbuild": "0.25.5",
+    "esbuild": "0.25.8",
     "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": "7.0.6",
     "vite-plugin-css-injected-by-js": "3.5.2",
-    "vite-plugin-static-copy": "3.1.0"
+    "vite-plugin-static-copy": "3.1.1"
   },
   "devDependencies": {
-    "@hpcc-js/wasm-base91": "1.3.1",
-    "@hpcc-js/wasm-zstd": "1.2.1"
+    "@hpcc-js/wasm-base91": "1.5.0",
+    "@hpcc-js/wasm-zstd": "1.4.0"
   },
   "keywords": [
     "esbuild",
@@ -64,5 +64,5 @@
   },
   "homepage": "https://hpcc-systems.github.io/hpcc-js-wasm/",
   "license": "Apache-2.0",
-  "gitHead": "44cd47dfe0d954df395002c2d5ce222a73d73f2a"
+  "gitHead": "92489547b0e57f479a691236b1a47e977b43cf2e"
 }

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 }) as Plugin, ...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 }) as Plugin, ...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/src/vite-utils.ts

@@ -1,4 +1,4 @@
-import { defineConfig, UserConfig } from "vite";
+import { configDefaults, defineConfig, ViteUserConfig } from "vitest/config";
 import cssInjectedByJsPlugin from "vite-plugin-css-injected-by-js";
 import { viteStaticCopy } from "vite-plugin-static-copy";
 
@@ -54,19 +54,65 @@ export interface ViteHpccConfigOptions {
     /**
      * Additional vite config options to merge
      */
-    configOverrides?: Partial<UserConfig>;
+    configOverrides?: Partial<ViteUserConfig>;
 }
 
-/**
- * Creates a standardized Vite configuration for HPCC-JS packages
- */
-export function createHpccViteConfig(pkg: any, options: ViteHpccConfigOptions = {}): UserConfig {
+export const nodeConfig = defineConfig({
+    test: {
+        name: "node",
+
+        exclude: [
+            ...configDefaults.exclude,
+            "**/*.browser.spec.{ts,js}",
+            "**/node_modules/**",
+            "**/.nx/**",
+            "**/apps/**",
+            "**/components/**",
+            "**/demos/**",
+        ],
+        environment: "node",
+        setupFiles: []
+    }
+});
+
+export const browserConfig = defineConfig({
+    test: {
+        exclude: [
+            ...configDefaults.exclude,
+            "@hpcc-js/dgrid-shim",
+            "**/*.node.spec.{ts,js}",
+            "**/node_modules/**",
+            "**/.nx/**",
+            "**/apps/**",
+            "**/components/**",
+            "**/demos/**",
+            "**/src/**",
+        ],
+        browser: {
+            enabled: true,
+            provider: "playwright",
+            instances: [{
+                name: "chromium",
+                browser: "chromium",
+                headless: true,
+                //@ts-expect-error
+                launch: {
+                    args: ["--disable-web-security"],
+                }
+            }],
+            screenshotFailures: false,
+        },
+        setupFiles: [],
+    }
+});
+
+export function createHpccViteConfig(pkg: any, options: ViteHpccConfigOptions = {}): ViteUserConfig {
     const {
         external: additionalExternal = [],
         plugins: additionalPlugins = [],
         includeFontAwesome = false,
         entry = "src/index.ts",
-        configOverrides = {}
+        configOverrides = {},
     } = options;
 
     const { alias, external, globals } = hpccBundleNames(pkg);
@@ -101,7 +147,7 @@ export function createHpccViteConfig(pkg: any, options: ViteHpccConfigOptions =
         fileName: "index",
     };
 
-    const config: UserConfig = {
+    const config: ViteUserConfig = {
         build: {
             lib: {
                 ...defaultLibConfig,
@@ -114,6 +160,14 @@ export function createHpccViteConfig(pkg: any, options: ViteHpccConfigOptions =
                 },
                 ...(configOverrides.build?.rollupOptions || {})
             },
+            // Preserve class names and function names in minified output
+            minify: "terser",
+            terserOptions: {
+                keep_classnames: true,
+                mangle: {
+                    keep_classnames: true,
+                }
+            },
             sourcemap: true,
             ...(configOverrides.build ? Object.fromEntries(Object.entries(configOverrides.build).filter(([key]) => key !== "lib" && key !== "rollupOptions")) : {})
         },
@@ -122,10 +176,14 @@ export function createHpccViteConfig(pkg: any, options: ViteHpccConfigOptions =
             ...(configOverrides.resolve || {})
         },
         esbuild: {
-            minifyIdentifiers: false,
+            keepNames: true,
             ...(configOverrides.esbuild || {})
         },
         plugins: allPlugins,
+        test: {
+            projects: [nodeConfig, browserConfig],
+            ...(configOverrides.test || {})
+        },
         ...Object.fromEntries(Object.entries(configOverrides).filter(([key]) => !["build", "resolve", "esbuild", "plugins"].includes(key)))
     };
 

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;

package/types/vite-utils.d.ts

@@ -1,4 +1,4 @@
-import { UserConfig } from "vite";
+import { ViteUserConfig } from "vitest/config";
 export declare function hpccBundleNames(pkg: any): {
     alias: {};
     external: string[];
@@ -26,9 +26,8 @@ export interface ViteHpccConfigOptions {
     /**
      * Additional vite config options to merge
      */
-    configOverrides?: Partial<UserConfig>;
+    configOverrides?: Partial<ViteUserConfig>;
 }
-/**
- * Creates a standardized Vite configuration for HPCC-JS packages
- */
-export declare function createHpccViteConfig(pkg: any, options?: ViteHpccConfigOptions): UserConfig;
+export declare const nodeConfig: ViteUserConfig;
+export declare const browserConfig: ViteUserConfig & Promise<ViteUserConfig> & (import("vitest/config").UserConfigFnObject & import("vitest/config").UserConfigExport);
+export declare function createHpccViteConfig(pkg: any, options?: ViteHpccConfigOptions): ViteUserConfig;