diff --git a/apollo-router-scaffold/Cargo.toml b/apollo-router-scaffold/Cargo.toml index bd35941ead0..642f5dce782 100644 --- a/apollo-router-scaffold/Cargo.toml +++ b/apollo-router-scaffold/Cargo.toml @@ -8,11 +8,11 @@ publish = false [dependencies] anyhow = "1.0.71" -clap = { version = "4.3.0", features = ["derive"] } +clap = { version = "4.3.2", features = ["derive"] } cargo-scaffold = { version = "0.8.9", default-features = false } regex = "1" str_inflector = "0.12.0" toml = "0.5.11" [dev-dependencies] -tempfile = "3.5.0" +tempfile = "3.6.0" copy_dir = "0.1.2" diff --git a/apollo-router/Cargo.toml b/apollo-router/Cargo.toml index a4775ee5323..3a87c42aa46 100644 --- a/apollo-router/Cargo.toml +++ b/apollo-router/Cargo.toml @@ -69,7 +69,7 @@ backtrace = "0.3.67" base64 = "0.20.0" buildstructor = "0.5.2" bytes = "1.4.0" -clap = { version = "4.3.0", default-features = false, features = [ +clap = { version = "4.3.2", default-features = false, features = [ "env", "derive", "std", @@ -87,7 +87,7 @@ dhat = { version = "0.3.2", optional = true } diff = "0.1.13" directories = "4.0.1" displaydoc = "0.2" -flate2 = "1.0.24" +flate2 = "1.0.26" fred = { version = "6.3.0", features = ["enable-rustls", "no-client-setname"] } futures = { version = "0.3.28", features = ["thread-pool"] } graphql_client = "0.11.0" @@ -117,7 +117,7 @@ multimap = "0.8.3" # To avoid tokio issues notify = { version = "5.2.0", default-features = false, features=["macos_kqueue"] } nu-ansi-term = "0.47" -once_cell = "1.17.2" +once_cell = "1.18.0" # Any package that starts with `opentelemetry` needs to be updated with care # because it is tightly intertwined with the `tracing` packages on account of @@ -163,7 +163,7 @@ prost-types = "0.11.9" proteus = "0.5.0" rand = "0.8.5" rhai = { version = "1.14.0", features = ["sync", "serde", "internals"] } -regex = "1.8.3" +regex = "1.8.4" reqwest = { version = "0.11.18", default-features = false, features = [ "rustls-tls", "rustls-native-certs", @@ -171,13 +171,13 @@ reqwest = { version = "0.11.18", default-features = false, features = [ "stream", ] } router-bridge = "0.2.6+v2.4.7" -rust-embed="6.6.1" +rust-embed="6.7.0" rustls = "0.20.8" rustls-pemfile = "1.0.2" schemars = { version = "0.8.12", features = ["url"] } shellexpand = "3.1.0" sha2 = "0.10.6" -serde = { version = "1.0.163", features = ["derive", "rc"] } +serde = { version = "1.0.164", features = ["derive", "rc"] } serde_json_bytes = { version = "0.2.1", features = ["preserve_order"] } serde_json = { version = "1.0.96", features = ["preserve_order"] } serde_urlencoded = "0.7.1" @@ -209,7 +209,7 @@ tracing-core = "0.1.30" tracing-futures = { version = "0.2.5", features = ["futures-03"] } tracing-opentelemetry = "0.19.0" tracing-subscriber = { version = "0.3.11", features = ["env-filter", "json"] } -url = { version = "2.3.1", features = ["serde"] } +url = { version = "2.4.0", features = ["serde"] } urlencoding = "2.1.2" uuid = { version = "1.3.3", features = ["serde", "v4"] } yaml-rust = "0.4.5" @@ -240,7 +240,7 @@ introspector-gadget = "0.2.2" maplit = "1.0.2" memchr = { version = "2.5.0", default-features = false } mockall = "0.11.4" -once_cell = "1.17.2" +once_cell = "1.18.0" p256 = "0.12.0" rand_core = "0.6.4" redis = { version = "0.21.7", features = ["tokio-comp"] } @@ -249,7 +249,7 @@ reqwest = { version = "0.11.18", default-features = false, features = [ "stream", ] } similar-asserts = "1.4.2" -tempfile = "3.5.0" +tempfile = "3.6.0" test-log = { version = "0.2.11", default-features = false, features = [ "trace", ] } diff --git a/dockerfiles/tracing/datadog-subgraph/package-lock.json b/dockerfiles/tracing/datadog-subgraph/package-lock.json index df2b4519cf8..854ab278608 100644 --- a/dockerfiles/tracing/datadog-subgraph/package-lock.json +++ b/dockerfiles/tracing/datadog-subgraph/package-lock.json @@ -17,7 +17,7 @@ "graphql": "^16.5.0" }, "devDependencies": { - "typescript": "5.0.4" + "typescript": "5.1.3" } }, "node_modules/@apollo/cache-control-types": { @@ -741,12 +741,12 @@ "integrity": "sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw==" }, "node_modules/dd-trace": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/dd-trace/-/dd-trace-3.21.0.tgz", - "integrity": "sha512-c86ZIVihUlIWx5XvzQ8xikgNwT7+w+2PllY7NRYRrxbN6ZjIqdg7tTkoUYMaIo1bvpNBGtW2mRV7JN6b76PlhA==", + "version": "3.22.1", + "resolved": "https://registry.npmjs.org/dd-trace/-/dd-trace-3.22.1.tgz", + "integrity": "sha512-lLWe3vF2pDe6HEajLE6FYqVC9tLcDak0Kfj2RVcX31T33gg5LbQNlOH6Y32jCin2obkF1fRertWJ6iBW8RbVBA==", "hasInstallScript": true, "dependencies": { - "@datadog/native-appsec": "^3.1.0", + "@datadog/native-appsec": "^3.2.0", "@datadog/native-iast-rewriter": "2.0.1", "@datadog/native-iast-taint-tracking": "^1.4.1", "@datadog/native-metrics": "^2.0.0", @@ -1602,16 +1602,16 @@ } }, "node_modules/typescript": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz", - "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.3.tgz", + "integrity": "sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw==", "dev": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" }, "engines": { - "node": ">=12.20" + "node": ">=14.17" } }, "node_modules/unpipe": { @@ -2276,11 +2276,11 @@ "integrity": "sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw==" }, "dd-trace": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/dd-trace/-/dd-trace-3.21.0.tgz", - "integrity": "sha512-c86ZIVihUlIWx5XvzQ8xikgNwT7+w+2PllY7NRYRrxbN6ZjIqdg7tTkoUYMaIo1bvpNBGtW2mRV7JN6b76PlhA==", + "version": "3.22.1", + "resolved": "https://registry.npmjs.org/dd-trace/-/dd-trace-3.22.1.tgz", + "integrity": "sha512-lLWe3vF2pDe6HEajLE6FYqVC9tLcDak0Kfj2RVcX31T33gg5LbQNlOH6Y32jCin2obkF1fRertWJ6iBW8RbVBA==", "requires": { - "@datadog/native-appsec": "^3.1.0", + "@datadog/native-appsec": "^3.2.0", "@datadog/native-iast-rewriter": "2.0.1", "@datadog/native-iast-taint-tracking": "^1.4.1", "@datadog/native-metrics": "^2.0.0", @@ -2908,9 +2908,9 @@ } }, "typescript": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz", - "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.3.tgz", + "integrity": "sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw==", "dev": true }, "unpipe": { diff --git a/dockerfiles/tracing/datadog-subgraph/package.json b/dockerfiles/tracing/datadog-subgraph/package.json index b4ea6222529..77d7bc18267 100644 --- a/dockerfiles/tracing/datadog-subgraph/package.json +++ b/dockerfiles/tracing/datadog-subgraph/package.json @@ -18,6 +18,6 @@ "graphql": "^16.5.0" }, "devDependencies": { - "typescript": "5.0.4" + "typescript": "5.1.3" } } diff --git a/dockerfiles/tracing/jaeger-subgraph/package-lock.json b/dockerfiles/tracing/jaeger-subgraph/package-lock.json index 83f36bd4fe7..ac5d3024068 100644 --- a/dockerfiles/tracing/jaeger-subgraph/package-lock.json +++ b/dockerfiles/tracing/jaeger-subgraph/package-lock.json @@ -18,7 +18,7 @@ "opentracing": "^0.14.7" }, "devDependencies": { - "typescript": "5.0.4" + "typescript": "5.1.3" } }, "node_modules/@apollo/cache-control-types": { @@ -1385,16 +1385,16 @@ } }, "node_modules/typescript": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz", - "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.3.tgz", + "integrity": "sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw==", "dev": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" }, "engines": { - "node": ">=12.20" + "node": ">=14.17" } }, "node_modules/unpipe": { @@ -2527,9 +2527,9 @@ } }, "typescript": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz", - "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.3.tgz", + "integrity": "sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw==", "dev": true }, "unpipe": { diff --git a/dockerfiles/tracing/jaeger-subgraph/package.json b/dockerfiles/tracing/jaeger-subgraph/package.json index ee41d863203..8e1a3e80298 100644 --- a/dockerfiles/tracing/jaeger-subgraph/package.json +++ b/dockerfiles/tracing/jaeger-subgraph/package.json @@ -19,6 +19,6 @@ "opentracing": "^0.14.7" }, "devDependencies": { - "typescript": "5.0.4" + "typescript": "5.1.3" } } diff --git a/dockerfiles/tracing/zipkin-subgraph/package-lock.json b/dockerfiles/tracing/zipkin-subgraph/package-lock.json index 1b58a4da752..4ee71345072 100644 --- a/dockerfiles/tracing/zipkin-subgraph/package-lock.json +++ b/dockerfiles/tracing/zipkin-subgraph/package-lock.json @@ -19,7 +19,7 @@ "zipkin-javascript-opentracing": "^3.0.0" }, "devDependencies": { - "typescript": "5.0.4" + "typescript": "5.1.3" } }, "node_modules/@apollo/cache-control-types": { @@ -1412,16 +1412,16 @@ } }, "node_modules/typescript": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz", - "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.3.tgz", + "integrity": "sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw==", "dev": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" }, "engines": { - "node": ">=12.20" + "node": ">=14.17" } }, "node_modules/unpipe": { @@ -2598,9 +2598,9 @@ } }, "typescript": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz", - "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.3.tgz", + "integrity": "sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw==", "dev": true }, "unpipe": { diff --git a/dockerfiles/tracing/zipkin-subgraph/package.json b/dockerfiles/tracing/zipkin-subgraph/package.json index f0a98da3e50..79094910462 100644 --- a/dockerfiles/tracing/zipkin-subgraph/package.json +++ b/dockerfiles/tracing/zipkin-subgraph/package.json @@ -20,6 +20,6 @@ "zipkin-javascript-opentracing": "^3.0.0" }, "devDependencies": { - "typescript": "5.0.4" + "typescript": "5.1.3" } } diff --git a/xtask/Cargo.lock b/xtask/Cargo.lock index 096a137719c..5d1a90e1ee3 100644 --- a/xtask/Cargo.lock +++ b/xtask/Cargo.lock @@ -202,9 +202,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.0" +version = "4.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" +checksum = "401a4694d2bf92537b6867d94de48c4842089645fdcdf6c71865b175d836e9c2" dependencies = [ "clap_builder", "clap_derive", @@ -213,9 +213,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.0" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" +checksum = "72394f3339a76daf211e57d4bcb374410f3965dcc606dd0e03738c7888766980" dependencies = [ "anstream", "anstyle", @@ -226,9 +226,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.0" +version = "4.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b" +checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" dependencies = [ "heck", "proc-macro2", @@ -1065,9 +1065,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.3" +version = "1.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" +checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" dependencies = [ "aho-corasick", "memchr", @@ -1260,18 +1260,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.163" +version = "1.0.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" dependencies = [ "proc-macro2", "quote", diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index 2e46c3fd4f4..99551038adb 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -12,7 +12,7 @@ publish = false anyhow = "1" base64 = "0.20" camino = "1" -clap = { version = "4.3.0", features = ["derive"] } +clap = { version = "4.3.2", features = ["derive"] } cargo_metadata = "0.15" # Only use the `clock` features of `chrono` to avoid the `time` dependency # impacted by CVE-2020-26235. https://github.com/chronotope/chrono/issues/602 @@ -27,13 +27,13 @@ libc = "0.2" memorable-wordlist = "0.1.7" nu-ansi-term = "0.47" once_cell = "1" -regex="1.8.3" +regex="1.8.4" reqwest = { version = "0.11", default-features = false, features = [ "blocking", "rustls-tls", "rustls-tls-native-roots", ] } -serde = { version = "1.0.163", features = ["derive"] } +serde = { version = "1.0.164", features = ["derive"] } serde_json = "1" serde_json_traversal = "0.2" tar = "0.4"