From bc3deec91973f00378a4c458effb902ad53b60e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grand?= <francois.grand@inrae.fr>
Date: Thu, 15 Sep 2022 09:44:01 +0200
Subject: [PATCH] package.json: use ng2-charts instead of angular2-chartjs
refs #554
---
package-lock.json | 124 +++++++++++++++++++---------------------------
package.json | 4 +-
2 files changed, 53 insertions(+), 75 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 3accb6991..1df2daaff 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,9 +25,8 @@
"@ngx-matomo/tracker": "^3.0.0",
"@types/pako": "^1.0.4",
"@types/sprintf-js": "^1.1.2",
- "angular2-chartjs": "^0.5.1",
"angular2-hotkeys": "^13.1.0",
- "chartjs-plugin-zoom": "^0.7.7",
+ "chartjs-plugin-zoom": "^1.2.1",
"cordova-android": "^11.0.0",
"cordova-plugin-advanced-http": "^3.3.1",
"cordova-plugin-app-version": "^0.1.14",
@@ -44,6 +43,7 @@
"material-design-icons": "^3.0.1",
"mathjax": "^3.2.2",
"mermaid": "^9.1.3",
+ "ng2-charts": "^4.0.0",
"ngx-markdown": "^14.0.1",
"ngx-material-file-input": "^4.0.0",
"ngx-webstorage-service": "^5.0.0",
@@ -4444,18 +4444,6 @@
"semver": "bin/semver"
}
},
- "node_modules/angular2-chartjs": {
- "version": "0.5.1",
- "license": "MIT",
- "dependencies": {
- "chart.js": "^2.3.0"
- },
- "peerDependencies": {
- "@angular/common": ">=4.0.0 || ^2.0.0",
- "@angular/compiler": ">=4.0.0 || ^2.0.0",
- "@angular/core": ">=4.0.0 || ^2.0.0"
- }
- },
"node_modules/angular2-hotkeys": {
"version": "13.1.0",
"license": "MIT",
@@ -5873,36 +5861,20 @@
"license": "MIT"
},
"node_modules/chart.js": {
- "version": "2.9.4",
- "license": "MIT",
- "dependencies": {
- "chartjs-color": "^2.1.0",
- "moment": "^2.10.2"
- }
- },
- "node_modules/chartjs-color": {
- "version": "2.4.1",
- "license": "MIT",
- "dependencies": {
- "chartjs-color-string": "^0.6.0",
- "color-convert": "^1.9.3"
- }
- },
- "node_modules/chartjs-color-string": {
- "version": "0.6.0",
- "license": "MIT",
- "dependencies": {
- "color-name": "^1.0.0"
- }
+ "version": "3.9.1",
+ "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.9.1.tgz",
+ "integrity": "sha512-Ro2JbLmvg83gXF5F4sniaQ+lTbSv18E+TIf2cOeiH1Iqd2PGFOtem+DUufMZsCJwFE7ywPOpfXFBwRTGq7dh6w==",
+ "peer": true
},
"node_modules/chartjs-plugin-zoom": {
- "version": "0.7.7",
- "license": "MIT",
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/chartjs-plugin-zoom/-/chartjs-plugin-zoom-1.2.1.tgz",
+ "integrity": "sha512-2zbWvw2pljrtMLMXkKw1uxYzAne5PtjJiOZftcut4Lo3Ee8qUt95RpMKDWrZ+pBZxZKQKOD/etdU4pN2jxZUmg==",
"dependencies": {
"hammerjs": "^2.0.8"
},
"peerDependencies": {
- "chart.js": "^2.6.0"
+ "chart.js": "^3.2.0"
}
},
"node_modules/cheerio": {
@@ -13362,6 +13334,11 @@
"version": "4.17.21",
"license": "MIT"
},
+ "node_modules/lodash-es": {
+ "version": "4.17.21",
+ "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
+ "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
+ },
"node_modules/lodash.debounce": {
"version": "4.0.8",
"license": "MIT"
@@ -13893,13 +13870,6 @@
"node": ">=10"
}
},
- "node_modules/moment": {
- "version": "2.29.4",
- "license": "MIT",
- "engines": {
- "node": "*"
- }
- },
"node_modules/moment-mini": {
"version": "2.24.0",
"license": "MIT"
@@ -14021,6 +13991,21 @@
"dev": true,
"license": "ISC"
},
+ "node_modules/ng2-charts": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/ng2-charts/-/ng2-charts-4.0.0.tgz",
+ "integrity": "sha512-1COLMs1UH8XIurk9C3pBQW3zH4RM3ggPtaC5vGjEmRGZ2cK/j8DqpzN4xMqyk0KB4D2vw/ZejgXmxxZ4Ie58Rw==",
+ "dependencies": {
+ "lodash-es": "^4.17.15",
+ "tslib": "^2.3.0"
+ },
+ "peerDependencies": {
+ "@angular/common": ">=14.0.0",
+ "@angular/core": ">=14.0.0",
+ "chart.js": "^3.4.0",
+ "rxjs": "^6.5.3 || ^7.4.0"
+ }
+ },
"node_modules/ngx-markdown": {
"version": "14.0.1",
"license": "MIT",
@@ -22809,12 +22794,6 @@
}
}
},
- "angular2-chartjs": {
- "version": "0.5.1",
- "requires": {
- "chart.js": "^2.3.0"
- }
- },
"angular2-hotkeys": {
"version": "13.1.0",
"requires": {
@@ -23741,27 +23720,15 @@
"version": "0.7.0"
},
"chart.js": {
- "version": "2.9.4",
- "requires": {
- "chartjs-color": "^2.1.0",
- "moment": "^2.10.2"
- }
- },
- "chartjs-color": {
- "version": "2.4.1",
- "requires": {
- "chartjs-color-string": "^0.6.0",
- "color-convert": "^1.9.3"
- }
- },
- "chartjs-color-string": {
- "version": "0.6.0",
- "requires": {
- "color-name": "^1.0.0"
- }
+ "version": "3.9.1",
+ "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.9.1.tgz",
+ "integrity": "sha512-Ro2JbLmvg83gXF5F4sniaQ+lTbSv18E+TIf2cOeiH1Iqd2PGFOtem+DUufMZsCJwFE7ywPOpfXFBwRTGq7dh6w==",
+ "peer": true
},
"chartjs-plugin-zoom": {
- "version": "0.7.7",
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/chartjs-plugin-zoom/-/chartjs-plugin-zoom-1.2.1.tgz",
+ "integrity": "sha512-2zbWvw2pljrtMLMXkKw1uxYzAne5PtjJiOZftcut4Lo3Ee8qUt95RpMKDWrZ+pBZxZKQKOD/etdU4pN2jxZUmg==",
"requires": {
"hammerjs": "^2.0.8"
}
@@ -28676,6 +28643,11 @@
"lodash": {
"version": "4.17.21"
},
+ "lodash-es": {
+ "version": "4.17.21",
+ "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
+ "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
+ },
"lodash.debounce": {
"version": "4.0.8"
},
@@ -28991,9 +28963,6 @@
"mkdirp": {
"version": "1.0.4"
},
- "moment": {
- "version": "2.29.4"
- },
"moment-mini": {
"version": "2.24.0"
},
@@ -29079,6 +29048,15 @@
"version": "1.1.0",
"dev": true
},
+ "ng2-charts": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/ng2-charts/-/ng2-charts-4.0.0.tgz",
+ "integrity": "sha512-1COLMs1UH8XIurk9C3pBQW3zH4RM3ggPtaC5vGjEmRGZ2cK/j8DqpzN4xMqyk0KB4D2vw/ZejgXmxxZ4Ie58Rw==",
+ "requires": {
+ "lodash-es": "^4.17.15",
+ "tslib": "^2.3.0"
+ }
+ },
"ngx-markdown": {
"version": "14.0.1",
"requires": {
diff --git a/package.json b/package.json
index f9a1a962c..24abe266b 100644
--- a/package.json
+++ b/package.json
@@ -51,9 +51,9 @@
"@ngx-matomo/tracker": "^3.0.0",
"@types/pako": "^1.0.4",
"@types/sprintf-js": "^1.1.2",
- "angular2-chartjs": "^0.5.1",
+ "ng2-charts": "^4.0.0",
"angular2-hotkeys": "^13.1.0",
- "chartjs-plugin-zoom": "^0.7.7",
+ "chartjs-plugin-zoom": "^1.2.1",
"cordova-android": "^11.0.0",
"cordova-plugin-advanced-http": "^3.3.1",
"cordova-plugin-app-version": "^0.1.14",
--
GitLab