@hpcc-js/esbuild-plugins 1.5.1 → 1.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hpcc-js/esbuild-plugins",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "description": "Various esbuild plugins",
   "type": "module",
   "exports": {
@@ -37,17 +37,17 @@
     "update": "npx --yes npm-check-updates -u -t minor"
   },
   "dependencies": {
-    "esbuild": "0.25.10",
+    "esbuild": "0.25.11",
     "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-plugin-css-injected-by-js": "3.5.2",
-    "vite-plugin-static-copy": "3.1.2"
+    "vite-plugin-static-copy": "3.1.4"
   },
   "devDependencies": {
-    "@hpcc-js/wasm-base91": "1.6.0",
-    "@hpcc-js/wasm-zstd": "1.5.0"
+    "@hpcc-js/wasm-base91": "1.8.0",
+    "@hpcc-js/wasm-zstd": "1.7.0"
   },
   "keywords": [
     "esbuild",
@@ -63,5 +63,5 @@
   },
   "homepage": "https://hpcc-systems.github.io/hpcc-js-wasm/",
   "license": "Apache-2.0",
-  "gitHead": "111cb62ebdf2ab518e094f321223ca3ebdc628bd"
+  "gitHead": "bfefa70bf4e4232dcdaaa8498a2985a4e9aaadb5"
 }

package/src/build.ts

@@ -1,5 +1,5 @@
 import * as process from "process";
-import { readFileSync, existsSync, writeFileSync } from "fs";
+import { readFileSync } from "fs";
 import * as path from "path";
 import * as esbuild from "esbuild";
 import type { BuildOptions, Format, Loader, Plugin } from "esbuild";
@@ -23,15 +23,6 @@ export async function buildWatch(inputs: string[] | Record<string, string> | { i
     const isWatch = process.argv.includes("--watch");
     const isProduction = !isDevelopment;
 
-    if (isProduction && existsSync(path.join(process.cwd(), "../../package.json"))) {
-        const rootPkg = JSON.parse(readFileSync(path.join(process.cwd(), "../../package.json"), "utf8"));
-        writeFileSync(path.join(process.cwd(), "src/__package__.ts"), `\
-export const PKG_NAME = "${pkg.name}";
-export const PKG_VERSION = "${pkg.version}";
-export const BUILD_VERSION = "${rootPkg.version}";
-`, "utf8");
-    }
-
     config = {
         entryPoints: inputs,
         format: config.format ?? "esm",

package/src/index.ts

@@ -5,3 +5,4 @@ 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/package-version-plugin.ts

@@ -0,0 +1,87 @@
+import type { Plugin } from "vite";
+
+export interface PackageVersionPluginOptions {
+    /**
+     * Package.json object containing name and version
+     */
+    pkg: {
+        name: string;
+        version: string;
+    };
+    /**
+     * Build version (typically from root package.json)
+     * If not provided, defaults to pkg.version
+     */
+    buildVersion?: string;
+    /**
+     * Placeholder for package name (default: "__PACKAGE_NAME__")
+     */
+    namePlaceholder?: string;
+    /**
+     * Placeholder for package version (default: "__PACKAGE_VERSION__")
+     */
+    versionPlaceholder?: string;
+    /**
+     * Placeholder for build version (default: "__BUILD_VERSION__")
+     */
+    buildVersionPlaceholder?: string;
+}
+
+/**
+ * Vite plugin to replace package version placeholders during build
+ * This allows keeping version information in source files as placeholders
+ * that get replaced with actual values from package.json during the build
+ */
+export function packageVersionPlugin(options: PackageVersionPluginOptions): Plugin {
+    const {
+        pkg,
+        buildVersion = pkg.version,
+        namePlaceholder = "__PACKAGE_NAME__",
+        versionPlaceholder = "__PACKAGE_VERSION__",
+        buildVersionPlaceholder = "__BUILD_VERSION__"
+    } = options;
+
+    return {
+        name: "hpcc-package-version-plugin",
+        enforce: "pre",
+        transform(code: string, id: string) {
+            // Only process TypeScript/JavaScript files
+            if (!id.endsWith(".ts") && !id.endsWith(".js")) {
+                return null;
+            }
+
+            // Check if the file contains any placeholders
+            if (!code.includes(namePlaceholder) &&
+                !code.includes(versionPlaceholder) &&
+                !code.includes(buildVersionPlaceholder)) {
+                return null;
+            }
+
+            // Replace placeholders with actual values
+            let transformedCode = code;
+            if (code.includes(namePlaceholder)) {
+                transformedCode = transformedCode.replace(
+                    new RegExp(namePlaceholder, "g"),
+                    pkg.name
+                );
+            }
+            if (code.includes(versionPlaceholder)) {
+                transformedCode = transformedCode.replace(
+                    new RegExp(versionPlaceholder, "g"),
+                    pkg.version
+                );
+            }
+            if (code.includes(buildVersionPlaceholder)) {
+                transformedCode = transformedCode.replace(
+                    new RegExp(buildVersionPlaceholder, "g"),
+                    buildVersion
+                );
+            }
+
+            return {
+                code: transformedCode,
+                map: null // Could generate source map if needed
+            };
+        }
+    };
+}

package/src/vite-utils.ts

@@ -1,6 +1,10 @@
 import { configDefaults, defineConfig, ViteUserConfig } from "vitest/config";
 import cssInjectedByJsPlugin from "vite-plugin-css-injected-by-js";
 import { viteStaticCopy } from "vite-plugin-static-copy";
+import { packageVersionPlugin } from "./package-version-plugin.ts";
+import { readFileSync } from "fs";
+import { resolve, dirname } from "path";
+import { fileURLToPath } from "url";
 
 const alias = {
     "d3-array": "@hpcc-js/common",
@@ -20,6 +24,46 @@ const alias = {
     "d3-zoom": "@hpcc-js/common"
 };
 
+/**
+ * Find and read the root package.json (monorepo root)
+ * Walks up the directory tree looking for a package.json with "workspaces"
+ */
+function getRootPackageVersion(): string {
+    try {
+        // Try to find root package.json by walking up from current file
+        let currentDir = dirname(fileURLToPath(import.meta.url));
+        let attempts = 0;
+        const maxAttempts = 10;
+
+        while (attempts < maxAttempts) {
+            try {
+                const pkgPath = resolve(currentDir, "package.json");
+                const pkgContent = readFileSync(pkgPath, "utf-8");
+                const pkg = JSON.parse(pkgContent);
+
+                // Check if this is the root by looking for workspaces
+                if (pkg.workspaces) {
+                    return pkg.version;
+                }
+            } catch {
+                // File doesn't exist or couldn't be read, continue up
+            }
+
+            const parentDir = dirname(currentDir);
+            if (parentDir === currentDir) {
+                // Reached filesystem root
+                break;
+            }
+            currentDir = parentDir;
+            attempts++;
+        }
+    } catch (error) {
+        console.warn("Could not read root package.json, using package version as build version:", error);
+    }
+
+    return "";
+}
+
 export function hpccBundleNames(pkg: any) {
     const external: string[] = [];
     const globals: { [id: string]: string } = {};
@@ -118,7 +162,11 @@ export function createHpccViteConfig(pkg: any, options: ViteHpccConfigOptions =
     const { alias, external, globals } = hpccBundleNames(pkg);
     const allExternals = [...external, ...additionalExternal];
 
+    // Get build version from root package.json
+    const buildVersion = getRootPackageVersion() || pkg.version;
+
     const allPlugins = [
+        packageVersionPlugin({ pkg, buildVersion }),
         cssInjectedByJsPlugin({
             topExecutionPriority: false
         }),

package/types/index.d.ts

@@ -5,3 +5,4 @@ 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/types/package-version-plugin.d.ts

@@ -0,0 +1,33 @@
+import type { Plugin } from "vite";
+export interface PackageVersionPluginOptions {
+    /**
+     * Package.json object containing name and version
+     */
+    pkg: {
+        name: string;
+        version: string;
+    };
+    /**
+     * Build version (typically from root package.json)
+     * If not provided, defaults to pkg.version
+     */
+    buildVersion?: string;
+    /**
+     * Placeholder for package name (default: "__PACKAGE_NAME__")
+     */
+    namePlaceholder?: string;
+    /**
+     * Placeholder for package version (default: "__PACKAGE_VERSION__")
+     */
+    versionPlaceholder?: string;
+    /**
+     * Placeholder for build version (default: "__BUILD_VERSION__")
+     */
+    buildVersionPlaceholder?: string;
+}
+/**
+ * Vite plugin to replace package version placeholders during build
+ * This allows keeping version information in source files as placeholders
+ * that get replaced with actual values from package.json during the build
+ */
+export declare function packageVersionPlugin(options: PackageVersionPluginOptions): Plugin;