Merge upstream/main: resolve Cargo.lock conflict (regex 1.13.0 -> 1.13.1)

Author: christiansany

compiler/Cargo.lock

@@ -219,6 +219,12 @@ pub struct FeatureFlags {
     /// for selections on abstract types.
     #[serde(default)]
     pub disable_more_precise_abstract_selection_raw_response_type: FeatureFlag,
+
+    /// Automatically add `__typename` selections that enable typegen to emit
+    /// discriminated unions for selections on abstract types. Limited and
+    /// rollout variants are keyed by operation or fragment definition name.
+    #[serde(default)]
+    pub enable_typename_discriminated_unions: FeatureFlag,
 }
 
 impl Default for FeatureFlags {
@@ -256,6 +262,7 @@ impl Default for FeatureFlags {
             enforce_module_name_prefix_for_non_haste: Default::default(),
             emit_nogrep_annotation: Default::default(),
             disable_more_precise_abstract_selection_raw_response_type: Default::default(),
+            enable_typename_discriminated_unions: Default::default(),
 
             // enabled-by-default
             enforce_fragment_alias_where_ambiguous: FeatureFlag::Enabled,
@@ -341,6 +348,10 @@ mod tests {
         ));
         // A couple of quick sanity checks for other defaults
         assert!(matches!(flags.no_inline, FeatureFlag::Disabled));
+        assert!(matches!(
+            flags.enable_typename_discriminated_unions,
+            FeatureFlag::Disabled
+        ));
         assert!(!flags.enable_resolver_normalization_ast);
     }
 

compiler/crates/common/src/feature_flags.rs

@@ -35,4 +35,4 @@ serde = { version = "1.0.219", features = ["derive", "rc"] }
 [dev-dependencies]
 fixture-tests = { path = "../fixture-tests" }
 relay-test-schema = { path = "../relay-test-schema" }
-tokio = { version = "1.52.3", features = ["full", "test-util", "tracing"] }
+tokio = { version = "1.52.4", features = ["full", "test-util", "tracing"] }

compiler/crates/dependency-analyzer/Cargo.toml

@@ -22,4 +22,4 @@ thiserror = "2.0.18"
 [dev-dependencies]
 fixture-tests = { path = "../fixture-tests" }
 graphql-test-helpers = { path = "../graphql-test-helpers" }
-tokio = { version = "1.52.3", features = ["full", "test-util", "tracing"] }
+tokio = { version = "1.52.4", features = ["full", "test-util", "tracing"] }

compiler/crates/docblock-syntax/Cargo.toml

@@ -19,4 +19,4 @@ graphql-syntax = { path = "../graphql-syntax" }
 
 [dev-dependencies]
 fixture-tests = { path = "../fixture-tests" }
-tokio = { version = "1.52.3", features = ["full", "test-util", "tracing"] }
+tokio = { version = "1.52.4", features = ["full", "test-util", "tracing"] }

compiler/crates/extract-graphql/Cargo.toml

@@ -17,8 +17,8 @@ name = "fixture_tests_tests"
 path = "tests/uppercase_test.rs"
 
 [dependencies]
-clap = { version = "4.6.0", features = ["derive", "env", "string", "unicode", "wrap_help"] }
+clap = { version = "4.6.2", features = ["derive", "env", "string", "unicode", "wrap_help"] }
 colored = "2.1.0"
 diff = "0.1.13"
 signedsource = { path = "../signedsource" }
-tokio = { version = "1.52.3", features = ["full", "test-util", "tracing"] }
+tokio = { version = "1.52.4", features = ["full", "test-util", "tracing"] }

compiler/crates/fixture-tests/Cargo.toml

@@ -31,4 +31,4 @@ graphql-cli = { path = "../graphql-cli" }
 graphql-syntax = { path = "../graphql-syntax" }
 graphql-test-helpers = { path = "../graphql-test-helpers" }
 relay-test-schema = { path = "../relay-test-schema" }
-tokio = { version = "1.52.3", features = ["full", "test-util", "tracing"] }
+tokio = { version = "1.52.4", features = ["full", "test-util", "tracing"] }

compiler/crates/graphql-ir-validations/Cargo.toml

@@ -36,4 +36,4 @@ thiserror = "2.0.18"
 fixture-tests = { path = "../fixture-tests" }
 graphql-cli = { path = "../graphql-cli" }
 relay-test-schema = { path = "../relay-test-schema" }
-tokio = { version = "1.52.3", features = ["full", "test-util", "tracing"] }
+tokio = { version = "1.52.4", features = ["full", "test-util", "tracing"] }

compiler/crates/graphql-ir/Cargo.toml

@@ -22,4 +22,4 @@ thiserror = "2.0.18"
 [dev-dependencies]
 fixture-tests = { path = "../fixture-tests" }
 graphql-cli = { path = "../graphql-cli" }
-tokio = { version = "1.52.3", features = ["full", "test-util", "tracing"] }
+tokio = { version = "1.52.4", features = ["full", "test-util", "tracing"] }

compiler/crates/graphql-syntax/Cargo.toml

@@ -33,4 +33,4 @@ schema = { path = "../schema" }
 fixture-tests = { path = "../fixture-tests" }
 relay-test-schema = { path = "../relay-test-schema" }
 relay-transforms = { path = "../relay-transforms" }
-tokio = { version = "1.52.3", features = ["full", "test-util", "tracing"] }
+tokio = { version = "1.52.4", features = ["full", "test-util", "tracing"] }