diff --git a/package.json b/package.json index 3af4c8c57840..e34f3450cb1f 100644 --- a/package.json +++ b/package.json @@ -132,5 +132,8 @@ }, "engines": { "node": ">= 10.14.2" + }, + "resolutions": { + "@testing-library/dom": "patch:@testing-library/dom@*#./patches/dom-testing.diff" } } diff --git a/patches/dom-testing.diff b/patches/dom-testing.diff new file mode 100644 index 000000000000..3e5dc1d5e2e1 --- /dev/null +++ b/patches/dom-testing.diff @@ -0,0 +1,38 @@ +diff --git a/dist/pretty-dom.js b/dist/pretty-dom.js +index 6719cb06f4a1adba30333866a9a84bce794446a9..50d91905461fa44f7fdf5d403c10df4161dcfeae 100644 +--- a/dist/pretty-dom.js ++++ b/dist/pretty-dom.js +@@ -1,14 +1,12 @@ + "use strict"; + +-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault"); +- + Object.defineProperty(exports, "__esModule", { + value: true + }); + exports.prettyDOM = prettyDOM; + exports.logDOM = void 0; + +-var _prettyFormat = _interopRequireDefault(require("pretty-format")); ++var _prettyFormat = require("pretty-format"); + + var _getUserCodeFrame = require("./get-user-code-frame"); + +@@ -26,7 +24,7 @@ const getMaxLength = dom => inCypress(dom) ? 0 : typeof process !== 'undefined' + const { + DOMElement, + DOMCollection +-} = _prettyFormat.default.plugins; ++} = _prettyFormat.plugins; + + function prettyDOM(dom, maxLength, options) { + if (!dom) { +@@ -58,7 +56,7 @@ function prettyDOM(dom, maxLength, options) { + throw new TypeError(`Expected an element or document but got ${domTypeName}`); + } + +- const debugContent = (0, _prettyFormat.default)(dom, { ++ const debugContent = (0, _prettyFormat.format)(dom, { + plugins: [DOMElement, DOMCollection], + printFunctionName: false, + highlight: inNode(), diff --git a/scripts/checkCopyrightHeaders.js b/scripts/checkCopyrightHeaders.js index c1038c78fc5f..cb98022e8bf0 100755 --- a/scripts/checkCopyrightHeaders.js +++ b/scripts/checkCopyrightHeaders.js @@ -20,6 +20,7 @@ const createRegExp = pattern => new RegExp(pattern); const GENERIC_IGNORED_EXTENSIONS = [ 'lock', 'patch', + 'diff', 'exe', 'bin', 'cfg', diff --git a/yarn.lock b/yarn.lock index d39891853c33..1377be00a816 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3195,7 +3195,7 @@ __metadata: languageName: node linkType: hard -"@testing-library/dom@npm:^7.24.2": +"@testing-library/dom@*": version: 7.24.2 resolution: "@testing-library/dom@npm:7.24.2" dependencies: @@ -3210,6 +3210,21 @@ __metadata: languageName: node linkType: hard +"@testing-library/dom@patch:@testing-library/dom@*#./patches/dom-testing.diff::locator=root-workspace-0b6124%40workspace%3A.": + version: 7.24.2 + resolution: "@testing-library/dom@patch:@testing-library/dom@npm%3A7.24.2#./patches/dom-testing.diff::version=7.24.2&hash=332747&locator=root-workspace-0b6124%40workspace%3A." + dependencies: + "@babel/code-frame": ^7.10.4 + "@babel/runtime": ^7.10.3 + "@types/aria-query": ^4.2.0 + aria-query: ^4.2.2 + chalk: ^4.1.0 + dom-accessibility-api: ^0.5.1 + pretty-format: ^26.4.2 + checksum: 40f2566efca491df61921053d11c56aee827f651a944d95cfa270647e685b9be182e9e44f5e6dcbef3dacd0fb077bc7be9dad4ad4eabe8d26c53a20dbd0a391d + languageName: node + linkType: hard + "@testing-library/react@npm:*": version: 11.0.4 resolution: "@testing-library/react@npm:11.0.4"