diff --git a/Cargo.lock b/Cargo.lock index 84ec21f90..6cb3ec669 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1438,9 +1438,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68" +checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" [[package]] name = "httpdate" @@ -1450,9 +1450,9 @@ checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" [[package]] name = "httpmock" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22a046939a6ac319fd52708d3309e18489b33dcb9a305c5cdaf2a897fc5d69b8" +checksum = "218c2c3dabf4497c87d042b43984a5fd03bcd8a6adb0056ade7df20f88df225a" dependencies = [ "assert-json-diff", "async-object-pool", @@ -1584,9 +1584,9 @@ checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" [[package]] name = "isahc" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81c01404730bb4574bbacb59ca0855f969f8eabd688ca22866f2cc333f1a4f69" +checksum = "0b183576592898e9e007d41b7cf2bc8bb3f8b5d2733b9291e42618d50040e7ba" dependencies = [ "async-channel", "crossbeam-utils", @@ -1634,9 +1634,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.52" +version = "0.3.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce791b7ca6638aae45be056e068fc756d871eb3b3b10b8efa62d1c9cec616752" +checksum = "e4bf49d50e2961077d9c99f4b7997d770a1114f087c3c2e0069b36c13fc2979d" dependencies = [ "wasm-bindgen", ] @@ -1792,9 +1792,9 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" [[package]] name = "memchr" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" [[package]] name = "memoffset" @@ -1922,9 +1922,9 @@ dependencies = [ [[package]] name = "object" -version = "0.26.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55827317fb4c08822499848a14237d2874d6f139828893017237e7ab93eb386" +checksum = "ee2766204889d09937d00bfbb7fec56bb2a199e2ade963cab19185d8a6104c7c" dependencies = [ "memchr", ] @@ -1959,9 +1959,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.35" +version = "0.10.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549430950c79ae24e6d02e0b7404534ecf311d94cc9f861e9e4020187d13d885" +checksum = "8d9facdb76fec0b73c406f125d44d86fdad818d66fef0531eec9233ca425ff4a" dependencies = [ "bitflags", "cfg-if", @@ -1988,9 +1988,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.65" +version = "0.9.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d" +checksum = "1996d2d305e561b70d1ee0c53f1542833f4e1ac6ce9a6708b6ff2738ca67dc82" dependencies = [ "autocfg", "cc", @@ -2683,9 +2683,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.8.17" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15654ed4ab61726bf918a39cb8d98a2e2995b002387807fa6ba58fdf7f59bb23" +checksum = "039ba818c784248423789eec090aab9fb566c7b94d6ebbfa1814a9fd52c8afb2" dependencies = [ "dtoa", "linked-hash-map", @@ -2781,11 +2781,11 @@ checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590" [[package]] name = "sluice" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fa0333a60ff2e3474a6775cc611840c2a55610c831dd366503474c02f1a28f5" +checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5" dependencies = [ - "futures-channel", + "async-channel", "futures-core", "futures-io", ] @@ -3186,9 +3186,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9ff14f98b1a4b289c6248a023c1c2fa1491062964e9fed67ab29c4e4da4a052" +checksum = "2ca517f43f0fb96e0c3072ed5c275fe5eece87e8cb52f4a77b69226d3b1c9df8" dependencies = [ "lazy_static", ] @@ -3226,9 +3226,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.2.19" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab69019741fca4d98be3c62d2b75254528b5432233fd8a4d2739fec20278de48" +checksum = "b9cbe87a2fa7e35900ce5de20220a582a9483a7063811defce79d7cbd59d4cfe" dependencies = [ "ansi_term 0.12.1", "chrono", @@ -3420,9 +3420,9 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" [[package]] name = "wasm-bindgen" -version = "0.2.75" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b608ecc8f4198fe8680e2ed18eccab5f0cd4caaf3d83516fa5fb2e927fda2586" +checksum = "8ce9b1b516211d33767048e5d47fa2a381ed8b76fc48d2ce4aa39877f9f183e0" dependencies = [ "cfg-if", "serde", @@ -3432,9 +3432,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.75" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "580aa3a91a63d23aac5b6b267e2d13cb4f363e31dce6c352fca4752ae12e479f" +checksum = "cfe8dc78e2326ba5f845f4b5bf548401604fa20b1dd1d365fb73b6c1d6364041" dependencies = [ "bumpalo", "lazy_static", @@ -3447,9 +3447,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.25" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16646b21c3add8e13fdb8f20172f8a28c3dbf62f45406bcff0233188226cfe0c" +checksum = "95fded345a6559c2cfee778d562300c581f7d4ff3edb9b0d230d69800d213972" dependencies = [ "cfg-if", "js-sys", @@ -3459,9 +3459,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.75" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "171ebf0ed9e1458810dfcb31f2e766ad6b3a89dbda42d8901f2b268277e5f09c" +checksum = "44468aa53335841d9d6b6c023eaab07c0cd4bddbcfdee3e2bb1e8d2cb8069fef" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3469,9 +3469,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.75" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c2657dd393f03aa2a659c25c6ae18a13a4048cebd220e147933ea837efc589f" +checksum = "0195807922713af1e67dc66132c7328206ed9766af3858164fb583eedc25fbad" dependencies = [ "proc-macro2", "quote", @@ -3482,15 +3482,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.75" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e0c4a743a309662d45f4ede961d7afa4ba4131a59a639f29b0069c3798bbcc2" +checksum = "acdb075a845574a1fa5f09fd77e43f7747599301ea3417a9fbffdeedfc1f4a29" [[package]] name = "web-sys" -version = "0.3.52" +version = "0.3.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c70a82d842c9979078c772d4a1344685045f1a5628f677c2b2eab4dd7d2696" +checksum = "224b2f6b67919060055ef1a67807367c2066ed520c3862cc013d26cf893a783c" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/crates/rover-client/package-lock.json b/crates/rover-client/package-lock.json index e4d1614dd..bee229f10 100644 --- a/crates/rover-client/package-lock.json +++ b/crates/rover-client/package-lock.json @@ -44,19 +44,6 @@ "node": ">=6.9.0" } }, - "node_modules/@babel/generator/node_modules/@babel/types": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz", - "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==", - "dev": true, - "dependencies": { - "@babel/helper-validator-identifier": "^7.14.9", - "to-fast-properties": "^2.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@babel/helper-function-name": { "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz", @@ -131,9 +118,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.9.tgz", - "integrity": "sha512-RdUTOseXJ8POjjOeEBEvNMIZU/nm4yu2rufRkcibzkkg7DmQvXU8v3M4Xk9G7uuI86CDGkKcuDWgioqZm+mScQ==", + "version": "7.15.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.3.tgz", + "integrity": "sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -157,18 +144,18 @@ } }, "node_modules/@babel/traverse": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.9.tgz", - "integrity": "sha512-bldh6dtB49L8q9bUyB7bC20UKgU+EFDwKJylwl234Kv+ySZeMD31Xeht6URyueQ6LrRRpF2tmkfcZooZR9/e8g==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.0.tgz", + "integrity": "sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw==", "dev": true, "dependencies": { "@babel/code-frame": "^7.14.5", - "@babel/generator": "^7.14.9", + "@babel/generator": "^7.15.0", "@babel/helper-function-name": "^7.14.5", "@babel/helper-hoist-variables": "^7.14.5", "@babel/helper-split-export-declaration": "^7.14.5", - "@babel/parser": "^7.14.9", - "@babel/types": "^7.14.9", + "@babel/parser": "^7.15.0", + "@babel/types": "^7.15.0", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -177,9 +164,9 @@ } }, "node_modules/@babel/types": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.9.tgz", - "integrity": "sha512-u0bLTnv3DFHeaQLYzb7oRJ1JHr1sv/SYDM7JSqHFFLwXG1wTZRughxFI5NCP8qBEo1rVVsn7Yg2Lvw49nne/Ow==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz", + "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==", "dev": true, "dependencies": { "@babel/helper-validator-identifier": "^7.14.9", @@ -228,9 +215,9 @@ } }, "node_modules/@eslint/eslintrc/node_modules/globals": { - "version": "13.10.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.10.0.tgz", - "integrity": "sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g==", + "version": "13.11.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz", + "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -260,12 +247,12 @@ } }, "node_modules/@graphql-tools/batch-execute": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-8.0.2.tgz", - "integrity": "sha512-IsTwujhWYbEPCPdUaEsEihzovQMfNeoOhV7LgXpJXyLAvr24WpY5H/Yn1FaT9B1Ki1Oh6sgYbuai9gNm3iDz5A==", + "version": "8.0.5", + "resolved": "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-8.0.5.tgz", + "integrity": "sha512-Zx+zs12BLGNvrQtfESIhitzwIkrWnKyKOkAfcaMNuOLGOO2pDmhwIRzbHj+6Jtq9V1/JTaVkSnm/4ozaCRck5A==", "dev": true, "dependencies": { - "@graphql-tools/utils": "8.0.2", + "@graphql-tools/utils": "^8.1.1", "dataloader": "2.0.0", "tslib": "~2.3.0", "value-or-promise": "1.0.10" @@ -275,15 +262,14 @@ } }, "node_modules/@graphql-tools/code-file-loader": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/@graphql-tools/code-file-loader/-/code-file-loader-7.0.2.tgz", - "integrity": "sha512-Es2gO2iRbir8yCHB1KEJ2sRyQNkncVSHHXUkTzYfQYVXT9vhiRaUtt/xZeBgTv0u/sdyvVPoYCM12wyURuyU7Q==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/@graphql-tools/code-file-loader/-/code-file-loader-7.0.6.tgz", + "integrity": "sha512-+xddAWyvrcW5Em3Yx+RJ7vwFMyOoS8pwqgeVr0CTZF9YbrQSPz7wQJRAVFZNJQaJOalKlPWxsmKkSyMQRG+t4A==", "dev": true, "dependencies": { - "@graphql-tools/graphql-tag-pluck": "^7.0.2", - "@graphql-tools/utils": "8.0.2", + "@graphql-tools/graphql-tag-pluck": "^7.0.5", + "@graphql-tools/utils": "^8.1.1", "globby": "^11.0.3", - "is-glob": "^4.0.1", "tslib": "~2.3.0", "unixify": "^1.0.0" }, @@ -292,14 +278,14 @@ } }, "node_modules/@graphql-tools/delegate": { - "version": "8.0.6", - "resolved": "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-8.0.6.tgz", - "integrity": "sha512-ZHR6mwHaNQRLzx/2w8ZTHBaB47FqdtkVa0nukUZJSMtv7RMcTTt9ifBwYTVtHL28zYVrJH/DCoUcIZFRv/Okqg==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-8.1.0.tgz", + "integrity": "sha512-jJmty2rr4k2k6pG3H0qoCH9LDezjyVe0wLNUbVQcSfWBj1VgeHX6BF4qgbT5HsDD3oOP8ruiHZgbn6EbrOwDfA==", "dev": true, "dependencies": { - "@graphql-tools/batch-execute": "^8.0.2", - "@graphql-tools/schema": "^8.0.2", - "@graphql-tools/utils": "8.0.2", + "@graphql-tools/batch-execute": "^8.0.5", + "@graphql-tools/schema": "^8.1.2", + "@graphql-tools/utils": "^8.1.1", "dataloader": "2.0.0", "tslib": "~2.3.0", "value-or-promise": "1.0.10" @@ -309,15 +295,14 @@ } }, "node_modules/@graphql-tools/graphql-file-loader": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.0.2.tgz", - "integrity": "sha512-hGL6mEERBZXtCE+e3U0+ESR6zMDqiE1l5KReBovjEEAbveyWWW58NJvaCGyS3eE8K8I91hwqJpwOY9aoTmavQA==", + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.0.5.tgz", + "integrity": "sha512-hYdz/zvA2z2M6zqgTCkEiqWPIKLsFirg1ZawaKzCLN0sUi+hRrLVTc1eIlz/vfR8ojvswEq81OMtk5d+lbHiHQ==", "dev": true, "dependencies": { "@graphql-tools/import": "^6.2.6", - "@graphql-tools/utils": "8.0.2", + "@graphql-tools/utils": "^8.1.1", "globby": "^11.0.3", - "is-glob": "^4.0.1", "tslib": "~2.3.0", "unixify": "^1.0.0" }, @@ -326,15 +311,15 @@ } }, "node_modules/@graphql-tools/graphql-tag-pluck": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/@graphql-tools/graphql-tag-pluck/-/graphql-tag-pluck-7.0.2.tgz", - "integrity": "sha512-Ef+TKdFI082KXmJbFsYx6S0I6l6LiArt72P+yrJ96H+DH6mVVHX37LCiBToFipm/5sxO0XqUfft9IOVfp5UfUA==", + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/@graphql-tools/graphql-tag-pluck/-/graphql-tag-pluck-7.0.5.tgz", + "integrity": "sha512-/eNFl/4gshnlgNvx1Koaey3036edcv5/Nko+px/DbkfjKedwikRWubURcCaMp/4VE6CyIUibxRrP6TzVByhVrw==", "dev": true, "dependencies": { - "@babel/parser": "7.14.9", - "@babel/traverse": "7.14.9", - "@babel/types": "7.14.9", - "@graphql-tools/utils": "8.0.2", + "@babel/parser": "7.15.3", + "@babel/traverse": "7.15.0", + "@babel/types": "7.15.0", + "@graphql-tools/utils": "^8.1.1", "tslib": "~2.3.0" }, "peerDependencies": { @@ -361,27 +346,28 @@ "dev": true }, "node_modules/@graphql-tools/json-file-loader": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-7.0.2.tgz", - "integrity": "sha512-WmkoSTm2KwMHWvXDm3nGlTlDGrFN69UnHOcEdMvMwd2whkzT6C4S9XRvKfe4KnOy7mKK1WSmYYhk9T9toRHkug==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-7.1.2.tgz", + "integrity": "sha512-/CrnNBwi4WDvt4yc2PcRmQxqGIOtK84s4iI5vsHwlcK7D02WX1cza4YEblFlMQUkxR9pmwGIYXverUOiaysqRA==", "dev": true, "dependencies": { - "@graphql-tools/utils": "8.0.2", - "tslib": "~2.3.0" + "@graphql-tools/utils": "^8.1.1", + "globby": "^11.0.3", + "tslib": "~2.3.0", + "unixify": "^1.0.0" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0" } }, "node_modules/@graphql-tools/load": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/@graphql-tools/load/-/load-7.1.2.tgz", - "integrity": "sha512-H2tLlAmFLjC8CQRTzqHkPJKjXdnYS2JdWsM6iVlKkbxs42ZAVk/OxYEe3Fg61pLV+EqfWtydiDT3xdPy+vqGEg==", + "version": "7.1.8", + "resolved": "https://registry.npmjs.org/@graphql-tools/load/-/load-7.1.8.tgz", + "integrity": "sha512-dVl2jJon9VL0qLTC98hJH4CkQ/oat6j9TouCk69ezzWHFxiPlz6tF78BzLr86Mz+bY6QCGeNIJ75Ovyn7EutCQ==", "dev": true, "dependencies": { - "@graphql-tools/merge": "^7.0.0", - "@graphql-tools/utils": "8.0.2", - "import-from": "4.0.0", + "@graphql-tools/schema": "8.1.2", + "@graphql-tools/utils": "^8.1.1", "p-limit": "3.1.0", "tslib": "~2.3.0" }, @@ -389,13 +375,13 @@ "graphql": "^14.0.0 || ^15.0.0" } }, - "node_modules/@graphql-tools/load/node_modules/@graphql-tools/merge": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-7.0.0.tgz", - "integrity": "sha512-u7TTwKQ7cybAkn6snYPRg3um/C2u690wlD8TgHITAmGQDAExN/yipSSBgu4rXWopsPLsY0G30mJ8tOWToZVE1w==", + "node_modules/@graphql-tools/merge": { + "version": "6.2.17", + "resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.17.tgz", + "integrity": "sha512-G5YrOew39fZf16VIrc49q3c8dBqQDD0ax5LYPiNja00xsXDi0T9zsEWVt06ApjtSdSF6HDddlu5S12QjeN8Tow==", "dev": true, "dependencies": { - "@graphql-tools/schema": "^8.0.3", + "@graphql-tools/schema": "^8.0.2", "@graphql-tools/utils": "8.0.2", "tslib": "~2.3.0" }, @@ -403,14 +389,12 @@ "graphql": "^14.0.0 || ^15.0.0" } }, - "node_modules/@graphql-tools/merge": { - "version": "6.2.17", - "resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.17.tgz", - "integrity": "sha512-G5YrOew39fZf16VIrc49q3c8dBqQDD0ax5LYPiNja00xsXDi0T9zsEWVt06ApjtSdSF6HDddlu5S12QjeN8Tow==", + "node_modules/@graphql-tools/merge/node_modules/@graphql-tools/utils": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.0.2.tgz", + "integrity": "sha512-gzkavMOgbhnwkHJYg32Adv6f+LxjbQmmbdD5Hty0+CWxvaiuJq+nU6tzb/7VSU4cwhbNLx/lGu2jbCPEW1McZQ==", "dev": true, "dependencies": { - "@graphql-tools/schema": "^8.0.2", - "@graphql-tools/utils": "8.0.2", "tslib": "~2.3.0" }, "peerDependencies": { @@ -418,13 +402,13 @@ } }, "node_modules/@graphql-tools/schema": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.0.3.tgz", - "integrity": "sha512-ufJH7r/RcetVPd3kKCZ16/JTRkOX8aB1yGbYnUjqWEIdYEZc3Fpg7AVlcliu2JlvwR+WSNlgWn2QK76QCsFFdA==", + "version": "8.1.2", + "resolved": "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.1.2.tgz", + "integrity": "sha512-rX2pg42a0w7JLVYT+f/yeEKpnoZL5PpLq68TxC3iZ8slnNBNjfVfvzzOn8Q8Q6Xw3t17KP9QespmJEDfuQe4Rg==", "dev": true, "dependencies": { - "@graphql-tools/merge": "7.0.0", - "@graphql-tools/utils": "8.0.2", + "@graphql-tools/merge": "^8.0.2", + "@graphql-tools/utils": "^8.1.1", "tslib": "~2.3.0", "value-or-promise": "1.0.10" }, @@ -433,13 +417,12 @@ } }, "node_modules/@graphql-tools/schema/node_modules/@graphql-tools/merge": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-7.0.0.tgz", - "integrity": "sha512-u7TTwKQ7cybAkn6snYPRg3um/C2u690wlD8TgHITAmGQDAExN/yipSSBgu4rXWopsPLsY0G30mJ8tOWToZVE1w==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.0.2.tgz", + "integrity": "sha512-li/bl6RpcZCPA0LrSxMYMcyYk+brer8QYY25jCKLS7gvhJkgzEFpCDaX43V1+X13djEoAbgay2mCr3dtfJQQRQ==", "dev": true, "dependencies": { - "@graphql-tools/schema": "^8.0.3", - "@graphql-tools/utils": "8.0.2", + "@graphql-tools/utils": "^8.1.1", "tslib": "~2.3.0" }, "peerDependencies": { @@ -447,15 +430,15 @@ } }, "node_modules/@graphql-tools/url-loader": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.0.6.tgz", - "integrity": "sha512-wU6bhdTLlecrrnPMrmUwuruRXxJPIcavDy7h+v515IDwQ9hs/z9tHQLRCKopgRlmqBocATrFctstmT8k+e0JSQ==", + "version": "7.0.11", + "resolved": "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.0.11.tgz", + "integrity": "sha512-4u+h5RtjJXaQjhfBdClreNWavBZqa0U92Cx3Z+zFvIsIYRrEboy7x+cH4QD9OEca/LuUcskJ4yyWllztz/ktow==", "dev": true, "dependencies": { "@ardatan/fetch-event-source": "2.0.2", - "@graphql-tools/delegate": "8.0.6", - "@graphql-tools/utils": "8.0.2", - "@graphql-tools/wrap": "^8.0.6", + "@graphql-tools/delegate": "^8.1.0", + "@graphql-tools/utils": "^8.1.1", + "@graphql-tools/wrap": "^8.0.13", "@n1ru4l/graphql-live-query": "0.7.1", "@types/websocket": "1.0.4", "abort-controller": "3.0.0", @@ -472,16 +455,16 @@ "tslib": "~2.3.0", "valid-url": "1.0.9", "value-or-promise": "1.0.10", - "ws": "8.0.0" + "ws": "8.2.0" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0" } }, "node_modules/@graphql-tools/utils": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.0.2.tgz", - "integrity": "sha512-gzkavMOgbhnwkHJYg32Adv6f+LxjbQmmbdD5Hty0+CWxvaiuJq+nU6tzb/7VSU4cwhbNLx/lGu2jbCPEW1McZQ==", + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.1.1.tgz", + "integrity": "sha512-QbFNoBmBiZ+ej4y6mOv8Ba4lNhcrTEKXAhZ0f74AhdEXi7b9xbGUH/slO5JaSyp85sGQYIPmxjRPpXBjLklbmw==", "dev": true, "dependencies": { "tslib": "~2.3.0" @@ -491,14 +474,14 @@ } }, "node_modules/@graphql-tools/wrap": { - "version": "8.0.6", - "resolved": "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-8.0.6.tgz", - "integrity": "sha512-iQr/ZQQIy2Xz2szVsQCPJ0R4eyjkX3O3Sy3RNB7x/a7IUBB5fTtUi+StxklpZb4KzKCBdz9VFIkhMTHVjsSxiQ==", + "version": "8.0.13", + "resolved": "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-8.0.13.tgz", + "integrity": "sha512-GTkHbN+Zgs+D7bFniFx3/YqNIDv8ET17prM7FewmU8LNRc2P48y6d4/dkQLcwQmryy1TZF87es6yA9FMNfQtWg==", "dev": true, "dependencies": { - "@graphql-tools/delegate": "8.0.6", - "@graphql-tools/schema": "^8.0.2", - "@graphql-tools/utils": "8.0.2", + "@graphql-tools/delegate": "^8.1.0", + "@graphql-tools/schema": "^8.1.2", + "@graphql-tools/utils": "^8.1.1", "tslib": "~2.3.0", "value-or-promise": "1.0.10" }, @@ -577,9 +560,9 @@ } }, "node_modules/@types/node": { - "version": "16.4.12", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.4.12.tgz", - "integrity": "sha512-zxrTNFl9Z8boMJXs6ieqZP0wAhvkdzmHSxTlJabM16cf5G9xBc1uPRH5Bbv2omEDDiM8MzTfqTJXBf0Ba4xFWA==", + "version": "16.6.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.6.2.tgz", + "integrity": "sha512-LSw8TZt12ZudbpHc6EkIyDM3nHVWKYrAvGy6EAJfNfjusbwnThqjqxUKKRwuV3iWYeW/LYMzNgaq3MaLffQ2xA==", "dev": true }, "node_modules/@types/parse-json": { @@ -1199,9 +1182,9 @@ } }, "node_modules/eslint/node_modules/globals": { - "version": "13.10.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.10.0.tgz", - "integrity": "sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g==", + "version": "13.11.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz", + "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -1392,9 +1375,9 @@ "dev": true }, "node_modules/fastq": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.1.tgz", - "integrity": "sha512-HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw==", + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.12.0.tgz", + "integrity": "sha512-VNX0QkHK3RsXVKr9KrlUv/FoTa0NdbYoHHl7uXHv2rzyHSlxjdNAKug2twd9luJxpcyNeAgf5iPPMutJO67Dfg==", "dev": true, "dependencies": { "reusify": "^1.0.4" @@ -1663,18 +1646,6 @@ "node": ">=4" } }, - "node_modules/import-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/import-from/-/import-from-4.0.0.tgz", - "integrity": "sha512-P9J71vT5nLlDeV8FHs5nNxaLbrpfAV5cF5srvbZfpwpcJoM/xZR3hiv+q+SAnuSmuGbXMWud063iIMx/V/EWZQ==", - "dev": true, - "engines": { - "node": ">=12.2" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", @@ -2571,9 +2542,9 @@ } }, "node_modules/tslib": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz", - "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", "dev": true }, "node_modules/type-check": { @@ -2687,9 +2658,9 @@ "dev": true }, "node_modules/ws": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.0.0.tgz", - "integrity": "sha512-6AcSIXpBlS0QvCVKk+3cWnWElLsA6SzC0lkQ43ciEglgXJXiCWK3/CGFEJ+Ybgp006CMibamAsqOlxE9s4AvYA==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.0.tgz", + "integrity": "sha512-uYhVJ/m9oXwEI04iIVmgLmugh2qrZihkywG9y5FfZV2ATeLIzHf93qs+tUNqlttbQK957/VX3mtwAS+UfIwA4g==", "dev": true, "engines": { "node": ">=10.0.0" @@ -2769,18 +2740,6 @@ "@babel/types": "^7.15.0", "jsesc": "^2.5.1", "source-map": "^0.5.0" - }, - "dependencies": { - "@babel/types": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz", - "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.14.9", - "to-fast-properties": "^2.0.0" - } - } } }, "@babel/helper-function-name": { @@ -2839,9 +2798,9 @@ } }, "@babel/parser": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.9.tgz", - "integrity": "sha512-RdUTOseXJ8POjjOeEBEvNMIZU/nm4yu2rufRkcibzkkg7DmQvXU8v3M4Xk9G7uuI86CDGkKcuDWgioqZm+mScQ==", + "version": "7.15.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.3.tgz", + "integrity": "sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA==", "dev": true }, "@babel/template": { @@ -2856,26 +2815,26 @@ } }, "@babel/traverse": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.9.tgz", - "integrity": "sha512-bldh6dtB49L8q9bUyB7bC20UKgU+EFDwKJylwl234Kv+ySZeMD31Xeht6URyueQ6LrRRpF2tmkfcZooZR9/e8g==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.0.tgz", + "integrity": "sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw==", "dev": true, "requires": { "@babel/code-frame": "^7.14.5", - "@babel/generator": "^7.14.9", + "@babel/generator": "^7.15.0", "@babel/helper-function-name": "^7.14.5", "@babel/helper-hoist-variables": "^7.14.5", "@babel/helper-split-export-declaration": "^7.14.5", - "@babel/parser": "^7.14.9", - "@babel/types": "^7.14.9", + "@babel/parser": "^7.15.0", + "@babel/types": "^7.15.0", "debug": "^4.1.0", "globals": "^11.1.0" } }, "@babel/types": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.9.tgz", - "integrity": "sha512-u0bLTnv3DFHeaQLYzb7oRJ1JHr1sv/SYDM7JSqHFFLwXG1wTZRughxFI5NCP8qBEo1rVVsn7Yg2Lvw49nne/Ow==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz", + "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.14.9", @@ -2912,9 +2871,9 @@ }, "dependencies": { "globals": { - "version": "13.10.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.10.0.tgz", - "integrity": "sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g==", + "version": "13.11.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz", + "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==", "dev": true, "requires": { "type-fest": "^0.20.2" @@ -2937,69 +2896,67 @@ } }, "@graphql-tools/batch-execute": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-8.0.2.tgz", - "integrity": "sha512-IsTwujhWYbEPCPdUaEsEihzovQMfNeoOhV7LgXpJXyLAvr24WpY5H/Yn1FaT9B1Ki1Oh6sgYbuai9gNm3iDz5A==", + "version": "8.0.5", + "resolved": "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-8.0.5.tgz", + "integrity": "sha512-Zx+zs12BLGNvrQtfESIhitzwIkrWnKyKOkAfcaMNuOLGOO2pDmhwIRzbHj+6Jtq9V1/JTaVkSnm/4ozaCRck5A==", "dev": true, "requires": { - "@graphql-tools/utils": "8.0.2", + "@graphql-tools/utils": "^8.1.1", "dataloader": "2.0.0", "tslib": "~2.3.0", "value-or-promise": "1.0.10" } }, "@graphql-tools/code-file-loader": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/@graphql-tools/code-file-loader/-/code-file-loader-7.0.2.tgz", - "integrity": "sha512-Es2gO2iRbir8yCHB1KEJ2sRyQNkncVSHHXUkTzYfQYVXT9vhiRaUtt/xZeBgTv0u/sdyvVPoYCM12wyURuyU7Q==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/@graphql-tools/code-file-loader/-/code-file-loader-7.0.6.tgz", + "integrity": "sha512-+xddAWyvrcW5Em3Yx+RJ7vwFMyOoS8pwqgeVr0CTZF9YbrQSPz7wQJRAVFZNJQaJOalKlPWxsmKkSyMQRG+t4A==", "dev": true, "requires": { - "@graphql-tools/graphql-tag-pluck": "^7.0.2", - "@graphql-tools/utils": "8.0.2", + "@graphql-tools/graphql-tag-pluck": "^7.0.5", + "@graphql-tools/utils": "^8.1.1", "globby": "^11.0.3", - "is-glob": "^4.0.1", "tslib": "~2.3.0", "unixify": "^1.0.0" } }, "@graphql-tools/delegate": { - "version": "8.0.6", - "resolved": "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-8.0.6.tgz", - "integrity": "sha512-ZHR6mwHaNQRLzx/2w8ZTHBaB47FqdtkVa0nukUZJSMtv7RMcTTt9ifBwYTVtHL28zYVrJH/DCoUcIZFRv/Okqg==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-8.1.0.tgz", + "integrity": "sha512-jJmty2rr4k2k6pG3H0qoCH9LDezjyVe0wLNUbVQcSfWBj1VgeHX6BF4qgbT5HsDD3oOP8ruiHZgbn6EbrOwDfA==", "dev": true, "requires": { - "@graphql-tools/batch-execute": "^8.0.2", - "@graphql-tools/schema": "^8.0.2", - "@graphql-tools/utils": "8.0.2", + "@graphql-tools/batch-execute": "^8.0.5", + "@graphql-tools/schema": "^8.1.2", + "@graphql-tools/utils": "^8.1.1", "dataloader": "2.0.0", "tslib": "~2.3.0", "value-or-promise": "1.0.10" } }, "@graphql-tools/graphql-file-loader": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.0.2.tgz", - "integrity": "sha512-hGL6mEERBZXtCE+e3U0+ESR6zMDqiE1l5KReBovjEEAbveyWWW58NJvaCGyS3eE8K8I91hwqJpwOY9aoTmavQA==", + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.0.5.tgz", + "integrity": "sha512-hYdz/zvA2z2M6zqgTCkEiqWPIKLsFirg1ZawaKzCLN0sUi+hRrLVTc1eIlz/vfR8ojvswEq81OMtk5d+lbHiHQ==", "dev": true, "requires": { "@graphql-tools/import": "^6.2.6", - "@graphql-tools/utils": "8.0.2", + "@graphql-tools/utils": "^8.1.1", "globby": "^11.0.3", - "is-glob": "^4.0.1", "tslib": "~2.3.0", "unixify": "^1.0.0" } }, "@graphql-tools/graphql-tag-pluck": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/@graphql-tools/graphql-tag-pluck/-/graphql-tag-pluck-7.0.2.tgz", - "integrity": "sha512-Ef+TKdFI082KXmJbFsYx6S0I6l6LiArt72P+yrJ96H+DH6mVVHX37LCiBToFipm/5sxO0XqUfft9IOVfp5UfUA==", + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/@graphql-tools/graphql-tag-pluck/-/graphql-tag-pluck-7.0.5.tgz", + "integrity": "sha512-/eNFl/4gshnlgNvx1Koaey3036edcv5/Nko+px/DbkfjKedwikRWubURcCaMp/4VE6CyIUibxRrP6TzVByhVrw==", "dev": true, "requires": { - "@babel/parser": "7.14.9", - "@babel/traverse": "7.14.9", - "@babel/types": "7.14.9", - "@graphql-tools/utils": "8.0.2", + "@babel/parser": "7.15.3", + "@babel/traverse": "7.15.0", + "@babel/types": "7.15.0", + "@graphql-tools/utils": "^8.1.1", "tslib": "~2.3.0" } }, @@ -3022,39 +2979,27 @@ } }, "@graphql-tools/json-file-loader": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-7.0.2.tgz", - "integrity": "sha512-WmkoSTm2KwMHWvXDm3nGlTlDGrFN69UnHOcEdMvMwd2whkzT6C4S9XRvKfe4KnOy7mKK1WSmYYhk9T9toRHkug==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-7.1.2.tgz", + "integrity": "sha512-/CrnNBwi4WDvt4yc2PcRmQxqGIOtK84s4iI5vsHwlcK7D02WX1cza4YEblFlMQUkxR9pmwGIYXverUOiaysqRA==", "dev": true, "requires": { - "@graphql-tools/utils": "8.0.2", - "tslib": "~2.3.0" + "@graphql-tools/utils": "^8.1.1", + "globby": "^11.0.3", + "tslib": "~2.3.0", + "unixify": "^1.0.0" } }, "@graphql-tools/load": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/@graphql-tools/load/-/load-7.1.2.tgz", - "integrity": "sha512-H2tLlAmFLjC8CQRTzqHkPJKjXdnYS2JdWsM6iVlKkbxs42ZAVk/OxYEe3Fg61pLV+EqfWtydiDT3xdPy+vqGEg==", + "version": "7.1.8", + "resolved": "https://registry.npmjs.org/@graphql-tools/load/-/load-7.1.8.tgz", + "integrity": "sha512-dVl2jJon9VL0qLTC98hJH4CkQ/oat6j9TouCk69ezzWHFxiPlz6tF78BzLr86Mz+bY6QCGeNIJ75Ovyn7EutCQ==", "dev": true, "requires": { - "@graphql-tools/merge": "^7.0.0", - "@graphql-tools/utils": "8.0.2", - "import-from": "4.0.0", + "@graphql-tools/schema": "8.1.2", + "@graphql-tools/utils": "^8.1.1", "p-limit": "3.1.0", "tslib": "~2.3.0" - }, - "dependencies": { - "@graphql-tools/merge": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-7.0.0.tgz", - "integrity": "sha512-u7TTwKQ7cybAkn6snYPRg3um/C2u690wlD8TgHITAmGQDAExN/yipSSBgu4rXWopsPLsY0G30mJ8tOWToZVE1w==", - "dev": true, - "requires": { - "@graphql-tools/schema": "^8.0.3", - "@graphql-tools/utils": "8.0.2", - "tslib": "~2.3.0" - } - } } }, "@graphql-tools/merge": { @@ -3066,43 +3011,53 @@ "@graphql-tools/schema": "^8.0.2", "@graphql-tools/utils": "8.0.2", "tslib": "~2.3.0" + }, + "dependencies": { + "@graphql-tools/utils": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.0.2.tgz", + "integrity": "sha512-gzkavMOgbhnwkHJYg32Adv6f+LxjbQmmbdD5Hty0+CWxvaiuJq+nU6tzb/7VSU4cwhbNLx/lGu2jbCPEW1McZQ==", + "dev": true, + "requires": { + "tslib": "~2.3.0" + } + } } }, "@graphql-tools/schema": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.0.3.tgz", - "integrity": "sha512-ufJH7r/RcetVPd3kKCZ16/JTRkOX8aB1yGbYnUjqWEIdYEZc3Fpg7AVlcliu2JlvwR+WSNlgWn2QK76QCsFFdA==", + "version": "8.1.2", + "resolved": "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.1.2.tgz", + "integrity": "sha512-rX2pg42a0w7JLVYT+f/yeEKpnoZL5PpLq68TxC3iZ8slnNBNjfVfvzzOn8Q8Q6Xw3t17KP9QespmJEDfuQe4Rg==", "dev": true, "requires": { - "@graphql-tools/merge": "7.0.0", - "@graphql-tools/utils": "8.0.2", + "@graphql-tools/merge": "^8.0.2", + "@graphql-tools/utils": "^8.1.1", "tslib": "~2.3.0", "value-or-promise": "1.0.10" }, "dependencies": { "@graphql-tools/merge": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-7.0.0.tgz", - "integrity": "sha512-u7TTwKQ7cybAkn6snYPRg3um/C2u690wlD8TgHITAmGQDAExN/yipSSBgu4rXWopsPLsY0G30mJ8tOWToZVE1w==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.0.2.tgz", + "integrity": "sha512-li/bl6RpcZCPA0LrSxMYMcyYk+brer8QYY25jCKLS7gvhJkgzEFpCDaX43V1+X13djEoAbgay2mCr3dtfJQQRQ==", "dev": true, "requires": { - "@graphql-tools/schema": "^8.0.3", - "@graphql-tools/utils": "8.0.2", + "@graphql-tools/utils": "^8.1.1", "tslib": "~2.3.0" } } } }, "@graphql-tools/url-loader": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.0.6.tgz", - "integrity": "sha512-wU6bhdTLlecrrnPMrmUwuruRXxJPIcavDy7h+v515IDwQ9hs/z9tHQLRCKopgRlmqBocATrFctstmT8k+e0JSQ==", + "version": "7.0.11", + "resolved": "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.0.11.tgz", + "integrity": "sha512-4u+h5RtjJXaQjhfBdClreNWavBZqa0U92Cx3Z+zFvIsIYRrEboy7x+cH4QD9OEca/LuUcskJ4yyWllztz/ktow==", "dev": true, "requires": { "@ardatan/fetch-event-source": "2.0.2", - "@graphql-tools/delegate": "8.0.6", - "@graphql-tools/utils": "8.0.2", - "@graphql-tools/wrap": "^8.0.6", + "@graphql-tools/delegate": "^8.1.0", + "@graphql-tools/utils": "^8.1.1", + "@graphql-tools/wrap": "^8.0.13", "@n1ru4l/graphql-live-query": "0.7.1", "@types/websocket": "1.0.4", "abort-controller": "3.0.0", @@ -3119,27 +3074,27 @@ "tslib": "~2.3.0", "valid-url": "1.0.9", "value-or-promise": "1.0.10", - "ws": "8.0.0" + "ws": "8.2.0" } }, "@graphql-tools/utils": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.0.2.tgz", - "integrity": "sha512-gzkavMOgbhnwkHJYg32Adv6f+LxjbQmmbdD5Hty0+CWxvaiuJq+nU6tzb/7VSU4cwhbNLx/lGu2jbCPEW1McZQ==", + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.1.1.tgz", + "integrity": "sha512-QbFNoBmBiZ+ej4y6mOv8Ba4lNhcrTEKXAhZ0f74AhdEXi7b9xbGUH/slO5JaSyp85sGQYIPmxjRPpXBjLklbmw==", "dev": true, "requires": { "tslib": "~2.3.0" } }, "@graphql-tools/wrap": { - "version": "8.0.6", - "resolved": "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-8.0.6.tgz", - "integrity": "sha512-iQr/ZQQIy2Xz2szVsQCPJ0R4eyjkX3O3Sy3RNB7x/a7IUBB5fTtUi+StxklpZb4KzKCBdz9VFIkhMTHVjsSxiQ==", + "version": "8.0.13", + "resolved": "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-8.0.13.tgz", + "integrity": "sha512-GTkHbN+Zgs+D7bFniFx3/YqNIDv8ET17prM7FewmU8LNRc2P48y6d4/dkQLcwQmryy1TZF87es6yA9FMNfQtWg==", "dev": true, "requires": { - "@graphql-tools/delegate": "8.0.6", - "@graphql-tools/schema": "^8.0.2", - "@graphql-tools/utils": "8.0.2", + "@graphql-tools/delegate": "^8.1.0", + "@graphql-tools/schema": "^8.1.2", + "@graphql-tools/utils": "^8.1.1", "tslib": "~2.3.0", "value-or-promise": "1.0.10" } @@ -3201,9 +3156,9 @@ } }, "@types/node": { - "version": "16.4.12", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.4.12.tgz", - "integrity": "sha512-zxrTNFl9Z8boMJXs6ieqZP0wAhvkdzmHSxTlJabM16cf5G9xBc1uPRH5Bbv2omEDDiM8MzTfqTJXBf0Ba4xFWA==", + "version": "16.6.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.6.2.tgz", + "integrity": "sha512-LSw8TZt12ZudbpHc6EkIyDM3nHVWKYrAvGy6EAJfNfjusbwnThqjqxUKKRwuV3iWYeW/LYMzNgaq3MaLffQ2xA==", "dev": true }, "@types/parse-json": { @@ -3642,9 +3597,9 @@ "dev": true }, "globals": { - "version": "13.10.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.10.0.tgz", - "integrity": "sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g==", + "version": "13.11.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz", + "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==", "dev": true, "requires": { "type-fest": "^0.20.2" @@ -3821,9 +3776,9 @@ "dev": true }, "fastq": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.1.tgz", - "integrity": "sha512-HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw==", + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.12.0.tgz", + "integrity": "sha512-VNX0QkHK3RsXVKr9KrlUv/FoTa0NdbYoHHl7uXHv2rzyHSlxjdNAKug2twd9luJxpcyNeAgf5iPPMutJO67Dfg==", "dev": true, "requires": { "reusify": "^1.0.4" @@ -4014,12 +3969,6 @@ } } }, - "import-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/import-from/-/import-from-4.0.0.tgz", - "integrity": "sha512-P9J71vT5nLlDeV8FHs5nNxaLbrpfAV5cF5srvbZfpwpcJoM/xZR3hiv+q+SAnuSmuGbXMWud063iIMx/V/EWZQ==", - "dev": true - }, "imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", @@ -4670,9 +4619,9 @@ } }, "tslib": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz", - "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", "dev": true }, "type-check": { @@ -4755,9 +4704,9 @@ "dev": true }, "ws": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.0.0.tgz", - "integrity": "sha512-6AcSIXpBlS0QvCVKk+3cWnWElLsA6SzC0lkQ43ciEglgXJXiCWK3/CGFEJ+Ybgp006CMibamAsqOlxE9s4AvYA==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.0.tgz", + "integrity": "sha512-uYhVJ/m9oXwEI04iIVmgLmugh2qrZihkywG9y5FfZV2ATeLIzHf93qs+tUNqlttbQK957/VX3mtwAS+UfIwA4g==", "dev": true, "requires": {} }, diff --git a/installers/npm/package-lock.json b/installers/npm/package-lock.json index 059e8e73a..ae4f48d0d 100644 --- a/installers/npm/package-lock.json +++ b/installers/npm/package-lock.json @@ -118,9 +118,9 @@ } }, "node_modules/follow-redirects": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz", - "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==", + "version": "1.14.2", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.2.tgz", + "integrity": "sha512-yLR6WaE2lbF0x4K2qE2p9PEXKLDjUjnR/xmjS3wHAYxtlsI9MLLBJUZirAHKzUZDGLxje7w/cXR49WOUo4rbsA==", "funding": [ { "type": "individual", @@ -273,9 +273,9 @@ } }, "node_modules/tar": { - "version": "6.1.6", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.6.tgz", - "integrity": "sha512-oaWyu5dQbHaYcyZCTfyPpC+VmI62/OM2RTUYavTk1MDr1cwW5Boi3baeYQKiZbY2uSQJGr+iMOzb/JFxLrft+g==", + "version": "6.1.10", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.10.tgz", + "integrity": "sha512-kvvfiVvjGMxeUNB6MyYv5z7vhfFRwbwCXJAeL0/lnbrttBVqcMOnpHUf0X42LrPMR8mMpgapkJMchFH4FSHzNA==", "dependencies": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", @@ -388,9 +388,9 @@ } }, "follow-redirects": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz", - "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==" + "version": "1.14.2", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.2.tgz", + "integrity": "sha512-yLR6WaE2lbF0x4K2qE2p9PEXKLDjUjnR/xmjS3wHAYxtlsI9MLLBJUZirAHKzUZDGLxje7w/cXR49WOUo4rbsA==" }, "fs-minipass": { "version": "2.1.0", @@ -490,9 +490,9 @@ } }, "tar": { - "version": "6.1.6", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.6.tgz", - "integrity": "sha512-oaWyu5dQbHaYcyZCTfyPpC+VmI62/OM2RTUYavTk1MDr1cwW5Boi3baeYQKiZbY2uSQJGr+iMOzb/JFxLrft+g==", + "version": "6.1.10", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.10.tgz", + "integrity": "sha512-kvvfiVvjGMxeUNB6MyYv5z7vhfFRwbwCXJAeL0/lnbrttBVqcMOnpHUf0X42LrPMR8mMpgapkJMchFH4FSHzNA==", "requires": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", diff --git a/xtask/src/commands/prep/mod.rs b/xtask/src/commands/prep/mod.rs index 2f3a0637d..fe93ae6af 100644 --- a/xtask/src/commands/prep/mod.rs +++ b/xtask/src/commands/prep/mod.rs @@ -5,7 +5,7 @@ use anyhow::{Context, Result}; use structopt::StructOpt; use crate::commands::prep::docs::DocsRunner; -use crate::tools::NpmRunner; +use crate::tools::{CargoRunner, NpmRunner}; #[derive(Debug, StructOpt)] pub struct Prep {} @@ -15,6 +15,8 @@ impl Prep { let npm_runner = NpmRunner::new(verbose)?; npm_runner.prepare_package()?; npm_runner.update_linter()?; + let mut cargo_runner = CargoRunner::new(verbose)?; + cargo_runner.update_deps()?; installers::update_versions()?; let docs_runner = DocsRunner::new()?; docs_runner diff --git a/xtask/src/tools/cargo.rs b/xtask/src/tools/cargo.rs index b7a15da38..d26efbe3d 100644 --- a/xtask/src/tools/cargo.rs +++ b/xtask/src/tools/cargo.rs @@ -99,6 +99,11 @@ impl CargoRunner { Ok(()) } + pub(crate) fn update_deps(&mut self) -> Result<()> { + self.cargo_exec_without_target(vec!["update"], vec![])?; + Ok(()) + } + pub(crate) fn test(&mut self, target: &Target) -> Result<()> { let command_output = self.cargo_exec_with_target( target,