Skip to content

Commit 15402e8

Browse files
piehpieh
committed
Merge remote-tracking branch 'origin/master' into chore/use-updated-fork-of-babel-plugin-lodash
2 parents fa118f6 + 0a80cd6 commit 15402e8

File tree

121 files changed

+557
-410
lines changed

Some content is hidden

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

121 files changed

+557
-410
lines changed

‎.jestSetup.js

+26-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,30 @@ if (
55
typeof globalThis.TextEncoder === "undefined" ||
66
typeof globalThis.TextDecoder === "undefined"
77
) {
8-
const utils = require("util");
9-
globalThis.TextEncoder = utils.TextEncoder;
10-
globalThis.TextDecoder = utils.TextDecoder;
8+
const utils = require("util")
9+
globalThis.TextEncoder = utils.TextEncoder
10+
globalThis.TextDecoder = utils.TextDecoder
1111
}
12+
13+
jest.mock(`gatsby-worker`, () => {
14+
const gatsbyWorker = jest.requireActual(`gatsby-worker`)
15+
16+
const { WorkerPool: OriginalWorkerPool } = gatsbyWorker
17+
18+
class WorkerPoolThatCanUseTS extends OriginalWorkerPool {
19+
constructor(workerPath, options) {
20+
options.env = {
21+
...(options.env ?? {}),
22+
NODE_OPTIONS: `--require ${require.resolve(
23+
`./packages/gatsby/src/utils/worker/__tests__/test-helpers/ts-register.js`
24+
)}`,
25+
}
26+
super(workerPath, options)
27+
}
28+
}
29+
30+
return {
31+
...gatsbyWorker,
32+
WorkerPool: WorkerPoolThatCanUseTS,
33+
}
34+
})

‎e2e-tests/adapters/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
"cypress": "^12.14.0",
3737
"dotenv": "^8.6.0",
3838
"execa": "^6.1.0",
39-
"gatsby-cypress": "^3.11.0",
39+
"gatsby-cypress": "^3.13.0",
4040
"netlify-cli": "^17.9.0",
4141
"npm-run-all": "^4.1.5",
4242
"start-server-and-test": "^2.0.3",
43-
"typescript": "^5.1.6"
43+
"typescript": "^5.3.3"
4444
}
4545
}

‎e2e-tests/contentful/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"prettier": "^2.8.8",
2828
"srcset": "^5.0.0",
2929
"start-server-and-test": "^2.0.3",
30-
"typescript": "^5.1.6"
30+
"typescript": "^5.3.3"
3131
},
3232
"keywords": [
3333
"gatsby"

‎e2e-tests/development-runtime/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
"is-ci": "^3.0.1",
7373
"prettier": "^2.8.8",
7474
"start-server-and-test": "^2.0.3",
75-
"typescript": "^5.1.6",
75+
"typescript": "^5.3.3",
7676
"yargs": "^17.7.2"
7777
},
7878
"repository": {

‎e2e-tests/mdx/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@
4949
"is-ci": "^3.0.1",
5050
"prettier": "^2.8.8",
5151
"start-server-and-test": "^2.0.3",
52-
"typescript": "^5.1.6"
52+
"typescript": "^5.3.3"
5353
}
5454
}

‎e2e-tests/path-prefix/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@
4040
"devDependencies": {
4141
"cpy-cli": "^4.2.0",
4242
"cross-env": "^7.0.3",
43-
"del-cli": "^5.0.0",
43+
"del-cli": "^5.1.0",
4444
"gatsby-cypress": "next",
4545
"is-ci": "^3.0.1",
4646
"make-dir-cli": "^3.1.0",
4747
"npm-run-all": "^4.1.5",
4848
"prettier": "^2.8.8",
4949
"start-server-and-test": "^2.0.3",
50-
"typescript": "^5.1.6",
50+
"typescript": "^5.3.3",
5151
"wait-on": "^7.2.0"
5252
},
5353
"repository": {

‎e2e-tests/production-runtime/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"is-ci": "^3.0.1",
6464
"prettier": "^2.8.8",
6565
"start-server-and-test": "^2.0.3",
66-
"typescript": "^5.1.6"
66+
"typescript": "^5.3.3"
6767
},
6868
"repository": {
6969
"type": "git",

‎e2e-tests/themes/development-runtime/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"is-ci": "^3.0.1",
3333
"prettier": "^2.8.8",
3434
"start-server-and-test": "^2.0.3",
35-
"typescript": "^5.1.6"
35+
"typescript": "^5.3.3"
3636
},
3737
"repository": {
3838
"type": "git",

‎e2e-tests/themes/production-runtime/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"is-ci": "^3.0.1",
3030
"prettier": "^2.8.8",
3131
"start-server-and-test": "^2.0.3",
32-
"typescript": "^5.1.6"
32+
"typescript": "^5.3.3"
3333
},
3434
"repository": {
3535
"type": "git",

‎e2e-tests/trailing-slash/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@
3737
"npm-run-all": "^4.1.5",
3838
"prettier": "^2.8.8",
3939
"start-server-and-test": "^2.0.3",
40-
"typescript": "^5.1.6"
40+
"typescript": "^5.3.3"
4141
}
4242
}

‎e2e-tests/visual-regression/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"is-ci": "^3.0.1",
3939
"prettier": "^2.8.8",
4040
"start-server-and-test": "^2.0.3",
41-
"typescript": "^5.1.6"
41+
"typescript": "^5.3.3"
4242
},
4343
"repository": {
4444
"type": "git",

‎packages/babel-plugin-remove-graphql-queries/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "babel-plugin-remove-graphql-queries",
3-
"version": "5.14.0-next.0",
3+
"version": "5.14.0-next.1",
44
"author": "Jason Quense <[email protected]>",
55
"repository": {
66
"type": "git",
@@ -11,12 +11,12 @@
1111
"dependencies": {
1212
"@babel/runtime": "^7.20.13",
1313
"@babel/types": "^7.20.7",
14-
"gatsby-core-utils": "^4.14.0-next.0"
14+
"gatsby-core-utils": "^4.14.0-next.1"
1515
},
1616
"devDependencies": {
1717
"@babel/cli": "^7.20.7",
1818
"@babel/core": "^7.20.12",
19-
"babel-preset-gatsby-package": "^3.14.0-next.0",
19+
"babel-preset-gatsby-package": "^3.14.0-next.1",
2020
"cross-env": "^7.0.3"
2121
},
2222
"peerDependencies": {

‎packages/babel-preset-gatsby-package/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "babel-preset-gatsby-package",
3-
"version": "3.14.0-next.0",
3+
"version": "3.14.0-next.1",
44
"author": "Philipp Spiess <[email protected]>",
55
"repository": {
66
"type": "git",

‎packages/babel-preset-gatsby/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "babel-preset-gatsby",
3-
"version": "3.14.0-next.0",
3+
"version": "3.14.0-next.1",
44
"author": "Philipp Spiess <[email protected]>",
55
"repository": {
66
"type": "git",
@@ -22,8 +22,8 @@
2222
"babel-plugin-dynamic-import-node": "^2.3.3",
2323
"babel-plugin-macros": "^3.1.0",
2424
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
25-
"gatsby-core-utils": "^4.14.0-next.0",
26-
"gatsby-legacy-polyfills": "^3.14.0-next.0"
25+
"gatsby-core-utils": "^4.14.0-next.1",
26+
"gatsby-legacy-polyfills": "^3.14.0-next.1"
2727
},
2828
"peerDependencies": {
2929
"@babel/core": "^7.11.6",
@@ -38,7 +38,7 @@
3838
},
3939
"devDependencies": {
4040
"@babel/cli": "^7.20.7",
41-
"babel-preset-gatsby-package": "^3.14.0-next.0",
41+
"babel-preset-gatsby-package": "^3.14.0-next.1",
4242
"cross-env": "^7.0.3",
4343
"slash": "^3.0.0"
4444
},

‎packages/create-gatsby/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "create-gatsby",
3-
"version": "3.14.0-next.0",
3+
"version": "3.14.0-next.1",
44
"main": "lib/index.js",
55
"bin": "cli.js",
66
"license": "MIT",
@@ -27,7 +27,7 @@
2727
"enquirer": "^2.3.6",
2828
"execa": "^5.1.1",
2929
"fs-extra": "^11.2.0",
30-
"gatsby-plugin-utils": "^4.14.0-next.0",
30+
"gatsby-plugin-utils": "^4.14.0-next.1",
3131
"joi": "^17.9.2",
3232
"microbundle": "^0.15.1",
3333
"node-fetch": "^2.6.11",

‎packages/gatsby-adapter-netlify/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gatsby-adapter-netlify",
3-
"version": "1.2.0-next.0",
3+
"version": "1.2.0-next.1",
44
"description": "Gatsby adapter for Netlify",
55
"main": "dist/index.js",
66
"types": "dist/index.d.ts",
@@ -43,7 +43,7 @@
4343
"@babel/cli": "^7.20.7",
4444
"@babel/core": "^7.20.12",
4545
"@netlify/edge-functions": "^2.2.0",
46-
"babel-preset-gatsby-package": "^3.14.0-next.0",
46+
"babel-preset-gatsby-package": "^3.14.0-next.1",
4747
"cross-env": "^7.0.3",
4848
"memfs": "^4.6.0",
4949
"rimraf": "^5.0.5",

‎packages/gatsby-cli/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "gatsby-cli",
33
"description": "Gatsby command-line interface for creating new sites and running Gatsby commands",
4-
"version": "5.14.0-next.0",
4+
"version": "5.14.0-next.1",
55
"author": "Kyle Mathews <[email protected]>",
66
"bin": {
77
"gatsby": "cli.js"
@@ -26,13 +26,13 @@
2626
"clipboardy": "^4.0.0",
2727
"common-tags": "^1.8.2",
2828
"convert-hrtime": "^3.0.0",
29-
"create-gatsby": "^3.14.0-next.0",
29+
"create-gatsby": "^3.14.0-next.1",
3030
"envinfo": "^7.10.0",
3131
"execa": "^5.1.1",
3232
"fs-exists-cached": "^1.0.0",
3333
"fs-extra": "^11.2.0",
34-
"gatsby-core-utils": "^4.14.0-next.0",
35-
"gatsby-telemetry": "^4.14.0-next.0",
34+
"gatsby-core-utils": "^4.14.0-next.1",
35+
"gatsby-telemetry": "^4.14.0-next.1",
3636
"hosted-git-info": "^3.0.8",
3737
"is-valid-path": "^0.1.1",
3838
"joi": "^17.9.2",
@@ -62,7 +62,7 @@
6262
"@types/hosted-git-info": "^3.0.5",
6363
"@types/yargs": "^15.0.19",
6464
"@sigmacomputing/babel-plugin-lodash": "^3.3.5",
65-
"babel-preset-gatsby-package": "^3.14.0-next.0",
65+
"babel-preset-gatsby-package": "^3.14.0-next.1",
6666
"cross-env": "^7.0.3",
6767
"ink": "^3.2.0",
6868
"ink-spinner": "^4.0.3",

‎packages/gatsby-codemods/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gatsby-codemods",
3-
"version": "4.14.0-next.0",
3+
"version": "4.14.0-next.1",
44
"description": "A collection of codemod scripts for use with JSCodeshift that help migrate to newer versions of Gatsby.",
55
"main": "index.js",
66
"scripts": {
@@ -37,7 +37,7 @@
3737
"devDependencies": {
3838
"@babel/cli": "^7.20.7",
3939
"@types/jscodeshift": "^0.11.11",
40-
"babel-preset-gatsby-package": "^3.14.0-next.0",
40+
"babel-preset-gatsby-package": "^3.14.0-next.1",
4141
"cross-env": "^7.0.3"
4242
},
4343
"engines": {

‎packages/gatsby-codemods/src/bin/cli.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const codemods = [
1111
]
1212

1313
export const transformerDirectory = path.join(__dirname, `../`, `transforms`)
14-
export const jscodeshiftExecutable = require.resolve(`.bin/jscodeshift`)
14+
export const jscodeshiftExecutable = require.resolve(`jscodeshift/bin/jscodeshift.js`)
1515

1616
export function runTransform(transform, targetDir) {
1717
const transformerPath = path.join(transformerDirectory, `${transform}.js`)

‎packages/gatsby-core-utils/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gatsby-core-utils",
3-
"version": "4.14.0-next.0",
3+
"version": "4.14.0-next.1",
44
"description": "A collection of gatsby utils used in different gatsby packages",
55
"keywords": [
66
"gatsby",
@@ -82,7 +82,7 @@
8282
"@babel/cli": "^7.20.7",
8383
"@babel/core": "^7.20.12",
8484
"@types/ci-info": "2.0.0",
85-
"babel-preset-gatsby-package": "^3.14.0-next.0",
85+
"babel-preset-gatsby-package": "^3.14.0-next.1",
8686
"cross-env": "^7.0.3",
8787
"del-cli": "^5.0.0",
8888
"is-uuid": "^1.0.2",

‎packages/gatsby-cypress/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gatsby-cypress",
3-
"version": "3.14.0-next.0",
3+
"version": "3.14.0-next.1",
44
"description": "Cypress tools for Gatsby projects",
55
"main": "index.js",
66
"types": "index.d.ts",
@@ -21,7 +21,7 @@
2121
"devDependencies": {
2222
"@babel/cli": "^7.20.7",
2323
"@babel/core": "^7.20.12",
24-
"babel-preset-gatsby-package": "^3.14.0-next.0",
24+
"babel-preset-gatsby-package": "^3.14.0-next.1",
2525
"cross-env": "^7.0.3"
2626
},
2727
"keywords": [

‎packages/gatsby-dev-cli/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "gatsby-dev-cli",
33
"description": "CLI helpers for contributors working on Gatsby",
4-
"version": "5.14.0-next.0",
4+
"version": "5.14.0-next.1",
55
"author": "Kyle Mathews <[email protected]>",
66
"bin": {
77
"gatsby-dev": "./dist/index.js"
@@ -27,7 +27,7 @@
2727
"devDependencies": {
2828
"@babel/cli": "^7.20.7",
2929
"@babel/core": "^7.20.12",
30-
"babel-preset-gatsby-package": "^3.14.0-next.0",
30+
"babel-preset-gatsby-package": "^3.14.0-next.1",
3131
"cross-env": "^7.0.3"
3232
},
3333
"homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-dev-cli#readme",

‎packages/gatsby-graphiql-explorer/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gatsby-graphiql-explorer",
3-
"version": "3.14.0-next.0",
3+
"version": "3.14.0-next.1",
44
"description": "GraphiQL IDE with custom features for Gatsby users",
55
"main": "index.js",
66
"scripts": {
@@ -43,7 +43,7 @@
4343
"@graphiql/react": "^0.18.0",
4444
"@graphiql/toolkit": "^0.8.4",
4545
"babel-loader": "^9.1.2",
46-
"babel-preset-gatsby-package": "^3.14.0-next.0",
46+
"babel-preset-gatsby-package": "^3.14.0-next.1",
4747
"core-js": "^3.31.0",
4848
"cross-env": "^7.0.3",
4949
"css-loader": "^6.8.1",

‎packages/gatsby-legacy-polyfills/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "gatsby-legacy-polyfills",
33
"description": "Polyfills for legacy browsers",
4-
"version": "3.14.0-next.0",
4+
"version": "3.14.0-next.1",
55
"main": "dist/polyfills.js",
66
"author": "Ward Peeters <[email protected]>",
77
"homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-legacy-polyfills#readme",

‎packages/gatsby-link/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "gatsby-link",
33
"description": "An enhanced Link component for Gatsby sites with support for resource prefetching",
4-
"version": "5.14.0-next.0",
4+
"version": "5.14.0-next.1",
55
"author": "Kyle Mathews <[email protected]>",
66
"bugs": {
77
"url": "https://github.com/gatsbyjs/gatsby/issues"
@@ -23,13 +23,13 @@
2323
},
2424
"dependencies": {
2525
"@types/reach__router": "^1.3.10",
26-
"gatsby-page-utils": "^3.14.0-next.0",
26+
"gatsby-page-utils": "^3.14.0-next.1",
2727
"prop-types": "^15.8.1"
2828
},
2929
"devDependencies": {
3030
"@testing-library/react": "^11.2.7",
3131
"cross-env": "^7.0.3",
32-
"del-cli": "^5.0.0",
32+
"del-cli": "^5.1.0",
3333
"microbundle": "^0.15.1",
3434
"prepend-directive": "^1.1.0"
3535
},

0 commit comments

Comments
 (0)