From edfba16243511378389411de374df01f2b77ed90 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Tue, 16 Aug 2022 11:05:06 +0200 Subject: [PATCH 1/3] Bump undici sub-dependency from v5.5.1 to v5.8.2 --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index bb308b0b29121..d30da36154fee 100644 --- a/yarn.lock +++ b/yarn.lock @@ -27880,9 +27880,9 @@ undefsafe@^2.0.5: integrity sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA== undici@^5.1.1: - version "5.5.1" - resolved "https://registry.yarnpkg.com/undici/-/undici-5.5.1.tgz#baaf25844a99eaa0b22e1ef8d205bffe587c8f43" - integrity sha512-MEvryPLf18HvlCbLSzCW0U00IMftKGI5udnjrQbC5D4P0Hodwffhv+iGfWuJwg16Y/TK11ZFK8i+BPVW2z/eAw== + version "5.8.2" + resolved "https://registry.yarnpkg.com/undici/-/undici-5.8.2.tgz#071fc8a6a5d24db0ad510ad442f607d9b09d5eec" + integrity sha512-3KLq3pXMS0Y4IELV045fTxqz04Nk9Ms7yfBBHum3yxsTR4XNn+ZCaUbf/mWitgYDAhsplQ0B1G4S5D345lMO3A== unfetch@^4.2.0: version "4.2.0" From 9fa92279c21b1a52fc1f0b3c1c14978ca649085f Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Mon, 22 Aug 2022 15:59:29 +0200 Subject: [PATCH 2/3] Fix weird AbortSignal not defined error --- packages/kbn-test/jest_node/jest-preset.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/kbn-test/jest_node/jest-preset.js b/packages/kbn-test/jest_node/jest-preset.js index 78d20414b9389..a28456e0da1f5 100644 --- a/packages/kbn-test/jest_node/jest-preset.js +++ b/packages/kbn-test/jest_node/jest-preset.js @@ -8,9 +8,12 @@ const preset = require('../jest-preset'); +const presetClone = { ...preset }; + +delete presetClone.testEnvironment; // simply redefining as `testEnvironment: 'node'` has some weird side-effects (https://github.com/elastic/kibana/pull/138877#issuecomment-1222366247) + module.exports = { - ...preset, - testEnvironment: 'node', + ...presetClone, snapshotSerializers: [], setupFiles: ['/node_modules/@kbn/test/target_node/jest/setup/babel_polyfill.js'], haste: { From f55c5a00a1367e39c49602cbcd2346c85a99854b Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Tue, 23 Aug 2022 11:10:14 +0200 Subject: [PATCH 3/3] Remove last place where testEnvironment: 'node' was used --- packages/kbn-test/jest_integration_node/jest-preset.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/kbn-test/jest_integration_node/jest-preset.js b/packages/kbn-test/jest_integration_node/jest-preset.js index 8f5f433139ab7..ff50c2de40961 100644 --- a/packages/kbn-test/jest_integration_node/jest-preset.js +++ b/packages/kbn-test/jest_integration_node/jest-preset.js @@ -8,10 +8,14 @@ const preset = require('../jest-preset'); +const presetClone = { ...preset }; + +delete presetClone.testEnvironment; // simply redefining as `testEnvironment: 'node'` has some weird side-effects (https://github.com/elastic/kibana/pull/138877) + /** @typedef {import("@jest/types").Config.InitialOptions} JestConfig */ /** @type {JestConfig} */ module.exports = { - ...preset, + ...presetClone, testMatch: ['**/integration_tests**/*.test.{js,mjs,ts,tsx}'], testPathIgnorePatterns: preset.testPathIgnorePatterns.filter( (pattern) => !pattern.includes('integration_tests') @@ -40,7 +44,6 @@ module.exports = { ? [['json', { file: 'jest-integration.json' }]] : ['html', 'text'], - testEnvironment: 'node', snapshotSerializers: [], setupFiles: ['/node_modules/@kbn/test/target_node/jest/setup/babel_polyfill.js'], haste: {