From 058d9b2d3fa02ff6d311079b49e892f0ba368a5a Mon Sep 17 00:00:00 2001 From: Adrian Moennich Date: Fri, 16 Apr 2021 12:23:37 +0200 Subject: [PATCH] Install jqplot from npm instead of git npm/pacote#76 caused issues for some developers when installing this package from git --- indico/web/client/js/jquery/compat/jqplot.js | 52 +++++--------------- package-lock.json | 23 +++++---- package.json | 2 +- 3 files changed, 24 insertions(+), 53 deletions(-) diff --git a/indico/web/client/js/jquery/compat/jqplot.js b/indico/web/client/js/jquery/compat/jqplot.js index 67f3b31f71a..d77ae61dbae 100644 --- a/indico/web/client/js/jquery/compat/jqplot.js +++ b/indico/web/client/js/jquery/compat/jqplot.js @@ -9,45 +9,17 @@ // imports all necesssay jqplot files, // $ is automatically extended with jqplot functionality. -import 'jqplot/src/jqplot.core'; -import 'jqplot/src/jqplot.axisLabelRenderer'; -import 'jqplot/src/jqplot.axisTickRenderer'; -import 'jqplot/src/jqplot.canvasGridRenderer'; -import 'jqplot/src/jqplot.divTitleRenderer'; -import 'jqplot/src/jqplot.effects.core'; -import 'jqplot/src/jqplot.effects.blind'; -import 'jqplot/src/jqplot.linePattern'; -import 'jqplot/src/jqplot.lineRenderer'; -import 'jqplot/src/jqplot.linearAxisRenderer'; -import 'jqplot/src/jqplot.linearTickGenerator'; -import 'jqplot/src/jqplot.markerRenderer'; -import 'jqplot/src/jqplot.shadowRenderer'; -import 'jqplot/src/jqplot.shapeRenderer'; -import 'jqplot/src/jqplot.sprintf'; -import 'jqplot/src/jqplot.tableLegendRenderer'; -import 'jqplot/src/jqplot.themeEngine'; -import 'jqplot/src/jqplot.toImage'; -import 'jqplot/src/jsdate'; +import 'updated-jqplot'; -import 'jqplot/src/plugins/jqplot.barRenderer'; -import 'jqplot/src/plugins/jqplot.barRenderer.js'; -import 'jqplot/src/plugins/jqplot.canvasAxisLabelRenderer'; -import 'jqplot/src/plugins/jqplot.canvasAxisLabelRenderer.js'; -import 'jqplot/src/plugins/jqplot.canvasAxisTickRenderer'; -import 'jqplot/src/plugins/jqplot.canvasAxisTickRenderer.js'; -import 'jqplot/src/plugins/jqplot.canvasTextRenderer'; -import 'jqplot/src/plugins/jqplot.canvasTextRenderer.js'; -import 'jqplot/src/plugins/jqplot.categoryAxisRenderer'; -import 'jqplot/src/plugins/jqplot.categoryAxisRenderer.js'; -import 'jqplot/src/plugins/jqplot.cursor'; -import 'jqplot/src/plugins/jqplot.cursor.js'; -import 'jqplot/src/plugins/jqplot.dateAxisRenderer'; -import 'jqplot/src/plugins/jqplot.dateAxisRenderer.js'; -import 'jqplot/src/plugins/jqplot.highlighter'; -import 'jqplot/src/plugins/jqplot.highlighter.js'; -import 'jqplot/src/plugins/jqplot.logAxisRenderer'; -import 'jqplot/src/plugins/jqplot.logAxisRenderer.js'; -import 'jqplot/src/plugins/jqplot.pointLabels'; -import 'jqplot/src/plugins/jqplot.pointLabels.js'; +import 'updated-jqplot/dist/plugins/jqplot.barRenderer'; +import 'updated-jqplot/dist/plugins/jqplot.canvasAxisLabelRenderer'; +import 'updated-jqplot/dist/plugins/jqplot.canvasAxisTickRenderer'; +import 'updated-jqplot/dist/plugins/jqplot.canvasTextRenderer'; +import 'updated-jqplot/dist/plugins/jqplot.categoryAxisRenderer'; +import 'updated-jqplot/dist/plugins/jqplot.cursor'; +import 'updated-jqplot/dist/plugins/jqplot.dateAxisRenderer'; +import 'updated-jqplot/dist/plugins/jqplot.highlighter'; +import 'updated-jqplot/dist/plugins/jqplot.logAxisRenderer'; +import 'updated-jqplot/dist/plugins/jqplot.pointLabels'; -import 'jqplot/src/jquery.jqplot.css'; +import 'updated-jqplot/dist/jquery.jqplot.css'; diff --git a/package-lock.json b/package-lock.json index d5551d8142a..327e66ea95f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33,7 +33,6 @@ "history": "^4.10.1", "indico-sui-theme": "^0.0.5", "jed": "^1.1.1", - "jqplot": "github:jqplot/jqplot#d96a669fbb729f4f51e2214688e54320411219af", "jquery": "^3.6.0", "jquery-colorbox": "^1.6.4", "jquery-form": "^4.3.0", @@ -90,6 +89,7 @@ "taggle": "^1.15.0", "ua-parser-js": "^0.7.28", "underscore": "^1.13.0", + "updated-jqplot": "1.0.9-2", "vanderlee-colorpicker": "^1.2.16" }, "devDependencies": { @@ -9891,12 +9891,6 @@ "node": ">= 10.13.0" } }, - "node_modules/jqplot": { - "version": "1.0.9", - "resolved": "git+https://github.com/jqplot/jqplot.git#d96a669fbb729f4f51e2214688e54320411219af", - "integrity": "sha512-hMjKgDiIZ2RWZOe0wOUk9V1kWwyuvpNoqIoDT1hJ/1RmzKnYIfKM1BUPdJAo4gXr/LgmEF6GxGPZ1uXn7cfVBw==", - "license": "(MIT AND GPL-2.0)" - }, "node_modules/jquery": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", @@ -17807,6 +17801,11 @@ "yarn": "*" } }, + "node_modules/updated-jqplot": { + "version": "1.0.9-2", + "resolved": "https://registry.npmjs.org/updated-jqplot/-/updated-jqplot-1.0.9-2.tgz", + "integrity": "sha1-0e8g5ANI9ahE17utGRF/Bcb5gFE=" + }, "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", @@ -26311,11 +26310,6 @@ "supports-color": "^7.0.0" } }, - "jqplot": { - "version": "git+https://github.com/jqplot/jqplot.git#d96a669fbb729f4f51e2214688e54320411219af", - "integrity": "sha512-hMjKgDiIZ2RWZOe0wOUk9V1kWwyuvpNoqIoDT1hJ/1RmzKnYIfKM1BUPdJAo4gXr/LgmEF6GxGPZ1uXn7cfVBw==", - "from": "jqplot@github:jqplot/jqplot#d96a669fbb729f4f51e2214688e54320411219af" - }, "jquery": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", @@ -32444,6 +32438,11 @@ "dev": true, "optional": true }, + "updated-jqplot": { + "version": "1.0.9-2", + "resolved": "https://registry.npmjs.org/updated-jqplot/-/updated-jqplot-1.0.9-2.tgz", + "integrity": "sha1-0e8g5ANI9ahE17utGRF/Bcb5gFE=" + }, "uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", diff --git a/package.json b/package.json index 6a27a11fdff..95a933bd52e 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,6 @@ "history": "^4.10.1", "indico-sui-theme": "^0.0.5", "jed": "^1.1.1", - "jqplot": "github:jqplot/jqplot#d96a669fbb729f4f51e2214688e54320411219af", "jquery": "^3.6.0", "jquery-colorbox": "^1.6.4", "jquery-form": "^4.3.0", @@ -88,6 +87,7 @@ "taggle": "^1.15.0", "ua-parser-js": "^0.7.28", "underscore": "^1.13.0", + "updated-jqplot": "1.0.9-2", "vanderlee-colorpicker": "^1.2.16" }, "devDependencies": {