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

fix(gatsby-plugin-image): Fix handling of sizes prop in SSR #28835

Merged
merged 9 commits into from
Jan 5, 2021
Merged

fix(gatsby-plugin-image): Fix handling of sizes prop in SSR #28835

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cb08a43
fix(gatsby-plugin-image): Fix handling of sizes prop in SSR
ascorbic Jan 4, 2021
07fc2d6
Merge remote-tracking branch 'upstream/master' into fix/image-ssr-siz…
Jan 4, 2021
5f1a182
Update tests
ascorbic Jan 4, 2021
a887d3d
Merge branch 'fix/image-ssr-sizes-prop' of github.com:gatsbyjs/gatsby…
ascorbic Jan 4, 2021
983e2d6
Update tests
ascorbic Jan 4, 2021
8f4482f
Fix types
ascorbic Jan 4, 2021
6e10b1d
Update e2e tests
ascorbic Jan 5, 2021
429fb4b
Update e2e-tests/gatsby-static-image/src/pages/constrained.js
ascorbic Jan 5, 2021
e882f78
Add test for size override
ascorbic Jan 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions packages/gatsby-plugin-image/src/components/gatsby-image.server.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ export const GatsbyImage: FunctionComponent<GatsbyImageProps> = function GatsbyI
layout,
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
layout,
layout,
fallback,

images,
placeholder,
sizes,
backgroundColor: placeholderBackgroundColor,
} = image

Expand All @@ -65,7 +64,7 @@ export const GatsbyImage: FunctionComponent<GatsbyImageProps> = function GatsbyI
}
if (images.fallback) {
cleanedImages.fallback = {
src: images.fallback.src,
...images.fallback,
Comment on lines 65 to +67
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
if (images.fallback) {
cleanedImages.fallback = {
src: images.fallback.src,
...images.fallback,
if (fallback) {
cleanedImages.fallback = {
...fallback,

srcSet: images.fallback.srcSet
? removeNewLines(images.fallback.srcSet)
: undefined,
Expand Down Expand Up @@ -106,7 +105,6 @@ export const GatsbyImage: FunctionComponent<GatsbyImageProps> = function GatsbyI

<MainImage
data-gatsby-image-ssr=""
sizes={sizes}
className={imgClassName}
style={imgStyle}
{...(props as Omit<MainImageProps, "images" | "fallback">)}
Expand Down