Move graphiql export location (#615)

LegNeato · web-flow · commit 5f454e05c7c6 · 2020-04-10T00:06:39.000-10:00
This fixes a TODO.
diff --git a/juniper/CHANGELOG.md b/juniper/CHANGELOG.md
@@ -22,6 +22,8 @@ See [#569](https://github.com/graphql-rust/juniper/pull/569).
 
 ## Breaking Changes
 
+- `juniper::graphiql` has moved to `juniper::http::graphiql`
+
 - remove old `graphql_object!` macro, rename `object` proc macro to `graphql_object`
 
 - Remove deprecated `ScalarValue` custom derive (renamed to GraphQLScalarValue)
diff --git a/juniper/src/lib.rs b/juniper/src/lib.rs
@@ -142,8 +142,6 @@ mod validation;
 // https://github.com/rust-lang/cargo/issues/1520
 pub mod http;
 pub mod integrations;
-// TODO: remove this alias export in 0.10. (breaking change)
-pub use crate::http::graphiql;
 
 #[cfg(all(test, not(feature = "expose-test-schema")))]
 mod tests;
diff --git a/juniper_hyper/src/lib.rs b/juniper_hyper/src/lib.rs
@@ -117,7 +117,7 @@ async fn parse_post_req<S: ScalarValue>(
 pub async fn graphiql(graphql_endpoint: &str) -> Result<Response<Body>, hyper::Error> {
     let mut resp = new_html_response(StatusCode::OK);
     // XXX: is the call to graphiql_source blocking?
-    *resp.body_mut() = Body::from(juniper::graphiql::graphiql_source(graphql_endpoint));
+    *resp.body_mut() = Body::from(juniper::http::graphiql::graphiql_source(graphql_endpoint));
     Ok(resp)
 }
 
diff --git a/juniper_iron/src/lib.rs b/juniper_iron/src/lib.rs
@@ -326,7 +326,7 @@ impl Handler for GraphiQLHandler {
         Ok(Response::with((
             content_type,
             status::Ok,
-            juniper::graphiql::graphiql_source(&self.graphql_url),
+            juniper::http::graphiql::graphiql_source(&self.graphql_url),
         )))
     }
 }
diff --git a/juniper_rocket/src/lib.rs b/juniper_rocket/src/lib.rs
@@ -72,7 +72,9 @@ pub struct GraphQLResponse(pub Status, pub String);
 
 /// Generate an HTML page containing GraphiQL
 pub fn graphiql_source(graphql_endpoint_url: &str) -> content::Html<String> {
-    content::Html(juniper::graphiql::graphiql_source(graphql_endpoint_url))
+    content::Html(juniper::http::graphiql::graphiql_source(
+        graphql_endpoint_url,
+    ))
 }
 
 /// Generate an HTML page containing GraphQL Playground
diff --git a/juniper_rocket_async/src/lib.rs b/juniper_rocket_async/src/lib.rs
@@ -72,7 +72,9 @@ pub struct GraphQLResponse(pub Status, pub String);
 
 /// Generate an HTML page containing GraphiQL
 pub fn graphiql_source(graphql_endpoint_url: &str) -> content::Html<String> {
-    content::Html(juniper::graphiql::graphiql_source(graphql_endpoint_url))
+    content::Html(juniper::http::graphiql::graphiql_source(
+        graphql_endpoint_url,
+    ))
 }
 
 /// Generate an HTML page containing GraphQL Playground
diff --git a/juniper_warp/src/lib.rs b/juniper_warp/src/lib.rs
@@ -312,7 +312,7 @@ pub fn graphiql_filter(
 fn graphiql_response(graphql_endpoint_url: &'static str) -> warp::http::Response<Vec<u8>> {
     warp::http::Response::builder()
         .header("content-type", "text/html;charset=utf-8")
-        .body(juniper::graphiql::graphiql_source(graphql_endpoint_url).into_bytes())
+        .body(juniper::http::graphiql::graphiql_source(graphql_endpoint_url).into_bytes())
         .expect("response is valid")
 }
 

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ async fn parse_post_req<S: ScalarValue>(`
`117`	`117`	`pub async fn graphiql(graphql_endpoint: &str) -> Result<Response<Body>, hyper::Error> {`
`118`	`118`	`let mut resp = new_html_response(StatusCode::OK);`
`119`	`119`	`// XXX: is the call to graphiql_source blocking?`
`120`		`- *resp.body_mut() = Body::from(juniper::graphiql::graphiql_source(graphql_endpoint));`
	`120`	`+ *resp.body_mut() = Body::from(juniper::http::graphiql::graphiql_source(graphql_endpoint));`
`121`	`121`	`Ok(resp)`
`122`	`122`	`}`
`123`	`123`
Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,7 @@ impl Handler for GraphiQLHandler {`
`326`	`326`	`Ok(Response::with((`
`327`	`327`	`content_type,`
`328`	`328`	`status::Ok,`
`329`		`- juniper::graphiql::graphiql_source(&self.graphql_url),`
	`329`	`+ juniper::http::graphiql::graphiql_source(&self.graphql_url),`
`330`	`330`	`)))`
`331`	`331`	`}`
`332`	`332`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,9 @@ pub struct GraphQLResponse(pub Status, pub String);`
`72`	`72`
`73`	`73`	`/// Generate an HTML page containing GraphiQL`
`74`	`74`	`pub fn graphiql_source(graphql_endpoint_url: &str) -> content::Html<String> {`
`75`		`- content::Html(juniper::graphiql::graphiql_source(graphql_endpoint_url))`
	`75`	`+ content::Html(juniper::http::graphiql::graphiql_source(`
	`76`	`+ graphql_endpoint_url,`
	`77`	`+ ))`
`76`	`78`	`}`
`77`	`79`
`78`	`80`	`/// Generate an HTML page containing GraphQL Playground`
Original file line number	Diff line number	Diff line change
`@@ -312,7 +312,7 @@ pub fn graphiql_filter(`
`312`	`312`	`fn graphiql_response(graphql_endpoint_url: &'static str) -> warp::http::Response<Vec<u8>> {`
`313`	`313`	`warp::http::Response::builder()`
`314`	`314`	`.header("content-type", "text/html;charset=utf-8")`
`315`		`- .body(juniper::graphiql::graphiql_source(graphql_endpoint_url).into_bytes())`
	`315`	`+ .body(juniper::http::graphiql::graphiql_source(graphql_endpoint_url).into_bytes())`
`316`	`316`	`.expect("response is valid")`
`317`	`317`	`}`
`318`	`318`