Skip to content

Commit 15402e8

Browse files
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

Lines changed: 26 additions & 3 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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
}

0 commit comments

Comments
 (0)