Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: gatsbyjs/gatsby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: gatsby@2.26.0
Choose a base ref
...
head repository: gatsbyjs/gatsby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: gatsby@2.26.1
Choose a head ref
  • 6 commits
  • 39 files changed
  • 2 contributors

Commits on Nov 13, 2020

  1. fix(gatsby-remark-images): adding missing plugin options (#27944 and #…

    …27998) (#28035)
    
    * fix(gatsby-remark-images): adding missing plugin options (#27944)
    
    (cherry picked from commit 08447bd)
    
    * fix(gatsby-remark-images): allow showCaptions to accept array of valid strings (#27998)
    
    (cherry picked from commit 3675467)
    vladar authored Nov 13, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    537bc8f View commit details
  2. fix(gatsby-plugin-sass): loosely check postCssPlugins (#27829) (#28037)

    (cherry picked from commit ac37599)
    vladar authored Nov 13, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    ae4c51e View commit details
  3. chore(gatsby-telemetry): add more value placeholders. (#27949 and #28025

    ) (#28036)
    
    * chore(gatsby-telemetry): add two more value placeholders. (#27949)
    
    (cherry picked from commit c6d754a)
    
    * chore(telemetry): Add new telemetry field for a generic string array (#28025)
    
    (cherry picked from commit d5807ac)
    vladar authored Nov 13, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    59713ed View commit details
  4. Revert "fix(gatsby): refresh browser when receiving update and runtim…

    …e errored (#27467)" (#28034) (#28038)
    
    This reverts commit f227e85.
    
    (cherry picked from commit 076b59f)
    vladar authored Nov 13, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    9f24f25 View commit details
  5. fix(gatsby): allow unknown plugin options (#27938) (#28010)

    * fix(gatsby): allow unknown plugin options
    
    * Warn on unknown options
    
    * Add telemetry for unknown plugin options
    
    * Log validation errors only
    
    (cherry picked from commit 412b523)
    
    Co-authored-by: Max Stoiber <contact@mxstbr.com>
    vladar and mxstbr authored Nov 13, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    8f16b9d View commit details
  6. chore(release): Publish

     - gatsby-admin@0.2.1
     - gatsby-cli@2.13.1
     - gatsby-plugin-sass@2.5.1
     - gatsby-recipes@0.3.1
     - gatsby-remark-images@3.5.1
     - gatsby-telemetry@1.4.1
     - gatsby@2.26.1
    vladar committed Nov 13, 2020
    Copy the full SHA
    f039123 View commit details
Showing with 187 additions and 478 deletions.
  1. +0 −4 e2e-tests/development-runtime/content/error-recovery/page-query.json
  2. +0 −4 e2e-tests/development-runtime/content/error-recovery/static-query.json
  3. +0 −41 e2e-tests/development-runtime/cypress/integration/hot-reloading/error-handling/compile-error.js
  4. +0 −69 ...pment-runtime/cypress/integration/hot-reloading/error-handling/page-query-result-runtime-error.js
  5. +0 −45 ...ts/development-runtime/cypress/integration/hot-reloading/error-handling/query-validation-error.js
  6. +0 −48 e2e-tests/development-runtime/cypress/integration/hot-reloading/error-handling/runtime-error.js
  7. +0 −69 ...ent-runtime/cypress/integration/hot-reloading/error-handling/static-query-result-runtime-error.js
  8. +2 −25 e2e-tests/development-runtime/cypress/support/commands.js
  9. +0 −1 e2e-tests/development-runtime/gatsby-config.js
  10. +0 −1 e2e-tests/development-runtime/package.json
  11. +1 −17 e2e-tests/development-runtime/scripts/update.js
  12. +0 −8 e2e-tests/development-runtime/src/pages/error-handling/compile-error.js
  13. +0 −25 e2e-tests/development-runtime/src/pages/error-handling/page-query-result-runtime-error.js
  14. +0 −19 e2e-tests/development-runtime/src/pages/error-handling/query-validation-error.js
  15. +0 −8 e2e-tests/development-runtime/src/pages/error-handling/runtime-error.js
  16. +0 −24 e2e-tests/development-runtime/src/pages/error-handling/static-query-result-runtime-error.js
  17. +4 −0 packages/gatsby-admin/CHANGELOG.md
  18. +2 −2 packages/gatsby-admin/package.json
  19. +4 −0 packages/gatsby-cli/CHANGELOG.md
  20. +3 −3 packages/gatsby-cli/package.json
  21. +6 −0 packages/gatsby-plugin-sass/CHANGELOG.md
  22. +1 −1 packages/gatsby-plugin-sass/package.json
  23. +1 −1 packages/gatsby-plugin-sass/src/__tests__/gatsby-node.js
  24. +1 −1 packages/gatsby-plugin-sass/src/gatsby-node.js
  25. +4 −0 packages/gatsby-recipes/CHANGELOG.md
  26. +2 −2 packages/gatsby-recipes/package.json
  27. +6 −0 packages/gatsby-remark-images/CHANGELOG.md
  28. +1 −1 packages/gatsby-remark-images/package.json
  29. +45 −3 packages/gatsby-remark-images/src/__tests__/gatsby-node.js
  30. +10 −2 packages/gatsby-remark-images/src/gatsby-node.js
  31. +4 −0 packages/gatsby-telemetry/CHANGELOG.md
  32. +1 −1 packages/gatsby-telemetry/package.json
  33. +3 −0 packages/gatsby-telemetry/src/telemetry.ts
  34. +10 −0 packages/gatsby/CHANGELOG.md
  35. +1 −35 packages/gatsby/cache-dir/error-overlay-handler.js
  36. +4 −4 packages/gatsby/package.json
  37. +26 −0 packages/gatsby/src/bootstrap/load-plugins/__tests__/load-plugins.ts
  38. +45 −9 packages/gatsby/src/bootstrap/load-plugins/validate.ts
  39. +0 −5 yarn.lock

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

27 changes: 2 additions & 25 deletions e2e-tests/development-runtime/cypress/support/commands.js
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ Cypress.Commands.add(`lifecycleCallOrder`, expectedActionCallOrder =>
if (expectedActionCallOrderLength > actionsLength) {
return false
}

let prevActionIndex = -1
for (let i = 0; i < actionsLength; i += 1) {
const nextActionIndex = prevActionIndex + 1
@@ -81,29 +81,6 @@ Cypress.Commands.add(
}
)

Cypress.Commands.add(`assertRoute`, route => {
Cypress.Commands.add(`assertRoute`, (route) => {
cy.url().should(`equal`, `${window.location.origin}${route}`)
})

// react-error-overlay is iframe, so this is just convenience helper
// https://www.cypress.io/blog/2020/02/12/working-with-iframes-in-cypress/#custom-command
Cypress.Commands.add(`getOverlayIframe`, () => {
// get the iframe > document > body
// and retry until the body element is not empty
return (
cy
.get(`iframe`, { log: true, timeout: 150000 })
.its(`0.contentDocument.body`)
.should(`not.be.empty`)
// wraps "body" DOM element to allow
// chaining more Cypress commands, like ".find(...)"
// https://on.cypress.io/wrap
.then(cy.wrap, { log: true })
)
})

Cypress.Commands.add(`assertNoOverlayIframe`, () => {
// get the iframe > document > body
// and retry until the body element is not empty
return cy.get(`iframe`, { log: true, timeout: 15000 }).should(`not.exist`)
})
1 change: 0 additions & 1 deletion e2e-tests/development-runtime/gatsby-config.js
Original file line number Diff line number Diff line change
@@ -29,7 +29,6 @@ module.exports = {
},
`gatsby-source-fake-data`,
`gatsby-transformer-sharp`,
`gatsby-transformer-json`,
{
resolve: `gatsby-transformer-remark`,
options: {
1 change: 0 additions & 1 deletion e2e-tests/development-runtime/package.json
Original file line number Diff line number Diff line change
@@ -13,7 +13,6 @@
"gatsby-plugin-sharp": "^2.0.37",
"gatsby-seo": "^0.1.0",
"gatsby-source-filesystem": "^2.0.33",
"gatsby-transformer-json": "^2.4.14",
"gatsby-transformer-remark": "^2.3.12",
"gatsby-transformer-sharp": "^2.1.19",
"isomorphic-fetch": "^2.2.1",
18 changes: 1 addition & 17 deletions e2e-tests/development-runtime/scripts/update.js
Original file line number Diff line number Diff line change
@@ -34,29 +34,13 @@ const args = yargs
`
).trim(),
type: `string`,
})
.option(`restore`, {
default: false,
type: `boolean`,
}).argv

async function update() {
const history = await getHistory()

const { file: fileArg, replacements, restore } = args
const { file: fileArg, replacements } = args
const filePath = path.resolve(fileArg)
if (restore) {
const original = history.get(filePath)
if (original) {
await fs.writeFile(filePath, original, `utf-8`)
} else if (original === false) {
await fs.remove(filePath)
} else {
console.log(`Didn't make changes to "${fileArg}". Nothing to restore.`)
}
history.delete(filePath)
return
}
let exists = true
if (!fs.existsSync(filePath)) {
exists = false

This file was deleted.

Loading