Merge branch 'master' into feat/wp-use-image-cdn-for-files-in-html

gatsbyjs · May 3, 2022 · dae52cd · dae52cd
2 parents 4d74099 + 128c7bb
commit dae52cd
Show file tree

Hide file tree

Showing 168 changed files with 3,796 additions and 1,801 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -540,6 +540,7 @@ jobs:
       - run:
           name: Run tests
           command: yarn jest --ci --runInBand ((yarn jest --listTests) | Foreach-Object {$_ -replace '.*\\packages', 'packages'} | Foreach-Object {$_ -replace '\\', '/'} | circleci tests split --split-by=timings)
+          no_output_timeout: 15m
           environment:
             NODE_OPTIONS: --max-old-space-size=2048
             GENERATE_JEST_REPORT: "true"

diff --git a/e2e-tests/development-runtime/.gitignore b/e2e-tests/development-runtime/.gitignore
@@ -74,3 +74,5 @@ cypress/fixtures
 cypress/videos
 
 __history__.json
+
+src/gatsby-types.d.ts
diff --git a/e2e-tests/development-runtime/cypress/integration/graphql-typegen/fragments-file.js b/e2e-tests/development-runtime/cypress/integration/graphql-typegen/fragments-file.js
@@ -0,0 +1,5 @@
+describe('fragments.graphql', () => {
+  it('exists in .cache folder', () => {
+    cy.readFile('.cache/typegen/fragments.graphql')
+  })
+})
diff --git a/e2e-tests/development-runtime/cypress/integration/graphql-typegen/graphql-config.js b/e2e-tests/development-runtime/cypress/integration/graphql-typegen/graphql-config.js
@@ -0,0 +1,20 @@
+describe('graphql-config', () => {
+  it('exists in .cache folder with correct data', () => {
+    cy.readFile('.cache/typegen/graphql.config.json', 'utf-8').then((json) => {
+      expect(json).to.deep.equal({
+        "schema": ".cache/typegen/schema.graphql",
+        "documents": [
+          "src/**/**.{ts,js,tsx,jsx}",
+          ".cache/typegen/fragments.graphql"
+        ],
+        "extensions": {
+          "endpoints": {
+            "default": {
+              "url": "http://localhost:8000/___graphql"
+            }
+          }
+        }
+      })
+    })
+  })
+})
diff --git a/e2e-tests/development-runtime/cypress/integration/graphql-typegen/schema-file.js b/e2e-tests/development-runtime/cypress/integration/graphql-typegen/schema-file.js
@@ -0,0 +1,5 @@
+describe('schema.graphql', () => {
+  it('exists in .cache folder', () => {
+    cy.readFile('.cache/typegen/schema.graphql')
+  })
+})
diff --git a/e2e-tests/development-runtime/cypress/integration/graphql-typegen/ts-types.js b/e2e-tests/development-runtime/cypress/integration/graphql-typegen/ts-types.js
@@ -0,0 +1,5 @@
+describe('gatsby-types.d.ts', () => {
+  it('exists in src folder', () => {
+    cy.readFile('src/gatsby-types.d.ts')
+  })
+})
diff --git a/e2e-tests/development-runtime/gatsby-config.js b/e2e-tests/development-runtime/gatsby-config.js
@@ -8,6 +8,7 @@ module.exports = {
   },
   flags: {
     DEV_SSR: false,
+    GRAPHQL_TYPEGEN: true,
   },
   plugins: [
     `gatsby-plugin-react-helmet`,

diff --git a/e2e-tests/development-runtime/package.json b/e2e-tests/development-runtime/package.json
@@ -25,7 +25,7 @@
     "prop-types": "^15.6.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-helmet": "^5.2.1",
+    "react-helmet": "^6.1.0",
     "sass": "^1.32.8"
   },
   "keywords": [
@@ -35,7 +35,7 @@
   "license": "MIT",
   "scripts": {
     "build": "gatsby build",
-    "develop": "cross-env CYPRESS_SUPPORT=y ENABLE_GATSBY_REFRESH_ENDPOINT=true GATSBY_EXPERIMENTAL_QUERY_ON_DEMAND=y gatsby develop",
+    "develop": "cross-env CYPRESS_SUPPORT=y ENABLE_GATSBY_REFRESH_ENDPOINT=true GATSBY_EXPERIMENTAL_QUERY_ON_DEMAND=y GATSBY_GRAPHQL_TYPEGEN=y gatsby develop",
     "serve": "gatsby serve",
     "clean": "gatsby clean",
     "start": "npm run develop",

diff --git a/e2e-tests/development-runtime/src/pages/collection-routing/hogwarts/{FakeData.uuid}.js b/e2e-tests/development-runtime/src/pages/collection-routing/hogwarts/{FakeData.uuid}.js
@@ -15,7 +15,7 @@ export default function FakeDataHogwarts({ data: { fake }, pageContext: { uuid }
 }
 
 export const blogPostQuery = graphql`
-  query($id: String!) {
+  query FakeDataHogwarts($id: String!) {
     fake: fakeData(id: { eq: $id }) {
       fields {
         slug

diff --git a/e2e-tests/development-runtime/src/pages/collection-routing/prefix-{FakeData.uuid}.js b/e2e-tests/development-runtime/src/pages/collection-routing/prefix-{FakeData.uuid}.js
@@ -15,7 +15,7 @@ export default function FakeDataPrefix({ data: { fake }, pageContext: { uuid } }
 }
 
 export const blogPostQuery = graphql`
-  query($id: String!) {
+  query FakeDataPrefix($id: String!) {
     fake: fakeData(id: { eq: $id }) {
       fields {
         slug

diff --git a/...ests/development-runtime/src/pages/collection-routing/{FakeData.title}/{FakeData.uuid}.js b/...ests/development-runtime/src/pages/collection-routing/{FakeData.title}/{FakeData.uuid}.js
@@ -15,7 +15,7 @@ export default function FakeDataNested({ data: { fake }, pageContext: { uuid } }
 }
 
 export const blogPostQuery = graphql`
-  query($id: String!) {
+  query FakeDataNested($id: String!) {
     fake: fakeData(id: { eq: $id }) {
       fields {
         slug

diff --git a/e2e-tests/development-runtime/src/pages/collection-routing/{FakeData.uuid}-postfix.js b/e2e-tests/development-runtime/src/pages/collection-routing/{FakeData.uuid}-postfix.js
@@ -15,7 +15,7 @@ export default function FakeDataPostfix({ data: { fake }, pageContext: { uuid }
 }
 
 export const blogPostQuery = graphql`
-  query($id: String!) {
+  query FakeDataPostfix($id: String!) {
     fake: fakeData(id: { eq: $id }) {
       fields {
         slug

diff --git a/e2e-tests/development-runtime/src/pages/collection-routing/{FakeData.uuid}.js b/e2e-tests/development-runtime/src/pages/collection-routing/{FakeData.uuid}.js
@@ -15,7 +15,7 @@ export default function FakeData({ data: { fake }, pageContext: { uuid } }) {
 }
 
 export const blogPostQuery = graphql`
-  query($id: String!) {
+  query FakeData($id: String!) {
     fake: fakeData(id: { eq: $id }) {
       fields {
         slug

diff --git a/package.json b/package.json
@@ -39,11 +39,11 @@
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-filenames": "^1.3.2",
     "eslint-plugin-flowtype": "^6.1.1",
-    "eslint-plugin-import": "^2.25.4",
+    "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jsx-a11y": "^6.5.1",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-react": "^7.29.4",
-    "fs-extra": "^10.0.0",
+    "fs-extra": "^10.1.0",
     "glob": "^7.1.7",
     "husky": "3.1.0",
     "ignore": "^5.1.8",
@@ -61,7 +61,7 @@
     "npm-packlist": "^2.1.5",
     "npm-run-all": "4.1.5",
     "plop": "^1.9.1",
-    "prettier": "^2.6.1",
+    "prettier": "^2.6.2",
     "remark": "^13.0.0",
     "remark-cli": "^9.0.0",
     "remark-frontmatter": "^3.0.0",
@@ -84,7 +84,7 @@
     "retext-syntax-urls": "^2.0.0",
     "rimraf": "^3.0.2",
     "svgo": "1.3.2",
-    "typescript": "^4.5.5",
+    "typescript": "^4.6.4",
     "unified": "^9.2.0",
     "yargs": "^15.4.1"
   },

diff --git a/packages/babel-plugin-remove-graphql-queries/package.json b/packages/babel-plugin-remove-graphql-queries/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-remove-graphql-queries",
-  "version": "4.14.0-next.2",
+  "version": "4.14.0-next.3",
   "author": "Jason Quense <[email protected]>",
   "repository": {
     "type": "git",
@@ -10,12 +10,12 @@
   "homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/babel-plugin-remove-graphql-queries#readme",
   "dependencies": {
     "@babel/runtime": "^7.15.4",
-    "gatsby-core-utils": "^3.14.0-next.2"
+    "gatsby-core-utils": "^3.14.0-next.3"
   },
   "devDependencies": {
     "@babel/cli": "^7.15.4",
     "@babel/core": "^7.15.5",
-    "babel-preset-gatsby-package": "^2.14.0-next.1",
+    "babel-preset-gatsby-package": "^2.14.0-next.2",
     "cross-env": "^7.0.3"
   },
   "peerDependencies": {

diff --git a/packages/babel-preset-gatsby-package/package.json b/packages/babel-preset-gatsby-package/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel-preset-gatsby-package",
-  "version": "2.14.0-next.1",
+  "version": "2.14.0-next.2",
   "author": "Philipp Spiess <[email protected]>",
   "repository": {
     "type": "git",
@@ -19,7 +19,7 @@
     "@babel/preset-react": "^7.14.0",
     "@babel/runtime": "^7.15.4",
     "babel-plugin-dynamic-import-node": "^2.3.3",
-    "core-js": "^3.22.2"
+    "core-js": "^3.22.3"
   },
   "devDependencies": {
     "@babel/cli": "^7.15.4",

diff --git a/packages/babel-preset-gatsby/package.json b/packages/babel-preset-gatsby/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel-preset-gatsby",
-  "version": "2.14.0-next.2",
+  "version": "2.14.0-next.3",
   "author": "Philipp Spiess <[email protected]>",
   "repository": {
     "type": "git",
@@ -22,8 +22,8 @@
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-macros": "^3.1.0",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
-    "gatsby-core-utils": "^3.14.0-next.2",
-    "gatsby-legacy-polyfills": "^2.14.0-next.0"
+    "gatsby-core-utils": "^3.14.0-next.3",
+    "gatsby-legacy-polyfills": "^2.14.0-next.1"
   },
   "peerDependencies": {
     "@babel/core": "^7.11.6",
@@ -38,7 +38,7 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.15.4",
-    "babel-preset-gatsby-package": "^2.14.0-next.1",
+    "babel-preset-gatsby-package": "^2.14.0-next.2",
     "cross-env": "^7.0.3",
     "slash": "^3.0.0"
   },

diff --git a/packages/create-gatsby/package.json b/packages/create-gatsby/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-gatsby",
-  "version": "2.14.0-next.2",
+  "version": "2.14.0-next.3",
   "main": "lib/index.js",
   "bin": "cli.js",
   "license": "MIT",
@@ -27,8 +27,8 @@
     "enquirer": "^2.3.6",
     "eslint": "^7.32.0",
     "execa": "^5.1.1",
-    "fs-extra": "^10.0.0",
-    "gatsby-plugin-utils": "^3.8.0-next.2",
+    "fs-extra": "^10.1.0",
+    "gatsby-plugin-utils": "^3.8.0-next.3",
     "joi": "^17.4.2",
     "microbundle": "^0.14.2",
     "node-fetch": "^2.6.6",

diff --git a/packages/gatsby-cli/package.json b/packages/gatsby-cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-cli",
   "description": "Gatsby command-line interface for creating new sites and running Gatsby commands",
-  "version": "4.14.0-next.2",
+  "version": "4.14.0-next.3",
   "author": "Kyle Mathews <[email protected]>",
   "bin": {
     "gatsby": "cli.js"
@@ -26,13 +26,13 @@
     "common-tags": "^1.8.2",
     "configstore": "^5.0.1",
     "convert-hrtime": "^3.0.0",
-    "create-gatsby": "^2.14.0-next.2",
+    "create-gatsby": "^2.14.0-next.3",
     "envinfo": "^7.8.1",
     "execa": "^5.1.1",
     "fs-exists-cached": "^1.0.0",
-    "fs-extra": "^10.0.0",
-    "gatsby-core-utils": "^3.14.0-next.2",
-    "gatsby-telemetry": "^3.14.0-next.2",
+    "fs-extra": "^10.1.0",
+    "gatsby-core-utils": "^3.14.0-next.3",
+    "gatsby-telemetry": "^3.14.0-next.3",
     "hosted-git-info": "^3.0.8",
     "is-valid-path": "^0.1.1",
     "joi": "^17.4.2",
@@ -45,7 +45,7 @@
     "prompts": "^2.4.2",
     "redux": "4.1.2",
     "resolve-cwd": "^3.0.0",
-    "semver": "^7.3.5",
+    "semver": "^7.3.7",
     "signal-exit": "^3.0.6",
     "source-map": "0.7.3",
     "stack-trace": "^0.0.10",
@@ -65,7 +65,7 @@
     "@rollup/plugin-replace": "^2.4.2",
     "@types/hosted-git-info": "^3.0.2",
     "@types/yargs": "^15.0.14",
-    "babel-preset-gatsby-package": "^2.14.0-next.1",
+    "babel-preset-gatsby-package": "^2.14.0-next.2",
     "cross-env": "^7.0.3",
     "ink": "^3.2.0",
     "ink-spinner": "^4.0.3",
@@ -75,7 +75,7 @@
     "rollup": "^2.66.1",
     "rollup-plugin-auto-external": "^2.0.0",
     "rollup-plugin-internal": "^1.0.4",
-    "typescript": "^4.5.5"
+    "typescript": "^4.6.4"
   },
   "files": [
     "lib/",

diff --git a/packages/gatsby-codemods/package.json b/packages/gatsby-codemods/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gatsby-codemods",
-  "version": "3.14.0-next.1",
+  "version": "3.14.0-next.2",
   "description": "A collection of codemod scripts for use with JSCodeshift that help migrate to newer versions of Gatsby.",
   "main": "index.js",
   "scripts": {
@@ -36,7 +36,7 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.15.4",
-    "babel-preset-gatsby-package": "^2.14.0-next.1",
+    "babel-preset-gatsby-package": "^2.14.0-next.2",
     "cross-env": "^7.0.3"
   },
   "engines": {

diff --git a/packages/gatsby-core-utils/package.json b/packages/gatsby-core-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gatsby-core-utils",
-  "version": "3.14.0-next.2",
+  "version": "3.14.0-next.3",
   "description": "A collection of gatsby utils used in different gatsby packages",
   "keywords": [
     "gatsby",
@@ -47,7 +47,7 @@
     "configstore": "^5.0.1",
     "fastq": "^1.13.0",
     "file-type": "^16.5.3",
-    "fs-extra": "^10.0.0",
+    "fs-extra": "^10.1.0",
     "got": "^11.8.3",
     "import-from": "^4.0.0",
     "lmdb": "^2.2.6",
@@ -62,11 +62,11 @@
     "@babel/cli": "^7.15.4",
     "@babel/core": "^7.15.5",
     "@types/ci-info": "2.0.0",
-    "babel-preset-gatsby-package": "^2.14.0-next.1",
+    "babel-preset-gatsby-package": "^2.14.0-next.2",
     "cross-env": "^7.0.3",
     "is-uuid": "^1.0.2",
     "msw": "^0.38.2",
-    "typescript": "^4.5.5"
+    "typescript": "^4.6.4"
   },
   "engines": {
     "node": ">=14.15.0"

diff --git a/packages/gatsby-cypress/package.json b/packages/gatsby-cypress/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gatsby-cypress",
-  "version": "2.14.0-next.1",
+  "version": "2.14.0-next.2",
   "description": "Cypress tools for Gatsby projects",
   "main": "index.js",
   "repository": {
@@ -20,7 +20,7 @@
   "devDependencies": {
     "@babel/cli": "^7.15.4",
     "@babel/core": "^7.15.5",
-    "babel-preset-gatsby-package": "^2.14.0-next.1",
+    "babel-preset-gatsby-package": "^2.14.0-next.2",
     "cross-env": "^7.0.3"
   },
   "keywords": [

diff --git a/packages/gatsby-dev-cli/package.json b/packages/gatsby-dev-cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-dev-cli",
   "description": "CLI helpers for contributors working on Gatsby",
-  "version": "4.14.0-next.1",
+  "version": "4.14.0-next.2",
   "author": "Kyle Mathews <[email protected]>",
   "bin": {
     "gatsby-dev": "./dist/index.js"
@@ -16,7 +16,7 @@
     "del": "^6.0.0",
     "execa": "^5.1.1",
     "find-yarn-workspace-root": "^2.0.0",
-    "fs-extra": "^10.0.0",
+    "fs-extra": "^10.1.0",
     "got": "^11.8.3",
     "is-absolute": "^1.0.0",
     "lodash": "^4.17.21",
@@ -27,7 +27,7 @@
   "devDependencies": {
     "@babel/cli": "^7.15.4",
     "@babel/core": "^7.15.5",
-    "babel-preset-gatsby-package": "^2.14.0-next.1",
+    "babel-preset-gatsby-package": "^2.14.0-next.2",
     "cross-env": "^7.0.3"
   },
   "homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-dev-cli#readme",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -74,3 +74,5 @@ cypress/fixtures
		cypress/videos

		__history__.json

		src/gatsby-types.d.ts