Rebase

.circleci/config.yml

@@ -1,3 +1,6 @@
+orbs:
+  win: circleci/[email protected]
+
 executors:
   node:
     parameters:
@@ -10,7 +13,7 @@ executors:
 aliases:
   e2e-executor: &e2e-executor
     docker:
-      - image: cypress/browsers:chrome69
+      - image: cypress/browsers:node10.16.0-chrome76
 
   restore_cache: &restore_cache
     restore_cache:
@@ -100,7 +103,7 @@ jobs:
       - <<: *restore_cache
       - <<: *install_node_modules
       - <<: *persist_cache
-      - run: yarn bootstrap
+      - run: yarn bootstrap -- concurrency=2
       - persist_to_workspace:
           root: packages
           paths:
@@ -157,6 +160,12 @@ jobs:
       - e2e-test:
           test_path: integration-tests/gatsby-pipeline
 
+  integration_tests_structured_logging:
+    executor: node
+    steps:
+      - e2e-test:
+          test_path: integration-tests/structured-logging
+
   e2e_tests_path-prefix:
     <<: *e2e-executor
     environment:
@@ -215,8 +224,8 @@ jobs:
     executor: node
     steps:
       - checkout
-      - run: ./scripts/assert-changed-files.sh "starters/*|themes/gatsby-starter-*|.circleci/*"
-      - run: sh ./scripts/validate-starters.sh "starters/* themes/gatsby-starter-*"
+      - run: ./scripts/assert-changed-files.sh "starters/*|.circleci/*"
+      - run: sh ./scripts/validate-starters.sh "starters/*"
 
   starters_publish:
     executor: node
@@ -228,8 +237,8 @@ jobs:
       - run: yarn markdown
       - run: sudo apt-get update && sudo apt-get install jq # jq is helpful for parsing json
       - run: git config --global user.name "GatsbyJS Bot"
-      - run: git config --global user.email "admin@gatsbyjs.com"
-      - run: sh ./scripts/publish-starters.sh "starters/* themes/gatsby-starter-*"
+      - run: git config --global user.email "core-team@gatsbyjs.com"
+      - run: sh ./scripts/publish-starters.sh "starters/*"
 
   build_www:
     docker:
@@ -238,9 +247,9 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: www_public_dir_1
+          key: v1_www_public_dir
       - restore_cache:
-          key: www_cache_dir_1
+          key: v1_www_cache_dir
       - run:
           command: yarn
           working_directory: ~/project/www
@@ -249,11 +258,11 @@ jobs:
           command: GATSBY_CPU_COUNT=8 yarn build
           working_directory: ~/project/www
       - save_cache:
-          key: www_public_dir_1_{{ epoch }}
+          key: v1_www_public_dir_{{ epoch }}
           paths:
             - ~/project/www/public
       - save_cache:
-          key: www_cache_dir_1_{{ epoch }}
+          key: v1_www_cache_dir_{{ epoch }}
           paths:
             - ~/project/www/.cache
 
@@ -263,7 +272,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: www_public_dir_1
+          key: v1_www_public_dir
       - run:
           command: yarn add netlify-cli
           working_directory: ~/project/www
@@ -272,10 +281,32 @@ jobs:
           no_output_timeout: 2h
           working_directory: ~/project/www
 
+  windows_unit_tests:
+    executor:
+      name: win/vs2019
+      shell: powershell.exe
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - yarn-packages-v2-{{ checksum "yarn.lock" }}
+            - yarn-packages-v2-
+      - run:
+          name: "Install dependencies"
+          command: yarn bootstrap
+      - save_cache:
+          paths:
+            - C:\Users\circleci\AppData\Local\Yarn\Cache
+          key: yarn-packages-v2-{{ checksum "yarn.lock" }}
+      - run:
+          name: "Run Tests"
+          command: yarn test
+
 workflows:
   version: 2
   build-test:
     jobs:
+      - windows_unit_tests
       - bootstrap
       - lint:
           requires:
@@ -294,11 +325,16 @@ workflows:
           requires:
             - lint
             - unit_tests_node8
-      - unit_tests_www
+      - unit_tests_www:
+          requires:
+            - lint
+            - unit_tests_node8
       - integration_tests_long_term_caching:
           <<: *e2e-test-workflow
       - integration_tests_gatsby_pipeline:
           <<: *e2e-test-workflow
+      - integration_tests_structured_logging:
+          <<: *e2e-test-workflow
       - e2e_tests_path-prefix:
           <<: *e2e-test-workflow
       - e2e_tests_gatsby-image:
@@ -320,6 +356,10 @@ workflows:
                 - master
       - manual_www_approval:
           type: approval
+          filters:
+            branches:
+              only:
+                - master
       - build_www:
           context: build_www
           requires:
@@ -328,7 +368,6 @@ workflows:
           requires:
             - build_www
           context: build_www
-
   www_deploy:
     triggers:
       - schedule:

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,7 +4,7 @@ about: Something isn't working as expected? Here is the right place to report.
 ---
 
 <!--
-  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.
+  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/
@@ -21,6 +21,8 @@ Describe the issue that you're seeing.
 
 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).
 
+How to Make a Minimal Reproduction: https://www.gatsbyjs.org/contributing/how-to-make-a-reproducible-test-case/
+
 ### Expected result
 
 What should happen?

.github/ISSUE_TEMPLATE/feature_request.md

@@ -4,7 +4,7 @@ about: Suggest a new idea for the project.
 ---
 
 <!--
-  Please fill out each section below, otherwise your issue will be closed.
+  Please fill out each section below, otherwise, your issue will be closed.
 
   Useful Links:
   - Gatsby RFCs: https://github.com/gatsbyjs/rfcs

.github/ISSUE_TEMPLATE/new_translation.md

@@ -0,0 +1,28 @@
+---
+name: New Translation Request 🌐
+about: Suggest a new language translation of the repo.
+---
+
+<!--
+  Please fill out the YAML form below, otherwise, your issue will be closed.
+
+  - *Name*: Language name in *English*
+  - *Code*: [ISO-693 Code]() or [IETF language tag](https://en.wikipedia.org/wiki/IETF_language_tag) of the language
+  - *Maintainers*: list of GitHub usernames of proposed maintainers (at least 2 required)
+-->
+
+```yaml
+name: English
+code: en
+maintainers:
+  - tesseralis
+  - marcysutton
+```
+
+**Maintainers**
+
+If you would like to be a maintainer, please respond to this issue with:
+
+- your experience level in open source
+- your level of experience in the target language and localization
+- how much time you can commit to being a maintainer

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,6 +3,11 @@
   ask in this Pull Request and a Gatsby maintainer will be happy to help :)
 -->
 
+<!--
+  Is this a blog post? Check out the docs at https://www.gatsbyjs.org/contributing/blog-and-website-contributions/, and please mention if the blog post is pre-approved
+  by someone from Gatsby.
+-->
+
 ## Description
 
 <!-- Write a brief description of the changes introduced by this PR -->
@@ -11,5 +16,11 @@
 
 <!--
   Link to the issue that is fixed by this PR (if there is one)
-  e.g. Fixes #1234, Addresses #1234, Related to #1234, etc.
+  e.g. Fixes #1234
+
+  Link to an issue that is partially addressed by this PR (if there are any)
+  e.g. Addresses #1234
+
+  Link to related issues (if there are any)
+  e.g. Related to #1234
 -->

.github/actions/gatsby-site-showcase-validator/index.js

@@ -4,37 +4,47 @@ const yaml = require("js-yaml")
 const cheerio = require("cheerio")
 const chalk = require("chalk")
 
+async function fetchAsSiteValidator(url) {
+  return fetch(url, {
+    headers: {
+      "User-Agent":
+        "gatsby-site-showcase-validator/1.0 (+https://github.com/gatsbyjs/gatsby/tree/master/.github/actions/gatsby-site-showcase-validator)",
+    },
+  })
+}
+
 async function run() {
   // Grab down sites.yml
-  let url =
+  const url =
     "https://raw.githubusercontent.com/gatsbyjs/gatsby/master/docs/sites.yml"
 
   let yamlStr
 
   try {
-    yamlStr = await fetch(url).then(resp => resp.text())
+    yamlStr = await fetchAsSiteValidator(url).then(resp => resp.text())
   } catch (err) {
     console.log(`[Err]: ${err.message}`)
     process.exit(1)
   }
 
   // Parse YAML
-  let parsedYaml = yaml.safeLoad(yamlStr, "utf8")
+  const parsedYaml = yaml.safeLoad(yamlStr, "utf8")
 
   let sitesVisited = 0
   let nonGatsbySiteCount = 0
+  let inaccessibleRepoCount = 0
   let erroredOut = 0
-  let totalSitesCount = parsedYaml.length
+  const totalSitesCount = parsedYaml.length
 
   // Loop over each site
   for (let site of parsedYaml) {
-    let siteUrl = site.main_url
-
+    const siteUrl = site.main_url
+    const sourceUrl = site.source_url
     let siteHtml
 
     // Fetch site
     try {
-      siteHtml = await fetch(siteUrl).then(resp => resp.text())
+      siteHtml = await fetchAsSiteValidator(siteUrl).then(resp => resp.text())
     } catch (err) {
       console.log(
         `${chalk.red(`[Err]`)}: ${site.title} (${siteUrl}) ran into an error: ${
@@ -47,34 +57,49 @@ async function run() {
     }
 
     // Pass html into a parser
-    let $ = cheerio.load(siteHtml)
+    const $ = cheerio.load(siteHtml)
 
     // Most Gatsby sites have an id of "___gatsby"
-    let gatsbyContainer = $("#___gatsby")
+    const gatsbyContainer = $("#___gatsby")
 
-    if (gatsbyContainer.length !== 0) {
-      // The site is a gatsby site don't do anything
-      sitesVisited++
-    } else {
-      // The site is not a gatsby site, print out some info
+    // The site is not a gatsby site, print out some info
+    if (!gatsbyContainer.length) {
       console.log(
         `${chalk.yellow(`[Notice]`)}: ${
           site.title
         } (${siteUrl}) is not a Gatsby site`
       )
-      sitesVisited++
       nonGatsbySiteCount++
     }
+
+    // Check if provided repository is public
+    if (sourceUrl) {
+      const status = await fetchAsSiteValidator(sourceUrl).then(
+        ({ status }) => status
+      )
+
+      if (status !== 200) {
+        console.log(
+          `${chalk.yellow(`[Notice]`)}: ${
+            site.title
+          } (${siteUrl}) provided a 'source_url', but it's repository is inaccessible (${sourceUrl})`
+        )
+        inaccessibleRepoCount++
+      }
+    }
+
+    sitesVisited++
   }
 
   console.log(
     chalk.green(
-      `We visited ${sitesVisited}/${totalSitesCount} sites. Out of them, ${nonGatsbySiteCount} sites were not a Gatsby site and ${erroredOut} errored out when visiting it.`
+      `We visited ${sitesVisited}/${totalSitesCount} sites. Out of them, ${nonGatsbySiteCount} sites were not a Gatsby site, ${inaccessibleRepoCount} provided inaccessible repositories, and ${erroredOut} errored out when visiting it.`
     )
   )
 
-  // If there are any non Gatsby sites, fail (non-zero exit code)
-  process.exit(nonGatsbySiteCount > 0 ? 1 : 0)
+  // If there are any non Gatsby sites or their `source_url` is inaccessible, fail (non-zero exit code)
+  const exitCode = nonGatsbySiteCount > 0 || inaccessibleRepoCount > 0 ? 1 : 0
+  process.exit(exitCode)
 }
 
 run()

.github/actions/high-priority-prs/src/filter.js

@@ -12,7 +12,11 @@ const filter = (queues, team) => {
       return pr.reviewRequests.nodes
         .map(node => {
           if (node.requestedReviewer) {
-            tools.log.info(`Review request for team ${node.requestedReviewer.name} on PR: ${pr.title}`)
+            tools.log.info(
+              `Review request for team ${node.requestedReviewer.name} on PR: ${
+                pr.title
+              }`
+            )
             return node.requestedReviewer.id
           }
         })