Merge remote-tracking branch 'origin/master' into chore/use-updated-f…

…ork-of-babel-plugin-lodash
gatsbyjs · Jan 9, 2024 · 15402e8 · 15402e8
2 parents fa118f6 + 0a80cd6
commit 15402e8
Show file tree

Hide file tree

Showing 121 changed files with 557 additions and 410 deletions.
diff --git a/.jestSetup.js b/.jestSetup.js
@@ -5,7 +5,30 @@ if (
   typeof globalThis.TextEncoder === "undefined" ||
   typeof globalThis.TextDecoder === "undefined"
 ) {
-  const utils = require("util");
-  globalThis.TextEncoder = utils.TextEncoder;
-  globalThis.TextDecoder = utils.TextDecoder;
+  const utils = require("util")
+  globalThis.TextEncoder = utils.TextEncoder
+  globalThis.TextDecoder = utils.TextDecoder
 }
+
+jest.mock(`gatsby-worker`, () => {
+  const gatsbyWorker = jest.requireActual(`gatsby-worker`)
+
+  const { WorkerPool: OriginalWorkerPool } = gatsbyWorker
+
+  class WorkerPoolThatCanUseTS extends OriginalWorkerPool {
+    constructor(workerPath, options) {
+      options.env = {
+        ...(options.env ?? {}),
+        NODE_OPTIONS: `--require ${require.resolve(
+          `./packages/gatsby/src/utils/worker/__tests__/test-helpers/ts-register.js`
+        )}`,
+      }
+      super(workerPath, options)
+    }
+  }
+
+  return {
+    ...gatsbyWorker,
+    WorkerPool: WorkerPoolThatCanUseTS,
+  }
+})
diff --git a/e2e-tests/adapters/package.json b/e2e-tests/adapters/package.json
@@ -36,10 +36,10 @@
     "cypress": "^12.14.0",
     "dotenv": "^8.6.0",
     "execa": "^6.1.0",
-    "gatsby-cypress": "^3.11.0",
+    "gatsby-cypress": "^3.13.0",
     "netlify-cli": "^17.9.0",
     "npm-run-all": "^4.1.5",
     "start-server-and-test": "^2.0.3",
-    "typescript": "^5.1.6"
+    "typescript": "^5.3.3"
   }
 }
diff --git a/e2e-tests/contentful/package.json b/e2e-tests/contentful/package.json
@@ -27,7 +27,7 @@
     "prettier": "^2.8.8",
     "srcset": "^5.0.0",
     "start-server-and-test": "^2.0.3",
-    "typescript": "^5.1.6"
+    "typescript": "^5.3.3"
   },
   "keywords": [
     "gatsby"

diff --git a/e2e-tests/development-runtime/package.json b/e2e-tests/development-runtime/package.json
@@ -72,7 +72,7 @@
     "is-ci": "^3.0.1",
     "prettier": "^2.8.8",
     "start-server-and-test": "^2.0.3",
-    "typescript": "^5.1.6",
+    "typescript": "^5.3.3",
     "yargs": "^17.7.2"
   },
   "repository": {

diff --git a/e2e-tests/mdx/package.json b/e2e-tests/mdx/package.json
@@ -49,6 +49,6 @@
     "is-ci": "^3.0.1",
     "prettier": "^2.8.8",
     "start-server-and-test": "^2.0.3",
-    "typescript": "^5.1.6"
+    "typescript": "^5.3.3"
   }
 }
diff --git a/e2e-tests/path-prefix/package.json b/e2e-tests/path-prefix/package.json
@@ -40,14 +40,14 @@
   "devDependencies": {
     "cpy-cli": "^4.2.0",
     "cross-env": "^7.0.3",
-    "del-cli": "^5.0.0",
+    "del-cli": "^5.1.0",
     "gatsby-cypress": "next",
     "is-ci": "^3.0.1",
     "make-dir-cli": "^3.1.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.8.8",
     "start-server-and-test": "^2.0.3",
-    "typescript": "^5.1.6",
+    "typescript": "^5.3.3",
     "wait-on": "^7.2.0"
   },
   "repository": {

diff --git a/e2e-tests/production-runtime/package.json b/e2e-tests/production-runtime/package.json
@@ -63,7 +63,7 @@
     "is-ci": "^3.0.1",
     "prettier": "^2.8.8",
     "start-server-and-test": "^2.0.3",
-    "typescript": "^5.1.6"
+    "typescript": "^5.3.3"
   },
   "repository": {
     "type": "git",

diff --git a/e2e-tests/themes/development-runtime/package.json b/e2e-tests/themes/development-runtime/package.json
@@ -32,7 +32,7 @@
     "is-ci": "^3.0.1",
     "prettier": "^2.8.8",
     "start-server-and-test": "^2.0.3",
-    "typescript": "^5.1.6"
+    "typescript": "^5.3.3"
   },
   "repository": {
     "type": "git",

diff --git a/e2e-tests/themes/production-runtime/package.json b/e2e-tests/themes/production-runtime/package.json
@@ -29,7 +29,7 @@
     "is-ci": "^3.0.1",
     "prettier": "^2.8.8",
     "start-server-and-test": "^2.0.3",
-    "typescript": "^5.1.6"
+    "typescript": "^5.3.3"
   },
   "repository": {
     "type": "git",

diff --git a/e2e-tests/trailing-slash/package.json b/e2e-tests/trailing-slash/package.json
@@ -37,6 +37,6 @@
     "npm-run-all": "^4.1.5",
     "prettier": "^2.8.8",
     "start-server-and-test": "^2.0.3",
-    "typescript": "^5.1.6"
+    "typescript": "^5.3.3"
   }
 }
diff --git a/e2e-tests/visual-regression/package.json b/e2e-tests/visual-regression/package.json
@@ -38,7 +38,7 @@
     "is-ci": "^3.0.1",
     "prettier": "^2.8.8",
     "start-server-and-test": "^2.0.3",
-    "typescript": "^5.1.6"
+    "typescript": "^5.3.3"
   },
   "repository": {
     "type": "git",

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": "5.14.0-next.0",
+  "version": "5.14.0-next.1",
   "author": "Jason Quense <[email protected]>",
   "repository": {
     "type": "git",
@@ -11,12 +11,12 @@
   "dependencies": {
     "@babel/runtime": "^7.20.13",
     "@babel/types": "^7.20.7",
-    "gatsby-core-utils": "^4.14.0-next.0"
+    "gatsby-core-utils": "^4.14.0-next.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.20.7",
     "@babel/core": "^7.20.12",
-    "babel-preset-gatsby-package": "^3.14.0-next.0",
+    "babel-preset-gatsby-package": "^3.14.0-next.1",
     "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": "3.14.0-next.0",
+  "version": "3.14.0-next.1",
   "author": "Philipp Spiess <[email protected]>",
   "repository": {
     "type": "git",

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": "3.14.0-next.0",
+  "version": "3.14.0-next.1",
   "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": "^4.14.0-next.0",
-    "gatsby-legacy-polyfills": "^3.14.0-next.0"
+    "gatsby-core-utils": "^4.14.0-next.1",
+    "gatsby-legacy-polyfills": "^3.14.0-next.1"
   },
   "peerDependencies": {
     "@babel/core": "^7.11.6",
@@ -38,7 +38,7 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.20.7",
-    "babel-preset-gatsby-package": "^3.14.0-next.0",
+    "babel-preset-gatsby-package": "^3.14.0-next.1",
     "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": "3.14.0-next.0",
+  "version": "3.14.0-next.1",
   "main": "lib/index.js",
   "bin": "cli.js",
   "license": "MIT",
@@ -27,7 +27,7 @@
     "enquirer": "^2.3.6",
     "execa": "^5.1.1",
     "fs-extra": "^11.2.0",
-    "gatsby-plugin-utils": "^4.14.0-next.0",
+    "gatsby-plugin-utils": "^4.14.0-next.1",
     "joi": "^17.9.2",
     "microbundle": "^0.15.1",
     "node-fetch": "^2.6.11",

diff --git a/packages/gatsby-adapter-netlify/package.json b/packages/gatsby-adapter-netlify/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gatsby-adapter-netlify",
-  "version": "1.2.0-next.0",
+  "version": "1.2.0-next.1",
   "description": "Gatsby adapter for Netlify",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -43,7 +43,7 @@
     "@babel/cli": "^7.20.7",
     "@babel/core": "^7.20.12",
     "@netlify/edge-functions": "^2.2.0",
-    "babel-preset-gatsby-package": "^3.14.0-next.0",
+    "babel-preset-gatsby-package": "^3.14.0-next.1",
     "cross-env": "^7.0.3",
     "memfs": "^4.6.0",
     "rimraf": "^5.0.5",

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": "5.14.0-next.0",
+  "version": "5.14.0-next.1",
   "author": "Kyle Mathews <[email protected]>",
   "bin": {
     "gatsby": "cli.js"
@@ -26,13 +26,13 @@
     "clipboardy": "^4.0.0",
     "common-tags": "^1.8.2",
     "convert-hrtime": "^3.0.0",
-    "create-gatsby": "^3.14.0-next.0",
+    "create-gatsby": "^3.14.0-next.1",
     "envinfo": "^7.10.0",
     "execa": "^5.1.1",
     "fs-exists-cached": "^1.0.0",
     "fs-extra": "^11.2.0",
-    "gatsby-core-utils": "^4.14.0-next.0",
-    "gatsby-telemetry": "^4.14.0-next.0",
+    "gatsby-core-utils": "^4.14.0-next.1",
+    "gatsby-telemetry": "^4.14.0-next.1",
     "hosted-git-info": "^3.0.8",
     "is-valid-path": "^0.1.1",
     "joi": "^17.9.2",
@@ -62,7 +62,7 @@
     "@types/hosted-git-info": "^3.0.5",
     "@types/yargs": "^15.0.19",
     "@sigmacomputing/babel-plugin-lodash": "^3.3.5",
-    "babel-preset-gatsby-package": "^3.14.0-next.0",
+    "babel-preset-gatsby-package": "^3.14.0-next.1",
     "cross-env": "^7.0.3",
     "ink": "^3.2.0",
     "ink-spinner": "^4.0.3",

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

diff --git a/packages/gatsby-codemods/src/bin/cli.js b/packages/gatsby-codemods/src/bin/cli.js
@@ -11,7 +11,7 @@ const codemods = [
 ]
 
 export const transformerDirectory = path.join(__dirname, `../`, `transforms`)
-export const jscodeshiftExecutable = require.resolve(`.bin/jscodeshift`)
+export const jscodeshiftExecutable = require.resolve(`jscodeshift/bin/jscodeshift.js`)
 
 export function runTransform(transform, targetDir) {
   const transformerPath = path.join(transformerDirectory, `${transform}.js`)

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": "4.14.0-next.0",
+  "version": "4.14.0-next.1",
   "description": "A collection of gatsby utils used in different gatsby packages",
   "keywords": [
     "gatsby",
@@ -82,7 +82,7 @@
     "@babel/cli": "^7.20.7",
     "@babel/core": "^7.20.12",
     "@types/ci-info": "2.0.0",
-    "babel-preset-gatsby-package": "^3.14.0-next.0",
+    "babel-preset-gatsby-package": "^3.14.0-next.1",
     "cross-env": "^7.0.3",
     "del-cli": "^5.0.0",
     "is-uuid": "^1.0.2",

diff --git a/packages/gatsby-cypress/package.json b/packages/gatsby-cypress/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gatsby-cypress",
-  "version": "3.14.0-next.0",
+  "version": "3.14.0-next.1",
   "description": "Cypress tools for Gatsby projects",
   "main": "index.js",
   "types": "index.d.ts",
@@ -21,7 +21,7 @@
   "devDependencies": {
     "@babel/cli": "^7.20.7",
     "@babel/core": "^7.20.12",
-    "babel-preset-gatsby-package": "^3.14.0-next.0",
+    "babel-preset-gatsby-package": "^3.14.0-next.1",
     "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": "5.14.0-next.0",
+  "version": "5.14.0-next.1",
   "author": "Kyle Mathews <[email protected]>",
   "bin": {
     "gatsby-dev": "./dist/index.js"
@@ -27,7 +27,7 @@
   "devDependencies": {
     "@babel/cli": "^7.20.7",
     "@babel/core": "^7.20.12",
-    "babel-preset-gatsby-package": "^3.14.0-next.0",
+    "babel-preset-gatsby-package": "^3.14.0-next.1",
     "cross-env": "^7.0.3"
   },
   "homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-dev-cli#readme",

diff --git a/packages/gatsby-graphiql-explorer/package.json b/packages/gatsby-graphiql-explorer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gatsby-graphiql-explorer",
-  "version": "3.14.0-next.0",
+  "version": "3.14.0-next.1",
   "description": "GraphiQL IDE with custom features for Gatsby users",
   "main": "index.js",
   "scripts": {
@@ -43,7 +43,7 @@
     "@graphiql/react": "^0.18.0",
     "@graphiql/toolkit": "^0.8.4",
     "babel-loader": "^9.1.2",
-    "babel-preset-gatsby-package": "^3.14.0-next.0",
+    "babel-preset-gatsby-package": "^3.14.0-next.1",
     "core-js": "^3.31.0",
     "cross-env": "^7.0.3",
     "css-loader": "^6.8.1",

diff --git a/packages/gatsby-legacy-polyfills/package.json b/packages/gatsby-legacy-polyfills/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-legacy-polyfills",
   "description": "Polyfills for legacy browsers",
-  "version": "3.14.0-next.0",
+  "version": "3.14.0-next.1",
   "main": "dist/polyfills.js",
   "author": "Ward Peeters <[email protected]>",
   "homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-legacy-polyfills#readme",

diff --git a/packages/gatsby-link/package.json b/packages/gatsby-link/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gatsby-link",
   "description": "An enhanced Link component for Gatsby sites with support for resource prefetching",
-  "version": "5.14.0-next.0",
+  "version": "5.14.0-next.1",
   "author": "Kyle Mathews <[email protected]>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
@@ -23,13 +23,13 @@
   },
   "dependencies": {
     "@types/reach__router": "^1.3.10",
-    "gatsby-page-utils": "^3.14.0-next.0",
+    "gatsby-page-utils": "^3.14.0-next.1",
     "prop-types": "^15.8.1"
   },
   "devDependencies": {
     "@testing-library/react": "^11.2.7",
     "cross-env": "^7.0.3",
-    "del-cli": "^5.0.0",
+    "del-cli": "^5.1.0",
     "microbundle": "^0.15.1",
     "prepend-directive": "^1.1.0"
   },