diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
index fc2ed95c05..7b2ccfd5d7 100644
--- a/.github/workflows/release-please.yml
+++ b/.github/workflows/release-please.yml
@@ -5,7 +5,7 @@ on:
       - candidate-*
 
   pull_request:
-    branches: 
+    branches:
       - trunk
       - candidate-*
 
@@ -21,7 +21,7 @@ jobs:
     steps:
       - name: Initialize Release Please
         id: release
-        if: ${{ github.event_name == 'push' }}      
+        if: ${{ github.event_name == 'push' }}
         uses: googleapis/release-please-action@v4
         with:
           target-branch: ${{ github.ref_name }}
@@ -41,11 +41,6 @@ jobs:
           registry-url: "https://registry.npmjs.org"
           scope: "@hpcc-js"
 
-      - name: Install OS Dependencies
-        if: ${{ github.event_name == 'pull_request' || steps.release.outputs.release_created }}
-        run: |
-          pip install pandas scikit-learn 
-
       - name: Export GitHub Actions cache environment variables
         if: ${{ github.event_name == 'pull_request' || steps.release.outputs.release_created }}
         uses: actions/github-script@v7
@@ -67,7 +62,6 @@ jobs:
       - name: Build
         if: ${{ github.event_name == 'pull_request' || steps.release.outputs.release_created }}
         run: |
-          npm run stamp-all
           npm run build
           npm run minimize
           npm run gen-legacy-types
@@ -109,15 +103,6 @@ jobs:
       #   with:
       #     github-token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: push stamped release
-        if: ${{ steps.release.outputs.release_created }}
-        run: |
-          git config user.name github-actions[bot]
-          git config user.email 4104672+github-actions[bot]@users.noreply.github.com
-          git remote add gh-token "https://${{ secrets.GITHUB_TOKEN}}@github.com/yargs/yargs.git"
-          git commit -a -m 'chore: stamp files for release'
-          git push origin
-        
       - name: Publish
         if: ${{ steps.release.outputs.release_created }}
         env:
diff --git a/package-lock.json b/package-lock.json
index 970d410480..140dc83ed6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "hpcc-js",
-  "version": "2.112.1",
+  "version": "2.108.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "hpcc-js",
-      "version": "2.112.1",
+      "version": "2.108.7",
       "license": "Apache-2.0",
       "workspaces": [
         "utils/*",
@@ -23441,6 +23441,22 @@
       "dev": true,
       "license": "CC0-1.0"
     },
+    "node_modules/string-replace-loader": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/string-replace-loader/-/string-replace-loader-3.2.0.tgz",
+      "integrity": "sha512-q7+F4DC6MAKkszF3ZQEuZ3dDH25wXPxFA0maTLk3TOTAYPLDgwqCeCKIvOd8xJhYYYl+EXusYRCyKIJliT/olg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "schema-utils": "^4"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "webpack": "^5"
+      }
+    },
     "node_modules/string-width": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -26044,7 +26060,7 @@
       },
       "devDependencies": {
         "@hpcc-js/bundle": "^2.12.0",
-        "colorbrewer": "1.5.9",
+        "colorbrewer": "1.6.1",
         "d3-array": "^1",
         "d3-brush": "^1",
         "d3-collection": "^1",
@@ -26380,7 +26396,8 @@
         "dojo": "1.17.3",
         "dojo-dstore": "1.2.1",
         "dojo-util": "1.17.3",
-        "dojox": "1.17.3"
+        "dojox": "1.17.3",
+        "string-replace-loader": "^3.2.0"
       }
     },
     "packages/dgrid2": {
diff --git a/package.json b/package.json
index 8f0d5ecd61..890c80a5a3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hpcc-js",
-  "version": "2.108.6",
+  "version": "2.108.7",
   "description": "HPCC Visualization Framework",
   "private": true,
   "jsdelivr": "dist/index.umd.min.js",
@@ -57,9 +57,6 @@
     "uninstall": "lerna clean && rimraf --glob packages/**/node_modules demos/**/node_modules apps/**/node_modules package-lock.json node_modules",
     "clean-root": "rimraf --glob build coverage dist lib* types temp tmp *.tsbuildinfo .vitepress/dist .vitepress/cache docs/api",
     "clean": "lerna run clean && npm run clean-root",
-    "stamp": "lerna run stamp",
-    "stamp-main": "node ./utils/bundle/src/stamp-main.js",
-    "stamp-all": "run-s stamp stamp-main",
     "compile-es6": "lerna run --ignore \"@hpcc-js/test-*\" compile-es6",
     "compile-es6-watch": "lerna run --no-sort --stream --ignore \"@hpcc-js/test-*\" compile-es6-watch",
     "compile-umd": "lerna run --ignore \"@hpcc-js/test-*\" compile-umd",
diff --git a/packages/api/package.json b/packages/api/package.json
index a6d1d543ef..f2c6427385 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -32,7 +32,6 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "npm run compile-es6 && npm run bundle",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "docs": "typedoc --options tdoptions.json .",
         "update": "npx --yes npm-check-updates -u -t minor"
@@ -59,4 +58,4 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization"
-}
+}
\ No newline at end of file
diff --git a/packages/api/rollup.config.mjs b/packages/api/rollup.config.mjs
index 1eaa58b2ae..3818399ee7 100644
--- a/packages/api/rollup.config.mjs
+++ b/packages/api/rollup.config.mjs
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 
-import { external, globals } from "@hpcc-js/bundle";
+import { external, globals, packageVersionPlugin } from "@hpcc-js/bundle";
 import alias from "@rollup/plugin-alias";
 import commonjs from "@rollup/plugin-commonjs";
 import sourcemaps from "rollup-plugin-sourcemaps";
@@ -26,6 +26,7 @@ export default {
         name: pkg.name
     }],
     plugins: [
+        packageVersionPlugin(),
         alias({
             entries: [
                 { find: "d3-array", replacement: "@hpcc-js/common" },
diff --git a/packages/api/src/__package__.ts b/packages/api/src/__package__.ts
index df8a509f30..3bc457cb28 100644
--- a/packages/api/src/__package__.ts
+++ b/packages/api/src/__package__.ts
@@ -1,3 +1,3 @@
-export const PKG_NAME = "@hpcc-js/api";
-export const PKG_VERSION = "2.14.2";
-export const BUILD_VERSION = "2.108.6";
+export const PKG_NAME = "__PACKAGE_NAME__";
+export const PKG_VERSION = "__PACKAGE_VERSION__";
+export const BUILD_VERSION = "__BUILD_VERSION__";
diff --git a/packages/chart/package.json b/packages/chart/package.json
index 6f6824d8d5..82e47ae723 100644
--- a/packages/chart/package.json
+++ b/packages/chart/package.json
@@ -32,7 +32,6 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "npm run compile-es6 && npm run bundle",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "docs": "typedoc --options tdoptions.json .",
         "update": "npx --yes npm-check-updates -u -t minor"
@@ -79,4 +78,4 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization"
-}
+}
\ No newline at end of file
diff --git a/packages/chart/rollup.config.mjs b/packages/chart/rollup.config.mjs
index c1ec2f0fff..356cd71ebc 100644
--- a/packages/chart/rollup.config.mjs
+++ b/packages/chart/rollup.config.mjs
@@ -1,4 +1,5 @@
-import { external, globals } from "@hpcc-js/bundle";
+import { external, globals, packageVersionPlugin } from "@hpcc-js/bundle";
+
 import alias from "@rollup/plugin-alias";
 import commonjs from "@rollup/plugin-commonjs";
 import sourcemaps from "rollup-plugin-sourcemaps";
@@ -24,6 +25,7 @@ export default {
         name: pkg.name
     }],
     plugins: [
+        packageVersionPlugin(),
         alias({
             entries: [
                 { find: "d3-array", replacement: "@hpcc-js/common" },
diff --git a/packages/chart/src/__package__.ts b/packages/chart/src/__package__.ts
index fe56e6e316..3bc457cb28 100644
--- a/packages/chart/src/__package__.ts
+++ b/packages/chart/src/__package__.ts
@@ -1,3 +1,3 @@
-export const PKG_NAME = "@hpcc-js/chart";
-export const PKG_VERSION = "2.86.2";
-export const BUILD_VERSION = "2.108.6";
+export const PKG_NAME = "__PACKAGE_NAME__";
+export const PKG_VERSION = "__PACKAGE_VERSION__";
+export const BUILD_VERSION = "__BUILD_VERSION__";
diff --git a/packages/codemirror-shim/package.json b/packages/codemirror-shim/package.json
index d3883e01ff..5891ff73da 100644
--- a/packages/codemirror-shim/package.json
+++ b/packages/codemirror-shim/package.json
@@ -29,7 +29,6 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "npm run compile-es6 && npm run bundle",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "docs": "typedoc --options tdoptions.json .",
         "update": "npx --yes npm-check-updates -u -t minor"
@@ -49,4 +48,4 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization"
-}
+}
\ No newline at end of file
diff --git a/packages/codemirror-shim/rollup.config.mjs b/packages/codemirror-shim/rollup.config.mjs
index d6a0beff39..dc4d54b9f8 100644
--- a/packages/codemirror-shim/rollup.config.mjs
+++ b/packages/codemirror-shim/rollup.config.mjs
@@ -1,4 +1,5 @@
-import { external, globals } from "@hpcc-js/bundle";
+import { external, globals, packageVersionPlugin } from "@hpcc-js/bundle";
+
 import alias from "@rollup/plugin-alias";
 import commonjs from "@rollup/plugin-commonjs";
 import sourcemaps from "rollup-plugin-sourcemaps";
@@ -23,6 +24,7 @@ export default {
         globals: globals
     }],
     plugins: [
+        packageVersionPlugin(),
         alias({}),
         nodeResolve({
             preferBuiltins: true
diff --git a/packages/codemirror-shim/src/__package__.ts b/packages/codemirror-shim/src/__package__.ts
index b730f8f2b7..3bc457cb28 100644
--- a/packages/codemirror-shim/src/__package__.ts
+++ b/packages/codemirror-shim/src/__package__.ts
@@ -1,3 +1,3 @@
-export const PKG_NAME = "@hpcc-js/codemirror-shim";
-export const PKG_VERSION = "2.38.0";
-export const BUILD_VERSION = "2.108.6";
+export const PKG_NAME = "__PACKAGE_NAME__";
+export const PKG_VERSION = "__PACKAGE_VERSION__";
+export const BUILD_VERSION = "__BUILD_VERSION__";
diff --git a/packages/codemirror/package.json b/packages/codemirror/package.json
index 1293999f6c..4d35da572b 100644
--- a/packages/codemirror/package.json
+++ b/packages/codemirror/package.json
@@ -32,7 +32,6 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "npm run compile-es6 && npm run bundle",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "docs": "typedoc --options tdoptions.json .",
         "update": "npx --yes npm-check-updates -u -t minor"
@@ -56,4 +55,4 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization"
-}
+}
\ No newline at end of file
diff --git a/packages/codemirror/rollup.config.mjs b/packages/codemirror/rollup.config.mjs
index ff533d571a..d7d8db55ed 100644
--- a/packages/codemirror/rollup.config.mjs
+++ b/packages/codemirror/rollup.config.mjs
@@ -1,4 +1,5 @@
-import { external, globals } from "@hpcc-js/bundle";
+import { external, globals, packageVersionPlugin } from "@hpcc-js/bundle";
+
 import alias from '@rollup/plugin-alias';
 import commonjs from '@rollup/plugin-commonjs';
 import sourcemaps from 'rollup-plugin-sourcemaps';
@@ -24,6 +25,7 @@ export default {
         name: pkg.name
     }],
     plugins: [
+        packageVersionPlugin(),
         alias({
             entries: [
                 { find: "d3-array", replacement: "@hpcc-js/common" },
diff --git a/packages/codemirror/src/__package__.ts b/packages/codemirror/src/__package__.ts
index 12671695bc..3bc457cb28 100644
--- a/packages/codemirror/src/__package__.ts
+++ b/packages/codemirror/src/__package__.ts
@@ -1,3 +1,3 @@
-export const PKG_NAME = "@hpcc-js/codemirror";
-export const PKG_VERSION = "2.66.1";
-export const BUILD_VERSION = "2.108.6";
+export const PKG_NAME = "__PACKAGE_NAME__";
+export const PKG_VERSION = "__PACKAGE_VERSION__";
+export const BUILD_VERSION = "__BUILD_VERSION__";
diff --git a/packages/common/package.json b/packages/common/package.json
index 0bcd1c3a91..ec202e3c9a 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -34,7 +34,6 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "npm run compile-es6 && npm run copy-resources && npm run bundle",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "docs": "typedoc --options tdoptions.json .",
         "update": "npx --yes npm-check-updates -u -t minor"
diff --git a/packages/common/rollup.config.mjs b/packages/common/rollup.config.mjs
index 73649b1609..2db8350bde 100644
--- a/packages/common/rollup.config.mjs
+++ b/packages/common/rollup.config.mjs
@@ -1,4 +1,5 @@
-import { external, globals } from "@hpcc-js/bundle";
+import { external, globals, packageVersionPlugin } from "@hpcc-js/bundle";
+
 import alias from "@rollup/plugin-alias";
 import commonjs from "@rollup/plugin-commonjs";
 import sourcemaps from "rollup-plugin-sourcemaps";
@@ -25,6 +26,7 @@ export default {
         name: pkg.name
     }],
     plugins: [
+        packageVersionPlugin(),
         alias({}),
         nodeResolve({
             preferBuiltins: true
diff --git a/packages/common/src/__package__.ts b/packages/common/src/__package__.ts
index 49cc990fe9..3bc457cb28 100644
--- a/packages/common/src/__package__.ts
+++ b/packages/common/src/__package__.ts
@@ -1,3 +1,3 @@
-export const PKG_NAME = "@hpcc-js/common";
-export const PKG_VERSION = "2.73.2";
-export const BUILD_VERSION = "2.108.6";
+export const PKG_NAME = "__PACKAGE_NAME__";
+export const PKG_VERSION = "__PACKAGE_VERSION__";
+export const BUILD_VERSION = "__BUILD_VERSION__";
diff --git a/packages/comms/package.json b/packages/comms/package.json
index b0e9e292fb..6e91321c29 100644
--- a/packages/comms/package.json
+++ b/packages/comms/package.json
@@ -32,7 +32,6 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "npm run compile-es6 && npm run bundle",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "lint-fix": "eslint --fix src/**/*.ts",
         "test": "mocha lib-umd/__tests__ --reporter spec",
diff --git a/packages/comms/rollup.config.mjs b/packages/comms/rollup.config.mjs
index 678d1cc67e..e99c2e6512 100644
--- a/packages/comms/rollup.config.mjs
+++ b/packages/comms/rollup.config.mjs
@@ -1,4 +1,5 @@
-import { external, globals } from "@hpcc-js/bundle";
+import { external, globals, packageVersionPlugin } from "@hpcc-js/bundle";
+
 import alias from '@rollup/plugin-alias';
 import commonjs from '@rollup/plugin-commonjs';
 import sourcemaps from 'rollup-plugin-sourcemaps';
@@ -8,6 +9,7 @@ import postcss from "rollup-plugin-postcss";
 import pkg from "./package.json" with { type: "json" };
 
 const plugins = [
+    packageVersionPlugin(),
     alias({}),
     nodeResolve({
         preferBuiltins: true
diff --git a/packages/comms/src/__package__.ts b/packages/comms/src/__package__.ts
index 025c5231e1..3bc457cb28 100644
--- a/packages/comms/src/__package__.ts
+++ b/packages/comms/src/__package__.ts
@@ -1,3 +1,3 @@
-export const PKG_NAME = "@hpcc-js/comms";
-export const PKG_VERSION = "2.102.1";
-export const BUILD_VERSION = "2.108.6";
+export const PKG_NAME = "__PACKAGE_NAME__";
+export const PKG_VERSION = "__PACKAGE_VERSION__";
+export const BUILD_VERSION = "__BUILD_VERSION__";
diff --git a/packages/composite/package.json b/packages/composite/package.json
index baf9969233..981829c93d 100644
--- a/packages/composite/package.json
+++ b/packages/composite/package.json
@@ -32,7 +32,6 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "npm run compile-es6 && npm run bundle",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "docs": "typedoc --options tdoptions.json .",
         "update": "npx --yes npm-check-updates -u -t minor"
@@ -67,4 +66,4 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization"
-}
+}
\ No newline at end of file
diff --git a/packages/composite/rollup.config.mjs b/packages/composite/rollup.config.mjs
index 3e0b2b9d2a..9482177161 100644
--- a/packages/composite/rollup.config.mjs
+++ b/packages/composite/rollup.config.mjs
@@ -1,4 +1,5 @@
-import { external, globals } from "@hpcc-js/bundle";
+import { external, globals, packageVersionPlugin } from "@hpcc-js/bundle";
+
 import alias from '@rollup/plugin-alias';
 import commonjs from '@rollup/plugin-commonjs';
 import sourcemaps from 'rollup-plugin-sourcemaps';
@@ -24,6 +25,7 @@ export default {
         name: pkg.name
     }],
     plugins: [
+        packageVersionPlugin(),
         alias({
             entries: [
                 { find: "d3-array", replacement: "@hpcc-js/common" },
diff --git a/packages/composite/src/__package__.ts b/packages/composite/src/__package__.ts
index 8cb8e7f3a3..3bc457cb28 100644
--- a/packages/composite/src/__package__.ts
+++ b/packages/composite/src/__package__.ts
@@ -1,3 +1,3 @@
-export const PKG_NAME = "@hpcc-js/composite";
-export const PKG_VERSION = "2.9.4";
-export const BUILD_VERSION = "2.108.6";
+export const PKG_NAME = "__PACKAGE_NAME__";
+export const PKG_VERSION = "__PACKAGE_VERSION__";
+export const BUILD_VERSION = "__BUILD_VERSION__";
diff --git a/packages/dataflow/package.json b/packages/dataflow/package.json
index 9e61df4f24..0051e0664f 100644
--- a/packages/dataflow/package.json
+++ b/packages/dataflow/package.json
@@ -35,7 +35,6 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "npm-run-all -p compile-es6 compile-umd -s bundle",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "lint-fix": "eslint --fix src/**/*.ts",
         "test": "mocha dist-test/index.js --reporter spec",
@@ -59,4 +58,4 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization"
-}
+}
\ No newline at end of file
diff --git a/packages/dataflow/rollup.config.mjs b/packages/dataflow/rollup.config.mjs
index 7a67cbb119..9cb5958613 100644
--- a/packages/dataflow/rollup.config.mjs
+++ b/packages/dataflow/rollup.config.mjs
@@ -1,4 +1,5 @@
-import { external, globals } from "@hpcc-js/bundle";
+import { external, globals, packageVersionPlugin } from "@hpcc-js/bundle";
+
 import alias from "@rollup/plugin-alias";
 import commonjs from "@rollup/plugin-commonjs";
 import sourcemaps from "rollup-plugin-sourcemaps";
@@ -18,6 +19,7 @@ export default {
         name: pkg.name
     }],
     plugins: [
+        packageVersionPlugin(),
         alias({}),
         nodeResolve({
             preferBuiltins: true
diff --git a/packages/dataflow/src/__package__.ts b/packages/dataflow/src/__package__.ts
index ecdcc95dce..3bc457cb28 100644
--- a/packages/dataflow/src/__package__.ts
+++ b/packages/dataflow/src/__package__.ts
@@ -1,3 +1,3 @@
-export const PKG_NAME = "@hpcc-js/dataflow";
-export const PKG_VERSION = "9.2.0";
-export const BUILD_VERSION = "2.108.6";
+export const PKG_NAME = "__PACKAGE_NAME__";
+export const PKG_VERSION = "__PACKAGE_VERSION__";
+export const BUILD_VERSION = "__BUILD_VERSION__";
diff --git a/packages/ddl-shim/package.json b/packages/ddl-shim/package.json
index 80d027def4..03e240ce8c 100644
--- a/packages/ddl-shim/package.json
+++ b/packages/ddl-shim/package.json
@@ -35,7 +35,6 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "run-s generate compile-es6 bundle",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "docs": "typedoc --options tdoptions.json .",
         "update": "npx --yes npm-check-updates -u -t minor"
diff --git a/packages/ddl-shim/rollup.config.mjs b/packages/ddl-shim/rollup.config.mjs
index c6d1d45573..8398444169 100644
--- a/packages/ddl-shim/rollup.config.mjs
+++ b/packages/ddl-shim/rollup.config.mjs
@@ -1,4 +1,5 @@
-import { external, globals } from "@hpcc-js/bundle";
+import { external, globals, packageVersionPlugin } from "@hpcc-js/bundle";
+
 import alias from "@rollup/plugin-alias";
 import commonjs from "@rollup/plugin-commonjs";
 import json from "@rollup/plugin-json";
@@ -19,6 +20,7 @@ export default [{
         sourcemap: true
     }],
     plugins: [
+        packageVersionPlugin(),
         shebang({
             include: "dist/cli.js"
         }),
@@ -43,6 +45,7 @@ export default [{
         name: pkg.name
     }],
     plugins: [
+        packageVersionPlugin(),
         alias({}),
         nodeResolve({
             preferBuiltins: true
diff --git a/packages/ddl-shim/src/__package__.ts b/packages/ddl-shim/src/__package__.ts
index b734131d7b..3bc457cb28 100644
--- a/packages/ddl-shim/src/__package__.ts
+++ b/packages/ddl-shim/src/__package__.ts
@@ -1,3 +1,3 @@
-export const PKG_NAME = "@hpcc-js/ddl-shim";
-export const PKG_VERSION = "2.25.0";
-export const BUILD_VERSION = "2.108.6";
+export const PKG_NAME = "__PACKAGE_NAME__";
+export const PKG_VERSION = "__PACKAGE_VERSION__";
+export const BUILD_VERSION = "__BUILD_VERSION__";
diff --git a/packages/dgrid-shim/package.json b/packages/dgrid-shim/package.json
index b444e10592..f485b60759 100644
--- a/packages/dgrid-shim/package.json
+++ b/packages/dgrid-shim/package.json
@@ -26,7 +26,6 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "npm run compile-cjs && npm run bundle",
         "watch": "run-p compile-cjs-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "update": "npx --yes npm-check-updates -u -t minor"
     },
@@ -43,7 +42,8 @@
         "dojo": "1.17.3",
         "dojo-dstore": "1.2.1",
         "dojo-util": "1.17.3",
-        "dojox": "1.17.3"
+        "dojox": "1.17.3",
+        "string-replace-loader": "^3.2.0"
     },
     "repository": {
         "type": "git",
@@ -61,4 +61,4 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization#readme"
-}
+}
\ No newline at end of file
diff --git a/packages/dgrid-shim/src/__package__.ts b/packages/dgrid-shim/src/__package__.ts
index e3ba9a0d6c..3bc457cb28 100644
--- a/packages/dgrid-shim/src/__package__.ts
+++ b/packages/dgrid-shim/src/__package__.ts
@@ -1,3 +1,3 @@
-export const PKG_NAME = "@hpcc-js/dgrid-shim";
-export const PKG_VERSION = "2.27.0";
-export const BUILD_VERSION = "2.108.6";
+export const PKG_NAME = "__PACKAGE_NAME__";
+export const PKG_VERSION = "__PACKAGE_VERSION__";
+export const BUILD_VERSION = "__BUILD_VERSION__";
diff --git a/packages/dgrid-shim/webpack.config.js b/packages/dgrid-shim/webpack.config.js
index 16edcb03b9..5fd5374f06 100644
--- a/packages/dgrid-shim/webpack.config.js
+++ b/packages/dgrid-shim/webpack.config.js
@@ -4,6 +4,7 @@
 var HasJsPlugin = require("webpack-hasjs-plugin");
 var DojoWebpackPlugin = require("dojo-webpack-plugin");
 const TerserPlugin = require("terser-webpack-plugin");
+const { getRootPackageVersion } = require("@hpcc-js/bundle");
 
 var path = require("path");
 var webpack = require("webpack");
@@ -11,6 +12,10 @@ var webpack = require("webpack");
 module.exports = function (env) {
     const isProduction = !env || env.build !== "dev";
 
+    // Read package info for replacements
+    const pkg = require("./package.json");
+    const buildVersion = getRootPackageVersion(__dirname);
+
     return {
         context: __dirname,
         entry: {
@@ -27,6 +32,17 @@ module.exports = function (env) {
         },
         module: {
             rules: [
+                {
+                    test: /__package__\.js$/,
+                    loader: "string-replace-loader",
+                    options: {
+                        multiple: [
+                            { search: '"__PACKAGE_NAME__"', replace: `"${pkg.name}"`, flags: "g" },
+                            { search: '"__PACKAGE_VERSION__"', replace: `"${pkg.version}"`, flags: "g" },
+                            { search: '"__BUILD_VERSION__"', replace: `"${buildVersion}"`, flags: "g" }
+                        ]
+                    }
+                },
                 {
                     test: /\.(png|jpg|gif)$/,
                     use: [
diff --git a/packages/dgrid/package.json b/packages/dgrid/package.json
index 7635a81d37..43130f9e5c 100644
--- a/packages/dgrid/package.json
+++ b/packages/dgrid/package.json
@@ -33,7 +33,6 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "npm run compile-es6 && npm run bundle",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "docs": "typedoc --options tdoptions.json .",
         "update": "npx --yes npm-check-updates -u -t minor"
@@ -61,4 +60,4 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization"
-}
+}
\ No newline at end of file
diff --git a/packages/dgrid/rollup.config.mjs b/packages/dgrid/rollup.config.mjs
index d437a5d847..4f6c86c256 100644
--- a/packages/dgrid/rollup.config.mjs
+++ b/packages/dgrid/rollup.config.mjs
@@ -1,4 +1,5 @@
-import { external, globals } from "@hpcc-js/bundle";
+import { external, globals, packageVersionPlugin } from "@hpcc-js/bundle";
+
 import alias from '@rollup/plugin-alias';
 import commonjs from '@rollup/plugin-commonjs';
 import sourcemaps from 'rollup-plugin-sourcemaps';
@@ -26,6 +27,7 @@ export default {
         strict: false
     }],
     plugins: [
+        packageVersionPlugin(),
         alias({
             entries: [
                 { find: "d3-array", replacement: "@hpcc-js/common" },
diff --git a/packages/dgrid/src/__package__.ts b/packages/dgrid/src/__package__.ts
index ed4ea84408..3bc457cb28 100644
--- a/packages/dgrid/src/__package__.ts
+++ b/packages/dgrid/src/__package__.ts
@@ -1,3 +1,3 @@
-export const PKG_NAME = "@hpcc-js/dgrid";
-export const PKG_VERSION = "2.34.3";
-export const BUILD_VERSION = "2.108.6";
+export const PKG_NAME = "__PACKAGE_NAME__";
+export const PKG_VERSION = "__PACKAGE_VERSION__";
+export const BUILD_VERSION = "__BUILD_VERSION__";
diff --git a/packages/dgrid2/package.json b/packages/dgrid2/package.json
index 4c29db7026..0335bf0524 100644
--- a/packages/dgrid2/package.json
+++ b/packages/dgrid2/package.json
@@ -33,7 +33,6 @@
         "build": "npm run compile-es6 && npm run bundle",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
         "serve-vite": "vite --config ../../vite.config.js",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint src/**/*.ts",
         "docs": "typedoc --options tdoptions.json .",
         "update": "npx --yes npm-check-updates -u -t minor"
@@ -59,4 +58,4 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization"
-}
+}
\ No newline at end of file
diff --git a/packages/dgrid2/rollup.config.mjs b/packages/dgrid2/rollup.config.mjs
index 9ea9f3a97c..b3ad9e0924 100644
--- a/packages/dgrid2/rollup.config.mjs
+++ b/packages/dgrid2/rollup.config.mjs
@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 
-import { external, globals } from "@hpcc-js/bundle";
+import { external, globals, packageVersionPlugin } from "@hpcc-js/bundle";
+
 import alias from "@rollup/plugin-alias";
 import commonjs from "@rollup/plugin-commonjs";
 import sourcemaps from "rollup-plugin-sourcemaps";
@@ -27,6 +28,7 @@ export default {
         name: pkg.name
     }],
     plugins: [
+        packageVersionPlugin(),
         alias({
             entries: [
                 { find: "react", replacement: "preact/compat" },
diff --git a/packages/dgrid2/src/__package__.ts b/packages/dgrid2/src/__package__.ts
index 8e79cd58a6..3bc457cb28 100644
--- a/packages/dgrid2/src/__package__.ts
+++ b/packages/dgrid2/src/__package__.ts
@@ -1,3 +1,3 @@
-export const PKG_NAME = "@hpcc-js/dgrid2";
-export const PKG_VERSION = "2.5.2";
-export const BUILD_VERSION = "2.108.6";
+export const PKG_NAME = "__PACKAGE_NAME__";
+export const PKG_VERSION = "__PACKAGE_VERSION__";
+export const BUILD_VERSION = "__BUILD_VERSION__";
diff --git a/packages/eclwatch/package.json b/packages/eclwatch/package.json
index 0daf18a36c..73319af300 100644
--- a/packages/eclwatch/package.json
+++ b/packages/eclwatch/package.json
@@ -32,7 +32,6 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "npm run compile-es6 && npm run bundle",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "docs": "typedoc --options tdoptions.json .",
         "update": "npx --yes npm-check-updates -u -t minor"
@@ -65,4 +64,4 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization"
-}
+}
\ No newline at end of file
diff --git a/packages/eclwatch/rollup.config.mjs b/packages/eclwatch/rollup.config.mjs
index d437a5d847..4f6c86c256 100644
--- a/packages/eclwatch/rollup.config.mjs
+++ b/packages/eclwatch/rollup.config.mjs
@@ -1,4 +1,5 @@
-import { external, globals } from "@hpcc-js/bundle";
+import { external, globals, packageVersionPlugin } from "@hpcc-js/bundle";
+
 import alias from '@rollup/plugin-alias';
 import commonjs from '@rollup/plugin-commonjs';
 import sourcemaps from 'rollup-plugin-sourcemaps';
@@ -26,6 +27,7 @@ export default {
         strict: false
     }],
     plugins: [
+        packageVersionPlugin(),
         alias({
             entries: [
                 { find: "d3-array", replacement: "@hpcc-js/common" },
diff --git a/packages/eclwatch/src/__package__.ts b/packages/eclwatch/src/__package__.ts
index bc0f7f3a8d..3bc457cb28 100644
--- a/packages/eclwatch/src/__package__.ts
+++ b/packages/eclwatch/src/__package__.ts
@@ -1,3 +1,3 @@
-export const PKG_NAME = "@hpcc-js/eclwatch";
-export const PKG_VERSION = "2.77.6";
-export const BUILD_VERSION = "2.108.6";
+export const PKG_NAME = "__PACKAGE_NAME__";
+export const PKG_VERSION = "__PACKAGE_VERSION__";
+export const BUILD_VERSION = "__BUILD_VERSION__";
diff --git a/packages/form/package.json b/packages/form/package.json
index d9031aac06..733f28fae1 100644
--- a/packages/form/package.json
+++ b/packages/form/package.json
@@ -32,7 +32,6 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "npm run compile-es6 && npm run bundle",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "docs": "typedoc --options tdoptions.json .",
         "update": "npx --yes npm-check-updates -u -t minor"
@@ -62,4 +61,4 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization"
-}
+}
\ No newline at end of file
diff --git a/packages/form/rollup.config.mjs b/packages/form/rollup.config.mjs
index 3e0b2b9d2a..9482177161 100644
--- a/packages/form/rollup.config.mjs
+++ b/packages/form/rollup.config.mjs
@@ -1,4 +1,5 @@
-import { external, globals } from "@hpcc-js/bundle";
+import { external, globals, packageVersionPlugin } from "@hpcc-js/bundle";
+
 import alias from '@rollup/plugin-alias';
 import commonjs from '@rollup/plugin-commonjs';
 import sourcemaps from 'rollup-plugin-sourcemaps';
@@ -24,6 +25,7 @@ export default {
         name: pkg.name
     }],
     plugins: [
+        packageVersionPlugin(),
         alias({
             entries: [
                 { find: "d3-array", replacement: "@hpcc-js/common" },
diff --git a/packages/form/src/__package__.ts b/packages/form/src/__package__.ts
index 37bc6b732e..3bc457cb28 100644
--- a/packages/form/src/__package__.ts
+++ b/packages/form/src/__package__.ts
@@ -1,3 +1,3 @@
-export const PKG_NAME = "@hpcc-js/form";
-export const PKG_VERSION = "2.12.2";
-export const BUILD_VERSION = "2.108.6";
+export const PKG_NAME = "__PACKAGE_NAME__";
+export const PKG_VERSION = "__PACKAGE_VERSION__";
+export const BUILD_VERSION = "__BUILD_VERSION__";
diff --git a/packages/graph/package.json b/packages/graph/package.json
index 1409f60849..f1c94fc780 100644
--- a/packages/graph/package.json
+++ b/packages/graph/package.json
@@ -44,7 +44,6 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "run-s build-workers build-package",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "docs": "typedoc --options tdoptions.json .",
         "ddd": "downlevel-dts . ts3.4",
diff --git a/packages/graph/rollup.config.mjs b/packages/graph/rollup.config.mjs
index 0afe4cdffc..8cce2aec70 100644
--- a/packages/graph/rollup.config.mjs
+++ b/packages/graph/rollup.config.mjs
@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
-import { external, globals } from "@hpcc-js/bundle";
+import { external, globals, packageVersionPlugin } from "@hpcc-js/bundle";
+
 import alias from "@rollup/plugin-alias";
 import commonjs from "@rollup/plugin-commonjs";
 import sourcemaps from "rollup-plugin-sourcemaps";
@@ -25,6 +26,7 @@ export default {
         name: pkg.name
     }],
     plugins: [
+        packageVersionPlugin(),
         alias({
             entries: [
                 { find: "d3-array", replacement: "@hpcc-js/common" },
diff --git a/packages/graph/src/__package__.ts b/packages/graph/src/__package__.ts
index ca8a38cebf..3bc457cb28 100644
--- a/packages/graph/src/__package__.ts
+++ b/packages/graph/src/__package__.ts
@@ -1,3 +1,3 @@
-export const PKG_NAME = "@hpcc-js/graph";
-export const PKG_VERSION = "2.87.2";
-export const BUILD_VERSION = "2.108.6";
+export const PKG_NAME = "__PACKAGE_NAME__";
+export const PKG_VERSION = "__PACKAGE_VERSION__";
+export const BUILD_VERSION = "__BUILD_VERSION__";
diff --git a/packages/html/package.json b/packages/html/package.json
index 46069a333b..692fe60875 100644
--- a/packages/html/package.json
+++ b/packages/html/package.json
@@ -32,7 +32,6 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "npm run compile-es6 && npm run bundle",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "docs": "typedoc --options tdoptions.json .",
         "update": "npx --yes npm-check-updates -u -t minor"
@@ -59,4 +58,4 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization"
-}
+}
\ No newline at end of file
diff --git a/packages/html/rollup.config.mjs b/packages/html/rollup.config.mjs
index 3e0b2b9d2a..9482177161 100644
--- a/packages/html/rollup.config.mjs
+++ b/packages/html/rollup.config.mjs
@@ -1,4 +1,5 @@
-import { external, globals } from "@hpcc-js/bundle";
+import { external, globals, packageVersionPlugin } from "@hpcc-js/bundle";
+
 import alias from '@rollup/plugin-alias';
 import commonjs from '@rollup/plugin-commonjs';
 import sourcemaps from 'rollup-plugin-sourcemaps';
@@ -24,6 +25,7 @@ export default {
         name: pkg.name
     }],
     plugins: [
+        packageVersionPlugin(),
         alias({
             entries: [
                 { find: "d3-array", replacement: "@hpcc-js/common" },
diff --git a/packages/html/src/__package__.ts b/packages/html/src/__package__.ts
index 52843813b4..3bc457cb28 100644
--- a/packages/html/src/__package__.ts
+++ b/packages/html/src/__package__.ts
@@ -1,3 +1,3 @@
-export const PKG_NAME = "@hpcc-js/html";
-export const PKG_VERSION = "2.44.2";
-export const BUILD_VERSION = "2.108.6";
+export const PKG_NAME = "__PACKAGE_NAME__";
+export const PKG_VERSION = "__PACKAGE_VERSION__";
+export const BUILD_VERSION = "__BUILD_VERSION__";
diff --git a/packages/layout/package.json b/packages/layout/package.json
index 5f563ab858..415eb8e2ce 100644
--- a/packages/layout/package.json
+++ b/packages/layout/package.json
@@ -32,7 +32,6 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "npm run compile-es6 && npm run bundle",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "docs": "typedoc --options tdoptions.json .",
         "update": "npx --yes npm-check-updates -u -t minor"
@@ -65,4 +64,4 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization"
-}
+}
\ No newline at end of file
diff --git a/packages/layout/rollup.config.mjs b/packages/layout/rollup.config.mjs
index 3e0b2b9d2a..9482177161 100644
--- a/packages/layout/rollup.config.mjs
+++ b/packages/layout/rollup.config.mjs
@@ -1,4 +1,5 @@
-import { external, globals } from "@hpcc-js/bundle";
+import { external, globals, packageVersionPlugin } from "@hpcc-js/bundle";
+
 import alias from '@rollup/plugin-alias';
 import commonjs from '@rollup/plugin-commonjs';
 import sourcemaps from 'rollup-plugin-sourcemaps';
@@ -24,6 +25,7 @@ export default {
         name: pkg.name
     }],
     plugins: [
+        packageVersionPlugin(),
         alias({
             entries: [
                 { find: "d3-array", replacement: "@hpcc-js/common" },
diff --git a/packages/layout/src/__package__.ts b/packages/layout/src/__package__.ts
index 6548a1449b..3bc457cb28 100644
--- a/packages/layout/src/__package__.ts
+++ b/packages/layout/src/__package__.ts
@@ -1,3 +1,3 @@
-export const PKG_NAME = "@hpcc-js/layout";
-export const PKG_VERSION = "2.51.2";
-export const BUILD_VERSION = "2.108.6";
+export const PKG_NAME = "__PACKAGE_NAME__";
+export const PKG_VERSION = "__PACKAGE_VERSION__";
+export const BUILD_VERSION = "__BUILD_VERSION__";
diff --git a/packages/loader/package.json b/packages/loader/package.json
index ce0def7266..60d85fd165 100644
--- a/packages/loader/package.json
+++ b/packages/loader/package.json
@@ -32,7 +32,6 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "npm run compile-es6 && npm run bundle",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "docs": "typedoc --options tdoptions.json .",
         "update": "npx --yes npm-check-updates -u -t minor"
@@ -80,4 +79,4 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization"
-}
+}
\ No newline at end of file
diff --git a/packages/loader/rollup.config.mjs b/packages/loader/rollup.config.mjs
index fb083397ba..112f89d41d 100644
--- a/packages/loader/rollup.config.mjs
+++ b/packages/loader/rollup.config.mjs
@@ -1,4 +1,5 @@
-import { external, globals } from "@hpcc-js/bundle";
+import { external, globals, packageVersionPlugin } from "@hpcc-js/bundle";
+
 import alias from '@rollup/plugin-alias';
 import commonjs from '@rollup/plugin-commonjs';
 import sourcemaps from 'rollup-plugin-sourcemaps';
@@ -24,6 +25,7 @@ export default {
         name: pkg.name
     }],
     plugins: [
+        packageVersionPlugin(),
         alias({}),
         nodeResolve({
             preferBuiltins: true
diff --git a/packages/loader/src/__package__.ts b/packages/loader/src/__package__.ts
index 781c692b90..3bc457cb28 100644
--- a/packages/loader/src/__package__.ts
+++ b/packages/loader/src/__package__.ts
@@ -1,3 +1,3 @@
-export const PKG_NAME = "@hpcc-js/loader";
-export const PKG_VERSION = "2.108.6";
-export const BUILD_VERSION = "2.108.6";
+export const PKG_NAME = "__PACKAGE_NAME__";
+export const PKG_VERSION = "__PACKAGE_VERSION__";
+export const BUILD_VERSION = "__BUILD_VERSION__";
diff --git a/packages/map-deck/package.json b/packages/map-deck/package.json
index ef2e6da53a..381a3f65bf 100644
--- a/packages/map-deck/package.json
+++ b/packages/map-deck/package.json
@@ -33,7 +33,6 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "npm run compile-es6 && npm run bundle",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "docs": "typedoc --options tdoptions.json .",
         "update": "npx --yes npm-check-updates -u -t minor"
@@ -61,4 +60,4 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization"
-}
+}
\ No newline at end of file
diff --git a/packages/map-deck/rollup.config.mjs b/packages/map-deck/rollup.config.mjs
index 2817812d53..043f3b3624 100644
--- a/packages/map-deck/rollup.config.mjs
+++ b/packages/map-deck/rollup.config.mjs
@@ -1,4 +1,5 @@
-import { external, globals } from "@hpcc-js/bundle";
+import { external, globals, packageVersionPlugin } from "@hpcc-js/bundle";
+
 import alias from '@rollup/plugin-alias';
 import commonjs from '@rollup/plugin-commonjs';
 import sourcemaps from 'rollup-plugin-sourcemaps';
@@ -24,6 +25,7 @@ export default {
         name: pkg.name
     }],
     plugins: [
+        packageVersionPlugin(),
         alias({}),
         nodeResolve({
             preferBuiltins: true
diff --git a/packages/map-deck/src/__package__.ts b/packages/map-deck/src/__package__.ts
index f21bb69068..3bc457cb28 100644
--- a/packages/map-deck/src/__package__.ts
+++ b/packages/map-deck/src/__package__.ts
@@ -1,3 +1,3 @@
-export const PKG_NAME = "@hpcc-js/map-deck";
-export const PKG_VERSION = "2.9.2";
-export const BUILD_VERSION = "2.108.6";
+export const PKG_NAME = "__PACKAGE_NAME__";
+export const PKG_VERSION = "__PACKAGE_VERSION__";
+export const BUILD_VERSION = "__BUILD_VERSION__";
diff --git a/packages/map/package.json b/packages/map/package.json
index 57258ed249..fd37bcfd2a 100644
--- a/packages/map/package.json
+++ b/packages/map/package.json
@@ -33,7 +33,6 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "npm run compile-es6 && npm run bundle",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "docs": "typedoc --options tdoptions.json .",
         "update": "npx --yes npm-check-updates -u -t minor"
@@ -72,4 +71,4 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization"
-}
+}
\ No newline at end of file
diff --git a/packages/map/rollup.config.mjs b/packages/map/rollup.config.mjs
index 91efc812e8..2b8af874d7 100644
--- a/packages/map/rollup.config.mjs
+++ b/packages/map/rollup.config.mjs
@@ -1,4 +1,5 @@
-import { external, globals } from "@hpcc-js/bundle";
+import { external, globals, packageVersionPlugin } from "@hpcc-js/bundle";
+
 import alias from '@rollup/plugin-alias';
 import commonjs from '@rollup/plugin-commonjs';
 import sourcemaps from 'rollup-plugin-sourcemaps';
@@ -24,6 +25,7 @@ export default {
         name: pkg.name
     }],
     plugins: [
+        packageVersionPlugin(),
         alias({
             entries: [
                 { find: "d3-array", replacement: "@hpcc-js/common" },
diff --git a/packages/map/src/__package__.ts b/packages/map/src/__package__.ts
index b39c880401..3bc457cb28 100644
--- a/packages/map/src/__package__.ts
+++ b/packages/map/src/__package__.ts
@@ -1,3 +1,3 @@
-export const PKG_NAME = "@hpcc-js/map";
-export const PKG_VERSION = "2.79.2";
-export const BUILD_VERSION = "2.108.6";
+export const PKG_NAME = "__PACKAGE_NAME__";
+export const PKG_VERSION = "__PACKAGE_VERSION__";
+export const BUILD_VERSION = "__BUILD_VERSION__";
diff --git a/packages/marshaller/package.json b/packages/marshaller/package.json
index 62680033bf..8e6b53c7e0 100644
--- a/packages/marshaller/package.json
+++ b/packages/marshaller/package.json
@@ -32,7 +32,6 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "npm run compile-es6 && npm run bundle",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "docs": "typedoc --options tdoptions.json .",
         "update": "npx --yes npm-check-updates -u -t minor"
@@ -73,4 +72,4 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization"
-}
+}
\ No newline at end of file
diff --git a/packages/marshaller/rollup.config.mjs b/packages/marshaller/rollup.config.mjs
index 91efc812e8..2b8af874d7 100644
--- a/packages/marshaller/rollup.config.mjs
+++ b/packages/marshaller/rollup.config.mjs
@@ -1,4 +1,5 @@
-import { external, globals } from "@hpcc-js/bundle";
+import { external, globals, packageVersionPlugin } from "@hpcc-js/bundle";
+
 import alias from '@rollup/plugin-alias';
 import commonjs from '@rollup/plugin-commonjs';
 import sourcemaps from 'rollup-plugin-sourcemaps';
@@ -24,6 +25,7 @@ export default {
         name: pkg.name
     }],
     plugins: [
+        packageVersionPlugin(),
         alias({
             entries: [
                 { find: "d3-array", replacement: "@hpcc-js/common" },
diff --git a/packages/marshaller/src/__package__.ts b/packages/marshaller/src/__package__.ts
index 64c8bd464e..3bc457cb28 100644
--- a/packages/marshaller/src/__package__.ts
+++ b/packages/marshaller/src/__package__.ts
@@ -1,3 +1,3 @@
-export const PKG_NAME = "@hpcc-js/marshaller";
-export const PKG_VERSION = "2.28.6";
-export const BUILD_VERSION = "2.108.6";
+export const PKG_NAME = "__PACKAGE_NAME__";
+export const PKG_VERSION = "__PACKAGE_VERSION__";
+export const BUILD_VERSION = "__BUILD_VERSION__";
diff --git a/packages/observable-md/package.json b/packages/observable-md/package.json
index 1cdb86c844..cef87ff804 100644
--- a/packages/observable-md/package.json
+++ b/packages/observable-md/package.json
@@ -44,7 +44,6 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "npm run compile-es6 && npm run bundle",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "docs": "typedoc --options tdoptions.json .",
         "dev-start": "ws",
@@ -72,4 +71,4 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization"
-}
+}
\ No newline at end of file
diff --git a/packages/observable-md/rollup.config.mjs b/packages/observable-md/rollup.config.mjs
index 88427c6f03..cd874d2fb9 100644
--- a/packages/observable-md/rollup.config.mjs
+++ b/packages/observable-md/rollup.config.mjs
@@ -1,4 +1,5 @@
-import { external, globals } from "@hpcc-js/bundle";
+import { external, globals, packageVersionPlugin } from "@hpcc-js/bundle";
+
 import alias from "@rollup/plugin-alias";
 import commonjs from "@rollup/plugin-commonjs";
 import sourcemaps from "rollup-plugin-sourcemaps";
@@ -9,6 +10,7 @@ import postcss from "rollup-plugin-postcss";
 import pkg from "./package.json" with { type: "json" };
 
 const plugins = [
+    packageVersionPlugin(),
     alias({
         entries: [
             { find: "@hpcc-js/common", replacement: "@hpcc-js/common/lib-es6/index.js" }
diff --git a/packages/observable-shim/rollup.config.mjs b/packages/observable-shim/rollup.config.mjs
index 5bcf0ca786..0b21a6c4e8 100644
--- a/packages/observable-shim/rollup.config.mjs
+++ b/packages/observable-shim/rollup.config.mjs
@@ -2,11 +2,12 @@ import alias from "@rollup/plugin-alias";
 import sourcemaps from "rollup-plugin-sourcemaps";
 import nodeResolve from "@rollup/plugin-node-resolve";
 import postcss from "rollup-plugin-postcss";
-import { globals } from "@hpcc-js/bundle";
+import { globals, packageVersionPlugin } from "@hpcc-js/bundle";
 
 import pkg from "./package.json" with { type: "json" };
 
 const plugins = [
+    packageVersionPlugin(),
     alias({
         entries: [
         ]
diff --git a/packages/observablehq-compiler/package.json b/packages/observablehq-compiler/package.json
index 957b2959b5..fe6bc492c6 100644
--- a/packages/observablehq-compiler/package.json
+++ b/packages/observablehq-compiler/package.json
@@ -46,7 +46,6 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "npm run compile-es6 && npm run bundle",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "docs": "typedoc --options tdoptions.json .",
         "dev-start": "ws",
@@ -76,4 +75,4 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization/tree/trunk/packages/observablehq-compiler"
-}
+}
\ No newline at end of file
diff --git a/packages/observablehq-compiler/rollup.config.mjs b/packages/observablehq-compiler/rollup.config.mjs
index 1ae3d1cddb..7f8fcf778c 100644
--- a/packages/observablehq-compiler/rollup.config.mjs
+++ b/packages/observablehq-compiler/rollup.config.mjs
@@ -1,4 +1,5 @@
-import { external, globals } from "@hpcc-js/bundle";
+import { external, globals, packageVersionPlugin } from "@hpcc-js/bundle";
+
 import alias from "@rollup/plugin-alias";
 import commonjs from "@rollup/plugin-commonjs";
 import sourcemaps from "rollup-plugin-sourcemaps";
@@ -35,7 +36,8 @@ export default [{
         sourcemap: true,
         globals: globals,
         name: pkg.name,
-        plugins: []
+        plugins: [
+        packageVersionPlugin(),]
     }, {
         file: pkg.module,
         format: "es",
diff --git a/packages/observablehq-compiler/src/__package__.ts b/packages/observablehq-compiler/src/__package__.ts
index 1abf8f4c1e..3bc457cb28 100644
--- a/packages/observablehq-compiler/src/__package__.ts
+++ b/packages/observablehq-compiler/src/__package__.ts
@@ -1,3 +1,3 @@
-export const PKG_NAME = "@hpcc-js/observablehq-compiler";
-export const PKG_VERSION = "1.5.0";
-export const BUILD_VERSION = "2.108.6";
+export const PKG_NAME = "__PACKAGE_NAME__";
+export const PKG_VERSION = "__PACKAGE_VERSION__";
+export const BUILD_VERSION = "__BUILD_VERSION__";
diff --git a/packages/other/package.json b/packages/other/package.json
index a58032230f..15b67352dd 100644
--- a/packages/other/package.json
+++ b/packages/other/package.json
@@ -32,7 +32,6 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "npm run compile-es6 && npm run bundle",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "docs": "typedoc --options tdoptions.json .",
         "update": "npx --yes npm-check-updates -u -t minor"
@@ -69,4 +68,4 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization"
-}
+}
\ No newline at end of file
diff --git a/packages/other/rollup.config.mjs b/packages/other/rollup.config.mjs
index 3e0b2b9d2a..9482177161 100644
--- a/packages/other/rollup.config.mjs
+++ b/packages/other/rollup.config.mjs
@@ -1,4 +1,5 @@
-import { external, globals } from "@hpcc-js/bundle";
+import { external, globals, packageVersionPlugin } from "@hpcc-js/bundle";
+
 import alias from '@rollup/plugin-alias';
 import commonjs from '@rollup/plugin-commonjs';
 import sourcemaps from 'rollup-plugin-sourcemaps';
@@ -24,6 +25,7 @@ export default {
         name: pkg.name
     }],
     plugins: [
+        packageVersionPlugin(),
         alias({
             entries: [
                 { find: "d3-array", replacement: "@hpcc-js/common" },
diff --git a/packages/other/src/__package__.ts b/packages/other/src/__package__.ts
index 3b26fbe6e4..3bc457cb28 100644
--- a/packages/other/src/__package__.ts
+++ b/packages/other/src/__package__.ts
@@ -1,3 +1,3 @@
-export const PKG_NAME = "@hpcc-js/other";
-export const PKG_VERSION = "2.17.2";
-export const BUILD_VERSION = "2.108.6";
+export const PKG_NAME = "__PACKAGE_NAME__";
+export const PKG_VERSION = "__PACKAGE_VERSION__";
+export const BUILD_VERSION = "__BUILD_VERSION__";
diff --git a/packages/phosphor-shim/package.json b/packages/phosphor-shim/package.json
index c20422d432..ff9da0c29f 100644
--- a/packages/phosphor-shim/package.json
+++ b/packages/phosphor-shim/package.json
@@ -32,7 +32,6 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "npm run compile-es6 && npm run bundle",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "docs": "typedoc --options tdoptions.json .",
         "update": "npx --yes npm-check-updates -u -t minor"
@@ -57,4 +56,4 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization"
-}
+}
\ No newline at end of file
diff --git a/packages/phosphor-shim/rollup.config.mjs b/packages/phosphor-shim/rollup.config.mjs
index a17cd6028d..0e3c4470bc 100644
--- a/packages/phosphor-shim/rollup.config.mjs
+++ b/packages/phosphor-shim/rollup.config.mjs
@@ -1,4 +1,5 @@
-import { external, globals } from "@hpcc-js/bundle";
+import { external, globals, packageVersionPlugin } from "@hpcc-js/bundle";
+
 import alias from '@rollup/plugin-alias';
 import commonjs from '@rollup/plugin-commonjs';
 import sourcemaps from 'rollup-plugin-sourcemaps';
@@ -25,6 +26,7 @@ export default {
         name: pkg.name
     }],
     plugins: [
+        packageVersionPlugin(),
         replace({
             "(typeof require !== 'undefined' && require('crypto')) ||": "/*---@hpcc-js (typeof require !== 'undefined' && require('crypto')) || @hpcc-js---*/",
             delimiters: ['', '']
diff --git a/packages/phosphor-shim/src/__package__.ts b/packages/phosphor-shim/src/__package__.ts
index 1e66302cf3..3bc457cb28 100644
--- a/packages/phosphor-shim/src/__package__.ts
+++ b/packages/phosphor-shim/src/__package__.ts
@@ -1,3 +1,3 @@
-export const PKG_NAME = "@hpcc-js/phosphor-shim";
-export const PKG_VERSION = "2.17.0";
-export const BUILD_VERSION = "2.108.6";
+export const PKG_NAME = "__PACKAGE_NAME__";
+export const PKG_VERSION = "__PACKAGE_VERSION__";
+export const BUILD_VERSION = "__BUILD_VERSION__";
diff --git a/packages/phosphor/package.json b/packages/phosphor/package.json
index f838a42b73..d0aec09d61 100644
--- a/packages/phosphor/package.json
+++ b/packages/phosphor/package.json
@@ -32,7 +32,6 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "npm run compile-es6 && npm run bundle",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "docs": "typedoc --options tdoptions.json .",
         "update": "npx --yes npm-check-updates -u -t minor"
@@ -59,4 +58,4 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization"
-}
+}
\ No newline at end of file
diff --git a/packages/phosphor/rollup.config.mjs b/packages/phosphor/rollup.config.mjs
index 3e0b2b9d2a..9482177161 100644
--- a/packages/phosphor/rollup.config.mjs
+++ b/packages/phosphor/rollup.config.mjs
@@ -1,4 +1,5 @@
-import { external, globals } from "@hpcc-js/bundle";
+import { external, globals, packageVersionPlugin } from "@hpcc-js/bundle";
+
 import alias from '@rollup/plugin-alias';
 import commonjs from '@rollup/plugin-commonjs';
 import sourcemaps from 'rollup-plugin-sourcemaps';
@@ -24,6 +25,7 @@ export default {
         name: pkg.name
     }],
     plugins: [
+        packageVersionPlugin(),
         alias({
             entries: [
                 { find: "d3-array", replacement: "@hpcc-js/common" },
diff --git a/packages/phosphor/src/__package__.ts b/packages/phosphor/src/__package__.ts
index 257ff76c07..3bc457cb28 100644
--- a/packages/phosphor/src/__package__.ts
+++ b/packages/phosphor/src/__package__.ts
@@ -1,3 +1,3 @@
-export const PKG_NAME = "@hpcc-js/phosphor";
-export const PKG_VERSION = "2.20.3";
-export const BUILD_VERSION = "2.108.6";
+export const PKG_NAME = "__PACKAGE_NAME__";
+export const PKG_VERSION = "__PACKAGE_VERSION__";
+export const BUILD_VERSION = "__BUILD_VERSION__";
diff --git a/packages/preact-shim/package.json b/packages/preact-shim/package.json
index 5894f6d3dc..5d3a7f54c9 100644
--- a/packages/preact-shim/package.json
+++ b/packages/preact-shim/package.json
@@ -32,7 +32,6 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "npm run compile-es6 && npm run bundle",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "docs": "typedoc --options tdoptions.json .",
         "update": "npx --yes npm-check-updates -u -t minor"
@@ -54,4 +53,4 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization"
-}
+}
\ No newline at end of file
diff --git a/packages/preact-shim/rollup.config.mjs b/packages/preact-shim/rollup.config.mjs
index 2817812d53..043f3b3624 100644
--- a/packages/preact-shim/rollup.config.mjs
+++ b/packages/preact-shim/rollup.config.mjs
@@ -1,4 +1,5 @@
-import { external, globals } from "@hpcc-js/bundle";
+import { external, globals, packageVersionPlugin } from "@hpcc-js/bundle";
+
 import alias from '@rollup/plugin-alias';
 import commonjs from '@rollup/plugin-commonjs';
 import sourcemaps from 'rollup-plugin-sourcemaps';
@@ -24,6 +25,7 @@ export default {
         name: pkg.name
     }],
     plugins: [
+        packageVersionPlugin(),
         alias({}),
         nodeResolve({
             preferBuiltins: true
diff --git a/packages/preact-shim/src/__package__.ts b/packages/preact-shim/src/__package__.ts
index 36b758c953..3bc457cb28 100644
--- a/packages/preact-shim/src/__package__.ts
+++ b/packages/preact-shim/src/__package__.ts
@@ -1,3 +1,3 @@
-export const PKG_NAME = "@hpcc-js/preact-shim";
-export const PKG_VERSION = "2.19.0";
-export const BUILD_VERSION = "2.108.6";
+export const PKG_NAME = "__PACKAGE_NAME__";
+export const PKG_VERSION = "__PACKAGE_VERSION__";
+export const BUILD_VERSION = "__BUILD_VERSION__";
diff --git a/packages/react/package.json b/packages/react/package.json
index 99341c39d9..1a933f88d4 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -32,7 +32,6 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "npm run compile-es6 && npm run bundle",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "docs": "typedoc --options tdoptions.json .",
         "update": "npx --yes npm-check-updates -u -t minor"
@@ -56,4 +55,4 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization"
-}
+}
\ No newline at end of file
diff --git a/packages/react/rollup.config.mjs b/packages/react/rollup.config.mjs
index 3e0b2b9d2a..9482177161 100644
--- a/packages/react/rollup.config.mjs
+++ b/packages/react/rollup.config.mjs
@@ -1,4 +1,5 @@
-import { external, globals } from "@hpcc-js/bundle";
+import { external, globals, packageVersionPlugin } from "@hpcc-js/bundle";
+
 import alias from '@rollup/plugin-alias';
 import commonjs from '@rollup/plugin-commonjs';
 import sourcemaps from 'rollup-plugin-sourcemaps';
@@ -24,6 +25,7 @@ export default {
         name: pkg.name
     }],
     plugins: [
+        packageVersionPlugin(),
         alias({
             entries: [
                 { find: "d3-array", replacement: "@hpcc-js/common" },
diff --git a/packages/react/src/__package__.ts b/packages/react/src/__package__.ts
index 8c3bb83846..3bc457cb28 100644
--- a/packages/react/src/__package__.ts
+++ b/packages/react/src/__package__.ts
@@ -1,3 +1,3 @@
-export const PKG_NAME = "@hpcc-js/react";
-export const PKG_VERSION = "2.55.2";
-export const BUILD_VERSION = "2.108.6";
+export const PKG_NAME = "__PACKAGE_NAME__";
+export const PKG_VERSION = "__PACKAGE_VERSION__";
+export const BUILD_VERSION = "__BUILD_VERSION__";
diff --git a/packages/timeline/package.json b/packages/timeline/package.json
index e6f351b2b6..058aa29c99 100644
--- a/packages/timeline/package.json
+++ b/packages/timeline/package.json
@@ -32,7 +32,6 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "npm run compile-es6 && npm run bundle",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "docs": "typedoc --options tdoptions.json .",
         "update": "npx --yes npm-check-updates -u -t minor"
diff --git a/packages/timeline/rollup.config.mjs b/packages/timeline/rollup.config.mjs
index 3e0b2b9d2a..9482177161 100644
--- a/packages/timeline/rollup.config.mjs
+++ b/packages/timeline/rollup.config.mjs
@@ -1,4 +1,5 @@
-import { external, globals } from "@hpcc-js/bundle";
+import { external, globals, packageVersionPlugin } from "@hpcc-js/bundle";
+
 import alias from '@rollup/plugin-alias';
 import commonjs from '@rollup/plugin-commonjs';
 import sourcemaps from 'rollup-plugin-sourcemaps';
@@ -24,6 +25,7 @@ export default {
         name: pkg.name
     }],
     plugins: [
+        packageVersionPlugin(),
         alias({
             entries: [
                 { find: "d3-array", replacement: "@hpcc-js/common" },
diff --git a/packages/timeline/src/__package__.ts b/packages/timeline/src/__package__.ts
index 0192e1021b..3bc457cb28 100644
--- a/packages/timeline/src/__package__.ts
+++ b/packages/timeline/src/__package__.ts
@@ -1,3 +1,3 @@
-export const PKG_NAME = "@hpcc-js/timeline";
-export const PKG_VERSION = "2.57.0";
-export const BUILD_VERSION = "2.108.6";
+export const PKG_NAME = "__PACKAGE_NAME__";
+export const PKG_VERSION = "__PACKAGE_VERSION__";
+export const BUILD_VERSION = "__BUILD_VERSION__";
diff --git a/packages/tree/package.json b/packages/tree/package.json
index c3c55517bc..17d7b6c508 100644
--- a/packages/tree/package.json
+++ b/packages/tree/package.json
@@ -32,7 +32,6 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "npm run compile-es6 && npm run bundle",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "docs": "typedoc --options tdoptions.json .",
         "update": "npx --yes npm-check-updates -u -t minor"
diff --git a/packages/tree/rollup.config.mjs b/packages/tree/rollup.config.mjs
index 3e0b2b9d2a..9482177161 100644
--- a/packages/tree/rollup.config.mjs
+++ b/packages/tree/rollup.config.mjs
@@ -1,4 +1,5 @@
-import { external, globals } from "@hpcc-js/bundle";
+import { external, globals, packageVersionPlugin } from "@hpcc-js/bundle";
+
 import alias from '@rollup/plugin-alias';
 import commonjs from '@rollup/plugin-commonjs';
 import sourcemaps from 'rollup-plugin-sourcemaps';
@@ -24,6 +25,7 @@ export default {
         name: pkg.name
     }],
     plugins: [
+        packageVersionPlugin(),
         alias({
             entries: [
                 { find: "d3-array", replacement: "@hpcc-js/common" },
diff --git a/packages/tree/src/__package__.ts b/packages/tree/src/__package__.ts
index fe1daa02c5..3bc457cb28 100644
--- a/packages/tree/src/__package__.ts
+++ b/packages/tree/src/__package__.ts
@@ -1,3 +1,3 @@
-export const PKG_NAME = "@hpcc-js/tree";
-export const PKG_VERSION = "2.45.0";
-export const BUILD_VERSION = "2.108.6";
+export const PKG_NAME = "__PACKAGE_NAME__";
+export const PKG_VERSION = "__PACKAGE_VERSION__";
+export const BUILD_VERSION = "__BUILD_VERSION__";
diff --git a/packages/util/package.json b/packages/util/package.json
index 5c0defc129..26b2f70ba7 100644
--- a/packages/util/package.json
+++ b/packages/util/package.json
@@ -33,7 +33,6 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "npm run compile-es6 && npm run bundle",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "docs": "typedoc --options tdoptions.json .",
         "update": "npx --yes npm-check-updates -u -t minor"
diff --git a/packages/util/rollup.config.mjs b/packages/util/rollup.config.mjs
index 4b15e381c1..514e96b326 100644
--- a/packages/util/rollup.config.mjs
+++ b/packages/util/rollup.config.mjs
@@ -1,4 +1,5 @@
-import { external, globals } from "@hpcc-js/bundle";
+import { external, globals, packageVersionPlugin } from "@hpcc-js/bundle";
+
 import alias from '@rollup/plugin-alias';
 import commonjs from '@rollup/plugin-commonjs';
 import sourcemaps from 'rollup-plugin-sourcemaps';
@@ -18,6 +19,7 @@ export default {
         name: pkg.name
     }],
     plugins: [
+        packageVersionPlugin(),
         alias({}),
         nodeResolve({
             preferBuiltins: true
diff --git a/packages/util/src/__package__.ts b/packages/util/src/__package__.ts
index 1edee63555..3bc457cb28 100644
--- a/packages/util/src/__package__.ts
+++ b/packages/util/src/__package__.ts
@@ -1,3 +1,3 @@
-export const PKG_NAME = "@hpcc-js/util";
-export const PKG_VERSION = "2.53.1";
-export const BUILD_VERSION = "2.108.6";
+export const PKG_NAME = "__PACKAGE_NAME__";
+export const PKG_VERSION = "__PACKAGE_VERSION__";
+export const BUILD_VERSION = "__BUILD_VERSION__";
diff --git a/utils/bundle/package.json b/utils/bundle/package.json
index e50a1b2206..dd6a1fd1ee 100644
--- a/utils/bundle/package.json
+++ b/utils/bundle/package.json
@@ -43,4 +43,4 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization"
-}
+}
\ No newline at end of file
diff --git a/utils/bundle/src/index.ts b/utils/bundle/src/index.ts
index 8be1455c4f..0c65e412b7 100644
--- a/utils/bundle/src/index.ts
+++ b/utils/bundle/src/index.ts
@@ -1,3 +1,4 @@
+
 const node_libs = ["child_process", "fs", "abort-controller", "node-fetch", "undici", "os", "path", "semver", "safe-buffer", "tmp", "@xmldom/xmldom"];
 
 export const isHpcc = (id: string): boolean => id.indexOf("@hpcc-js") === 0;
@@ -14,3 +15,5 @@ export function globals(id) {
     }
     return undefined;
 }
+
+export { packageVersionPlugin, getRootPackageVersion } from "./rollup-plugin-version.js";
diff --git a/utils/bundle/src/rollup-plugin-version.ts b/utils/bundle/src/rollup-plugin-version.ts
new file mode 100644
index 0000000000..1681bce75b
--- /dev/null
+++ b/utils/bundle/src/rollup-plugin-version.ts
@@ -0,0 +1,74 @@
+import * as fs from "fs";
+import * as path from "path";
+import type { Plugin } from "rollup";
+
+interface PackageJson {
+    name: string;
+    version: string;
+    workspaces?: string[];
+}
+
+/**
+ * Walks up the directory tree to find the root package.json with workspaces
+ */
+export function getRootPackageVersion(startDir: string): string {
+    let currentDir = startDir;
+    while (currentDir !== path.dirname(currentDir)) {
+        const pkgPath = path.join(currentDir, "package.json");
+        if (fs.existsSync(pkgPath)) {
+            const pkg: PackageJson = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
+            if (pkg.workspaces) {
+                return pkg.version;
+            }
+        }
+        currentDir = path.dirname(currentDir);
+    }
+    throw new Error("Could not find root package.json with workspaces");
+}
+
+/**
+ * Rollup plugin to replace version placeholders in __package__.ts
+ */
+export function packageVersionPlugin(): Plugin {
+    let packageName: string;
+    let packageVersion: string;
+    let buildVersion: string;
+
+    return {
+        name: "package-version-plugin",
+
+        buildStart() {
+            // Read the local package.json
+            const pkgPath = path.resolve(process.cwd(), "package.json");
+            const pkg: PackageJson = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
+
+            packageName = pkg.name;
+            packageVersion = pkg.version;
+
+            // Get the root package version for BUILD_VERSION
+            buildVersion = getRootPackageVersion(process.cwd());
+        },
+
+        transform(code: string, id: string) {
+            // Only process __package__ files
+            if (!id.includes("__package__")) {
+                return null;
+            }
+
+            // Replace the placeholders
+            let transformedCode = code;
+            transformedCode = transformedCode.replace(/"__PACKAGE_NAME__"/g, `"${packageName}"`);
+            transformedCode = transformedCode.replace(/"__PACKAGE_VERSION__"/g, `"${packageVersion}"`);
+            transformedCode = transformedCode.replace(/"__BUILD_VERSION__"/g, `"${buildVersion}"`);
+
+            if (transformedCode !== code) {
+                return {
+                    code: transformedCode,
+                    map: null
+                };
+            }
+
+            return null;
+        }
+    };
+}
diff --git a/utils/bundle/src/stamp-main.js b/utils/bundle/src/stamp-main.js
deleted file mode 100644
index 52926b2cfd..0000000000
--- a/utils/bundle/src/stamp-main.js
+++ /dev/null
@@ -1,11 +0,0 @@
-const { execSync } = require('child_process');
-const fs = require("fs");
-var EOL = require('os').EOL;
-
-const wd = process.cwd();
-const pkg = require(`${wd}/package.json`);
-const loaderPkg = require(`${wd}/packages/loader/package.json`);
-
-pkg.version = loaderPkg.version;
-
-fs.writeFileSync(`${wd}/package.json`, JSON.stringify(pkg, undefined, 2), 'utf8');
diff --git a/utils/bundle/src/stamp.js b/utils/bundle/src/stamp.js
deleted file mode 100644
index 307ad680c5..0000000000
--- a/utils/bundle/src/stamp.js
+++ /dev/null
@@ -1,8 +0,0 @@
-const fs = require("fs");
-var EOL = require('os').EOL;
-
-const wd = process.cwd();
-const pkg = require(`${wd}/package.json`);
-const loaderPkg = require(`${wd}/../loader/package.json`);
-fs.writeFile(`${wd}/src/__package__.ts`, `export const PKG_NAME = "${pkg.name}";${EOL}export const PKG_VERSION = "${pkg.version}";${EOL}export const BUILD_VERSION = "${loaderPkg.version}";${EOL}`, 'utf8', err => { });
-