Merge pull request #40 from sgratzl/release/v3.9.0

Release v3.9.0

.yarnrc.yml

@@ -3,4 +3,4 @@ packageExtensions:
     dependencies:
       eslint-import-resolver-node: "*"
 
-yarnPath: .yarn/releases/yarn-3.2.1.cjs
+yarnPath: .yarn/releases/yarn-3.2.2.cjs

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Samuel Gratzl
+Copyright (c) 2019-2022 Samuel Gratzl
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package.json

@@ -1,7 +1,7 @@
 {
   "name": "chartjs-chart-graph",
   "description": "Chart.js module for charting error bars",
-  "version": "3.8.1",
+  "version": "3.9.0",
   "author": {
     "name": "Samuel Gratzl",
     "email": "sam@sgratzl.com",
@@ -24,8 +24,8 @@
   },
   "global": "ChartGraphs",
   "module": "build/index.js",
-  "main": "build/index.cjs.js",
-  "browser": "build/index.umd.js",
+  "main": "build/index.cjs",
+  "node": "build/index.cjs",
   "unpkg": "build/index.umd.min.js",
   "jsdelivr": "build/index.umd.min.js",
   "types": "build/index.d.ts",
@@ -35,7 +35,7 @@
     "src/**/*.ts"
   ],
   "peerDependencies": {
-    "chart.js": "^3.8.0"
+    "chart.js": "^3.9.1"
   },
   "browserslist": [
     "Firefox ESR",
@@ -50,42 +50,42 @@
   },
   "devDependencies": {
     "@chiogen/rollup-plugin-terser": "^7.0.2",
-    "@rollup/plugin-commonjs": "^22.0.1",
+    "@rollup/plugin-commonjs": "^22.0.2",
     "@rollup/plugin-node-resolve": "^13.3.0",
     "@rollup/plugin-replace": "^4.0.0",
-    "@rollup/plugin-typescript": "^8.3.3",
-    "@types/jest": "^28.1.4",
+    "@rollup/plugin-typescript": "^8.3.4",
+    "@types/jest": "^28.1.6",
     "@types/jest-image-snapshot": "^5.1.0",
-    "@types/node": "^18.0.3",
+    "@types/node": "^18.7.3",
     "@types/seedrandom": "^3.0.2",
-    "@typescript-eslint/eslint-plugin": "^5.30.5",
-    "@typescript-eslint/parser": "^5.30.5",
+    "@typescript-eslint/eslint-plugin": "^5.33.0",
+    "@typescript-eslint/parser": "^5.33.0",
     "@yarnpkg/sdks": "^2.6.2",
     "canvas": "^2.9.3",
     "canvas-5-polyfill": "^0.1.5",
-    "chart.js": "^3.8.0",
-    "eslint": "^8.19.0",
+    "chart.js": "^3.9.1",
+    "eslint": "^8.22.0",
     "eslint-config-airbnb-typescript": "^17.0.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-config-react-app": "^7.0.1",
     "eslint-plugin-flowtype": "^8.0.3",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jsx-a11y": "^6.6.0",
+    "eslint-plugin-jsx-a11y": "^6.6.1",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-react": "^7.30.1",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "jest": "^28.1.2",
-    "jest-environment-jsdom": "^28.1.2",
+    "jest": "^28.1.3",
+    "jest-environment-jsdom": "^28.1.3",
     "jest-image-snapshot": "^5.1.0",
     "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
-    "rollup": "~2.75.7",
+    "rollup": "~2.78.0",
     "rollup-plugin-cleanup": "^3.2.1",
     "rollup-plugin-dts": "^4.2.2",
     "seedrandom": "^3.0.5",
-    "ts-jest": "^28.0.5",
+    "ts-jest": "^28.0.7",
     "tslib": "^2.4.0",
-    "typedoc": "^0.23.5",
+    "typedoc": "^0.23.10",
     "typescript": "^4.7.4"
   },
   "scripts": {
@@ -108,5 +108,5 @@
     "docs": "typedoc src/index.ts",
     "prepare": "yarn run build"
   },
-  "packageManager": "yarn@3.2.1"
+  "packageManager": "yarn@3.2.2"
 }

rollup.config.js

@@ -34,11 +34,10 @@ const banner = `/**
  */
 const watchOnly = ['umd'];
 
-const isDependency = (v) => Object.keys(pkg.dependencies || {}).some((e) => e === v || v.startsWith(`${e}/`));
-const isPeerDependency = (v) => Object.keys(pkg.peerDependencies || {}).some((e) => e === v || v.startsWith(`${e}/`));
+const isDependency = (v) => Object.keys(pkg.dependencies || {}).some((e) => e === v || v.startsWith(e + '/'));
+const isPeerDependency = (v) => Object.keys(pkg.peerDependencies || {}).some((e) => e === v || v.startsWith(e + '/'));
 
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-export default function Config(options) {
+export default (options) => {
   const buildFormat = (format) => {
     return !options.watch || watchOnly.includes(format);
   };
@@ -56,7 +55,11 @@ export default function Config(options) {
     external: (v) => isDependency(v) || isPeerDependency(v),
     plugins: [
       typescript(),
-      resolve(),
+      resolve({
+        mainFields: ['module', 'main'],
+        extensions: ['.mjs', '.cjs', '.js', '.jsx', '.json', '.node'],
+        modulesOnly: true,
+      }),
       commonjs(),
       replace({
         preventAssignment: true,
@@ -124,4 +127,4 @@ export default function Config(options) {
       ],
     },
   ].filter(Boolean);
-}
+};

samples/default_esm.html

@@ -11,8 +11,8 @@
     <script type="importmap-shim">
       {
         "imports": {
-          "chart.js": "https://unpkg.com/chart.js@3.8.0?module",
-          "chart.js/helpers": "https://unpkg.com/chart.js@3.8.0/helpers/helpers.esm.js?module",
+          "chart.js": "https://unpkg.com/chart.js@3.9.1?module",
+          "chart.js/helpers": "https://unpkg.com/chart.js@3.9.1/helpers/helpers.esm.js?module",
           "chartjs-chart-graph": "../build/index.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/chart.js@3.8.0/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.9.1/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/chart.js@3.8.0/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.9.1/dist/chart.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/hammerjs@2.0.8"></script>
     <script src="https://unpkg.com/chartjs-plugin-zoom/dist/chartjs-plugin-zoom"></script>
     <script src="../build/index.umd.js"></script>

samples/graphChange.html

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

samples/multi.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="https://unpkg.com/chart.js@3.8.0/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.9.1/dist/chart.js"></script>
     <script src="../build/index.umd.js"></script>
     <style>
       body {

samples/radial.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="https://unpkg.com/chart.js@3.8.0/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.9.1/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/chart.js@3.8.0/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.9.1/dist/chart.js"></script>
     <script src="https://unpkg.com/chartjs-plugin-datalabels@next"></script>
     <!-- <script src="https://unpkg.com/chartjs-plugin-datalabels"></script> -->
     <script src="../build/index.umd.js"></script>

samples/tree.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="https://unpkg.com/chart.js@3.8.0/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.9.1/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/chart.js@3.8.0/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.9.1/dist/chart.js"></script>
     <script src="https://unpkg.com/chartjs-plugin-datalabels@next"></script>
     <script src="https://cdn.jsdelivr.net/npm/hammerjs@2.0.8"></script>
     <script src="https://unpkg.com/chartjs-plugin-zoom/dist/chartjs-plugin-zoom"></script>