From 9d14ea0dd194202915db58f97b7e1bc026a12bd2 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Tue, 31 Jan 2023 10:20:29 -0500 Subject: [PATCH] Allow secondary version of d3 for compatibility during transition of src/viz --- client/package.json | 1 + client/src/viz/circster.js | 4 ++-- client/src/viz/phyloviz.js | 2 +- client/src/viz/sweepster.js | 2 +- client/src/viz/tools.js | 2 +- client/yarn.lock | 5 +++++ 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/client/package.json b/client/package.json index ca7c9ee3630..292a099434a 100644 --- a/client/package.json +++ b/client/package.json @@ -51,6 +51,7 @@ "csv-parse": "^5.3.0", "d3": "^7.8.0", "d3-zoom": "^3.0.0", + "d3v3": "npm:d3@3", "date-fns": "^2.28.0", "date-fns-tz": "^1.3.3", "decode-uri-component": "^0.2.1", diff --git a/client/src/viz/circster.js b/client/src/viz/circster.js index adea9a7586d..a14c2535b06 100644 --- a/client/src/viz/circster.js +++ b/client/src/viz/circster.js @@ -4,8 +4,8 @@ import Backbone from "backbone"; import { getAppRoot } from "onload/loadConfig"; import { getGalaxyInstance } from "app"; import _l from "utils/localization"; -import * as d3 from "d3"; -import { event as currentEvent } from "d3"; +import * as d3 from "d3v3"; +import { event as currentEvent } from "d3v3"; import visualization from "viz/visualization"; import mod_utils from "utils/utils"; import config from "utils/config"; diff --git a/client/src/viz/phyloviz.js b/client/src/viz/phyloviz.js index b71098e3389..616f1692fbe 100644 --- a/client/src/viz/phyloviz.js +++ b/client/src/viz/phyloviz.js @@ -1,7 +1,7 @@ import $ from "jquery"; import Backbone from "backbone"; import _l from "utils/localization"; -import * as d3 from "d3"; +import * as d3 from "d3v3"; import visualization_mod from "viz/visualization"; import { Dataset } from "mvc/dataset/data"; import mod_icon_btn from "mvc/ui/icon-button"; diff --git a/client/src/viz/sweepster.js b/client/src/viz/sweepster.js index 8578d481247..f5a65b3f9ab 100644 --- a/client/src/viz/sweepster.js +++ b/client/src/viz/sweepster.js @@ -8,7 +8,7 @@ import $ from "jquery"; import Backbone from "backbone"; import { getAppRoot } from "onload/loadConfig"; import _l from "utils/localization"; -import * as d3 from "d3"; +import * as d3 from "d3v3"; import visualization from "viz/visualization"; import tracks from "viz/trackster/tracks"; import tools from "viz/tools"; diff --git a/client/src/viz/tools.js b/client/src/viz/tools.js index 5fb54fe1fa4..2255442ec26 100644 --- a/client/src/viz/tools.js +++ b/client/src/viz/tools.js @@ -3,7 +3,7 @@ */ import _ from "underscore"; import $ from "jquery"; -import * as d3 from "d3"; +import * as d3 from "d3v3"; import Backbone from "backbone"; import { getAppRoot } from "onload/loadConfig"; import util from "viz/trackster/util"; diff --git a/client/yarn.lock b/client/yarn.lock index effa8a67e86..8b6b8b242b0 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -4515,6 +4515,11 @@ d3@^7.8.0: d3-transition "3" d3-zoom "3" +"d3v3@npm:d3@3": + version "3.5.17" + resolved "https://registry.yarnpkg.com/d3/-/d3-3.5.17.tgz#bc46748004378b21a360c9fc7cf5231790762fb8" + integrity sha512-yFk/2idb8OHPKkbAL8QaOaqENNoMhIaSHZerk3oQsECwkObkCpJyjYwCe+OHiq6UEdhe1m8ZGARRRO3ljFjlKg== + d@1, d@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/d/-/d-1.0.1.tgz"