Skip to content

fix(gatsby-source-drupal): Image cdn fixes #35619

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

Merged
TylerBarnes merged 6 commits into from
May 13, 2022
Merged

fix(gatsby-source-drupal): Image cdn fixes #35619

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a1bddd6
warning spacing
TylerBarnes May 9, 2022
9d56927
warn about corrupt files and skip over to the next one
TylerBarnes May 9, 2022
cb70614
Update gatsby-node.js
TylerBarnes May 9, 2022
3ebb6ee
Only register gatsby image support when skipFileDownloads option is e…
TylerBarnes May 9, 2022
66d5d16
Merge branch 'master' into fix/drupal-image-cdn-fixes
TylerBarnes May 12, 2022
7f6b738
add [gatsby-source-drupal] to errors
TylerBarnes May 12, 2022
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
46 changes: 29 additions & 17 deletions packages/gatsby-source-drupal/src/gatsby-node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ const {
getExtendedFileNodeData,
} = require(`./utils`)

const imageCdnDocs = `https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-source-drupal#readme`

const agent = {
http: new HttpAgent(),
https: new HttpsAgent(),
Expand Down Expand Up @@ -680,12 +682,13 @@ ${JSON.stringify(webhookBody, null, 4)}`
}

if (
skipFileDownloads &&
!imageCDNState.foundPlaceholderStyle &&
!imageCDNState.hasLoggedNoPlaceholderStyle
) {
imageCDNState.hasLoggedNoPlaceholderStyle = true
reporter.warn(
`[gatsby-source-drupal]\nNo Gatsby Image CDN placeholder style found. Please ensure that you have a placeholder style in your Drupal site for the fastest builds. See the docs for more info on gatsby-source-drupal Image CDN support:\n\nhttps://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-source-drupal#readme`
`[gatsby-source-drupal]\nNo Gatsby Image CDN placeholder style found. Please ensure that you have a placeholder style in your Drupal site for the fastest builds. See the docs for more info on gatsby-source-drupal Image CDN support:\n${imageCdnDocs}\n`
)
}

Expand Down Expand Up @@ -857,20 +860,29 @@ exports.onCreateDevServer = async ({ app }) => {
polyfillImageServiceDevRoutes(app)
}

exports.createSchemaCustomization = ({ actions, schema }) => {
actions.createTypes([
// polyfill so image CDN works on older versions of Gatsby
addRemoteFilePolyfillInterface(
// this type is merged in with the inferred file__file type, adding Image CDN support via the gatsbyImage GraphQL field. The `RemoteFile` interface as well as the polyfill above are what add the gatsbyImage field.
schema.buildObjectType({
name: `file__file`,
fields: {},
interfaces: [`Node`, `RemoteFile`],
}),
{
schema,
actions,
}
),
])
exports.createSchemaCustomization = (
{ actions, schema, reporter },
pluginOptions
) => {
if (pluginOptions.skipFileDownloads) {
actions.createTypes([
// polyfill so image CDN works on older versions of Gatsby
addRemoteFilePolyfillInterface(
// this type is merged in with the inferred file__file type, adding Image CDN support via the gatsbyImage GraphQL field. The `RemoteFile` interface as well as the polyfill above are what add the gatsbyImage field.
schema.buildObjectType({
name: `file__file`,
fields: {},
interfaces: [`Node`, `RemoteFile`],
}),
{
schema,
actions,
}
),
])
} else {
reporter.info(
`[gatsby-source-drupal] Enable the skipFileDownloads option to use Gatsby's Image CDN. See the docs for more info:\n${imageCdnDocs}\n`
)
}
}
8 changes: 8 additions & 0 deletions packages/gatsby-source-drupal/src/normalize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,14 @@ const getGatsbyImageCdnFields = async ({

return gatsbyImageCdnFields
} catch (e) {
if (e.message.includes(`unrecognized file format`)) {
reporter.error(
`Encountered corrupt file while requesting image dimensions for ${url}`
)

return {}
}

reporter.error(e)
reporter.info(
JSON.stringify(
Expand Down