From 3bdd41d3a67a512ce4beebb0c0356d149e5467fa Mon Sep 17 00:00:00 2001
From: Jaco <jacogr@gmail.com>
Date: Sun, 12 Mar 2023 16:00:27 +0200
Subject: [PATCH] Bump chartjs (#9042)

* Bump chartjs

* Adjust chart.js imports

* Bump react-chartjs-2

* Adjust
---
 packages/page-referenda/package.json         |  2 +-
 packages/react-components/package.json       |  4 +--
 packages/react-components/src/Chart/index.ts |  4 +--
 scripts/fixupModules.cjs                     |  4 ++-
 yarn.lock                                    | 33 +++++++++++++-------
 5 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/packages/page-referenda/package.json b/packages/page-referenda/package.json
index ec90326e13..5198b745a6 100644
--- a/packages/page-referenda/package.json
+++ b/packages/page-referenda/package.json
@@ -13,6 +13,6 @@
   "type": "module",
   "version": "0.124.2-138-x",
   "devDependencies": {
-    "chart.js": "^3.9.1"
+    "chart.js": "^4.2.1"
   }
 }
diff --git a/packages/react-components/package.json b/packages/react-components/package.json
index 1026a6003c..8fc67a58c4 100644
--- a/packages/react-components/package.json
+++ b/packages/react-components/package.json
@@ -26,7 +26,7 @@
     "@polkadot/util": "^11.0.2",
     "@polkadot/util-crypto": "^11.0.2",
     "@types/chartjs-plugin-crosshair": "^1.1.1",
-    "chart.js": "^3.9.1",
+    "chart.js": "^4.2.1",
     "chartjs-plugin-annotation": "^2.1.2",
     "chartjs-plugin-crosshair": "^1.2.0",
     "codeflask": "^1.4.1",
@@ -35,7 +35,7 @@
     "owasp-password-strength-test": "^1.3.0",
     "react": "^18.2.0",
     "react-beautiful-dnd": "^13.1.1",
-    "react-chartjs-2": "^4.3.1",
+    "react-chartjs-2": "^5.2.0",
     "react-copy-to-clipboard": "^5.1.0",
     "react-dom": "^18.2.0",
     "react-dropzone": "^11.7.1",
diff --git a/packages/react-components/src/Chart/index.ts b/packages/react-components/src/Chart/index.ts
index 37d9790c01..d459cf9576 100644
--- a/packages/react-components/src/Chart/index.ts
+++ b/packages/react-components/src/Chart/index.ts
@@ -1,7 +1,7 @@
 // Copyright 2017-2023 @polkadot/react-components authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import * as chartJs from 'chart.js';
+import { CategoryScale, Chart, LinearScale, LineElement, PointElement, Title, Tooltip } from 'chart.js';
 import annotationPlugin from 'chartjs-plugin-annotation';
 import crosshairPlugin from 'chartjs-plugin-crosshair';
 
@@ -9,7 +9,7 @@ import Doughnut from './Doughnut.js';
 import HorizBar from './HorizBar.js';
 import Line from './Line.js';
 
-chartJs.Chart.register(chartJs.CategoryScale, chartJs.LinearScale, chartJs.LineElement, chartJs.PointElement, chartJs.Title, chartJs.Tooltip, annotationPlugin, crosshairPlugin);
+Chart.register(CategoryScale, LinearScale, LineElement, PointElement, Title, Tooltip, annotationPlugin, crosshairPlugin);
 
 export default {
   Doughnut,
diff --git a/scripts/fixupModules.cjs b/scripts/fixupModules.cjs
index 4380402caa..267db7859b 100644
--- a/scripts/fixupModules.cjs
+++ b/scripts/fixupModules.cjs
@@ -7,7 +7,9 @@ const process = require('process');
 
 // incorrect packages without type specifier
 const PKG_FIX = [
-  '@frequency-chain/api-augment'
+  '@frequency-chain/api-augment',
+  // we use the ESM path here
+  'chartjs-plugin-annotation'
 ];
 
 PKG_FIX.forEach((f) => {
diff --git a/yarn.lock b/yarn.lock
index b51db9082b..f02e7bcef4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -811,6 +811,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@kurkle/color@npm:^0.3.0":
+  version: 0.3.2
+  resolution: "@kurkle/color@npm:0.3.2"
+  checksum: 79e97b31f8f6efb28c69d373f94b0c7480226fe8ec95221f518ac998e156444a496727ce47de6d728eb5c3369288e794cba82cae34253deb0d472d3bfe080e49
+  languageName: node
+  linkType: hard
+
 "@laminar/type-definitions@npm:0.3.1":
   version: 0.3.1
   resolution: "@laminar/type-definitions@npm:0.3.1"
@@ -1540,7 +1547,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@polkadot/app-referenda@workspace:packages/page-referenda"
   dependencies:
-    chart.js: ^3.9.1
+    chart.js: ^4.2.1
   languageName: unknown
   linkType: soft
 
@@ -1981,7 +1988,7 @@ __metadata:
     "@types/chartjs-plugin-crosshair": ^1.1.1
     "@types/codeflask": ^1.4.3
     "@types/owasp-password-strength-test": ^1.3.0
-    chart.js: ^3.9.1
+    chart.js: ^4.2.1
     chartjs-plugin-annotation: ^2.1.2
     chartjs-plugin-crosshair: ^1.2.0
     codeflask: ^1.4.1
@@ -1990,7 +1997,7 @@ __metadata:
     owasp-password-strength-test: ^1.3.0
     react: ^18.2.0
     react-beautiful-dnd: ^13.1.1
-    react-chartjs-2: ^4.3.1
+    react-chartjs-2: ^5.2.0
     react-copy-to-clipboard: ^5.1.0
     react-dom: ^18.2.0
     react-dropzone: ^11.7.1
@@ -5577,10 +5584,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chart.js@npm:^3.9.1":
-  version: 3.9.1
-  resolution: "chart.js@npm:3.9.1"
-  checksum: 9ab0c0ac01215af0b3f020f2e313030fd6e347b48ed17d5484ee9c4e8ead45e78ae71bea16c397621c386b409ce0b14bf17f9f6c2492cd15b56c0f433efdfff6
+"chart.js@npm:^4.2.1":
+  version: 4.2.1
+  resolution: "chart.js@npm:4.2.1"
+  dependencies:
+    "@kurkle/color": ^0.3.0
+  checksum: 7319fdfd1e29812e87bbc07737e8c9072ff659bbc09ade8dd262f83424cd7e48f89afe5220e11e002c9f236883fae3f3adb8adc16acb4682b0ddcc0b661c3af9
   languageName: node
   linkType: hard
 
@@ -14333,13 +14342,13 @@ fsevents@~2.3.2:
   languageName: node
   linkType: hard
 
-"react-chartjs-2@npm:^4.3.1":
-  version: 4.3.1
-  resolution: "react-chartjs-2@npm:4.3.1"
+"react-chartjs-2@npm:^5.2.0":
+  version: 5.2.0
+  resolution: "react-chartjs-2@npm:5.2.0"
   peerDependencies:
-    chart.js: ^3.5.0
+    chart.js: ^4.1.1
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 574d12cc43b9b4a0f1e04cc692982e16ef7083c03da2a8a9fc2180fe9bcadc793008f81d8f4eec5465925eff84c95d7c523cb74376858b363ae75a83bb3c2a5d
+  checksum: ace702185be1450e5888a8bcd8b5fc1995067e3b11d236764a67f5567a3d7c32ff16923b8d48d3d39bda6e45135da6c044c9b43fbe8e1978f95aca9d2c0ce348
   languageName: node
   linkType: hard