From dafcb2ec6f106f0f369ded2a66d14af73db27c08 Mon Sep 17 00:00:00 2001 From: Brandon Scott Date: Fri, 22 Apr 2022 11:59:09 -0400 Subject: [PATCH 1/7] Update to react v18 packages, swap ReactDOM.render with createRoot().render --- package.json | 14 ++++++------ src/toaster/src/Toaster.js | 7 +++--- yarn.lock | 45 +++++++++++++++++++++++--------------- 3 files changed, 37 insertions(+), 29 deletions(-) diff --git a/package.json b/package.json index 7dbab189f..f40aee07b 100644 --- a/package.json +++ b/package.json @@ -78,9 +78,9 @@ "ui-box": "^5.0.0" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0", - "react-dom": "^16.8.0 || ^17.0.0", - "react-is": "^16.8.0 || ^17.0.0" + "react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react-is": "^16.8.0 || ^17.0.0 || ^18.0.0" }, "devDependencies": { "@babel/cli": "^7.1.2", @@ -131,10 +131,10 @@ "lint-staged": "^10.0.1", "np": "^6.3.2", "prettier": "^1.14.3", - "react": "^17.0.2", - "react-dom": "^17.0.2", - "react-is": "^17.0.2", - "react-test-renderer": "^17.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", + "react-is": "^18.0.0", + "react-test-renderer": "^18.0.0", "rollup": "^2.28.2", "rollup-plugin-terser": "^5.2.0", "sinon": "^8.1.0", diff --git a/src/toaster/src/Toaster.js b/src/toaster/src/Toaster.js index 4ce2c32fc..122656693 100644 --- a/src/toaster/src/Toaster.js +++ b/src/toaster/src/Toaster.js @@ -1,5 +1,5 @@ import React from 'react' -import ReactDOM from 'react-dom' +import { createRoot } from 'react-dom/client' import canUseDom from '../../lib/canUseDom' import ToastManager from './ToastManager' @@ -15,14 +15,13 @@ export default class Toaster { container.setAttribute('data-evergreen-toaster-container', '') document.body.appendChild(container) - ReactDOM.render( + createRoot(container).render( , - container + /> ) } diff --git a/yarn.lock b/yarn.lock index 36f021ae0..9514ce920 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11888,14 +11888,13 @@ react-docgen@^5.0.0: node-dir "^0.1.10" strip-indent "^3.0.0" -react-dom@^17.0.2: - version "17.0.2" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23" - integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA== +react-dom@^18.0.0: + version "18.0.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.0.0.tgz#26b88534f8f1dbb80853e1eabe752f24100d8023" + integrity sha512-XqX7uzmFo0pUceWFCt7Gff6IyIMzFUn7QMZrbrQfGxtaxXZIcGQzoNpRLE3fQLnS4XzLLPMZX2T9TRcSrasicw== dependencies: loose-envify "^1.1.0" - object-assign "^4.1.1" - scheduler "^0.20.2" + scheduler "^0.21.0" react-draggable@^4.4.3: version "4.4.3" @@ -11953,6 +11952,11 @@ react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.1: resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== +react-is@^18.0.0: + version "18.0.0" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.0.0.tgz#026f6c4a27dbe33bf4a35655b9e1327c4e55e3f5" + integrity sha512-yUcBYdBBbo3QiPsgYDcfQcIkGZHfxOaoE6HLSnr1sPzMhdyxusbfKOSUbSd/ocGi32dxcj366PsTj+5oggeKKw== + react-lifecycles-compat@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" @@ -12009,15 +12013,14 @@ react-syntax-highlighter@^13.5.3: prismjs "^1.21.0" refractor "^3.1.0" -react-test-renderer@^17.0.2: - version "17.0.2" - resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-17.0.2.tgz#4cd4ae5ef1ad5670fc0ef776e8cc7e1231d9866c" - integrity sha512-yaQ9cB89c17PUb0x6UfWRs7kQCorVdHlutU1boVPEsB8IDZH6n9tHxMacc3y0JoXOJUsZb/t/Mb8FUWMKaM7iQ== +react-test-renderer@^18.0.0: + version "18.0.0" + resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-18.0.0.tgz#fa403d625ea9478a70ace43db88833f6c3a5bb4c" + integrity sha512-SyZTP/FSkwfiKOZuTZiISzsrC8A80KNlQ8PyyoGoOq+VzMAab6Em1POK/CiX3+XyXG6oiJa1C53zYDbdrJu9fw== dependencies: - object-assign "^4.1.1" - react-is "^17.0.2" + react-is "^18.0.0" react-shallow-renderer "^16.13.1" - scheduler "^0.20.2" + scheduler "^0.21.0" react-textarea-autosize@^8.3.0: version "8.3.3" @@ -12055,6 +12058,13 @@ react@^17.0.2: loose-envify "^1.1.0" object-assign "^4.1.1" +react@^18.0.0: + version "18.0.0" + resolved "https://registry.yarnpkg.com/react/-/react-18.0.0.tgz#b468736d1f4a5891f38585ba8e8fb29f91c3cb96" + integrity sha512-x+VL6wbT4JRVPm7EGxXhZ8w8LTROaxPXOqhlGyVSrv0sB1jkyFGgXxJ8LVoPRLvPR6/CIZGFmfzqUa2NYeMr2A== + dependencies: + loose-envify "^1.1.0" + read-pkg-up@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07" @@ -12617,13 +12627,12 @@ saxes@^5.0.1: dependencies: xmlchars "^2.2.0" -scheduler@^0.20.2: - version "0.20.2" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91" - integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ== +scheduler@^0.21.0: + version "0.21.0" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.21.0.tgz#6fd2532ff5a6d877b6edb12f00d8ab7e8f308820" + integrity sha512-1r87x5fz9MXqswA2ERLo0EbOAU74DpIUO090gIasYTqlVoJeMcl+Z1Rg7WHz+qtPujhS/hGIt9kxZOYBV3faRQ== dependencies: loose-envify "^1.1.0" - object-assign "^4.1.1" schema-utils@2.7.0: version "2.7.0" From 109ee019430d8a2020da1c3763490b293c7ca8fa Mon Sep 17 00:00:00 2001 From: Brandon Scott Date: Fri, 22 Apr 2022 12:00:56 -0400 Subject: [PATCH 2/7] Move @types packages to devDependencies --- package.json | 4 ++-- yarn.lock | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index f40aee07b..09d39d363 100644 --- a/package.json +++ b/package.json @@ -58,8 +58,6 @@ "dependencies": { "@babel/runtime": "^7.1.2", "@segment/react-tiny-virtual-list": "^2.2.1", - "@types/react": "^16.9.5", - "@types/react-transition-group": "^4.4.0", "arrify": "^1.0.1", "classnames": "^2.2.6", "downshift": "^5.2.0", @@ -107,6 +105,8 @@ "@testing-library/jest-dom": "^5.11.6", "@testing-library/react": "^11.2.2", "@testing-library/user-event": "^13.1.9", + "@types/react": "^18.0.0", + "@types/react-transition-group": "^4.4.0", "babel-core": "7.0.0-bridge.0", "babel-eslint": "^10.0.1", "babel-loader": "^8.1.0", diff --git a/yarn.lock b/yarn.lock index 9514ce920..fee23d65e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3049,10 +3049,10 @@ "@types/scheduler" "*" csstype "^3.0.2" -"@types/react@^16.9.5": - version "16.14.11" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.11.tgz#992a0cd4b66b9f27315042b5d96e976717368f04" - integrity sha512-Don0MtsZZ3fjwTJ2BsoqkyOy7e176KplEAKOpr/4XDdzinlyJBn9yfsKn5mcSgn4kh1B22+3tBnzBC1z63ybtQ== +"@types/react@^18.0.0": + version "18.0.6" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.6.tgz#30206c3830af6ce8639b91ace5868bc2d3d1d96c" + integrity sha512-bPqwzJRzKtfI0mVYr5R+1o9BOE8UEXefwc1LwcBtfnaAn6OoqMhLa/91VA8aeWfDPJt1kHvYKI8RHcQybZLHHA== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" From 43069029ae30d38f131cadb5c2521f0dd60b1621 Mon Sep 17 00:00:00 2001 From: Brandon Scott Date: Fri, 22 Apr 2022 13:15:04 -0400 Subject: [PATCH 3/7] Revert createRoot/ReactDOM.render change until we can safely require React 18 by default --- src/toaster/src/Toaster.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/toaster/src/Toaster.js b/src/toaster/src/Toaster.js index 122656693..4ce2c32fc 100644 --- a/src/toaster/src/Toaster.js +++ b/src/toaster/src/Toaster.js @@ -1,5 +1,5 @@ import React from 'react' -import { createRoot } from 'react-dom/client' +import ReactDOM from 'react-dom' import canUseDom from '../../lib/canUseDom' import ToastManager from './ToastManager' @@ -15,13 +15,14 @@ export default class Toaster { container.setAttribute('data-evergreen-toaster-container', '') document.body.appendChild(container) - createRoot(container).render( + ReactDOM.render( + />, + container ) } From aa0982befb2b10bad450bba91aa82aff650b597d Mon Sep 17 00:00:00 2001 From: Brandon Scott Date: Fri, 22 Apr 2022 15:30:58 -0400 Subject: [PATCH 4/7] Revert "Move @types packages to devDependencies" This reverts commit 109ee019430d8a2020da1c3763490b293c7ca8fa. --- package.json | 4 ++-- yarn.lock | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 09d39d363..f40aee07b 100644 --- a/package.json +++ b/package.json @@ -58,6 +58,8 @@ "dependencies": { "@babel/runtime": "^7.1.2", "@segment/react-tiny-virtual-list": "^2.2.1", + "@types/react": "^16.9.5", + "@types/react-transition-group": "^4.4.0", "arrify": "^1.0.1", "classnames": "^2.2.6", "downshift": "^5.2.0", @@ -105,8 +107,6 @@ "@testing-library/jest-dom": "^5.11.6", "@testing-library/react": "^11.2.2", "@testing-library/user-event": "^13.1.9", - "@types/react": "^18.0.0", - "@types/react-transition-group": "^4.4.0", "babel-core": "7.0.0-bridge.0", "babel-eslint": "^10.0.1", "babel-loader": "^8.1.0", diff --git a/yarn.lock b/yarn.lock index fee23d65e..9514ce920 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3049,10 +3049,10 @@ "@types/scheduler" "*" csstype "^3.0.2" -"@types/react@^18.0.0": - version "18.0.6" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.6.tgz#30206c3830af6ce8639b91ace5868bc2d3d1d96c" - integrity sha512-bPqwzJRzKtfI0mVYr5R+1o9BOE8UEXefwc1LwcBtfnaAn6OoqMhLa/91VA8aeWfDPJt1kHvYKI8RHcQybZLHHA== +"@types/react@^16.9.5": + version "16.14.11" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.11.tgz#992a0cd4b66b9f27315042b5d96e976717368f04" + integrity sha512-Don0MtsZZ3fjwTJ2BsoqkyOy7e176KplEAKOpr/4XDdzinlyJBn9yfsKn5mcSgn4kh1B22+3tBnzBC1z63ybtQ== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" From 3830514d373e636c0036660e753a87cd46b00213 Mon Sep 17 00:00:00 2001 From: Brandon Scott Date: Fri, 22 Apr 2022 15:37:53 -0400 Subject: [PATCH 5/7] Update failing Text test due to additional console error from React v18 --- src/typography/__tests__/Text.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/typography/__tests__/Text.test.js b/src/typography/__tests__/Text.test.js index 6bbdf4a0b..908f07fa1 100644 --- a/src/typography/__tests__/Text.test.js +++ b/src/typography/__tests__/Text.test.js @@ -59,7 +59,7 @@ describe('Sizing', () => { test(' has undefined behavior when trying to set arbitrary sizes', () => { render() - expect(mockFn.mock.calls.length).toEqual(1) + expect(mockFn.mock.calls.length).toBeGreaterThanOrEqual(1) expect(mockFn.mock.calls[0][0]).toMatchInlineSnapshot(` Extracted Styles: box-sizing: border-box; From 30cb681dd89d6728dac2f256cd3168cde613349e Mon Sep 17 00:00:00 2001 From: Brandon Scott Date: Tue, 21 Jun 2022 10:42:34 -0400 Subject: [PATCH 6/7] Bump from react dev deps 18.0.0 -> 18.2.0 --- package.json | 8 +++---- yarn.lock | 66 ++++++++++++++++++++++++++-------------------------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/package.json b/package.json index f40aee07b..877d7ebee 100644 --- a/package.json +++ b/package.json @@ -131,10 +131,10 @@ "lint-staged": "^10.0.1", "np": "^6.3.2", "prettier": "^1.14.3", - "react": "^18.0.0", - "react-dom": "^18.0.0", - "react-is": "^18.0.0", - "react-test-renderer": "^18.0.0", + "react": "^18.2.0", + "react-dom": "^18.2.0", + "react-is": "^18.2.0", + "react-test-renderer": "^18.2.0", "rollup": "^2.28.2", "rollup-plugin-terser": "^5.2.0", "sinon": "^8.1.0", diff --git a/yarn.lock b/yarn.lock index 9514ce920..0d0802116 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11888,13 +11888,13 @@ react-docgen@^5.0.0: node-dir "^0.1.10" strip-indent "^3.0.0" -react-dom@^18.0.0: - version "18.0.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.0.0.tgz#26b88534f8f1dbb80853e1eabe752f24100d8023" - integrity sha512-XqX7uzmFo0pUceWFCt7Gff6IyIMzFUn7QMZrbrQfGxtaxXZIcGQzoNpRLE3fQLnS4XzLLPMZX2T9TRcSrasicw== +react-dom@^18.2.0: + version "18.2.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d" + integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g== dependencies: loose-envify "^1.1.0" - scheduler "^0.21.0" + scheduler "^0.23.0" react-draggable@^4.4.3: version "4.4.3" @@ -11942,20 +11942,20 @@ react-inspector@^5.1.0: is-dom "^1.0.0" prop-types "^15.0.0" -"react-is@^16.12.0 || ^17.0.0", react-is@^17.0.1, react-is@^17.0.2: - version "17.0.2" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" - integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== +"react-is@^16.12.0 || ^17.0.0 || ^18.0.0", react-is@^18.2.0: + version "18.2.0" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" + integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.1: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== -react-is@^18.0.0: - version "18.0.0" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.0.0.tgz#026f6c4a27dbe33bf4a35655b9e1327c4e55e3f5" - integrity sha512-yUcBYdBBbo3QiPsgYDcfQcIkGZHfxOaoE6HLSnr1sPzMhdyxusbfKOSUbSd/ocGi32dxcj366PsTj+5oggeKKw== +react-is@^17.0.1, react-is@^17.0.2: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" + integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== react-lifecycles-compat@^3.0.4: version "3.0.4" @@ -11984,13 +11984,13 @@ react-refresh@^0.8.3: resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.8.3.tgz#721d4657672d400c5e3c75d063c4a85fb2d5d68f" integrity sha512-X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg== -react-shallow-renderer@^16.13.1: - version "16.14.1" - resolved "https://registry.yarnpkg.com/react-shallow-renderer/-/react-shallow-renderer-16.14.1.tgz#bf0d02df8a519a558fd9b8215442efa5c840e124" - integrity sha512-rkIMcQi01/+kxiTE9D3fdS959U1g7gs+/rborw++42m1O9FAQiNI/UNRZExVUoAOprn4umcXf+pFRou8i4zuBg== +react-shallow-renderer@^16.15.0: + version "16.15.0" + resolved "https://registry.yarnpkg.com/react-shallow-renderer/-/react-shallow-renderer-16.15.0.tgz#48fb2cf9b23d23cde96708fe5273a7d3446f4457" + integrity sha512-oScf2FqQ9LFVQgA73vr86xl2NaOIX73rh+YFqcOp68CWj56tSfgtGKrEbyhCj0rSijyG9M1CYprTh39fBi5hzA== dependencies: object-assign "^4.1.1" - react-is "^16.12.0 || ^17.0.0" + react-is "^16.12.0 || ^17.0.0 || ^18.0.0" react-sizeme@^3.0.1: version "3.0.1" @@ -12013,14 +12013,14 @@ react-syntax-highlighter@^13.5.3: prismjs "^1.21.0" refractor "^3.1.0" -react-test-renderer@^18.0.0: - version "18.0.0" - resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-18.0.0.tgz#fa403d625ea9478a70ace43db88833f6c3a5bb4c" - integrity sha512-SyZTP/FSkwfiKOZuTZiISzsrC8A80KNlQ8PyyoGoOq+VzMAab6Em1POK/CiX3+XyXG6oiJa1C53zYDbdrJu9fw== +react-test-renderer@^18.2.0: + version "18.2.0" + resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-18.2.0.tgz#1dd912bd908ff26da5b9fca4fd1c489b9523d37e" + integrity sha512-JWD+aQ0lh2gvh4NM3bBM42Kx+XybOxCpgYK7F8ugAlpaTSnWsX+39Z4XkOykGZAHrjwwTZT3x3KxswVWxHPUqA== dependencies: - react-is "^18.0.0" - react-shallow-renderer "^16.13.1" - scheduler "^0.21.0" + react-is "^18.2.0" + react-shallow-renderer "^16.15.0" + scheduler "^0.23.0" react-textarea-autosize@^8.3.0: version "8.3.3" @@ -12058,10 +12058,10 @@ react@^17.0.2: loose-envify "^1.1.0" object-assign "^4.1.1" -react@^18.0.0: - version "18.0.0" - resolved "https://registry.yarnpkg.com/react/-/react-18.0.0.tgz#b468736d1f4a5891f38585ba8e8fb29f91c3cb96" - integrity sha512-x+VL6wbT4JRVPm7EGxXhZ8w8LTROaxPXOqhlGyVSrv0sB1jkyFGgXxJ8LVoPRLvPR6/CIZGFmfzqUa2NYeMr2A== +react@^18.2.0: + version "18.2.0" + resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5" + integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ== dependencies: loose-envify "^1.1.0" @@ -12627,10 +12627,10 @@ saxes@^5.0.1: dependencies: xmlchars "^2.2.0" -scheduler@^0.21.0: - version "0.21.0" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.21.0.tgz#6fd2532ff5a6d877b6edb12f00d8ab7e8f308820" - integrity sha512-1r87x5fz9MXqswA2ERLo0EbOAU74DpIUO090gIasYTqlVoJeMcl+Z1Rg7WHz+qtPujhS/hGIt9kxZOYBV3faRQ== +scheduler@^0.23.0: + version "0.23.0" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.0.tgz#ba8041afc3d30eb206a487b6b384002e4e61fdfe" + integrity sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw== dependencies: loose-envify "^1.1.0" From 487f8629c0b489f8a6fffdb61ccea167ed3366ad Mon Sep 17 00:00:00 2001 From: Brandon Scott Date: Tue, 21 Jun 2022 11:17:45 -0400 Subject: [PATCH 7/7] Bump ui-box to 5.1.0 for peer dep updates --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 3e6a935d2..3452b8bb9 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "react-fast-compare": "^3.2.0", "react-transition-group": "^4.4.1", "tinycolor2": "^1.4.1", - "ui-box": "^5.0.1" + "ui-box": "^5.1.0" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0", diff --git a/yarn.lock b/yarn.lock index f2daff315..9cada57e6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13997,10 +13997,10 @@ ua-parser-js@^0.7.18: resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.28.tgz#8ba04e653f35ce210239c64661685bf9121dec31" integrity sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g== -ui-box@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/ui-box/-/ui-box-5.0.1.tgz#a2eaf230c004c06f0acab414d1fdfe922a970287" - integrity sha512-LhZ5pHE+QdtoAZlbSgSSrxrByHBDJfIaTQr9OPxi9cJ56f5SySJYlvIRXvFDmF4hwgs0WBcvV8v6Gp8pJPrPrQ== +ui-box@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/ui-box/-/ui-box-5.1.0.tgz#3b62d4089f0b4c3e7c5db60cff32adba0e268605" + integrity sha512-3FYTKhYKu8JaZmg1+iYzrHUpZDtrAiIdhLBbaVV/u5TL6Zfg1U7OkI00eFJNASa/D+b0SwJjt5Ph6tzmcub1RQ== dependencies: "@emotion/hash" "^0.7.1" inline-style-prefixer "^5.0.4"