Merge branch 'pravi/gitlab-update-d3' into 'master'

Update d3 node module 4.13 -> 5.12 Closes #33944 See merge request gitlab-org/gitlab!20627

Merge branch 'pravi/gitlab-update-d3' into 'master'
Update d3 node module 4.13 -> 5.12 Closes #33944 See merge request gitlab-org/gitlab!20627
a1749c7a · Clement Ho · 722c4463 · 49dd4a57 · a1749c7a · a1749c7a
Commit a1749c7a authored Jan 13, 2020 by Clement Ho
4 changed files
--- a/app/assets/javascripts/vue_shared/components/bar_chart.vue
+++ b/app/assets/javascripts/vue_shared/components/bar_chart.vue
@@ -124,9 +124,7 @@ export default {
    },
  },
  mounted() {
-    if (!this.allValuesEmpty) {
-      this.draw();
-    }
+    this.draw();
  },
  methods: {
    draw() {
@@ -153,7 +151,14 @@ export default {
      this.yScale = d3.scaleLinear().rangeRound([this.vbHeight, 0]);

      this.xScale.domain(this.graphData.map(d => d.name));
-      this.yScale.domain([0, d3.max(this.graphData.map(d => d.value))]);
+      /*
+      If we have all-zero graph we want graph to center 0 on axis and not to draw
+      any kind of ticks on Y axis. Infinity allows us to do that.
+
+      See https://gitlab.com/gitlab-org/gitlab/merge_requests/20627#note_251484582
+      for detailed explanation
+      */
+      this.yScale.domain([0, d3.max(this.graphData.map(d => d.value)) || Infinity]);

      // Zoom/Panning Function
      this.zoom = d3

--- a/changelogs/unreleased/pravi-gitlab-update-d3.yml
+++ b/changelogs/unreleased/pravi-gitlab-update-d3.yml
+---
+title: Update d3 to 5.12
+merge_request: 20627
+author: Praveen Arimbrathodiyil
+type: other
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
    "core-js": "^3.2.1",
    "cropper": "^2.3.0",
    "css-loader": "^1.0.0",
-    "d3": "^4.13.0",
+    "d3": "^5.12.0",
    "d3-scale": "^1.0.7",
    "d3-selection": "^1.2.0",
    "dateformat": "^3.0.3",

--- a/yarn.lock
+++ b/yarn.lock
@@ -3237,17 +3237,17 @@ cyclist@~0.2.2:
  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
  integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=

-d3-array@1, d3-array@1.2.1, d3-array@^1.1.1, d3-array@^1.2.0:
+d3-array@1, d3-array@^1.1.1, d3-array@^1.2.0:
  version "1.2.1"
  resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.1.tgz#d1ca33de2f6ac31efadb8e050a021d7e2396d5dc"
  integrity sha512-CyINJQ0SOUHojDdFDH4JEM0552vCR1utGyLHegJHyYH0JyCpSeTPxi4OBqHMA2jJZq4NH782LtaJWBImqI/HBw==

-d3-axis@1, d3-axis@1.0.8:
+d3-axis@1:
  version "1.0.8"
  resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-1.0.8.tgz#31a705a0b535e65759de14173a31933137f18efa"
  integrity sha1-MacFoLU15ldZ3hQXOjGTMTfxjvo=

-d3-brush@1, d3-brush@1.0.4:
+d3-brush@1:
  version "1.0.4"
  resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.0.4.tgz#00c2f238019f24f6c0a194a26d41a1530ffe7bc4"
  integrity sha1-AMLyOAGfJPbAoZSibUGhUw/+e8Q=
@@ -3258,7 +3258,7 @@ d3-brush@1, d3-brush@1.0.4:
    d3-selection "1"
    d3-transition "1"

-d3-chord@1, d3-chord@1.0.4:
+d3-chord@1:
  version "1.0.4"
  resolved "https://registry.yarnpkg.com/d3-chord/-/d3-chord-1.0.4.tgz#7dec4f0ba886f713fe111c45f763414f6f74ca2c"
  integrity sha1-fexPC6iG9xP+ERxF92NBT290yiw=
@@ -3266,12 +3266,12 @@ d3-chord@1, d3-chord@1.0.4:
    d3-array "1"
    d3-path "1"

-d3-collection@1, d3-collection@1.0.4:
+d3-collection@1:
  version "1.0.4"
  resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.4.tgz#342dfd12837c90974f33f1cc0a785aea570dcdc2"
  integrity sha1-NC39EoN8kJdPM/HMCnha6lcNzcI=

-d3-color@1, d3-color@1.0.3:
+d3-color@1:
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.0.3.tgz#bc7643fca8e53a8347e2fbdaffa236796b58509b"
  integrity sha1-vHZD/KjlOoNH4vva/6I2eWtYUJs=
@@ -3283,12 +3283,12 @@ d3-contour@1:
  dependencies:
    d3-array "^1.1.1"

-d3-dispatch@1, d3-dispatch@1.0.3:
+d3-dispatch@1:
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-1.0.3.tgz#46e1491eaa9b58c358fce5be4e8bed626e7871f8"
  integrity sha1-RuFJHqqbWMNY/OW+TovtYm54cfg=

-d3-drag@1, d3-drag@1.2.1:
+d3-drag@1:
  version "1.2.1"
  resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-1.2.1.tgz#df8dd4c502fb490fc7462046a8ad98a5c479282d"
  integrity sha512-Cg8/K2rTtzxzrb0fmnYOUeZHvwa4PHzwXOLZZPwtEs2SKLLKLXeYwZKBB+DlOxUvFmarOnmt//cU4+3US2lyyQ==
@@ -3296,7 +3296,7 @@ d3-drag@1, d3-drag@1.2.1:
    d3-dispatch "1"
    d3-selection "1"

-d3-dsv@1, d3-dsv@1.0.8:
+d3-dsv@1:
  version "1.0.8"
  resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.0.8.tgz#907e240d57b386618dc56468bacfe76bf19764ae"
  integrity sha512-IVCJpQ+YGe3qu6odkPQI0KPqfxkhbP/oM1XhhE/DFiYmcXKfCRub4KXyiuehV1d4drjWVXHUWx4gHqhdZb6n/A==
@@ -3305,7 +3305,7 @@ d3-dsv@1, d3-dsv@1.0.8:
    iconv-lite "0.4"
    rw "1"

-d3-ease@1, d3-ease@1.0.3:
+d3-ease@1:
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.3.tgz#68bfbc349338a380c44d8acc4fbc3304aa2d8c0e"
  integrity sha1-aL+8NJM4o4DETYrMT7wzBKotjA4=
@@ -3317,7 +3317,7 @@ d3-fetch@1:
  dependencies:
    d3-dsv "1"

-d3-force@1, d3-force@1.1.0:
+d3-force@1:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/d3-force/-/d3-force-1.1.0.tgz#cebf3c694f1078fcc3d4daf8e567b2fbd70d4ea3"
  integrity sha512-2HVQz3/VCQs0QeRNZTYb7GxoUCeb6bOzMp/cGcLa87awY9ZsPvXOGeZm0iaGBjXic6I1ysKwMn+g+5jSAdzwcg==
@@ -3327,65 +3327,50 @@ d3-force@1, d3-force@1.1.0:
    d3-quadtree "1"
    d3-timer "1"

-d3-format@1, d3-format@1.2.2:
+d3-format@1:
  version "1.2.2"
  resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.2.2.tgz#1a39c479c8a57fe5051b2e67a3bee27061a74e7a"
  integrity sha512-zH9CfF/3C8zUI47nsiKfD0+AGDEuM8LwBIP7pBVpyR4l/sKkZqITmMtxRp04rwBrlshIZ17XeFAaovN3++wzkw==

-d3-geo@1, d3-geo@1.9.1:
+d3-geo@1:
  version "1.9.1"
  resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.9.1.tgz#157e3b0f917379d0f73bebfff3be537f49fa7356"
  integrity sha512-l9wL/cEQkyZQYXw3xbmLsH3eQ5ij+icNfo4r0GrLa5rOCZR/e/3am45IQ0FvQ5uMsv+77zBRunLc9ufTWSQYFA==
  dependencies:
    d3-array "1"

-d3-hierarchy@1, d3-hierarchy@1.1.5:
+d3-hierarchy@1:
  version "1.1.5"
  resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-1.1.5.tgz#a1c845c42f84a206bcf1c01c01098ea4ddaa7a26"
  integrity sha1-ochFxC+Eoga88cAcAQmOpN2qeiY=

-d3-interpolate@1, d3-interpolate@1.1.6:
+d3-interpolate@1:
  version "1.1.6"
  resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.1.6.tgz#2cf395ae2381804df08aa1bf766b7f97b5f68fb6"
  integrity sha512-mOnv5a+pZzkNIHtw/V6I+w9Lqm9L5bG3OTXPM5A+QO0yyVMQ4W1uZhR+VOJmazaOZXri2ppbiZ5BUNWT0pFM9A==
  dependencies:
    d3-color "1"

-d3-path@1, d3-path@1.0.5:
+d3-path@1:
  version "1.0.5"
  resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-1.0.5.tgz#241eb1849bd9e9e8021c0d0a799f8a0e8e441764"
  integrity sha1-JB6xhJvZ6egCHA0KeZ+KDo5EF2Q=

-d3-polygon@1, d3-polygon@1.0.3:
+d3-polygon@1:
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/d3-polygon/-/d3-polygon-1.0.3.tgz#16888e9026460933f2b179652ad378224d382c62"
  integrity sha1-FoiOkCZGCTPysXllKtN4Ik04LGI=

-d3-quadtree@1, d3-quadtree@1.0.3:
+d3-quadtree@1:
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-1.0.3.tgz#ac7987e3e23fe805a990f28e1b50d38fcb822438"
  integrity sha1-rHmH4+I/6AWpkPKOG1DTj8uCJDg=

-d3-queue@3.0.7:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/d3-queue/-/d3-queue-3.0.7.tgz#c93a2e54b417c0959129d7d73f6cf7d4292e7618"
-  integrity sha1-yTouVLQXwJWRKdfXP2z31Ckudhg=
-
-d3-random@1, d3-random@1.1.0:
+d3-random@1:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/d3-random/-/d3-random-1.1.0.tgz#6642e506c6fa3a648595d2b2469788a8d12529d3"
  integrity sha1-ZkLlBsb6OmSFldKyRpeIqNElKdM=

-d3-request@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/d3-request/-/d3-request-1.0.6.tgz#a1044a9ef4ec28c824171c9379fae6d79474b19f"
-  integrity sha512-FJj8ySY6GYuAJHZMaCQ83xEYE4KbkPkmxZ3Hu6zA1xxG2GD+z6P+Lyp+zjdsHf0xEbp2xcluDI50rCS855EQ6w==
-  dependencies:
-    d3-collection "1"
-    d3-dispatch "1"
-    d3-dsv "1"
-    xmlhttprequest "1"
-
 d3-scale-chromatic@1:
  version "1.3.3"
  resolved "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-1.3.3.tgz#dad4366f0edcb288f490128979c3c793583ed3c0"
@@ -3394,61 +3379,61 @@ d3-scale-chromatic@1:
    d3-color "1"
    d3-interpolate "1"

-d3-scale@1.0.7, d3-scale@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-1.0.7.tgz#fa90324b3ea8a776422bd0472afab0b252a0945d"
-  integrity sha512-KvU92czp2/qse5tUfGms6Kjig0AhHOwkzXG0+PqIJB3ke0WUv088AHMZI0OssO9NCkXt4RP8yju9rpH8aGB7Lw==
+d3-scale@2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-2.2.2.tgz#4e880e0b2745acaaddd3ede26a9e908a9e17b81f"
+  integrity sha512-LbeEvGgIb8UMcAa0EATLNX0lelKWGYDQiPdHj+gLblGVhGLyNbaCn3EvrJf0A3Y/uOOU5aD6MTh5ZFCdEwGiCw==
  dependencies:
    d3-array "^1.2.0"
    d3-collection "1"
-    d3-color "1"
    d3-format "1"
    d3-interpolate "1"
    d3-time "1"
    d3-time-format "2"

-d3-scale@2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-2.2.2.tgz#4e880e0b2745acaaddd3ede26a9e908a9e17b81f"
-  integrity sha512-LbeEvGgIb8UMcAa0EATLNX0lelKWGYDQiPdHj+gLblGVhGLyNbaCn3EvrJf0A3Y/uOOU5aD6MTh5ZFCdEwGiCw==
+d3-scale@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-1.0.7.tgz#fa90324b3ea8a776422bd0472afab0b252a0945d"
+  integrity sha512-KvU92czp2/qse5tUfGms6Kjig0AhHOwkzXG0+PqIJB3ke0WUv088AHMZI0OssO9NCkXt4RP8yju9rpH8aGB7Lw==
  dependencies:
    d3-array "^1.2.0"
    d3-collection "1"
+    d3-color "1"
    d3-format "1"
    d3-interpolate "1"
    d3-time "1"
    d3-time-format "2"

-d3-selection@1, d3-selection@1.3.0, d3-selection@^1.1.0, d3-selection@^1.2.0:
+d3-selection@1, d3-selection@^1.1.0, d3-selection@^1.2.0:
  version "1.3.0"
  resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.3.0.tgz#d53772382d3dc4f7507bfb28bcd2d6aed2a0ad6d"
  integrity sha512-qgpUOg9tl5CirdqESUAu0t9MU/t3O9klYfGfyKsXEmhyxyzLpzpeh08gaxBUTQw1uXIOkr/30Ut2YRjSSxlmHA==

-d3-shape@1, d3-shape@1.2.0:
+d3-shape@1:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.2.0.tgz#45d01538f064bafd05ea3d6d2cb748fd8c41f777"
  integrity sha1-RdAVOPBkuv0F6j1tLLdI/YxB93c=
  dependencies:
    d3-path "1"

-d3-time-format@2, d3-time-format@2.1.1:
+d3-time-format@2:
  version "2.1.1"
  resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.1.1.tgz#85b7cdfbc9ffca187f14d3c456ffda268081bb31"
  integrity sha512-8kAkymq2WMfzW7e+s/IUNAtN/y3gZXGRrdGfo6R8NKPAA85UBTxZg5E61bR6nLwjPjj4d3zywSQe1CkYLPFyrw==
  dependencies:
    d3-time "1"

-d3-time@1, d3-time@1.0.8:
+d3-time@1:
  version "1.0.8"
  resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.0.8.tgz#dbd2d6007bf416fe67a76d17947b784bffea1e84"
  integrity sha512-YRZkNhphZh3KcnBfitvF3c6E0JOFGikHZ4YqD+Lzv83ZHn1/u6yGenRU1m+KAk9J1GnZMnKcrtfvSktlA1DXNQ==

-d3-timer@1, d3-timer@1.0.7:
+d3-timer@1:
  version "1.0.7"
  resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.7.tgz#df9650ca587f6c96607ff4e60cc38229e8dd8531"
  integrity sha512-vMZXR88XujmG/L5oB96NNKH5lCWwiLM/S2HyyAQLcjWJCloK5shxta4CwOFYLZoY3AWX73v8Lgv4cCAdWtRmOA==

-d3-transition@1, d3-transition@1.1.1:
+d3-transition@1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.1.1.tgz#d8ef89c3b848735b060e54a39b32aaebaa421039"
  integrity sha512-xeg8oggyQ+y5eb4J13iDgKIjUcEfIOZs2BqV/eEmXm2twx80wTzJ4tB4vaZ5BKfz7XsI/DFmQL5me6O27/5ykQ==
@@ -3460,12 +3445,12 @@ d3-transition@1, d3-transition@1.1.1:
    d3-selection "^1.1.0"
    d3-timer "1"

-d3-voronoi@1, d3-voronoi@1.1.2:
+d3-voronoi@1:
  version "1.1.2"
  resolved "https://registry.yarnpkg.com/d3-voronoi/-/d3-voronoi-1.1.2.tgz#1687667e8f13a2d158c80c1480c5a29cb0d8973c"
  integrity sha1-Fodmfo8TotFYyAwUgMWinLDYlzw=

-d3-zoom@1, d3-zoom@1.7.1:
+d3-zoom@1:
  version "1.7.1"
  resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-1.7.1.tgz#02f43b3c3e2db54f364582d7e4a236ccc5506b63"
  integrity sha512-sZHQ55DGq5BZBFGnRshUT8tm2sfhPHFnOlmPbbwTkAoPeVdRTkB4Xsf9GCY0TSHrTD8PeJPZGmP/TpGicwJDJQ==
@@ -3476,43 +3461,44 @@ d3-zoom@1, d3-zoom@1.7.1:
    d3-selection "1"
    d3-transition "1"

-d3@^4.13.0:
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/d3/-/d3-4.13.0.tgz#ab236ff8cf0cfc27a81e69bf2fb7518bc9b4f33d"
-  integrity sha512-l8c4+0SldjVKLaE2WG++EQlqD7mh/dmQjvi2L2lKPadAVC+TbJC4ci7Uk9bRi+To0+ansgsS0iWfPjD7DBy+FQ==
-  dependencies:
-    d3-array "1.2.1"
-    d3-axis "1.0.8"
-    d3-brush "1.0.4"
-    d3-chord "1.0.4"
-    d3-collection "1.0.4"
-    d3-color "1.0.3"
-    d3-dispatch "1.0.3"
-    d3-drag "1.2.1"
-    d3-dsv "1.0.8"
-    d3-ease "1.0.3"
-    d3-force "1.1.0"
-    d3-format "1.2.2"
-    d3-geo "1.9.1"
-    d3-hierarchy "1.1.5"
-    d3-interpolate "1.1.6"
-    d3-path "1.0.5"
-    d3-polygon "1.0.3"
-    d3-quadtree "1.0.3"
-    d3-queue "3.0.7"
-    d3-random "1.1.0"
-    d3-request "1.0.6"
-    d3-scale "1.0.7"
-    d3-selection "1.3.0"
-    d3-shape "1.2.0"
-    d3-time "1.0.8"
-    d3-time-format "2.1.1"
-    d3-timer "1.0.7"
-    d3-transition "1.1.1"
-    d3-voronoi "1.1.2"
-    d3-zoom "1.7.1"
-
-d3@^5.14, d3@^5.7.0:
+d3@^5.12.0, d3@^5.7.0:
+  version "5.12.0"
+  resolved "https://registry.yarnpkg.com/d3/-/d3-5.12.0.tgz#0ddeac879c28c882317cd439b495290acd59ab61"
+  integrity sha512-flYVMoVuhPFHd9zVCe2BxIszUWqBcd5fvQGMNRmSiBrgdnh6Vlruh60RJQTouAK9xPbOB0plxMvBm4MoyODXNg==
+  dependencies:
+    d3-array "1"
+    d3-axis "1"
+    d3-brush "1"
+    d3-chord "1"
+    d3-collection "1"
+    d3-color "1"
+    d3-contour "1"
+    d3-dispatch "1"
+    d3-drag "1"
+    d3-dsv "1"
+    d3-ease "1"
+    d3-fetch "1"
+    d3-force "1"
+    d3-format "1"
+    d3-geo "1"
+    d3-hierarchy "1"
+    d3-interpolate "1"
+    d3-path "1"
+    d3-polygon "1"
+    d3-quadtree "1"
+    d3-random "1"
+    d3-scale "2"
+    d3-scale-chromatic "1"
+    d3-selection "1"
+    d3-shape "1"
+    d3-time "1"
+    d3-time-format "2"
+    d3-timer "1"
+    d3-transition "1"
+    d3-voronoi "1"
+    d3-zoom "1"
+
+d3@^5.14:
  version "5.15.0"
  resolved "https://registry.yarnpkg.com/d3/-/d3-5.15.0.tgz#ffd44958e6a3cb8a59a84429c45429b8bca5677a"
  integrity sha512-C+E80SL2nLLtmykZ6klwYj5rPqB5nlfN5LdWEAVdWPppqTD8taoJi2PxLZjPeYT8FFRR2yucXq+kBlOnnvZeLg==
@@ -12135,11 +12121,6 @@ xmlhttprequest-ssl@~1.5.4:
  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
  integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=

-xmlhttprequest@1:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc"
-  integrity sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=
-
 xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
  version "4.0.2"
  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"