From 2beb0f7b067323eb2c935f20487d324dab356881 Mon Sep 17 00:00:00 2001 From: oxalica Date: Tue, 22 Jun 2021 02:24:15 +0800 Subject: [PATCH] rust-analyzer: 2021-06-07 -> 2021-06-21 and fix the extension --- .../node-packages/node-packages.nix | 986 +++++++++--------- .../tools/rust/rust-analyzer/default.nix | 14 +- .../rust-analyzer/no-rust-1-53-features.patch | 673 ++++++++++++ .../tools/rust/rust-analyzer/update.sh | 3 + .../rust-analyzer/build-deps/package.json | 2 +- 5 files changed, 1194 insertions(+), 484 deletions(-) create mode 100644 pkgs/development/tools/rust/rust-analyzer/no-rust-1-53-features.patch diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 438a0b56c188..b18d1b290f84 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -346,13 +346,13 @@ let sha512 = "9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw=="; }; }; - "@babel/compat-data-7.14.5" = { + "@babel/compat-data-7.14.7" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.14.5"; + version = "7.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.5.tgz"; - sha512 = "kixrYn4JwfAVPa0f2yfzc2AWti6WRRyO3XjWW5PJAvtE11qhSayrrcrEnee05KAtNaPC+EwehE8Qt1UedEVB8w=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.7.tgz"; + sha512 = "nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw=="; }; }; "@babel/core-7.10.5" = { @@ -481,13 +481,13 @@ let sha512 = "R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ=="; }; }; - "@babel/helper-member-expression-to-functions-7.14.5" = { + "@babel/helper-member-expression-to-functions-7.14.7" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.14.5"; + version = "7.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.5.tgz"; - sha512 = "UxUeEYPrqH1Q/k0yRku1JE7dyfyehNwT6SVkMHvYvPDv4+uu627VXBckVj891BO8ruKBkiDoGnZf4qPDD8abDQ=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz"; + sha512 = "TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA=="; }; }; "@babel/helper-module-imports-7.14.5" = { @@ -625,13 +625,13 @@ let sha512 = "qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg=="; }; }; - "@babel/parser-7.14.6" = { + "@babel/parser-7.14.7" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.14.6"; + version = "7.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.14.6.tgz"; - sha512 = "oG0ej7efjEXxb4UgE+klVx+3j4MVo+A2vCzm7OUN4CLo6WhQ+vSOD2yJ8m7B+DghObxtLxt3EfgMWpq+AsWehQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.14.7.tgz"; + sha512 = "X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA=="; }; }; "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" = { @@ -652,13 +652,13 @@ let sha512 = "mx0WXDDiIl5DwzMtzWGRSPugXi9BxROS05GQrhLNbEamhBiicgn994ibwkyiBH+6png7bm/yA7AUsvHyCXi4Vw=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.14.5" = { + "@babel/plugin-proposal-async-generator-functions-7.14.7" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.14.5"; + version = "7.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.5.tgz"; - sha512 = "tbD/CG3l43FIXxmu4a7RBe4zH7MLJ+S/lFowPFO7HetS2hyOZ/0nnnznegDuzFzfkyQYTxqdTH/hKmuBngaDAA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.7.tgz"; + sha512 = "RK8Wj7lXLY3bqei69/cc25gwS5puEc3dknoFPFbqfy3XxYQBQFvu4ioWpafMBAB+L9NyptQK4nMOa5Xz16og8Q=="; }; }; "@babel/plugin-proposal-class-properties-7.12.13" = { @@ -760,13 +760,13 @@ let sha512 = "6vh4SqRuLLarjgeOf4EaROJAHjvu9Gl+/346PbDH9yWbJyfnJ/ah3jmYKYtswEyCoWZiidvVHjHshd4WgjB9BA=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.14.5" = { + "@babel/plugin-proposal-object-rest-spread-7.14.7" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.14.5"; + version = "7.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.5.tgz"; - sha512 = "VzMyY6PWNPPT3pxc5hi9LloKNr4SSrVCg7Yr6aZpW4Ym07r7KqSU/QXYwjXLVxqwSv0t/XSXkFoKBPUkZ8vb2A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz"; + sha512 = "082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g=="; }; }; "@babel/plugin-proposal-optional-catch-binding-7.14.5" = { @@ -1057,13 +1057,13 @@ let sha512 = "pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg=="; }; }; - "@babel/plugin-transform-destructuring-7.14.5" = { + "@babel/plugin-transform-destructuring-7.14.7" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.14.5"; + version = "7.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.5.tgz"; - sha512 = "wU9tYisEbRMxqDezKUqC9GleLycCRoUsai9ddlsq54r8QRLaeEhc+d+9DqCG+kV9W2GgQjTZESPTpn5bAFMDww=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz"; + sha512 = "0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw=="; }; }; "@babel/plugin-transform-dotall-regex-7.14.5" = { @@ -1174,13 +1174,13 @@ let sha512 = "RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.14.5" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.14.7" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.14.5"; + version = "7.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.5.tgz"; - sha512 = "+Xe5+6MWFo311U8SchgeX5c1+lJM+eZDBZgD+tvXu9VVQPXwwVzeManMMjYX6xw2HczngfOSZjoFYKwdeB/Jvw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.7.tgz"; + sha512 = "DTNOTaS7TkW97xsDMrp7nycUVh6sn/eq22VaxWfEdzuEbRsiaOU0pqU7DlyUGHVsbQbSghvjKRpEl+nUCKGQSg=="; }; }; "@babel/plugin-transform-new-target-7.14.5" = { @@ -1390,13 +1390,13 @@ let sha512 = "9PMijx8zFbCwTHrd2P4PJR5nWGH3zWebx2OcpTjqQrHhCiL2ssSR2Sc9ko2BsI2VmVBfoaQmPrlMTCui4LmXQg=="; }; }; - "@babel/preset-env-7.14.5" = { + "@babel/preset-env-7.14.7" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.14.5"; + version = "7.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.5.tgz"; - sha512 = "ci6TsS0bjrdPpWGnQ+m4f+JSSzDKlckqKIJJt9UZ/+g7Zz9k0N8lYU8IeLg/01o2h8LyNZDMLGgRLDTxpudLsA=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.7.tgz"; + sha512 = "itOGqCKLsSUl0Y+1nSfhbuuOlTs0MJk2Iv7iSH+XT/mR8U1zRLO7NjWlYXB47yhK4J/7j+HYty/EhFZDYKa/VA=="; }; }; "@babel/preset-flow-7.14.5" = { @@ -1498,13 +1498,13 @@ let sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA=="; }; }; - "@babel/runtime-corejs3-7.14.6" = { + "@babel/runtime-corejs3-7.14.7" = { name = "_at_babel_slash_runtime-corejs3"; packageName = "@babel/runtime-corejs3"; - version = "7.14.6"; + version = "7.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.6.tgz"; - sha512 = "Xl8SPYtdjcMoCsIM4teyVRg7jIcgl8F2kRtoCcXuHzXswt9UxZCS6BzRo8fcnCuP6u2XtPgvyonmEPF57Kxo9Q=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.7.tgz"; + sha512 = "Wvzcw4mBYbTagyBVZpAJWI06auSIj033T/yNE0Zn1xcup83MieCddZA7ls3kme17L4NOGBrQ09Q+nKB41RLWBA=="; }; }; "@babel/standalone-7.14.7" = { @@ -1525,13 +1525,13 @@ let sha512 = "6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g=="; }; }; - "@babel/traverse-7.14.5" = { + "@babel/traverse-7.14.7" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.14.5"; + version = "7.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.5.tgz"; - sha512 = "G3BiS15vevepdmFqmUc9X+64y0viZYygubAMO8SvBmKARuF6CPSZtH4Ng9vi/lrWlZFGe3FWdXNy835akH8Glg=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.7.tgz"; + sha512 = "9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ=="; }; }; "@babel/types-7.14.5" = { @@ -2047,22 +2047,22 @@ let sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA=="; }; }; - "@expo/config-4.0.2" = { + "@expo/config-4.0.4" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "4.0.2"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-4.0.2.tgz"; - sha512 = "zKKWt6Qs2lJLSwp8NeBCQ+iAPuKYkRJB6PZZJFIXaXD9AC5uJYSElUG+HVfy73se4KF/4JjndOWXWZEkCAivxw=="; + url = "https://registry.npmjs.org/@expo/config/-/config-4.0.4.tgz"; + sha512 = "O3xRlwMCidOgk1WHIy6eOjh2yp0h/kgBDRNKqPe21+YDiOufyTGGNvbWgHwoax8goa1iMg443WQO7GhvaH286g=="; }; }; - "@expo/config-plugins-2.0.2" = { + "@expo/config-plugins-2.0.4" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; - version = "2.0.2"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-2.0.2.tgz"; - sha512 = "kaTfzLfg9sjy9uAHq708FVqC2hlVQyzCmrCsnfRguk2d+5V9ZyCVdMPiDdAIKHtWCPygIPNmlIP4FYQ093RNzQ=="; + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-2.0.4.tgz"; + sha512 = "JGt/X2tFr7H8KBQrKfbGo9hmCubQraMxq5sj3bqDdKmDOLcE1a/EDCP9g0U4GHsa425J8VDIkQUHYz3h3ndEXQ=="; }; }; "@expo/config-types-41.0.0" = { @@ -2083,22 +2083,22 @@ let sha512 = "IDPnr2/DW1tYpDHqedFYNCDzRTf9HYinWFQ7fOelNZLuOCMoErLbSStA5zfkv46o69AgcCpteqgKHSoxsIBz5g=="; }; }; - "@expo/dev-server-0.1.72" = { + "@expo/dev-server-0.1.74" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.72"; + version = "0.1.74"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.72.tgz"; - sha512 = "W1ULabPSCDiV1ySy3ZkX2nTUPiWLqj1ocMLE8sk1wddO8RWneKGB9FlrGDj0+RFTDOYi6ZmBESesKrH/elNkRw=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.74.tgz"; + sha512 = "b0yHZH0HB28plFf2/d53ZP91QNANy5Sz9fDYfWfMznHTg1tx6xkjBNu6WiVtlDqBq4UBdbXqSu5AIZWAziss2Q=="; }; }; - "@expo/dev-tools-0.13.102" = { + "@expo/dev-tools-0.13.104" = { name = "_at_expo_slash_dev-tools"; packageName = "@expo/dev-tools"; - version = "0.13.102"; + version = "0.13.104"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.102.tgz"; - sha512 = "yVpt9EERqMrPXaFgjV5HumcDSoni0rhaafTB186NB4BYPNuBDytSeb9RnpxyHHWxzF3/mav5DIQ+x6HB6TdWig=="; + url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.104.tgz"; + sha512 = "q0ozFDgMzfjJIpVyp3awA3L2jQ+t+suhfrJvKk58uYiCiVAicQYaqoxMj7jVgRdd45WJwPcUSA6lAbFx1PMkmQ=="; }; }; "@expo/devcert-1.0.0" = { @@ -2128,13 +2128,13 @@ let sha512 = "vrgGyPEXBoFI5NY70IegusCSoSVIFV3T3ry4tjJg1MFQKTUlR7E0r+8g8XR6qC705rc2PawaZQjqXMAVtV6s2A=="; }; }; - "@expo/metro-config-0.1.72" = { + "@expo/metro-config-0.1.74" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.1.72"; + version = "0.1.74"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.72.tgz"; - sha512 = "PvWn5DZCV6hNYA9CTOBWEfwb9FCjyQCiyYnmxjsT0k9eplIBGTtfy74uIOd0SdDdCTPCgCO8SMyabc+Qg599xg=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.74.tgz"; + sha512 = "1FzFJCXhdEMzDivZ+AKxrNBsgSRNPwQqz++KwN1ooeL9oPgxXWOQtStMB0Y2N2FSaHtLe/94D4EmzNWFGyz15A=="; }; }; "@expo/osascript-2.0.28" = { @@ -2164,13 +2164,13 @@ let sha512 = "zGPSq9OrCn7lWvwLLHLpHUUq2E40KptUFXn53xyZXPViI0k9lbApcR9KlonQZ95C+ELsf0BQ3gRficwK92Ivcw=="; }; }; - "@expo/prebuild-config-1.0.3" = { + "@expo/prebuild-config-1.0.5" = { name = "_at_expo_slash_prebuild-config"; packageName = "@expo/prebuild-config"; - version = "1.0.3"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-1.0.3.tgz"; - sha512 = "4rkWeVs6FaO4TcOVf5GnH5HTPOaVHJX9d1GnqF/Msh3IdhX1+v+c3s6HYmxDezkild27SYwrinqu89CWRUtM/A=="; + url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-1.0.5.tgz"; + sha512 = "tBVB3n70t/jWqOZOxo85WsIp9gJ/hZT8aii72S7BLarXa0oPmAy+TmPD19IR4U6+TcrR0B2Qwr/6mVNnZhuBtg=="; }; }; "@expo/results-1.0.0" = { @@ -2209,22 +2209,22 @@ let sha512 = "LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew=="; }; }; - "@expo/webpack-config-0.12.76" = { + "@expo/webpack-config-0.12.78" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.12.76"; + version = "0.12.78"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.76.tgz"; - sha512 = "8Q4sH+KBgM9jsH7Dp0A5lEmGiKvBXNcax2H6k8i54vfptaUh8gBZqohGuLshzeTJYT43I3LDulheOGr83yNB3g=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.78.tgz"; + sha512 = "oYR9fTuO2qWkZOHhA20NPpG0P+C4EBSsWT3RavHSREFPWSNqQB6BYnTIAFmK29QaVcY370qvqfBo+p7vCaRQ4w=="; }; }; - "@expo/xcpretty-2.0.2" = { + "@expo/xcpretty-3.1.3" = { name = "_at_expo_slash_xcpretty"; packageName = "@expo/xcpretty"; - version = "2.0.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/xcpretty/-/xcpretty-2.0.2.tgz"; - sha512 = "c5e+tj8XG7xHE4ohQhgVx3b6cq0ePTOfbZ5a2bLrF4QGLeCJ92bBBZ+LkcHFHbwngQBe20w9pqMqJGD/C5ZAEg=="; + url = "https://registry.npmjs.org/@expo/xcpretty/-/xcpretty-3.1.3.tgz"; + sha512 = "Kgp2eXR8LB/m7UxOwL1fi6JzRv6DGT+rXfrtyUR3J9L0O66KDKem3A9NWACnihn/1RiL8Xb5ryb0vBUFYYeieg=="; }; }; "@fast-csv/format-4.3.5" = { @@ -2272,13 +2272,13 @@ let sha512 = "iT1bU56rKrKEOfODoW6fScY11qj3iaYrZ+z11T6fo5+TDm84UGkkXjLXJTE57ZJzg0/gbccHQWYv+chY7bJN8Q=="; }; }; - "@fluentui/react-7.172.0" = { + "@fluentui/react-7.172.1" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.172.0"; + version = "7.172.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.172.0.tgz"; - sha512 = "s4tdCVY+2XMqE8XFaIMyQrocXUaDjt1ZXa048en5Iqmfs5LHCTOjsipKPew6/m+dCLGbSSO/Ait3+3YzFFtuAg=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.172.1.tgz"; + sha512 = "XJhYEo0fn/30i4m+qJkT1y5kNTZ8DAwzWhdGSyTiOrxiJ7pKWOoXAdWnvhtk3iY0SPVWSD9jTn5lMT/2WkZbJw=="; }; }; "@fluentui/react-focus-7.17.6" = { @@ -3883,13 +3883,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-12.4.1" = { + "@netlify/build-12.7.2" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "12.4.1"; + version = "12.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-12.4.1.tgz"; - sha512 = "KAdQY1vh0XsnmgJJ8yQ4ciqP0NMfCmYWEkYcbHmFbECGlQH3saw6LKOmSB28EJ3NomMad6r0yr+8Z2f7BS8EMA=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-12.7.2.tgz"; + sha512 = "AQCtlVBQFEpcQzglzAiXqfaXAss/+ufBhfuc6BuWM24ze+dD+ywyUb9IHfe6ceHdHZIKhfST6AYWT7my39NGmg=="; }; }; "@netlify/cache-utils-1.0.7" = { @@ -3901,13 +3901,22 @@ let sha512 = "yrdrnQkzg/qMovoFYwQ24UVt/OyHtP+t0KpQFd7eBl6gnuuGGgxFocaFFv6eKpMVwzHTsOwx/y9B/FcC3/6cfA=="; }; }; - "@netlify/config-7.5.0" = { + "@netlify/config-7.7.1" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "7.5.0"; + version = "7.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-7.5.0.tgz"; - sha512 = "7+tChBf8jVIgPS9M5tNSldz1JDYwpIPKEe8WqLEaTnE3Vz9RoOBkbPQX3jbKd5sAnfiOZrBm7kVSxB4yZCihKw=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-7.7.1.tgz"; + sha512 = "ReVy0Dqcvubldo9ZzmI6jCwUqFwDdq9v4enQu/uM6B2UVueKSgombKO8r0BlyNtLlKbbCOlaG7Gpbu0KsBvsPw=="; + }; + }; + "@netlify/config-8.0.0" = { + name = "_at_netlify_slash_config"; + packageName = "@netlify/config"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/config/-/config-8.0.0.tgz"; + sha512 = "zEgClyq8RZ79FPJHEK3xIPnXOPbji0N5ucPpk17lFyccPeKTsEG2cfEJ94vP2T809AUHa90cRvZVg8j7UtpR4A=="; }; }; "@netlify/esbuild-0.13.6" = { @@ -3928,13 +3937,13 @@ let sha512 = "9pgfafCGv2pt2l82JfPxst3QasuA40DFF0QdLm/3NNdSje8Ro3/i4rUATMCisaGJcScrAYljRlMFOhT4vFVlDg=="; }; }; - "@netlify/functions-utils-1.3.43" = { + "@netlify/functions-utils-1.3.46" = { name = "_at_netlify_slash_functions-utils"; packageName = "@netlify/functions-utils"; - version = "1.3.43"; + version = "1.3.46"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.43.tgz"; - sha512 = "B2F4VbeyZAol87ruUtYPr0Bg+Z88XEZ1d/J77GoPf96BveMvyzr1BByoUoFFcrjLPlVGjS5lltTGQt5KSMRu4A=="; + url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.46.tgz"; + sha512 = "BXJxaj4fQ//zYUdRO9Mib35hOinRVBIjAWgD2YiW4fJv98Adcr33LMbPxxTnc/zP3Oh6c56YAUIBh5FA3VIe5g=="; }; }; "@netlify/git-utils-1.0.11" = { @@ -3964,13 +3973,13 @@ let sha512 = "SAsVNIxF0asduPXbsr3wbyAB7lPZQxhG90EeOu0/Fo+BLhpO4g+6eH13I60qJpWCI/ucXXqSrUw8y6Oy5wpY0g=="; }; }; - "@netlify/plugins-list-2.16.0" = { + "@netlify/plugins-list-2.18.0" = { name = "_at_netlify_slash_plugins-list"; packageName = "@netlify/plugins-list"; - version = "2.16.0"; + version = "2.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.16.0.tgz"; - sha512 = "Yvo7evuGbP0tcaSr+nnFWTfSZzGg2T3D9PoVha2okBGWtL461RWM19/u5Q7aGbF2xJ7IKgKI1KAZoSetkvcNXA=="; + url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.18.0.tgz"; + sha512 = "lbI7P0CaSH23r2sF4z3DX02PqQ8ENUtRullQXEQXUareZfrXlOV6F8sl/LAWcgjE/kuh51eIAu/hWstsZFEQIQ=="; }; }; "@netlify/routing-local-proxy-0.30.1" = { @@ -4000,6 +4009,15 @@ let sha512 = "627ZNqfc4mdhU5mYDpcKUbmx8RoAUu8ZQiW/RIt5s7uDhruba3bK776Ygzog5b14hYWthT41/bf+9wQ+O9NFWw=="; }; }; + "@netlify/zip-it-and-ship-it-4.5.1" = { + name = "_at_netlify_slash_zip-it-and-ship-it"; + packageName = "@netlify/zip-it-and-ship-it"; + version = "4.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.5.1.tgz"; + sha512 = "zU2ztAEwLxIL7oy1nl0NXZC9Mbzb2QVkdjztZcpY76Ne5q0hBYpBv85SJFgrz75QMSC5C/eeQxs8iUYpmdZH4Q=="; + }; + }; "@node-red/editor-api-1.3.5" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; @@ -5197,13 +5215,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/dashboard-plugin-5.4.1" = { + "@serverless/dashboard-plugin-5.4.2" = { name = "_at_serverless_slash_dashboard-plugin"; packageName = "@serverless/dashboard-plugin"; - version = "5.4.1"; + version = "5.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-5.4.1.tgz"; - sha512 = "lOj6jJIzZEPfiaMi70HNWD2uFd8+hzfAArsprtDvsek2H+1JSQ8I4vCtlLOf/X0hQn3sIHI7JQizathkzXkBrg=="; + url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-5.4.2.tgz"; + sha512 = "yFugs3TBPjZh6Gt/8lPca8H7n2/ICin17r/zmhiOhIscYMgIJT1EOY9EyCFWIQi9AMAmZD0a3ZR8U8gSYYTT9A=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -5494,31 +5512,31 @@ let sha512 = "E/Pfdze/WFfxwyuTFcfhQN1SwyUsc43yuCoW63RVBCaxTD6OzhVD2Pvc/Sy7BjiWUfmelzyKkIBpoow8zZX7Zg=="; }; }; - "@snyk/fix-1.634.0" = { + "@snyk/fix-1.642.0" = { name = "_at_snyk_slash_fix"; packageName = "@snyk/fix"; - version = "1.634.0"; + version = "1.642.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/fix/-/fix-1.634.0.tgz"; - sha512 = "uR0Y2jfh+hnoNepnSsiPvyFEUSo9SEUNwYPxyKZGq6bfPvoC9HzZkujhSJMnmagSlxVP/UtGtEb2mHRNu/IOdg=="; + url = "https://registry.npmjs.org/@snyk/fix/-/fix-1.642.0.tgz"; + sha512 = "wA1hjH/eH0y/4/psauKFkK8pO29NSv1uEfheckvkoBB8BVrj3zDDBJhrxx2RRH2395XZxk977GLU9oTgUwSzlw=="; }; }; - "@snyk/fix-pipenv-pipfile-0.5.3" = { + "@snyk/fix-pipenv-pipfile-0.5.4" = { name = "_at_snyk_slash_fix-pipenv-pipfile"; packageName = "@snyk/fix-pipenv-pipfile"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/fix-pipenv-pipfile/-/fix-pipenv-pipfile-0.5.3.tgz"; - sha512 = "/wD7bcQ2mpDyXtQiKToQBfKl6asl3nroe9Dw3PkBY79ljwOSm27yqLQVv2EQT7BTK25VxndXSbe47eOrShh1eg=="; + url = "https://registry.npmjs.org/@snyk/fix-pipenv-pipfile/-/fix-pipenv-pipfile-0.5.4.tgz"; + sha512 = "n1Sg21htJG+gqw2Q9JYsIFxT5IDtELifbQZheiLhOl8sgfoD6oCNyf07IwUqzPrW2wRpmCrTUtuO08+KGnzJpg=="; }; }; - "@snyk/fix-poetry-0.7.0" = { + "@snyk/fix-poetry-0.7.2" = { name = "_at_snyk_slash_fix-poetry"; packageName = "@snyk/fix-poetry"; - version = "0.7.0"; + version = "0.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/fix-poetry/-/fix-poetry-0.7.0.tgz"; - sha512 = "M0JzI/7rOwH2Q/Gy/v1UXvpnvoaRGZrQCe4bEd3hsJ1ZR1tSy7jZsZGtTxk/E5WjWFMrqe4RRip9Uyd1aLjr9A=="; + url = "https://registry.npmjs.org/@snyk/fix-poetry/-/fix-poetry-0.7.2.tgz"; + sha512 = "abBdeOb326exreUDnCkELw9GVOR7qdUQmX0sKyE1baz3i9WaWI5Wy0bWHqjw9oGE5ZP8Ki/xtzkHU2W57D++Zg=="; }; }; "@snyk/gemfile-1.2.0" = { @@ -6358,15 +6376,6 @@ let sha512 = "wLhcKh3PMlyA2cNAB9sjM1BntnhPMiM0JOBwPBqttjHev2428MLEB4AYVN+d8s2iyCVZac+o41Pflm/ZH5vLXQ=="; }; }; - "@types/express-serve-static-core-4.17.19" = { - name = "_at_types_slash_express-serve-static-core"; - packageName = "@types/express-serve-static-core"; - version = "4.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.19.tgz"; - sha512 = "DJOSHzX7pCiSElWaGR8kCprwibCB/3yW6vcT8VG3P0SJjnv19gnWG/AZMfM60Xj/YJIp/YCaDHyvzsFVeniARA=="; - }; - }; "@types/express-serve-static-core-4.17.21" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; @@ -6862,13 +6871,13 @@ let sha512 = "Lt+wj8NVPx0zUmUwumiVXapmaLUcAk3yPuHCFVXras9k5VT9TdhJqKqGVUQCD60OTMCl0qxJ57OiTL0Mic3Iag=="; }; }; - "@types/node-14.17.3" = { + "@types/node-14.17.4" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.17.3"; + version = "14.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.17.3.tgz"; - sha512 = "e6ZowgGJmTuXa3GyaPbTGxX17tnThl2aSSizrFthQ7m9uLGZBXiGhgE55cjRZTF5kjZvYn9EOPOMljdjwbflxw=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.17.4.tgz"; + sha512 = "8kQ3+wKGRNN0ghtEn7EGps/B8CzuBz1nXZEIGGLP2GnwbqYn4dbTs7k+VKLTq1HvZLRCIDtN3Snx1Ege8B7L5A=="; }; }; "@types/node-15.12.4" = { @@ -7627,31 +7636,31 @@ let sha512 = "B6PedV/H2kcGEAgnqncwjHe3E8fqUNXCLv1BsrNwkHHWQJXkDN7dFeuEB4oaucBOVbjhH7KGLJ6JAiXPE3S7xA=="; }; }; - "@vue/compiler-core-3.1.1" = { + "@vue/compiler-core-3.1.2" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.1.1.tgz"; - sha512 = "Z1RO3T6AEtAUFf2EqqovFm3ohAeTvFzRtB0qUENW2nEerJfdlk13/LS1a0EgsqlzxmYfR/S/S/gW9PLbFZZxkA=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.1.2.tgz"; + sha512 = "nHmq7vLjq/XM2IMbZUcKWoH5sPXa2uR/nIKZtjbK5F3TcbnYE/zKsrSUR9WZJ03unlwotNBX1OyxVt9HbWD7/Q=="; }; }; - "@vue/compiler-dom-3.1.1" = { + "@vue/compiler-dom-3.1.2" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.1.1.tgz"; - sha512 = "nobRIo0t5ibzg+q8nC31m+aJhbq8FbWUoKvk6h3Vs1EqTDJaj6lBTcVTq5or8AYht7FbSpdAJ81isbJ1rWNX7A=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.1.2.tgz"; + sha512 = "k2+SWcWH0jL6WQAX7Or2ONqu5MbtTgTO0dJrvebQYzgqaKMXNI90RNeWeCxS4BnNFMDONpHBeFgbwbnDWIkmRg=="; }; }; - "@vue/shared-3.1.1" = { + "@vue/shared-3.1.2" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.1.1.tgz"; - sha512 = "g+4pzAw7PYSjARtLBoDq6DmcblX8i9KJHSCnyM5VDDFFifUaUT9iHbFpOF/KOizQ9f7QAqU2JH3Y6aXjzUMhVA=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.1.2.tgz"; + sha512 = "EmH/poaDWBPJaPILXNI/1fvUbArJQmmTyVCwvvyDYDFnkPoTclAbHRAtyIvqfez7jybTDn077HTNILpxlsoWhg=="; }; }; "@webassemblyjs/ast-1.11.0" = { @@ -9472,13 +9481,13 @@ let sha512 = "MsVCuf/2FxuTFVhGLK13B+TZH9tBd2qkyoXKKILIiGcZ5CDUEBO14vIV63aNkMkS1xxvK2U4wBcuuNj/VH2Mkw=="; }; }; - "apollo-server-core-2.25.1" = { + "apollo-server-core-2.25.2" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.25.1"; + version = "2.25.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.25.1.tgz"; - sha512 = "10gVjvGv3uPfy7gUFQhgNhb66RorD1qX6yF4bTawm4S6JstkGrWYFJN5/48o7Mte+tATpXzAGiWu0l4wsYA/mA=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.25.2.tgz"; + sha512 = "lrohEjde2TmmDTO7FlOs8x5QQbAS0Sd3/t0TaK2TWaodfzi92QAvIsq321Mol6p6oEqmjm8POIDHW1EuJd7XMA=="; }; }; "apollo-server-env-3.1.0" = { @@ -9499,13 +9508,13 @@ let sha512 = "lO5oTjgiC3vlVg2RKr3RiXIIQ5pGXBFxYGGUkKDhTud3jMIhs+gel8L8zsEjKaKxkjHhCQAA/bcEfYiKkGQIvA=="; }; }; - "apollo-server-express-2.25.1" = { + "apollo-server-express-2.25.2" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.25.1"; + version = "2.25.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.25.1.tgz"; - sha512 = "9idHkV3umcIDdq/NIQEC2D6zZ0QtaMRVCbeRcDgm9uWWiX3ulK5ICdHbNBu5UHXkDmKjfZiGaCWBZti0MsRQAg=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.25.2.tgz"; + sha512 = "A2gF2e85vvDugPlajbhr0A14cDFDIGX0mteNOJ8P3Z3cIM0D4hwrWxJidI+SzobefDIyIHu1dynFedJVhV0euQ=="; }; }; "apollo-server-plugin-base-0.13.0" = { @@ -12505,13 +12514,13 @@ let sha1 = "825a8fc536a5dc43193467f3124f7e9b78b21cef"; }; }; - "blakejs-1.1.0" = { + "blakejs-1.1.1" = { name = "blakejs"; packageName = "blakejs"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/blakejs/-/blakejs-1.1.0.tgz"; - sha1 = "69df92ef953aa88ca51a32df6ab1c54a155fc7a5"; + url = "https://registry.npmjs.org/blakejs/-/blakejs-1.1.1.tgz"; + sha512 = "bLG6PHOCZJKNshTjGRBvET0vTciwQE6zFKOKKXPDJfwFBd4Ac0yBfPZqcGvGJap50l7ktvlpFqc2jGVaUgbJgg=="; }; }; "blessed-0.1.81" = { @@ -15466,13 +15475,13 @@ let sha512 = "/1owvF0SZ5Gn54cgrikJ0QskgTzeg30HGjkmjFoaHDJzAqFpuX1DBpFR8aLvsE1J5s9MgeYRENQK4BFwOag5VA=="; }; }; - "cli-ux-5.5.1" = { + "cli-ux-5.6.2" = { name = "cli-ux"; packageName = "cli-ux"; - version = "5.5.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/cli-ux/-/cli-ux-5.5.1.tgz"; - sha512 = "t3DT1U1C3rArLGYLpKa3m9dr/8uKZRI8HRm/rXKL7UTjm4c+Yd9zHNWg1tP8uaJkUbhmvx5SQHwb3VWpPUVdHQ=="; + url = "https://registry.npmjs.org/cli-ux/-/cli-ux-5.6.2.tgz"; + sha512 = "CuiamOCfPaOTjbuAQXdFsfZLQmO6XSmCDxulq4y8pIets1hZ3eaysHppPKGdrcdgLugUGUap5+bXd3IukJASBA=="; }; }; "cli-width-1.1.1" = { @@ -16987,13 +16996,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.86" = { + "constructs-3.3.87" = { name = "constructs"; packageName = "constructs"; - version = "3.3.86"; + version = "3.3.87"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.86.tgz"; - sha512 = "y1EKluD1jl6jilmL2VH3B6qUADwJ+QqRpwfYe3y/WSKK283wr1apZPiwApm001n07Jg2ObXhPKep57xP5LLZ2w=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.87.tgz"; + sha512 = "/SQrY1RP9KQsSyyVeyBTSMIiC5yOJO635YVqPH6XBsS5MMkBHd4gsPOX4FkpkDLMC1shAoK0FSTLatgxFiS4+A=="; }; }; "consume-http-header-1.0.0" = { @@ -17501,31 +17510,31 @@ let sha512 = "SaMnchL//WwU2Ot1hhkPflE8gzo7uq1FGvUJ8GKmi3TOU7rGTHIU+eir1WGf6qOtTyxdfdcp10yPdGZ59sQ3hw=="; }; }; - "core-js-3.15.0" = { + "core-js-3.15.1" = { name = "core-js"; packageName = "core-js"; - version = "3.15.0"; + version = "3.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.15.0.tgz"; - sha512 = "GUbtPllXMYRzIgHNZ4dTYTcUemls2cni83Q4Q/TrFONHfhcg9oEGOtaGHfb0cpzec60P96UKPvMkjX1jET8rUw=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.15.1.tgz"; + sha512 = "h8VbZYnc9pDzueiS2610IULDkpFFPunHwIpl8yRwFahAEEdSpHlTy3h3z3rKq5h11CaUdBEeRViu9AYvbxiMeg=="; }; }; - "core-js-compat-3.15.0" = { + "core-js-compat-3.15.1" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.15.0"; + version = "3.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.15.0.tgz"; - sha512 = "8X6lWsG+s7IfOKzV93a7fRYfWRZobOfjw5V5rrq43Vh/W+V6qYxl7Akalsvgab4PFT/4L/pjQbdBUEM36NXKrw=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.15.1.tgz"; + sha512 = "xGhzYMX6y7oEGQGAJmP2TmtBLvR4nZmRGEcFa3ubHOq5YEp51gGN9AovVa0AoujGZIq+Wm6dISiYyGNfdflYww=="; }; }; - "core-js-pure-3.15.0" = { + "core-js-pure-3.15.1" = { name = "core-js-pure"; packageName = "core-js-pure"; - version = "3.15.0"; + version = "3.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.15.0.tgz"; - sha512 = "RO+LFAso8DB6OeBX9BAcEGvyth36QtxYon1OyVsITNVtSKr/Hos0BXZwnsOJ7o+O6KHtK+O+cJIEj9NGg6VwFA=="; + url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.15.1.tgz"; + sha512 = "OZuWHDlYcIda8sJLY4Ec6nWq2hRjlyCqCZ+jCflyleMkVt3tPedDVErvHslyS2nbO+SlBFMSBJYvtLMwxnrzjA=="; }; }; "core-util-is-1.0.2" = { @@ -17753,13 +17762,13 @@ let sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; }; }; - "create-gatsby-1.7.1" = { + "create-gatsby-1.8.0" = { name = "create-gatsby"; packageName = "create-gatsby"; - version = "1.7.1"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.7.1.tgz"; - sha512 = "X330+JLFhnYDVTEs7nd5nQiaqWc9aq/gAY6V/jXo2ZwySZRW2XMAaL1ROLpkd5MwywTfykW0oJWRhLBwC17a7A=="; + url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.8.0.tgz"; + sha512 = "AW3PZONTFfTMKmUfHbpwHebL8/QCbQ0qPwH9piNHen4/7EeZyaN7ZzeilKMUue4DEi9Om7VKlZtW+bKcVml3bg=="; }; }; "create-graphback-1.0.1" = { @@ -19571,13 +19580,13 @@ let sha1 = "d171a87933252807eb3cb61dc1c1445d078df2d9"; }; }; - "decimal.js-10.2.1" = { + "decimal.js-10.3.0" = { name = "decimal.js"; packageName = "decimal.js"; - version = "10.2.1"; + version = "10.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz"; - sha512 = "KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw=="; + url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.0.tgz"; + sha512 = "MrQRs2gyD//7NeHi9TtsfClkf+cFAewDz+PZHR8ILKglLmBMyVX3ymQ+oeznE3tjrS7beTN+6JXb2C3JDHm7ug=="; }; }; "decimal.js-7.5.1" = { @@ -21641,13 +21650,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.752" = { + "electron-to-chromium-1.3.755" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.752"; + version = "1.3.755"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.752.tgz"; - sha512 = "2Tg+7jSl3oPxgsBsWKh5H83QazTkmWG/cnNwJplmyZc7KcN61+I10oUgaXSVk/NwfvN3BdkKDR4FYuRBQQ2v0A=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.755.tgz"; + sha512 = "BJ1s/kuUuOeo1bF/EM2E4yqW9te0Hpof3wgwBx40AWJE18zsD1Tqo0kr7ijnOc+lRsrlrqKPauJAHqaxOItoUA=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -23605,13 +23614,13 @@ let sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929"; }; }; - "expo-pwa-0.0.82" = { + "expo-pwa-0.0.84" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.82"; + version = "0.0.84"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.82.tgz"; - sha512 = "4TSJRmVl3/gOQbE56Xe7P+A+zIqNF2asqMtC8Au/YQF0o4emmEAICEwCCRMg2jdtgq7qVDwWjBfMNLDdGS4HrQ=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.84.tgz"; + sha512 = "esZ6a5ObdnWn8h9METs3WuUbGEq16vh4wq1jwSK81oBJKIxijd5M0JbqDqhOsT4rIjuH8ZfQKsl0C1AtLIAfgQ=="; }; }; "express-2.5.11" = { @@ -26143,31 +26152,31 @@ let sha1 = "cbed2d20a40c1f5679a35908e2b9415733e78db9"; }; }; - "gatsby-core-utils-2.7.1" = { + "gatsby-core-utils-2.8.0" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "2.7.1"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.7.1.tgz"; - sha512 = "ofiAzLMeLjkS9huo0JQRbNzOfwCCxzPg7mSXeEhZhHGfbXoqZ9ZufmlTTgSYLc5v6agoM4yi4rHqdMOXu4qXAw=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.8.0.tgz"; + sha512 = "CadvILN4ZyYMYQAp+haxSgE/0k5zIu6y2WcqVSJaQLmmWq0o49Gv4CftVKOEXOtXaN0DEr9e4wWFVBRAYaRHGA=="; }; }; - "gatsby-recipes-0.18.1" = { + "gatsby-recipes-0.19.0" = { name = "gatsby-recipes"; packageName = "gatsby-recipes"; - version = "0.18.1"; + version = "0.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.18.1.tgz"; - sha512 = "gjtCDu1qMtQkjmA5mrHw4orFxkoUPW9VnyVcLc8kcGAjJLR3MTKeECQL6p0SrKHgsbJTkOJ2BTvzU3R5jENBbg=="; + url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.19.0.tgz"; + sha512 = "yboFABHUNB9+1x/RA13yKU/P0/2K+SaenudC+THshxL4uiUHlbU029iXp6Di2zMfIhak8aZ7FyUrpCieey/0Rw=="; }; }; - "gatsby-telemetry-2.7.1" = { + "gatsby-telemetry-2.8.0" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "2.7.1"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.7.1.tgz"; - sha512 = "nZgM5SYkS7AWE4NJ/HGrQkUBn7B1k8d6KuRVgv1HanHQxnKUBaWL/6ej/ZBYcvfRBWMCi2mX0QJYlSKVx45XOw=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.8.0.tgz"; + sha512 = "MlV9Lbminhsz1MUiWJJvZ+8VVhIYBl2AsxJylckGoUp+skGfNq5d3pWSv+u/nU4zVP8T1HUWc1c7KSVq6ggrbw=="; }; }; "gauge-1.2.7" = { @@ -27305,13 +27314,13 @@ let sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew=="; }; }; - "google-gax-2.15.1" = { + "google-gax-2.16.0" = { name = "google-gax"; packageName = "google-gax"; - version = "2.15.1"; + version = "2.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/google-gax/-/google-gax-2.15.1.tgz"; - sha512 = "I5j4JRxx1HfZZBXnQs7gUvRHaTqT8XZ6U/QQWI/mDbf05dXP/vLni+ZkDzUh/XHDtIo/MPVkuEUhkwWwi+vwTg=="; + url = "https://registry.npmjs.org/google-gax/-/google-gax-2.16.0.tgz"; + sha512 = "IwHxHs9gEbvQ0Ne12taqDjJT9cpoLqM7tJamvctIGmkyqnQrdnbDJTGK2Rf85piMYGzmOuPKas9TkhCaoTVIJA=="; }; }; "google-p12-pem-3.1.0" = { @@ -32796,13 +32805,13 @@ let sha512 = "ChFg5qhvxCaM2bspCqizs48yMtsm5YLHjBoNZLCkbXyc3yMM5l8pnn787B5ww5TI3+tKxKYWkbiKf356kQ1OgQ=="; }; }; - "jsii-srcmak-0.1.289" = { + "jsii-srcmak-0.1.290" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.289"; + version = "0.1.290"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.289.tgz"; - sha512 = "nfOMq2qcf2JymxhEm79wehmyBiM35w5tQdnn5KR4IuYPML8HfUA3GT+1/d/xlaUAzQc0eguWIZqYczlmkScoKw=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.290.tgz"; + sha512 = "kKyb2kUBCbecbQRx467QGHUCcuCvD2gXzMNYACMgxbKLakRq3qZ3CMb8Pc8/7mnlbgU9e3suh49t8E3D6Q0yhw=="; }; }; "json-bigint-0.2.3" = { @@ -33102,13 +33111,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.1.256" = { + "json2jsii-0.1.257" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.1.256"; + version = "0.1.257"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.256.tgz"; - sha512 = "6DyDhvjKJXM9K6XTxEwVhl2LAyRHSt6+guVyRWVvjYbIYprMQsN59y6wzmdNBBtJZJr/Gj5lytNNWn6NMS9Lcg=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.257.tgz"; + sha512 = "MMMMK6Oa9U3FtISKuOow6iwd/nJqk9i9C1HkkOO7AyBaD0IDhvgss3cRj37a390AVMnJKeQGWPm8whRsno/N+Q=="; }; }; "json3-3.2.6" = { @@ -37270,13 +37279,13 @@ let sha512 = "c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg=="; }; }; - "marked-2.1.1" = { + "marked-2.1.2" = { name = "marked"; packageName = "marked"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-2.1.1.tgz"; - sha512 = "5XFS69o9CzDpQDSpUYC+AN2xvq8yl1EGa5SG/GI1hP78/uTeo3PDfiDNmsUyiahpyhToDDJhQk7fNtJsga+KVw=="; + url = "https://registry.npmjs.org/marked/-/marked-2.1.2.tgz"; + sha512 = "ueJhIvklJJw04qxQbGIAu63EXwwOCYc7yKMBjgagTM4rjC5QtWyqSNgW7jCosV1/Km/1TUfs5qEpAqcGG0Mo5g=="; }; }; "marked-terminal-3.3.0" = { @@ -40349,6 +40358,15 @@ let sha512 = "O+4b18XZG1Y8Jaki02T58xRFoEAXIH4qxMSlhQXd8qP5WPIicwcQKylC4fdoA2+puQzGkXvEY9Yc5jn8Zpb2pQ=="; }; }; + "netlify-redirect-parser-8.0.0" = { + name = "netlify-redirect-parser"; + packageName = "netlify-redirect-parser"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-8.0.0.tgz"; + sha512 = "4E7YYZHVje+aofCiwznWVZJowf7ed6nrFexlL/ogQaE7745KI8KdHj7itVXAPggpiqiTPj9Iz/LMh/av6iT1Gg=="; + }; + }; "netlify-redirector-0.2.1" = { name = "netlify-redirector"; packageName = "netlify-redirector"; @@ -41340,13 +41358,13 @@ let sha512 = "9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="; }; }; - "normalize-url-6.0.1" = { + "normalize-url-6.1.0" = { name = "normalize-url"; packageName = "normalize-url"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-url/-/normalize-url-6.0.1.tgz"; - sha512 = "VU4pzAuh7Kip71XEmO9aNREYAdMHFGTVj/i+CaTImS8x0i1d3jUZkXhqluy/PRgjPLMgsLQulYY3PJ/aSbSjpQ=="; + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz"; + sha512 = "DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="; }; }; "now-and-later-2.0.1" = { @@ -41664,15 +41682,6 @@ let sha1 = "201095a487e1ad36081b3432fa3cada4f8d071b0"; }; }; - "nullthrows-1.1.1" = { - name = "nullthrows"; - packageName = "nullthrows"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nullthrows/-/nullthrows-1.1.1.tgz"; - sha512 = "2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw=="; - }; - }; "num-sort-2.1.0" = { name = "num-sort"; packageName = "num-sort"; @@ -42169,13 +42178,13 @@ let sha512 = "0HGaSR/E/seIhSzFxLkh0QqckuNSre4iGqSElZRUv1hVHH2YgrZ7xtQL9McwL8o1fh6HqkzykjUx0Iy2haVIUg=="; }; }; - "office-ui-fabric-react-7.172.0" = { + "office-ui-fabric-react-7.172.1" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.172.0"; + version = "7.172.1"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.172.0.tgz"; - sha512 = "L0cRUZ95mnsq/Gj5h0E+qpzj0KelI2c5UPE9sijx/P2QaW0hE7cuDZ2BtNqJFQ/KhOZ4CQqZgPRUZa+xc9LukA=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.172.1.tgz"; + sha512 = "W3QFwxmHAu4Pn65hccuLSx8yiGzto3eRkMgD46OIwDT9smTEF6U3OVSZC/8cpX24BJF9Qe5u034InIfzPLtJeQ=="; }; }; "omggif-1.0.10" = { @@ -42781,13 +42790,13 @@ let sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; }; }; - "optimize-css-assets-webpack-plugin-5.0.6" = { + "optimize-css-assets-webpack-plugin-5.0.8" = { name = "optimize-css-assets-webpack-plugin"; packageName = "optimize-css-assets-webpack-plugin"; - version = "5.0.6"; + version = "5.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.6.tgz"; - sha512 = "JAYw7WrIAIuHWoKeSBB3lJ6ZG9PSDK3JJduv/FMpIY060wvbA8Lqn/TCtxNGICNlg0X5AGshLzIhpYrkltdq+A=="; + url = "https://registry.npmjs.org/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.8.tgz"; + sha512 = "mgFS1JdOtEGzD8l+EuISqL57cKO+We9GcoiQEmdCWRqqck+FGNmYJtx9qfAPzEz+lRrlThWMuGDaRkI/yWNx/Q=="; }; }; "optional-0.1.4" = { @@ -54311,13 +54320,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.9" = { + "sscaff-1.2.10" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.9"; + version = "1.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.9.tgz"; - sha512 = "BcOsAZGTh/vo0DArPc/MiJf6DYvC29fIH5b+sIzEFpz5vKPHp1RPOoVyhYpafPW45+xN9oKde6YfvaKaHvtBPw=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.10.tgz"; + sha512 = "okh9hLxPkZl22XpK+4rLOnR3SHG2hEI92KKevDI8e6wZPIP5Dgsxx8RQUogdm3/a87kgyoWaCoOABekYIeXx9g=="; }; }; "ssh-config-1.1.6" = { @@ -55931,13 +55940,13 @@ let sha512 = "6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ=="; }; }; - "svelte-3.38.2" = { + "svelte-3.38.3" = { name = "svelte"; packageName = "svelte"; - version = "3.38.2"; + version = "3.38.3"; src = fetchurl { - url = "https://registry.npmjs.org/svelte/-/svelte-3.38.2.tgz"; - sha512 = "q5Dq0/QHh4BLJyEVWGe7Cej5NWs040LWjMbicBGZ+3qpFWJ1YObRmUDZKbbovddLC9WW7THTj3kYbTOFmU9fbg=="; + url = "https://registry.npmjs.org/svelte/-/svelte-3.38.3.tgz"; + sha512 = "N7bBZJH0iF24wsalFZF+fVYMUOigaAUQMIcEKHO3jstK/iL8VmP9xE+P0/a76+FkNcWt+TDv2Gx1taUoUscrvw=="; }; }; "svelte-preprocess-4.7.3" = { @@ -61396,15 +61405,6 @@ let sha512 = "FS5ou3G+WRnPPr/tWVs8b/jVzeDacgZHy/y7/QQW7maSPFEAmRt2bFGUJtJVEUDLBqtDm/3VGMJ7D31cF2U1tw=="; }; }; - "vsce-1.93.0" = { - name = "vsce"; - packageName = "vsce"; - version = "1.93.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vsce/-/vsce-1.93.0.tgz"; - sha512 = "RgmxwybXenP6tTF0PLh97b/RRLp1RkzjAHNya3QAfv1EZVg+lfoBiAaXogpmOGjYr8OskkqP5tIa3D/Q6X9lrw=="; - }; - }; "vscode-css-languageservice-3.0.13" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; @@ -63547,13 +63547,13 @@ let sha512 = "N1XQngeqMBoj9wM4ZFadVV2MymImeiFfYD+fJrNlcVcOHsJFFQe7n3b+aBoTPwARuq2HQxukfzVpQmAk1gN4sQ=="; }; }; - "xdl-59.0.42" = { + "xdl-59.0.44" = { name = "xdl"; packageName = "xdl"; - version = "59.0.42"; + version = "59.0.44"; src = fetchurl { - url = "https://registry.npmjs.org/xdl/-/xdl-59.0.42.tgz"; - sha512 = "/Er1hvi8AB5YbAL/JulvFkNHKd1B+9Sl8PttHZmu8kaqApkDZWPNvWhN3hBEnJIIzEODTejYII3IoAQmf7PveA=="; + url = "https://registry.npmjs.org/xdl/-/xdl-59.0.44.tgz"; + sha512 = "p9zwI5w0juiKdq5v0tIYojyqpomhMWg7C3W1tILSE48aPdkNgOlatSgAPJ9qbjBha6berKYtdOnpnfyEYOAtWQ=="; }; }; "xenvar-0.5.1" = { @@ -65505,7 +65505,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.752" + sources."electron-to-chromium-1.3.755" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -65748,7 +65748,7 @@ in sources."@apollographql/graphql-playground-html-1.6.27" sources."@apollographql/graphql-upload-8-fork-8.1.3" sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.5" + sources."@babel/compat-data-7.14.7" sources."@babel/core-7.14.6" sources."@babel/generator-7.14.5" sources."@babel/helper-annotate-as-pure-7.14.5" @@ -65761,7 +65761,7 @@ in sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" sources."@babel/helper-module-transforms-7.14.5" sources."@babel/helper-optimise-call-expression-7.14.5" @@ -65776,9 +65776,9 @@ in sources."@babel/helper-wrap-function-7.14.5" sources."@babel/helpers-7.14.6" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.6" + sources."@babel/parser-7.14.7" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" - sources."@babel/plugin-proposal-async-generator-functions-7.14.5" + sources."@babel/plugin-proposal-async-generator-functions-7.14.7" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-class-static-block-7.14.5" sources."@babel/plugin-proposal-dynamic-import-7.14.5" @@ -65787,7 +65787,7 @@ in sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" sources."@babel/plugin-proposal-numeric-separator-7.14.5" - sources."@babel/plugin-proposal-object-rest-spread-7.14.5" + sources."@babel/plugin-proposal-object-rest-spread-7.14.7" sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-proposal-private-methods-7.14.5" @@ -65815,7 +65815,7 @@ in sources."@babel/plugin-transform-block-scoping-7.14.5" sources."@babel/plugin-transform-classes-7.14.5" sources."@babel/plugin-transform-computed-properties-7.14.5" - sources."@babel/plugin-transform-destructuring-7.14.5" + sources."@babel/plugin-transform-destructuring-7.14.7" sources."@babel/plugin-transform-dotall-regex-7.14.5" sources."@babel/plugin-transform-duplicate-keys-7.14.5" sources."@babel/plugin-transform-exponentiation-operator-7.14.5" @@ -65828,7 +65828,7 @@ in sources."@babel/plugin-transform-modules-commonjs-7.14.5" sources."@babel/plugin-transform-modules-systemjs-7.14.5" sources."@babel/plugin-transform-modules-umd-7.14.5" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.5" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.7" sources."@babel/plugin-transform-new-target-7.14.5" sources."@babel/plugin-transform-object-super-7.14.5" sources."@babel/plugin-transform-parameters-7.14.5" @@ -65843,7 +65843,7 @@ in sources."@babel/plugin-transform-typescript-7.14.6" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - sources."@babel/preset-env-7.14.5" + sources."@babel/preset-env-7.14.7" sources."@babel/preset-flow-7.14.5" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.14.5" @@ -65856,7 +65856,7 @@ in }) sources."@babel/runtime-7.14.6" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.5" + sources."@babel/traverse-7.14.7" sources."@babel/types-7.14.5" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" @@ -65890,8 +65890,8 @@ in sources."@types/cookies-0.7.6" sources."@types/cors-2.8.10" sources."@types/ejs-2.7.0" - sources."@types/express-4.17.11" - sources."@types/express-serve-static-core-4.17.19" + sources."@types/express-4.17.12" + sources."@types/express-serve-static-core-4.17.21" sources."@types/fs-capacitor-2.0.0" sources."@types/glob-7.1.3" sources."@types/http-assert-1.5.1" @@ -65925,13 +65925,13 @@ in }) sources."@vue/cli-ui-addon-webpack-4.5.13" sources."@vue/cli-ui-addon-widgets-4.5.13" - (sources."@vue/compiler-core-3.1.1" // { + (sources."@vue/compiler-core-3.1.2" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.1.1" - sources."@vue/shared-3.1.1" + sources."@vue/compiler-dom-3.1.2" + sources."@vue/shared-3.1.2" sources."@wry/equality-0.1.11" sources."accepts-1.3.7" sources."aggregate-error-3.1.0" @@ -65959,7 +65959,7 @@ in sources."lru-cache-6.0.0" ]; }) - (sources."apollo-server-core-2.25.1" // { + (sources."apollo-server-core-2.25.2" // { dependencies = [ sources."lru-cache-6.0.0" sources."uuid-8.3.2" @@ -65967,7 +65967,7 @@ in }) sources."apollo-server-env-3.1.0" sources."apollo-server-errors-2.5.0" - sources."apollo-server-express-2.25.1" + sources."apollo-server-express-2.25.2" sources."apollo-server-plugin-base-0.13.0" sources."apollo-server-types-0.9.0" sources."apollo-tracing-0.15.0" @@ -66111,12 +66111,12 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - (sources."core-js-compat-3.15.0" // { + (sources."core-js-compat-3.15.1" // { dependencies = [ sources."semver-7.0.0" ]; }) - sources."core-js-pure-3.15.0" + sources."core-js-pure-3.15.1" sources."core-util-is-1.0.2" sources."cors-2.8.5" (sources."cross-spawn-6.0.5" // { @@ -66183,7 +66183,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.752" + sources."electron-to-chromium-1.3.755" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -67082,7 +67082,7 @@ in sources."@babel/generator-7.14.5" sources."@babel/helper-validator-identifier-7.14.5" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.6" + sources."@babel/parser-7.14.7" sources."@babel/template-7.14.5" sources."@babel/types-7.14.5" sources."@webassemblyjs/ast-1.11.0" @@ -67159,7 +67159,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.5" + sources."@babel/compat-data-7.14.7" (sources."@babel/core-7.14.6" // { dependencies = [ sources."source-map-0.5.7" @@ -67174,7 +67174,7 @@ in sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" sources."@babel/helper-module-transforms-7.14.5" sources."@babel/helper-optimise-call-expression-7.14.5" @@ -67185,9 +67185,9 @@ in sources."@babel/helper-validator-option-7.14.5" sources."@babel/helpers-7.14.6" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.6" + sources."@babel/parser-7.14.7" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.5" + sources."@babel/traverse-7.14.7" sources."@babel/types-7.14.5" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" @@ -67207,7 +67207,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.752" + sources."electron-to-chromium-1.3.755" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -68787,7 +68787,7 @@ in sources."@babel/code-frame-7.14.5" sources."@babel/helper-validator-identifier-7.14.5" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.6" + sources."@babel/parser-7.14.7" sources."@babel/types-7.14.5" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" @@ -68904,7 +68904,7 @@ in sources."map-obj-1.0.1" ]; }) - sources."decimal.js-10.2.1" + sources."decimal.js-10.3.0" sources."delayed-stream-1.0.0" sources."denque-1.5.0" sources."depd-1.1.2" @@ -69681,7 +69681,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.29.3" - sources."constructs-3.3.86" + sources."constructs-3.3.87" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-5.0.0" @@ -69754,13 +69754,13 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.289" // { + (sources."jsii-srcmak-0.1.290" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.3.0" - sources."json2jsii-0.1.256" + sources."json2jsii-0.1.257" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -69796,7 +69796,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.9" + sources."sscaff-1.2.10" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -69855,7 +69855,7 @@ in sources."@jsii/spec-1.30.0" sources."@skorfmann/ink-confirm-input-3.0.0" sources."@skorfmann/terraform-cloud-1.10.1" - sources."@types/node-14.17.3" + sources."@types/node-14.17.4" sources."@types/node-fetch-2.5.10" sources."@types/yauzl-2.9.1" sources."@types/yoga-layout-1.9.2" @@ -69911,7 +69911,7 @@ in sources."commonmark-0.29.3" sources."compress-commons-4.1.1" sources."concat-map-0.0.1" - sources."constructs-3.3.86" + sources."constructs-3.3.87" sources."convert-to-spaces-1.0.2" sources."core-util-is-1.0.2" sources."crc-32-1.2.0" @@ -70030,7 +70030,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.289" // { + (sources."jsii-srcmak-0.1.290" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -70113,7 +70113,7 @@ in sources."slice-ansi-3.0.0" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.9" + sources."sscaff-1.2.10" sources."stack-utils-2.0.3" sources."stream-buffers-3.0.2" (sources."streamroller-2.2.4" // { @@ -71072,7 +71072,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.15.0" + sources."core-js-3.15.1" sources."cosmiconfig-3.1.0" sources."create-error-class-3.0.2" sources."cross-spawn-7.0.3" @@ -71108,7 +71108,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.752" + sources."electron-to-chromium-1.3.755" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -72064,14 +72064,14 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.5" + sources."@babel/compat-data-7.14.7" sources."@babel/core-7.14.6" sources."@babel/generator-7.14.5" sources."@babel/helper-compilation-targets-7.14.5" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" sources."@babel/helper-module-transforms-7.14.5" sources."@babel/helper-optimise-call-expression-7.14.5" @@ -72086,9 +72086,9 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.6" + sources."@babel/parser-7.14.7" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.5" + sources."@babel/traverse-7.14.7" sources."@babel/types-7.14.5" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" @@ -72157,7 +72157,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.752" + sources."electron-to-chromium-1.3.755" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -75108,7 +75108,7 @@ in dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.17.3" + sources."@types/node-14.17.4" sources."JSONStream-1.3.5" sources."ajv-6.12.6" sources."asn1-0.2.4" @@ -75380,7 +75380,7 @@ in sources."concat-map-0.0.1" sources."config-chain-1.1.13" sources."console-control-strings-1.1.0" - sources."core-js-3.15.0" + sources."core-js-3.15.1" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" sources."currently-unhandled-0.4.1" @@ -75648,7 +75648,7 @@ in sources."semver-5.7.1" ]; }) - sources."normalize-url-6.0.1" + sources."normalize-url-6.1.0" sources."npm-bundled-1.1.2" (sources."npm-conf-1.1.3" // { dependencies = [ @@ -75892,7 +75892,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.5" + sources."@babel/compat-data-7.14.7" (sources."@babel/core-7.14.6" // { dependencies = [ sources."semver-6.3.0" @@ -75908,7 +75908,7 @@ in sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" sources."@babel/helper-module-transforms-7.14.5" sources."@babel/helper-optimise-call-expression-7.14.5" @@ -75920,15 +75920,15 @@ in sources."@babel/helper-validator-option-7.14.5" sources."@babel/helpers-7.14.6" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.6" - sources."@babel/plugin-proposal-object-rest-spread-7.14.5" + sources."@babel/parser-7.14.7" + sources."@babel/plugin-proposal-object-rest-spread-7.14.7" sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-transform-destructuring-7.14.5" + sources."@babel/plugin-transform-destructuring-7.14.7" sources."@babel/plugin-transform-parameters-7.14.5" sources."@babel/plugin-transform-react-jsx-7.14.5" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.5" + sources."@babel/traverse-7.14.7" sources."@babel/types-7.14.5" sources."@sindresorhus/is-4.0.1" sources."@szmarczak/http-timer-4.0.5" @@ -76008,7 +76008,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.752" + sources."electron-to-chromium-1.3.755" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -76107,7 +76107,7 @@ in sources."nice-try-1.0.5" sources."node-releases-1.1.73" sources."normalize-package-data-2.5.0" - sources."normalize-url-6.0.1" + sources."normalize-url-6.1.0" sources."npm-run-path-2.0.2" sources."object-assign-4.1.1" sources."once-1.4.0" @@ -76269,7 +76269,7 @@ in sources."@fluentui/date-time-utilities-7.9.1" sources."@fluentui/dom-utilities-1.1.2" sources."@fluentui/keyboard-key-0.2.17" - sources."@fluentui/react-7.172.0" + sources."@fluentui/react-7.172.1" sources."@fluentui/react-focus-7.17.6" sources."@fluentui/react-window-provider-1.0.2" sources."@fluentui/theme-1.7.4" @@ -77310,7 +77310,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.172.0" + sources."office-ui-fabric-react-7.172.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -78292,14 +78292,14 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "4.5.2"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.5.2.tgz"; - sha512 = "r6SeIMk2ZP1/rSKGcXquiQp/A7MGAmJvG0otmJhlO5ypdYXfAJ1fhEJIqt7ufSngc5RRJ0cjnKZ1WBSyJlJTNA=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.6.0.tgz"; + sha512 = "hvsfWKLsPG8oUMTEAVcGxp3JR/28H2KkZP2TW6iXqCv4EXwOYydnr1WjnYLZgN+wDRtoyGhYn7GFra5tXZJhrA=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.5" + sources."@babel/compat-data-7.14.7" (sources."@babel/core-7.9.0" // { dependencies = [ sources."semver-5.7.1" @@ -78324,7 +78324,7 @@ in sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" sources."@babel/helper-module-transforms-7.14.5" sources."@babel/helper-optimise-call-expression-7.14.5" @@ -78343,8 +78343,8 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.6" - sources."@babel/plugin-proposal-async-generator-functions-7.14.5" + sources."@babel/parser-7.14.7" + sources."@babel/plugin-proposal-async-generator-functions-7.14.7" sources."@babel/plugin-proposal-class-properties-7.12.13" sources."@babel/plugin-proposal-dynamic-import-7.14.5" sources."@babel/plugin-proposal-export-default-from-7.14.5" @@ -78353,7 +78353,7 @@ in sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" sources."@babel/plugin-proposal-numeric-separator-7.14.5" - sources."@babel/plugin-proposal-object-rest-spread-7.14.5" + sources."@babel/plugin-proposal-object-rest-spread-7.14.7" sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-proposal-private-methods-7.14.5" @@ -78380,7 +78380,7 @@ in sources."@babel/plugin-transform-block-scoping-7.14.5" sources."@babel/plugin-transform-classes-7.14.5" sources."@babel/plugin-transform-computed-properties-7.14.5" - sources."@babel/plugin-transform-destructuring-7.14.5" + sources."@babel/plugin-transform-destructuring-7.14.7" sources."@babel/plugin-transform-dotall-regex-7.14.5" sources."@babel/plugin-transform-duplicate-keys-7.14.5" sources."@babel/plugin-transform-exponentiation-operator-7.14.5" @@ -78393,7 +78393,7 @@ in sources."@babel/plugin-transform-modules-commonjs-7.14.5" sources."@babel/plugin-transform-modules-systemjs-7.14.5" sources."@babel/plugin-transform-modules-umd-7.14.5" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.5" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.7" sources."@babel/plugin-transform-new-target-7.14.5" sources."@babel/plugin-transform-object-assign-7.14.5" sources."@babel/plugin-transform-object-super-7.14.5" @@ -78427,12 +78427,12 @@ in sources."@babel/preset-typescript-7.12.17" sources."@babel/runtime-7.14.6" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.5" + sources."@babel/traverse-7.14.7" sources."@babel/types-7.14.5" sources."@expo/apple-utils-0.0.0-alpha.20" sources."@expo/bunyan-4.0.0" - sources."@expo/config-4.0.2" - sources."@expo/config-plugins-2.0.2" + sources."@expo/config-4.0.4" + sources."@expo/config-plugins-2.0.4" sources."@expo/config-types-41.0.0" (sources."@expo/configure-splash-screen-0.4.0" // { dependencies = [ @@ -78440,7 +78440,7 @@ in sources."pngjs-5.0.0" ]; }) - (sources."@expo/dev-server-0.1.72" // { + (sources."@expo/dev-server-0.1.74" // { dependencies = [ sources."body-parser-1.19.0" sources."bytes-3.1.0" @@ -78457,7 +78457,7 @@ in sources."temp-dir-2.0.0" ]; }) - sources."@expo/dev-tools-0.13.102" + sources."@expo/dev-tools-0.13.104" (sources."@expo/devcert-1.0.0" // { dependencies = [ sources."debug-3.2.7" @@ -78477,7 +78477,7 @@ in sources."json5-1.0.1" ]; }) - sources."@expo/metro-config-0.1.72" + sources."@expo/metro-config-0.1.74" sources."@expo/osascript-2.0.28" (sources."@expo/package-manager-0.0.43" // { dependencies = [ @@ -78491,7 +78491,7 @@ in sources."xmlbuilder-14.0.0" ]; }) - sources."@expo/prebuild-config-1.0.3" + sources."@expo/prebuild-config-1.0.5" sources."@expo/results-1.0.0" (sources."@expo/schemer-1.3.29" // { dependencies = [ @@ -78502,15 +78502,16 @@ in }) sources."@expo/simple-spinner-1.0.2" sources."@expo/spawn-async-1.5.0" - (sources."@expo/webpack-config-0.12.76" // { + (sources."@expo/webpack-config-0.12.78" // { dependencies = [ sources."@babel/runtime-7.9.0" sources."react-refresh-0.8.3" ]; }) - (sources."@expo/xcpretty-2.0.2" // { + (sources."@expo/xcpretty-3.1.3" // { dependencies = [ sources."@babel/code-frame-7.10.4" + sources."js-yaml-4.1.0" ]; }) sources."@hapi/address-4.1.0" @@ -78700,7 +78701,7 @@ in sources."application-config-path-0.1.0" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" - sources."argparse-1.0.10" + sources."argparse-2.0.1" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -78979,7 +78980,7 @@ in ]; }) sources."core-js-2.6.12" - (sources."core-js-compat-3.15.0" // { + (sources."core-js-compat-3.15.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -79113,7 +79114,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.752" + sources."electron-to-chromium-1.3.755" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -79194,7 +79195,7 @@ in sources."ms-2.0.0" ]; }) - (sources."expo-pwa-0.0.82" // { + (sources."expo-pwa-0.0.84" // { dependencies = [ sources."commander-2.20.0" ]; @@ -79512,7 +79513,11 @@ in sources."join-component-1.1.0" sources."jpeg-js-0.4.3" sources."js-tokens-4.0.0" - sources."js-yaml-3.14.1" + (sources."js-yaml-3.14.1" // { + dependencies = [ + sources."argparse-1.0.10" + ]; + }) sources."jsbn-0.1.1" sources."jsesc-2.5.2" sources."json-buffer-3.0.1" @@ -79720,7 +79725,7 @@ in sources."node-releases-1.1.73" sources."nopt-5.0.0" sources."normalize-path-3.0.0" - sources."normalize-url-6.0.1" + sources."normalize-url-6.1.0" sources."npm-bundled-1.1.2" sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" @@ -79749,7 +79754,6 @@ in sources."npm-run-path-2.0.2" sources."npmlog-4.1.2" sources."nth-check-2.0.0" - sources."nullthrows-1.1.1" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."ob1-0.59.0" @@ -79788,7 +79792,7 @@ in sources."is-wsl-1.1.0" ]; }) - sources."optimize-css-assets-webpack-plugin-5.0.6" + sources."optimize-css-assets-webpack-plugin-5.0.8" sources."options-0.0.6" (sources."ora-3.4.0" // { dependencies = [ @@ -80743,7 +80747,7 @@ in sources."uuid-7.0.3" ]; }) - (sources."xdl-59.0.42" // { + (sources."xdl-59.0.44" // { dependencies = [ sources."chownr-1.1.4" sources."fs-minipass-1.2.7" @@ -80997,9 +81001,9 @@ in sources."@babel/helper-split-export-declaration-7.14.5" sources."@babel/helper-validator-identifier-7.14.5" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.6" + sources."@babel/parser-7.14.7" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.5" + sources."@babel/traverse-7.14.7" sources."@babel/types-7.14.5" (sources."@heroku-cli/color-1.1.14" // { dependencies = [ @@ -81720,7 +81724,7 @@ in sources."binary-0.3.0" sources."binary-extensions-2.2.0" sources."bl-4.1.0" - sources."blakejs-1.1.0" + sources."blakejs-1.1.1" sources."bluebird-3.4.7" (sources."body-parser-1.19.0" // { dependencies = [ @@ -82004,7 +82008,7 @@ in sources."glob-slasher-1.0.1" sources."global-dirs-2.1.0" sources."google-auth-library-6.1.6" - (sources."google-gax-2.15.1" // { + (sources."google-gax-2.16.0" // { dependencies = [ sources."google-auth-library-7.1.2" ]; @@ -83448,10 +83452,10 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "3.7.1"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.7.1.tgz"; - sha512 = "IWs7eU3tOad4qiglvokrZEL2yJPQsXjuzKW5slfXbhuj5pIc+o65f389HeOq20wHPh7ACHfZPMftvhtaPsO91g=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.8.0.tgz"; + sha512 = "81rQNDgHgkXoFMiwluZGN0ETKonGn8tl1uxL3OpOx3aOfP1aPv5NBSOLX70O6vo9jXyg6oy0gPHGjhbQMdSyIw=="; }; dependencies = [ (sources."@ardatan/aggregate-error-0.0.6" // { @@ -83460,7 +83464,7 @@ in ]; }) sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.5" + sources."@babel/compat-data-7.14.7" (sources."@babel/core-7.14.6" // { dependencies = [ sources."semver-6.3.0" @@ -83481,7 +83485,7 @@ in sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" sources."@babel/helper-module-transforms-7.14.5" sources."@babel/helper-optimise-call-expression-7.14.5" @@ -83498,7 +83502,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.6" + sources."@babel/parser-7.14.7" sources."@babel/plugin-proposal-object-rest-spread-7.10.4" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-syntax-jsx-7.14.5" @@ -83509,7 +83513,7 @@ in sources."@babel/runtime-7.14.6" sources."@babel/standalone-7.14.7" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.5" + sources."@babel/traverse-7.14.7" sources."@babel/types-7.14.5" sources."@graphql-tools/schema-7.1.5" sources."@graphql-tools/utils-7.10.0" @@ -83676,7 +83680,7 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."cors-2.8.5" - sources."create-gatsby-1.7.1" + sources."create-gatsby-1.8.0" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -83711,7 +83715,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.752" + sources."electron-to-chromium-1.3.755" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -83783,8 +83787,8 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."gatsby-core-utils-2.7.1" - (sources."gatsby-recipes-0.18.1" // { + sources."gatsby-core-utils-2.8.0" + (sources."gatsby-recipes-0.19.0" // { dependencies = [ sources."cross-spawn-7.0.3" sources."execa-4.1.0" @@ -83798,7 +83802,7 @@ in sources."which-2.0.2" ]; }) - sources."gatsby-telemetry-2.7.1" + sources."gatsby-telemetry-2.8.0" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" @@ -83960,7 +83964,7 @@ in sources."node-object-hash-2.3.7" sources."node-releases-1.1.73" sources."normalize-path-3.0.0" - sources."normalize-url-6.0.1" + sources."normalize-url-6.1.0" sources."npm-run-path-2.0.2" sources."nth-check-2.0.0" sources."object-assign-4.1.1" @@ -85656,7 +85660,7 @@ in sources."lodash-4.17.21" sources."lodash.toarray-4.4.0" sources."map-canvas-0.1.5" - sources."marked-2.1.1" + sources."marked-2.1.2" (sources."marked-terminal-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -88807,7 +88811,7 @@ in sha512 = "sxKt7h0vzCd+3Y81Ey2qinupL6DpRSZJclS04ugHDNmRUXGzqicMJ6iwayhSA0S0DwwX30c5ozyUthr1QKF6uw=="; }; dependencies = [ - sources."@babel/parser-7.14.6" + sources."@babel/parser-7.14.7" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.9.0" @@ -88820,7 +88824,7 @@ in sources."lodash-4.17.21" sources."markdown-it-10.0.0" sources."markdown-it-anchor-5.3.0" - sources."marked-2.1.1" + sources."marked-2.1.2" sources."mdurl-1.0.1" sources."mkdirp-1.0.4" sources."requizzle-0.2.3" @@ -89336,10 +89340,10 @@ in sources."clean-stack-3.0.1" sources."cli-cursor-3.1.0" sources."cli-progress-3.9.0" - (sources."cli-ux-5.5.1" // { + (sources."cli-ux-5.6.2" // { dependencies = [ sources."has-flag-4.0.0" - sources."supports-color-7.2.0" + sources."supports-color-8.1.1" sources."tslib-2.3.0" ]; }) @@ -91097,7 +91101,7 @@ in sources."semver-5.7.1" ]; }) - sources."normalize-url-6.0.1" + sources."normalize-url-6.1.0" sources."npm-bundled-1.1.2" sources."npm-install-checks-4.0.0" (sources."npm-lifecycle-3.1.5" // { @@ -92255,7 +92259,7 @@ in src = ../interpreters/clojurescript/lumo; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.5" + sources."@babel/compat-data-7.14.7" sources."@babel/core-7.14.6" sources."@babel/generator-7.14.5" sources."@babel/helper-annotate-as-pure-7.14.5" @@ -92268,7 +92272,7 @@ in sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" sources."@babel/helper-module-transforms-7.14.5" sources."@babel/helper-optimise-call-expression-7.14.5" @@ -92287,10 +92291,10 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.6" + sources."@babel/parser-7.14.7" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-external-helpers-7.8.3" - sources."@babel/plugin-proposal-async-generator-functions-7.14.5" + sources."@babel/plugin-proposal-async-generator-functions-7.14.7" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-class-static-block-7.14.5" sources."@babel/plugin-proposal-dynamic-import-7.14.5" @@ -92299,7 +92303,7 @@ in sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" sources."@babel/plugin-proposal-numeric-separator-7.14.5" - sources."@babel/plugin-proposal-object-rest-spread-7.14.5" + sources."@babel/plugin-proposal-object-rest-spread-7.14.7" sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-proposal-private-methods-7.14.5" @@ -92327,7 +92331,7 @@ in sources."@babel/plugin-transform-block-scoping-7.14.5" sources."@babel/plugin-transform-classes-7.14.5" sources."@babel/plugin-transform-computed-properties-7.14.5" - sources."@babel/plugin-transform-destructuring-7.14.5" + sources."@babel/plugin-transform-destructuring-7.14.7" sources."@babel/plugin-transform-dotall-regex-7.14.5" sources."@babel/plugin-transform-duplicate-keys-7.14.5" sources."@babel/plugin-transform-exponentiation-operator-7.14.5" @@ -92339,7 +92343,7 @@ in sources."@babel/plugin-transform-modules-commonjs-7.14.5" sources."@babel/plugin-transform-modules-systemjs-7.14.5" sources."@babel/plugin-transform-modules-umd-7.14.5" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.5" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.7" sources."@babel/plugin-transform-new-target-7.14.5" sources."@babel/plugin-transform-object-super-7.14.5" sources."@babel/plugin-transform-parameters-7.14.5" @@ -92354,12 +92358,12 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - sources."@babel/preset-env-7.14.5" + sources."@babel/preset-env-7.14.7" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-stage-2-7.8.3" sources."@babel/runtime-7.14.6" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.5" + sources."@babel/traverse-7.14.7" sources."@babel/types-7.14.5" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" @@ -92626,7 +92630,7 @@ in }) sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.15.0" // { + (sources."core-js-compat-3.15.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -92678,7 +92682,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.752" + sources."electron-to-chromium-1.3.755" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -93533,7 +93537,7 @@ in sources."link-check-4.5.4" sources."lodash-4.17.21" sources."markdown-link-extractor-1.3.0" - sources."marked-2.1.1" + sources."marked-2.1.2" sources."mime-db-1.48.0" sources."mime-types-2.1.31" sources."ms-2.1.3" @@ -93568,10 +93572,10 @@ in mastodon-bot = nodeEnv.buildNodePackage { name = "mastodon-bot"; packageName = "mastodon-bot"; - version = "1.11.0"; + version = "1.12.1-20210623060235"; src = fetchurl { - url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.11.0.tgz"; - sha512 = "ZJiVQ87TLyJ+px5fqxlqL4Ho8Ii3v9WduD7Srs9mD2iCnKwSockDXocdWfUv5Bx70Z8/3NJDRIurlRPMAqbAvg=="; + url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.12.1-20210623060235.tgz"; + sha512 = "eXao5YnfoIQ4hqVmzCN2HT6GXfgYuReCPNlDz54Yn8YtUxwdhQZ9KnQo9t0ex4Bl6rrAZ0Po8GuVIzTVn22o4Q=="; }; dependencies = [ sources."acorn-5.7.4" @@ -94085,7 +94089,7 @@ in sources."@fluentui/date-time-utilities-7.9.1" sources."@fluentui/dom-utilities-1.1.2" sources."@fluentui/keyboard-key-0.2.17" - sources."@fluentui/react-7.172.0" + sources."@fluentui/react-7.172.1" sources."@fluentui/react-focus-7.17.6" sources."@fluentui/react-window-provider-1.0.2" sources."@fluentui/theme-1.7.4" @@ -94225,7 +94229,7 @@ in sources."node-fetch-1.6.3" sources."normalize-url-4.5.1" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.172.0" + sources."office-ui-fabric-react-7.172.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -94602,14 +94606,14 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "3.37.38"; + version = "3.38.7"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.37.38.tgz"; - sha512 = "huXGW0QZpqNQ8hFE2JfWl5hMhqtEXU05vMsa91ldL0b5JLoh7/9+xQGhfiHvlT3PMGNznc1ToBSN+6Fp0rJ1BQ=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.38.7.tgz"; + sha512 = "q95l1GhUbv1VgePfCHuNREvmGO7dN9H+kSw5esaxNITa/+67xXP4PA2dzJaylTXciEF3NdIhTdXCC9j/CUs4EQ=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.5" + sources."@babel/compat-data-7.14.7" (sources."@babel/core-7.14.6" // { dependencies = [ sources."semver-6.3.0" @@ -94634,7 +94638,7 @@ in sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" sources."@babel/helper-module-transforms-7.14.5" sources."@babel/helper-optimise-call-expression-7.14.5" @@ -94657,9 +94661,9 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.14.6" + sources."@babel/parser-7.14.7" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" - sources."@babel/plugin-proposal-async-generator-functions-7.14.5" + sources."@babel/plugin-proposal-async-generator-functions-7.14.7" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-class-static-block-7.14.5" sources."@babel/plugin-proposal-dynamic-import-7.14.5" @@ -94668,7 +94672,7 @@ in sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" sources."@babel/plugin-proposal-numeric-separator-7.14.5" - sources."@babel/plugin-proposal-object-rest-spread-7.14.5" + sources."@babel/plugin-proposal-object-rest-spread-7.14.7" sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-proposal-private-methods-7.14.5" @@ -94694,7 +94698,7 @@ in sources."@babel/plugin-transform-block-scoping-7.14.5" sources."@babel/plugin-transform-classes-7.14.5" sources."@babel/plugin-transform-computed-properties-7.14.5" - sources."@babel/plugin-transform-destructuring-7.14.5" + sources."@babel/plugin-transform-destructuring-7.14.7" sources."@babel/plugin-transform-dotall-regex-7.14.5" sources."@babel/plugin-transform-duplicate-keys-7.14.5" sources."@babel/plugin-transform-exponentiation-operator-7.14.5" @@ -94706,7 +94710,7 @@ in sources."@babel/plugin-transform-modules-commonjs-7.14.5" sources."@babel/plugin-transform-modules-systemjs-7.14.5" sources."@babel/plugin-transform-modules-umd-7.14.5" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.5" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.7" sources."@babel/plugin-transform-new-target-7.14.5" sources."@babel/plugin-transform-object-super-7.14.5" sources."@babel/plugin-transform-parameters-7.14.5" @@ -94720,7 +94724,7 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.14.5" // { + (sources."@babel/preset-env-7.14.7" // { dependencies = [ sources."semver-6.3.0" ]; @@ -94728,7 +94732,7 @@ in sources."@babel/preset-modules-0.1.4" sources."@babel/runtime-7.14.6" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.5" + sources."@babel/traverse-7.14.7" sources."@babel/types-7.14.5" sources."@bugsnag/browser-7.10.1" sources."@bugsnag/core-7.10.0" @@ -94739,13 +94743,28 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-12.4.1" // { + (sources."@netlify/build-12.7.2" // { dependencies = [ + sources."@netlify/config-7.7.1" + (sources."@netlify/zip-it-and-ship-it-4.4.2" // { + dependencies = [ + sources."find-up-5.0.0" + sources."locate-path-6.0.0" + sources."p-locate-5.0.0" + sources."pkg-dir-5.0.0" + sources."semver-7.3.5" + sources."yargs-16.2.0" + ]; + }) sources."ansi-styles-4.3.0" sources."chalk-3.0.0" + sources."cp-file-9.1.0" + sources."dot-prop-5.3.0" sources."execa-3.4.0" + sources."find-up-4.1.0" sources."is-plain-obj-2.1.0" sources."locate-path-5.0.0" + sources."netlify-redirect-parser-7.0.0" sources."resolve-2.0.0-next.3" sources."semver-6.3.0" sources."update-notifier-4.1.3" @@ -94759,7 +94778,7 @@ in sources."slash-3.0.0" ]; }) - (sources."@netlify/config-7.5.0" // { + (sources."@netlify/config-8.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" @@ -94773,11 +94792,18 @@ in sources."@netlify/esbuild-0.13.6" (sources."@netlify/framework-info-5.3.0" // { dependencies = [ - sources."p-limit-3.1.0" sources."p-locate-5.0.0" ]; }) - sources."@netlify/functions-utils-1.3.43" + (sources."@netlify/functions-utils-1.3.46" // { + dependencies = [ + sources."@netlify/zip-it-and-ship-it-4.4.2" + sources."cp-file-9.1.0" + sources."pkg-dir-5.0.0" + sources."resolve-2.0.0-next.3" + sources."yargs-16.2.0" + ]; + }) (sources."@netlify/git-utils-1.0.11" // { dependencies = [ sources."braces-3.0.2" @@ -94791,25 +94817,23 @@ in sources."@netlify/open-api-2.5.0" (sources."@netlify/plugin-edge-handlers-1.11.19" // { dependencies = [ - sources."@types/node-14.17.3" + sources."@types/node-14.17.4" + sources."typescript-4.3.4" ]; }) - sources."@netlify/plugins-list-2.16.0" + sources."@netlify/plugins-list-2.18.0" sources."@netlify/routing-local-proxy-0.30.1" (sources."@netlify/run-utils-1.0.7" // { dependencies = [ sources."execa-3.4.0" ]; }) - (sources."@netlify/zip-it-and-ship-it-4.4.2" // { + (sources."@netlify/zip-it-and-ship-it-4.5.1" // { dependencies = [ - sources."cliui-7.0.4" sources."cp-file-9.1.0" sources."pkg-dir-5.0.0" sources."resolve-2.0.0-next.3" - sources."y18n-5.0.8" sources."yargs-16.2.0" - sources."yargs-parser-20.2.9" ]; }) (sources."@nodelib/fs.scandir-2.1.5" // { @@ -95001,6 +95025,7 @@ in sources."@typescript-eslint/visitor-keys-4.28.0" sources."@ungap/from-entries-0.2.1" sources."accepts-1.3.7" + sources."acorn-8.4.0" sources."agent-base-6.0.2" sources."aggregate-error-3.1.0" sources."ajv-8.6.0" @@ -95185,7 +95210,7 @@ in sources."strip-ansi-3.0.1" ]; }) - (sources."cli-ux-5.5.1" // { + (sources."cli-ux-5.6.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."argparse-1.0.10" @@ -95194,17 +95219,17 @@ in sources."extract-stack-2.0.0" sources."has-flag-4.0.0" sources."js-yaml-3.14.1" - sources."supports-hyperlinks-2.2.0" + sources."supports-color-8.1.1" + (sources."supports-hyperlinks-2.2.0" // { + dependencies = [ + sources."supports-color-7.2.0" + ]; + }) sources."tslib-2.3.0" ]; }) sources."cli-width-2.2.1" - (sources."cliui-6.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."wrap-ansi-6.2.0" - ]; - }) + sources."cliui-7.0.4" sources."clone-1.0.4" sources."clone-response-1.0.2" sources."code-point-at-1.1.0" @@ -95256,7 +95281,7 @@ in sources."safe-buffer-5.1.2" ]; }) - (sources."core-js-compat-3.15.0" // { + (sources."core-js-compat-3.15.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -95360,11 +95385,7 @@ in sources."detective-sass-3.0.1" sources."detective-scss-2.0.1" sources."detective-stylus-1.0.0" - (sources."detective-typescript-7.0.0" // { - dependencies = [ - sources."typescript-3.9.10" - ]; - }) + sources."detective-typescript-7.0.0" (sources."dir-glob-2.2.2" // { dependencies = [ sources."path-type-3.0.0" @@ -95402,7 +95423,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.752" + sources."electron-to-chromium-1.3.755" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -95519,7 +95540,7 @@ in sources."keyv-4.0.3" sources."lowercase-keys-2.0.0" sources."mimic-response-2.1.0" - sources."normalize-url-6.0.1" + sources."normalize-url-6.1.0" sources."p-cancelable-2.1.1" sources."pretty-format-25.5.0" sources."responselike-2.0.0" @@ -95837,7 +95858,6 @@ in }) (sources."locate-path-6.0.0" // { dependencies = [ - sources."p-limit-3.1.0" sources."p-locate-5.0.0" ]; }) @@ -95957,7 +95977,7 @@ in sources."qs-6.10.1" ]; }) - (sources."netlify-redirect-parser-7.0.0" // { + (sources."netlify-redirect-parser-8.0.0" // { dependencies = [ sources."is-plain-obj-2.1.0" ]; @@ -96072,8 +96092,12 @@ in }) sources."p-finally-2.0.1" sources."p-is-promise-1.1.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" + sources."p-limit-3.1.0" + (sources."p-locate-4.1.0" // { + dependencies = [ + sources."p-limit-2.3.0" + ]; + }) sources."p-map-4.0.0" sources."p-reduce-2.1.0" (sources."p-timeout-2.0.1" // { @@ -96451,7 +96475,7 @@ in sources."type-fest-0.21.3" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" - sources."typescript-4.3.4" + sources."typescript-3.9.10" sources."uid-safe-2.1.5" sources."unbzip2-stream-1.4.3" sources."unicode-canonical-property-names-ecmascript-1.0.4" @@ -96555,15 +96579,20 @@ in sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xtend-4.0.2" - sources."y18n-4.0.3" + sources."y18n-5.0.8" sources."yallist-4.0.0" (sources."yargs-15.4.1" // { dependencies = [ + sources."ansi-styles-4.3.0" + sources."cliui-6.0.0" sources."find-up-4.1.0" sources."locate-path-5.0.0" + sources."wrap-ansi-6.2.0" + sources."y18n-4.0.3" + sources."yargs-parser-18.1.3" ]; }) - sources."yargs-parser-18.1.3" + sources."yargs-parser-20.2.9" sources."yarn-1.22.10" sources."yauzl-2.10.0" sources."yocto-queue-0.1.0" @@ -98293,7 +98322,7 @@ in sources."hosted-git-info-4.0.2" ]; }) - sources."normalize-url-6.0.1" + sources."normalize-url-6.1.0" (sources."npm-name-6.0.1" // { dependencies = [ sources."p-map-3.0.0" @@ -99097,7 +99126,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.5" + sources."@babel/compat-data-7.14.7" (sources."@babel/core-7.14.6" // { dependencies = [ sources."json5-2.2.0" @@ -99128,7 +99157,7 @@ in sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" sources."@babel/helper-module-transforms-7.14.5" sources."@babel/helper-optimise-call-expression-7.14.5" @@ -99143,9 +99172,9 @@ in sources."@babel/helper-wrap-function-7.14.5" sources."@babel/helpers-7.14.6" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.6" + sources."@babel/parser-7.14.7" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" - sources."@babel/plugin-proposal-async-generator-functions-7.14.5" + sources."@babel/plugin-proposal-async-generator-functions-7.14.7" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-class-static-block-7.14.5" sources."@babel/plugin-proposal-dynamic-import-7.14.5" @@ -99154,7 +99183,7 @@ in sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" sources."@babel/plugin-proposal-numeric-separator-7.14.5" - sources."@babel/plugin-proposal-object-rest-spread-7.14.5" + sources."@babel/plugin-proposal-object-rest-spread-7.14.7" sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-proposal-private-methods-7.14.5" @@ -99182,7 +99211,7 @@ in sources."@babel/plugin-transform-block-scoping-7.14.5" sources."@babel/plugin-transform-classes-7.14.5" sources."@babel/plugin-transform-computed-properties-7.14.5" - sources."@babel/plugin-transform-destructuring-7.14.5" + sources."@babel/plugin-transform-destructuring-7.14.7" sources."@babel/plugin-transform-dotall-regex-7.14.5" sources."@babel/plugin-transform-duplicate-keys-7.14.5" sources."@babel/plugin-transform-exponentiation-operator-7.14.5" @@ -99195,7 +99224,7 @@ in sources."@babel/plugin-transform-modules-commonjs-7.14.5" sources."@babel/plugin-transform-modules-systemjs-7.14.5" sources."@babel/plugin-transform-modules-umd-7.14.5" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.5" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.7" sources."@babel/plugin-transform-new-target-7.14.5" sources."@babel/plugin-transform-object-super-7.14.5" sources."@babel/plugin-transform-parameters-7.14.5" @@ -99210,7 +99239,7 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.14.5" // { + (sources."@babel/preset-env-7.14.7" // { dependencies = [ sources."semver-6.3.0" ]; @@ -99218,7 +99247,7 @@ in sources."@babel/preset-modules-0.1.4" sources."@babel/runtime-7.14.6" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.5" + sources."@babel/traverse-7.14.7" sources."@babel/types-7.14.5" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -99368,7 +99397,7 @@ in sources."convert-source-map-1.8.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.15.0" // { + (sources."core-js-compat-3.15.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -99479,7 +99508,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.752" + sources."electron-to-chromium-1.3.755" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -101368,10 +101397,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.8.0"; + version = "6.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.8.0.tgz"; - sha512 = "la/zfhv3FA9K5kwWda58genmRQD0MwWJjLvHhH65EQWOEG3sr9zKSCJxUzckIY9uy//IRhnTTUY0HYqq2D7N6g=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.9.0.tgz"; + sha512 = "PYB3AujuDut50PAe7m8jAggruh0D8/Zm+nO2QprVfG1Xug1zAOsMMJEc+wjvEC9irFwT20Qu4qvr+lEiXyK1HA=="; }; buildInputs = globalBuildInputs; meta = { @@ -102246,7 +102275,7 @@ in dependencies = [ sources."@babel/cli-7.14.5" sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.5" + sources."@babel/compat-data-7.14.7" (sources."@babel/core-7.14.6" // { dependencies = [ sources."semver-6.3.0" @@ -102271,7 +102300,7 @@ in sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" sources."@babel/helper-module-transforms-7.14.5" sources."@babel/helper-optimise-call-expression-7.14.5" @@ -102286,9 +102315,9 @@ in sources."@babel/helper-wrap-function-7.14.5" sources."@babel/helpers-7.14.6" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.6" + sources."@babel/parser-7.14.7" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" - sources."@babel/plugin-proposal-async-generator-functions-7.14.5" + sources."@babel/plugin-proposal-async-generator-functions-7.14.7" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-class-static-block-7.14.5" sources."@babel/plugin-proposal-dynamic-import-7.14.5" @@ -102298,7 +102327,7 @@ in sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" sources."@babel/plugin-proposal-numeric-separator-7.14.5" - sources."@babel/plugin-proposal-object-rest-spread-7.14.5" + sources."@babel/plugin-proposal-object-rest-spread-7.14.7" sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-proposal-private-methods-7.14.5" @@ -102326,7 +102355,7 @@ in sources."@babel/plugin-transform-block-scoping-7.14.5" sources."@babel/plugin-transform-classes-7.14.5" sources."@babel/plugin-transform-computed-properties-7.14.5" - sources."@babel/plugin-transform-destructuring-7.14.5" + sources."@babel/plugin-transform-destructuring-7.14.7" sources."@babel/plugin-transform-dotall-regex-7.14.5" sources."@babel/plugin-transform-duplicate-keys-7.14.5" sources."@babel/plugin-transform-exponentiation-operator-7.14.5" @@ -102338,7 +102367,7 @@ in sources."@babel/plugin-transform-modules-commonjs-7.14.5" sources."@babel/plugin-transform-modules-systemjs-7.14.5" sources."@babel/plugin-transform-modules-umd-7.14.5" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.5" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.7" sources."@babel/plugin-transform-new-target-7.14.5" sources."@babel/plugin-transform-object-super-7.14.5" sources."@babel/plugin-transform-parameters-7.14.5" @@ -102361,7 +102390,7 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.14.5" // { + (sources."@babel/preset-env-7.14.7" // { dependencies = [ sources."semver-6.3.0" ]; @@ -102372,7 +102401,7 @@ in sources."@babel/register-7.14.5" sources."@babel/runtime-7.14.6" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.5" + sources."@babel/traverse-7.14.7" sources."@babel/types-7.14.5" sources."@reach/router-1.3.4" sources."@sindresorhus/is-0.7.0" @@ -102652,7 +102681,7 @@ in sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.15.0" // { + (sources."core-js-compat-3.15.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -102796,7 +102825,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.752" + sources."electron-to-chromium-1.3.755" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -103281,7 +103310,7 @@ in sources."onetime-2.0.1" sources."opener-1.5.2" sources."opn-5.5.0" - sources."optimize-css-assets-webpack-plugin-5.0.6" + sources."optimize-css-assets-webpack-plugin-5.0.8" sources."original-1.0.2" sources."os-browserify-0.3.0" sources."os-tmpdir-1.0.2" @@ -104077,7 +104106,7 @@ in }) sources."data-urls-2.0.0" sources."debug-4.3.2" - sources."decimal.js-10.2.1" + sources."decimal.js-10.3.0" sources."deep-is-0.1.3" sources."delayed-stream-1.0.0" (sources."domexception-2.0.1" // { @@ -104172,10 +104201,10 @@ in sources."@babel/helper-split-export-declaration-7.14.5" sources."@babel/helper-validator-identifier-7.14.5" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.6" + sources."@babel/parser-7.14.7" sources."@babel/runtime-7.14.6" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.5" + sources."@babel/traverse-7.14.7" sources."@babel/types-7.14.5" sources."@emotion/is-prop-valid-0.8.8" sources."@emotion/memoize-0.7.4" @@ -104185,7 +104214,7 @@ in sources."@redocly/ajv-6.12.4" (sources."@redocly/openapi-core-1.0.0-beta.50" // { dependencies = [ - sources."@types/node-14.17.3" + sources."@types/node-14.17.4" ]; }) sources."@redocly/react-dropdown-aria-2.0.12" @@ -105034,7 +105063,7 @@ in ]; }) sources."text-table-0.2.0" - sources."tmp-0.2.1" + sources."tmp-0.0.29" sources."to-regex-range-5.0.1" sources."traverse-0.3.9" sources."tslib-2.3.0" @@ -105056,7 +105085,7 @@ in sources."url-join-1.1.0" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.3.0" - (sources."vsce-1.93.0" // { + (sources."vsce-1.88.0" // { dependencies = [ sources."chalk-2.4.2" sources."commander-6.2.1" @@ -105476,7 +105505,7 @@ in sources."semver-6.3.0" ]; }) - sources."@serverless/dashboard-plugin-5.4.1" + sources."@serverless/dashboard-plugin-5.4.2" sources."@serverless/event-mocks-1.1.1" (sources."@serverless/platform-client-4.2.3" // { dependencies = [ @@ -105848,7 +105877,7 @@ in sources."keyv-4.0.3" sources."lowercase-keys-2.0.0" sources."mimic-response-3.1.0" - sources."normalize-url-6.0.1" + sources."normalize-url-6.1.0" sources."p-cancelable-2.1.1" sources."responselike-2.0.0" ]; @@ -106925,10 +106954,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.640.0"; + version = "1.642.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.640.0.tgz"; - sha512 = "cVBEX4+JxzqcIn/S726VYwbRXzERy/KBxeu9LE1b/WSDe0SNX6ejOl8LGORCk0No2RIJLLAgkmrBZSeSS+AeHw=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.642.0.tgz"; + sha512 = "rrEZuPD1olFg8+MoNAHXeS+HuPQE/RpL4R2Yhizg/NIzYd/PC2peNx0jOOywqqqRseQY8Vhyr19KIrriFEIFJg=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" @@ -106952,18 +106981,18 @@ in }) sources."@snyk/docker-registry-v2-client-2.2.2" sources."@snyk/fast-glob-3.2.6-patch" - (sources."@snyk/fix-1.634.0" // { + (sources."@snyk/fix-1.642.0" // { dependencies = [ sources."chalk-4.1.1" sources."strip-ansi-6.0.0" ]; }) - (sources."@snyk/fix-pipenv-pipfile-0.5.3" // { + (sources."@snyk/fix-pipenv-pipfile-0.5.4" // { dependencies = [ sources."debug-4.3.1" ]; }) - (sources."@snyk/fix-poetry-0.7.0" // { + (sources."@snyk/fix-poetry-0.7.2" // { dependencies = [ sources."debug-4.3.1" ]; @@ -107134,7 +107163,7 @@ in sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."configstore-5.0.1" - sources."core-js-3.15.0" + sources."core-js-3.15.1" sources."core-util-is-1.0.2" (sources."cross-spawn-6.0.5" // { dependencies = [ @@ -107348,7 +107377,7 @@ in }) sources."nice-try-1.0.5" sources."node.extend-2.0.2" - sources."normalize-url-6.0.1" + sources."normalize-url-6.1.0" sources."npm-run-path-2.0.2" sources."object-hash-2.2.0" sources."object-keys-1.1.1" @@ -107399,7 +107428,6 @@ in sources."picomatch-2.3.0" sources."pluralize-7.0.0" sources."prepend-http-2.0.0" - sources."prettier-2.3.1" sources."pretty-bytes-5.6.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" @@ -109720,14 +109748,14 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/compat-data-7.14.5" + sources."@babel/compat-data-7.14.7" sources."@babel/core-7.14.6" sources."@babel/generator-7.14.5" sources."@babel/helper-compilation-targets-7.14.5" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" - sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" sources."@babel/helper-module-transforms-7.14.5" sources."@babel/helper-optimise-call-expression-7.14.5" @@ -109742,9 +109770,9 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.6" + sources."@babel/parser-7.14.7" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.5" + sources."@babel/traverse-7.14.7" sources."@babel/types-7.14.5" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" @@ -109813,7 +109841,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.752" + sources."electron-to-chromium-1.3.755" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -110096,7 +110124,7 @@ in sources."readdirp-3.6.0" sources."source-map-0.7.3" sources."strip-indent-3.0.0" - sources."svelte-3.38.2" + sources."svelte-3.38.3" sources."svelte-preprocess-4.7.3" sources."svelte2tsx-0.3.0" sources."to-regex-range-5.0.1" @@ -112255,7 +112283,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.15.0" + sources."core-js-3.15.1" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -112432,7 +112460,7 @@ in ]; }) sources."nopt-4.0.3" - sources."normalize-url-6.0.1" + sources."normalize-url-6.1.0" sources."npm-bundled-1.1.2" sources."npm-normalize-package-bin-1.0.1" sources."npm-packlist-1.4.8" @@ -113147,7 +113175,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.10" - sources."@types/node-14.17.3" + sources."@types/node-14.17.4" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" @@ -114109,7 +114137,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.7.0" - sources."electron-to-chromium-1.3.752" + sources."electron-to-chromium-1.3.755" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.2" @@ -115591,7 +115619,7 @@ in sha512 = "uhSNGU27KDT2e2v51l/NqMc59O7X0DG7CHonZOwsnvMHLvyudCLZgXCU8Rw4T8gpqg2asn50vfPHq7l3DGlN5w=="; }; dependencies = [ - sources."@babel/runtime-corejs3-7.14.6" + sources."@babel/runtime-corejs3-7.14.7" sources."@mapbox/node-pre-gyp-1.0.5" sources."@tootallnate/once-1.1.2" sources."@types/raf-3.4.0" @@ -115643,7 +115671,7 @@ in sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."core-js-pure-3.15.0" + sources."core-js-pure-3.15.1" sources."core-util-is-1.0.2" sources."cssom-0.4.4" (sources."cssstyle-2.3.0" // { @@ -115653,7 +115681,7 @@ in }) sources."data-urls-2.0.0" sources."debug-4.3.2" - sources."decimal.js-10.2.1" + sources."decimal.js-10.3.0" sources."decompress-response-4.2.1" sources."deep-is-0.1.3" sources."delayed-stream-1.0.0" @@ -116430,7 +116458,7 @@ in sources."chrome-trace-event-1.0.3" sources."colorette-1.2.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.752" + sources."electron-to-chromium-1.3.755" sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.6.0" sources."escalade-3.1.1" @@ -117803,7 +117831,7 @@ in sources."config-chain-1.1.13" sources."configstore-3.1.5" sources."console-control-strings-1.1.0" - sources."core-js-3.15.0" + sources."core-js-3.15.1" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 8eca1fda2e5b..07b00deb9c36 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -1,21 +1,27 @@ { lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, cmake , libiconv , useMimalloc ? false -, doCheck ? true +# FIXME: Test doesn't pass under rustc 1.52.1 due to different escaping of `'` in string. +, doCheck ? false }: rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2021-06-07"; - cargoSha256 = "sha256-TyoCu2Q4Tr2EIWxQcjSxASni4dkeEVsfrF5UN7IVxSs="; + version = "2021-06-21"; + cargoSha256 = "sha256-OpfcxBeNwXSD830Sz3o07kgIdXTbZNNVGpaPeCIGGV8="; src = fetchFromGitHub { owner = "rust-analyzer"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-f8jdBL42+bU8KKchkW4fF6+kDBjgpoOZyP5yOYsebBk="; + sha256 = "sha256-nL5lSvxpOS+fw4iH/Gnl/DI86T9tUtguOy+wLGRkoeY="; }; + patches = [ + # We have rustc 1.52.1 in nixpkgs. + ./no-rust-1-53-features.patch + ]; + buildAndTestSubdir = "crates/rust-analyzer"; cargoBuildFlags = lib.optional useMimalloc "--features=mimalloc"; diff --git a/pkgs/development/tools/rust/rust-analyzer/no-rust-1-53-features.patch b/pkgs/development/tools/rust/rust-analyzer/no-rust-1-53-features.patch new file mode 100644 index 000000000000..9fa54e8a9039 --- /dev/null +++ b/pkgs/development/tools/rust/rust-analyzer/no-rust-1-53-features.patch @@ -0,0 +1,673 @@ +diff --git a/crates/hir/src/semantics.rs b/crates/hir/src/semantics.rs +index 43162797e..613266e07 100644 +--- a/crates/hir/src/semantics.rs ++++ b/crates/hir/src/semantics.rs +@@ -51,14 +51,12 @@ impl PathResolution { + PathResolution::Def(ModuleDef::BuiltinType(builtin)) => { + Some(TypeNs::BuiltinType((*builtin).into())) + } +- PathResolution::Def( +- ModuleDef::Const(_) +- | ModuleDef::Variant(_) +- | ModuleDef::Function(_) +- | ModuleDef::Module(_) +- | ModuleDef::Static(_) +- | ModuleDef::Trait(_), +- ) => None, ++ PathResolution::Def(ModuleDef::Const(_)) ++ | PathResolution::Def(ModuleDef::Variant(_)) ++ | PathResolution::Def(ModuleDef::Function(_)) ++ | PathResolution::Def(ModuleDef::Module(_)) ++ | PathResolution::Def(ModuleDef::Static(_)) ++ | PathResolution::Def(ModuleDef::Trait(_)) => None, + PathResolution::Def(ModuleDef::TypeAlias(alias)) => { + Some(TypeNs::TypeAliasId((*alias).into())) + } +@@ -67,7 +65,8 @@ impl PathResolution { + } + PathResolution::TypeParam(param) => Some(TypeNs::GenericParam((*param).into())), + PathResolution::SelfType(impl_def) => Some(TypeNs::SelfType((*impl_def).into())), +- PathResolution::AssocItem(AssocItem::Const(_) | AssocItem::Function(_)) => None, ++ PathResolution::AssocItem(AssocItem::Const(_)) ++ | PathResolution::AssocItem(AssocItem::Function(_)) => None, + PathResolution::AssocItem(AssocItem::TypeAlias(alias)) => { + Some(TypeNs::TypeAliasId((*alias).into())) + } +diff --git a/crates/hir_def/src/item_tree/pretty.rs b/crates/hir_def/src/item_tree/pretty.rs +index e63bc8232..b1e1b70d0 100644 +--- a/crates/hir_def/src/item_tree/pretty.rs ++++ b/crates/hir_def/src/item_tree/pretty.rs +@@ -63,7 +63,7 @@ impl<'a> Printer<'a> { + fn blank(&mut self) { + let mut iter = self.buf.chars().rev().fuse(); + match (iter.next(), iter.next()) { +- (Some('\n'), Some('\n') | None) | (None, None) => {} ++ (Some('\n'), Some('\n')) | (Some('\n'), None) | (None, None) => {} + (Some('\n'), Some(_)) => { + self.buf.push('\n'); + } +@@ -77,7 +77,7 @@ impl<'a> Printer<'a> { + + fn whitespace(&mut self) { + match self.buf.chars().next_back() { +- None | Some('\n' | ' ') => {} ++ None | Some('\n') | Some(' ') => {} + _ => self.buf.push(' '), + } + } +diff --git a/crates/hir_def/src/nameres/collector.rs b/crates/hir_def/src/nameres/collector.rs +index 927a7b6e8..fc2c50fb8 100644 +--- a/crates/hir_def/src/nameres/collector.rs ++++ b/crates/hir_def/src/nameres/collector.rs +@@ -1260,7 +1260,7 @@ impl DefCollector<'_> { + for directive in &self.unresolved_imports { + if let ImportSource::Import { id: import, use_tree } = &directive.import.source { + match (directive.import.path.segments().first(), &directive.import.path.kind) { +- (Some(krate), PathKind::Plain | PathKind::Abs) => { ++ (Some(krate), PathKind::Plain) | (Some(krate), PathKind::Abs) => { + if diagnosed_extern_crates.contains(krate) { + continue; + } +diff --git a/crates/hir_def/src/resolver.rs b/crates/hir_def/src/resolver.rs +index 49c573087..5edd93a2a 100644 +--- a/crates/hir_def/src/resolver.rs ++++ b/crates/hir_def/src/resolver.rs +@@ -605,7 +605,8 @@ fn to_value_ns(per_ns: PerNs) -> Option { + ModuleDefId::ConstId(it) => ValueNs::ConstId(it), + ModuleDefId::StaticId(it) => ValueNs::StaticId(it), + +- ModuleDefId::AdtId(AdtId::EnumId(_) | AdtId::UnionId(_)) ++ ModuleDefId::AdtId(AdtId::EnumId(_)) ++ | ModuleDefId::AdtId(AdtId::UnionId(_)) + | ModuleDefId::TraitId(_) + | ModuleDefId::TypeAliasId(_) + | ModuleDefId::BuiltinType(_) +diff --git a/crates/hir_def/src/visibility.rs b/crates/hir_def/src/visibility.rs +index aeb1e7726..83500f54e 100644 +--- a/crates/hir_def/src/visibility.rs ++++ b/crates/hir_def/src/visibility.rs +@@ -172,8 +172,9 @@ impl Visibility { + /// visible in unrelated modules). + pub(crate) fn max(self, other: Visibility, def_map: &DefMap) -> Option { + match (self, other) { +- (Visibility::Module(_) | Visibility::Public, Visibility::Public) +- | (Visibility::Public, Visibility::Module(_)) => Some(Visibility::Public), ++ (Visibility::Module(_), Visibility::Public) ++ | (Visibility::Public, Visibility::Module(_)) ++ | (Visibility::Public, Visibility::Public) => Some(Visibility::Public), + (Visibility::Module(mod_a), Visibility::Module(mod_b)) => { + if mod_a.krate != mod_b.krate { + return None; +diff --git a/crates/hir_expand/src/hygiene.rs b/crates/hir_expand/src/hygiene.rs +index 848522411..05c6c3fb1 100644 +--- a/crates/hir_expand/src/hygiene.rs ++++ b/crates/hir_expand/src/hygiene.rs +@@ -146,11 +146,10 @@ impl HygieneInfo { + (&self.macro_arg.1, InFile::new(loc.kind.file_id(), arg_start)) + } + mbe::Origin::Def => match (&*self.macro_def, self.def_start) { +- ( +- TokenExpander::MacroDef { def_site_token_map, .. } +- | TokenExpander::MacroRules { def_site_token_map, .. }, +- Some(tt), +- ) => (def_site_token_map, tt), ++ (TokenExpander::MacroDef { def_site_token_map, .. }, Some(tt)) ++ | (TokenExpander::MacroRules { def_site_token_map, .. }, Some(tt)) => { ++ (def_site_token_map, tt) ++ } + _ => panic!("`Origin::Def` used with non-`macro_rules!` macro"), + }, + }; +diff --git a/crates/hir_expand/src/lib.rs b/crates/hir_expand/src/lib.rs +index c31426d7c..33107aa24 100644 +--- a/crates/hir_expand/src/lib.rs ++++ b/crates/hir_expand/src/lib.rs +@@ -368,11 +368,10 @@ impl ExpansionInfo { + let (token_map, tt) = match origin { + mbe::Origin::Call => (&self.macro_arg.1, self.arg.clone()), + mbe::Origin::Def => match (&*self.macro_def, self.def.as_ref()) { +- ( +- db::TokenExpander::MacroRules { def_site_token_map, .. } +- | db::TokenExpander::MacroDef { def_site_token_map, .. }, +- Some(tt), +- ) => (def_site_token_map, tt.as_ref().map(|tt| tt.syntax().clone())), ++ (db::TokenExpander::MacroRules { def_site_token_map, .. }, Some(tt)) ++ | (db::TokenExpander::MacroDef { def_site_token_map, .. }, Some(tt)) => { ++ (def_site_token_map, tt.as_ref().map(|tt| tt.syntax().clone())) ++ } + _ => panic!("`Origin::Def` used with non-`macro_rules!` macro"), + }, + }; +diff --git a/crates/hir_ty/src/consteval.rs b/crates/hir_ty/src/consteval.rs +index ab1afce08..6f0bf8f8c 100644 +--- a/crates/hir_ty/src/consteval.rs ++++ b/crates/hir_ty/src/consteval.rs +@@ -38,7 +38,8 @@ impl ConstExt for Const { + // FIXME: support more than just evaluating literals + pub fn eval_usize(expr: &Expr) -> Option { + match expr { +- Expr::Literal(Literal::Uint(v, None | Some(BuiltinUint::Usize))) => (*v).try_into().ok(), ++ Expr::Literal(Literal::Uint(v, None)) ++ | Expr::Literal(Literal::Uint(v, Some(BuiltinUint::Usize))) => (*v).try_into().ok(), + _ => None, + } + } +diff --git a/crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs b/crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs +index e3d640a79..471cd4921 100644 +--- a/crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs ++++ b/crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs +@@ -84,7 +84,10 @@ impl IntRange { + #[inline] + fn is_integral(ty: &Ty) -> bool { + match ty.kind(&Interner) { +- TyKind::Scalar(Scalar::Char | Scalar::Int(_) | Scalar::Uint(_) | Scalar::Bool) => true, ++ TyKind::Scalar(Scalar::Char) ++ | TyKind::Scalar(Scalar::Int(_)) ++ | TyKind::Scalar(Scalar::Uint(_)) ++ | TyKind::Scalar(Scalar::Bool) => true, + _ => false, + } + } +@@ -378,7 +381,7 @@ impl Constructor { + // Wildcards cover anything + (_, Wildcard) => true, + // The missing ctors are not covered by anything in the matrix except wildcards. +- (Missing | Wildcard, _) => false, ++ (Missing, _) | (Wildcard, _) => false, + + (Single, Single) => true, + (Variant(self_id), Variant(other_id)) => self_id == other_id, +@@ -520,7 +523,7 @@ impl SplitWildcard { + } + } + TyKind::Scalar(Scalar::Char) => unhandled(), +- TyKind::Scalar(Scalar::Int(..) | Scalar::Uint(..)) => unhandled(), ++ TyKind::Scalar(Scalar::Int(..)) | TyKind::Scalar(Scalar::Uint(..)) => unhandled(), + TyKind::Never if !cx.feature_exhaustive_patterns() && !pcx.is_top_level => { + smallvec![NonExhaustive] + } +diff --git a/crates/hir_ty/src/infer/coerce.rs b/crates/hir_ty/src/infer/coerce.rs +index 7be914451..4b7f31521 100644 +--- a/crates/hir_ty/src/infer/coerce.rs ++++ b/crates/hir_ty/src/infer/coerce.rs +@@ -47,7 +47,10 @@ impl<'a> InferenceContext<'a> { + // pointers to have a chance at getting a match. See + // https://github.com/rust-lang/rust/blob/7b805396bf46dce972692a6846ce2ad8481c5f85/src/librustc_typeck/check/coercion.rs#L877-L916 + let sig = match (ty1.kind(&Interner), ty2.kind(&Interner)) { +- (TyKind::FnDef(..) | TyKind::Closure(..), TyKind::FnDef(..) | TyKind::Closure(..)) => { ++ (TyKind::FnDef(..), TyKind::FnDef(..)) ++ | (TyKind::Closure(..), TyKind::FnDef(..)) ++ | (TyKind::FnDef(..), TyKind::Closure(..)) ++ | (TyKind::Closure(..), TyKind::Closure(..)) => { + // FIXME: we're ignoring safety here. To be more correct, if we have one FnDef and one Closure, + // we should be coercing the closure to a fn pointer of the safety of the FnDef + cov_mark::hit!(coerce_fn_reification); +@@ -445,7 +448,8 @@ fn safe_to_unsafe_fn_ty(fn_ty: FnPointer) -> FnPointer { + + fn coerce_mutabilities(from: Mutability, to: Mutability) -> Result<(), TypeError> { + match (from, to) { +- (Mutability::Mut, Mutability::Mut | Mutability::Not) ++ (Mutability::Mut, Mutability::Mut) ++ | (Mutability::Mut, Mutability::Not) + | (Mutability::Not, Mutability::Not) => Ok(()), + (Mutability::Not, Mutability::Mut) => Err(TypeError), + } +diff --git a/crates/hir_ty/src/infer/expr.rs b/crates/hir_ty/src/infer/expr.rs +index c3a5b979f..346e94128 100644 +--- a/crates/hir_ty/src/infer/expr.rs ++++ b/crates/hir_ty/src/infer/expr.rs +@@ -593,11 +593,11 @@ impl<'a> InferenceContext<'a> { + UnaryOp::Neg => { + match inner_ty.kind(&Interner) { + // Fast path for builtins +- TyKind::Scalar(Scalar::Int(_) | Scalar::Uint(_) | Scalar::Float(_)) +- | TyKind::InferenceVar( +- _, +- TyVariableKind::Integer | TyVariableKind::Float, +- ) => inner_ty, ++ TyKind::Scalar(Scalar::Int(_)) ++ | TyKind::Scalar(Scalar::Uint(_)) ++ | TyKind::Scalar(Scalar::Float(_)) ++ | TyKind::InferenceVar(_, TyVariableKind::Integer) ++ | TyKind::InferenceVar(_, TyVariableKind::Float) => inner_ty, + // Otherwise we resolve via the std::ops::Neg trait + _ => self + .resolve_associated_type(inner_ty, self.resolve_ops_neg_output()), +@@ -606,7 +606,9 @@ impl<'a> InferenceContext<'a> { + UnaryOp::Not => { + match inner_ty.kind(&Interner) { + // Fast path for builtins +- TyKind::Scalar(Scalar::Bool | Scalar::Int(_) | Scalar::Uint(_)) ++ TyKind::Scalar(Scalar::Bool) ++ | TyKind::Scalar(Scalar::Int(_)) ++ | TyKind::Scalar(Scalar::Uint(_)) + | TyKind::InferenceVar(_, TyVariableKind::Integer) => inner_ty, + // Otherwise we resolve via the std::ops::Not trait + _ => self +@@ -733,7 +735,7 @@ impl<'a> InferenceContext<'a> { + Expr::Array(array) => { + let elem_ty = + match expected.to_option(&mut self.table).as_ref().map(|t| t.kind(&Interner)) { +- Some(TyKind::Array(st, _) | TyKind::Slice(st)) => st.clone(), ++ Some(TyKind::Array(st, _)) | Some(TyKind::Slice(st)) => st.clone(), + _ => self.table.new_type_var(), + }; + +diff --git a/crates/hir_ty/src/infer/pat.rs b/crates/hir_ty/src/infer/pat.rs +index c79ed91ea..80ecd4ea9 100644 +--- a/crates/hir_ty/src/infer/pat.rs ++++ b/crates/hir_ty/src/infer/pat.rs +@@ -297,11 +297,10 @@ fn is_non_ref_pat(body: &hir_def::body::Body, pat: PatId) -> bool { + Expr::Literal(Literal::String(..)) => false, + _ => true, + }, +- Pat::Bind { +- mode: BindingAnnotation::Mutable | BindingAnnotation::Unannotated, +- subpat: Some(subpat), +- .. +- } => is_non_ref_pat(body, *subpat), ++ Pat::Bind { mode: BindingAnnotation::Mutable, subpat: Some(subpat), .. } ++ | Pat::Bind { mode: BindingAnnotation::Unannotated, subpat: Some(subpat), .. } => { ++ is_non_ref_pat(body, *subpat) ++ } + Pat::Wild | Pat::Bind { .. } | Pat::Ref { .. } | Pat::Box { .. } | Pat::Missing => false, + } + } +diff --git a/crates/hir_ty/src/op.rs b/crates/hir_ty/src/op.rs +index 5ef6342d5..0222de2bc 100644 +--- a/crates/hir_ty/src/op.rs ++++ b/crates/hir_ty/src/op.rs +@@ -8,15 +8,17 @@ pub(super) fn binary_op_return_ty(op: BinaryOp, lhs_ty: Ty, rhs_ty: Ty) -> Ty { + match op { + BinaryOp::LogicOp(_) | BinaryOp::CmpOp(_) => TyKind::Scalar(Scalar::Bool).intern(&Interner), + BinaryOp::Assignment { .. } => TyBuilder::unit(), +- BinaryOp::ArithOp(ArithOp::Shl | ArithOp::Shr) => { ++ BinaryOp::ArithOp(ArithOp::Shl) | BinaryOp::ArithOp(ArithOp::Shr) => { + // all integer combinations are valid here + if matches!( + lhs_ty.kind(&Interner), +- TyKind::Scalar(Scalar::Int(_) | Scalar::Uint(_)) ++ TyKind::Scalar(Scalar::Int(_)) ++ | TyKind::Scalar(Scalar::Uint(_)) + | TyKind::InferenceVar(_, TyVariableKind::Integer) + ) && matches!( + rhs_ty.kind(&Interner), +- TyKind::Scalar(Scalar::Int(_) | Scalar::Uint(_)) ++ TyKind::Scalar(Scalar::Int(_)) ++ | TyKind::Scalar(Scalar::Uint(_)) + | TyKind::InferenceVar(_, TyVariableKind::Integer) + ) { + lhs_ty +@@ -30,15 +32,15 @@ pub(super) fn binary_op_return_ty(op: BinaryOp, lhs_ty: Ty, rhs_ty: Ty) -> Ty { + | (TyKind::Scalar(Scalar::Uint(_)), TyKind::Scalar(Scalar::Uint(_))) + | (TyKind::Scalar(Scalar::Float(_)), TyKind::Scalar(Scalar::Float(_))) => rhs_ty, + // ({int}, int) | ({int}, uint) +- ( +- TyKind::InferenceVar(_, TyVariableKind::Integer), +- TyKind::Scalar(Scalar::Int(_) | Scalar::Uint(_)), +- ) => rhs_ty, ++ (TyKind::InferenceVar(_, TyVariableKind::Integer), TyKind::Scalar(Scalar::Int(_))) ++ | (TyKind::InferenceVar(_, TyVariableKind::Integer), TyKind::Scalar(Scalar::Uint(_))) => { ++ rhs_ty ++ } + // (int, {int}) | (uint, {int}) +- ( +- TyKind::Scalar(Scalar::Int(_) | Scalar::Uint(_)), +- TyKind::InferenceVar(_, TyVariableKind::Integer), +- ) => lhs_ty, ++ (TyKind::Scalar(Scalar::Int(_)), TyKind::InferenceVar(_, TyVariableKind::Integer)) ++ | (TyKind::Scalar(Scalar::Uint(_)), TyKind::InferenceVar(_, TyVariableKind::Integer)) => { ++ lhs_ty ++ } + // ({float} | float) + (TyKind::InferenceVar(_, TyVariableKind::Float), TyKind::Scalar(Scalar::Float(_))) => { + rhs_ty +@@ -67,15 +69,21 @@ pub(super) fn binary_op_rhs_expectation(op: BinaryOp, lhs_ty: Ty) -> Ty { + BinaryOp::Assignment { op: None } => lhs_ty, + BinaryOp::CmpOp(CmpOp::Eq { .. }) => match lhs_ty.kind(&Interner) { + TyKind::Scalar(_) | TyKind::Str => lhs_ty, +- TyKind::InferenceVar(_, TyVariableKind::Integer | TyVariableKind::Float) => lhs_ty, ++ TyKind::InferenceVar(_, TyVariableKind::Integer) ++ | TyKind::InferenceVar(_, TyVariableKind::Float) => lhs_ty, + _ => TyKind::Error.intern(&Interner), + }, +- BinaryOp::ArithOp(ArithOp::Shl | ArithOp::Shr) => TyKind::Error.intern(&Interner), ++ BinaryOp::ArithOp(ArithOp::Shl) | BinaryOp::ArithOp(ArithOp::Shr) => { ++ TyKind::Error.intern(&Interner) ++ } + BinaryOp::CmpOp(CmpOp::Ord { .. }) + | BinaryOp::Assignment { op: Some(_) } + | BinaryOp::ArithOp(_) => match lhs_ty.kind(&Interner) { +- TyKind::Scalar(Scalar::Int(_) | Scalar::Uint(_) | Scalar::Float(_)) => lhs_ty, +- TyKind::InferenceVar(_, TyVariableKind::Integer | TyVariableKind::Float) => lhs_ty, ++ TyKind::Scalar(Scalar::Int(_)) ++ | TyKind::Scalar(Scalar::Uint(_)) ++ | TyKind::Scalar(Scalar::Float(_)) => lhs_ty, ++ TyKind::InferenceVar(_, TyVariableKind::Integer) ++ | TyKind::InferenceVar(_, TyVariableKind::Float) => lhs_ty, + _ => TyKind::Error.intern(&Interner), + }, + } +diff --git a/crates/ide/src/join_lines.rs b/crates/ide/src/join_lines.rs +index ffa8bd182..93d3760bf 100644 +--- a/crates/ide/src/join_lines.rs ++++ b/crates/ide/src/join_lines.rs +@@ -197,7 +197,7 @@ fn join_single_use_tree(edit: &mut TextEditBuilder, token: &SyntaxToken) -> Opti + } + + fn is_trailing_comma(left: SyntaxKind, right: SyntaxKind) -> bool { +- matches!((left, right), (T![,], T![')'] | T![']'])) ++ matches!((left, right), (T![,], T![')']) | (T![,], T![']'])) + } + + fn compute_ws(left: SyntaxKind, right: SyntaxKind) -> &'static str { +diff --git a/crates/ide/src/references.rs b/crates/ide/src/references.rs +index 5808562a7..945c9b9e1 100644 +--- a/crates/ide/src/references.rs ++++ b/crates/ide/src/references.rs +@@ -79,7 +79,8 @@ pub(crate) fn find_all_refs( + }); + usages.references.retain(|_, it| !it.is_empty()); + } +- Definition::ModuleDef(hir::ModuleDef::Adt(_) | hir::ModuleDef::Variant(_)) => { ++ Definition::ModuleDef(hir::ModuleDef::Adt(_)) ++ | Definition::ModuleDef(hir::ModuleDef::Variant(_)) => { + refs.for_each(|it| { + it.retain(|reference| { + reference.name.as_name_ref().map_or(false, is_lit_name_ref) +diff --git a/crates/ide/src/syntax_highlighting.rs b/crates/ide/src/syntax_highlighting.rs +index d44a1b45f..e186b82b7 100644 +--- a/crates/ide/src/syntax_highlighting.rs ++++ b/crates/ide/src/syntax_highlighting.rs +@@ -294,7 +294,7 @@ fn traverse( + Some(parent) => { + // We only care Name and Name_ref + match (token.kind(), parent.kind()) { +- (IDENT, NAME | NAME_REF) => parent.into(), ++ (IDENT, NAME) | (IDENT, NAME_REF) => parent.into(), + _ => token.into(), + } + } +@@ -310,7 +310,7 @@ fn traverse( + Some(parent) => { + // We only care Name and Name_ref + match (token.kind(), parent.kind()) { +- (IDENT, NAME | NAME_REF) => parent.into(), ++ (IDENT, NAME) | (IDENT, NAME_REF) => parent.into(), + _ => token.into(), + } + } +diff --git a/crates/ide_assists/src/handlers/extract_function.rs b/crates/ide_assists/src/handlers/extract_function.rs +index ac7f0959b..9b78cf4b1 100644 +--- a/crates/ide_assists/src/handlers/extract_function.rs ++++ b/crates/ide_assists/src/handlers/extract_function.rs +@@ -1384,7 +1384,7 @@ fn fix_param_usages(ctx: &AssistContext, params: &[Param], syntax: &SyntaxNode) + for (param, usages) in usages_for_param { + for usage in usages { + match usage.syntax().ancestors().skip(1).find_map(ast::Expr::cast) { +- Some(ast::Expr::MethodCallExpr(_) | ast::Expr::FieldExpr(_)) => { ++ Some(ast::Expr::MethodCallExpr(_)) | Some(ast::Expr::FieldExpr(_)) => { + // do nothing + } + Some(ast::Expr::RefExpr(node)) +diff --git a/crates/ide_assists/src/tests.rs b/crates/ide_assists/src/tests.rs +index 841537c77..d9d9124b6 100644 +--- a/crates/ide_assists/src/tests.rs ++++ b/crates/ide_assists/src/tests.rs +@@ -181,10 +181,9 @@ fn check(handler: Handler, before: &str, expected: ExpectedResult, assist_label: + "unresolved assist should not contain source changes" + ), + (Some(_), ExpectedResult::NotApplicable) => panic!("assist should not be applicable!"), +- ( +- None, +- ExpectedResult::After(_) | ExpectedResult::Target(_) | ExpectedResult::Unresolved, +- ) => { ++ (None, ExpectedResult::After(_)) ++ | (None, ExpectedResult::Target(_)) ++ | (None, ExpectedResult::Unresolved) => { + panic!("code action is not applicable") + } + (None, ExpectedResult::NotApplicable) => (), +diff --git a/crates/ide_completion/src/completions/qualified_path.rs b/crates/ide_completion/src/completions/qualified_path.rs +index f5dbd203b..88f4d940d 100644 +--- a/crates/ide_completion/src/completions/qualified_path.rs ++++ b/crates/ide_completion/src/completions/qualified_path.rs +@@ -65,11 +65,9 @@ pub(crate) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionCon + // Don't suggest attribute macros and derives. + hir::ScopeDef::MacroDef(mac) => mac.is_fn_like(), + // no values in type places +- hir::ScopeDef::ModuleDef( +- hir::ModuleDef::Function(_) +- | hir::ModuleDef::Variant(_) +- | hir::ModuleDef::Static(_), +- ) ++ hir::ScopeDef::ModuleDef(hir::ModuleDef::Function(_)) ++ | hir::ScopeDef::ModuleDef(hir::ModuleDef::Variant(_)) ++ | hir::ScopeDef::ModuleDef(hir::ModuleDef::Static(_)) + | hir::ScopeDef::Local(_) => !ctx.expects_type(), + // unless its a constant in a generic arg list position + hir::ScopeDef::ModuleDef(hir::ModuleDef::Const(_)) => { +@@ -83,13 +81,9 @@ pub(crate) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionCon + } + } + } +- hir::PathResolution::Def( +- def +- @ +- (hir::ModuleDef::Adt(_) +- | hir::ModuleDef::TypeAlias(_) +- | hir::ModuleDef::BuiltinType(_)), +- ) => { ++ hir::PathResolution::Def(def @ hir::ModuleDef::Adt(_)) ++ | hir::PathResolution::Def(def @ hir::ModuleDef::TypeAlias(_)) ++ | hir::PathResolution::Def(def @ hir::ModuleDef::BuiltinType(_)) => { + if let hir::ModuleDef::Adt(hir::Adt::Enum(e)) = def { + add_enum_variants(acc, ctx, e); + } +diff --git a/crates/ide_completion/src/completions/unqualified_path.rs b/crates/ide_completion/src/completions/unqualified_path.rs +index 81c4fb305..8ea5a2d5b 100644 +--- a/crates/ide_completion/src/completions/unqualified_path.rs ++++ b/crates/ide_completion/src/completions/unqualified_path.rs +@@ -74,11 +74,9 @@ pub(crate) fn complete_unqualified_path(acc: &mut Completions, ctx: &CompletionC + // Don't suggest attribute macros and derives. + ScopeDef::MacroDef(mac) => mac.is_fn_like(), + // no values in type places +- ScopeDef::ModuleDef( +- hir::ModuleDef::Function(_) +- | hir::ModuleDef::Variant(_) +- | hir::ModuleDef::Static(_), +- ) ++ ScopeDef::ModuleDef(hir::ModuleDef::Function(_)) ++ | ScopeDef::ModuleDef(hir::ModuleDef::Variant(_)) ++ | ScopeDef::ModuleDef(hir::ModuleDef::Static(_)) + | ScopeDef::Local(_) => !ctx.expects_type(), + // unless its a constant in a generic arg list position + ScopeDef::ModuleDef(hir::ModuleDef::Const(_)) +diff --git a/crates/ide_completion/src/context.rs b/crates/ide_completion/src/context.rs +index 7b76600df..09eb953fd 100644 +--- a/crates/ide_completion/src/context.rs ++++ b/crates/ide_completion/src/context.rs +@@ -242,23 +242,24 @@ impl<'a> CompletionContext<'a> { + } + + pub(crate) fn expects_assoc_item(&self) -> bool { +- matches!(self.completion_location, Some(ImmediateLocation::Trait | ImmediateLocation::Impl)) ++ matches!( ++ self.completion_location, ++ Some(ImmediateLocation::Trait) | Some(ImmediateLocation::Impl) ++ ) + } + + pub(crate) fn has_dot_receiver(&self) -> bool { + matches!( + &self.completion_location, +- Some(ImmediateLocation::FieldAccess { receiver, .. } | ImmediateLocation::MethodCall { receiver,.. }) ++ Some(ImmediateLocation::FieldAccess { receiver, .. }) | Some(ImmediateLocation::MethodCall { receiver,.. }) + if receiver.is_some() + ) + } + + pub(crate) fn dot_receiver(&self) -> Option<&ast::Expr> { + match &self.completion_location { +- Some( +- ImmediateLocation::MethodCall { receiver, .. } +- | ImmediateLocation::FieldAccess { receiver, .. }, +- ) => receiver.as_ref(), ++ Some(ImmediateLocation::MethodCall { receiver, .. }) ++ | Some(ImmediateLocation::FieldAccess { receiver, .. }) => receiver.as_ref(), + _ => None, + } + } +@@ -282,7 +283,7 @@ impl<'a> CompletionContext<'a> { + pub(crate) fn expects_ident_pat_or_ref_expr(&self) -> bool { + matches!( + self.completion_location, +- Some(ImmediateLocation::IdentPat | ImmediateLocation::RefExpr) ++ Some(ImmediateLocation::IdentPat) | Some(ImmediateLocation::RefExpr) + ) + } + +@@ -293,14 +294,14 @@ impl<'a> CompletionContext<'a> { + pub(crate) fn in_use_tree(&self) -> bool { + matches!( + self.completion_location, +- Some(ImmediateLocation::Use | ImmediateLocation::UseTree) ++ Some(ImmediateLocation::Use) | Some(ImmediateLocation::UseTree) + ) + } + + pub(crate) fn has_impl_or_trait_prev_sibling(&self) -> bool { + matches!( + self.prev_sibling, +- Some(ImmediatePrevSibling::ImplDefType | ImmediatePrevSibling::TraitDefName) ++ Some(ImmediatePrevSibling::ImplDefType) | Some(ImmediatePrevSibling::TraitDefName) + ) + } + +@@ -321,16 +322,14 @@ impl<'a> CompletionContext<'a> { + || self.previous_token_is(T![unsafe]) + || matches!( + self.prev_sibling, +- Some(ImmediatePrevSibling::Attribute | ImmediatePrevSibling::Visibility) ++ Some(ImmediatePrevSibling::Attribute) | Some(ImmediatePrevSibling::Visibility) + ) + || matches!( + self.completion_location, +- Some( +- ImmediateLocation::Attribute(_) +- | ImmediateLocation::ModDeclaration(_) +- | ImmediateLocation::RecordPat(_) +- | ImmediateLocation::RecordExpr(_) +- ) ++ Some(ImmediateLocation::Attribute(_)) ++ | Some(ImmediateLocation::ModDeclaration(_)) ++ | Some(ImmediateLocation::RecordPat(_)) ++ | Some(ImmediateLocation::RecordExpr(_)) + ) + } + +@@ -704,8 +703,8 @@ fn path_or_use_tree_qualifier(path: &ast::Path) -> Option<(ast::Path, bool)> { + + fn has_ref(token: &SyntaxToken) -> bool { + let mut token = token.clone(); +- for skip in [WHITESPACE, IDENT, T![mut]] { +- if token.kind() == skip { ++ for skip in &[WHITESPACE, IDENT, T![mut]] { ++ if token.kind() == *skip { + token = match token.prev_token() { + Some(it) => it, + None => return false, +diff --git a/crates/ide_completion/src/render/builder_ext.rs b/crates/ide_completion/src/render/builder_ext.rs +index 33d3a5ee1..749dfc665 100644 +--- a/crates/ide_completion/src/render/builder_ext.rs ++++ b/crates/ide_completion/src/render/builder_ext.rs +@@ -32,7 +32,7 @@ impl Builder { + cov_mark::hit!(no_parens_in_use_item); + return false; + } +- if matches!(ctx.path_call_kind(), Some(CallKind::Expr | CallKind::Pat)) ++ if matches!(ctx.path_call_kind(), Some(CallKind::Expr) | Some(CallKind::Pat)) + | matches!( + ctx.completion_location, + Some(ImmediateLocation::MethodCall { has_parens: true, .. }) +diff --git a/crates/mbe/src/expander/matcher.rs b/crates/mbe/src/expander/matcher.rs +index b4f2fe9a4..c2a9a38c9 100644 +--- a/crates/mbe/src/expander/matcher.rs ++++ b/crates/mbe/src/expander/matcher.rs +@@ -804,17 +804,33 @@ impl<'a> TtIter<'a> { + }; + + match (punct.char, second, third) { +- ('.', '.', Some('.' | '=')) | ('<', '<', Some('=')) | ('>', '>', Some('=')) => { ++ ('.', '.', Some('.')) ++ | ('.', '.', Some('=')) ++ | ('<', '<', Some('=')) ++ | ('>', '>', Some('=')) => { + let tt2 = self.next().unwrap().clone(); + let tt3 = self.next().unwrap().clone(); + Ok(tt::Subtree { delimiter: None, token_trees: vec![tt, tt2, tt3] }.into()) + } +- ('-' | '!' | '*' | '/' | '&' | '%' | '^' | '+' | '<' | '=' | '>' | '|', '=', _) +- | ('-' | '=' | '>', '>', _) ++ ('-', '=', _) ++ | ('-', '>', _) + | (':', ':', _) ++ | ('!', '=', _) + | ('.', '.', _) ++ | ('*', '=', _) ++ | ('/', '=', _) + | ('&', '&', _) ++ | ('&', '=', _) ++ | ('%', '=', _) ++ | ('^', '=', _) ++ | ('+', '=', _) + | ('<', '<', _) ++ | ('<', '=', _) ++ | ('=', '=', _) ++ | ('=', '>', _) ++ | ('>', '=', _) ++ | ('>', '>', _) ++ | ('|', '=', _) + | ('|', '|', _) => { + let tt2 = self.next().unwrap().clone(); + Ok(tt::Subtree { delimiter: None, token_trees: vec![tt, tt2] }.into()) +diff --git a/crates/parser/src/grammar/params.rs b/crates/parser/src/grammar/params.rs +index 5a78675fb..e0c1d3b3a 100644 +--- a/crates/parser/src/grammar/params.rs ++++ b/crates/parser/src/grammar/params.rs +@@ -184,7 +184,8 @@ fn opt_self_param(p: &mut Parser, m: Marker) -> Result<(), Marker> { + if !matches!( + (p.current(), la1, la2, la3), + (T![&], T![self], _, _) +- | (T![&], T![mut] | LIFETIME_IDENT, T![self], _) ++ | (T![&], LIFETIME_IDENT, T![self], _) ++ | (T![&], T![mut], T![self], _) + | (T![&], LIFETIME_IDENT, T![mut], T![self]) + ) { + return Err(m); +diff --git a/crates/vfs/src/vfs_path.rs b/crates/vfs/src/vfs_path.rs +index ef2d7657a..2b3d7fd84 100644 +--- a/crates/vfs/src/vfs_path.rs ++++ b/crates/vfs/src/vfs_path.rs +@@ -389,7 +389,7 @@ impl VirtualPath { + + match (file_stem, extension) { + (None, None) => None, +- (None | Some(""), Some(_)) => Some((file_name, None)), ++ (None, Some(_)) | (Some(""), Some(_)) => Some((file_name, None)), + (Some(file_stem), extension) => Some((file_stem, extension)), + } + } +diff --git a/xtask/src/install.rs b/xtask/src/install.rs +index 64ab12b42..7e2dccdfe 100644 +--- a/xtask/src/install.rs ++++ b/xtask/src/install.rs +@@ -8,7 +8,7 @@ use xshell::{cmd, pushd}; + use crate::flags; + + // Latest stable, feel free to send a PR if this lags behind. +-const REQUIRED_RUST_VERSION: u32 = 53; ++const REQUIRED_RUST_VERSION: u32 = 52; + + impl flags::Install { + pub(crate) fn run(self) -> Result<()> { diff --git a/pkgs/development/tools/rust/rust-analyzer/update.sh b/pkgs/development/tools/rust/rust-analyzer/update.sh index a67b6c927a89..3010b9bf3859 100755 --- a/pkgs/development/tools/rust/rust-analyzer/update.sh +++ b/pkgs/development/tools/rust/rust-analyzer/update.sh @@ -51,6 +51,9 @@ build_deps="../../../../misc/vscode-extensions/rust-analyzer/build-deps" jq '{ name, version, dependencies: (.dependencies + .devDependencies) }' "$node_src/package.json" \ >"$build_deps/package.json.new" +# FIXME: vsce@1.93.0 breaks the build. +sed 's/"vsce": ".*"/"vsce": "=1.88.0"/' --in-place "$build_deps/package.json.new" + if cmp --quiet "$build_deps"/package.json{.new,}; then echo "package.json not changed, skip updating nodePackages" rm "$build_deps"/package.json.new diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json index ece623b53c36..20dd6593abff 100644 --- a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json +++ b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json @@ -21,7 +21,7 @@ "tslib": "^2.0.3", "typescript": "^4.1.2", "typescript-formatter": "^7.2.2", - "vsce": "^1.85.0", + "vsce": "=1.88.0", "vscode-test": "^1.5.1" } }