Skip to content

Commit c60f700

Browse files
committed
Merge branch 'master' into updates/fewer-install-warnings
2 parents 72014f1 + 19a2064 commit c60f700

File tree

496 files changed

+9157
-2186
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

496 files changed

+9157
-2186
lines changed

.circleci/config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,8 @@ jobs:
334334
environment:
335335
GATSBY_HOT_LOADER: fast-refresh
336336
CYPRESS_HOT_LOADER: fast-refresh
337+
CYPRESS_PROJECT_ID: 917bea
338+
CYPRESS_RECORD_KEY: 4750fb36-4576-4638-a617-d243a381acef
337339

338340
e2e_tests_development_runtime_with_experimental_react:
339341
<<: *e2e_tests_development_runtime_alias

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
---
22
name: Bug Report 🐞
3-
about: Something isn't working as expected? Here is the right place to report.
3+
about: Something isn't working as expected? Here is the right place to report. For questions, please use "Discussions".
44
labels: "type: bug"
55
---
66

77
<!--
88
Please fill out each section below, otherwise, your issue will be closed. This info allows Gatsby maintainers to diagnose (and fix!) your issue as quickly as possible.
99
1010
Useful Links:
11-
- Documentation: https://www.gatsbyjs.org/docs/
12-
- How to File an Issue: https://www.gatsbyjs.org/contributing/how-to-file-an-issue/
11+
- Documentation: https://www.gatsbyjs.com/docs/
12+
- How to File an Issue: https://www.gatsbyjs.com/contributing/how-to-file-an-issue/
1313
1414
Before opening a new issue, please search existing issues: https://github.com/gatsbyjs/gatsby/issues
1515
-->
@@ -20,9 +20,9 @@ Describe the issue that you're seeing.
2020

2121
### Steps to reproduce
2222

23-
Clear steps describing how to reproduce the issue. Please please please link to a demo project if possible, this makes your issue _much_ easier to diagnose (seriously).
23+
Clear steps describing how to reproduce the issue. **Please** link to a reproduction, this makes your issue _much_ easier to diagnose (seriously).
2424

25-
How to Make a Minimal Reproduction: https://www.gatsbyjs.org/contributing/how-to-make-a-reproducible-test-case/
25+
How to Make a Minimal Reproduction: https://www.gatsbyjs.com/contributing/how-to-make-a-reproducible-test-case/
2626

2727
### Expected result
2828

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
blank_issues_enabled: false
22
contact_links:
33
- name: Gatsby Documentation
4-
url: https://www.gatsbyjs.org/docs/
4+
url: https://www.gatsbyjs.com/docs/
55
about: Check out the Gatsby documentation for answers to common questions
66
- name: Gatsby Discord
77
url: https://gatsby.dev/discord
88
about: Ask questions, get help and discuss new things you're building with the Gatsby community
99
- name: Gatsby Discussions
1010
url: https://github.com/gatsbyjs/gatsby/discussions
11-
about: Have a question or feature request?
11+
about: Ask questions, request features & discuss RFCs
1212
- name: AskGatsbyJS Twitter
1313
url: https://twitter.com/AskGatsbyJS
1414
about: The official Twitter account to ask questions and get help with Gatsby

.github/ISSUE_TEMPLATE/documentation.md

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
---
22
name: Documentation 📝
3-
about: Suggest better docs coverage for a particular tool or process.
3+
about: Suggest specific improvements for our documentation. For questions, please use "Discussions".
44
labels: "type: documentation"
55
---
66

77
<!--
88
To make it easier for us to help you, please include as much useful information as possible.
99
1010
Useful Links:
11-
- Documentation: https://www.gatsbyjs.org/docs/
12-
- Contributing: https://www.gatsbyjs.org/contributing/
13-
14-
Gatsby has several community support channels, try asking your question on:
15-
16-
- Discord: https://gatsby.dev/discord
17-
- Twitter: https://twitter.com/gatsbyjs
11+
- Documentation: https://www.gatsbyjs.com/docs/
12+
- Contributing: https://www.gatsbyjs.com/contributing/
1813
1914
Before opening a new issue, please search existing issues https://github.com/gatsbyjs/gatsby/issues
2015
-->
@@ -39,10 +34,9 @@ Why should we document this and who will benefit from it?
3934
### Draft the doc
4035

4136
- [ ] Write the doc, following the format listed in these resources:
42-
- [Overview on contributing to documentation](https://www.gatsbyjs.org/contributing/docs-contributions/)
43-
- [Docs Templates](https://www.gatsbyjs.org/contributing/docs-templates/)
37+
- [Overview on contributing to documentation](https://www.gatsbyjs.com/contributing/docs-contributions/)
38+
- [Docs Templates](https://www.gatsbyjs.com/contributing/docs-templates/)
4439
- [Example of a similar article]()
45-
- [ ] Add the article to the [docs sidebar](https://github.com/gatsbyjs/gatsby/blob/master/www/src/data/sidebars/doc-links.yaml) under the [parent doc] section.
4640

4741
### Open a pull request
4842

.github/ISSUE_TEMPLATE/new_translation.md

Lines changed: 0 additions & 30 deletions
This file was deleted.

SECURITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ The following versions are currently being supported with security updates.
1212

1313
## Reporting a Vulnerability
1414

15-
Please email Kyle Mathews @ mathews.kyle@gmail.com
15+
Please email security@gatsbyjs.com

benchmarks/source-contentful/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
"cross-env": "^7.0.0",
2323
"dotenv": "^8.2.0",
2424
"gatsby": "^2.19.7",
25-
"gatsby-plugin-benchmark-reporting": "*",
2625
"gatsby-image": "^2.2.40",
26+
"gatsby-plugin-benchmark-reporting": "*",
2727
"gatsby-plugin-sharp": "^2.4.5",
28-
"gatsby-source-contentful": "^2.1.88",
28+
"gatsby-source-contentful": "^4.2.0",
2929
"gatsby-source-drupal": "^3.3.18",
3030
"gatsby-source-filesystem": "^2.1.48",
3131
"gatsby-transformer-sharp": "^2.3.14",

benchmarks/source-wordpress/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"gatsby-plugin-benchmark-reporting": "*",
2424
"gatsby-plugin-sharp": "^2.6.2",
2525
"gatsby-source-filesystem": "^2.1.48",
26-
"gatsby-source-wordpress-experimental": "^0.1.10",
26+
"gatsby-source-wordpress-experimental": "^5.0.0",
2727
"gatsby-transformer-sharp": "^2.5.2",
2828
"react": "^16.12.0",
2929
"react-dom": "^16.12.0"

benchmarks/source-wordpress/scripts/updater.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const fetchGraphql = require(`gatsby-source-wordpress-experimental/utils/fetch-graphql`)
1+
const fetchGraphql = require(`gatsby-source-wordpress-experimental/dist/utils/fetch-graphql`)
22
.default
33

44
const faker = require(`faker`)

benchmarks/source-wordpress/src/templates/article.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ const Article = ({ data: { article } }) => {
99
<Link to="/">Go back to index page</Link>
1010
<div>
1111
<h2>{article.title}</h2>
12-
{!!article.featuredImage?.remoteFile?.childImageSharp && (
13-
<Img fluid={article.featuredImage.remoteFile.childImageSharp.fluid} />
12+
{!!article.featuredImage?.node?.localFile?.childImageSharp && (
13+
<Img fluid={article.featuredImage.node.localFile.childImageSharp.fluid} />
1414
)}
1515
<div dangerouslySetInnerHTML={{ __html: article.content }} />
1616
</div>
@@ -26,10 +26,12 @@ export const query = graphql`
2626
title
2727
content
2828
featuredImage {
29-
remoteFile {
30-
childImageSharp {
31-
fluid(maxWidth: 960, quality: 90) {
32-
...GatsbyImageSharpFluid_withWebp_tracedSVG
29+
node {
30+
localFile {
31+
childImageSharp {
32+
fluid(maxWidth: 960, quality: 90) {
33+
...GatsbyImageSharpFluid_withWebp_tracedSVG
34+
}
3335
}
3436
}
3537
}

0 commit comments

Comments
 (0)