From 6523ce5121e9f6d26ae4e21e2eb41c67d3528d9c Mon Sep 17 00:00:00 2001 From: Brendan Keogh Date: Mon, 7 Jun 2021 13:16:39 -0600 Subject: [PATCH 1/7] Update to 3.14.2 to add bugfix-PR 7e732d7 Wrapping getComputedStyle in try catch --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d8c0e36a40..bb770692f4 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "prop-types": ">=15.7.2", "react-contenteditable": "^3.3.5", "react-highlighter": "^0.4.3", - "react-modal": "3.13.1", + "react-modal": "3.14.2", "react-onclickoutside": "^6.10.0", "react-required-if": "^1.0.3", "react-text-truncate": "^0.16.0", From bd6692efe8f42b67d3d52600036ebbc1ac92ee2b Mon Sep 17 00:00:00 2001 From: Brendan Keogh Date: Mon, 7 Jun 2021 13:27:56 -0600 Subject: [PATCH 2/7] Fixing annotation for react-modal package --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bb770692f4..e0ce91e374 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "prop-types": ">=15.7.2", "react-contenteditable": "^3.3.5", "react-highlighter": "^0.4.3", - "react-modal": "3.14.2", + "react-modal": "^3.14.2", "react-onclickoutside": "^6.10.0", "react-required-if": "^1.0.3", "react-text-truncate": "^0.16.0", From 388a6fa8e57928d83036e1069aa7863ab374e004 Mon Sep 17 00:00:00 2001 From: Brendan Keogh Date: Mon, 7 Jun 2021 13:32:33 -0600 Subject: [PATCH 3/7] reverting annotation change --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e0ce91e374..bb770692f4 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "prop-types": ">=15.7.2", "react-contenteditable": "^3.3.5", "react-highlighter": "^0.4.3", - "react-modal": "^3.14.2", + "react-modal": "3.14.2", "react-onclickoutside": "^6.10.0", "react-required-if": "^1.0.3", "react-text-truncate": "^0.16.0", From b4bc88aa2b36d73343cc64da8662589a256e112c Mon Sep 17 00:00:00 2001 From: Brendan Keogh Date: Mon, 7 Jun 2021 13:34:45 -0600 Subject: [PATCH 4/7] Fixing annotation for react-modal package --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bb770692f4..e0ce91e374 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "prop-types": ">=15.7.2", "react-contenteditable": "^3.3.5", "react-highlighter": "^0.4.3", - "react-modal": "3.14.2", + "react-modal": "^3.14.2", "react-onclickoutside": "^6.10.0", "react-required-if": "^1.0.3", "react-text-truncate": "^0.16.0", From b22a1b6dfc8c16075120f24db3bd11a92e81a48c Mon Sep 17 00:00:00 2001 From: Brendan Keogh Date: Mon, 7 Jun 2021 13:38:10 -0600 Subject: [PATCH 5/7] reverting annotation change --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e0ce91e374..bb770692f4 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "prop-types": ">=15.7.2", "react-contenteditable": "^3.3.5", "react-highlighter": "^0.4.3", - "react-modal": "^3.14.2", + "react-modal": "3.14.2", "react-onclickoutside": "^6.10.0", "react-required-if": "^1.0.3", "react-text-truncate": "^0.16.0", From cdc4ac6dc869459eb150f89db359644a411548b8 Mon Sep 17 00:00:00 2001 From: Brendan Keogh Date: Mon, 7 Jun 2021 13:44:47 -0600 Subject: [PATCH 6/7] Updating package.lock file for react-modal version bump --- package-lock.json | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index eae4858bc5..5fae18bab7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "design-system-react", - "version": "0.10.33", + "version": "0.10.34", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "0.10.33", + "version": "0.10.34", "license": "SEE LICENSE IN README.md", "dependencies": { "@salesforce/babel-preset-design-system-react": "^3.0.0", @@ -24,7 +24,7 @@ "prop-types": ">=15.7.2", "react-contenteditable": "^3.3.5", "react-highlighter": "^0.4.3", - "react-modal": "3.13.1", + "react-modal": "3.14.2", "react-onclickoutside": "^6.10.0", "react-required-if": "^1.0.3", "react-text-truncate": "^0.16.0", @@ -35472,7 +35472,6 @@ "version": "17.0.2", "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz", "integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==", - "dev": true, "dependencies": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1" @@ -35979,7 +35978,6 @@ "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz", "integrity": "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==", - "dev": true, "dependencies": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1", @@ -36054,17 +36052,21 @@ "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" }, "node_modules/react-modal": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.13.1.tgz", - "integrity": "sha512-m6yXK7I4YKssQnsjHK7xITSXy2O81BSOHOsg0/uWAsdKtuT9HF2tdoYhRuxNNQg2V+LgepsoHUPJKS8m6no+eg==", + "version": "3.14.2", + "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.14.2.tgz", + "integrity": "sha512-CYasEJanwneDsmvtx/fisXhgDxtt3I8jWTVX/tP9dM/J1NgDKU9lgjR9zuCCl33ub2jrTWhXyijCxCzYGN8sJg==", "dependencies": { "exenv": "^1.2.0", - "prop-types": "^15.5.10", + "prop-types": "^15.7.2", "react-lifecycles-compat": "^3.0.0", "warning": "^4.0.3" }, "engines": { "node": ">=8" + }, + "peerDependencies": { + "react": "^0.14.0 || ^15.0.0 || ^16 || ^17", + "react-dom": "^0.14.0 || ^15.0.0 || ^16 || ^17" } }, "node_modules/react-onclickoutside": { @@ -37220,7 +37222,6 @@ "version": "0.20.2", "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz", "integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==", - "dev": true, "dependencies": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1" @@ -73585,7 +73586,6 @@ "version": "17.0.2", "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz", "integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==", - "dev": true, "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1" @@ -73981,7 +73981,6 @@ "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz", "integrity": "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==", - "dev": true, "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1", @@ -74056,12 +74055,12 @@ "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" }, "react-modal": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.13.1.tgz", - "integrity": "sha512-m6yXK7I4YKssQnsjHK7xITSXy2O81BSOHOsg0/uWAsdKtuT9HF2tdoYhRuxNNQg2V+LgepsoHUPJKS8m6no+eg==", + "version": "3.14.2", + "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.14.2.tgz", + "integrity": "sha512-CYasEJanwneDsmvtx/fisXhgDxtt3I8jWTVX/tP9dM/J1NgDKU9lgjR9zuCCl33ub2jrTWhXyijCxCzYGN8sJg==", "requires": { "exenv": "^1.2.0", - "prop-types": "^15.5.10", + "prop-types": "^15.7.2", "react-lifecycles-compat": "^3.0.0", "warning": "^4.0.3" } @@ -75046,7 +75045,6 @@ "version": "0.20.2", "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz", "integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==", - "dev": true, "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1" From a0f00be099db554f07ec4fe34b4c8c02243df7ad Mon Sep 17 00:00:00 2001 From: Brendan Keogh Date: Sun, 13 Jun 2021 09:25:58 -0600 Subject: [PATCH 7/7] This is a test change to see if this addresses the issue on Travis. Still searching for the root cause --- components/modal/__tests__/modal.browser-test.jsx | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/components/modal/__tests__/modal.browser-test.jsx b/components/modal/__tests__/modal.browser-test.jsx index 6f4c6ecc02..376241ab32 100644 --- a/components/modal/__tests__/modal.browser-test.jsx +++ b/components/modal/__tests__/modal.browser-test.jsx @@ -28,10 +28,16 @@ describe('SLDSModal: ', function () { appNode = null; }); - afterEach(() => { - ReactDOM.unmountComponentAtNode(container); - document.body.removeChild(container); - container = null; + afterEach((done) => { + // We run into a race condition if we do not have this wait + // with the changes to react-modal, we end up trying to set state + // on an unmounted component + setTimeout(() => { + ReactDOM.unmountComponentAtNode(container); + document.body.removeChild(container); + container = null; + done(); + }, 100); }); const defaultProps = {