fix: add webpack umd tests

GordonSmith · GordonSmith · commit 9bfc77360eb5 · 2026-05-29T16:08:32.000+01:00
update clean scripts to include types-3.4 directory across all packages
fix webpack config to disable AMD parsing for layout bundle, ensuring it exposes the expected global variable
diff --git a/demos/gallery/package.json b/demos/gallery/package.json
@@ -3,7 +3,7 @@
     "name": "@hpcc-js/demo-gallery",
     "type": "module",
     "scripts": {
-        "clean": "rimraf --glob types dist *.tsbuildinfo",
+        "clean": "rimraf --glob types types-3.4 dist *.tsbuildinfo",
         "bundle": "vite build",
         "bundle-watch": "vite --port 5500",
         "gen-types": "tsgo --project tsconfig.json",
diff --git a/demos/imdb/package.json b/demos/imdb/package.json
@@ -3,7 +3,7 @@
     "name": "@hpcc-js/demo-imdb",
     "type": "module",
     "scripts": {
-        "clean": "rimraf --glob types dist *.tsbuildinfo",
+        "clean": "rimraf --glob types types-3.4 dist *.tsbuildinfo",
         "lint": "eslint ./src",
         "dev": "vite",
         "preview": "vite preview",
diff --git a/package.json b/package.json
@@ -13,14 +13,15 @@
     "uninstall-lock": "rimraf --glob package-lock.json packages/**/package-lock.json demos/**/package-lock.json tests/**/package-lock.json",
     "uninstall-node-modules": "rimraf --glob node_modules packages/**/node_modules demos/**/node_modules tests/**/node_modules",
     "uninstall": "lerna clean && npm run uninstall-node-modules",
-    "clean-root": "rimraf --glob build coverage dist lib* types temp tmp *.tsbuildinfo .vitepress/dist .vitepress/cache docs/api",
+    "clean-root": "rimraf --glob build coverage dist lib* types types-3.4 temp tmp *.tsbuildinfo .vitepress/dist .vitepress/cache docs/api",
     "clean": "lerna run clean --no-sort && npm run clean-root",
     "build": "lerna run build",
     "lint": "lerna run --no-bail lint",
     "lint-fix": "lerna run --no-bail lint -- --fix",
     "test-browser": "vitest run --project browser",
     "test-browser-esm": "cd tests/browser-esm && npm i && npm test",
     "test-browser-umd": "cd tests/browser-umd && npm i && npm test",
+    "test-webpack-browser-umd": "cd tests/webpack-browser-umd && npm i && npm test",
     "test-node": "vitest run --project node",
     "test-node-esm": "cd tests/node-esm && npm i && npm test",
     "test-node-cjs": "cd tests/node-cjs && npm i && npm test",
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -21,7 +21,7 @@
         "types/*"
     ],
     "scripts": {
-        "clean": "rimraf --glob lib* types dist *.tsbuildinfo .turbo",
+        "clean": "rimraf --glob lib* types types-3.4 dist *.tsbuildinfo .turbo",
         "bundle": "vite build",
         "bundle-watch": "vite build --watch",
         "bundle-serve": "vite",
diff --git a/packages/chart/package.json b/packages/chart/package.json
@@ -21,7 +21,7 @@
         "types/*"
     ],
     "scripts": {
-        "clean": "rimraf --glob lib* types dist *.tsbuildinfo .turbo",
+        "clean": "rimraf --glob lib* types types-3.4 dist *.tsbuildinfo .turbo",
         "bundle": "vite build",
         "bundle-watch": "vite build --watch",
         "bundle-serve": "vite --port 5500",
diff --git a/packages/codemirror/package.json b/packages/codemirror/package.json
@@ -21,7 +21,7 @@
         "types/*"
     ],
     "scripts": {
-        "clean": "rimraf --glob lib* types dist *.tsbuildinfo .turbo",
+        "clean": "rimraf --glob lib* types types-3.4 dist *.tsbuildinfo .turbo",
         "bundle": "vite build",
         "bundle-watch": "vite build --watch",
         "bundle-serve": "vite --port 5501",
diff --git a/packages/codemirror/src/codemirror-shim.ts b/packages/codemirror/src/codemirror-shim.ts
@@ -3,9 +3,11 @@ import "codemirror/mode/ecl/ecl.js";
 import "codemirror/mode/gfm/gfm.js";
 import "codemirror/mode/htmlmixed/htmlmixed.js";
 import "codemirror/mode/javascript/javascript.js";
+import "codemirror/mode/markdown/markdown.js";
 import "codemirror/mode/xml/xml.js";
 import "codemirror/mode/sql/sql.js";
 import "codemirror/mode/yaml/yaml.js";
+import "codemirror/mode/meta.js";
 import "./mode/dot/dot.ts";
 import "./mode/markdown/markdown.ts";
 
@@ -16,6 +18,7 @@ import "codemirror/addon/fold/comment-fold.js";
 import "codemirror/addon/fold/foldcode.js";
 import "codemirror/addon/fold/foldgutter.js";
 import "codemirror/addon/fold/indent-fold.js";
+import "codemirror/addon/mode/overlay.js";
 import "codemirror/addon/fold/xml-fold.js";
 
 import "codemirror/addon/fold/foldgutter.css";
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -23,7 +23,7 @@
         "font-awesome/**/*"
     ],
     "scripts": {
-        "clean": "rimraf --glob lib* types dist font-awesome *.tsbuildinfo .turbo",
+        "clean": "rimraf --glob lib* types types-3.4 dist font-awesome *.tsbuildinfo .turbo",
         "bundle": "vite build",
         "bundle-watch": "vite build --watch",
         "bundle-serve": "vite --port 5502",
diff --git a/packages/comms/package.json b/packages/comms/package.json
@@ -34,7 +34,7 @@
         "types/*"
     ],
     "scripts": {
-        "clean": "rimraf --glob lib* types dist *.tsbuildinfo .turbo",
+        "clean": "rimraf --glob lib* types types-3.4 dist *.tsbuildinfo .turbo",
         "bundle-node": "node ./esbuild.js",
         "bundle-browser": "vite build",
         "bundle": "run-s bundle-browser bundle-node",
diff --git a/packages/composite/package.json b/packages/composite/package.json
@@ -21,7 +21,7 @@
         "types/*"
     ],
     "scripts": {
-        "clean": "rimraf --glob lib* types dist *.tsbuildinfo .turbo",
+        "clean": "rimraf --glob lib* types types-3.4 dist *.tsbuildinfo .turbo",
         "bundle": "vite build",
         "bundle-watch": "vite build --watch",
         "bundle-serve": "vite --port 5503",
diff --git a/packages/dataflow/package.json b/packages/dataflow/package.json
@@ -21,7 +21,7 @@
         "types/*"
     ],
     "scripts": {
-        "clean": "rimraf --glob lib* types dist *.tsbuildinfo .turbo",
+        "clean": "rimraf --glob lib* types types-3.4 dist *.tsbuildinfo .turbo",
         "bundle": "vite build",
         "bundle-watch": "vite build --watch",
         "bundle-serve": "vite",
diff --git a/packages/ddl-shim/package.json b/packages/ddl-shim/package.json
@@ -22,7 +22,7 @@
     ],
     "scripts": {
         "preinstall": "echo \"\" > cli.js",
-        "clean": "rimraf --glob bin lib* types dist ./src/ddl*Schema*.ts ./schema/*.json *.tsbuildinfo .turbo",
+        "clean": "rimraf --glob bin lib* types types-3.4 dist ./src/ddl*Schema*.ts ./schema/*.json *.tsbuildinfo .turbo",
         "generate-v1": "ts-json-schema-generator --tsconfig tsconfig-schema.json --type DDLSchema > ./schema/v1.json",
         "generate-v2": "ts-json-schema-generator --tsconfig tsconfig-schema.json --type Schema > ./schema/v2.json",
         "generate": "run-p generate-v1 generate-v2",
diff --git a/packages/dgrid-shim/package.json b/packages/dgrid-shim/package.json
@@ -14,7 +14,7 @@
         }
     },
     "scripts": {
-        "clean": "rimraf --glob lib* types dist *.tsbuildinfo",
+        "clean": "rimraf --glob lib* types types-3.4 dist *.tsbuildinfo",
         "compile": "tsc",
         "compile-watch": "npm run compile -- -w",
         "bundle": "webpack",
@@ -63,4 +63,4 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization#readme"
-}
+}
diff --git a/packages/dgrid/package.json b/packages/dgrid/package.json
@@ -21,7 +21,7 @@
         "types/*"
     ],
     "scripts": {
-        "clean": "rimraf --glob lib* types dist *.tsbuildinfo .turbo",
+        "clean": "rimraf --glob lib* types types-3.4 dist *.tsbuildinfo .turbo",
         "bundle": "vite build",
         "bundle-watch": "vite build --watch",
         "bundle-serve": "vite --port 5506",
diff --git a/packages/dgrid2/package.json b/packages/dgrid2/package.json
@@ -21,7 +21,7 @@
         "types/*"
     ],
     "scripts": {
-        "clean": "rimraf --glob lib* types dist *.tsbuildinfo .turbo",
+        "clean": "rimraf --glob lib* types types-3.4 dist *.tsbuildinfo .turbo",
         "bundle": "vite build",
         "bundle-watch": "vite build --watch",
         "bundle-serve": "vite --port 5507",
diff --git a/packages/eclwatch/package.json b/packages/eclwatch/package.json
@@ -21,7 +21,7 @@
         "types/*"
     ],
     "scripts": {
-        "clean": "rimraf --glob lib* types dist *.tsbuildinfo .turbo",
+        "clean": "rimraf --glob lib* types types-3.4 dist *.tsbuildinfo .turbo",
         "bundle": "vite build",
         "bundle-watch": "vite build --watch",
         "bundle-serve": "vite --port 5520",
diff --git a/packages/eclwatch/src/index.ts b/packages/eclwatch/src/index.ts
@@ -1,6 +1,7 @@
 export * from "./__package__.ts";
 export * from "./ECLArchiveViewer.ts";
 export * from "./WUGraph.ts";
+export * from "./WUGraphLegend.ts";
 export * from "./WUResult.ts";
 export * from "./WUScopeController.ts";
 export * from "./WUStatus.ts";
diff --git a/packages/esbuild-plugins/src/vite-utils.ts b/packages/esbuild-plugins/src/vite-utils.ts
@@ -172,6 +172,36 @@ export const browserConfig = defineConfig({
     }
 });
 
+/**
+ * Strips AMD detection (`typeof define === 'function' && define.amd`) from CJS/UMD files
+ * in node_modules before they are bundled.
+ *
+ * Rolldown (Vite 8) wraps bundled CJS node_modules with `__commonJSMin()`, which preserves
+ * any inner UMD boilerplate including AMD checks. When webpack consumers later process the
+ * resulting UMD bundle, their AMD interop compiles `typeof define === 'function' && define.amd`
+ * to `true`, causing the inner `define()` to fire and overwrite `module.exports` with the CJS
+ * library value — corrupting the outer package's exports.
+ *
+ * Replacing the AMD check with `false` before bundling forces only the CJS path
+ * (`typeof exports === 'object'`), which is the correct path inside a `__commonJSMin` wrapper.
+ */
+function stripNodeModulesAmdPlugin() {
+    return {
+        name: "hpcc:strip-node-modules-amd",
+        transform(code: string, id: string) {
+            if (!id.includes("node_modules")) return null;
+            if (!code.includes("define.amd")) return null;
+            return {
+                code: code.replace(
+                    /typeof\s+define\s*===?\s*['"]function['"]\s*&&\s*define\.amd/g,
+                    "false"
+                ),
+                map: null,
+            };
+        },
+    };
+}
+
 export function createHpccViteConfig(pkg: any, options: ViteHpccConfigOptions = {}): ViteUserConfig {
     const {
         external: additionalExternal = [],
@@ -192,6 +222,7 @@ export function createHpccViteConfig(pkg: any, options: ViteHpccConfigOptions =
         cssInjectedByJsPlugin({
             topExecutionPriority: false
         }),
+        stripNodeModulesAmdPlugin(),
         ...additionalPlugins
     ];
 
diff --git a/packages/form/package.json b/packages/form/package.json
@@ -21,7 +21,7 @@
         "types/*"
     ],
     "scripts": {
-        "clean": "rimraf --glob lib* types dist *.tsbuildinfo .turbo",
+        "clean": "rimraf --glob lib* types types-3.4 dist *.tsbuildinfo .turbo",
         "bundle": "vite build",
         "bundle-watch": "vite build --watch",
         "bundle-serve": "vite --port 5508",
diff --git a/packages/graph/package.json b/packages/graph/package.json
@@ -21,7 +21,7 @@
         "types/*"
     ],
     "scripts": {
-        "clean": "rimraf --glob lib* types dist *.tsbuildinfo .turbo ./workers/dist ./workers/lib-es6 ./workers/types",
+        "clean": "rimraf --glob lib* types types-3.4 dist *.tsbuildinfo .turbo ./workers/dist ./workers/lib-es6 ./workers/types",
         "bundle": "vite build",
         "bundle-workers": "vite build -c ./workers/vite.config.ts",
         "bundle-watch": "vite build --watch",
diff --git a/packages/html/package.json b/packages/html/package.json
@@ -21,7 +21,7 @@
         "types/*"
     ],
     "scripts": {
-        "clean": "rimraf --glob lib* types dist *.tsbuildinfo .turbo",
+        "clean": "rimraf --glob lib* types types-3.4 dist *.tsbuildinfo .turbo",
         "bundle": "vite build",
         "bundle-watch": "vite build --watch",
         "bundle-serve": "vite --port 5510",
diff --git a/packages/layout/package.json b/packages/layout/package.json
@@ -21,7 +21,7 @@
         "types/*"
     ],
     "scripts": {
-        "clean": "rimraf --glob lib* types dist *.tsbuildinfo .turbo",
+        "clean": "rimraf --glob lib* types types-3.4 dist *.tsbuildinfo .turbo",
         "bundle": "vite build",
         "bundle-watch": "vite build --watch",
         "bundle-serve": "vite --port 5511",
diff --git a/packages/map/package.json b/packages/map/package.json
@@ -23,7 +23,7 @@
         "TopoJSON/*"
     ],
     "scripts": {
-        "clean": "rimraf --glob lib* types dist *.tsbuildinfo .turbo",
+        "clean": "rimraf --glob lib* types types-3.4 dist *.tsbuildinfo .turbo",
         "bundle": "vite build",
         "bundle-watch": "vite build --watch",
         "bundle-serve": "vite --port 5512",
diff --git a/packages/markdown-it-plugins/package.json b/packages/markdown-it-plugins/package.json
@@ -30,7 +30,7 @@
         "types/*"
     ],
     "scripts": {
-        "clean": "rimraf --glob lib* types dist dist-test .vitepress/cache .vitepress/dist *.tsbuildinfo .turbo",
+        "clean": "rimraf --glob lib* types types-3.4 dist dist-test .vitepress/cache .vitepress/dist *.tsbuildinfo .turbo",
         "bundle": "vite build",
         "bundle-watch": "vite build --watch",
         "bundle-serve": "vite --port 5513",
diff --git a/packages/marshaller/package.json b/packages/marshaller/package.json
@@ -21,7 +21,7 @@
         "types/*"
     ],
     "scripts": {
-        "clean": "rimraf --glob lib* types dist *.tsbuildinfo .turbo",
+        "clean": "rimraf --glob lib* types types-3.4 dist *.tsbuildinfo .turbo",
         "bundle": "vite build",
         "bundle-watch": "vite build --watch",
         "bundle-serve": "vite --port 5520",
diff --git a/packages/observablehq-compiler/package.json b/packages/observablehq-compiler/package.json
@@ -39,7 +39,7 @@
         "ojscc": "bin/ojscc.mjs"
     },
     "scripts": {
-        "clean": "rimraf --glob lib* types dist dist-test *.tsbuildinfo .turbo",
+        "clean": "rimraf --glob lib* types types-3.4 dist dist-test *.tsbuildinfo .turbo",
         "bundle-node": "node ./esbuild.js",
         "bundle-browser": "vite build",
         "bundle": "run-s bundle-browser bundle-node",
diff --git a/packages/other/package.json b/packages/other/package.json
@@ -21,7 +21,7 @@
         "types/*"
     ],
     "scripts": {
-        "clean": "rimraf --glob lib* types dist *.tsbuildinfo .turbo",
+        "clean": "rimraf --glob lib* types types-3.4 dist *.tsbuildinfo .turbo",
         "bundle": "vite build",
         "bundle-watch": "vite build --watch",
         "bundle-serve": "vite --port 5515",
diff --git a/packages/phosphor/package.json b/packages/phosphor/package.json
@@ -21,7 +21,7 @@
         "types/*"
     ],
     "scripts": {
-        "clean": "rimraf --glob lib* types dist *.tsbuildinfo .turbo",
+        "clean": "rimraf --glob lib* types types-3.4 dist *.tsbuildinfo .turbo",
         "bundle": "vite build",
         "bundle-watch": "vite build --watch",
         "bundle-serve": "vite --port 5516",
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -21,7 +21,7 @@
         "types/*"
     ],
     "scripts": {
-        "clean": "rimraf --glob lib* types dist *.tsbuildinfo .turbo",
+        "clean": "rimraf --glob lib* types types-3.4 dist *.tsbuildinfo .turbo",
         "bundle": "vite build",
         "bundle-watch": "vite build --watch",
         "bundle-serve": "vite --port 5517",
diff --git a/packages/timeline/package.json b/packages/timeline/package.json
@@ -21,7 +21,7 @@
         "types/*"
     ],
     "scripts": {
-        "clean": "rimraf --glob lib* types dist *.tsbuildinfo .turbo",
+        "clean": "rimraf --glob lib* types types-3.4 dist *.tsbuildinfo .turbo",
         "bundle": "vite build",
         "bundle-watch": "vite build --watch",
         "bundle-serve": "vite --port 5518",
diff --git a/packages/tree/package.json b/packages/tree/package.json
@@ -21,7 +21,7 @@
         "types/*"
     ],
     "scripts": {
-        "clean": "rimraf --glob lib* types dist *.tsbuildinfo .turbo",
+        "clean": "rimraf --glob lib* types types-3.4 dist *.tsbuildinfo .turbo",
         "bundle": "vite build",
         "bundle-watch": "vite build --watch",
         "bundle-serve": "vite --port 5519",
diff --git a/packages/util/package.json b/packages/util/package.json
@@ -21,7 +21,7 @@
         "types/*"
     ],
     "scripts": {
-        "clean": "rimraf --glob lib* types dist dist-test *.tsbuildinfo .turbo",
+        "clean": "rimraf --glob lib* types types-3.4 dist dist-test *.tsbuildinfo .turbo",
         "bundle": "vite build",
         "bundle-watch": "vite build --watch",
         "bundle-serve": "vite --port 5523",
diff --git a/tests/browser-umd/eclwatch.browser.spec.ts b/tests/browser-umd/eclwatch.browser.spec.ts
diff --git a/tests/browser-umd/package.json b/tests/browser-umd/package.json
diff --git a/tests/package.json b/tests/package.json
diff --git a/tests/webpack-browser-umd/.gitignore b/tests/webpack-browser-umd/.gitignore
diff --git a/tests/webpack-browser-umd/amd.webpack.spec.ts b/tests/webpack-browser-umd/amd.webpack.spec.ts
diff --git a/tests/webpack-browser-umd/eclwatch.webpack.spec.ts b/tests/webpack-browser-umd/eclwatch.webpack.spec.ts
diff --git a/tests/webpack-browser-umd/layout.webpack.spec.ts b/tests/webpack-browser-umd/layout.webpack.spec.ts
diff --git a/tests/webpack-browser-umd/package.json b/tests/webpack-browser-umd/package.json
diff --git a/tests/webpack-browser-umd/src/eclwatch-entry.cjs b/tests/webpack-browser-umd/src/eclwatch-entry.cjs
diff --git a/tests/webpack-browser-umd/src/layout-entry.cjs b/tests/webpack-browser-umd/src/layout-entry.cjs
diff --git a/tests/webpack-browser-umd/tsconfig.json b/tests/webpack-browser-umd/tsconfig.json
diff --git a/tests/webpack-browser-umd/util.ts b/tests/webpack-browser-umd/util.ts
diff --git a/tests/webpack-browser-umd/vitest.config.ts b/tests/webpack-browser-umd/vitest.config.ts
diff --git a/tests/webpack-browser-umd/webpack.config.cjs b/tests/webpack-browser-umd/webpack.config.cjs
