diff --git a/juniper/CHANGELOG.md b/juniper/CHANGELOG.md index 4314bcda1..c2a8f7726 100644 --- a/juniper/CHANGELOG.md +++ b/juniper/CHANGELOG.md @@ -56,7 +56,7 @@ All user visible changes to `juniper` crate will be documented in this file. Thi - [September 2025] GraphQL spec: ([#1347]) - Canonical introspection query to [16.11.0 version of GraphQL.js](https://github.com/graphql/graphql-js/blob/v16.11.0/src/utilities/getIntrospectionQuery.ts#L75). ([#1348]) -- Upgraded [GraphiQL] to [5.2.2 version](https://github.com/graphql/graphiql/blob/graphiql%405.2.2/packages/graphiql/CHANGELOG.md#522). ([#1361], [#1358]) +- Upgraded [GraphiQL] to [5.2.3 version](https://github.com/graphql/graphiql/blob/graphiql%405.2.3/packages/graphiql/CHANGELOG.md#523). ([#1361], [#1377]) ### Fixed @@ -76,10 +76,10 @@ All user visible changes to `juniper` crate will be documented in this file. Thi [#1353]: /../../pull/1353 [#1354]: /../../pull/1354 [#1355]: /../../pull/1355 -[#1358]: /../../pull/1358 [#1361]: /../../pull/1361 [#1371]: /../../pull/1371 [#1376]: /../../pull/1376 +[#1377]: /../../pull/1377 [graphql/graphql-spec#525]: https://github.com/graphql/graphql-spec/pull/525 [graphql/graphql-spec#687]: https://github.com/graphql/graphql-spec/issues/687 [graphql/graphql-spec#805]: https://github.com/graphql/graphql-spec/pull/805 diff --git a/juniper/Makefile b/juniper/Makefile index 9d877a000..be0f6b9f6 100644 --- a/juniper/Makefile +++ b/juniper/Makefile @@ -46,13 +46,13 @@ graphiql: | grep -m1 '"@graphiql/toolkit": "' | cut -d '"' -f4 | cut -d '^' -f2))) curl -fsL -o src/http/graphiql.html \ https://raw.githubusercontent.com/graphql/graphiql/graphiql%40$(GRAPHIQL_VER)/examples/graphiql-cdn/index.html - $(sed-i) 's|esm.sh/graphiql|esm.sh/graphiql@$(GRAPHIQL_VER)|g' \ + $(sed-i) -E 's|esm.sh/graphiql@[^/?]+|esm.sh/graphiql@$(GRAPHIQL_VER)|g' \ src/http/graphiql.html - $(sed-i) 's|esm.sh/@graphiql/plugin-explorer|esm.sh/@graphiql/plugin-explorer@$(graphiql-plugin-explorer-ver)|g' \ + $(sed-i) -E 's|esm.sh/@graphiql/plugin-explorer@[^/?]+|esm.sh/@graphiql/plugin-explorer@$(graphiql-plugin-explorer-ver)|g' \ src/http/graphiql.html - $(sed-i) 's|esm.sh/@graphiql/react|esm.sh/@graphiql/react@$(graphiql-react-ver)|g' \ + $(sed-i) -E 's|esm.sh/@graphiql/react@[^/?]+|esm.sh/@graphiql/react@$(graphiql-react-ver)|g' \ src/http/graphiql.html - $(sed-i) 's|esm.sh/@graphiql/toolkit|esm.sh/@graphiql/toolkit@$(graphiql-toolkit-ver)|g' \ + $(sed-i) -E 's|esm.sh/@graphiql/toolkit@[^/?]+|esm.sh/@graphiql/toolkit@$(graphiql-toolkit-ver)|g' \ src/http/graphiql.html $(sed-i) "s|'https://countries.trevorblades.com'|JUNIPER_URL|g" \ src/http/graphiql.html @@ -62,6 +62,12 @@ graphiql: src/http/graphiql.html $(sed-i) 's|GraphiQL 5 with React 19 and GraphiQL Explorer|GraphiQL|' \ src/http/graphiql.html + $(sed-i) -E '/integrity="[^"]+"/d' \ + src/http/graphiql.html + $(sed-i) '/"integrity": {/,/}/d' \ + src/http/graphiql.html + $(sed-i) -E 's| },| }|' \ + src/http/graphiql.html # Download and prepare actual version of GraphQL Playground static files, used diff --git a/juniper/package.json b/juniper/package.json index a37b26a66..36b168c81 100644 --- a/juniper/package.json +++ b/juniper/package.json @@ -4,7 +4,7 @@ "postinstall": "make graphiql graphql-playground" }, "dependencies": { - "graphiql": "5.2.2", + "graphiql": "5.2.3", "graphql-playground-react": "1.7.28" } } diff --git a/juniper/src/http/graphiql.html b/juniper/src/http/graphiql.html index c73ac72c1..68b3189a3 100644 --- a/juniper/src/http/graphiql.html +++ b/juniper/src/http/graphiql.html @@ -28,10 +28,15 @@ font-size: 4rem; } - +