Fix scatterplot build. Not perfect, but it should probably work and w…

…e should consolidate towards a replacement
galaxyproject · Jun 5, 2024 · aa62112 · aa62112
1 parent 9e96eae
commit aa62112
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 22 deletions.
diff --git a/config/plugins/visualizations/scatterplot/.babelrc b/config/plugins/visualizations/scatterplot/.babelrc
diff --git a/config/plugins/visualizations/scatterplot/package.json b/config/plugins/visualizations/scatterplot/package.json
@@ -10,8 +10,6 @@
     "author": "Carl Eberhard",
     "license": "0BSD",
     "dependencies": {
-        "babel-plugin-auto-import": "^0.7.1",
-        "babel-preset-env": "^1.6.1",
         "backbone": "^1.3.3",
         "bootstrap": "^3.3.7",
         "d3": "^3.5.17",
@@ -20,10 +18,9 @@
         "underscore": "^1.8.3"
     },
     "devDependencies": {
-        "@babel/core": "^7.24.6",
         "parcel": "2.11.0"
     },
     "scripts": {
-        "build": "parcel build src/scatterplot.js --dist-dir static/"
+        "build": "parcel build src/scatterplot.js --dist-dir static"
     }
 }
diff --git a/config/plugins/visualizations/scatterplot/src/jqglobals.js b/config/plugins/visualizations/scatterplot/src/jqglobals.js
@@ -1,2 +1,3 @@
-import $ from "jquery";
-window.jQuery = window.$ = window.jquery = $;
+import jquery from "jquery";
+
+export default (window.$ = window.jQuery = jquery);
diff --git a/client/src/ui/pagination.js → ...ualizations/scatterplot/src/pagination.js b/client/src/ui/pagination.js → ...ualizations/scatterplot/src/pagination.js
diff --git a/client/src/ui/peek-column-selector.js → ...s/scatterplot/src/peek-column-selector.js b/client/src/ui/peek-column-selector.js → ...s/scatterplot/src/peek-column-selector.js
diff --git a/config/plugins/visualizations/scatterplot/src/scatterplot.js b/config/plugins/visualizations/scatterplot/src/scatterplot.js
@@ -1,14 +1,15 @@
 import "./jqglobals";
 // This is a really annoying hack to get bootstrap/jqui jquery bindings available correctly.
 /* global $ */
-import * as Backbone from "backbone";
-import * as d3 from "d3";
-import * as _ from "underscore";
-import "../../../../../client/src/ui/peek-column-selector";
-import "../../../../../client/src/ui/pagination";
+import "./peek-column-selector";
+import "./pagination";
 import "jquery-ui-bundle";
 import "bootstrap";
 
+import Backbone from "backbone";
+import * as d3 from "d3";
+import _ from "underscore";
+
 //TODO: Finish unlinking this from the Galaxy codebase (package it, use that way?)
 
 var Visualization = Backbone.Model.extend({