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

Expose and prefix JSON type to avoid conflict with other libraries #403

Merged
merged 1 commit into from
Jan 30, 2017

Conversation

AlexGaspar
Copy link
Contributor

Implement #343 ideas

@AlexGaspar AlexGaspar force-pushed the Fix-confict-JSON-type branch from ad15d4e to 1b66552 Compare January 19, 2017 15:03
@codecov-io
Copy link

codecov-io commented Jan 19, 2017

Current coverage is 92.66% (diff: 100%)

Merging #403 into master will not change coverage

@@             master       #403   diff @@
==========================================
  Files            11         11          
  Lines           368        368          
  Methods           0          0          
  Messages          0          0          
  Branches          0          0          
==========================================
  Hits            341        341          
  Misses           27         27          
  Partials          0          0          

Powered by Codecov. Last update cc93df7...1b66552

@@ -5,5 +5,6 @@ module.exports = {
typeMapper: require('./typeMapper'),
attributeFields: require('./attributeFields'),
simplifyAST: require('./simplifyAST'),
relay: require('./relay')
relay: require('./relay'),
GraphQLJSON: require('./types/jsonType')
Copy link
Owner

Choose a reason for hiding this comment

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

just JSONType maybe? :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure! I've updated the pr :)

@AlexGaspar AlexGaspar force-pushed the Fix-confict-JSON-type branch from 1b66552 to 68db423 Compare January 19, 2017 16:33
@AlexGaspar
Copy link
Contributor Author

Is there something preventing this from being merged?

@mickhansen
Copy link
Owner

@AlexGaspar Nope, not at all, i forgot to merge & release, will do it tomorrow.

@mickhansen mickhansen closed this Jan 29, 2017
@mickhansen mickhansen reopened this Jan 29, 2017
@mickhansen mickhansen merged commit dbf90e3 into mickhansen:master Jan 30, 2017
@mickhansen
Copy link
Owner

v5.0.0

@blueorbitz blueorbitz mentioned this pull request Mar 15, 2017
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