From 32ff5da25d061d7bd1a76488f6d50b7e7f901469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Berengu=C3=A9?= Date: Thu, 8 Jul 2021 23:14:06 +0200 Subject: [PATCH] Update chart.js. Resolves #86 --- src/Chartjs/Resources/assets/dist/controller.js | 8 +++++--- src/Chartjs/Resources/assets/package.json | 4 ++-- src/Chartjs/Resources/assets/src/controller.js | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Chartjs/Resources/assets/dist/controller.js b/src/Chartjs/Resources/assets/dist/controller.js index 5e7b465b8b6..28f54a503a8 100644 --- a/src/Chartjs/Resources/assets/dist/controller.js +++ b/src/Chartjs/Resources/assets/dist/controller.js @@ -17,7 +17,9 @@ exports["default"] = void 0; var _stimulus = require("stimulus"); -var _chart = require("chart.js"); +var _auto = _interopRequireDefault(require("chart.js/auto")); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; } function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } @@ -35,7 +37,7 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } } +function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } @@ -63,7 +65,7 @@ var _default = /*#__PURE__*/function (_Controller) { options: payload.options }); - var chart = new _chart.Chart(this.element.getContext('2d'), payload); + var chart = new _auto["default"](this.element.getContext('2d'), payload); this._dispatchEvent('chartjs:connect', { chart: chart diff --git a/src/Chartjs/Resources/assets/package.json b/src/Chartjs/Resources/assets/package.json index b43292cb225..0ee16125c7e 100644 --- a/src/Chartjs/Resources/assets/package.json +++ b/src/Chartjs/Resources/assets/package.json @@ -19,7 +19,7 @@ "lint": "eslint src test" }, "peerDependencies": { - "chart.js": "^2.9.4", + "chart.js": "^3.4.1", "stimulus": "^2.0.0" }, "devDependencies": { @@ -28,7 +28,7 @@ "@babel/plugin-proposal-class-properties": "^7.12.1", "@babel/preset-env": "^7.12.7", "@symfony/stimulus-testing": "^1.1.0", - "chart.js": "^2.9.4", + "chart.js": "^3.4.1", "jest-canvas-mock": "^2.3.0", "stimulus": "^2.0.0" }, diff --git a/src/Chartjs/Resources/assets/src/controller.js b/src/Chartjs/Resources/assets/src/controller.js index 098946456b7..a46b751fce2 100644 --- a/src/Chartjs/Resources/assets/src/controller.js +++ b/src/Chartjs/Resources/assets/src/controller.js @@ -10,7 +10,7 @@ 'use strict'; import { Controller } from 'stimulus'; -import { Chart } from 'chart.js'; +import Chart from 'chart.js/auto'; export default class extends Controller { connect() {