Merge branch 'master' into postcss-updated

package.json

@@ -84,7 +84,7 @@
     "datatables.net-autofill-bs4": "^2.3.5",
     "datatables.net-bs4": "^1.10.22",
     "datatables.net-buttons-bs4": "^1.6.5",
-    "datatables.net-colreorder-bs4": "^1.5.2",
+    "datatables.net-colreorder-bs4": "^1.5.3",
     "datatables.net-fixedcolumns-bs4": "^3.3.2",
     "datatables.net-fixedheader-bs4": "^3.1.7",
     "datatables.net-keytable-bs4": "^2.5.3",
@@ -92,7 +92,7 @@
     "datatables.net-rowgroup-bs4": "^1.1.2",
     "datatables.net-rowreorder-bs4": "^1.2.7",
     "datatables.net-scroller-bs4": "^2.0.3",
-    "datatables.net-searchpanes-bs4": "^1.2.1",
+    "datatables.net-searchpanes-bs4": "^1.2.2",
     "datatables.net-select-bs4": "^1.3.1",
     "daterangepicker": "^3.1.0",
     "dropzone": "^5.7.2",
@@ -126,17 +126,17 @@
     "sweetalert2": "^10.10.2",
     "tempusdominus-bootstrap-4": "^5.39.0",
     "toastr": "^2.1.4",
-    "uplot": "^1.4.6"
+    "uplot": "^1.4.7"
   },
   "devDependencies": {
     "@babel/core": "^7.12.9",
     "@babel/preset-env": "^7.12.7",
-    "@rollup/plugin-babel": "^5.2.1",
+    "@rollup/plugin-babel": "^5.2.2",
     "autoprefixer": "^10.0.4",
     "browser-sync": "^2.26.13",
     "bundlewatch": "^0.3.1",
     "clean-css-cli": "^4.3.0",
-    "eslint": "^7.14.0",
+    "eslint": "^7.15.0",
     "eslint-config-xo": "^0.33.1",
     "eslint-plugin-compat": "^3.8.0",
     "eslint-plugin-import": "^2.22.1",