From a4974e179bb0f3350a23a0ceff76395a4fc034b4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Jul 2024 13:49:28 +0200
Subject: [PATCH] Update GraphiQL from 3.3.1 to 3.3.2 version (#1265)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Kai Ren <tyranron@gmail.com>
---
juniper/CHANGELOG.md | 4 +--
juniper/package.json | 2 +-
juniper/src/http/graphiql.html | 4 +--
.../fail/union/struct_same_type_ugly.stderr | 34 +++++++++----------
4 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/juniper/CHANGELOG.md b/juniper/CHANGELOG.md
index 1f10af61..21e0c3bd 100644
--- a/juniper/CHANGELOG.md
+++ b/juniper/CHANGELOG.md
@@ -17,10 +17,10 @@ All user visible changes to `juniper` crate will be documented in this file. Thi
### Changed
-- Updated [GraphiQL] to [3.3.1 version](https://github.com/graphql/graphiql/blob/graphiql%403.3.1/packages/graphiql/CHANGELOG.md#331). ([#1264])
+- Updated [GraphiQL] to [3.3.2 version](https://github.com/graphql/graphiql/blob/graphiql%403.3.2/packages/graphiql/CHANGELOG.md#332). ([#1265])
[#1252]: /../../pull/1252
-[#1264]: /../../pull/1264
+[#1265]: /../../pull/1265
diff --git a/juniper/package.json b/juniper/package.json
index aeb6fdb4..6196fb40 100644
--- a/juniper/package.json
+++ b/juniper/package.json
@@ -4,7 +4,7 @@
"postinstall": "make graphiql graphql-playground"
},
"dependencies": {
- "graphiql": "3.3.1",
+ "graphiql": "3.3.2",
"graphql-playground-react": "1.7.28"
}
}
diff --git a/juniper/src/http/graphiql.html b/juniper/src/http/graphiql.html
index 5cc2fd2d..20bce4d2 100644
--- a/juniper/src/http/graphiql.html
+++ b/juniper/src/http/graphiql.html
@@ -42,10 +42,10 @@
favored resource bundler.
-->
<script
- src="https://unpkg.com/graphiql@3.3.1/graphiql.min.js"
+ src="https://unpkg.com/graphiql@3.3.2/graphiql.min.js"
type="application/javascript"
></script>
- <link rel="stylesheet" href="https://unpkg.com/graphiql@3.3.1/graphiql.min.css" />
+ <link rel="stylesheet" href="https://unpkg.com/graphiql@3.3.2/graphiql.min.css" />
<!--
These are imports for the GraphIQL Explorer plugin.
-->
diff --git a/tests/codegen/fail/union/struct_same_type_ugly.stderr b/tests/codegen/fail/union/struct_same_type_ugly.stderr
index 8e0ca39a..bc6c8e81 100644
--- a/tests/codegen/fail/union/struct_same_type_ugly.stderr
+++ b/tests/codegen/fail/union/struct_same_type_ugly.stderr
@@ -9,23 +9,6 @@ error[E0119]: conflicting implementations of trait `MutuallyExclusive` for type
|
= note: this error originates in the macro `::juniper::sa::assert_type_ne_all` which comes from the expansion of the derive macro `GraphQLUnion` (in Nightly builds, run with -Z macro-backtrace for more info)
-error[E0277]: the trait bound `std::string::String: GraphQLObject<__S>` is not satisfied
- --> fail/union/struct_same_type_ugly.rs:4:14
- |
-4 | #[graphql(on String = Character::a)]
- | ^^^^^^ the trait `GraphQLObject<__S>` is not implemented for `std::string::String`
- |
- = help: the following other types implement trait `GraphQLObject<S>`:
- <&T as GraphQLObject<S>>
- <Arc<T> as GraphQLObject<S>>
- <Argument<'a, S> as GraphQLObject<S>>
- <Box<T> as GraphQLObject<S>>
- <EnumValue as GraphQLObject<__S>>
- <SchemaType<'a, S> as GraphQLObject<S>>
- <juniper::meta::Field<'a, S> as GraphQLObject<S>>
- <juniper::schema::model::DirectiveType<'a, S> as GraphQLObject<S>>
- <juniper::schema::model::TypeType<'a, S> as GraphQLObject<S>>
-
error[E0277]: the trait bound `std::string::String: GraphQLObject<__S>` is not satisfied
--> fail/union/struct_same_type_ugly.rs:5:14
|
@@ -42,3 +25,20 @@ error[E0277]: the trait bound `std::string::String: GraphQLObject<__S>` is not s
<juniper::meta::Field<'a, S> as GraphQLObject<S>>
<juniper::schema::model::DirectiveType<'a, S> as GraphQLObject<S>>
<juniper::schema::model::TypeType<'a, S> as GraphQLObject<S>>
+
+error[E0277]: the trait bound `std::string::String: GraphQLObject<__S>` is not satisfied
+ --> fail/union/struct_same_type_ugly.rs:4:14
+ |
+4 | #[graphql(on String = Character::a)]
+ | ^^^^^^ the trait `GraphQLObject<__S>` is not implemented for `std::string::String`
+ |
+ = help: the following other types implement trait `GraphQLObject<S>`:
+ <&T as GraphQLObject<S>>
+ <Arc<T> as GraphQLObject<S>>
+ <Argument<'a, S> as GraphQLObject<S>>
+ <Box<T> as GraphQLObject<S>>
+ <EnumValue as GraphQLObject<__S>>
+ <SchemaType<'a, S> as GraphQLObject<S>>
+ <juniper::meta::Field<'a, S> as GraphQLObject<S>>
+ <juniper::schema::model::DirectiveType<'a, S> as GraphQLObject<S>>
+ <juniper::schema::model::TypeType<'a, S> as GraphQLObject<S>>