From c945384d63c32dd5554eed572305abd9e57025eb Mon Sep 17 00:00:00 2001 From: Jacob Fletcher Date: Tue, 10 Oct 2023 11:36:44 -0400 Subject: [PATCH] fix(live-preview-react): moves react to peer dependencies (#3545) --- packages/live-preview-react/package.json | 7 +- pnpm-lock.yaml | 7 +- .../app/(pages)/[slug]/page.client.tsx | 6 +- test/live-preview/next-app/package.json | 6 +- test/live-preview/next-app/yarn.lock | 69 +++++++++++++++---- 5 files changed, 68 insertions(+), 27 deletions(-) diff --git a/packages/live-preview-react/package.json b/packages/live-preview-react/package.json index 8c205e183..4fec3c3e8 100644 --- a/packages/live-preview-react/package.json +++ b/packages/live-preview-react/package.json @@ -17,15 +17,16 @@ "prepublishOnly": "pnpm clean && pnpm build" }, "dependencies": { - "react": "18.2.0", "@payloadcms/live-preview": "workspace:*" }, "devDependencies": { "@payloadcms/eslint-config": "workspace:*", - "@types/node": "20.5.7", - "@types/react": "18.2.15", + "@types/react": "^18.2.0", "payload": "workspace:*" }, + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + }, "exports": { ".": { "default": "./src/index.ts", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7bc6ca94d..b05d83c57 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -443,17 +443,14 @@ importers: specifier: workspace:* version: link:../live-preview react: - specifier: 18.2.0 + specifier: ^16.8.0 || ^17.0.0 || ^18.0.0 version: 18.2.0 devDependencies: '@payloadcms/eslint-config': specifier: workspace:* version: link:../eslint-config-payload - '@types/node': - specifier: 20.5.7 - version: 20.5.7 '@types/react': - specifier: 18.2.15 + specifier: ^18.2.0 version: 18.2.15 payload: specifier: workspace:* diff --git a/test/live-preview/next-app/app/(pages)/[slug]/page.client.tsx b/test/live-preview/next-app/app/(pages)/[slug]/page.client.tsx index b074ee871..48d1e6238 100644 --- a/test/live-preview/next-app/app/(pages)/[slug]/page.client.tsx +++ b/test/live-preview/next-app/app/(pages)/[slug]/page.client.tsx @@ -18,11 +18,11 @@ export const PageClient: React.FC<{ return ( - + diff --git a/test/live-preview/next-app/package.json b/test/live-preview/next-app/package.json index da59fa192..c44fd48c2 100644 --- a/test/live-preview/next-app/package.json +++ b/test/live-preview/next-app/package.json @@ -11,11 +11,13 @@ "dependencies": { "@types/escape-html": "^1.0.2", "next": "^13.5.3", + "react": "^18.2.0", + "react-dom": "^18.2.0", "sass": "^1.68.0", "slate": "^0.94.1" }, "devDependencies": { - "@types/node": "20.6.2", - "@types/react": "18.2.22" + "@types/node": "^20.6.2", + "@types/react": "^18.2.22" } } diff --git a/test/live-preview/next-app/yarn.lock b/test/live-preview/next-app/yarn.lock index 4c91a40b2..2325c8307 100644 --- a/test/live-preview/next-app/yarn.lock +++ b/test/live-preview/next-app/yarn.lock @@ -64,20 +64,22 @@ resolved "https://registry.yarnpkg.com/@types/escape-html/-/escape-html-1.0.2.tgz#072b7b13784fb3cee9c2450c22f36405983f5e3c" integrity sha512-gaBLT8pdcexFztLSPRtriHeXY/Kn4907uOCZ4Q3lncFBkheAWOuNt53ypsF8szgxbEJ513UeBzcf4utN0EzEwA== -"@types/node@20.6.2": - version "20.6.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.6.2.tgz#a065925409f59657022e9063275cd0b9bd7e1b12" - integrity sha512-Y+/1vGBHV/cYk6OI1Na/LHzwnlNCAfU3ZNGrc1LdRe/LAIbdDPTTv/HU3M7yXN448aTVDq3eKRm2cg7iKLb8gw== +"@types/node@^20.6.2": + version "20.8.4" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.8.4.tgz#0e9ebb2ff29d5c3302fc84477d066fa7c6b441aa" + integrity sha512-ZVPnqU58giiCjSxjVUESDtdPk4QR5WQhhINbc9UBrKLU68MX5BF6kbQzTrkwbolyr0X8ChBpXfavr5mZFKZQ5A== + dependencies: + undici-types "~5.25.1" "@types/prop-types@*": version "15.7.8" resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.8.tgz#805eae6e8f41bd19e88917d2ea200dc992f405d3" integrity sha512-kMpQpfZKSCBqltAJwskgePRaYRFukDkm1oItcAbC3gNELR20XIBcN9VRgg4+m8DKsTfkWeA4m4Imp4DDuWy7FQ== -"@types/react@18.2.22": - version "18.2.22" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.22.tgz#abe778a1c95a07fa70df40a52d7300a40b949ccb" - integrity sha512-60fLTOLqzarLED2O3UQImc/lsNRgG0jE/a1mPW9KjMemY0LMITWEsbS4VvZ4p6rorEHd5YKxxmMKSDK505GHpA== +"@types/react@^18.2.22": + version "18.2.27" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.27.tgz#746e52b06f3ccd5d7a724fd53769b70792601440" + integrity sha512-Wfv7B7FZiR2r3MIqbAlXoY1+tXm4bOqfz4oRr+nyXdBqapDBZ0l/IGcSlAfvxIHEEJjkPU0MYAc/BlFPOcrgLw== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -116,9 +118,9 @@ busboy@1.6.0: streamsearch "^1.1.0" caniuse-lite@^1.0.30001406: - version "1.0.30001543" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001543.tgz#478a3e9dddbb353c5ab214b0ecb0dbed529ed1d8" - integrity sha512-qxdO8KPWPQ+Zk6bvNpPeQIOH47qZSYdFZd6dXQzb2KzhnSXju4Kd7H1PkSJx6NICSMgo/IhRZRhhfPTHYpJUCA== + version "1.0.30001547" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001547.tgz#d4f92efc488aab3c7f92c738d3977c2a3180472b" + integrity sha512-W7CrtIModMAxobGhz8iXmDfuJiiKg1WADMO/9x7/CLNin5cpSbuBjooyoIUVB5eyCc36QuTVlkVa1iB2S5+/eA== "chokidar@>=3.0.0 <4.0.0": version "3.5.3" @@ -213,6 +215,18 @@ is-plain-object@^5.0.0: resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== +"js-tokens@^3.0.0 || ^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== + +loose-envify@^1.1.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== + dependencies: + js-tokens "^3.0.0 || ^4.0.0" + nanoid@^3.3.6: version "3.3.6" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" @@ -265,6 +279,21 @@ postcss@8.4.31: picocolors "^1.0.0" source-map-js "^1.0.2" +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.23.0" + +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" + readdirp@~3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" @@ -273,14 +302,21 @@ readdirp@~3.6.0: picomatch "^2.2.1" sass@^1.68.0: - version "1.68.0" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.68.0.tgz#0034b0cc9a50248b7d1702ac166fd25990023669" - integrity sha512-Lmj9lM/fef0nQswm1J2HJcEsBUba4wgNx2fea6yJHODREoMFnwRpZydBnX/RjyXw2REIwdkbqE4hrTo4qfDBUA== + version "1.69.1" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.1.tgz#659b3b04452245dcf82f731684831e990ddb0c89" + integrity sha512-nc969GvTVz38oqKgYYVHM/Iq7Yl33IILy5uqaH2CWSiSUmRCvw+UR7tA3845Sp4BD5ykCUimvrT3k1EjTwpVUA== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" source-map-js ">=0.6.2 <2.0.0" +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" + slate@^0.94.1: version "0.94.1" resolved "https://registry.yarnpkg.com/slate/-/slate-0.94.1.tgz#13b0ba7d0a7eeb0ec89a87598e9111cbbd685696" @@ -324,6 +360,11 @@ tslib@^2.4.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== +undici-types@~5.25.1: + version "5.25.3" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.25.3.tgz#e044115914c85f0bcbb229f346ab739f064998c3" + integrity sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA== + watchpack@2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"