build_client_schema: Revert breaking change

Replicates graphql/graphql-js@3c79bed

Author: Cito

graphql/utilities/build_client_schema.py

@@ -312,8 +312,7 @@ def build_directive(directive_introspection: Dict) -> GraphQLDirective:
     for std_type_name, std_type in chain(
         specified_scalar_types.items(), introspection_types.items()
     ):
-        if std_type_name in type_map:
-            type_map[std_type_name] = std_type
+        type_map[std_type_name] = std_type
 
     # Get the root Query, Mutation, and Subscription types.
 

tests/utilities/test_build_client_schema.py

@@ -38,10 +38,25 @@ def cycle_introspection(sdl_string):
     # If the client then runs the introspection query against the client-side schema,
     # it should get a result identical to what was returned by the server
     second_introspection = introspection_from_schema(client_schema)
+
+    hack_to_remove_standard_types(second_introspection)
+    hack_to_remove_standard_types(initial_introspection)
+
+    # If the client then runs the introspection query against the client-side
+    # schema, it should get a result identical to what was returned by the server.
     assert initial_introspection == second_introspection
     return print_schema(client_schema)
 
 
+# Temporary hack to remove always presented standard types - should be removed in 15.0
+def hack_to_remove_standard_types(introspection):
+    introspection["__schema"]["types"] = [
+        type_
+        for type_ in introspection["__schema"]["types"]
+        if type_["name"] not in ("ID", "Float", "Int", "Boolean", "String")
+    ]
+
+
 def describe_type_system_build_schema_from_introspection():
     def builds_a_simple_schema():
         sdl = dedent(
@@ -311,6 +326,9 @@ def builds_a_schema_with_an_enum():
         introspection = introspection_from_schema(schema)
         client_schema = build_client_schema(introspection)
         second_introspection = introspection_from_schema(client_schema)
+
+        hack_to_remove_standard_types(second_introspection)
+        hack_to_remove_standard_types(introspection)
         assert second_introspection == introspection
 
         client_food_enum = client_schema.get_type("Food")