Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump Graphiql to fix layout #1131

Merged
merged 5 commits into from
Aug 3, 2024
Merged

Bump Graphiql to fix layout #1131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
62fad1c
bump graphiql to fix layout
May 4, 2024
c88c755
next upd
May 6, 2024
2524736
remove due to useless
May 22, 2024
aafc27c
Merge branch 'develop' into master
Shane32 Aug 3, 2024
dfbebbe
Update migration8.md
Shane32 Aug 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions docs/migration/migration8.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ None
GraphQL.NET library. Please see the GraphQL.NET v8 migration document for more information.
- The obsolete (v6 and prior) authorization validation rule has been removed. See the v7 migration
document for more information on how to migrate to the v7/v8 authorization validation rule.

## Other changes

- GraphiQL has been bumped from 1.5.1 to 3.2.0
2 changes: 1 addition & 1 deletion src/Ui.GraphiQL/Internal/GraphiQLPageModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public string Render()
.Replace("@Model.SubscriptionsEndPoint", StringEncode(_options.SubscriptionsEndPoint))
.Replace("@Model.Headers", JsonSerialize(headers))
.Replace("@Model.HeaderEditorEnabled", _options.HeaderEditorEnabled ? "true" : "false")
.Replace("@Model.GraphiQLElement", _options.ExplorerExtensionEnabled ? "GraphiQLWithExtensions.GraphiQLWithExtensions" : "GraphiQL")
.Replace("@Model.GraphiQLElement", "GraphiQL")
.Replace("@Model.RequestCredentials", requestCredentials);

// Here, fully-qualified, absolute and relative URLs are supported for both the
Expand Down
11 changes: 6 additions & 5 deletions src/Ui.GraphiQL/Internal/graphiql.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
* Copyright (c) 2021 GraphQL Contributors
* Copyright (c) 2024 GraphQL Contributors
* All rights reserved.
*
* This source code is licensed under the license found in the
Expand Down Expand Up @@ -52,8 +52,8 @@
-->
<link
rel="stylesheet"
href="https://unpkg.com/graphiql@1.5.1/graphiql.min.css"
integrity="sha384-1YHEU+Xy8hlKYAZ26WTz+JQEPMM6i/Mx5m8umMkSZChlzSYmq7RqyCyRbGqrILVZ"
href="https://unpkg.com/graphiql@3.2.0/graphiql.min.css"
integrity="sha384-yz3/sqpuplkA7msMo0FE4ekg0xdwdvZ8JX9MVZREsxipqjU4h8IRfmAMRcb1QpUy"
crossorigin="anonymous"
/>
<script
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On the next line there is a reference to graphiqlWithExtensions. Is this old version compatible with the new version of GraphiQL ? All other features still work?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, ive checked and it works as expected

Expand Down Expand Up @@ -82,8 +82,9 @@
<body>
<div id="graphiql">Loading...</div>
<script
src="https://unpkg.com/[email protected]/graphiql.min.js"
integrity="sha384-ktvW/i3KUd0D3ub91RkvHlJmf5wWqq7/VSBpCtpRrItml9btmAZH0x8c7fEXcr3e"
src="https://unpkg.com/[email protected]/graphiql.min.js"
type="application/javascript"
integrity="sha384-h7T8iQ4OYtRS2RIWfZ7ahqfNRtVrjc6Uz/gUJjydAV/uWn/HgC5GMnSKmsvNGeUH"
crossorigin="anonymous"
></script>
<script>
Expand Down