From d7eff01fa7865fa8495d588c86a58ccd04cb3d64 Mon Sep 17 00:00:00 2001
From: Colin <colin.diesh@gmail.com>
Date: Thu, 11 Apr 2024 15:39:57 -0400
Subject: [PATCH] Downgrade d3 to avoid pure esm jest issues

---
 plugins/hic/package.json                    |  4 ++--
 plugins/hic/src/HicRenderer/HicRenderer.tsx | 21 -------------------
 yarn.lock                                   | 23 +++++++--------------
 3 files changed, 10 insertions(+), 38 deletions(-)

diff --git a/plugins/hic/package.json b/plugins/hic/package.json
index 21c3033e6c..cc0c8d6902 100644
--- a/plugins/hic/package.json
+++ b/plugins/hic/package.json
@@ -36,8 +36,8 @@
     "clean": "rimraf dist esm *.tsbuildinfo"
   },
   "dependencies": {
-    "d3-interpolate": "^3.0.1",
-    "d3-scale-chromatic": "^3.0.0",
+    "d3-interpolate": "^2.0.1",
+    "d3-scale-chromatic": "^2.0.0",
     "hic-straw": "^2.0.3"
   },
   "peerDependencies": {
diff --git a/plugins/hic/src/HicRenderer/HicRenderer.tsx b/plugins/hic/src/HicRenderer/HicRenderer.tsx
index c237592294..a21975d97e 100644
--- a/plugins/hic/src/HicRenderer/HicRenderer.tsx
+++ b/plugins/hic/src/HicRenderer/HicRenderer.tsx
@@ -151,27 +151,6 @@ export default class HicRenderer extends ServerSideRendererType {
         }
       }
       ctx.restore()
-
-      // wip legend code
-      //const l2 = useLogScale
-      // ? scaleLog().domain([1, m])
-      // : scaleLinear().domain([0, m])
-      // const ticks = l2.ticks(100)
-      // const ticks2 = l2.ticks(4)
-      //       const w2 = 30
-      //       const h = ticks.length
-      //       const yoff = 200
-      //       const x = width - w2
-      //       for (let i = 0; i < ticks.length; i++) {
-      //         // @ts-expect-error
-      //         ctx.fillStyle = scale(ticks[i])
-      //         ctx.fillRect(x, i + yoff, w2, 1)
-      //       }
-      //       ctx.textAlign = 'right'
-      //       ctx.fillStyle = 'black'
-      //       for (const tick of ticks2) {
-      //         ctx.fillText(`${tick}`, x, l2.range([0, ticks.length])(tick) + yoff)
-      //       }
     }
   }
 
diff --git a/yarn.lock b/yarn.lock
index 5ac4bf3185..9e047e6e75 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7964,7 +7964,7 @@ d3-array@2, d3-array@^2.3.0:
   resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-2.0.0.tgz#8d625cab42ed9b8f601a1760a389f7ea9189d62e"
   integrity sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ==
 
-"d3-color@1 - 3", d3-color@^3.0.2:
+d3-color@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-3.1.0.tgz#395b2833dfac71507f12ac2f7af23bf819de24e2"
   integrity sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==
@@ -7974,27 +7974,20 @@ d3-array@2, d3-array@^2.3.0:
   resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-2.0.0.tgz#a10bcc0f986c372b729ba447382413aabf5b0767"
   integrity sha512-Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA==
 
-"d3-interpolate@1 - 3", d3-interpolate@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-3.0.1.tgz#3c47aa5b32c5b3dfb56ef3fd4342078a632b400d"
-  integrity sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==
-  dependencies:
-    d3-color "1 - 3"
-
-"d3-interpolate@1.2.0 - 2":
+"d3-interpolate@1 - 2", "d3-interpolate@1.2.0 - 2", d3-interpolate@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-2.0.1.tgz#98be499cfb8a3b94d4ff616900501a64abc91163"
   integrity sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==
   dependencies:
     d3-color "1 - 2"
 
-d3-scale-chromatic@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz#34c39da298b23c20e02f1a4b239bd0f22e7f1314"
-  integrity sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==
+d3-scale-chromatic@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-2.0.0.tgz#c13f3af86685ff91323dc2f0ebd2dabbd72d8bab"
+  integrity sha512-LLqy7dJSL8yDy7NRmf6xSlsFZ6zYvJ4BcWFE4zBrOPnQERv9zj24ohnXKRbyi9YHnYV+HN1oEO3iFK971/gkzA==
   dependencies:
-    d3-color "1 - 3"
-    d3-interpolate "1 - 3"
+    d3-color "1 - 2"
+    d3-interpolate "1 - 2"
 
 d3-scale@^3.0.2:
   version "3.3.0"