feat: upgrade to beta.3

package.json

@@ -1,7 +1,7 @@
 {
   "name": "chartjs-chart-graph",
   "description": "Chart.js module for charting error bars",
-  "version": "3.0.0-beta.1",
+  "version": "3.0.0-beta.2",
   "author": {
     "name": "Samuel Gratzl",
     "email": "[email protected]",
@@ -42,50 +42,48 @@
     "last 2 Firefox versions"
   ],
   "dependencies": {
-    "@types/d3-force": "^1.2.1",
-    "@types/d3-hierarchy": "^1.1.6",
+    "@types/d3-force": "^2.0.0",
+    "@types/d3-hierarchy": "^2.0.0",
     "d3-force": "^2.1.1",
     "d3-hierarchy": "^2.0.0"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^15.0.0",
+    "@rollup/plugin-commonjs": "^15.1.0",
     "@rollup/plugin-node-resolve": "^9.0.0",
     "@rollup/plugin-replace": "^2.3.3",
-    "@rollup/plugin-typescript": "^5.0.2",
-    "@types/jest": "^26.0.12",
-    "@types/jest-image-snapshot": "^3.1.0",
-    "@types/node": "^14.6.2",
+    "@rollup/plugin-typescript": "^6.0.0",
+    "@types/jest": "^26.0.14",
+    "@types/jest-image-snapshot": "^4.1.0",
+    "@types/node": "^14.11.2",
     "@types/seedrandom": "^2.4.28",
-    "@typescript-eslint/eslint-plugin": "^4.0.1",
-    "@typescript-eslint/parser": "^4.0.1",
+    "@typescript-eslint/eslint-plugin": "^4.3.0",
+    "@typescript-eslint/parser": "^4.3.0",
     "@yarnpkg/pnpify": "^2.2.1",
     "canvas": "^2.6.1",
-    "chart.js": "^3.0.0-beta",
-    "eslint": "^7.8.1",
-    "eslint-config-prettier": "^6.11.0",
+    "chart.js": "^3.0.0-beta.3",
+    "eslint": "^7.10.0",
+    "eslint-config-prettier": "^6.12.0",
     "eslint-config-react-app": "^5.2.1",
     "eslint-plugin-flowtype": "^5.2.0",
-    "eslint-plugin-import": "^2.22.0",
+    "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-jsx-a11y": "^6.3.1",
     "eslint-plugin-prettier": "^3.1.4",
-    "eslint-plugin-react": "^7.20.6",
-    "eslint-plugin-react-hooks": "^4.1.0",
+    "eslint-plugin-react": "^7.21.2",
+    "eslint-plugin-react-hooks": "^4.1.2",
     "jest": "^26.4.2",
     "jest-image-snapshot": "^4.2.0",
-    "prettier": "^2.1.1",
-    "release-it": "^13.7.0",
+    "prettier": "^2.1.2",
+    "release-it": "^14.0.3",
     "rimraf": "^3.0.2",
-    "rollup": "^2.26.9",
-    "rollup-plugin-cleanup": "^3.1.1",
-    "rollup-plugin-dts": "^1.4.12",
-    "rollup-plugin-terser": "^7.0.1",
+    "rollup": "^2.28.2",
+    "rollup-plugin-cleanup": "^3.2.1",
+    "rollup-plugin-dts": "^1.4.13",
+    "rollup-plugin-terser": "^7.0.2",
     "seedrandom": "^3.0.5",
-    "ts-jest": "^26.3.0",
+    "ts-jest": "^26.4.1",
     "tslib": "^2.0.1",
-    "typedoc": "^0.19.0",
-    "typescript": "^4.0.2",
-    "us-atlas": "^3.0.0",
-    "world-atlas": "^2.0.2"
+    "typedoc": "^0.19.2",
+    "typescript": "^4.0.3"
   },
   "scripts": {
     "clean": "rimraf build node_modules \"*.tgz\"",

rollup.config.js

@@ -35,6 +35,7 @@ export default (options) => {
     banner,
     globals: {
       'chart.js': 'Chart',
+      'chart.js/helpers': 'Chart.helpers'
     },
   };
 
@@ -73,14 +74,6 @@ export default (options) => {
         file: pkg.main,
         format: 'cjs',
       },
-      plugins: [
-        replace({
-          'chartjs-helpers/core': 'chartjs-helpers/core/index.js',
-          'chartjs-helpers/canvas': 'chartjs-helpers/canvas/index.js',
-          'chartjs-helpers/collection': 'chartjs-helpers/collection/index.js',
-        }),
-        ...base.plugins,
-      ],
     },
     (buildFormat('umd') || buildFormat('umd-min')) && {
       ...base,
@@ -101,14 +94,6 @@ export default (options) => {
         },
       ].filter(Boolean),
       external: (v) => isPeerDependency(v),
-      plugins: [
-        replace({
-          'chartjs-helpers/core': 'chartjs-helpers/core/index.js',
-          'chartjs-helpers/canvas': 'chartjs-helpers/canvas/index.js',
-          'chartjs-helpers/collection': 'chartjs-helpers/collection/index.js',
-        }),
-        ...base.plugins,
-      ],
     },
     buildFormat('types') && {
       ...base,

samples/default_esm.html

@@ -11,8 +11,9 @@
     <script type="importmap-shim">
       {
         "imports": {
-          "chart.js": "https://unpkg.com/[email protected]?module",
-          "chartjs-chart-graph": "../build/Chart.Graphs.esm.js",
+          "chart.js": "https://unpkg.com/[email protected]?module",
+          "chart.js/helpers": "https://unpkg.com/[email protected]/helpers/helpers.esm.js?module",
+          "chartjs-chart-graph": "../build/index.esm.js",
           "d3-force": "https://unpkg.com/d3-force?module",
           "d3-hierarchy": "https://unpkg.com/d3-hierarchy?module"
         }

samples/directed.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="https://unpkg.com/[email protected]/dist/chart.js"></script>
+    <script src="https://unpkg.com/[email protected].3/dist/chart.js"></script>
     <script src="../build/index.umd.js"></script>
   </head>
 

samples/forceDirectedGraph.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="https://unpkg.com/[email protected]/dist/chart.js"></script>
+    <script src="https://unpkg.com/[email protected].3/dist/chart.js"></script>
     <script src="../build/index.umd.js"></script>
   </head>
 

samples/graphChange.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="https://unpkg.com/[email protected]/dist/chart.js"></script>
+    <script src="https://unpkg.com/[email protected].3/dist/chart.js"></script>
     <script src="../build/index.umd.js"></script>
   </head>
 

samples/radial.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="https://unpkg.com/[email protected]/dist/chart.js"></script>
+    <script src="https://unpkg.com/[email protected].3/dist/chart.js"></script>
     <script src="../build/index.umd.js"></script>
   </head>
 

samples/radiallabel.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="https://unpkg.com/[email protected]/dist/chart.js"></script>
+    <script src="https://unpkg.com/[email protected].3/dist/chart.js"></script>
     <!-- <script src="https://unpkg.com/chartjs-plugin-datalabels"></script> -->
     <script src="../build/index.umd.js"></script>
   </head>

samples/tree.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="https://unpkg.com/[email protected]/dist/chart.js"></script>
+    <script src="https://unpkg.com/[email protected].3/dist/chart.js"></script>
     <script src="../build/index.umd.js"></script>
   </head>
 

samples/treelabel.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="https://unpkg.com/[email protected]/dist/chart.js"></script>
+    <script src="https://unpkg.com/[email protected].3/dist/chart.js"></script>
     <!-- <script src="https://unpkg.com/chartjs-plugin-datalabels"></script>
     <script src="https://unpkg.com/chartjs-plugin-dragdata"></script> -->
     <script src="../build/index.umd.js"></script>

src/__tests__/createChart.ts

@@ -1,7 +1,7 @@
 /// <reference types="jest" />
 /// <reference types="node" />
 
-import { Chart, IChartConfiguration, defaults } from 'chart.js';
+import { Chart, IChartConfiguration, defaults, IChartType, DefaultDataPoint } from 'chart.js';
 import { toMatchImageSnapshot, MatchImageSnapshotOptions } from 'jest-image-snapshot';
 
 expect.extend({ toMatchImageSnapshot });
@@ -22,10 +22,10 @@ export async function expectMatchSnapshot(canvas: HTMLCanvasElement) {
 }
 
 export default function createChart<
-  T = number,
-  L = string,
-  C extends IChartConfiguration<string, T, L> = IChartConfiguration<string, T, L>
->(config: C, width = 800, height = 600) {
+  TYPE extends IChartType,
+  DATA extends unknown[] = DefaultDataPoint<TYPE>,
+  LABEL = string
+>(config: IChartConfiguration<TYPE, DATA, LABEL>, width = 800, height = 600) {
   const canvas = document.createElement('canvas');
   canvas.width = width;
   canvas.height = height;
@@ -43,10 +43,10 @@ export default function createChart<
       },
     },
     config.options || {}
-  );
+  ) as any;
   const ctx = canvas.getContext('2d')!;
 
-  const t = new Chart<T, L, C>(ctx, config);
+  const t = new Chart<TYPE, DATA, LABEL>(ctx, config);
 
   return {
     chart: t,

src/controllers/forceDirected.spec.ts

@@ -1,5 +1,5 @@
 import createChart from '../__tests__/createChart';
-import { ForceDirectedGraphController, IForceDirectedGraphChartControllerConfiguration } from './forceDirected';
+import { ForceDirectedGraphController } from './forceDirected';
 import data from './__tests__/miserables';
 import { registry, Point, LinearScale } from 'chart.js';
 import { EdgeLine } from '../elements';
@@ -11,15 +11,7 @@ describe('dendogram', () => {
     registry.addScales(LinearScale);
   });
   test('default', () => {
-    return createChart<
-      { id: string; group: number },
-      string,
-      IForceDirectedGraphChartControllerConfiguration<
-        { id: string; group: number },
-        { source: string; target: string; value: number },
-        string
-      >
-    >({
+    return createChart({
       type: ForceDirectedGraphController.id,
       data: {
         labels: data.nodes.map((d) => d.id),
@@ -32,7 +24,7 @@ describe('dendogram', () => {
             pointBackgroundColor: 'steelblue',
             pointRadius: 5,
             data: data.nodes,
-            edges: data.links,
+            edges: data.links as any,
           },
         ],
       },