Merge pull request #4399 from GordonSmith/SOURCE_MAPS

fix: Sourcemaps out of sync

Author: GordonSmith

demos/gallery/vite.config.ts

@@ -28,6 +28,8 @@ export default defineConfig({
         minifyIdentifiers: false
     },
     plugins: [
-        cssInjectedByJsPlugin()
+        cssInjectedByJsPlugin({
+            topExecutionPriority: false
+        })
     ],
 });

package-lock.json

@@ -36,8 +36,8 @@
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "8.29.0",
     "@typescript-eslint/parser": "8.29.0",
-    "@vitest/browser": "3.1.1",
-    "@vitest/coverage-v8": "3.1.1",
+    "@vitest/browser": "3.2.4",
+    "@vitest/coverage-v8": "3.2.4",
     "eslint": "9.24.0",
     "eslint-plugin-react-hooks": "5.2.0",
     "lerna": "8.2.1",
@@ -46,12 +46,8 @@
     "rimraf": "5.0.10",
     "typescript": "5.8.3",
     "typescript-eslint": "8.29.0",
-    "vite": "6.2.5",
-    "vite-plugin-css-injected-by-js": "3.5.2",
-    "vite-plugin-static-copy": "2.3.0",
-    "vite-plugin-inspect": "10.3.0",
     "vitepress": "1.6.3",
-    "vitest": "3.1.1"
+    "vitest": "3.2.4"
   },
   "overrides": {
     "d3-color": "3.1.0",

package.json

@@ -127,7 +127,6 @@ export function tip() {
     // v - value of the attribute
     //
     // Returns tip or attribute value
-    // eslint-disable-next-line no-unused-vars
     tip.attr = function (n, v) {
         if (arguments.length < 2 && typeof n === "string") {
             return getNodeEl().attr(n);
@@ -144,8 +143,7 @@ export function tip() {
     // n - name of the property
     // v - value of the property
     //
-    // Returns tip or style property value
-    // eslint-disable-next-line no-unused-vars
+    // Returns tip or style property value 
     tip.style = function (n, v) {
         if (arguments.length < 2 && typeof n === "string") {
             return getNodeEl().style(n);

packages/api/src/Tooltip.ts

@@ -1,33 +1,4 @@
-import { defineConfig } from "vite";
-import { resolve } from "path";
-import cssInjectedByJsPlugin from "vite-plugin-css-injected-by-js";
-import { hpccBundleNames } from "@hpcc-js/esbuild-plugins";
+import { createHpccViteConfig } from "@hpcc-js/esbuild-plugins";
 import pkg from "./package.json" with { type: "json" };
 
-const { alias, external, globals } = hpccBundleNames(pkg);
-
-export default defineConfig({
-    build: {
-        lib: {
-            entry: resolve(__dirname, "src/index.ts"),
-            name: pkg.name,
-            fileName: "index",
-        },
-        rollupOptions: {
-            external,
-            output: {
-                globals,
-            },
-        },
-        sourcemap: true
-    },
-    resolve: {
-        alias
-    },
-    esbuild: {
-        minifyIdentifiers: false
-    },
-    plugins: [
-        cssInjectedByJsPlugin()
-    ],
-});
+export default createHpccViteConfig(pkg);

packages/api/vite.config.ts

@@ -4,7 +4,7 @@ import { Class, HTMLWidget, SVGWidget } from "@hpcc-js/common";
 import { describe, it, expect } from "vitest";
 import { classDef, renderMedium, renderShort, renderSmall, renderWide } from "../../common/tests/index.ts";
 
-const urlSearch: string = window.location.href.split("?")[1];
+const urlSearch: string = "";
 const simple = {
     ND: {
         columns: ["Subject", "Year 1", "Year 2", "Year 3", "Year 4"],

packages/chart/tests/chart.browser.spec.ts

@@ -1,33 +1,4 @@
-import { defineConfig } from "vite";
-import { resolve } from "path";
-import cssInjectedByJsPlugin from "vite-plugin-css-injected-by-js";
-import { hpccBundleNames } from "@hpcc-js/esbuild-plugins";
+import { createHpccViteConfig } from "@hpcc-js/esbuild-plugins";
 import pkg from "./package.json" with { type: "json" };
 
-const { alias, external, globals } = hpccBundleNames(pkg);
-
-export default defineConfig({
-    build: {
-        lib: {
-            entry: resolve(__dirname, "src/index.ts"),
-            name: pkg.name,
-            fileName: "index",
-        },
-        rollupOptions: {
-            external,
-            output: {
-                globals,
-            },
-        },
-        sourcemap: true
-    },
-    resolve: {
-        alias
-    },
-    esbuild: {
-        minifyIdentifiers: false
-    },
-    plugins: [
-        cssInjectedByJsPlugin()
-    ],
-});
+export default createHpccViteConfig(pkg);

packages/chart/vite.config.ts

@@ -4,7 +4,7 @@ import { Class, HTMLWidget, SVGWidget } from "@hpcc-js/common";
 import { describe, it, expect } from "vitest";
 import { classDef, renderMedium } from "../../common/tests/index.ts";
 
-const urlSearch: string = window.location.href.split("?")[1];
+const urlSearch: string = "";
 
 describe("@hpcc-js/codemirror", () => {
     for (const key in codemirror) {

packages/codemirror/tests/codemirror.browser.spec.ts

@@ -1,33 +1,4 @@
-import { defineConfig } from "vite";
-import { resolve } from "path";
-import cssInjectedByJsPlugin from "vite-plugin-css-injected-by-js";
-import { hpccBundleNames } from "@hpcc-js/esbuild-plugins";
+import { createHpccViteConfig } from "@hpcc-js/esbuild-plugins";
 import pkg from "./package.json" with { type: "json" };
 
-const { alias, external, globals } = hpccBundleNames(pkg);
-
-export default defineConfig({
-    build: {
-        lib: {
-            entry: resolve(__dirname, "src/index.ts"),
-            name: pkg.name,
-            fileName: "index",
-        },
-        rollupOptions: {
-            external,
-            output: {
-                globals,
-            },
-        },
-        sourcemap: true
-    },
-    resolve: {
-        alias
-    },
-    esbuild: {
-        minifyIdentifiers: false
-    },
-    plugins: [
-        cssInjectedByJsPlugin()
-    ],
-});
+export default createHpccViteConfig(pkg);

packages/codemirror/vite.config.ts

@@ -3,7 +3,7 @@ import { Button, CanvasWidget, Class, Entity, EntityCard, EntityPin, EntityRect,
 import { describe, it, expect } from "vitest";
 import { classDef, renderIcon, renderMedium, renderSmall } from "./index.ts";
 
-const urlSearch: string = window.location.href.split("?")[1];
+const urlSearch: string = "";
 const menuList = ["List item 1", "This is Item 2", "List item 3", "This is list item 4", "And finally 5"];
 
 describe("Widget.classed", () => {