Install npm-merge-driver instead of relying on npx

author: Alan Pearce 2019-12-13 15:16:18 +0100
committer: Alan Pearce 2019-12-13 15:16:18 +0100
commit: bec3f8af9468612cf9c02ca375723a02a223a20d (patch)
tree: 7b7e27c3024e08ca97100dc253856eec349d17e4 /user
parent: d4e727774fc7be10c25e0b750e60cae75e359046 (diff)
download: nixfiles-bec3f8af9468612cf9c02ca375723a02a223a20d.tar.lz
nixfiles-bec3f8af9468612cf9c02ca375723a02a223a20d.tar.zst
nixfiles-bec3f8af9468612cf9c02ca375723a02a223a20d.zip
3 files changed, 786 insertions, 281 deletions
diff --git a/user/packages/node2nix/node-packages.json b/user/packages/node2nix/node-packages.json
index 9bc9a27a..2631be9d 100644
--- a/user/packages/node2nix/node-packages.json
+++ b/user/packages/node2nix/node-packages.json
@@ -5,5 +5,6 @@
   { "pnpm": "4.1.7" },
   "bunyan",
   "pino-pretty",
-  "netlify-cli"
+  "netlify-cli",
+  "npm-merge-driver"
 ]
diff --git a/user/packages/node2nix/node-packages.nix b/user/packages/node2nix/node-packages.nix
index 419b6e01..8cd74d13 100644
--- a/user/packages/node2nix/node-packages.nix
+++ b/user/packages/node2nix/node-packages.nix
@@ -40,13 +40,13 @@ let
         sha512 = "7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==";
       };
     };
-    "@babel/parser-7.7.3" = {
+    "@babel/parser-7.7.5" = {
       name = "_at_babel_slash_parser";
       packageName = "@babel/parser";
-      version = "7.7.3";
+      version = "7.7.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.7.3.tgz";
-        sha512 = "bqv+iCo9i+uLVbI0ILzKkvMorqxouI+GbV13ivcARXn9NNEabi2IEz912IgNpT/60BNXac5dgcfjb94NjsF33A==";
+        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.7.5.tgz";
+        sha512 = "KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==";
       };
     };
     "@hapi/bourne-1.3.2" = {
@@ -76,22 +76,31 @@ let
         sha512 = "XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==";
       };
     };
-    "@netlify/build-0.1.23" = {
+    "@mrmlnc/readdir-enhanced-2.2.1" = {
+      name = "_at_mrmlnc_slash_readdir-enhanced";
+      packageName = "@mrmlnc/readdir-enhanced";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz";
+        sha512 = "bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==";
+      };
+    };
+    "@netlify/build-0.1.30" = {
       name = "_at_netlify_slash_build";
       packageName = "@netlify/build";
-      version = "0.1.23";
+      version = "0.1.30";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/build/-/build-0.1.23.tgz";
-        sha512 = "laACmxf8DAVymyOLTmtRu6oGvHiDmn4j4YW+TlNIE58RoaCvc8j+WYJUh9iYQJEBDxVWUvHfkAyiOYJOPQiYxg==";
+        url = "https://registry.npmjs.org/@netlify/build/-/build-0.1.30.tgz";
+        sha512 = "7Ne3LD4IOvsAtQoNWe5FrN5WxttKJZj78g41lSAKGdIVZYW4jV7tDx2+ZOhiKLba34+Rv7UCGbd/geDy8SMsZg==";
       };
     };
-    "@netlify/config-0.1.8" = {
+    "@netlify/config-0.1.12" = {
       name = "_at_netlify_slash_config";
       packageName = "@netlify/config";
-      version = "0.1.8";
+      version = "0.1.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/config/-/config-0.1.8.tgz";
-        sha512 = "UfzXPE3LsvVm0hAadyN8Tz6sYZLw8lf2Mek4gPOEP2ktDE2/ErOOHACii9mkFyNx+8lbMNNL9fenRw7jbxbHPQ==";
+        url = "https://registry.npmjs.org/@netlify/config/-/config-0.1.12.tgz";
+        sha512 = "LRjKKZx/zXRb2g8Fx3Z5wW9ZD1Am/QZART7D2kcRHZzswQUJ0hwsV/6+PeYKDWJUtrZh+tvUdcpOroeQLBbZ+Q==";
       };
     };
     "@netlify/open-api-0.9.0" = {
@@ -112,13 +121,13 @@ let
         sha512 = "vLKxc1/Kvy7c0TL6AMr39/3SIweMkXZXkfU5nUtw1DSBVXaz9aYtiFLBX8YOblJXFFs3rpcyhzmzctoQsOnqVA==";
       };
     };
-    "@netlify/zip-it-and-ship-it-0.4.0-7" = {
+    "@netlify/zip-it-and-ship-it-0.4.0-8" = {
       name = "_at_netlify_slash_zip-it-and-ship-it";
       packageName = "@netlify/zip-it-and-ship-it";
-      version = "0.4.0-7";
+      version = "0.4.0-8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-0.4.0-7.tgz";
-        sha512 = "zVPY2+pC1k7MOl1p4INxf64+NWvATKY9LPBB41mwjoGYo8RsTRRfaMt0JAycQPrSLQKjUY+484egzE2CCpx2NQ==";
+        url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-0.4.0-8.tgz";
+        sha512 = "lr2kafpVKqHu2lS630B9CFfpoB6suIZixZfXKerS+r1Z81sBIJpIPGYArmNa3fOZyvXt8+kyFdiXVkibQYLsWw==";
       };
     };
     "@nodelib/fs.scandir-2.1.3" = {
@@ -130,6 +139,15 @@ let
         sha512 = "eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==";
       };
     };
+    "@nodelib/fs.stat-1.1.3" = {
+      name = "_at_nodelib_slash_fs.stat";
+      packageName = "@nodelib/fs.stat";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz";
+        sha512 = "shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==";
+      };
+    };
     "@nodelib/fs.stat-2.0.3" = {
       name = "_at_nodelib_slash_fs.stat";
       packageName = "@nodelib/fs.stat";
@@ -202,13 +220,13 @@ let
         sha512 = "cyP1at3l42kQHZtqDS3KfTeyMvxITGwXwH1qk9ktBYvqgMp5h4vHT+cOD74ld3RqJUOZY/+Zi9lb4Tbza3BtuA==";
       };
     };
-    "@oclif/plugin-help-2.2.1" = {
+    "@oclif/plugin-help-2.2.2" = {
       name = "_at_oclif_slash_plugin-help";
       packageName = "@oclif/plugin-help";
-      version = "2.2.1";
+      version = "2.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-2.2.1.tgz";
-        sha512 = "psEA3t41MSGBErLk6xCaAq2jKrRtx3Br+kHpd43vZeGEeZ7Gos4wgK0JAaHBbvhvUQskCHg8dzoqv4XEeTWeVQ==";
+        url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-2.2.2.tgz";
+        sha512 = "Xh4o3TKEg5CsIpQx1XzzV0RYCShfksFuFF0CBodv5Eh1boAw06cBGv225LYdAX8lcSo9qklw/tuz2RsAsH0o9A==";
       };
     };
     "@oclif/plugin-not-found-1.2.3" = {
@@ -319,6 +337,24 @@ let
         sha512 = "Lo5dy3ai6LNnbL663sgdzqL1eib11u1yKH6w3v3IXEOO4kRfQpMn1qWUTaumcHLACjFp1RcBx9tUXEvJoR3vcA==";
       };
     };
+    "@types/events-3.0.0" = {
+      name = "_at_types_slash_events";
+      packageName = "@types/events";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz";
+        sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==";
+      };
+    };
+    "@types/glob-7.1.1" = {
+      name = "_at_types_slash_glob";
+      packageName = "@types/glob";
+      version = "7.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz";
+        sha512 = "1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==";
+      };
+    };
     "@types/got-8.3.5" = {
       name = "_at_types_slash_got";
       packageName = "@types/got";
@@ -355,6 +391,15 @@ let
         sha512 = "UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==";
       };
     };
+    "@types/minimatch-3.0.3" = {
+      name = "_at_types_slash_minimatch";
+      packageName = "@types/minimatch";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz";
+        sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==";
+      };
+    };
     "@types/mkdirp-0.5.2" = {
       name = "_at_types_slash_mkdirp";
       packageName = "@types/mkdirp";
@@ -364,22 +409,22 @@ let
         sha512 = "U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg==";
       };
     };
-    "@types/node-12.12.11" = {
+    "@types/node-12.12.17" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "12.12.11";
+      version = "12.12.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-12.12.11.tgz";
-        sha512 = "O+x6uIpa6oMNTkPuHDa9MhMMehlxLAd5QcOvKRjAFsBVpeFWTOPnXbDvILvFgFFZfQ1xh1EZi1FbXxUix+zpsQ==";
+        url = "https://registry.npmjs.org/@types/node/-/node-12.12.17.tgz";
+        sha512 = "Is+l3mcHvs47sKy+afn2O1rV4ldZFU7W8101cNlOd+MRbjM4Onida8jSZnJdTe/0Pcf25g9BNIUsuugmE6puHA==";
       };
     };
-    "@types/node-fetch-2.5.3" = {
+    "@types/node-fetch-2.5.4" = {
       name = "_at_types_slash_node-fetch";
       packageName = "@types/node-fetch";
-      version = "2.5.3";
+      version = "2.5.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.3.tgz";
-        sha512 = "X3TNlzZ7SuSwZsMkb5fV7GrPbVKvHc2iwHmslb8bIxRKWg2iqkfm3F/Wd79RhDpOXR7wCtKAwc5Y2JE6n/ibyw==";
+        url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.4.tgz";
+        sha512 = "Oz6id++2qAOFuOlE1j0ouk1dzl3mmI1+qINPNBhi9nt/gVOz0G+13Ao6qjhdF0Ys+eOkhu6JnFmt38bR3H0POQ==";
       };
     };
     "@types/normalize-package-data-2.4.0" = {
@@ -418,13 +463,13 @@ let
         sha512 = "gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg==";
       };
     };
-    "@typescript-eslint/typescript-estree-2.8.0" = {
+    "@typescript-eslint/typescript-estree-2.11.0" = {
       name = "_at_typescript-eslint_slash_typescript-estree";
       packageName = "@typescript-eslint/typescript-estree";
-      version = "2.8.0";
+      version = "2.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.8.0.tgz";
-        sha512 = "ksvjBDTdbAQ04cR5JyFSDX113k66FxH1tAXmi+dj6hufsl/G0eMc/f1GgLjEVPkYClDbRKv+rnBFuE5EusomUw==";
+        url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.11.0.tgz";
+        sha512 = "HGY4+d4MagO6cKMcKfIKaTMxcAv7dEVnji2Zi+vi5VV8uWAM631KjAB5GxFcexMYrwKT0EekRiiGK1/Sd7VFGA==";
       };
     };
     "accepts-1.3.7" = {
@@ -679,6 +724,33 @@ let
         sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2";
       };
     };
+    "array-union-1.0.2" = {
+      name = "array-union";
+      packageName = "array-union";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz";
+        sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39";
+      };
+    };
+    "array-union-2.1.0" = {
+      name = "array-union";
+      packageName = "array-union";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz";
+        sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==";
+      };
+    };
+    "array-uniq-1.0.3" = {
+      name = "array-uniq";
+      packageName = "array-uniq";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz";
+        sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6";
+      };
+    };
     "array-unique-0.3.2" = {
       name = "array-unique";
       packageName = "array-unique";
@@ -688,6 +760,15 @@ let
         sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428";
       };
     };
+    "arrify-1.0.1" = {
+      name = "arrify";
+      packageName = "arrify";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz";
+        sha1 = "898508da2226f380df904728456849c1501a4b0d";
+      };
+    };
     "ascii-table-0.0.9" = {
       name = "ascii-table";
       packageName = "ascii-table";
@@ -706,13 +787,13 @@ let
         sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367";
       };
     };
-    "ast-module-types-2.5.0" = {
+    "ast-module-types-2.6.0" = {
       name = "ast-module-types";
       packageName = "ast-module-types";
-      version = "2.5.0";
+      version = "2.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ast-module-types/-/ast-module-types-2.5.0.tgz";
-        sha512 = "dP6vhvatex3Q+OThhvcyGRvHn4noQBg1b8lCNKUAFL05up80hr2pAExveU3YQNDGMhfNPhQit/vzIkkvBPbSXw==";
+        url = "https://registry.npmjs.org/ast-module-types/-/ast-module-types-2.6.0.tgz";
+        sha512 = "zXSoVaMrf2R+r+ISid5/9a8SXm1LLdkhHzh6pSRhj9jklzruOOl1hva1YmFT33wAstg/f9ZndJAlq1BSrFLSGA==";
       };
     };
     "async-2.6.3" = {
@@ -823,13 +904,13 @@ let
         sha512 = "EUAyP5UHU5hxF8BPT0LKW8gjYLhq1DQIcneOX/pL/m2Alo+OYDQAJlHq+yseMP50Os2nHXOSic6Ss3vSQeyf4A==";
       };
     };
-    "bluebird-3.7.1" = {
+    "bluebird-3.7.2" = {
       name = "bluebird";
       packageName = "bluebird";
-      version = "3.7.1";
+      version = "3.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.1.tgz";
-        sha512 = "DdmyoGCleJnkbp3nkbxTLJ18rjDsE4yCggEwKNXkeV123sPNfOCYeDoeuOY+F2FrSjO1YXcTU+dsy96KMy+gcg==";
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz";
+        sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==";
       };
     };
     "body-parser-1.19.0" = {
@@ -850,13 +931,13 @@ let
         sha512 = "TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==";
       };
     };
-    "boxen-4.1.0" = {
+    "boxen-4.2.0" = {
       name = "boxen";
       packageName = "boxen";
-      version = "4.1.0";
+      version = "4.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/boxen/-/boxen-4.1.0.tgz";
-        sha512 = "Iwq1qOkmEsl0EVABa864Bbj3HCL4186DRZgFW/NrFs5y5GMM3ljsxzMLgOHdWISDRvcM8beh8q4tTNzXz+mSKg==";
+        url = "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz";
+        sha512 = "eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==";
       };
     };
     "brace-expansion-1.1.11" = {
@@ -967,6 +1048,24 @@ let
         sha1 = "0d808801b6342ad33c91df9d0b44dc09b91e5c3d";
       };
     };
+    "cachedir-2.3.0" = {
+      name = "cachedir";
+      packageName = "cachedir";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz";
+        sha512 = "A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==";
+      };
+    };
+    "call-me-maybe-1.0.1" = {
+      name = "call-me-maybe";
+      packageName = "call-me-maybe";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz";
+        sha1 = "26d208ea89e37b5cbde60250a15f031c16a4d66b";
+      };
+    };
     "camelcase-4.1.0" = {
       name = "camelcase";
       packageName = "camelcase";
@@ -1102,13 +1201,13 @@ let
         sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==";
       };
     };
-    "clean-deep-3.1.0" = {
+    "clean-deep-3.2.0" = {
       name = "clean-deep";
       packageName = "clean-deep";
-      version = "3.1.0";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clean-deep/-/clean-deep-3.1.0.tgz";
-        sha512 = "uVHIbqQ7RqIu5JOApJ6G28x0L58Uu8lt0ACOZd0EUWYxrqOgbTB4rM0/J3xFZ2ozKHQDMp2bhkhP/EM95CkYwA==";
+        url = "https://registry.npmjs.org/clean-deep/-/clean-deep-3.2.0.tgz";
+        sha512 = "YA2SBZnGnbq1MnV17UsjKERWJiT/cTPjCtT7xSxZ/DTcPQGdfWKjlP/FfjKXTyfkMGUhNvOD1Oq7IzTbHfUv9g==";
       };
     };
     "clean-stack-1.3.0" = {
@@ -1156,6 +1255,15 @@ let
         sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5";
       };
     };
+    "cli-progress-3.4.0" = {
+      name = "cli-progress";
+      packageName = "cli-progress";
+      version = "3.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli-progress/-/cli-progress-3.4.0.tgz";
+        sha512 = "35zcc1FsbPfN2dVonxUQwEnqMnI5kDFx2G4qGFGWgIDYqZ6+3t4/GjX/Vk0tq6bNgI9dEFcWLJ6AaLN17NLBDA==";
+      };
+    };
     "cli-spinners-1.3.1" = {
       name = "cli-spinners";
       packageName = "cli-spinners";
@@ -1183,13 +1291,13 @@ let
         sha512 = "/1owvF0SZ5Gn54cgrikJ0QskgTzeg30HGjkmjFoaHDJzAqFpuX1DBpFR8aLvsE1J5s9MgeYRENQK4BFwOag5VA==";
       };
     };
-    "cli-ux-5.3.3" = {
+    "cli-ux-5.4.0" = {
       name = "cli-ux";
       packageName = "cli-ux";
-      version = "5.3.3";
+      version = "5.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cli-ux/-/cli-ux-5.3.3.tgz";
-        sha512 = "a16g+BTjASUH41s1pevai4P3JKwhx85wkOSm6sXWsk6KkdSmDeJ16pSCn2x3nqK7W8n35igOu2YiW+qFkqLRJg==";
+        url = "https://registry.npmjs.org/cli-ux/-/cli-ux-5.4.0.tgz";
+        sha512 = "j5GmlUJEc37SHILLQAUL+4NymK1sjcM+kmwnmRSnzzCOisbFE4zotrN8BBKQhFEyOpqFxUdbuP0sdc8YEGF6VA==";
       };
     };
     "cli-width-2.2.0" = {
@@ -1489,22 +1597,22 @@ let
         sha512 = "xkXSJhvKz4MfLbVkZ7GyCaFo4ciB3uKI/HHzkGwj1eyTH5+7RTFxW5CE0irWAZgV5oFcO9hd6+NVXAtY9hlo7Q==";
       };
     };
-    "core-js-2.6.10" = {
+    "core-js-2.6.11" = {
       name = "core-js";
       packageName = "core-js";
-      version = "2.6.10";
+      version = "2.6.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-2.6.10.tgz";
-        sha512 = "I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA==";
+        url = "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz";
+        sha512 = "5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==";
       };
     };
-    "core-js-3.4.1" = {
+    "core-js-3.5.0" = {
       name = "core-js";
       packageName = "core-js";
-      version = "3.4.1";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-3.4.1.tgz";
-        sha512 = "KX/dnuY/J8FtEwbnrzmAjUYgLqtk+cxM86hfG60LGiW3MmltIc2yAmDgBgEkfm0blZhUrdr1Zd84J2Y14mLxzg==";
+        url = "https://registry.npmjs.org/core-js/-/core-js-3.5.0.tgz";
+        sha512 = "Ifh3kj78gzQ7NAoJXeTu+XwzDld0QRIwjBLRqAMhuLhP3d2Av5wmgE9ycfnvK6NAEjTkQ1sDPeoEZAWO3Hx1Uw==";
       };
     };
     "core-util-is-1.0.2" = {
@@ -1516,6 +1624,15 @@ let
         sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
       };
     };
+    "cp-file-6.2.0" = {
+      name = "cp-file";
+      packageName = "cp-file";
+      version = "6.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cp-file/-/cp-file-6.2.0.tgz";
+        sha512 = "fmvV4caBnofhPe8kOcitBwSn2f39QLjnAnGq3gO9dfd75mUytzKNZB1hde6QHunW2Rt+OwuBOMc3i1tNElbszA==";
+      };
+    };
     "cp-file-7.0.0" = {
       name = "cp-file";
       packageName = "cp-file";
@@ -1525,6 +1642,15 @@ let
         sha512 = "0Cbj7gyvFVApzpK/uhCtQ/9kE9UnYpxMzaq5nQQC/Dh4iaj5fxp7iEFIullrYwzj8nf0qnsI1Qsx34hAeAebvw==";
       };
     };
+    "cpy-7.3.0" = {
+      name = "cpy";
+      packageName = "cpy";
+      version = "7.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cpy/-/cpy-7.3.0.tgz";
+        sha512 = "auvDu6h/J+cO1uqV40ymL/VoPM0+qPpNGaNttTzkYVXO/+GeynuyAK/MwFcWgU/P82ezcZw7RaN34CIIWajKLA==";
+      };
+    };
     "crc-3.8.0" = {
       name = "crc";
       packageName = "crc";
@@ -1813,6 +1939,15 @@ let
         sha512 = "jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==";
       };
     };
+    "del-5.1.0" = {
+      name = "del";
+      packageName = "del";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/del/-/del-5.1.0.tgz";
+        sha512 = "wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA==";
+      };
+    };
     "depd-1.1.2" = {
       name = "depd";
       packageName = "depd";
@@ -1921,6 +2056,24 @@ let
         sha512 = "4SQeACXWAjIOsd2kJykPL8gWC9nVA+z8w7KtAdtd/7BCpDfrpI2ZA7pdhsmHv/zxf3ofeqpYi72vCkZ65bAjtA==";
       };
     };
+    "dir-glob-2.2.2" = {
+      name = "dir-glob";
+      packageName = "dir-glob";
+      version = "2.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz";
+        sha512 = "f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==";
+      };
+    };
+    "dir-glob-3.0.1" = {
+      name = "dir-glob";
+      packageName = "dir-glob";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz";
+        sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==";
+      };
+    };
     "dockerfile-ast-0.0.12" = {
       name = "dockerfile-ast";
       packageName = "dockerfile-ast";
@@ -2074,13 +2227,13 @@ let
         sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==";
       };
     };
-    "envinfo-7.4.0" = {
+    "envinfo-7.5.0" = {
       name = "envinfo";
       packageName = "envinfo";
-      version = "7.4.0";
+      version = "7.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/envinfo/-/envinfo-7.4.0.tgz";
-        sha512 = "FdDfnWnCVjxTTpWE3d6Jgh5JDIA3Cw7LCgpM/pI7kK1ORkjaqI2r6NqQ+ln2j0dfpgxY00AWieSvtkiZQKIItA==";
+        url = "https://registry.npmjs.org/envinfo/-/envinfo-7.5.0.tgz";
+        sha512 = "jDgnJaF/Btomk+m3PZDTTCb5XIIIX3zYItnCRfF73zVgvinLoRomuhi75Y4su0PtQxWz4v66XnLLckyvyJTOIQ==";
       };
     };
     "error-ex-1.3.2" = {
@@ -2092,13 +2245,13 @@ let
         sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==";
       };
     };
-    "es-abstract-1.16.0" = {
+    "es-abstract-1.17.0-next.1" = {
       name = "es-abstract";
       packageName = "es-abstract";
-      version = "1.16.0";
+      version = "1.17.0-next.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.16.0.tgz";
-        sha512 = "xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg==";
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.0-next.1.tgz";
+        sha512 = "7MmGr03N7Rnuid6+wyhD9sHNE2n4tFSwExnU2lQl3lIo2ShXWGePY80zYaoMOmILWv57H0amMjZGHNzzGG70Rw==";
       };
     };
     "es-to-primitive-1.2.1" = {
@@ -2254,13 +2407,13 @@ let
         sha512 = "Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw==";
       };
     };
-    "execa-3.3.0" = {
+    "execa-3.4.0" = {
       name = "execa";
       packageName = "execa";
-      version = "3.3.0";
+      version = "3.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/execa/-/execa-3.3.0.tgz";
-        sha512 = "j5Vit5WZR/cbHlqU97+qcnw9WHRCIL4V1SVe75VcHcD1JRBdt8fv0zw89b7CQHQdUHTt2VjuhcF5ibAgVOxqpg==";
+        url = "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz";
+        sha512 = "r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==";
       };
     };
     "expand-brackets-2.1.4" = {
@@ -2380,13 +2533,22 @@ let
         sha512 = "4WKW0AL5+WEqO0zWavAfYGY1qwLsBgE//DN4TTcVEN2UlINgkv9b3vm2iHicoenWKSX9mKWmGOsU/iI5IST7pQ==";
       };
     };
-    "fast-glob-3.1.0" = {
+    "fast-glob-2.2.7" = {
       name = "fast-glob";
       packageName = "fast-glob";
-      version = "3.1.0";
+      version = "2.2.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz";
+        sha512 = "g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==";
+      };
+    };
+    "fast-glob-3.1.1" = {
+      name = "fast-glob";
+      packageName = "fast-glob";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.1.0.tgz";
-        sha512 = "TrUz3THiq2Vy3bjfQUB2wNyPdGBeGmdjbzzBLhfHN4YFurYptCKwGq/TfiRavbGywFRzY6U2CdmQ1zmsY5yYaw==";
+        url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.1.1.tgz";
+        sha512 = "nTCREpBY8w8r+boyFYAx21iL6faSsQynliPHM4Uf56SbkyohCNxpVPEH9xrF5TXKy+IsjkPUHDKiUkzBVRXn9g==";
       };
     };
     "fast-json-stable-stringify-2.0.0" = {
@@ -2569,6 +2731,15 @@ let
         sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==";
       };
     };
+    "find-process-1.4.3" = {
+      name = "find-process";
+      packageName = "find-process";
+      version = "1.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find-process/-/find-process-1.4.3.tgz";
+        sha512 = "+IA+AUsQCf3uucawyTwMWcY+2M3FXq3BRvw3S+j5Jvydjk31f/+NPWpYZOJs+JUs2GvxH4Yfr6Wham0ZtRLlPA==";
+      };
+    };
     "find-up-3.0.0" = {
       name = "find-up";
       packageName = "find-up";
@@ -2902,6 +3073,15 @@ let
         sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==";
       };
     };
+    "glob-parent-3.1.0" = {
+      name = "glob-parent";
+      packageName = "glob-parent";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz";
+        sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae";
+      };
+    };
     "glob-parent-5.1.0" = {
       name = "glob-parent";
       packageName = "glob-parent";
@@ -2911,6 +3091,24 @@ let
         sha512 = "qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==";
       };
     };
+    "glob-to-regexp-0.3.0" = {
+      name = "glob-to-regexp";
+      packageName = "glob-to-regexp";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz";
+        sha1 = "8c5a1494d2066c570cc3bfe4496175acc4d502ab";
+      };
+    };
+    "global-cache-dir-1.0.1" = {
+      name = "global-cache-dir";
+      packageName = "global-cache-dir";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/global-cache-dir/-/global-cache-dir-1.0.1.tgz";
+        sha512 = "wYGh6O3Xkx1LsMXQpObr/uu3PsFpbWhpbslgn9Xq52rbDZ6YOwJcQtU5R4lSEQgCDtXLItV9EH5X1F/VnBTAlw==";
+      };
+    };
     "global-dirs-0.1.1" = {
       name = "global-dirs";
       packageName = "global-dirs";
@@ -2920,6 +3118,24 @@ let
         sha1 = "b319c0dd4607f353f3be9cca4c72fc148c49f445";
       };
     };
+    "globby-10.0.1" = {
+      name = "globby";
+      packageName = "globby";
+      version = "10.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/globby/-/globby-10.0.1.tgz";
+        sha512 = "sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==";
+      };
+    };
+    "globby-9.2.0" = {
+      name = "globby";
+      packageName = "globby";
+      version = "9.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/globby/-/globby-9.2.0.tgz";
+        sha512 = "ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==";
+      };
+    };
     "gonzales-pe-4.2.4" = {
       name = "gonzales-pe";
       packageName = "gonzales-pe";
@@ -3109,13 +3325,13 @@ let
         sha512 = "5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==";
       };
     };
-    "http-call-5.2.5" = {
+    "http-call-5.3.0" = {
       name = "http-call";
       packageName = "http-call";
-      version = "5.2.5";
+      version = "5.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-call/-/http-call-5.2.5.tgz";
-        sha512 = "SfJ9j2xfi8zhQuJxcBCN1AhPCUAvPhipNaoeHWHfHiV0gz4uf9RUt2kl+xu9mxJLKxhNP7We87aRGbaSGPjr8A==";
+        url = "https://registry.npmjs.org/http-call/-/http-call-5.3.0.tgz";
+        sha512 = "ahwimsC23ICE4kPl9xTBjKB4inbRaeLyZeRunC/1Jy/Z6X8tv22MEAjK+KBOMSVLaqXPTTmd8638waVIKLGx2w==";
       };
     };
     "http-errors-1.7.2" = {
@@ -3199,6 +3415,24 @@ let
         sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==";
       };
     };
+    "ignore-4.0.6" = {
+      name = "ignore";
+      packageName = "ignore";
+      version = "4.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz";
+        sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==";
+      };
+    };
+    "ignore-5.1.4" = {
+      name = "ignore";
+      packageName = "ignore";
+      version = "5.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz";
+        sha512 = "MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==";
+      };
+    };
     "ignore-walk-3.0.3" = {
       name = "ignore-walk";
       packageName = "ignore-walk";
@@ -3496,6 +3730,15 @@ let
         sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==";
       };
     };
+    "is-glob-3.1.0" = {
+      name = "is-glob";
+      packageName = "is-glob";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz";
+        sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a";
+      };
+    };
     "is-glob-4.0.1" = {
       name = "is-glob";
       packageName = "is-glob";
@@ -3577,6 +3820,15 @@ let
         sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470";
       };
     };
+    "is-path-cwd-2.2.0" = {
+      name = "is-path-cwd";
+      packageName = "is-path-cwd";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz";
+        sha512 = "w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==";
+      };
+    };
     "is-path-inside-1.0.1" = {
       name = "is-path-inside";
       packageName = "is-path-inside";
@@ -3586,6 +3838,15 @@ let
         sha1 = "8ef5b7de50437a3fdca6b4e865ef7aa55cb48036";
       };
     };
+    "is-path-inside-3.0.2" = {
+      name = "is-path-inside";
+      packageName = "is-path-inside";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz";
+        sha512 = "/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==";
+      };
+    };
     "is-plain-obj-1.1.0" = {
       name = "is-plain-obj";
       packageName = "is-plain-obj";
@@ -3685,13 +3946,13 @@ let
         sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==";
       };
     };
-    "is-symbol-1.0.2" = {
+    "is-symbol-1.0.3" = {
       name = "is-symbol";
       packageName = "is-symbol";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz";
-        sha512 = "HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==";
+        url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz";
+        sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==";
       };
     };
     "is-typedarray-1.0.0" = {
@@ -4378,6 +4639,15 @@ let
         sha512 = "2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==";
       };
     };
+    "make-dir-2.1.0" = {
+      name = "make-dir";
+      packageName = "make-dir";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz";
+        sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==";
+      };
+    };
     "make-dir-3.0.0" = {
       name = "make-dir";
       packageName = "make-dir";
@@ -4648,13 +4918,13 @@ let
         sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
       };
     };
-    "module-definition-3.2.0" = {
+    "module-definition-3.3.0" = {
       name = "module-definition";
       packageName = "module-definition";
-      version = "3.2.0";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/module-definition/-/module-definition-3.2.0.tgz";
-        sha512 = "PO6o0BajpdRR+fb3FUSeDISgJpnyxg8UDUEalR8LPQajl0M5+m4jHWhgrMGGSEl6D9+sVl/l1fjOCvpBXIQ+2Q==";
+        url = "https://registry.npmjs.org/module-definition/-/module-definition-3.3.0.tgz";
+        sha512 = "HTplA9xwDzH67XJFC1YvZMUElWJD28DV0dUq7lhTs+JKJamUOWA/CcYWSlhW5amJO66uWtY7XdltT+LfX0wIVg==";
       };
     };
     "moize-5.4.4" = {
@@ -4675,6 +4945,15 @@ let
         sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==";
       };
     };
+    "move-file-1.2.0" = {
+      name = "move-file";
+      packageName = "move-file";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/move-file/-/move-file-1.2.0.tgz";
+        sha512 = "USHrRmxzGowUWAGBbJPdFjHzEqtxDU03pLHY0Rfqgtnq+q8FOIs8wvkkf+Udmg77SJKs47y9sI0jJvQeYsmiCA==";
+      };
+    };
     "mri-1.1.4" = {
       name = "mri";
       packageName = "mri";
@@ -4792,6 +5071,15 @@ let
         sha512 = "htYbhZ0+pd6nazyoc874N9i3MiVyxe2Pm2ooZShkaRmf/e9NmgS5cOs+a4hvHGbye7tCnF78RV1i4JYAs0t3mw==";
       };
     };
+    "netlify-3.0.0" = {
+      name = "netlify";
+      packageName = "netlify";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/netlify/-/netlify-3.0.0.tgz";
+        sha512 = "/D0Y8qSUggcpgW3XHkHIE0Pjd89Dl1PoxfptoqBnWpSSVKCsnfhhxmYkmIpBHILSzVT3wePJHO3yOnF5PpQSqg==";
+      };
+    };
     "netlify-cli-logo-1.0.0" = {
       name = "netlify-cli-logo";
       packageName = "netlify-cli-logo";
@@ -4801,6 +5089,15 @@ let
         sha512 = "+lTytTFc1y6RRN1UCmYcbBn+km0C66q2Qjzbz8/vFfMyyY1LbLVWBThbVgv1KVUxZDeciY9G8oOoiRKcSKyovA==";
       };
     };
+    "netlify-redirect-parser-1.0.3" = {
+      name = "netlify-redirect-parser";
+      packageName = "netlify-redirect-parser";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-1.0.3.tgz";
+        sha512 = "NDQKgrN5DgWIYvEyVRG8OgiM1KV140D+4f8rJkqbTCKj32uXokMuJ38woTyGnqBb565ygiFuU6uA0czHbvGxaw==";
+      };
+    };
     "netlify-redirector-0.1.0" = {
       name = "netlify-redirector";
       packageName = "netlify-redirector";
@@ -4891,13 +5188,13 @@ let
         sha512 = "U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==";
       };
     };
-    "npm-bundled-1.0.6" = {
+    "npm-bundled-1.1.1" = {
       name = "npm-bundled";
       packageName = "npm-bundled";
-      version = "1.0.6";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz";
-        sha512 = "8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==";
+        url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz";
+        sha512 = "gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==";
       };
     };
     "npm-conf-1.1.3" = {
@@ -4909,13 +5206,22 @@ let
         sha512 = "Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==";
       };
     };
-    "npm-packlist-1.4.6" = {
+    "npm-normalize-package-bin-1.0.1" = {
+      name = "npm-normalize-package-bin";
+      packageName = "npm-normalize-package-bin";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz";
+        sha512 = "EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==";
+      };
+    };
+    "npm-packlist-1.4.7" = {
       name = "npm-packlist";
       packageName = "npm-packlist";
-      version = "1.4.6";
+      version = "1.4.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.6.tgz";
-        sha512 = "u65uQdb+qwtGvEJh/DgQgW1Xg7sqeNbmxYyrvlNznaVTjV3E5P6F/EFjM+BVHXl7JJlsdG8A64M0XI8FI/IOlg==";
+        url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.7.tgz";
+        sha512 = "vAj7dIkp5NhieaGZxBJB8fF4R0078rqsmhJcAfXZ6O7JJhjhPK96n5Ry1oZcfLXgfun0GWTZPOxaEyqv8GBykQ==";
       };
     };
     "npm-run-path-2.0.2" = {
@@ -4990,13 +5296,22 @@ let
         sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb";
       };
     };
-    "object.getownpropertydescriptors-2.0.3" = {
+    "object.assign-4.1.0" = {
+      name = "object.assign";
+      packageName = "object.assign";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz";
+        sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==";
+      };
+    };
+    "object.getownpropertydescriptors-2.1.0" = {
       name = "object.getownpropertydescriptors";
       packageName = "object.getownpropertydescriptors";
-      version = "2.0.3";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz";
-        sha1 = "8758c846f5b407adab0f236e0986f14b051caa16";
+        url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz";
+        sha512 = "Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==";
       };
     };
     "object.pick-1.3.0" = {
@@ -5377,6 +5692,15 @@ let
         sha512 = "bpuBhROdrhuN3E7G/koAju0WjVw9/uQOG5Co5mokNj0MiOSBVZS1JTwM4zl55hu0WFmIEFvO9cU9sJQiBIYeIA==";
       };
     };
+    "path-dirname-1.0.2" = {
+      name = "path-dirname";
+      packageName = "path-dirname";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz";
+        sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0";
+      };
+    };
     "path-exists-3.0.0" = {
       name = "path-exists";
       packageName = "path-exists";
@@ -5422,13 +5746,13 @@ let
         sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40";
       };
     };
-    "path-key-3.1.0" = {
+    "path-key-3.1.1" = {
       name = "path-key";
       packageName = "path-key";
-      version = "3.1.0";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/path-key/-/path-key-3.1.0.tgz";
-        sha512 = "8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg==";
+        url = "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz";
+        sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==";
       };
     };
     "path-parse-1.0.6" = {
@@ -5458,6 +5782,15 @@ let
         sha512 = "T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==";
       };
     };
+    "path-type-4.0.0" = {
+      name = "path-type";
+      packageName = "path-type";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz";
+        sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==";
+      };
+    };
     "pend-1.2.0" = {
       name = "pend";
       packageName = "pend";
@@ -5539,13 +5872,13 @@ let
         sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab";
       };
     };
-    "postcss-7.0.23" = {
+    "postcss-7.0.24" = {
       name = "postcss";
       packageName = "postcss";
-      version = "7.0.23";
+      version = "7.0.24";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss/-/postcss-7.0.23.tgz";
-        sha512 = "hOlMf3ouRIFXD+j2VJecwssTwbvsPGJVMzupptg+85WA+i7MwyrydmQAgY3R+m0Bc0exunhbJmijy8u8+vufuQ==";
+        url = "https://registry.npmjs.org/postcss/-/postcss-7.0.24.tgz";
+        sha512 = "Xl0XvdNWg+CblAXzNvbSOUvgJXwSjmbAKORqyw9V2AlHrm1js2gFw9y3jibBAhpKZi8b5JzJCVh/FyzPsTtgTA==";
       };
     };
     "postcss-values-parser-1.5.0" = {
@@ -5557,13 +5890,13 @@ let
         sha512 = "3M3p+2gMp0AH3da530TlX8kiO1nxdTnc3C6vr8dMxRLIlh8UYkz0/wcwptSXjhtx2Fr0TySI7a+BHDQ8NL7LaQ==";
       };
     };
-    "precinct-6.1.2" = {
+    "precinct-6.2.0" = {
       name = "precinct";
       packageName = "precinct";
-      version = "6.1.2";
+      version = "6.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/precinct/-/precinct-6.1.2.tgz";
-        sha512 = "Mk+oWvR7N2D2EY+5vKNnnXPGor1aU3ZbkcHp2ER68el5PL1nmZsvpq41s69emiNMSuL6TMoIeTabvwfe5w7vNg==";
+        url = "https://registry.npmjs.org/precinct/-/precinct-6.2.0.tgz";
+        sha512 = "BCAmnOxZzobF3H1/h/gq70pEyvX/BVLWCrzi8beFD22dqu5Z14qOghNUsI24Wg8oaTsGFcIjOGtFX5L9ttmjVg==";
       };
     };
     "precond-0.2.3" = {
@@ -5638,13 +5971,13 @@ let
         sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==";
       };
     };
-    "promise.prototype.finally-3.1.1" = {
+    "promise.prototype.finally-3.1.2" = {
       name = "promise.prototype.finally";
       packageName = "promise.prototype.finally";
-      version = "3.1.1";
+      version = "3.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.1.tgz";
-        sha512 = "gnt8tThx0heJoI3Ms8a/JdkYBVhYP/wv+T7yQimR+kdOEJL21xTFbiJhMRqnSPcr54UVvMbsscDk2w+ivyaLPw==";
+        url = "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.2.tgz";
+        sha512 = "A2HuJWl2opDH0EafgdjwEw7HysI8ff/n4lW4QEVBCUXFk9QeGecBWv0Deph0UmLe3tTNYegz8MOjsVuE6SMoJA==";
       };
     };
     "proto-list-1.2.4" = {
@@ -5719,6 +6052,15 @@ let
         sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==";
       };
     };
+    "qs-6.9.1" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.9.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-6.9.1.tgz";
+        sha512 = "Cxm7/SS/y/Z3MHWSxXb8lIFqgqBowP5JMlTUFyJN88y0SGQhVmZnqFK/PeuMX9LzUyWsqqhNxIyg0jlzq946yA==";
+      };
+    };
     "query-string-5.1.1" = {
       name = "query-string";
       packageName = "query-string";
@@ -5854,6 +6196,15 @@ let
         sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==";
       };
     };
+    "readdirp-3.3.0" = {
+      name = "readdirp";
+      packageName = "readdirp";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz";
+        sha512 = "zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==";
+      };
+    };
     "redact-env-0.2.0" = {
       name = "redact-env";
       packageName = "redact-env";
@@ -6007,13 +6358,13 @@ let
         sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff";
       };
     };
-    "resolve-1.12.0" = {
+    "resolve-1.13.1" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.12.0";
+      version = "1.13.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz";
-        sha512 = "B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.13.1.tgz";
+        sha512 = "CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w==";
       };
     };
     "resolve-url-0.2.1" = {
@@ -6079,6 +6430,15 @@ let
         sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==";
       };
     };
+    "rimraf-3.0.0" = {
+      name = "rimraf";
+      packageName = "rimraf";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.0.tgz";
+        sha512 = "NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg==";
+      };
+    };
     "run-async-2.3.0" = {
       name = "run-async";
       packageName = "run-async";
@@ -6295,6 +6655,24 @@ let
         sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
       };
     };
+    "slash-2.0.0" = {
+      name = "slash";
+      packageName = "slash";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz";
+        sha512 = "ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==";
+      };
+    };
+    "slash-3.0.0" = {
+      name = "slash";
+      packageName = "slash";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz";
+        sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==";
+      };
+    };
     "snapdragon-0.8.2" = {
       name = "snapdragon";
       packageName = "snapdragon";
@@ -6997,6 +7375,15 @@ let
         sha512 = "q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==";
       };
     };
+    "type-fest-0.8.1" = {
+      name = "type-fest";
+      packageName = "type-fest";
+      version = "0.8.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz";
+        sha512 = "4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==";
+      };
+    };
     "type-is-1.6.18" = {
       name = "type-is";
       packageName = "type-is";
@@ -7015,13 +7402,13 @@ let
         sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==";
       };
     };
-    "typescript-3.7.2" = {
+    "typescript-3.7.3" = {
       name = "typescript";
       packageName = "typescript";
-      version = "3.7.2";
+      version = "3.7.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-3.7.2.tgz";
-        sha512 = "ml7V7JfiN2Xwvcer+XAf2csGO1bPBdRbFCkYBczNZggrBZ9c7G3riSUeJmqEU5uOtXNPMhE3n+R4FA/3YOAWOQ==";
+        url = "https://registry.npmjs.org/typescript/-/typescript-3.7.3.tgz";
+        sha512 = "Mcr/Qk7hXqFBXMN7p7Lusj1ktCBydylfQM/FZCk5glCNQJrCUKPkMHdo9R0MTFWsC/4kPFvDS0fDPvukfCkFsw==";
       };
     };
     "unbzip2-stream-1.3.3" = {
@@ -7249,13 +7636,13 @@ let
         sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc";
       };
     };
-    "vscode-json-languageservice-3.4.7" = {
+    "vscode-json-languageservice-3.4.9" = {
       name = "vscode-json-languageservice";
       packageName = "vscode-json-languageservice";
-      version = "3.4.7";
+      version = "3.4.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.4.7.tgz";
-        sha512 = "y3MN2+/yph3yoIHGmHu4ScYpm285L58XVvfGkd49xTQzLja4apxSbwzsYcP9QsqS0W7KuvoyiPhqksiudoMwjg==";
+        url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.4.9.tgz";
+        sha512 = "4VCpZ9ooea/Zc/MTnj1ccc9C7rqcoinKVQLhLoi6jw6yueSf4y4tg/YIUiPPVMlEAG7ZCPS+NVmqxisQ+mOsSw==";
       };
     };
     "vscode-jsonrpc-4.0.0" = {
@@ -7303,13 +7690,13 @@ let
         sha512 = "lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==";
       };
     };
-    "vscode-languageserver-types-3.15.0-next.8" = {
+    "vscode-languageserver-types-3.15.0-next.9" = {
       name = "vscode-languageserver-types";
       packageName = "vscode-languageserver-types";
-      version = "3.15.0-next.8";
+      version = "3.15.0-next.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.8.tgz";
-        sha512 = "AEfWrSNyeamWMKPehh/kd3nBnKD9ZGCPhzfxMnW9YNqElSh28G2+Puk3knIQWyaWyV6Bzh28ok9BRJsPzXFCkQ==";
+        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.9.tgz";
+        sha512 = "Rl/8qJ6932nrHCdPn+9y0x08uLVQaSLRG+U4JzhyKpWU4eJbVaDRoAcz1Llj7CErJGbPr6kdBvShPy5fRfR+Uw==";
       };
     };
     "vscode-languageserver-types-3.6.0" = {
@@ -7348,13 +7735,13 @@ let
         sha512 = "eY9jmGoEnVf8VE8xr5znSah7Qt1P/xsCdErz+g8HYZtJ7bZqKH5E3d+6oVNm1AC/c6IHUDokbmVXKOi4qPAC9A==";
       };
     };
-    "wait-port-0.2.6" = {
+    "wait-port-0.2.7" = {
       name = "wait-port";
       packageName = "wait-port";
-      version = "0.2.6";
+      version = "0.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wait-port/-/wait-port-0.2.6.tgz";
-        sha512 = "nXE5Yp0Zs1obhFVc0Da7WVJc3y0LxoCq3j4mtV0NdI5P/ZvRdKp5yhuojvMOcOxSwpQL1hGbOgMNQ+4wpRpwCA==";
+        url = "https://registry.npmjs.org/wait-port/-/wait-port-0.2.7.tgz";
+        sha512 = "pJ6cSBIa0w1sDg4y/wXN4bmvhM9OneOvwdFHo647L2NShBi/oXG4lRaLic5cO1HaYGbUhEvratPfl/WMlIC+tg==";
       };
     };
     "wcwidth-1.0.1" = {
@@ -7582,13 +7969,13 @@ let
         sha512 = "H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg==";
       };
     };
-    "yarn-1.19.1" = {
+    "yarn-1.21.1" = {
       name = "yarn";
       packageName = "yarn";
-      version = "1.19.1";
+      version = "1.21.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yarn/-/yarn-1.19.1.tgz";
-        sha512 = "gBnfbL9rYY05Gt0cjJhs/siqQXHYlZalTjK3nXn2QO20xbkIFPob+LlH44ML47GcR4VU9/2dYck1BWFM0Javxw==";
+        url = "https://registry.npmjs.org/yarn/-/yarn-1.21.1.tgz";
+        sha512 = "dQgmJv676X/NQczpbiDtc2hsE/pppGDJAzwlRiADMTvFzYbdxPj2WO4PcNyriSt2c4jsCMpt8UFRKHUozt21GQ==";
       };
     };
     "yauzl-2.10.0" = {
@@ -7622,7 +8009,7 @@ in
     };
     dependencies = [
       sources."ansi-styles-3.2.1"
-      sources."bluebird-3.7.1"
+      sources."bluebird-3.7.2"
       sources."camelcase-4.1.0"
       sources."camelcase-keys-4.2.0"
       (sources."chalk-2.4.2" // {
@@ -7658,7 +8045,7 @@ in
       sources."prettier-1.19.1"
       sources."pseudomap-1.0.2"
       sources."quick-lru-1.1.0"
-      sources."resolve-1.12.0"
+      sources."resolve-1.13.1"
       sources."semver-5.7.1"
       sources."sigmund-1.0.1"
       sources."strip-json-comments-2.0.1"
@@ -7745,9 +8132,9 @@ in
       sources."prettier-1.19.1"
       sources."request-light-0.2.5"
       sources."sprintf-js-1.0.3"
-      (sources."vscode-json-languageservice-3.4.7" // {
+      (sources."vscode-json-languageservice-3.4.9" // {
         dependencies = [
-          sources."vscode-languageserver-types-3.15.0-next.8"
+          sources."vscode-languageserver-types-3.15.0-next.9"
         ];
       })
       sources."vscode-jsonrpc-4.0.0"
@@ -7833,10 +8220,10 @@ in
   pino-pretty = nodeEnv.buildNodePackage {
     name = "pino-pretty";
     packageName = "pino-pretty";
-    version = "3.4.0";
+    version = "3.5.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pino-pretty/-/pino-pretty-3.4.0.tgz";
-      sha512 = "0oEHicFdUCh2tFHQnTX7b9jph+S/UibLMuhBF0yFkt+7JGZGQejNkui27B9qPUofwmqKAf3FfLYvponPyNsQJw==";
+      url = "https://registry.npmjs.org/pino-pretty/-/pino-pretty-3.5.0.tgz";
+      sha512 = "3sg6s7nI5vgjrEBKhLckAfLPjgjm1U/Fw0C6jhoWnIU2D6QqCpF8eAqL+E1A6bBglCGR/APCx8VuxchBxtuMjA==";
     };
     dependencies = [
       sources."@hapi/bourne-1.3.2"
@@ -7880,22 +8267,23 @@ in
   netlify-cli = nodeEnv.buildNodePackage {
     name = "netlify-cli";
     packageName = "netlify-cli";
-    version = "2.21.0";
+    version = "2.25.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.21.0.tgz";
-      sha512 = "zUVPXHo1HwyXtsuKny4W1cKWBLAxsTMkdDsbSCpTK/2bwZgixUXWxk2bT/xMBYH+9Xb0SOnhfeEiDYqQ7uRB1Q==";
+      url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.25.0.tgz";
+      sha512 = "jblYmk9Pv12r2YpUSfNhck1S2It+KkYpT1/+5H1a7+6Dk7Dil+94BaxS52437G8RYczHc9Y1YRpopOo9+8FwQw==";
     };
     dependencies = [
       sources."@analytics/cookie-utils-0.2.2"
       sources."@analytics/storage-utils-0.2.2"
       sources."@babel/code-frame-7.5.5"
       sources."@babel/highlight-7.5.0"
-      sources."@babel/parser-7.7.3"
+      sources."@babel/parser-7.7.5"
       sources."@iarna/toml-2.2.3"
       sources."@jest/types-24.9.0"
-      (sources."@netlify/build-0.1.23" // {
+      sources."@mrmlnc/readdir-enhanced-2.2.1"
+      (sources."@netlify/build-0.1.30" // {
         dependencies = [
-          (sources."@netlify/zip-it-and-ship-it-0.4.0-7" // {
+          (sources."@netlify/zip-it-and-ship-it-0.4.0-8" // {
             dependencies = [
               sources."find-up-3.0.0"
               sources."string-width-3.1.0"
@@ -7905,7 +8293,7 @@ in
           })
           sources."ansi-styles-4.2.0"
           sources."chalk-3.0.0"
-          sources."execa-3.3.0"
+          sources."execa-3.4.0"
           (sources."find-up-4.1.0" // {
             dependencies = [
               sources."locate-path-5.0.0"
@@ -7917,10 +8305,22 @@ in
               sources."path-exists-3.0.0"
             ];
           })
+          (sources."netlify-3.0.0" // {
+            dependencies = [
+              sources."@netlify/zip-it-and-ship-it-0.3.1"
+              sources."p-map-2.1.0"
+            ];
+          })
           sources."p-locate-3.0.0"
+          (sources."read-pkg-up-4.0.0" // {
+            dependencies = [
+              sources."find-up-3.0.0"
+            ];
+          })
+          sources."rimraf-2.7.1"
         ];
       })
-      (sources."@netlify/config-0.1.8" // {
+      (sources."@netlify/config-0.1.12" // {
         dependencies = [
           sources."ansi-styles-4.2.0"
           sources."chalk-3.0.0"
@@ -7933,8 +8333,12 @@ in
           sources."read-pkg-up-4.0.0"
         ];
       })
-      sources."@nodelib/fs.scandir-2.1.3"
-      sources."@nodelib/fs.stat-2.0.3"
+      (sources."@nodelib/fs.scandir-2.1.3" // {
+        dependencies = [
+          sources."@nodelib/fs.stat-2.0.3"
+        ];
+      })
+      sources."@nodelib/fs.stat-1.1.3"
       sources."@nodelib/fs.walk-1.2.4"
       (sources."@oclif/color-0.0.0" // {
         dependencies = [
@@ -7965,7 +8369,7 @@ in
       })
       sources."@oclif/linewrap-1.0.0"
       sources."@oclif/parser-3.8.4"
-      (sources."@oclif/plugin-help-2.2.1" // {
+      (sources."@oclif/plugin-help-2.2.2" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
           sources."indent-string-3.2.0"
@@ -7994,12 +8398,21 @@ in
           sources."fs-extra-7.0.1"
           sources."load-json-file-5.3.0"
           sources."npm-run-path-3.1.0"
-          sources."pify-4.0.1"
         ];
       })
       sources."@oclif/screen-1.0.4"
-      sources."@octokit/endpoint-5.5.1"
-      sources."@octokit/request-5.3.1"
+      (sources."@octokit/endpoint-5.5.1" // {
+        dependencies = [
+          sources."is-plain-object-3.0.0"
+          sources."isobject-4.0.0"
+        ];
+      })
+      (sources."@octokit/request-5.3.1" // {
+        dependencies = [
+          sources."is-plain-object-3.0.0"
+          sources."isobject-4.0.0"
+        ];
+      })
       sources."@octokit/request-error-1.2.0"
       sources."@octokit/rest-16.35.0"
       sources."@octokit/types-2.0.2"
@@ -8007,18 +8420,21 @@ in
       sources."@types/color-name-1.1.1"
       sources."@types/decompress-4.2.3"
       sources."@types/download-6.2.4"
+      sources."@types/events-3.0.0"
+      sources."@types/glob-7.1.1"
       sources."@types/got-8.3.5"
       sources."@types/istanbul-lib-coverage-2.0.1"
       sources."@types/istanbul-lib-report-1.1.1"
       sources."@types/istanbul-reports-1.1.1"
+      sources."@types/minimatch-3.0.3"
       sources."@types/mkdirp-0.5.2"
-      sources."@types/node-12.12.11"
-      sources."@types/node-fetch-2.5.3"
+      sources."@types/node-12.12.17"
+      sources."@types/node-fetch-2.5.4"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/semver-5.5.0"
       sources."@types/yargs-13.0.3"
       sources."@types/yargs-parser-13.1.0"
-      (sources."@typescript-eslint/typescript-estree-2.8.0" // {
+      (sources."@typescript-eslint/typescript-estree-2.11.0" // {
         dependencies = [
           sources."semver-6.3.0"
         ];
@@ -8061,16 +8477,19 @@ in
       sources."arr-union-3.1.0"
       sources."array-flat-polyfill-1.0.1"
       sources."array-flatten-1.1.1"
+      sources."array-union-1.0.2"
+      sources."array-uniq-1.0.3"
       sources."array-unique-0.3.2"
+      sources."arrify-1.0.1"
       sources."ascii-table-0.0.9"
       sources."assign-symbols-1.0.0"
-      sources."ast-module-types-2.5.0"
+      sources."ast-module-types-2.6.0"
       sources."async-2.6.3"
       sources."atob-2.1.2"
       sources."atob-lite-2.0.0"
       (sources."babel-runtime-6.26.0" // {
         dependencies = [
-          sources."core-js-2.6.10"
+          sources."core-js-2.6.11"
         ];
       })
       sources."backoff-2.5.0"
@@ -8078,7 +8497,6 @@ in
       (sources."base-0.11.2" // {
         dependencies = [
           sources."define-property-1.0.0"
-          sources."isobject-3.0.1"
         ];
       })
       sources."base64-js-1.3.1"
@@ -8088,16 +8506,23 @@ in
       (sources."body-parser-1.19.0" // {
         dependencies = [
           sources."debug-2.6.9"
+          sources."qs-6.7.0"
         ];
       })
-      (sources."boxen-4.1.0" // {
+      (sources."boxen-4.2.0" // {
         dependencies = [
-          sources."type-fest-0.5.2"
+          sources."ansi-styles-4.2.0"
+          sources."chalk-3.0.0"
+          sources."type-fest-0.8.1"
           sources."widest-line-3.1.0"
         ];
       })
       sources."brace-expansion-1.1.11"
-      sources."braces-3.0.2"
+      (sources."braces-2.3.2" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
       sources."btoa-lite-1.0.0"
       sources."buffer-5.4.3"
       sources."buffer-alloc-1.2.0"
@@ -8105,11 +8530,7 @@ in
       sources."buffer-crc32-0.2.13"
       sources."buffer-fill-1.0.0"
       sources."bytes-3.1.0"
-      (sources."cache-base-1.0.1" // {
-        dependencies = [
-          sources."isobject-3.0.1"
-        ];
-      })
+      sources."cache-base-1.0.1"
       (sources."cacheable-request-2.1.4" // {
         dependencies = [
           sources."get-stream-3.0.0"
@@ -8119,6 +8540,8 @@ in
           sources."sort-keys-2.0.0"
         ];
       })
+      sources."cachedir-2.3.0"
+      sources."call-me-maybe-1.0.1"
       sources."camelcase-5.3.1"
       sources."capture-stack-trace-1.0.1"
       sources."cardinal-2.1.1"
@@ -8130,7 +8553,16 @@ in
         ];
       })
       sources."chardet-0.7.0"
-      sources."chokidar-3.3.0"
+      (sources."chokidar-3.3.0" // {
+        dependencies = [
+          sources."braces-3.0.2"
+          sources."fill-range-7.0.1"
+          sources."glob-parent-5.1.0"
+          sources."is-number-7.0.0"
+          sources."readdirp-3.2.0"
+          sources."to-regex-range-5.0.1"
+        ];
+      })
       sources."ci-info-2.0.0"
       (sources."class-utils-0.3.6" // {
         dependencies = [
@@ -8146,16 +8578,22 @@ in
             ];
           })
           sources."is-descriptor-0.1.6"
-          sources."isobject-3.0.1"
           sources."kind-of-5.1.0"
         ];
       })
-      sources."clean-deep-3.1.0"
+      sources."clean-deep-3.2.0"
       sources."clean-stack-2.2.0"
       sources."cli-boxes-2.2.0"
       sources."cli-cursor-2.1.0"
+      (sources."cli-progress-3.4.0" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."string-width-2.1.1"
+          sources."strip-ansi-4.0.0"
+        ];
+      })
       sources."cli-spinners-1.3.1"
-      (sources."cli-ux-5.3.3" // {
+      (sources."cli-ux-5.4.0" // {
         dependencies = [
           sources."fs-extra-7.0.1"
           sources."has-flag-3.0.0"
@@ -8180,7 +8618,7 @@ in
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
       sources."colors-1.4.0"
-      sources."commander-2.8.1"
+      sources."commander-2.20.3"
       sources."common-path-prefix-2.0.0"
       sources."component-emitter-1.3.0"
       sources."component-props-1.1.1"
@@ -8193,7 +8631,12 @@ in
       sources."concordance-4.0.0"
       sources."config-chain-1.1.12"
       sources."configorama-0.3.6"
-      sources."configstore-5.0.0"
+      (sources."configstore-5.0.0" // {
+        dependencies = [
+          sources."crypto-random-string-2.0.0"
+          sources."unique-string-2.0.0"
+        ];
+      })
       sources."content-disposition-0.5.3"
       sources."content-type-1.0.4"
       sources."cookie-0.4.0"
@@ -8201,37 +8644,25 @@ in
       sources."copy-descriptor-0.1.1"
       (sources."copy-template-dir-1.4.0" // {
         dependencies = [
-          (sources."braces-2.3.2" // {
-            dependencies = [
-              sources."extend-shallow-2.0.1"
-            ];
-          })
-          (sources."fill-range-4.0.0" // {
-            dependencies = [
-              sources."extend-shallow-2.0.1"
-            ];
-          })
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."isobject-3.0.1"
-          sources."micromatch-3.1.10"
           sources."pump-1.0.3"
           sources."readable-stream-2.3.6"
           sources."readdirp-2.2.1"
-          sources."to-regex-range-2.1.1"
         ];
       })
-      sources."core-js-3.4.1"
+      sources."core-js-3.5.0"
       sources."core-util-is-1.0.2"
       sources."cp-file-7.0.0"
+      (sources."cpy-7.3.0" // {
+        dependencies = [
+          sources."cp-file-6.2.0"
+          sources."make-dir-2.1.0"
+        ];
+      })
       sources."crc-3.8.0"
       sources."crc32-stream-3.0.1"
       sources."create-error-class-3.0.2"
       sources."cross-spawn-7.0.1"
-      sources."crypto-random-string-2.0.0"
+      sources."crypto-random-string-1.0.0"
       sources."cyclist-1.0.1"
       sources."date-time-2.1.0"
       (sources."debug-4.1.1" // {
@@ -8285,9 +8716,15 @@ in
       sources."deepmerge-4.2.2"
       sources."defaults-1.0.3"
       sources."define-properties-1.1.3"
-      (sources."define-property-2.0.2" // {
+      sources."define-property-2.0.2"
+      (sources."del-5.1.0" // {
         dependencies = [
-          sources."isobject-3.0.1"
+          sources."array-union-2.1.0"
+          sources."dir-glob-3.0.1"
+          sources."globby-10.0.1"
+          sources."ignore-5.1.4"
+          sources."path-type-4.0.0"
+          sources."slash-3.0.0"
         ];
       })
       sources."depd-1.1.2"
@@ -8302,12 +8739,14 @@ in
       sources."detective-scss-2.0.1"
       sources."detective-stylus-1.0.0"
       sources."detective-typescript-5.7.0"
+      sources."dir-glob-2.2.2"
       sources."dot-prop-5.2.0"
       (sources."download-7.1.0" // {
         dependencies = [
           sources."get-stream-3.0.0"
           sources."make-dir-1.3.0"
           sources."p-event-2.3.1"
+          sources."pify-3.0.0"
         ];
       })
       sources."duplexer3-0.1.4"
@@ -8316,9 +8755,9 @@ in
       sources."emoji-regex-7.0.3"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
-      sources."envinfo-7.4.0"
+      sources."envinfo-7.5.0"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.16.0"
+      sources."es-abstract-1.17.0-next.1"
       sources."es-to-primitive-1.2.1"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
@@ -8361,6 +8800,7 @@ in
       (sources."express-4.17.1" // {
         dependencies = [
           sources."debug-2.6.9"
+          sources."qs-6.7.0"
         ];
       })
       sources."express-logging-1.1.1"
@@ -8369,8 +8809,6 @@ in
       (sources."extend-shallow-3.0.2" // {
         dependencies = [
           sources."is-extendable-1.0.1"
-          sources."is-plain-object-2.0.4"
-          sources."isobject-3.0.1"
         ];
       })
       sources."external-editor-3.1.0"
@@ -8384,7 +8822,17 @@ in
       sources."fast-deep-equal-2.0.1"
       sources."fast-diff-1.2.0"
       sources."fast-equals-1.6.3"
-      sources."fast-glob-3.1.0"
+      (sources."fast-glob-3.1.1" // {
+        dependencies = [
+          sources."@nodelib/fs.stat-2.0.3"
+          sources."braces-3.0.2"
+          sources."fill-range-7.0.1"
+          sources."glob-parent-5.1.0"
+          sources."is-number-7.0.0"
+          sources."micromatch-4.0.2"
+          sources."to-regex-range-5.0.1"
+        ];
+      })
       sources."fast-json-stable-stringify-2.0.0"
       sources."fast-levenshtein-2.0.6"
       sources."fast-stringify-1.1.2"
@@ -8395,13 +8843,22 @@ in
       sources."file-type-8.1.0"
       sources."filename-reserved-regex-2.0.0"
       sources."filenamify-2.1.0"
-      sources."fill-range-7.0.1"
+      (sources."fill-range-4.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
       sources."filter-obj-2.0.1"
       (sources."finalhandler-1.1.2" // {
         dependencies = [
           sources."debug-2.6.9"
         ];
       })
+      (sources."find-process-1.4.3" // {
+        dependencies = [
+          sources."debug-2.6.9"
+        ];
+      })
       (sources."find-up-3.0.0" // {
         dependencies = [
           sources."locate-path-3.0.0"
@@ -8451,8 +8908,19 @@ in
       sources."git-url-parse-11.1.2"
       sources."gitconfiglocal-1.0.0"
       sources."glob-7.1.6"
-      sources."glob-parent-5.1.0"
+      (sources."glob-parent-3.1.0" // {
+        dependencies = [
+          sources."is-glob-3.1.0"
+        ];
+      })
+      sources."glob-to-regexp-0.3.0"
+      sources."global-cache-dir-1.0.1"
       sources."global-dirs-0.1.1"
+      (sources."globby-9.2.0" // {
+        dependencies = [
+          sources."fast-glob-2.2.7"
+        ];
+      })
       (sources."gonzales-pe-4.2.4" // {
         dependencies = [
           sources."minimist-1.1.3"
@@ -8461,6 +8929,7 @@ in
       (sources."got-8.3.2" // {
         dependencies = [
           sources."get-stream-3.0.0"
+          sources."pify-3.0.0"
         ];
       })
       sources."graceful-fs-4.2.3"
@@ -8476,18 +8945,9 @@ in
       sources."has-symbol-support-x-1.4.2"
       sources."has-symbols-1.0.1"
       sources."has-to-string-tag-x-1.4.1"
-      (sources."has-value-1.0.0" // {
-        dependencies = [
-          sources."isobject-3.0.1"
-        ];
-      })
+      sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
         dependencies = [
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
           sources."kind-of-4.0.0"
         ];
       })
@@ -8498,18 +8958,27 @@ in
       })
       sources."hosted-git-info-2.8.5"
       sources."http-cache-semantics-3.8.1"
-      sources."http-call-5.2.5"
+      sources."http-call-5.3.0"
       (sources."http-errors-1.7.2" // {
         dependencies = [
           sources."inherits-2.0.3"
         ];
       })
       sources."http-proxy-1.18.0"
-      sources."http-proxy-middleware-0.20.0"
+      (sources."http-proxy-middleware-0.20.0" // {
+        dependencies = [
+          sources."braces-3.0.2"
+          sources."fill-range-7.0.1"
+          sources."is-number-7.0.0"
+          sources."micromatch-4.0.2"
+          sources."to-regex-range-5.0.1"
+        ];
+      })
       sources."human-signals-1.1.1"
       sources."hyperlinker-1.0.0"
       sources."iconv-lite-0.4.24"
       sources."ieee754-1.1.13"
+      sources."ignore-4.0.6"
       sources."ignore-walk-3.0.3"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
@@ -8555,29 +9024,38 @@ in
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-glob-4.0.1"
-      sources."is-installed-globally-0.1.0"
+      (sources."is-installed-globally-0.1.0" // {
+        dependencies = [
+          sources."is-path-inside-1.0.1"
+        ];
+      })
       sources."is-natural-number-4.0.1"
       sources."is-npm-1.0.0"
-      sources."is-number-7.0.0"
+      (sources."is-number-3.0.0" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
       sources."is-obj-2.0.0"
       sources."is-object-1.0.1"
-      sources."is-path-inside-1.0.1"
+      sources."is-path-cwd-2.2.0"
+      sources."is-path-inside-3.0.2"
       sources."is-plain-obj-2.0.0"
-      sources."is-plain-object-3.0.0"
+      sources."is-plain-object-2.0.4"
       sources."is-promise-2.1.0"
       sources."is-redirect-1.0.0"
       sources."is-regex-1.0.4"
       sources."is-retry-allowed-1.2.0"
       sources."is-ssh-1.3.1"
       sources."is-stream-2.0.0"
-      sources."is-symbol-1.0.2"
+      sources."is-symbol-1.0.3"
       sources."is-typedarray-1.0.0"
       sources."is-url-1.2.4"
       sources."is-windows-1.0.2"
       sources."is-wsl-1.1.0"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
-      sources."isobject-4.0.0"
+      sources."isobject-3.0.1"
       sources."isurl-1.0.0"
       sources."jest-get-type-24.9.0"
       sources."jest-validate-24.9.0"
@@ -8601,7 +9079,11 @@ in
       sources."leven-3.1.0"
       sources."levn-0.3.0"
       sources."lines-and-columns-1.1.6"
-      sources."load-json-file-4.0.0"
+      (sources."load-json-file-4.0.0" // {
+        dependencies = [
+          sources."pify-3.0.0"
+        ];
+      })
       sources."locate-path-5.0.0"
       sources."lodash-4.17.15"
       sources."lodash-es-4.17.15"
@@ -8662,7 +9144,7 @@ in
       sources."methods-1.1.2"
       sources."micro-api-client-3.3.0"
       sources."micro-memoize-2.1.2"
-      sources."micromatch-4.0.2"
+      sources."micromatch-3.1.10"
       sources."mime-1.6.0"
       sources."mime-db-1.42.0"
       sources."mime-types-2.1.25"
@@ -8673,8 +9155,6 @@ in
       (sources."mixin-deep-1.3.2" // {
         dependencies = [
           sources."is-extendable-1.0.1"
-          sources."is-plain-object-2.0.4"
-          sources."isobject-3.0.1"
         ];
       })
       (sources."mkdirp-0.5.1" // {
@@ -8682,8 +9162,18 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      sources."module-definition-3.2.0"
+      sources."module-definition-3.3.0"
       sources."moize-5.4.4"
+      (sources."move-file-1.2.0" // {
+        dependencies = [
+          (sources."cp-file-6.2.0" // {
+            dependencies = [
+              sources."make-dir-2.1.0"
+            ];
+          })
+          sources."path-exists-3.0.0"
+        ];
+      })
       sources."ms-2.0.0"
       sources."mute-stream-0.0.7"
       sources."nanomatch-1.2.13"
@@ -8694,9 +9184,11 @@ in
         dependencies = [
           sources."is-stream-1.1.0"
           sources."p-map-2.1.0"
+          sources."rimraf-2.7.1"
         ];
       })
       sources."netlify-cli-logo-1.0.0"
+      sources."netlify-redirect-parser-1.0.3"
       sources."netlify-redirector-0.1.0"
       sources."nice-try-1.0.5"
       sources."node-fetch-2.6.0"
@@ -8705,9 +9197,14 @@ in
       sources."normalize-package-data-2.5.0"
       sources."normalize-path-3.0.0"
       sources."normalize-url-3.3.0"
-      sources."npm-bundled-1.0.6"
-      sources."npm-conf-1.1.3"
-      sources."npm-packlist-1.4.6"
+      sources."npm-bundled-1.1.1"
+      (sources."npm-conf-1.1.3" // {
+        dependencies = [
+          sources."pify-3.0.0"
+        ];
+      })
+      sources."npm-normalize-package-bin-1.0.1"
+      sources."npm-packlist-1.4.7"
       sources."npm-run-path-4.0.0"
       sources."object-assign-4.1.1"
       (sources."object-copy-0.1.0" // {
@@ -8725,17 +9222,10 @@ in
       })
       sources."object-inspect-1.7.0"
       sources."object-keys-1.1.1"
-      (sources."object-visit-1.0.1" // {
-        dependencies = [
-          sources."isobject-3.0.1"
-        ];
-      })
-      sources."object.getownpropertydescriptors-2.0.3"
-      (sources."object.pick-1.3.0" // {
-        dependencies = [
-          sources."isobject-3.0.1"
-        ];
-      })
+      sources."object-visit-1.0.1"
+      sources."object.assign-4.1.0"
+      sources."object.getownpropertydescriptors-2.1.0"
+      sources."object.pick-1.3.0"
       sources."octokit-pagination-methods-1.1.0"
       sources."omit.js-1.0.2"
       sources."on-finished-2.3.0"
@@ -8804,16 +9294,21 @@ in
           sources."which-1.3.1"
         ];
       })
+      sources."path-dirname-1.0.2"
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-is-inside-1.0.2"
-      sources."path-key-3.1.0"
+      sources."path-key-3.1.1"
       sources."path-parse-1.0.6"
       sources."path-to-regexp-0.1.7"
-      sources."path-type-3.0.0"
+      (sources."path-type-3.0.0" // {
+        dependencies = [
+          sources."pify-3.0.0"
+        ];
+      })
       sources."pend-1.2.0"
       sources."picomatch-2.1.1"
-      sources."pify-3.0.0"
+      sources."pify-4.0.1"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
       (sources."pkg-dir-4.2.0" // {
@@ -8822,7 +9317,7 @@ in
         ];
       })
       sources."posix-character-classes-0.1.1"
-      (sources."postcss-7.0.23" // {
+      (sources."postcss-7.0.24" // {
         dependencies = [
           sources."has-flag-3.0.0"
           sources."source-map-0.6.1"
@@ -8830,25 +9325,21 @@ in
         ];
       })
       sources."postcss-values-parser-1.5.0"
-      (sources."precinct-6.1.2" // {
-        dependencies = [
-          sources."commander-2.20.3"
-        ];
-      })
+      sources."precinct-6.2.0"
       sources."precond-0.2.3"
       sources."prelude-ls-1.1.2"
       sources."prepend-http-2.0.0"
       sources."pretty-format-24.9.0"
       sources."prettyjson-1.2.1"
       sources."process-nextick-args-2.0.1"
-      sources."promise.prototype.finally-3.1.1"
+      sources."promise.prototype.finally-3.1.2"
       sources."proto-list-1.2.4"
       sources."protocols-1.4.7"
       sources."proxy-addr-2.0.5"
       sources."pseudomap-1.0.2"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
-      sources."qs-6.7.0"
+      sources."qs-6.9.1"
       sources."query-string-5.1.1"
       sources."random-item-1.0.0"
       sources."range-parser-1.2.1"
@@ -8869,7 +9360,7 @@ in
         ];
       })
       sources."readable-stream-3.4.0"
-      sources."readdirp-3.2.0"
+      sources."readdirp-3.3.0"
       (sources."redact-env-0.2.0" // {
         dependencies = [
           sources."escape-string-regexp-2.0.0"
@@ -8894,7 +9385,7 @@ in
       sources."require-main-filename-2.0.0"
       sources."require-package-name-2.0.1"
       sources."requires-port-1.0.0"
-      sources."resolve-1.12.0"
+      sources."resolve-1.13.1"
       sources."resolve-url-0.2.1"
       sources."responselike-1.0.2"
       (sources."restore-cursor-2.0.0" // {
@@ -8905,7 +9396,7 @@ in
       })
       sources."ret-0.1.15"
       sources."reusify-1.0.4"
-      sources."rimraf-2.7.1"
+      sources."rimraf-3.0.0"
       sources."run-async-2.3.0"
       sources."run-parallel-1.1.9"
       sources."rxjs-6.5.3"
@@ -8913,7 +9404,11 @@ in
       sources."safe-join-0.1.3"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
-      sources."seek-bzip-1.0.5"
+      (sources."seek-bzip-1.0.5" // {
+        dependencies = [
+          sources."commander-2.8.1"
+        ];
+      })
       sources."semver-5.7.1"
       sources."semver-diff-2.1.0"
       (sources."send-0.17.1" // {
@@ -8931,14 +9426,13 @@ in
       (sources."set-value-2.0.1" // {
         dependencies = [
           sources."extend-shallow-2.0.1"
-          sources."is-plain-object-2.0.4"
-          sources."isobject-3.0.1"
         ];
       })
       sources."setprototypeof-1.1.1"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       sources."signal-exit-3.0.2"
+      sources."slash-2.0.0"
       (sources."snapdragon-0.8.2" // {
         dependencies = [
           sources."debug-2.6.9"
@@ -8961,7 +9455,6 @@ in
       (sources."snapdragon-node-2.1.1" // {
         dependencies = [
           sources."define-property-1.0.0"
-          sources."isobject-3.0.1"
         ];
       })
       (sources."snapdragon-util-3.0.1" // {
@@ -9052,12 +9545,7 @@ in
       })
       sources."tar-stream-2.1.0"
       sources."temp-dir-1.0.0"
-      (sources."tempy-0.2.1" // {
-        dependencies = [
-          sources."crypto-random-string-1.0.0"
-          sources."unique-string-1.0.0"
-        ];
-      })
+      sources."tempy-0.2.1"
       sources."term-size-2.1.0"
       sources."through-2.3.8"
       (sources."through2-2.0.5" // {
@@ -9078,7 +9566,7 @@ in
         ];
       })
       sources."to-regex-3.0.2"
-      sources."to-regex-range-5.0.1"
+      sources."to-regex-range-2.1.1"
       sources."toidentifier-1.0.0"
       sources."traverse-0.6.6"
       sources."treeify-1.1.0"
@@ -9090,11 +9578,11 @@ in
       sources."type-fest-0.3.1"
       sources."type-is-1.6.18"
       sources."typedarray-to-buffer-3.1.5"
-      sources."typescript-3.7.2"
+      sources."typescript-3.7.3"
       sources."unbzip2-stream-1.3.3"
       sources."union-value-1.0.1"
       sources."uniq-1.0.1"
-      sources."unique-string-2.0.0"
+      sources."unique-string-1.0.0"
       sources."universal-user-agent-4.0.0"
       sources."universalify-0.1.2"
       (sources."unixify-1.0.0" // {
@@ -9111,7 +9599,6 @@ in
             ];
           })
           sources."has-values-0.1.4"
-          sources."isobject-3.0.1"
         ];
       })
       sources."unzip-response-2.0.1"
@@ -9125,7 +9612,6 @@ in
           sources."cli-boxes-1.0.0"
           sources."configstore-3.1.2"
           sources."cross-spawn-5.1.0"
-          sources."crypto-random-string-1.0.0"
           sources."dot-prop-4.2.0"
           sources."execa-0.7.0"
           sources."get-stream-3.0.0"
@@ -9136,12 +9622,12 @@ in
           sources."npm-run-path-2.0.2"
           sources."p-finally-1.0.0"
           sources."path-key-2.0.1"
+          sources."pify-3.0.0"
           sources."shebang-command-1.2.0"
           sources."shebang-regex-1.0.0"
           sources."string-width-2.1.1"
           sources."strip-ansi-4.0.0"
           sources."term-size-1.2.0"
-          sources."unique-string-1.0.0"
           sources."which-1.3.1"
           sources."write-file-atomic-2.4.3"
           sources."xdg-basedir-3.0.0"
@@ -9158,7 +9644,7 @@ in
       sources."uuid-3.3.3"
       sources."validate-npm-package-license-3.0.4"
       sources."vary-1.1.2"
-      (sources."wait-port-0.2.6" // {
+      (sources."wait-port-0.2.7" // {
         dependencies = [
           sources."commander-3.0.2"
         ];
@@ -9208,7 +9694,7 @@ in
         ];
       })
       sources."yargs-parser-15.0.0"
-      sources."yarn-1.19.1"
+      sources."yarn-1.21.1"
       sources."yauzl-2.10.0"
       sources."zip-stream-2.1.2"
     ];
@@ -9222,4 +9708,22 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  npm-merge-driver = nodeEnv.buildNodePackage {
+    name = "npm-merge-driver";
+    packageName = "npm-merge-driver";
+    version = "2.3.5";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/npm-merge-driver/-/npm-merge-driver-2.3.5.tgz";
+      sha512 = "MUxE26ZdDWAc+wlqwyOEIhRH1EdaIXCWSZbqAQ76dUkz3uSrxrLhfgQ3nb3oZbqC5e4NyLcCdzTSDVwkisoJpg==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "git merge driver for automatically merging lockfiles";
+      homepage = "https://github.com/npm/npm-merge-driver#readme";
+      license = "ISC";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
 }
\ No newline at end of file
diff --git a/user/settings/git.nix b/user/settings/git.nix
index 0314579b..fabd8102 100644
--- a/user/settings/git.nix
+++ b/user/settings/git.nix
@@ -46,7 +46,7 @@
       };
       "merge.npm-merge-driver" = {
         name = "automatically merge npm lockfiles";
-        driver = "npx npm-merge-driver merge %A %O %B %P";
+        driver = "${pkgs.node2nixPackages."npm-merge-driver"}/bin/npm-merge-driver merge %A %O %B %P";
       };
       remote = {
         autoSetupMerge = true;
author	Alan Pearce	2019-12-13 15:16:18 +0100
committer	Alan Pearce	2019-12-13 15:16:18 +0100
commit	bec3f8af9468612cf9c02ca375723a02a223a20d (patch)
tree	7b7e27c3024e08ca97100dc253856eec349d17e4 /user
parent	d4e727774fc7be10c25e0b750e60cae75e359046 (diff)
download	nixfiles-bec3f8af9468612cf9c02ca375723a02a223a20d.tar.lz nixfiles-bec3f8af9468612cf9c02ca375723a02a223a20d.tar.zst nixfiles-bec3f8af9468612cf9c02ca375723a02a223a20d.zip