Merge remote-tracking branch 'origin/master' into improve-ws

# Conflicts: # juniper/CHANGELOG.md
graphql-rust · Sep 21, 2023 · 0326e05 · 0326e05
2 parents dd43115 + a74ea9c
commit 0326e05
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -183,6 +183,9 @@ jobs:
       - run: cargo +nightly update -Z minimal-versions
 
       - run: make test.cargo crate=${{ matrix.crate }}
+        if: ${{ !contains(fromJSON('["juniper_actix"]'), matrix.crate) }}
+      - run: cargo check -p ${{ matrix.crate }} --all-features
+        if: ${{ contains(fromJSON('["juniper_actix"]'), matrix.crate) }}
 
   package:
     if: ${{ startsWith(github.ref, 'refs/tags/juniper') }}

diff --git a/juniper/CHANGELOG.md b/juniper/CHANGELOG.md
@@ -51,7 +51,7 @@ All user visible changes to `juniper` crate will be documented in this file. Thi
     - Disabled `chrono` [Cargo feature] by default.
     - Removed `scalar-naivetime` [Cargo feature].
 - Removed lifetime parameter from `ParseError`, `GraphlQLError`, `GraphQLBatchRequest` and `GraphQLRequest`. ([#1081], [#528])
-- Upgraded [GraphiQL] to 3.0.5 version (requires new [`graphql-transport-ws` GraphQL over WebSocket Protocol] integration on server, see `juniper_warp/examples/subscription.rs`). ([#1188])
+- Upgraded [GraphiQL] to 3.0.6 version (requires new [`graphql-transport-ws` GraphQL over WebSocket Protocol] integration on server, see `juniper_warp/examples/subscription.rs`). ([#1188], [#1193])
 
 ### Added
 
@@ -125,6 +125,7 @@ All user visible changes to `juniper` crate will be documented in this file. Thi
 [#1176]: /../../pull/1176
 [#1188]: /../../pull/1188
 [#1190]: /../../pull/1190
+[#1193]: /../../pull/1193
 [ba1ed85b]: /../../commit/ba1ed85b3c3dd77fbae7baf6bc4e693321a94083
 [CVE-2022-31173]: /../../security/advisories/GHSA-4rx6-g5vg-5f3j
 

diff --git a/juniper/package.json b/juniper/package.json
@@ -4,7 +4,7 @@
     "postinstall": "make graphiql graphql-playground"
   },
   "dependencies": {
-    "graphiql": "3.0.5",
+    "graphiql": "3.0.6",
     "graphql-playground-react": "1.7.28"
   }
 }
diff --git a/juniper/src/http/graphiql.html b/juniper/src/http/graphiql.html
@@ -21,7 +21,6 @@
         height: 100vh;
       }
     </style>
-
     <!--
       This GraphiQL example depends on Promise and fetch, which are available in
       modern browsers, but can be "polyfilled" for older browsers.
@@ -37,20 +36,28 @@
       crossorigin
       src="https://unpkg.com/react-dom@18/umd/react-dom.development.js"
     ></script>
+    <!--
+      These two files can be found in the npm module, however you may wish to
+      copy them directly into your environment, or perhaps include them in your
+      favored resource bundler.
+     -->
     <script
-      src="https://unpkg.com/graphiql@3.0.5/graphiql.min.js"
+      src="https://unpkg.com/graphiql@3.0.6/graphiql.min.js"
       type="application/javascript"
     ></script>
+    <link rel="stylesheet" href="https://unpkg.com/graphiql@3.0.6/graphiql.min.css" />
+    <!-- 
+      These are imports for the GraphIQL Explorer plugin.
+     -->
     <script
       src="https://unpkg.com/@graphiql/plugin-explorer/dist/index.umd.js"
       crossorigin
     ></script>
-    <!--
-      These two files can be found in the npm module, however you may wish to
-      copy them directly into your environment, or perhaps include them in your
-      favored resource bundler.
-     -->
-    <link rel="stylesheet" href="https://unpkg.com/graphiql@3.0.5/graphiql.min.css" />
+
+    <link
+      rel="stylesheet"
+      href="https://unpkg.com/@graphiql/plugin-explorer/dist/style.css"
+    />
   </head>
 
   <body>

diff --git a/juniper_actix/Cargo.toml b/juniper_actix/Cargo.toml
@@ -45,7 +45,7 @@ tokio = { version = "1.0", features = ["sync"], optional = true }
 
 [dev-dependencies]
 actix-cors = "0.6"
-actix-identity = "0.5"
+actix-identity = "0.6"
 actix-rt = "2.0"
 actix-test = "0.1"
 async-stream = "0.3"