diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index b272ee99ba09..31e015b06647 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -230,12 +230,13 @@
 , "snyk"
 , "socket.io"
 , "speed-test"
+, "sql-formatter"
 , "ssb-server"
 , "stackdriver-statsd-backend"
 , "stf"
 , "stylelint"
-, "svelte-language-server"
 , "svelte-check"
+, "svelte-language-server"
 , "svgo"
 , "swagger"
 , {"tedicross": "git+https://github.com/TediCross/TediCross.git#v0.8.7"}
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index db8f5fb1128a..97e465202256 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -1777,13 +1777,13 @@ let
         sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q==";
       };
     };
-    "@deepcode/dcignore-1.0.3" = {
+    "@deepcode/dcignore-1.0.4" = {
       name = "_at_deepcode_slash_dcignore";
       packageName = "@deepcode/dcignore";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@deepcode/dcignore/-/dcignore-1.0.3.tgz";
-        sha512 = "nGBjIMd99ox2EJ2EjRn+VEGBgYlwkTii/1NMX1Y2Ylk61GhXKKNjPNfKWz1Jc4tox9SZiCIsnmv3v8AWLjx/Qg==";
+        url = "https://registry.npmjs.org/@deepcode/dcignore/-/dcignore-1.0.4.tgz";
+        sha512 = "gsLh2FJ43Mz3kA6aqMq3BOUCMS5ub8pJZOpRgrZ1h0f/rkzphriUGLnC37+Jn86CFckxWlwHk/q28tyf0g4NBw==";
       };
     };
     "@devicefarmer/adbkit-2.11.3" = {
@@ -8824,6 +8824,15 @@ let
         sha512 = "xYKDNuPR36/fUK+jmhM+oauBmbdUAfuJKnDjg3/7NbN+Pj03TX7e94LXnzkwGgAR+U/HWoMqM5UPTuGIYfIx9g==";
       };
     };
+    "@xmldom/xmldom-0.7.1" = {
+      name = "_at_xmldom_slash_xmldom";
+      packageName = "@xmldom/xmldom";
+      version = "0.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.1.tgz";
+        sha512 = "EOzJBMOjJ657nmlTt5RsyEwJrMTMu0aX15pI96GmpyFPj33a9J4mkcEk0KqYGplqInQ6JsPUxv/R25jR+I5ADA==";
+      };
+    };
     "@xtuc/ieee754-1.2.0" = {
       name = "_at_xtuc_slash_ieee754";
       packageName = "@xtuc/ieee754";
@@ -16016,13 +16025,13 @@ let
         sha512 = "OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==";
       };
     };
-    "cldr-7.1.0" = {
+    "cldr-7.1.1" = {
       name = "cldr";
       packageName = "cldr";
-      version = "7.1.0";
+      version = "7.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cldr/-/cldr-7.1.0.tgz";
-        sha512 = "GYS0GiLZ2bTOUv4Hye/z5z0feflEuQYdY3LM/vn0RFbIQKCA/q3f/l8P22N37W+tjNiQOWbnGpXz3tcaH4+NAg==";
+        url = "https://registry.npmjs.org/cldr/-/cldr-7.1.1.tgz";
+        sha512 = "zHHQLSZT9i/g7wAxGrMj1BRD7JYOSJHvPIT06EFkFEl4m9ItW48i9yWqgRgWESJ5oUqLs9IuMDoKf+21Lscqrg==";
       };
     };
     "clean-css-3.4.28" = {
@@ -34525,13 +34534,13 @@ let
         sha512 = "cUhDs2V2wYg7LFgm/X/uken8oF9re3vRORD08s0+z9Re8tt0pEehKmCotx3HYFhYrRhCEVvm66xjQt0t62GzXg==";
       };
     };
-    "jsii-srcmak-0.1.328" = {
+    "jsii-srcmak-0.1.329" = {
       name = "jsii-srcmak";
       packageName = "jsii-srcmak";
-      version = "0.1.328";
+      version = "0.1.329";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.328.tgz";
-        sha512 = "+bjVQcM3SsXjod2QIKmBpC68wKVUVKbKqOGTGNHvhTAMfGIEC+WSzdw5b3Q5bt4wtIwM+dsQnF8UVponQY/tFA==";
+        url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.329.tgz";
+        sha512 = "H4Sw8Ek33JeP7cHHAe6m4BZivwRqW6rq8X/IMleaLpzK9QAiJykf7wYV4+TSpeBUpdoipshFcnefzXtNny8iwA==";
       };
     };
     "json-bigint-1.0.0" = {
@@ -40961,13 +40970,13 @@ let
         sha512 = "hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ==";
       };
     };
-    "mocha-9.0.3" = {
+    "mocha-9.1.0" = {
       name = "mocha";
       packageName = "mocha";
-      version = "9.0.3";
+      version = "9.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mocha/-/mocha-9.0.3.tgz";
-        sha512 = "hnYFrSefHxYS2XFGtN01x8un0EwNu2bzKvhpRFhgoybIvMaOkkL60IVPmkb5h6XDmUl4IMSB+rT5cIO4/4bJgg==";
+        url = "https://registry.npmjs.org/mocha/-/mocha-9.1.0.tgz";
+        sha512 = "Kjg/XxYOFFUi0h/FwMOeb6RoroiZ+P1yOfya6NK7h3dNhahrJx1r2XIT3ge4ZQvJM86mdjNA+W5phqRQh7DwCg==";
       };
     };
     "mock-require-3.0.3" = {
@@ -57210,13 +57219,13 @@ let
         sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA==";
       };
     };
-    "sscaff-1.2.49" = {
+    "sscaff-1.2.50" = {
       name = "sscaff";
       packageName = "sscaff";
-      version = "1.2.49";
+      version = "1.2.50";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.49.tgz";
-        sha512 = "drDc3ZfEyhPDf/Nc7GoFc901xfZ4uI0E0IEo2MgS6G+FJcN1177kMVnXfZ8LSrNXUgR7BIAnlzhANap2z9vP9g==";
+        url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.50.tgz";
+        sha512 = "uEcxq341buXVnoWpzwHahKuTw4WkauXv+TFZMY2ljjlKQMRoaJm1rgsSFJEDe1w53pL+qgvFUziV/zKmbA1P5g==";
       };
     };
     "ssh-config-1.1.6" = {
@@ -73671,7 +73680,7 @@ in
           sources."yargs-16.2.0"
         ];
       })
-      (sources."jsii-srcmak-0.1.328" // {
+      (sources."jsii-srcmak-0.1.329" // {
         dependencies = [
           sources."fs-extra-9.1.0"
         ];
@@ -73713,7 +73722,7 @@ in
       sources."snake-case-3.0.4"
       sources."sort-json-2.0.0"
       sources."spdx-license-list-6.4.0"
-      sources."sscaff-1.2.49"
+      sources."sscaff-1.2.50"
       (sources."streamroller-2.2.4" // {
         dependencies = [
           sources."date-format-2.1.0"
@@ -74177,7 +74186,7 @@ in
           sources."yargs-16.2.0"
         ];
       })
-      (sources."jsii-srcmak-0.1.328" // {
+      (sources."jsii-srcmak-0.1.329" // {
         dependencies = [
           sources."fs-extra-9.1.0"
         ];
@@ -74335,7 +74344,7 @@ in
       sources."sort-json-2.0.0"
       sources."source-map-0.5.7"
       sources."spdx-license-list-6.4.0"
-      sources."sscaff-1.2.49"
+      sources."sscaff-1.2.50"
       (sources."stack-utils-2.0.3" // {
         dependencies = [
           sources."escape-string-regexp-2.0.0"
@@ -93122,6 +93131,7 @@ in
       sources."@ot-builder/var-store-1.1.0"
       sources."@ot-builder/variance-1.1.0"
       sources."@unicode/unicode-13.0.0-1.2.0"
+      sources."@xmldom/xmldom-0.7.1"
       sources."aglfn-1.0.2"
       sources."amdefine-1.0.1"
       sources."ansi-regex-5.0.0"
@@ -93133,7 +93143,7 @@ in
       sources."brace-expansion-1.1.11"
       sources."chainsaw-0.0.9"
       sources."chalk-2.4.2"
-      sources."cldr-7.1.0"
+      sources."cldr-7.1.1"
       sources."cli-cursor-3.1.0"
       sources."clipper-lib-6.4.2"
       sources."cliui-7.0.4"
@@ -93270,7 +93280,6 @@ in
         ];
       })
       sources."wrappy-1.0.2"
-      sources."xmldom-0.6.0"
       sources."xpath-0.0.32"
       sources."y18n-5.0.8"
       sources."yallist-4.0.0"
@@ -101414,10 +101423,10 @@ in
   mocha = nodeEnv.buildNodePackage {
     name = "mocha";
     packageName = "mocha";
-    version = "9.0.3";
+    version = "9.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/mocha/-/mocha-9.0.3.tgz";
-      sha512 = "hnYFrSefHxYS2XFGtN01x8un0EwNu2bzKvhpRFhgoybIvMaOkkL60IVPmkb5h6XDmUl4IMSB+rT5cIO4/4bJgg==";
+      url = "https://registry.npmjs.org/mocha/-/mocha-9.1.0.tgz";
+      sha512 = "Kjg/XxYOFFUi0h/FwMOeb6RoroiZ+P1yOfya6NK7h3dNhahrJx1r2XIT3ge4ZQvJM86mdjNA+W5phqRQh7DwCg==";
     };
     dependencies = [
       sources."@ungap/promise-all-settled-1.1.2"
@@ -112323,7 +112332,7 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
       sources."mkdirp-0.5.5"
-      (sources."mocha-9.0.3" // {
+      (sources."mocha-9.1.0" // {
         dependencies = [
           sources."argparse-2.0.1"
           (sources."debug-4.3.1" // {
@@ -114284,7 +114293,7 @@ in
     };
     dependencies = [
       sources."@arcanis/slice-ansi-1.0.2"
-      sources."@deepcode/dcignore-1.0.3"
+      sources."@deepcode/dcignore-1.0.4"
       sources."@iarna/toml-2.2.5"
       sources."@nodelib/fs.scandir-2.1.5"
       sources."@nodelib/fs.stat-2.0.5"
@@ -115178,6 +115187,27 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  sql-formatter = nodeEnv.buildNodePackage {
+    name = "sql-formatter";
+    packageName = "sql-formatter";
+    version = "4.0.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/sql-formatter/-/sql-formatter-4.0.2.tgz";
+      sha512 = "R6u9GJRiXZLr/lDo8p56L+OyyN2QFJPCDnsyEOsbdIpsnDKL8gubYFo7lNR7Zx7hfdWT80SfkoVS0CMaF/DE2w==";
+    };
+    dependencies = [
+      sources."argparse-2.0.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Format whitespace in a SQL query to make it more readable";
+      homepage = "https://github.com/zeroturnaround/sql-formatter#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
   ssb-server = nodeEnv.buildNodePackage {
     name = "ssb-server";
     packageName = "ssb-server";
@@ -117285,6 +117315,74 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  svelte-check = nodeEnv.buildNodePackage {
+    name = "svelte-check";
+    packageName = "svelte-check";
+    version = "2.2.4";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.2.4.tgz";
+      sha512 = "eGEuZ3UEanOhlpQhICLjKejDxcZ9uYJlGnBGKAPW7uugolaBE6HpEBIiKFZN/TMRFFHQUURgGvsVn8/HJUBfeQ==";
+    };
+    dependencies = [
+      sources."@types/node-16.6.2"
+      sources."@types/pug-2.0.5"
+      sources."@types/sass-1.16.1"
+      sources."ansi-styles-4.3.0"
+      sources."anymatch-3.1.2"
+      sources."balanced-match-1.0.2"
+      sources."binary-extensions-2.2.0"
+      sources."brace-expansion-1.1.11"
+      sources."braces-3.0.2"
+      sources."callsites-3.1.0"
+      sources."chalk-4.1.2"
+      sources."chokidar-3.5.2"
+      sources."color-convert-2.0.1"
+      sources."color-name-1.1.4"
+      sources."concat-map-0.0.1"
+      sources."detect-indent-6.1.0"
+      sources."fill-range-7.0.1"
+      sources."fs.realpath-1.0.0"
+      sources."fsevents-2.3.2"
+      sources."glob-7.1.7"
+      sources."glob-parent-5.1.2"
+      sources."has-flag-4.0.0"
+      sources."import-fresh-3.3.0"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.4"
+      sources."is-binary-path-2.1.0"
+      sources."is-extglob-2.1.1"
+      sources."is-glob-4.0.1"
+      sources."is-number-7.0.0"
+      sources."min-indent-1.0.1"
+      sources."minimatch-3.0.4"
+      sources."minimist-1.2.5"
+      sources."mri-1.1.6"
+      sources."normalize-path-3.0.0"
+      sources."once-1.4.0"
+      sources."parent-module-1.0.1"
+      sources."path-is-absolute-1.0.1"
+      sources."picomatch-2.3.0"
+      sources."readdirp-3.6.0"
+      sources."resolve-from-4.0.0"
+      sources."sade-1.7.4"
+      sources."source-map-0.7.3"
+      sources."strip-indent-3.0.0"
+      sources."supports-color-7.2.0"
+      sources."svelte-preprocess-4.7.4"
+      sources."to-regex-range-5.0.1"
+      sources."typescript-4.3.5"
+      sources."wrappy-1.0.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Svelte Code Checker Terminal Interface";
+      homepage = "https://github.com/sveltejs/language-tools#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
   svelte-language-server = nodeEnv.buildNodePackage {
     name = "svelte-language-server";
     packageName = "svelte-language-server";
@@ -117370,74 +117468,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  svelte-check = nodeEnv.buildNodePackage {
-    name = "svelte-check";
-    packageName = "svelte-check";
-    version = "2.2.4";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.2.4.tgz";
-      sha512 = "eGEuZ3UEanOhlpQhICLjKejDxcZ9uYJlGnBGKAPW7uugolaBE6HpEBIiKFZN/TMRFFHQUURgGvsVn8/HJUBfeQ==";
-    };
-    dependencies = [
-      sources."@types/node-16.6.2"
-      sources."@types/pug-2.0.5"
-      sources."@types/sass-1.16.1"
-      sources."ansi-styles-4.3.0"
-      sources."anymatch-3.1.2"
-      sources."balanced-match-1.0.2"
-      sources."binary-extensions-2.2.0"
-      sources."brace-expansion-1.1.11"
-      sources."braces-3.0.2"
-      sources."callsites-3.1.0"
-      sources."chalk-4.1.2"
-      sources."chokidar-3.5.2"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."concat-map-0.0.1"
-      sources."detect-indent-6.1.0"
-      sources."fill-range-7.0.1"
-      sources."fs.realpath-1.0.0"
-      sources."fsevents-2.3.2"
-      sources."glob-7.1.7"
-      sources."glob-parent-5.1.2"
-      sources."has-flag-4.0.0"
-      sources."import-fresh-3.3.0"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."is-binary-path-2.1.0"
-      sources."is-extglob-2.1.1"
-      sources."is-glob-4.0.1"
-      sources."is-number-7.0.0"
-      sources."min-indent-1.0.1"
-      sources."minimatch-3.0.4"
-      sources."minimist-1.2.5"
-      sources."mri-1.1.6"
-      sources."normalize-path-3.0.0"
-      sources."once-1.4.0"
-      sources."parent-module-1.0.1"
-      sources."path-is-absolute-1.0.1"
-      sources."picomatch-2.3.0"
-      sources."readdirp-3.6.0"
-      sources."resolve-from-4.0.0"
-      sources."sade-1.7.4"
-      sources."source-map-0.7.3"
-      sources."strip-indent-3.0.0"
-      sources."supports-color-7.2.0"
-      sources."svelte-preprocess-4.7.4"
-      sources."to-regex-range-5.0.1"
-      sources."typescript-4.3.5"
-      sources."wrappy-1.0.2"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Svelte Code Checker Terminal Interface";
-      homepage = "https://github.com/sveltejs/language-tools#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   svgo = nodeEnv.buildNodePackage {
     name = "svgo";
     packageName = "svgo";
@@ -126059,10 +126089,10 @@ in
   zx = nodeEnv.buildNodePackage {
     name = "zx";
     packageName = "zx";
-    version = "3.0.0";
+    version = "3.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/zx/-/zx-3.0.0.tgz";
-      sha512 = "GPaKTImhbKfc3TmJ43g8vRT6PMhiifcUZ0ndhHqhqtJMbteTQYNzTZT+vBtdZsDMkoqxE54Vjm3bDsplE2qWFg==";
+      url = "https://registry.npmjs.org/zx/-/zx-3.1.0.tgz";
+      sha512 = "Dwm75vWiWPsZhZXRUmneeZQlMbRXJBDLMy+QGDyKDID2+Dkp6LCzlXTrW7VOmU66K1/w8dEcJ5r3zFCDW0kx1Q==";
     };
     dependencies = [
       sources."@nodelib/fs.scandir-2.1.5"