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.

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

Preserve directives on fragments when merging AST #3290

Open
wants to merge 5 commits into
base: main
Choose a base branch
from

Conversation

esquevin
Copy link
Contributor

When a FragmentSpread has a directive, they used to be discarded.

Added a test and a fix. All tests passes

@changeset-bot
Copy link

changeset-bot bot commented Jun 26, 2023

🦋 Changeset detected

Latest commit: eeffefb

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 5 packages
Name Type
@graphiql/toolkit Minor
@graphiql/react Patch
graphiql Patch
@graphiql/plugin-code-exporter Patch
@graphiql/plugin-explorer Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Jun 26, 2023

CLA Signed

The committers listed above are authorized under a signed CLA.

@esquevin esquevin force-pushed the support-directives branch from 242b36d to a72087b Compare June 26, 2023 12:50
@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Jun 26, 2023

CLA Missing ID CLA Not Signed

@acao
Copy link
Member

acao commented Jun 26, 2023

awesome @esquevin, thank you ! one thing to note about signing the CLA, the email in your commits and the email you sign the CLA with have to be the same

@esquevin
Copy link
Contributor Author

one thing to note about signing the CLA, the email in your commits and the email you sign the CLA with have to be the same

I've signed the CLA, using the proper email

On another note there seems to have been an issue in the Test PR step if the CI. I'm not familiar with this repo tooling and don't want to make a mess. What should be done now?

@codecov
Copy link

codecov bot commented Jun 28, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (dfe083a) 55.34% compared to head (eeffefb) 55.36%.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #3290      +/-   ##
==========================================
+ Coverage   55.34%   55.36%   +0.01%     
==========================================
  Files         115      115              
  Lines        5348     5348              
  Branches     1450     1450              
==========================================
+ Hits         2960     2961       +1     
  Misses       1962     1962              
+ Partials      426      425       -1     
Files Coverage Δ
.../graphiql-toolkit/src/graphql-helpers/merge-ast.ts 88.13% <100.00%> (+1.69%) ⬆️

@acao acao force-pushed the support-directives branch from 705b1aa to 7248821 Compare July 14, 2023 18:48
@acao
Copy link
Member

acao commented Jul 14, 2023

@esquevin this one is almost ready! you just need to run yarn pretty locally and it should be good to go. can you add a changeset to mark the improvement?

@esquevin esquevin force-pushed the support-directives branch from 589f819 to 948c569 Compare July 18, 2023 12:32
@linux-foundation-easycla
Copy link

CLA Missing ID CLA Not Signed

@esquevin esquevin force-pushed the support-directives branch from b8886a9 to fe0201b Compare July 19, 2023 08:09
@acao acao force-pushed the support-directives branch from fe0201b to ea92079 Compare July 22, 2023 23:38
@esquevin
Copy link
Contributor Author

@acao Seems everything is green, can I do anything to help this get merged?

@acao
Copy link
Member

acao commented Jul 30, 2023

@esquevin just needs a rebase because of conflicts from the PR of yours we just merged!

@esquevin esquevin force-pushed the support-directives branch from ea92079 to 55a30e8 Compare August 21, 2023 12:36
@esquevin esquevin force-pushed the support-directives branch from 55a30e8 to f571341 Compare August 21, 2023 12:43
@esquevin
Copy link
Contributor Author

Everything should be good now =)

@esquevin
Copy link
Contributor Author

@acao I believe this can be merged, let me know if it ain't the case and what I can do.

I thought it had been merged a while ago 😅 just realised now that it never made it across the finish ine

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants