Skip to content

Commit

Permalink
Merge branch 'master' into merceyz/missing-deps
Browse files Browse the repository at this point in the history
  • Loading branch information
wardpeet committed Dec 19, 2021
2 parents 4dfff9e + ccf70da commit 52e07c1
Show file tree
Hide file tree
Showing 585 changed files with 11,139 additions and 13,070 deletions.
16 changes: 15 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,15 @@ executors:
GATSBY_CPU_COUNT: 2

aliases:
e2e-executor-env: &e2e-executor-env
GATSBY_CPU_COUNT: 2
VERBOSE: 1

e2e-executor: &e2e-executor
docker:
- image: cypress/browsers:node14.15.0-chrome86-ff82
environment:
GATSBY_CPU_COUNT: 2
<<: *e2e-executor-env

restore_cache: &restore_cache
restore_cache:
Expand Down Expand Up @@ -91,6 +95,8 @@ aliases:
GENERATE_JEST_REPORT: "true"
JEST_JUNIT_OUTPUT_DIR: ./test-results/jest-node/
JEST_JUNIT_OUTPUT_NAME: results.xml
GATSBY_EXPERIMENTAL_LMDB_STORE: 1
GATSBY_EXPERIMENTAL_PARALLEL_QUERY_RUNNING: 1
- store_test_results:
path: ./test-results/jest-node/

Expand Down Expand Up @@ -126,6 +132,7 @@ aliases:
type: boolean
default: false
environment:
<<: *e2e-executor-env
CYPRESS_PROJECT_ID: s3j3qj
CYPRESS_RECORD_KEY: 3904ca0c-bc98-47d9-8371-b68c5e81fb9b
steps:
Expand Down Expand Up @@ -318,6 +325,7 @@ jobs:
e2e_tests_path-prefix:
<<: *e2e-executor
environment:
<<: *e2e-executor-env
CYPRESS_PROJECT_ID: pzj19c
CYPRESS_RECORD_KEY: c9ea1b91-eed6-4bac-be41-eccd75a48969
steps:
Expand Down Expand Up @@ -388,6 +396,7 @@ jobs:
themes_e2e_tests_development_runtime:
<<: *e2e-executor
environment:
<<: *e2e-executor-env
CYPRESS_PROJECT_ID: 9parq5
CYPRESS_RECORD_KEY: 3fb49000-4143-4bd8-9ab4-219389060910
steps:
Expand All @@ -398,6 +407,7 @@ jobs:
themes_e2e_tests_production_runtime:
<<: *e2e-executor
environment:
<<: *e2e-executor-env
CYPRESS_PROJECT_ID: c9rs27
CYPRESS_RECORD_KEY: e4e7b3b8-e1e7-4a74-a0c9-9ac76585236b
steps:
Expand All @@ -408,6 +418,7 @@ jobs:
mdx_e2e_tests:
<<: *e2e-executor
environment:
<<: *e2e-executor-env
CYPRESS_PROJECT_ID: spbj28
CYPRESS_RECORD_KEY: af30ea46-121f-4fb7-97dd-f17ec224402e
steps:
Expand All @@ -418,6 +429,7 @@ jobs:
e2e_tests_gatsby-static-image:
<<: *e2e-executor
environment:
<<: *e2e-executor-env
CYPRESS_PROJECT_ID: zstawi
CYPRESS_RECORD_KEY: 389326a6-c0d2-4215-bc5e-3be29483ed13
steps:
Expand All @@ -428,6 +440,7 @@ jobs:
e2e_tests_visual-regression:
<<: *e2e-executor
environment:
<<: *e2e-executor-env
CYPRESS_PROJECT_ID: nz99aw
CYPRESS_RECORD_KEY: ed4b1af1-bd97-47d4-bb09-3cab2435a147
steps:
Expand All @@ -442,6 +455,7 @@ jobs:
e2e_tests_contentful:
<<: *e2e-executor
environment:
<<: *e2e-executor-env
CYPRESS_PROJECT_ID: 2193cm
CYPRESS_RECORD_KEY: 57e9563e-af49-494c-837c-5af53c2d6f76
steps:
Expand Down
120 changes: 93 additions & 27 deletions .github/actions/format-stale-output/dist/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/******/ (() => { // webpackBootstrap
/******/ var __webpack_modules__ = ({

/***/ 264:
/***/ 473:
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {

"use strict";
Expand All @@ -28,7 +28,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.issue = exports.issueCommand = void 0;
const os = __importStar(__nccwpck_require__(37));
const utils_1 = __nccwpck_require__(814);
const utils_1 = __nccwpck_require__(767);
/**
* Commands
*
Expand Down Expand Up @@ -100,7 +100,7 @@ function escapeProperty(s) {

/***/ }),

/***/ 909:
/***/ 406:
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {

"use strict";
Expand Down Expand Up @@ -135,12 +135,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
};
Object.defineProperty(exports, "__esModule", ({ value: true }));
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;
const command_1 = __nccwpck_require__(264);
const file_command_1 = __nccwpck_require__(694);
const utils_1 = __nccwpck_require__(814);
const command_1 = __nccwpck_require__(473);
const file_command_1 = __nccwpck_require__(230);
const utils_1 = __nccwpck_require__(767);
const os = __importStar(__nccwpck_require__(37));
const path = __importStar(__nccwpck_require__(17));
const oidc_utils_1 = __nccwpck_require__(786);
const oidc_utils_1 = __nccwpck_require__(149);
/**
* The code to exit an action
*/
Expand Down Expand Up @@ -419,7 +419,7 @@ exports.getIDToken = getIDToken;

/***/ }),

/***/ 694:
/***/ 230:
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {

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

/***/ }),

/***/ 786:
/***/ 149:
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {

"use strict";
Expand All @@ -484,9 +484,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
};
Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.OidcClient = void 0;
const http_client_1 = __nccwpck_require__(316);
const auth_1 = __nccwpck_require__(25);
const core_1 = __nccwpck_require__(909);
const http_client_1 = __nccwpck_require__(277);
const auth_1 = __nccwpck_require__(689);
const core_1 = __nccwpck_require__(406);
class OidcClient {
static createHttpClient(allowRetry = true, maxRetry = 10) {
const requestOptions = {
Expand Down Expand Up @@ -552,7 +552,7 @@ exports.OidcClient = OidcClient;

/***/ }),

/***/ 814:
/***/ 767:
/***/ ((__unused_webpack_module, exports) => {

"use strict";
Expand Down Expand Up @@ -599,7 +599,7 @@ exports.toCommandProperties = toCommandProperties;

/***/ }),

/***/ 25:
/***/ 689:
/***/ ((__unused_webpack_module, exports) => {

"use strict";
Expand Down Expand Up @@ -665,15 +665,15 @@ exports.PersonalAccessTokenCredentialHandler = PersonalAccessTokenCredentialHand

/***/ }),

/***/ 316:
/***/ 277:
/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {

"use strict";

Object.defineProperty(exports, "__esModule", ({ value: true }));
const http = __nccwpck_require__(685);
const https = __nccwpck_require__(687);
const pm = __nccwpck_require__(808);
const pm = __nccwpck_require__(359);
let tunnel;
var HttpCodes;
(function (HttpCodes) {
Expand Down Expand Up @@ -1092,7 +1092,7 @@ class HttpClient {
if (useProxy) {
// If using proxy, need tunnel
if (!tunnel) {
tunnel = __nccwpck_require__(707);
tunnel = __nccwpck_require__(0);
}
const agentOptions = {
maxSockets: maxSockets,
Expand Down Expand Up @@ -1210,7 +1210,7 @@ exports.HttpClient = HttpClient;

/***/ }),

/***/ 808:
/***/ 359:
/***/ ((__unused_webpack_module, exports) => {

"use strict";
Expand Down Expand Up @@ -1275,21 +1275,21 @@ exports.checkBypass = checkBypass;

/***/ }),

/***/ 707:
/***/ 0:
/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {

module.exports = __nccwpck_require__(154);
module.exports = __nccwpck_require__(531);


/***/ }),

/***/ 154:
/***/ 531:
/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {

"use strict";


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


/***/ }),

/***/ 679:
/***/ ((module) => {

const messages = {
stale: {
found: "*_Issues were marked as stale_*",
empty: "No issues were marked as stale"
},
closed: {
found: "*_Issues were closed_*",
empty: "There are none! Great job!"
}
}

/**
* Format a list of issues to Slack's block kit
* @see https://api.slack.com/tools/block-kit-builder
* @param queue
* @param type - Which type of issue. stale | closed
*/
const slackMessage = (queue, type) => {
const report = []

report.push({
type: "divider",
})

report.push({
type: "section",
text: {
type: "mrkdwn",
text: `[${queue.length}] ${messages[type].found}`,
},
})

let text = ``

queue.map((issue, i) => {
text += `${i + 1 + `. `}<${issue.url}|${issue.title}>\n`
})

if (text === ``) {
text = messages[type].empty
}

report.push({
type: "section",
text: {
type: "mrkdwn",
text,
},
})

return report
}

module.exports = slackMessage

/***/ }),

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

/***/ }),

/***/ 982:
/***/ 808:
/***/ ((module) => {

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

function formatIssues(issues) {
return issues.map(entry => ({
const parsedIssues = JSON.parse(issues)

if (parsedIssues.length === 0) {
return []
}

return parsedIssues.map(entry => ({
title: entry.title,
url: `https://github.com/gatsbyjs/gatsby/issues/${entry.number}`
}))
Expand Down
10 changes: 8 additions & 2 deletions .github/actions/format-stale-output/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
const core = require("@actions/core")
const slackMessage = "./slack-message"
const slackMessage = require("./slack-message")

function formatIssues(issues) {
return issues.map(entry => ({
const parsedIssues = JSON.parse(issues)

if (parsedIssues.length === 0) {
return []
}

return parsedIssues.map(entry => ({
title: entry.title,
url: `https://github.com/gatsbyjs/gatsby/issues/${entry.number}`
}))
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/format-stale-output/slack-message.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ const slackMessage = (queue, type) => {
return report
}

export default slackMessage
module.exports = slackMessage
2 changes: 1 addition & 1 deletion .github/actions/high-priority-prs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
"lodash": "^4.17.15"
},
"devDependencies": {
"jest": "^25.1.0"
"jest": "^27.2.1"
}
}
2 changes: 1 addition & 1 deletion .github/workflows/schedule-stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
staled-issues-prs: ${{ steps.stale.outputs.staled-issues-prs }}
closed-issues-prs: ${{ steps.stale.outputs.closed-issues-prs }}
- name: Slack Report Closed Issues
uses: pullreminders/slack-action@v1.0.7
uses: pullreminders/slack-action@master
env:
SLACK_BOT_TOKEN: ${{ secrets.SLACK_TOKEN }}
with:
Expand Down
3 changes: 3 additions & 0 deletions .jestSetup.js
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
process.env.GATSBY_RECIPES_NO_COLOR = "true"

// Potrace has a dependency on giwrap which has a process.nextTick as a sideEffect which messes up with jest.
jest.mock(`gifwrap`, () => jest.fn())
Loading

0 comments on commit 52e07c1

Please sign in to comment.