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: 76be951eef5e95a03dc8faafe57a5888943e3f62
Choose a base ref
...
head repository: gatsbyjs/gatsby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fbc58933c6a6d5d8837e36104fdb74a0cb02163d
Choose a head ref
Loading
Showing 3,921 changed files with 128,505 additions and 173,344 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
77 changes: 55 additions & 22 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ executors:
aliases:
e2e-executor: &e2e-executor
docker:
- image: cypress/browsers:node10.16.0-chrome76
- image: cypress/browsers:node12.18.3-chrome87-ff82

restore_cache: &restore_cache
restore_cache:
@@ -182,7 +182,7 @@ jobs:
executor: node
steps:
- checkout
- run: ./scripts/assert-changed-files.sh "packages/*|(e2e|integration)-tests/*|.circleci/*"
- run: ./scripts/assert-changed-files.sh "packages/*|(e2e|integration)-tests/*|.circleci/*|yarn.lock"
- <<: *restore_cache
- <<: *install_node_modules
- <<: *persist_cache
@@ -213,7 +213,7 @@ jobs:
steps:
- checkout
# We should always assert on master
- run: ./scripts/assert-changed-files.sh "packages/*|.circleci/*"
- run: ./scripts/assert-changed-files.sh "packages/*|.circleci/*|yarn.lock"
- <<: *attach_to_bootstrap
- run: yarn typecheck
- run: yarn check-repo-fields
@@ -234,17 +234,6 @@ jobs:
image: "14"
<<: *test_template

unit_tests_www:
executor: node
steps:
- checkout
- run:
command: yarn
working_directory: ~/project/www
- run:
command: yarn test
working_directory: ~/project/www

integration_tests_long_term_caching:
executor: node
steps:
@@ -282,6 +271,12 @@ jobs:
- e2e-test:
test_path: integration-tests/artifacts

integration_tests_ssr:
executor: node
steps:
- e2e-test:
test_path: integration-tests/ssr

e2e_tests_path-prefix:
<<: *e2e-executor
environment:
@@ -306,9 +301,6 @@ jobs:
- run: # Quick upgrade to the v2 (any version, we just need the real set version)
command: yarn policies set-version berry
working_directory: ~/project/e2e-tests/gatsby-pnp
- run: # Pins the Yarn version
command: yarn set version 2.0.0-rc.32
working_directory: ~/project/e2e-tests/gatsby-pnp
- run: # Forces to use the local packages
command: yarn link --all --private ../..
working_directory: ~/project/e2e-tests/gatsby-pnp
@@ -337,6 +329,14 @@ jobs:
e2e_tests_development_runtime:
<<: *e2e_tests_development_runtime_alias

e2e_tests_development_runtime_fast_refresh:
<<: *e2e_tests_development_runtime_alias
environment:
GATSBY_HOT_LOADER: fast-refresh
CYPRESS_HOT_LOADER: fast-refresh
CYPRESS_PROJECT_ID: 917bea
CYPRESS_RECORD_KEY: 4750fb36-4576-4638-a617-d243a381acef

e2e_tests_development_runtime_with_experimental_react:
<<: *e2e_tests_development_runtime_alias

@@ -374,11 +374,38 @@ jobs:

mdx_e2e_tests:
<<: *e2e-executor
environment:
CYPRESS_PROJECT_ID: spbj28
CYPRESS_RECORD_KEY: af30ea46-121f-4fb7-97dd-f17ec224402e
steps:
- e2e-test:
test_path: e2e-tests/mdx
test_command: yarn test

e2e_tests_gatsby-static-image:
<<: *e2e-executor
environment:
CYPRESS_PROJECT_ID: zstawi
CYPRESS_RECORD_KEY: 389326a6-c0d2-4215-bc5e-3be29483ed13
steps:
- e2e-test:
test_path: e2e-tests/gatsby-static-image
test_command: yarn test

e2e_tests_visual-regression:
<<: *e2e-executor
environment:
CYPRESS_PROJECT_ID: nz99aw
CYPRESS_RECORD_KEY: ed4b1af1-bd97-47d4-bb09-3cab2435a147
steps:
- e2e-test:
test_path: e2e-tests/visual-regression
test_command: yarn test
- store_artifacts:
path: e2e-tests/visual-regression/__diff_output__
- store_test_results:
path: e2e-tests/visual-regression/cypress/results

starters_validate:
executor: node
steps:
@@ -435,6 +462,9 @@ jobs:
# keys:
# - yarn-packages-v2-{{ checksum "yarn.lock" }}
# - yarn-packages-v2-
- run:
name: Set yarn timeout
command: yarn config set network-timeout 300000
- run:
name: Install node modules
command: yarn --frozen-lockfile
@@ -565,11 +595,6 @@ workflows:
- lint
- typecheck
- bootstrap
- unit_tests_www:
requires:
- lint
- typecheck
- bootstrap
- integration_tests_long_term_caching:
<<: *e2e-test-workflow
- integration_tests_cache_resilience:
@@ -580,6 +605,8 @@ workflows:
<<: *e2e-test-workflow
- integration_tests_artifacts:
<<: *e2e-test-workflow
- integration_tests_ssr:
<<: *e2e-test-workflow
- integration_tests_gatsby_cli:
requires:
- bootstrap
@@ -589,8 +616,14 @@ workflows:
<<: *e2e-test-workflow
- e2e_tests_gatsby-image:
<<: *e2e-test-workflow
- e2e_tests_gatsby-static-image:
<<: *e2e-test-workflow
- e2e_tests_visual-regression:
<<: *e2e-test-workflow
- e2e_tests_development_runtime:
<<: *e2e-test-workflow
- e2e_tests_development_runtime_fast_refresh:
<<: *e2e-test-workflow
- e2e_tests_production_runtime:
<<: *e2e-test-workflow
- themes_e2e_tests_production_runtime:
2 changes: 0 additions & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -8,8 +8,6 @@ packages/*/scripts/**
**/dist/*
**/__testfixtures__/**
**/__tests__/fixtures/**
www/public
www/src/components/search-form/docsearch.min.js
peril
docs
plop-templates
33 changes: 19 additions & 14 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -45,6 +45,12 @@ module.exports = {
allowTaggedTemplates: true,
},
],
"no-unused-vars": [
"warn",
{
varsIgnorePattern: "^_"
}
],
"consistent-return": ["error"],
"filenames/match-regex": ["error", "^[a-z-\\d\\.]+$", true],
"no-console": "off",
@@ -79,15 +85,6 @@ module.exports = {
Cypress: false,
},
},
{
files: ["www/**/*"],
rules: {
// We need to import React to use the Fragment shorthand (`<>`).
// When we use theme-ui's JSX pragma, it lists React as an unused var
// even though it's still needed.
"no-unused-vars": ["error", { varsIgnorePattern: "React" }],
},
},
{
files: ["*.ts", "*.tsx"],
parser: "@typescript-eslint/parser",
@@ -105,11 +102,18 @@ module.exports = {
"error",
{ ignoreParameters: true },
],
// This rule tries to ensure we use camelCase for all variables, properties
// functions, etc. However, it is not always possible to ensure properties
// are camelCase. Specifically we have `node.__gatsby_resolve` which breaks
// this rule. This allows properties to be whatever they need to be.
"@typescript-eslint/camelcase": ["error", { properties: "never" }],
"@typescript-eslint/camelcase": [
"error",
{
// This rule tries to ensure we use camelCase for all variables, properties
// functions, etc. However, it is not always possible to ensure properties
// are camelCase. Specifically we have `node.__gatsby_resolve` which breaks
// this rule. This allows properties to be whatever they need to be.
properties: "never",
// Allow unstable api's to use `unstable_`, which is easier to grep
allow: ["^unstable_"],
},
],
// This rule tries to prevent using `require()`. However in node code,
// there are times where this makes sense. And it specifically is causing
// problems in our tests where we often want this functionality for module
@@ -168,6 +172,7 @@ module.exports = {
// bump to @typescript-eslint/parser started showing Flow related errors in ts(x) files
// so disabling them in .ts(x) files
"flowtype/no-types-missing-file-annotation": "off",
"@typescript-eslint/array-type": ["error", { default: "generic" }],
},
},
],
36 changes: 0 additions & 36 deletions .forestry/front_matter/templates/blog.yml

This file was deleted.

7 changes: 0 additions & 7 deletions .forestry/front_matter/templates/docs.yml

This file was deleted.

43 changes: 0 additions & 43 deletions .forestry/settings.yml

This file was deleted.

3 changes: 0 additions & 3 deletions .forestry/snippets/pullquote.snippet

This file was deleted.

3 changes: 0 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
* text=auto eol=lf

/docs/sites.yml merge=union
/docs/starters.yml merge=union

# These files are binary and should be left untouched
*.png binary
*.jpg binary
10 changes: 5 additions & 5 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
---
name: Bug Report 🐞
about: Something isn't working as expected? Here is the right place to report.
about: Something isn't working as expected? Here is the right place to report. For questions, please use "Discussions".
labels: "type: bug"
---

<!--
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.
Useful Links:
- Documentation: https://www.gatsbyjs.org/docs/
- How to File an Issue: https://www.gatsbyjs.org/contributing/how-to-file-an-issue/
- Documentation: https://www.gatsbyjs.com/docs/
- How to File an Issue: https://www.gatsbyjs.com/contributing/how-to-file-an-issue/
Before opening a new issue, please search existing issues: https://github.com/gatsbyjs/gatsby/issues
-->
@@ -20,9 +20,9 @@ Describe the issue that you're seeing.

### Steps to reproduce

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).
Clear steps describing how to reproduce the issue. **Please** link to a reproduction, this makes your issue _much_ easier to diagnose (seriously).

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

### Expected result

5 changes: 4 additions & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
blank_issues_enabled: false
contact_links:
- name: Gatsby Documentation
url: https://www.gatsbyjs.org/docs/
url: https://www.gatsbyjs.com/docs/
about: Check out the Gatsby documentation for answers to common questions
- name: Gatsby Discord
url: https://gatsby.dev/discord
about: Ask questions, get help and discuss new things you're building with the Gatsby community
- name: Gatsby Discussions
url: https://github.com/gatsbyjs/gatsby/discussions
about: Ask questions, request features & discuss RFCs
- name: AskGatsbyJS Twitter
url: https://twitter.com/AskGatsbyJS
about: The official Twitter account to ask questions and get help with Gatsby
Loading