Merge pull request #204260 from LeSuisse/pgadmin4-6.17

pkgs/tools/admin/pgadmin/default.nix

@@ -10,11 +10,11 @@
 
 let
   pname = "pgadmin";
-  version = "6.16";
+  version = "6.17";
 
   src = fetchurl {
     url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz";
-    sha256 = "sha256-v2CfoV7QAzLcPXKY5nkUi9+HbHujiulUJS4GVBKxTY4=";
+    sha256 = "sha256-fcMNqki0namB5mRntlJUE9cN+axlw+7b8EA9aactlIw=";
   };
 
   yarnDeps = mkYarnModules {

pkgs/tools/admin/pgadmin/package.json

@@ -29,6 +29,7 @@
     "copy-webpack-plugin": "^7.0.0",
     "core-js": "^3.2.1",
     "cross-env": "^7.0.3",
+    "css-loader": "^6.7.2",
     "css-minimizer-webpack-plugin": "^3.0.0",
     "enzyme": "^3.11.0",
     "eslint": "^7.19.0",
@@ -40,9 +41,10 @@
     "imagemin-mozjpeg": "^10.0.0",
     "imagemin-optipng": "^8.0.0",
     "imagemin-pngquant": "^9.0.2",
+    "imports-loader": "^4.0.1",
     "is-docker": "^2.1.1",
     "istanbul-instrumenter-loader": "^3.0.1",
-    "jasmine-core": "^3.6.0",
+    "jasmine-core": "3.10.1",
     "jasmine-enzyme": "^7.1.2",
     "karma": "^6.3.15",
     "karma-babel-preprocessor": "^8.0.0",
@@ -54,6 +56,7 @@
     "karma-source-map-support": "^1.4.0",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^5.0.0",
+    "loader-utils": "^3.2.1",
     "mini-css-extract-plugin": "^1.3.5",
     "popper.js": "^1.16.1",
     "postcss-loader": "^5.0.0",
@@ -63,13 +66,15 @@
     "sass": "^1.24.4",
     "sass-loader": "^11.0.0",
     "sass-resources-loader": "^2.2.1",
-    "style-loader": "^2.0.0",
+    "shim-loader": "^1.0.1",
+    "style-loader": "^3.3.1",
     "stylis": "^4.0.7",
     "svgo": "^2.7.0",
     "svgo-loader": "^2.2.0",
     "terser-webpack-plugin": "^5.1.1",
     "typescript": "^3.2.2",
-    "webfonts-loader": "^7.3.0",
+    "url-loader": "^4.1.1",
+    "webfonts-loader": "^7.5.2",
     "webpack": "^5.21.2",
     "webpack-bundle-analyzer": "^4.4.0",
     "webpack-cli": "^4.5.0",
@@ -96,7 +101,6 @@
     "aspen-decorations": "^1.0.2",
     "axios": "^0.21.1",
     "babelify": "~10.0.0",
-    "backbone": "1.4.0",
     "bignumber.js": "^9.0.1",
     "bootstrap": "^4.3.1",
     "bootstrap-datepicker": "^1.8.0",
@@ -110,14 +114,12 @@
     "codemirror": "^5.59.2",
     "context-menu": "^2.0.0",
     "convert-units": "^2.3.4",
-    "css-loader": "^5.0.1",
     "cssnano": "^5.0.2",
     "dagre": "^0.8.4",
     "date-fns": "^2.24.0",
     "diff-arrays-of-objects": "^1.1.8",
     "html2canvas": "^1.0.0-rc.7",
     "immutability-helper": "^3.0.0",
-    "imports-loader": "^2.0.0",
     "insert-if": "^1.1.0",
     "ip-address": "^7.1.0",
     "jquery": "^3.6.0",
@@ -160,15 +162,12 @@
     "react-virtualized-auto-sizer": "^1.0.6",
     "react-window": "^1.8.5",
     "select2": "^4.0.13",
-    "shim-loader": "^1.0.1",
     "snapsvg-cjs": "^0.0.6",
     "socket.io-client": "^4.5.0",
     "split.js": "^1.5.10",
     "styled-components": "^5.2.1",
     "tempusdominus-bootstrap-4": "^5.1.2",
     "tempusdominus-core": "^5.19.3",
-    "underscore": "^1.13.1",
-    "url-loader": "^1.1.2",
     "valid-filename": "^2.0.1",
     "webcabin-docker": "git+https://github.com/EnterpriseDB/wcDocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8",
     "wkx": "^0.5.0",