Skip to content

Commit 52e07c1

Browse files
authored
Merge branch 'master' into merceyz/missing-deps
2 parents 4dfff9e + ccf70da commit 52e07c1

File tree

585 files changed

+11139
-13070
lines changed

Some content is hidden

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

585 files changed

+11139
-13070
lines changed

.circleci/config.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,15 @@ executors:
1414
GATSBY_CPU_COUNT: 2
1515

1616
aliases:
17+
e2e-executor-env: &e2e-executor-env
18+
GATSBY_CPU_COUNT: 2
19+
VERBOSE: 1
20+
1721
e2e-executor: &e2e-executor
1822
docker:
1923
- image: cypress/browsers:node14.15.0-chrome86-ff82
2024
environment:
21-
GATSBY_CPU_COUNT: 2
25+
<<: *e2e-executor-env
2226

2327
restore_cache: &restore_cache
2428
restore_cache:
@@ -91,6 +95,8 @@ aliases:
9195
GENERATE_JEST_REPORT: "true"
9296
JEST_JUNIT_OUTPUT_DIR: ./test-results/jest-node/
9397
JEST_JUNIT_OUTPUT_NAME: results.xml
98+
GATSBY_EXPERIMENTAL_LMDB_STORE: 1
99+
GATSBY_EXPERIMENTAL_PARALLEL_QUERY_RUNNING: 1
94100
- store_test_results:
95101
path: ./test-results/jest-node/
96102

@@ -126,6 +132,7 @@ aliases:
126132
type: boolean
127133
default: false
128134
environment:
135+
<<: *e2e-executor-env
129136
CYPRESS_PROJECT_ID: s3j3qj
130137
CYPRESS_RECORD_KEY: 3904ca0c-bc98-47d9-8371-b68c5e81fb9b
131138
steps:
@@ -318,6 +325,7 @@ jobs:
318325
e2e_tests_path-prefix:
319326
<<: *e2e-executor
320327
environment:
328+
<<: *e2e-executor-env
321329
CYPRESS_PROJECT_ID: pzj19c
322330
CYPRESS_RECORD_KEY: c9ea1b91-eed6-4bac-be41-eccd75a48969
323331
steps:
@@ -388,6 +396,7 @@ jobs:
388396
themes_e2e_tests_development_runtime:
389397
<<: *e2e-executor
390398
environment:
399+
<<: *e2e-executor-env
391400
CYPRESS_PROJECT_ID: 9parq5
392401
CYPRESS_RECORD_KEY: 3fb49000-4143-4bd8-9ab4-219389060910
393402
steps:
@@ -398,6 +407,7 @@ jobs:
398407
themes_e2e_tests_production_runtime:
399408
<<: *e2e-executor
400409
environment:
410+
<<: *e2e-executor-env
401411
CYPRESS_PROJECT_ID: c9rs27
402412
CYPRESS_RECORD_KEY: e4e7b3b8-e1e7-4a74-a0c9-9ac76585236b
403413
steps:
@@ -408,6 +418,7 @@ jobs:
408418
mdx_e2e_tests:
409419
<<: *e2e-executor
410420
environment:
421+
<<: *e2e-executor-env
411422
CYPRESS_PROJECT_ID: spbj28
412423
CYPRESS_RECORD_KEY: af30ea46-121f-4fb7-97dd-f17ec224402e
413424
steps:
@@ -418,6 +429,7 @@ jobs:
418429
e2e_tests_gatsby-static-image:
419430
<<: *e2e-executor
420431
environment:
432+
<<: *e2e-executor-env
421433
CYPRESS_PROJECT_ID: zstawi
422434
CYPRESS_RECORD_KEY: 389326a6-c0d2-4215-bc5e-3be29483ed13
423435
steps:
@@ -428,6 +440,7 @@ jobs:
428440
e2e_tests_visual-regression:
429441
<<: *e2e-executor
430442
environment:
443+
<<: *e2e-executor-env
431444
CYPRESS_PROJECT_ID: nz99aw
432445
CYPRESS_RECORD_KEY: ed4b1af1-bd97-47d4-bb09-3cab2435a147
433446
steps:
@@ -442,6 +455,7 @@ jobs:
442455
e2e_tests_contentful:
443456
<<: *e2e-executor
444457
environment:
458+
<<: *e2e-executor-env
445459
CYPRESS_PROJECT_ID: 2193cm
446460
CYPRESS_RECORD_KEY: 57e9563e-af49-494c-837c-5af53c2d6f76
447461
steps:

.github/actions/format-stale-output/dist/index.js

Lines changed: 93 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/******/ (() => { // webpackBootstrap
22
/******/ var __webpack_modules__ = ({
33

4-
/***/ 264:
4+
/***/ 473:
55
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
66

77
"use strict";
@@ -28,7 +28,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
2828
Object.defineProperty(exports, "__esModule", ({ value: true }));
2929
exports.issue = exports.issueCommand = void 0;
3030
const os = __importStar(__nccwpck_require__(37));
31-
const utils_1 = __nccwpck_require__(814);
31+
const utils_1 = __nccwpck_require__(767);
3232
/**
3333
* Commands
3434
*
@@ -100,7 +100,7 @@ function escapeProperty(s) {
100100

101101
/***/ }),
102102

103-
/***/ 909:
103+
/***/ 406:
104104
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
105105

106106
"use strict";
@@ -135,12 +135,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
135135
};
136136
Object.defineProperty(exports, "__esModule", ({ value: true }));
137137
exports.getIDToken = exports.getState = exports.saveState = exports.group = exports.endGroup = exports.startGroup = exports.info = exports.notice = exports.warning = exports.error = exports.debug = exports.isDebug = exports.setFailed = exports.setCommandEcho = exports.setOutput = exports.getBooleanInput = exports.getMultilineInput = exports.getInput = exports.addPath = exports.setSecret = exports.exportVariable = exports.ExitCode = void 0;
138-
const command_1 = __nccwpck_require__(264);
139-
const file_command_1 = __nccwpck_require__(694);
140-
const utils_1 = __nccwpck_require__(814);
138+
const command_1 = __nccwpck_require__(473);
139+
const file_command_1 = __nccwpck_require__(230);
140+
const utils_1 = __nccwpck_require__(767);
141141
const os = __importStar(__nccwpck_require__(37));
142142
const path = __importStar(__nccwpck_require__(17));
143-
const oidc_utils_1 = __nccwpck_require__(786);
143+
const oidc_utils_1 = __nccwpck_require__(149);
144144
/**
145145
* The code to exit an action
146146
*/
@@ -419,7 +419,7 @@ exports.getIDToken = getIDToken;
419419

420420
/***/ }),
421421

422-
/***/ 694:
422+
/***/ 230:
423423
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
424424

425425
"use strict";
@@ -450,7 +450,7 @@ exports.issueCommand = void 0;
450450
/* eslint-disable @typescript-eslint/no-explicit-any */
451451
const fs = __importStar(__nccwpck_require__(147));
452452
const os = __importStar(__nccwpck_require__(37));
453-
const utils_1 = __nccwpck_require__(814);
453+
const utils_1 = __nccwpck_require__(767);
454454
function issueCommand(command, message) {
455455
const filePath = process.env[`GITHUB_${command}`];
456456
if (!filePath) {
@@ -468,7 +468,7 @@ exports.issueCommand = issueCommand;
468468

469469
/***/ }),
470470

471-
/***/ 786:
471+
/***/ 149:
472472
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
473473

474474
"use strict";
@@ -484,9 +484,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
484484
};
485485
Object.defineProperty(exports, "__esModule", ({ value: true }));
486486
exports.OidcClient = void 0;
487-
const http_client_1 = __nccwpck_require__(316);
488-
const auth_1 = __nccwpck_require__(25);
489-
const core_1 = __nccwpck_require__(909);
487+
const http_client_1 = __nccwpck_require__(277);
488+
const auth_1 = __nccwpck_require__(689);
489+
const core_1 = __nccwpck_require__(406);
490490
class OidcClient {
491491
static createHttpClient(allowRetry = true, maxRetry = 10) {
492492
const requestOptions = {
@@ -552,7 +552,7 @@ exports.OidcClient = OidcClient;
552552

553553
/***/ }),
554554

555-
/***/ 814:
555+
/***/ 767:
556556
/***/ ((__unused_webpack_module, exports) => {
557557

558558
"use strict";
@@ -599,7 +599,7 @@ exports.toCommandProperties = toCommandProperties;
599599

600600
/***/ }),
601601

602-
/***/ 25:
602+
/***/ 689:
603603
/***/ ((__unused_webpack_module, exports) => {
604604

605605
"use strict";
@@ -665,15 +665,15 @@ exports.PersonalAccessTokenCredentialHandler = PersonalAccessTokenCredentialHand
665665

666666
/***/ }),
667667

668-
/***/ 316:
668+
/***/ 277:
669669
/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
670670

671671
"use strict";
672672

673673
Object.defineProperty(exports, "__esModule", ({ value: true }));
674674
const http = __nccwpck_require__(685);
675675
const https = __nccwpck_require__(687);
676-
const pm = __nccwpck_require__(808);
676+
const pm = __nccwpck_require__(359);
677677
let tunnel;
678678
var HttpCodes;
679679
(function (HttpCodes) {
@@ -1092,7 +1092,7 @@ class HttpClient {
10921092
if (useProxy) {
10931093
// If using proxy, need tunnel
10941094
if (!tunnel) {
1095-
tunnel = __nccwpck_require__(707);
1095+
tunnel = __nccwpck_require__(0);
10961096
}
10971097
const agentOptions = {
10981098
maxSockets: maxSockets,
@@ -1210,7 +1210,7 @@ exports.HttpClient = HttpClient;
12101210

12111211
/***/ }),
12121212

1213-
/***/ 808:
1213+
/***/ 359:
12141214
/***/ ((__unused_webpack_module, exports) => {
12151215

12161216
"use strict";
@@ -1275,21 +1275,21 @@ exports.checkBypass = checkBypass;
12751275

12761276
/***/ }),
12771277

1278-
/***/ 707:
1278+
/***/ 0:
12791279
/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
12801280

1281-
module.exports = __nccwpck_require__(154);
1281+
module.exports = __nccwpck_require__(531);
12821282

12831283

12841284
/***/ }),
12851285

1286-
/***/ 154:
1286+
/***/ 531:
12871287
/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
12881288

12891289
"use strict";
12901290

12911291

1292-
var net = __nccwpck_require__(982);
1292+
var net = __nccwpck_require__(808);
12931293
var tls = __nccwpck_require__(404);
12941294
var http = __nccwpck_require__(685);
12951295
var https = __nccwpck_require__(687);
@@ -1553,6 +1553,66 @@ if (process.env.NODE_DEBUG && /\btunnel\b/.test(process.env.NODE_DEBUG)) {
15531553
exports.debug = debug; // for test
15541554

15551555

1556+
/***/ }),
1557+
1558+
/***/ 679:
1559+
/***/ ((module) => {
1560+
1561+
const messages = {
1562+
stale: {
1563+
found: "*_Issues were marked as stale_*",
1564+
empty: "No issues were marked as stale"
1565+
},
1566+
closed: {
1567+
found: "*_Issues were closed_*",
1568+
empty: "There are none! Great job!"
1569+
}
1570+
}
1571+
1572+
/**
1573+
* Format a list of issues to Slack's block kit
1574+
* @see https://api.slack.com/tools/block-kit-builder
1575+
* @param queue
1576+
* @param type - Which type of issue. stale | closed
1577+
*/
1578+
const slackMessage = (queue, type) => {
1579+
const report = []
1580+
1581+
report.push({
1582+
type: "divider",
1583+
})
1584+
1585+
report.push({
1586+
type: "section",
1587+
text: {
1588+
type: "mrkdwn",
1589+
text: `[${queue.length}] ${messages[type].found}`,
1590+
},
1591+
})
1592+
1593+
let text = ``
1594+
1595+
queue.map((issue, i) => {
1596+
text += `${i + 1 + `. `}<${issue.url}|${issue.title}>\n`
1597+
})
1598+
1599+
if (text === ``) {
1600+
text = messages[type].empty
1601+
}
1602+
1603+
report.push({
1604+
type: "section",
1605+
text: {
1606+
type: "mrkdwn",
1607+
text,
1608+
},
1609+
})
1610+
1611+
return report
1612+
}
1613+
1614+
module.exports = slackMessage
1615+
15561616
/***/ }),
15571617

15581618
/***/ 491:
@@ -1595,7 +1655,7 @@ module.exports = require("https");
15951655

15961656
/***/ }),
15971657

1598-
/***/ 982:
1658+
/***/ 808:
15991659
/***/ ((module) => {
16001660

16011661
"use strict";
@@ -1676,11 +1736,17 @@ module.exports = require("util");
16761736
var __webpack_exports__ = {};
16771737
// This entry need to be wrapped in an IIFE because it need to be isolated against other modules in the chunk.
16781738
(() => {
1679-
const core = __nccwpck_require__(909)
1680-
const slackMessage = "./slack-message"
1739+
const core = __nccwpck_require__(406)
1740+
const slackMessage = __nccwpck_require__(679)
16811741

16821742
function formatIssues(issues) {
1683-
return issues.map(entry => ({
1743+
const parsedIssues = JSON.parse(issues)
1744+
1745+
if (parsedIssues.length === 0) {
1746+
return []
1747+
}
1748+
1749+
return parsedIssues.map(entry => ({
16841750
title: entry.title,
16851751
url: `https://github.com/gatsbyjs/gatsby/issues/${entry.number}`
16861752
}))

.github/actions/format-stale-output/index.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
const core = require("@actions/core")
2-
const slackMessage = "./slack-message"
2+
const slackMessage = require("./slack-message")
33

44
function formatIssues(issues) {
5-
return issues.map(entry => ({
5+
const parsedIssues = JSON.parse(issues)
6+
7+
if (parsedIssues.length === 0) {
8+
return []
9+
}
10+
11+
return parsedIssues.map(entry => ({
612
title: entry.title,
713
url: `https://github.com/gatsbyjs/gatsby/issues/${entry.number}`
814
}))

.github/actions/format-stale-output/slack-message.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@ const slackMessage = (queue, type) => {
5151
return report
5252
}
5353

54-
export default slackMessage
54+
module.exports = slackMessage

.github/actions/high-priority-prs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
"lodash": "^4.17.15"
1515
},
1616
"devDependencies": {
17-
"jest": "^25.1.0"
17+
"jest": "^27.2.1"
1818
}
1919
}

.github/workflows/schedule-stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
staled-issues-prs: ${{ steps.stale.outputs.staled-issues-prs }}
4444
closed-issues-prs: ${{ steps.stale.outputs.closed-issues-prs }}
4545
- name: Slack Report Closed Issues
46-
uses: pullreminders/slack-action@v1.0.7
46+
uses: pullreminders/slack-action@master
4747
env:
4848
SLACK_BOT_TOKEN: ${{ secrets.SLACK_TOKEN }}
4949
with:

.jestSetup.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
process.env.GATSBY_RECIPES_NO_COLOR = "true"
2+
3+
// Potrace has a dependency on giwrap which has a process.nextTick as a sideEffect which messes up with jest.
4+
jest.mock(`gifwrap`, () => jest.fn())

0 commit comments

Comments
 (0)