Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

Replace vendored jquery.flot with npm dependency

Alexander Brandon Coles7f9d0c3f0f64
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 5ec1f15c075..d4d2983e82d 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -86,6 +86,7 @@
"jquery-ujs": "^1.2.3",
"jquery.caret": "^0.3.1",
"jquery.cookie": "^1.4.1",
+ "jquery.flot": "^0.8.3",
"json5": "^2.2.2",
"lodash": "^4.17.21",
"mark.js": "^8.11.0",
@@ -135,6 +136,7 @@
"@types/codemirror": "5.60.5",
"@types/dom-navigation": "^1.0.3",
"@types/dragula": "^3.7.5",
+ "@types/flot": "^0.0.36",
"@types/hammerjs": "^2.0.36",
"@types/jasmine": "~5.1.8",
"@types/jquery": "^3.5.32",
@@ -8030,6 +8032,16 @@
"resolved": "https://registry.npmjs.org/@types/flatbuffers/-/flatbuffers-1.10.3.tgz",
"integrity": "sha512-kwJQsAROanCiMXSLjcTLmYVBIJ9Qyuqs92SaDIcj2EII2KnDgZbiU7it1Z/JfZd1gmxw/lAahMysQ6ZM+j3Ryw=="
},
+ "node_modules/@types/flot": {
+ "version": "0.0.36",
+ "resolved": "https://registry.npmjs.org/@types/flot/-/flot-0.0.36.tgz",
+ "integrity": "sha512-xRo4MUIMnRPGXJCuQXAWvo+uKRmziRGHAy9LQHsLgbKanknpe5z3EThqVuYkVCC6ZWPZ/8pllBXnzQmGzFkJ/Q==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@types/jquery": "*"
+ }
+ },
"node_modules/@types/geojson": {
"version": "7946.0.14",
"resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.14.tgz",
@@ -16598,6 +16610,11 @@
"integrity": "sha512-c/hZOOL+8VSw/FkTVH637gS1/6YzMSCROpTZ2qBYwJ7s7sHajU7uBkSSiE5+GXWwrfCCyO+jsYjUQ7Hs2rIxAA==",
"license": "MIT"
},
+ "node_modules/jquery.flot": {
+ "version": "0.8.3",
+ "resolved": "https://registry.npmjs.org/jquery.flot/-/jquery.flot-0.8.3.tgz",
+ "integrity": "sha512-/tEE8J5NjwvStHDaCHkvTJpD7wDS4hE1OEL8xEmhgQfUe0gLUem923PIceNez1mz4yBNx6Hjv7pJcowLNd+nbg=="
+ },
"node_modules/js-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -31291,6 +31308,15 @@
"resolved": "https://registry.npmjs.org/@types/flatbuffers/-/flatbuffers-1.10.3.tgz",
"integrity": "sha512-kwJQsAROanCiMXSLjcTLmYVBIJ9Qyuqs92SaDIcj2EII2KnDgZbiU7it1Z/JfZd1gmxw/lAahMysQ6ZM+j3Ryw=="
},
+ "@types/flot": {
+ "version": "0.0.36",
+ "resolved": "https://registry.npmjs.org/@types/flot/-/flot-0.0.36.tgz",
+ "integrity": "sha512-xRo4MUIMnRPGXJCuQXAWvo+uKRmziRGHAy9LQHsLgbKanknpe5z3EThqVuYkVCC6ZWPZ/8pllBXnzQmGzFkJ/Q==",
+ "dev": true,
+ "requires": {
+ "@types/jquery": "*"
+ }
+ },
"@types/geojson": {
"version": "7946.0.14",
"resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.14.tgz",
@@ -37506,6 +37532,11 @@
"resolved": "https://registry.npmjs.org/jquery.cookie/-/jquery.cookie-1.4.1.tgz",
"integrity": "sha512-c/hZOOL+8VSw/FkTVH637gS1/6YzMSCROpTZ2qBYwJ7s7sHajU7uBkSSiE5+GXWwrfCCyO+jsYjUQ7Hs2rIxAA=="
},
+ "jquery.flot": {
+ "version": "0.8.3",
+ "resolved": "https://registry.npmjs.org/jquery.flot/-/jquery.flot-0.8.3.tgz",
+ "integrity": "sha512-/tEE8J5NjwvStHDaCHkvTJpD7wDS4hE1OEL8xEmhgQfUe0gLUem923PIceNez1mz4yBNx6Hjv7pJcowLNd+nbg=="
+ },
"js-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index ed5d106443a..964e5a3548b 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -21,6 +21,7 @@
"@types/codemirror": "5.60.5",
"@types/dom-navigation": "^1.0.3",
"@types/dragula": "^3.7.5",
+ "@types/flot": "^0.0.36",
"@types/hammerjs": "^2.0.36",
"@types/jasmine": "~5.1.8",
"@types/jquery": "^3.5.32",
@@ -140,6 +141,7 @@
"jquery-ujs": "^1.2.3",
"jquery.caret": "^0.3.1",
"jquery.cookie": "^1.4.1",
+ "jquery.flot": "^0.8.3",
"json5": "^2.2.2",
"lodash": "^4.17.21",
"mark.js": "^8.11.0",
diff --git a/frontend/src/stimulus/controllers/dynamic/backlogs.controller.ts b/frontend/src/stimulus/controllers/dynamic/backlogs.controller.ts
index 8ce154be058..a551ee1768e 100644
--- a/frontend/src/stimulus/controllers/dynamic/backlogs.controller.ts
+++ b/frontend/src/stimulus/controllers/dynamic/backlogs.controller.ts
@@ -1,7 +1,8 @@
import { Controller } from '@hotwired/stimulus';
-import 'core-vendor/jquery.flot/jquery.flot';
-import 'core-vendor/jquery.flot/excanvas';
+import 'jquery.flot';
+import 'jquery.flot/excanvas';
+
import 'core-vendor/jquery.jeditable.mini';
import 'core-vendor/jquery.colorcontrast';