Include version in Chart (#7129)

* Include version in Chart
* Remove commonjs

diff --git a/package-lock.json b/package-lock.json
index e7fe7efb2a32ffda4fee160e0d8d65e15aec496a..28bd0119759d874471f2357f7a17e0f51916cfe5 100644 (file)
--- a/package-lock.json
+++ b/package-lock.json
@@ -2282,6 +2282,32 @@
       "resolved": "https://registry.npmjs.org/@kurkle/color/-/color-0.1.3.tgz",
       "integrity": "sha512-AEYY1u0xlvb7gyT1Dfe4cg6Brfk7ymmyFJkx2KUIIf/u+lvOPhvUqSwNYMEtBCrEO6KW2Iqtdy174HNa9R51Sg=="
     },
+    "@rollup/plugin-json": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-4.0.2.tgz",
+      "integrity": "sha512-t4zJMc98BdH42mBuzjhQA7dKh0t4vMJlUka6Fz0c+iO5IVnWaEMiYBy1uBj9ruHZzXBW23IPDGL9oCzBkQ9Udg==",
+      "dev": true,
+      "requires": {
+        "@rollup/pluginutils": "^3.0.4"
+      }
+    },
+    "@rollup/pluginutils": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.0.8.tgz",
+      "integrity": "sha512-rYGeAc4sxcZ+kPG/Tw4/fwJODC3IXHYDH4qusdN/b6aLw5LPUbzpecYbEJh4sVQGPFJxd2dBU4kc1H3oy9/bnw==",
+      "dev": true,
+      "requires": {
+        "estree-walker": "^1.0.1"
+      },
+      "dependencies": {
+        "estree-walker": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
+          "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
+          "dev": true
+        }
+      }
+    },
     "@types/estree": {
       "version": "0.0.39",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",

diff --git a/package.json b/package.json
index 2aa292aedeef74266751baecdb4c4f52220038b3..3c1dc302433a2b592ff948a3b0f65029068a3adf 100644 (file)
--- a/package.json
+++ b/package.json
@@ -34,6 +34,7 @@
     "@babel/plugin-proposal-class-properties": "^7.8.3",
     "@babel/plugin-transform-object-assign": "^7.8.3",
     "@babel/preset-env": "^7.8.4",
+    "@rollup/plugin-json": "^4.0.2",
     "babel-plugin-istanbul": "^6.0.0",
     "babel-preset-es2015-rollup": "^3.0.0",
     "coveralls": "^3.0.9",

diff --git a/rollup.config.js b/rollup.config.js
index d5704321ce30cbcdb637011d0ab4ea54717b7ef5..0825eabafae241949a0b73fb37392d141161654a 100644 (file)
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -5,6 +5,7 @@ const resolve = require('rollup-plugin-node-resolve');
 const babel = require('rollup-plugin-babel');
 const cleanup = require('rollup-plugin-cleanup');
 const terser = require('rollup-plugin-terser').terser;
+const json = require('@rollup/plugin-json');
 const optional = require('./rollup.plugins').optional;
 const pkg = require('./package.json');
 
@@ -24,6 +25,7 @@ module.exports = [
        {
                input,
                plugins: [
+                       json(),
                        resolve(),
                        babel(),
                        optional({
@@ -50,6 +52,7 @@ module.exports = [
        {
                input,
                plugins: [
+                       json(),
                        resolve(),
                        babel(),
                        optional({
@@ -81,6 +84,7 @@ module.exports = [
        {
                input,
                plugins: [
+                       json(),
                        resolve(),
                        babel(),
                        cleanup({
@@ -104,6 +108,7 @@ module.exports = [
        {
                input,
                plugins: [
+                       json(),
                        resolve(),
                        babel(),
                        terser({

diff --git a/src/core/core.controller.js b/src/core/core.controller.js
index c3a29d5f22c1b863106cf2481331f01ff64a16d7..f777f8c9acef50272a07cb810e168cbbab47cfea 100644 (file)
--- a/src/core/core.controller.js
+++ b/src/core/core.controller.js
@@ -8,6 +8,8 @@ import {BasicPlatform, DomPlatform} from '../platform/platforms';
 import plugins from './core.plugins';
 import scaleService from '../core/core.scaleService';
 import {getMaximumWidth, getMaximumHeight} from '../helpers/helpers.dom';
+// @ts-ignore
+import {version} from '../../package.json';
 
 /**
  * @typedef { import("../platform/platform.base").IEvent } IEvent
@@ -172,6 +174,8 @@ function getCanvas(item) {
 }
 
 class Chart {
+       static version = version;
+
        constructor(item, config) {
                const me = this;