js: install chartjs via npm

Change-Id: I520c72366c66fcdd4e280199a2503f816a5388b5
vmiklos · Nov 29, 2020 · 36dab22 · 36dab22
1 parent 67d7fb1
commit 36dab22
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 24 deletions.
diff --git a/package.json b/package.json
@@ -2,6 +2,9 @@
   "license": "MIT",
   "dependencies": {
     "browserify": "17.0.0",
+    "chart.js": "2.9.4",
+    "chartjs-plugin-datalabels": "0.7.0",
+    "chartjs-plugin-trendline": "0.2.2",
     "eslint": "7.14.0",
     "sorttable": "1.0.2",
     "tinyify": "3.0.0"

diff --git a/static/Chart.min.js b/static/Chart.min.js
diff --git a/static/chartjs-plugin-datalabels.min.js b/static/chartjs-plugin-datalabels.min.js
diff --git a/static/chartjs-plugin-trendline.min.js b/static/chartjs-plugin-trendline.min.js
diff --git a/stats.js b/stats.js
@@ -6,6 +6,12 @@
 
 /* global Chart */
 
+var chartJs = require("chart.js");
+// eslint-disable-next-line no-unused-vars
+var chartJsDatalabels = require("chartjs-plugin-datalabels"); // only for its side-effects
+var chartJsTrendline = require("chartjs-plugin-trendline");
+chartJs.plugins.register(chartJsTrendline);
+
 var config = require("./config.js");
 
 function getString(key) {

diff --git a/webframe.py b/webframe.py
@@ -348,12 +348,6 @@ def handle_stats(relations: areas.Relations, request_uri: str) -> yattag.doc.Doc
     doc.asis(get_toolbar(relations).getvalue())
 
     prefix = config.Config.get_uri_prefix()
-    with doc.tag("script", src=prefix + "/static/Chart.min.js"):
-        pass
-    with doc.tag("script", src=prefix + "/static/chartjs-plugin-datalabels.min.js"):
-        pass
-    with doc.tag("script", src=prefix + "/static/chartjs-plugin-trendline.min.js"):
-        pass
 
     # Emit localized strings for JS purposes.
     with doc.tag("div", style="display: none;"):