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

fix(gatsby-source-contentful): Bypass schema validation for null nodes for fixed/fluid media assets #20794

Merged
merged 1 commit into from
Jan 22, 2020

Conversation

ryanhefner
Copy link
Contributor

Description

Fix Contentful schema validation for null nodes for fixed or fluid media assets.

Documentation

N/A

Related Issues

#20696

@ryanhefner ryanhefner requested a review from a team as a code owner January 22, 2020 20:58
@ryanhefner ryanhefner changed the title Fix Contentful schema validation for null nodes for fixed/fluid media assets fix(gatsby-source-contentful): Contentful schema validation for null nodes for fixed/fluid media assets Jan 22, 2020
@ryanhefner ryanhefner changed the title fix(gatsby-source-contentful): Contentful schema validation for null nodes for fixed/fluid media assets fix(gatsby-source-contentful): Bypass schema validation for null nodes for fixed/fluid media assets Jan 22, 2020
Copy link
Contributor

@pvdz pvdz left a comment

Choose a reason for hiding this comment

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

Thank you for this fix! The null case was indeed not caught.

I hope that's not going to lead to a problem down the road but in here it is definitely necessary.

@pvdz pvdz merged commit 6a3ae01 into gatsbyjs:master Jan 22, 2020
@gatsbot
Copy link

gatsbot bot commented Jan 22, 2020

Holy buckets, @ryanhefner — we just merged your PR to Gatsby! 💪💜

Gatsby is built by awesome people like you. Let us say “thanks” in two ways:

  1. We’d like to send you some Gatsby swag. As a token of our appreciation, you can go to the Gatsby Swag Store and log in with your GitHub account to get a coupon code good for one free piece of swag. We’ve got Gatsby t-shirts, stickers, hats, scrunchies, and much more. (You can also unlock even more free swag with 5 contributions — wink wink nudge nudge.) See gatsby.dev/swag for details.
  2. We just invited you to join the Gatsby organization on GitHub. This will add you to our team of maintainers. Accept the invite by visiting https://github.com/orgs/gatsbyjs/invitation. By joining the team, you’ll be able to label issues, review pull requests, and merge approved pull requests.

If there’s anything we can do to help, please don’t hesitate to reach out to us: tweet at @gatsbyjs and we’ll come a-runnin’.

Thanks again!

@@ -397,6 +397,8 @@ const fixedNodeType = ({ name, getTracedSVG }) => {
},
resolve: (image, options, context) =>
Promise.resolve(resolveFixed(image, options)).then(node => {
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm looking at this and I'm convinced it could just be

resolve: (image, options, context) =>
  Promise.resolve(resolveFixed(image, options)).then(node => {

into

resolve: async (image, options, context) =>
  const node = resolveFixed(image, options)

And it would be the same thing. The resolveFixed func is never returning a promise so there's no need (anymore?) for the Promise.resolve. The async keyword will ensure a promise is returned to preserve that api.

Not sure if it makes any difference but would be clearer. Oh well, this was unrelated to this PR, I was just confused looking at it :)

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.

2 participants