From d78968cbaa073e7edcdf1350b39e3b7da28327fc Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Mon, 22 Apr 2024 12:30:46 +0200 Subject: [PATCH] Revert React 19 upgrade (#10482 and #10491) (#10495) --- .github/workflows/ci.yml | 4 - .../@apollo-client-npm-3.9.9-15c2e13518.patch | 35 ----- ...react-dom-shim-npm-7.6.17-789bc900f0.patch | 7 - .../fragment-test-project/web/package.json | 4 +- .../@apollo-client-npm-3.9.9-15c2e13518.patch | 35 ----- .../test-project-rsa/web/package.json | 4 +- .../@apollo-client-npm-3.9.9-15c2e13518.patch | 35 ----- .../web/package.json | 4 +- .../@apollo-client-npm-3.9.9-15c2e13518.patch | 35 ----- ...react-dom-shim-npm-7.6.17-789bc900f0.patch | 7 - __fixtures__/test-project/package.json | 5 +- __fixtures__/test-project/web/package.json | 4 +- package.json | 3 +- .../auth-providers/auth0/web/package.json | 2 +- .../azureActiveDirectory/web/package.json | 2 +- .../auth-providers/clerk/web/package.json | 2 +- .../auth-providers/dbAuth/web/package.json | 2 +- .../auth-providers/firebase/web/package.json | 2 +- .../auth-providers/netlify/web/package.json | 2 +- .../auth-providers/supabase/web/package.json | 2 +- .../supertokens/web/package.json | 2 +- packages/auth/package.json | 2 +- packages/cli/src/commands/upgrade.js | 57 ------- .../@apollo-client-npm-3.9.9-15c2e13518.patch | 35 ----- ...react-dom-shim-npm-7.6.17-789bc900f0.patch | 7 - .../templates/js/package.json | 5 +- .../templates/js/web/package.json | 4 +- .../@apollo-client-npm-3.9.9-15c2e13518.patch | 35 ----- ...react-dom-shim-npm-7.6.17-789bc900f0.patch | 7 - .../templates/ts/package.json | 5 +- .../templates/ts/web/package.json | 4 +- .../tests/templates.test.ts | 8 - packages/forms/package.json | 6 +- packages/ogimage-gen/package.json | 4 +- packages/prerender/package.json | 4 +- packages/router/package.json | 8 +- packages/vite/package.json | 4 +- packages/web/package.json | 10 +- yarn.lock | 141 ++++++------------ 39 files changed, 90 insertions(+), 454 deletions(-) delete mode 100644 .yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch delete mode 100644 .yarn/patches/@storybook-react-dom-shim-npm-7.6.17-789bc900f0.patch delete mode 100644 __fixtures__/test-project-rsa/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch delete mode 100644 __fixtures__/test-project-rsc-external-packages-and-cells/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch delete mode 100644 __fixtures__/test-project/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch delete mode 100644 __fixtures__/test-project/.yarn/patches/@storybook-react-dom-shim-npm-7.6.17-789bc900f0.patch delete mode 100644 packages/create-redwood-app/templates/js/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch delete mode 100644 packages/create-redwood-app/templates/js/.yarn/patches/@storybook-react-dom-shim-npm-7.6.17-789bc900f0.patch delete mode 100644 packages/create-redwood-app/templates/ts/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch delete mode 100644 packages/create-redwood-app/templates/ts/.yarn/patches/@storybook-react-dom-shim-npm-7.6.17-789bc900f0.patch diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fbd0265075f5..8436d7c63c55 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -237,10 +237,6 @@ jobs: - name: Run `rw build --no-prerender` run: | - yarn why @apollo/client - tree .yarn - tree node_modules/@apollo/client/react/hooks/internal - cat node_modules/@apollo/client/react/hooks/internal/useRenderGuard.js yarn rw build --no-prerender working-directory: ${{ steps.set-up-test-project.outputs.test-project-path }} diff --git a/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch b/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch deleted file mode 100644 index 176f03718891..000000000000 --- a/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/react/hooks/internal/useRenderGuard.js b/react/hooks/internal/useRenderGuard.js -index 15551e6e2de4dcc585e9426f80c67cb136ecd2a7..181e74a378c59779e83b698cb1923602cf845813 100644 ---- a/react/hooks/internal/useRenderGuard.js -+++ b/react/hooks/internal/useRenderGuard.js -@@ -1,7 +1,9 @@ --import * as React from "rehackt"; -+import React from "rehackt"; - function getRenderDispatcher() { -- var _a, _b; -- return (_b = (_a = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED) === null || _a === void 0 ? void 0 : _a.ReactCurrentDispatcher) === null || _b === void 0 ? void 0 : _b.current; -+ var r18 = typeof React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED !== "undefined" ? React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED : {}; -+ var r19 = typeof React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE !== "undefined" ? React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE : {}; -+ var _b = r18.ReactCurrentDispatcher || r19.ReactCurrentDispatcher; -+ return _b === null || _b === void 0 ? void 0 : _b.current; - } - var RenderDispatcher = null; - /* -diff --git a/testing/internal/profile/profile.js b/testing/internal/profile/profile.js -index bcb709e4a7f6a72b381632e6da6a5c7d9ab5d8f1..362dcd3e577beb62f14bdb61a72debebaaf212ff 100644 ---- a/testing/internal/profile/profile.js -+++ b/testing/internal/profile/profile.js -@@ -276,8 +276,11 @@ export function profileHook(renderCallback) { - }); - } - function resolveHookOwner() { -- var _a, _b, _c; -- return (_c = (_b = (_a = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED) === null || _a === void 0 ? void 0 : _a.ReactCurrentOwner) === null || _b === void 0 ? void 0 : _b.current) === null || _c === void 0 ? void 0 : _c.elementType; -+ var r18 = typeof React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED !== "undefined" ? React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED : {}; -+ var r19 = typeof React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE !== "undefined" ? React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE : {}; -+ var _b = r18.ReactCurrentOwner || r19.ReactCurrentOwner; -+ var _c; -+ return (_c = _b === null || _b === void 0 ? void 0 : _b.current) === null || _c === void 0 ? void 0 : _c.elementType; - } - export function useTrackRenders(_a) { - var _b = _a === void 0 ? {} : _a, name = _b.name; diff --git a/.yarn/patches/@storybook-react-dom-shim-npm-7.6.17-789bc900f0.patch b/.yarn/patches/@storybook-react-dom-shim-npm-7.6.17-789bc900f0.patch deleted file mode 100644 index 4f6243bdd1f4..000000000000 --- a/.yarn/patches/@storybook-react-dom-shim-npm-7.6.17-789bc900f0.patch +++ /dev/null @@ -1,7 +0,0 @@ -diff --git a/dist/preset.js b/dist/preset.js -index e136e7e4efc61bc2596c91b12bae8748cd48226f..578c2e77cd58176ad441a8fe83d384016008bbfe 100644 ---- a/dist/preset.js -+++ b/dist/preset.js -@@ -1 +1 @@ --"use strict";var __defProp=Object.defineProperty;var __getOwnPropDesc=Object.getOwnPropertyDescriptor;var __getOwnPropNames=Object.getOwnPropertyNames;var __hasOwnProp=Object.prototype.hasOwnProperty;var __export=(target,all)=>{for(var name in all)__defProp(target,name,{get:all[name],enumerable:!0})},__copyProps=(to,from,except,desc)=>{if(from&&typeof from=="object"||typeof from=="function")for(let key of __getOwnPropNames(from))!__hasOwnProp.call(to,key)&&key!==except&&__defProp(to,key,{get:()=>from[key],enumerable:!(desc=__getOwnPropDesc(from,key))||desc.enumerable});return to};var __toCommonJS=mod=>__copyProps(__defProp({},"__esModule",{value:!0}),mod);var preset_exports={};__export(preset_exports,{viteFinal:()=>viteFinal,webpackFinal:()=>webpackFinal});module.exports=__toCommonJS(preset_exports);var import_package=require("react-dom/package.json"),webpackFinal=async(config,options)=>{var _a;let{legacyRootApi}=await options.presets.apply("frameworkOptions")||{},isReact18=import_package.version.startsWith("18")||import_package.version.startsWith("0.0.0");return legacyRootApi??!isReact18?config:{...config,resolve:{...config.resolve,alias:{...(_a=config.resolve)==null?void 0:_a.alias,"@storybook/react-dom-shim":"@storybook/react-dom-shim/dist/react-18"}}}},viteFinal=async(config,options)=>{var _a,_b;let{legacyRootApi}=await options.presets.apply("frameworkOptions")||{},isReact18=import_package.version.startsWith("18")||import_package.version.startsWith("0.0.0");if(legacyRootApi||!isReact18)return config;let alias=Array.isArray((_a=config.resolve)==null?void 0:_a.alias)?config.resolve.alias.concat({find:/^@storybook\/react-dom-shim$/,replacement:"@storybook/react-dom-shim/dist/react-18"}):{...(_b=config.resolve)==null?void 0:_b.alias,"@storybook/react-dom-shim":"@storybook/react-dom-shim/dist/react-18"};return{...config,resolve:{...config.resolve,alias}}};0&&(module.exports={viteFinal,webpackFinal}); -+"use strict";var __defProp=Object.defineProperty;var __getOwnPropDesc=Object.getOwnPropertyDescriptor;var __getOwnPropNames=Object.getOwnPropertyNames;var __hasOwnProp=Object.prototype.hasOwnProperty;var __export=(target,all)=>{for(var name in all)__defProp(target,name,{get:all[name],enumerable:!0})},__copyProps=(to,from,except,desc)=>{if(from&&typeof from=="object"||typeof from=="function")for(let key of __getOwnPropNames(from))!__hasOwnProp.call(to,key)&&key!==except&&__defProp(to,key,{get:()=>from[key],enumerable:!(desc=__getOwnPropDesc(from,key))||desc.enumerable});return to};var __toCommonJS=mod=>__copyProps(__defProp({},"__esModule",{value:!0}),mod);var preset_exports={};__export(preset_exports,{viteFinal:()=>viteFinal,webpackFinal:()=>webpackFinal});module.exports=__toCommonJS(preset_exports);var import_package=require("react-dom/package.json"),webpackFinal=async(config,options)=>{var _a;let{legacyRootApi}=await options.presets.apply("frameworkOptions")||{},isReact18=import_package.version.startsWith("18")||import_package.version.startsWith("19")||import_package.version.startsWith("0.0.0");return legacyRootApi??!isReact18?config:{...config,resolve:{...config.resolve,alias:{...(_a=config.resolve)==null?void 0:_a.alias,"@storybook/react-dom-shim":"@storybook/react-dom-shim/dist/react-18"}}}},viteFinal=async(config,options)=>{var _a,_b;let{legacyRootApi}=await options.presets.apply("frameworkOptions")||{},isReact18=import_package.version.startsWith("18")||import_package.version.startsWith("0.0.0");if(legacyRootApi||!isReact18)return config;let alias=Array.isArray((_a=config.resolve)==null?void 0:_a.alias)?config.resolve.alias.concat({find:/^@storybook\/react-dom-shim$/,replacement:"@storybook/react-dom-shim/dist/react-18"}):{...(_b=config.resolve)==null?void 0:_b.alias,"@storybook/react-dom-shim":"@storybook/react-dom-shim/dist/react-18"};return{...config,resolve:{...config.resolve,alias}}};0&&(module.exports={viteFinal,webpackFinal}); diff --git a/__fixtures__/fragment-test-project/web/package.json b/__fixtures__/fragment-test-project/web/package.json index 05fb9a6b5eb3..f527cdb9c3d2 100644 --- a/__fixtures__/fragment-test-project/web/package.json +++ b/__fixtures__/fragment-test-project/web/package.json @@ -16,8 +16,8 @@ "@redwoodjs/router": "7.0.0", "@redwoodjs/web": "7.0.0", "humanize-string": "2.1.0", - "react": "19.0.0-canary-36e62c603-20240418", - "react-dom": "19.0.0-canary-36e62c603-20240418" + "react": "18.3.0-canary-a870b2d54-20240314", + "react-dom": "18.3.0-canary-a870b2d54-20240314" }, "devDependencies": { "@redwoodjs/vite": "7.0.0", diff --git a/__fixtures__/test-project-rsa/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch b/__fixtures__/test-project-rsa/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch deleted file mode 100644 index 176f03718891..000000000000 --- a/__fixtures__/test-project-rsa/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/react/hooks/internal/useRenderGuard.js b/react/hooks/internal/useRenderGuard.js -index 15551e6e2de4dcc585e9426f80c67cb136ecd2a7..181e74a378c59779e83b698cb1923602cf845813 100644 ---- a/react/hooks/internal/useRenderGuard.js -+++ b/react/hooks/internal/useRenderGuard.js -@@ -1,7 +1,9 @@ --import * as React from "rehackt"; -+import React from "rehackt"; - function getRenderDispatcher() { -- var _a, _b; -- return (_b = (_a = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED) === null || _a === void 0 ? void 0 : _a.ReactCurrentDispatcher) === null || _b === void 0 ? void 0 : _b.current; -+ var r18 = typeof React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED !== "undefined" ? React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED : {}; -+ var r19 = typeof React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE !== "undefined" ? React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE : {}; -+ var _b = r18.ReactCurrentDispatcher || r19.ReactCurrentDispatcher; -+ return _b === null || _b === void 0 ? void 0 : _b.current; - } - var RenderDispatcher = null; - /* -diff --git a/testing/internal/profile/profile.js b/testing/internal/profile/profile.js -index bcb709e4a7f6a72b381632e6da6a5c7d9ab5d8f1..362dcd3e577beb62f14bdb61a72debebaaf212ff 100644 ---- a/testing/internal/profile/profile.js -+++ b/testing/internal/profile/profile.js -@@ -276,8 +276,11 @@ export function profileHook(renderCallback) { - }); - } - function resolveHookOwner() { -- var _a, _b, _c; -- return (_c = (_b = (_a = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED) === null || _a === void 0 ? void 0 : _a.ReactCurrentOwner) === null || _b === void 0 ? void 0 : _b.current) === null || _c === void 0 ? void 0 : _c.elementType; -+ var r18 = typeof React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED !== "undefined" ? React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED : {}; -+ var r19 = typeof React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE !== "undefined" ? React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE : {}; -+ var _b = r18.ReactCurrentOwner || r19.ReactCurrentOwner; -+ var _c; -+ return (_c = _b === null || _b === void 0 ? void 0 : _b.current) === null || _c === void 0 ? void 0 : _c.elementType; - } - export function useTrackRenders(_a) { - var _b = _a === void 0 ? {} : _a, name = _b.name; diff --git a/__fixtures__/test-project-rsa/web/package.json b/__fixtures__/test-project-rsa/web/package.json index b418e2cefc0d..4e67de27d64b 100644 --- a/__fixtures__/test-project-rsa/web/package.json +++ b/__fixtures__/test-project-rsa/web/package.json @@ -15,8 +15,8 @@ "@redwoodjs/forms": "8.0.0-canary.144", "@redwoodjs/router": "8.0.0-canary.144", "@redwoodjs/web": "8.0.0-canary.144", - "react": "19.0.0-canary-36e62c603-20240418", - "react-dom": "19.0.0-canary-36e62c603-20240418" + "react": "18.3.0-canary-a870b2d54-20240314", + "react-dom": "18.3.0-canary-a870b2d54-20240314" }, "devDependencies": { "@redwoodjs/vite": "8.0.0-canary.144", diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch b/__fixtures__/test-project-rsc-external-packages-and-cells/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch deleted file mode 100644 index 176f03718891..000000000000 --- a/__fixtures__/test-project-rsc-external-packages-and-cells/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/react/hooks/internal/useRenderGuard.js b/react/hooks/internal/useRenderGuard.js -index 15551e6e2de4dcc585e9426f80c67cb136ecd2a7..181e74a378c59779e83b698cb1923602cf845813 100644 ---- a/react/hooks/internal/useRenderGuard.js -+++ b/react/hooks/internal/useRenderGuard.js -@@ -1,7 +1,9 @@ --import * as React from "rehackt"; -+import React from "rehackt"; - function getRenderDispatcher() { -- var _a, _b; -- return (_b = (_a = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED) === null || _a === void 0 ? void 0 : _a.ReactCurrentDispatcher) === null || _b === void 0 ? void 0 : _b.current; -+ var r18 = typeof React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED !== "undefined" ? React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED : {}; -+ var r19 = typeof React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE !== "undefined" ? React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE : {}; -+ var _b = r18.ReactCurrentDispatcher || r19.ReactCurrentDispatcher; -+ return _b === null || _b === void 0 ? void 0 : _b.current; - } - var RenderDispatcher = null; - /* -diff --git a/testing/internal/profile/profile.js b/testing/internal/profile/profile.js -index bcb709e4a7f6a72b381632e6da6a5c7d9ab5d8f1..362dcd3e577beb62f14bdb61a72debebaaf212ff 100644 ---- a/testing/internal/profile/profile.js -+++ b/testing/internal/profile/profile.js -@@ -276,8 +276,11 @@ export function profileHook(renderCallback) { - }); - } - function resolveHookOwner() { -- var _a, _b, _c; -- return (_c = (_b = (_a = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED) === null || _a === void 0 ? void 0 : _a.ReactCurrentOwner) === null || _b === void 0 ? void 0 : _b.current) === null || _c === void 0 ? void 0 : _c.elementType; -+ var r18 = typeof React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED !== "undefined" ? React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED : {}; -+ var r19 = typeof React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE !== "undefined" ? React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE : {}; -+ var _b = r18.ReactCurrentOwner || r19.ReactCurrentOwner; -+ var _c; -+ return (_c = _b === null || _b === void 0 ? void 0 : _b.current) === null || _c === void 0 ? void 0 : _c.elementType; - } - export function useTrackRenders(_a) { - var _b = _a === void 0 ? {} : _a, name = _b.name; diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/package.json b/__fixtures__/test-project-rsc-external-packages-and-cells/web/package.json index d28ed24a094d..76b29d6d0257 100644 --- a/__fixtures__/test-project-rsc-external-packages-and-cells/web/package.json +++ b/__fixtures__/test-project-rsc-external-packages-and-cells/web/package.json @@ -18,8 +18,8 @@ "@redwoodjs/web": "7.0.0-canary.1011", "@tobbe.dev/rsc-test": "0.0.5", "client-only": "0.0.1", - "react": "19.0.0-canary-36e62c603-20240418", - "react-dom": "19.0.0-canary-36e62c603-20240418" + "react": "18.3.0-canary-a870b2d54-20240314", + "react-dom": "18.3.0-canary-a870b2d54-20240314" }, "devDependencies": { "@redwoodjs/vite": "7.0.0-canary.1011", diff --git a/__fixtures__/test-project/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch b/__fixtures__/test-project/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch deleted file mode 100644 index 176f03718891..000000000000 --- a/__fixtures__/test-project/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/react/hooks/internal/useRenderGuard.js b/react/hooks/internal/useRenderGuard.js -index 15551e6e2de4dcc585e9426f80c67cb136ecd2a7..181e74a378c59779e83b698cb1923602cf845813 100644 ---- a/react/hooks/internal/useRenderGuard.js -+++ b/react/hooks/internal/useRenderGuard.js -@@ -1,7 +1,9 @@ --import * as React from "rehackt"; -+import React from "rehackt"; - function getRenderDispatcher() { -- var _a, _b; -- return (_b = (_a = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED) === null || _a === void 0 ? void 0 : _a.ReactCurrentDispatcher) === null || _b === void 0 ? void 0 : _b.current; -+ var r18 = typeof React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED !== "undefined" ? React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED : {}; -+ var r19 = typeof React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE !== "undefined" ? React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE : {}; -+ var _b = r18.ReactCurrentDispatcher || r19.ReactCurrentDispatcher; -+ return _b === null || _b === void 0 ? void 0 : _b.current; - } - var RenderDispatcher = null; - /* -diff --git a/testing/internal/profile/profile.js b/testing/internal/profile/profile.js -index bcb709e4a7f6a72b381632e6da6a5c7d9ab5d8f1..362dcd3e577beb62f14bdb61a72debebaaf212ff 100644 ---- a/testing/internal/profile/profile.js -+++ b/testing/internal/profile/profile.js -@@ -276,8 +276,11 @@ export function profileHook(renderCallback) { - }); - } - function resolveHookOwner() { -- var _a, _b, _c; -- return (_c = (_b = (_a = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED) === null || _a === void 0 ? void 0 : _a.ReactCurrentOwner) === null || _b === void 0 ? void 0 : _b.current) === null || _c === void 0 ? void 0 : _c.elementType; -+ var r18 = typeof React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED !== "undefined" ? React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED : {}; -+ var r19 = typeof React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE !== "undefined" ? React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE : {}; -+ var _b = r18.ReactCurrentOwner || r19.ReactCurrentOwner; -+ var _c; -+ return (_c = _b === null || _b === void 0 ? void 0 : _b.current) === null || _c === void 0 ? void 0 : _c.elementType; - } - export function useTrackRenders(_a) { - var _b = _a === void 0 ? {} : _a, name = _b.name; diff --git a/__fixtures__/test-project/.yarn/patches/@storybook-react-dom-shim-npm-7.6.17-789bc900f0.patch b/__fixtures__/test-project/.yarn/patches/@storybook-react-dom-shim-npm-7.6.17-789bc900f0.patch deleted file mode 100644 index 4f6243bdd1f4..000000000000 --- a/__fixtures__/test-project/.yarn/patches/@storybook-react-dom-shim-npm-7.6.17-789bc900f0.patch +++ /dev/null @@ -1,7 +0,0 @@ -diff --git a/dist/preset.js b/dist/preset.js -index e136e7e4efc61bc2596c91b12bae8748cd48226f..578c2e77cd58176ad441a8fe83d384016008bbfe 100644 ---- a/dist/preset.js -+++ b/dist/preset.js -@@ -1 +1 @@ --"use strict";var __defProp=Object.defineProperty;var __getOwnPropDesc=Object.getOwnPropertyDescriptor;var __getOwnPropNames=Object.getOwnPropertyNames;var __hasOwnProp=Object.prototype.hasOwnProperty;var __export=(target,all)=>{for(var name in all)__defProp(target,name,{get:all[name],enumerable:!0})},__copyProps=(to,from,except,desc)=>{if(from&&typeof from=="object"||typeof from=="function")for(let key of __getOwnPropNames(from))!__hasOwnProp.call(to,key)&&key!==except&&__defProp(to,key,{get:()=>from[key],enumerable:!(desc=__getOwnPropDesc(from,key))||desc.enumerable});return to};var __toCommonJS=mod=>__copyProps(__defProp({},"__esModule",{value:!0}),mod);var preset_exports={};__export(preset_exports,{viteFinal:()=>viteFinal,webpackFinal:()=>webpackFinal});module.exports=__toCommonJS(preset_exports);var import_package=require("react-dom/package.json"),webpackFinal=async(config,options)=>{var _a;let{legacyRootApi}=await options.presets.apply("frameworkOptions")||{},isReact18=import_package.version.startsWith("18")||import_package.version.startsWith("0.0.0");return legacyRootApi??!isReact18?config:{...config,resolve:{...config.resolve,alias:{...(_a=config.resolve)==null?void 0:_a.alias,"@storybook/react-dom-shim":"@storybook/react-dom-shim/dist/react-18"}}}},viteFinal=async(config,options)=>{var _a,_b;let{legacyRootApi}=await options.presets.apply("frameworkOptions")||{},isReact18=import_package.version.startsWith("18")||import_package.version.startsWith("0.0.0");if(legacyRootApi||!isReact18)return config;let alias=Array.isArray((_a=config.resolve)==null?void 0:_a.alias)?config.resolve.alias.concat({find:/^@storybook\/react-dom-shim$/,replacement:"@storybook/react-dom-shim/dist/react-18"}):{...(_b=config.resolve)==null?void 0:_b.alias,"@storybook/react-dom-shim":"@storybook/react-dom-shim/dist/react-18"};return{...config,resolve:{...config.resolve,alias}}};0&&(module.exports={viteFinal,webpackFinal}); -+"use strict";var __defProp=Object.defineProperty;var __getOwnPropDesc=Object.getOwnPropertyDescriptor;var __getOwnPropNames=Object.getOwnPropertyNames;var __hasOwnProp=Object.prototype.hasOwnProperty;var __export=(target,all)=>{for(var name in all)__defProp(target,name,{get:all[name],enumerable:!0})},__copyProps=(to,from,except,desc)=>{if(from&&typeof from=="object"||typeof from=="function")for(let key of __getOwnPropNames(from))!__hasOwnProp.call(to,key)&&key!==except&&__defProp(to,key,{get:()=>from[key],enumerable:!(desc=__getOwnPropDesc(from,key))||desc.enumerable});return to};var __toCommonJS=mod=>__copyProps(__defProp({},"__esModule",{value:!0}),mod);var preset_exports={};__export(preset_exports,{viteFinal:()=>viteFinal,webpackFinal:()=>webpackFinal});module.exports=__toCommonJS(preset_exports);var import_package=require("react-dom/package.json"),webpackFinal=async(config,options)=>{var _a;let{legacyRootApi}=await options.presets.apply("frameworkOptions")||{},isReact18=import_package.version.startsWith("18")||import_package.version.startsWith("19")||import_package.version.startsWith("0.0.0");return legacyRootApi??!isReact18?config:{...config,resolve:{...config.resolve,alias:{...(_a=config.resolve)==null?void 0:_a.alias,"@storybook/react-dom-shim":"@storybook/react-dom-shim/dist/react-18"}}}},viteFinal=async(config,options)=>{var _a,_b;let{legacyRootApi}=await options.presets.apply("frameworkOptions")||{},isReact18=import_package.version.startsWith("18")||import_package.version.startsWith("0.0.0");if(legacyRootApi||!isReact18)return config;let alias=Array.isArray((_a=config.resolve)==null?void 0:_a.alias)?config.resolve.alias.concat({find:/^@storybook\/react-dom-shim$/,replacement:"@storybook/react-dom-shim/dist/react-18"}):{...(_b=config.resolve)==null?void 0:_b.alias,"@storybook/react-dom-shim":"@storybook/react-dom-shim/dist/react-18"};return{...config,resolve:{...config.resolve,alias}}};0&&(module.exports={viteFinal,webpackFinal}); diff --git a/__fixtures__/test-project/package.json b/__fixtures__/test-project/package.json index e9d5e7f3a963..f93f198eeb40 100644 --- a/__fixtures__/test-project/package.json +++ b/__fixtures__/test-project/package.json @@ -20,8 +20,5 @@ "prisma": { "seed": "yarn rw exec seed" }, - "packageManager": "yarn@4.1.1", - "resolutions": { - "@storybook/react-dom-shim@npm:7.6.17": "patch:@storybook/react-dom-shim@npm%3A7.6.17#~/.yarn/patches/@storybook-react-dom-shim-npm-7.6.17-789bc900f0.patch" - } + "packageManager": "yarn@4.1.1" } diff --git a/__fixtures__/test-project/web/package.json b/__fixtures__/test-project/web/package.json index b3e669ea6d75..6cfed421007b 100644 --- a/__fixtures__/test-project/web/package.json +++ b/__fixtures__/test-project/web/package.json @@ -16,8 +16,8 @@ "@redwoodjs/router": "7.0.0", "@redwoodjs/web": "7.0.0", "humanize-string": "2.1.0", - "react": "19.0.0-canary-36e62c603-20240418", - "react-dom": "19.0.0-canary-36e62c603-20240418" + "react": "18.3.0-canary-a870b2d54-20240314", + "react-dom": "18.3.0-canary-a870b2d54-20240314" }, "devDependencies": { "@redwoodjs/vite": "7.0.0", diff --git a/package.json b/package.json index b66eac6e5ee0..f5288ae3db45 100644 --- a/package.json +++ b/package.json @@ -41,8 +41,7 @@ "vscode-languageserver": "6.1.1", "vscode-languageserver-protocol": "3.15.3", "vscode-languageserver-textdocument": "1.0.11", - "vscode-languageserver-types": "3.17.5", - "@storybook/react-dom-shim@npm:7.6.17": "patch:@storybook/react-dom-shim@npm%3A7.6.17#~/.yarn/patches/@storybook-react-dom-shim-npm-7.6.17-789bc900f0.patch" + "vscode-languageserver-types": "3.17.5" }, "devDependencies": { "@actions/cache": "3.2.4", diff --git a/packages/auth-providers/auth0/web/package.json b/packages/auth-providers/auth0/web/package.json index 1ff27057a9cc..32da48ca7903 100644 --- a/packages/auth-providers/auth0/web/package.json +++ b/packages/auth-providers/auth0/web/package.json @@ -32,7 +32,7 @@ "@babel/cli": "7.24.1", "@babel/core": "^7.22.20", "@types/react": "^18.2.55", - "react": "19.0.0-canary-36e62c603-20240418", + "react": "18.3.0-canary-a870b2d54-20240314", "typescript": "5.4.5", "vitest": "1.4.0" }, diff --git a/packages/auth-providers/azureActiveDirectory/web/package.json b/packages/auth-providers/azureActiveDirectory/web/package.json index 1f8edd51290d..a212a7da2ad6 100644 --- a/packages/auth-providers/azureActiveDirectory/web/package.json +++ b/packages/auth-providers/azureActiveDirectory/web/package.json @@ -33,7 +33,7 @@ "@babel/core": "^7.22.20", "@types/netlify-identity-widget": "1.9.6", "@types/react": "^18.2.55", - "react": "19.0.0-canary-36e62c603-20240418", + "react": "18.3.0-canary-a870b2d54-20240314", "typescript": "5.4.5", "vitest": "1.4.0" }, diff --git a/packages/auth-providers/clerk/web/package.json b/packages/auth-providers/clerk/web/package.json index 8a0ef706ee1b..11f66265f033 100644 --- a/packages/auth-providers/clerk/web/package.json +++ b/packages/auth-providers/clerk/web/package.json @@ -33,7 +33,7 @@ "@clerk/clerk-react": "4.30.7", "@clerk/types": "3.62.1", "@types/react": "^18.2.55", - "react": "19.0.0-canary-36e62c603-20240418", + "react": "18.3.0-canary-a870b2d54-20240314", "typescript": "5.4.5", "vitest": "1.4.0" }, diff --git a/packages/auth-providers/dbAuth/web/package.json b/packages/auth-providers/dbAuth/web/package.json index 0c249ebe8120..a7ec05461fa7 100644 --- a/packages/auth-providers/dbAuth/web/package.json +++ b/packages/auth-providers/dbAuth/web/package.json @@ -36,7 +36,7 @@ "@types/react": "^18.2.55", "jest": "29.7.0", "jest-environment-jsdom": "29.7.0", - "react": "19.0.0-canary-36e62c603-20240418", + "react": "18.3.0-canary-a870b2d54-20240314", "typescript": "5.4.5" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" diff --git a/packages/auth-providers/firebase/web/package.json b/packages/auth-providers/firebase/web/package.json index 8fba31a67387..81720510f8f0 100644 --- a/packages/auth-providers/firebase/web/package.json +++ b/packages/auth-providers/firebase/web/package.json @@ -34,7 +34,7 @@ "firebase": "10.11.0", "jest": "29.7.0", "jest-environment-jsdom": "29.7.0", - "react": "19.0.0-canary-36e62c603-20240418", + "react": "18.3.0-canary-a870b2d54-20240314", "typescript": "5.4.5" }, "peerDependencies": { diff --git a/packages/auth-providers/netlify/web/package.json b/packages/auth-providers/netlify/web/package.json index 2af5b7e2b55e..2f3bf57d2e47 100644 --- a/packages/auth-providers/netlify/web/package.json +++ b/packages/auth-providers/netlify/web/package.json @@ -32,7 +32,7 @@ "@babel/core": "^7.22.20", "@types/netlify-identity-widget": "1.9.6", "@types/react": "^18.2.55", - "react": "19.0.0-canary-36e62c603-20240418", + "react": "18.3.0-canary-a870b2d54-20240314", "typescript": "5.4.5", "vitest": "1.4.0" }, diff --git a/packages/auth-providers/supabase/web/package.json b/packages/auth-providers/supabase/web/package.json index ab6f4c7d15e4..62b84f3db73b 100644 --- a/packages/auth-providers/supabase/web/package.json +++ b/packages/auth-providers/supabase/web/package.json @@ -32,7 +32,7 @@ "@babel/core": "^7.22.20", "@supabase/supabase-js": "2.40.0", "@types/react": "^18.2.55", - "react": "19.0.0-canary-36e62c603-20240418", + "react": "18.3.0-canary-a870b2d54-20240314", "typescript": "5.4.5", "vitest": "1.4.0" }, diff --git a/packages/auth-providers/supertokens/web/package.json b/packages/auth-providers/supertokens/web/package.json index 2bbf982f2c63..bd4419570aba 100644 --- a/packages/auth-providers/supertokens/web/package.json +++ b/packages/auth-providers/supertokens/web/package.json @@ -31,7 +31,7 @@ "@babel/cli": "7.24.1", "@babel/core": "^7.22.20", "@types/react": "^18.2.55", - "react": "19.0.0-canary-36e62c603-20240418", + "react": "18.3.0-canary-a870b2d54-20240314", "supertokens-auth-react": "0.39.1", "typescript": "5.4.5", "vitest": "1.4.0" diff --git a/packages/auth/package.json b/packages/auth/package.json index add9349d8c97..5701cd6cbea9 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -28,7 +28,7 @@ }, "dependencies": { "core-js": "3.36.1", - "react": "19.0.0-canary-36e62c603-20240418" + "react": "18.3.0-canary-a870b2d54-20240314" }, "devDependencies": { "@redwoodjs/framework-tools": "workspace:*", diff --git a/packages/cli/src/commands/upgrade.js b/packages/cli/src/commands/upgrade.js index 01b25fb77311..2b52f4fd087b 100644 --- a/packages/cli/src/commands/upgrade.js +++ b/packages/cli/src/commands/upgrade.js @@ -111,11 +111,6 @@ export const handler = async ({ dryRun, tag, verbose, dedupe }) => { updatePackageVersionsFromTemplate(ctx, { dryRun, verbose }), enabled: (ctx) => ctx.versionToUpgradeTo?.includes('canary'), }, - { - title: 'Downloading yarn patches', - task: (ctx) => downloadYarnPatches(ctx, { dryRun, verbose }), - enabled: (ctx) => ctx.versionToUpgradeTo?.includes('canary'), - }, { title: 'Running yarn install', task: (ctx) => yarnInstall(ctx, { dryRun, verbose }), @@ -360,58 +355,6 @@ async function updatePackageVersionsFromTemplate(ctx, { dryRun, verbose }) { ) } -async function downloadYarnPatches(ctx, { dryRun, verbose }) { - if (!ctx.versionToUpgradeTo) { - throw new Error('Failed to upgrade') - } - - const res = await fetch( - 'https://api.github.com/repos/redwoodjs/redwood/git/trees/main?recursive=1', - ) - const json = await res.json() - const patches = json.tree.filter((patchInfo) => - patchInfo.path.startsWith( - 'packages/create-redwood-app/templates/ts/.yarn/patches/', - ), - ) - - const patchDir = path.join(getPaths().base, '.yarn', 'patches') - - if (verbose) { - console.log('Creating patch directory', patchDir) - } - - if (!dryRun) { - fs.mkdirSync(patchDir, { recursive: true }) - } - - return new Listr( - patches.map((patch) => { - return { - title: `Downloading ${patch.path}`, - task: async () => { - const res = await fetch(patch.url) - const patchMeta = await res.json() - const patchPath = path.join( - getPaths().base, - '.yarn', - 'patches', - path.basename(patch.path), - ) - - if (verbose) { - console.log('Writing patch', patchPath) - } - - if (!dryRun) { - await fs.writeFile(patchPath, patchMeta.content, 'base64') - } - }, - } - }), - ) -} - async function refreshPrismaClient(task, { verbose }) { /** Relates to prisma/client issue, @see: https://github.com/redwoodjs/redwood/issues/1083 */ try { diff --git a/packages/create-redwood-app/templates/js/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch b/packages/create-redwood-app/templates/js/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch deleted file mode 100644 index 176f03718891..000000000000 --- a/packages/create-redwood-app/templates/js/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/react/hooks/internal/useRenderGuard.js b/react/hooks/internal/useRenderGuard.js -index 15551e6e2de4dcc585e9426f80c67cb136ecd2a7..181e74a378c59779e83b698cb1923602cf845813 100644 ---- a/react/hooks/internal/useRenderGuard.js -+++ b/react/hooks/internal/useRenderGuard.js -@@ -1,7 +1,9 @@ --import * as React from "rehackt"; -+import React from "rehackt"; - function getRenderDispatcher() { -- var _a, _b; -- return (_b = (_a = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED) === null || _a === void 0 ? void 0 : _a.ReactCurrentDispatcher) === null || _b === void 0 ? void 0 : _b.current; -+ var r18 = typeof React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED !== "undefined" ? React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED : {}; -+ var r19 = typeof React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE !== "undefined" ? React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE : {}; -+ var _b = r18.ReactCurrentDispatcher || r19.ReactCurrentDispatcher; -+ return _b === null || _b === void 0 ? void 0 : _b.current; - } - var RenderDispatcher = null; - /* -diff --git a/testing/internal/profile/profile.js b/testing/internal/profile/profile.js -index bcb709e4a7f6a72b381632e6da6a5c7d9ab5d8f1..362dcd3e577beb62f14bdb61a72debebaaf212ff 100644 ---- a/testing/internal/profile/profile.js -+++ b/testing/internal/profile/profile.js -@@ -276,8 +276,11 @@ export function profileHook(renderCallback) { - }); - } - function resolveHookOwner() { -- var _a, _b, _c; -- return (_c = (_b = (_a = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED) === null || _a === void 0 ? void 0 : _a.ReactCurrentOwner) === null || _b === void 0 ? void 0 : _b.current) === null || _c === void 0 ? void 0 : _c.elementType; -+ var r18 = typeof React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED !== "undefined" ? React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED : {}; -+ var r19 = typeof React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE !== "undefined" ? React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE : {}; -+ var _b = r18.ReactCurrentOwner || r19.ReactCurrentOwner; -+ var _c; -+ return (_c = _b === null || _b === void 0 ? void 0 : _b.current) === null || _c === void 0 ? void 0 : _c.elementType; - } - export function useTrackRenders(_a) { - var _b = _a === void 0 ? {} : _a, name = _b.name; diff --git a/packages/create-redwood-app/templates/js/.yarn/patches/@storybook-react-dom-shim-npm-7.6.17-789bc900f0.patch b/packages/create-redwood-app/templates/js/.yarn/patches/@storybook-react-dom-shim-npm-7.6.17-789bc900f0.patch deleted file mode 100644 index 4f6243bdd1f4..000000000000 --- a/packages/create-redwood-app/templates/js/.yarn/patches/@storybook-react-dom-shim-npm-7.6.17-789bc900f0.patch +++ /dev/null @@ -1,7 +0,0 @@ -diff --git a/dist/preset.js b/dist/preset.js -index e136e7e4efc61bc2596c91b12bae8748cd48226f..578c2e77cd58176ad441a8fe83d384016008bbfe 100644 ---- a/dist/preset.js -+++ b/dist/preset.js -@@ -1 +1 @@ --"use strict";var __defProp=Object.defineProperty;var __getOwnPropDesc=Object.getOwnPropertyDescriptor;var __getOwnPropNames=Object.getOwnPropertyNames;var __hasOwnProp=Object.prototype.hasOwnProperty;var __export=(target,all)=>{for(var name in all)__defProp(target,name,{get:all[name],enumerable:!0})},__copyProps=(to,from,except,desc)=>{if(from&&typeof from=="object"||typeof from=="function")for(let key of __getOwnPropNames(from))!__hasOwnProp.call(to,key)&&key!==except&&__defProp(to,key,{get:()=>from[key],enumerable:!(desc=__getOwnPropDesc(from,key))||desc.enumerable});return to};var __toCommonJS=mod=>__copyProps(__defProp({},"__esModule",{value:!0}),mod);var preset_exports={};__export(preset_exports,{viteFinal:()=>viteFinal,webpackFinal:()=>webpackFinal});module.exports=__toCommonJS(preset_exports);var import_package=require("react-dom/package.json"),webpackFinal=async(config,options)=>{var _a;let{legacyRootApi}=await options.presets.apply("frameworkOptions")||{},isReact18=import_package.version.startsWith("18")||import_package.version.startsWith("0.0.0");return legacyRootApi??!isReact18?config:{...config,resolve:{...config.resolve,alias:{...(_a=config.resolve)==null?void 0:_a.alias,"@storybook/react-dom-shim":"@storybook/react-dom-shim/dist/react-18"}}}},viteFinal=async(config,options)=>{var _a,_b;let{legacyRootApi}=await options.presets.apply("frameworkOptions")||{},isReact18=import_package.version.startsWith("18")||import_package.version.startsWith("0.0.0");if(legacyRootApi||!isReact18)return config;let alias=Array.isArray((_a=config.resolve)==null?void 0:_a.alias)?config.resolve.alias.concat({find:/^@storybook\/react-dom-shim$/,replacement:"@storybook/react-dom-shim/dist/react-18"}):{...(_b=config.resolve)==null?void 0:_b.alias,"@storybook/react-dom-shim":"@storybook/react-dom-shim/dist/react-18"};return{...config,resolve:{...config.resolve,alias}}};0&&(module.exports={viteFinal,webpackFinal}); -+"use strict";var __defProp=Object.defineProperty;var __getOwnPropDesc=Object.getOwnPropertyDescriptor;var __getOwnPropNames=Object.getOwnPropertyNames;var __hasOwnProp=Object.prototype.hasOwnProperty;var __export=(target,all)=>{for(var name in all)__defProp(target,name,{get:all[name],enumerable:!0})},__copyProps=(to,from,except,desc)=>{if(from&&typeof from=="object"||typeof from=="function")for(let key of __getOwnPropNames(from))!__hasOwnProp.call(to,key)&&key!==except&&__defProp(to,key,{get:()=>from[key],enumerable:!(desc=__getOwnPropDesc(from,key))||desc.enumerable});return to};var __toCommonJS=mod=>__copyProps(__defProp({},"__esModule",{value:!0}),mod);var preset_exports={};__export(preset_exports,{viteFinal:()=>viteFinal,webpackFinal:()=>webpackFinal});module.exports=__toCommonJS(preset_exports);var import_package=require("react-dom/package.json"),webpackFinal=async(config,options)=>{var _a;let{legacyRootApi}=await options.presets.apply("frameworkOptions")||{},isReact18=import_package.version.startsWith("18")||import_package.version.startsWith("19")||import_package.version.startsWith("0.0.0");return legacyRootApi??!isReact18?config:{...config,resolve:{...config.resolve,alias:{...(_a=config.resolve)==null?void 0:_a.alias,"@storybook/react-dom-shim":"@storybook/react-dom-shim/dist/react-18"}}}},viteFinal=async(config,options)=>{var _a,_b;let{legacyRootApi}=await options.presets.apply("frameworkOptions")||{},isReact18=import_package.version.startsWith("18")||import_package.version.startsWith("0.0.0");if(legacyRootApi||!isReact18)return config;let alias=Array.isArray((_a=config.resolve)==null?void 0:_a.alias)?config.resolve.alias.concat({find:/^@storybook\/react-dom-shim$/,replacement:"@storybook/react-dom-shim/dist/react-18"}):{...(_b=config.resolve)==null?void 0:_b.alias,"@storybook/react-dom-shim":"@storybook/react-dom-shim/dist/react-18"};return{...config,resolve:{...config.resolve,alias}}};0&&(module.exports={viteFinal,webpackFinal}); diff --git a/packages/create-redwood-app/templates/js/package.json b/packages/create-redwood-app/templates/js/package.json index e9d5e7f3a963..f93f198eeb40 100644 --- a/packages/create-redwood-app/templates/js/package.json +++ b/packages/create-redwood-app/templates/js/package.json @@ -20,8 +20,5 @@ "prisma": { "seed": "yarn rw exec seed" }, - "packageManager": "yarn@4.1.1", - "resolutions": { - "@storybook/react-dom-shim@npm:7.6.17": "patch:@storybook/react-dom-shim@npm%3A7.6.17#~/.yarn/patches/@storybook-react-dom-shim-npm-7.6.17-789bc900f0.patch" - } + "packageManager": "yarn@4.1.1" } diff --git a/packages/create-redwood-app/templates/js/web/package.json b/packages/create-redwood-app/templates/js/web/package.json index 20760391c43b..171b5331ccc6 100644 --- a/packages/create-redwood-app/templates/js/web/package.json +++ b/packages/create-redwood-app/templates/js/web/package.json @@ -14,8 +14,8 @@ "@redwoodjs/forms": "7.0.0", "@redwoodjs/router": "7.0.0", "@redwoodjs/web": "7.0.0", - "react": "19.0.0-canary-36e62c603-20240418", - "react-dom": "19.0.0-canary-36e62c603-20240418" + "react": "18.3.0-canary-a870b2d54-20240314", + "react-dom": "18.3.0-canary-a870b2d54-20240314" }, "devDependencies": { "@redwoodjs/vite": "7.0.0", diff --git a/packages/create-redwood-app/templates/ts/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch b/packages/create-redwood-app/templates/ts/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch deleted file mode 100644 index 176f03718891..000000000000 --- a/packages/create-redwood-app/templates/ts/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/react/hooks/internal/useRenderGuard.js b/react/hooks/internal/useRenderGuard.js -index 15551e6e2de4dcc585e9426f80c67cb136ecd2a7..181e74a378c59779e83b698cb1923602cf845813 100644 ---- a/react/hooks/internal/useRenderGuard.js -+++ b/react/hooks/internal/useRenderGuard.js -@@ -1,7 +1,9 @@ --import * as React from "rehackt"; -+import React from "rehackt"; - function getRenderDispatcher() { -- var _a, _b; -- return (_b = (_a = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED) === null || _a === void 0 ? void 0 : _a.ReactCurrentDispatcher) === null || _b === void 0 ? void 0 : _b.current; -+ var r18 = typeof React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED !== "undefined" ? React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED : {}; -+ var r19 = typeof React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE !== "undefined" ? React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE : {}; -+ var _b = r18.ReactCurrentDispatcher || r19.ReactCurrentDispatcher; -+ return _b === null || _b === void 0 ? void 0 : _b.current; - } - var RenderDispatcher = null; - /* -diff --git a/testing/internal/profile/profile.js b/testing/internal/profile/profile.js -index bcb709e4a7f6a72b381632e6da6a5c7d9ab5d8f1..362dcd3e577beb62f14bdb61a72debebaaf212ff 100644 ---- a/testing/internal/profile/profile.js -+++ b/testing/internal/profile/profile.js -@@ -276,8 +276,11 @@ export function profileHook(renderCallback) { - }); - } - function resolveHookOwner() { -- var _a, _b, _c; -- return (_c = (_b = (_a = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED) === null || _a === void 0 ? void 0 : _a.ReactCurrentOwner) === null || _b === void 0 ? void 0 : _b.current) === null || _c === void 0 ? void 0 : _c.elementType; -+ var r18 = typeof React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED !== "undefined" ? React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED : {}; -+ var r19 = typeof React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE !== "undefined" ? React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE : {}; -+ var _b = r18.ReactCurrentOwner || r19.ReactCurrentOwner; -+ var _c; -+ return (_c = _b === null || _b === void 0 ? void 0 : _b.current) === null || _c === void 0 ? void 0 : _c.elementType; - } - export function useTrackRenders(_a) { - var _b = _a === void 0 ? {} : _a, name = _b.name; diff --git a/packages/create-redwood-app/templates/ts/.yarn/patches/@storybook-react-dom-shim-npm-7.6.17-789bc900f0.patch b/packages/create-redwood-app/templates/ts/.yarn/patches/@storybook-react-dom-shim-npm-7.6.17-789bc900f0.patch deleted file mode 100644 index 4f6243bdd1f4..000000000000 --- a/packages/create-redwood-app/templates/ts/.yarn/patches/@storybook-react-dom-shim-npm-7.6.17-789bc900f0.patch +++ /dev/null @@ -1,7 +0,0 @@ -diff --git a/dist/preset.js b/dist/preset.js -index e136e7e4efc61bc2596c91b12bae8748cd48226f..578c2e77cd58176ad441a8fe83d384016008bbfe 100644 ---- a/dist/preset.js -+++ b/dist/preset.js -@@ -1 +1 @@ --"use strict";var __defProp=Object.defineProperty;var __getOwnPropDesc=Object.getOwnPropertyDescriptor;var __getOwnPropNames=Object.getOwnPropertyNames;var __hasOwnProp=Object.prototype.hasOwnProperty;var __export=(target,all)=>{for(var name in all)__defProp(target,name,{get:all[name],enumerable:!0})},__copyProps=(to,from,except,desc)=>{if(from&&typeof from=="object"||typeof from=="function")for(let key of __getOwnPropNames(from))!__hasOwnProp.call(to,key)&&key!==except&&__defProp(to,key,{get:()=>from[key],enumerable:!(desc=__getOwnPropDesc(from,key))||desc.enumerable});return to};var __toCommonJS=mod=>__copyProps(__defProp({},"__esModule",{value:!0}),mod);var preset_exports={};__export(preset_exports,{viteFinal:()=>viteFinal,webpackFinal:()=>webpackFinal});module.exports=__toCommonJS(preset_exports);var import_package=require("react-dom/package.json"),webpackFinal=async(config,options)=>{var _a;let{legacyRootApi}=await options.presets.apply("frameworkOptions")||{},isReact18=import_package.version.startsWith("18")||import_package.version.startsWith("0.0.0");return legacyRootApi??!isReact18?config:{...config,resolve:{...config.resolve,alias:{...(_a=config.resolve)==null?void 0:_a.alias,"@storybook/react-dom-shim":"@storybook/react-dom-shim/dist/react-18"}}}},viteFinal=async(config,options)=>{var _a,_b;let{legacyRootApi}=await options.presets.apply("frameworkOptions")||{},isReact18=import_package.version.startsWith("18")||import_package.version.startsWith("0.0.0");if(legacyRootApi||!isReact18)return config;let alias=Array.isArray((_a=config.resolve)==null?void 0:_a.alias)?config.resolve.alias.concat({find:/^@storybook\/react-dom-shim$/,replacement:"@storybook/react-dom-shim/dist/react-18"}):{...(_b=config.resolve)==null?void 0:_b.alias,"@storybook/react-dom-shim":"@storybook/react-dom-shim/dist/react-18"};return{...config,resolve:{...config.resolve,alias}}};0&&(module.exports={viteFinal,webpackFinal}); -+"use strict";var __defProp=Object.defineProperty;var __getOwnPropDesc=Object.getOwnPropertyDescriptor;var __getOwnPropNames=Object.getOwnPropertyNames;var __hasOwnProp=Object.prototype.hasOwnProperty;var __export=(target,all)=>{for(var name in all)__defProp(target,name,{get:all[name],enumerable:!0})},__copyProps=(to,from,except,desc)=>{if(from&&typeof from=="object"||typeof from=="function")for(let key of __getOwnPropNames(from))!__hasOwnProp.call(to,key)&&key!==except&&__defProp(to,key,{get:()=>from[key],enumerable:!(desc=__getOwnPropDesc(from,key))||desc.enumerable});return to};var __toCommonJS=mod=>__copyProps(__defProp({},"__esModule",{value:!0}),mod);var preset_exports={};__export(preset_exports,{viteFinal:()=>viteFinal,webpackFinal:()=>webpackFinal});module.exports=__toCommonJS(preset_exports);var import_package=require("react-dom/package.json"),webpackFinal=async(config,options)=>{var _a;let{legacyRootApi}=await options.presets.apply("frameworkOptions")||{},isReact18=import_package.version.startsWith("18")||import_package.version.startsWith("19")||import_package.version.startsWith("0.0.0");return legacyRootApi??!isReact18?config:{...config,resolve:{...config.resolve,alias:{...(_a=config.resolve)==null?void 0:_a.alias,"@storybook/react-dom-shim":"@storybook/react-dom-shim/dist/react-18"}}}},viteFinal=async(config,options)=>{var _a,_b;let{legacyRootApi}=await options.presets.apply("frameworkOptions")||{},isReact18=import_package.version.startsWith("18")||import_package.version.startsWith("0.0.0");if(legacyRootApi||!isReact18)return config;let alias=Array.isArray((_a=config.resolve)==null?void 0:_a.alias)?config.resolve.alias.concat({find:/^@storybook\/react-dom-shim$/,replacement:"@storybook/react-dom-shim/dist/react-18"}):{...(_b=config.resolve)==null?void 0:_b.alias,"@storybook/react-dom-shim":"@storybook/react-dom-shim/dist/react-18"};return{...config,resolve:{...config.resolve,alias}}};0&&(module.exports={viteFinal,webpackFinal}); diff --git a/packages/create-redwood-app/templates/ts/package.json b/packages/create-redwood-app/templates/ts/package.json index e9d5e7f3a963..f93f198eeb40 100644 --- a/packages/create-redwood-app/templates/ts/package.json +++ b/packages/create-redwood-app/templates/ts/package.json @@ -20,8 +20,5 @@ "prisma": { "seed": "yarn rw exec seed" }, - "packageManager": "yarn@4.1.1", - "resolutions": { - "@storybook/react-dom-shim@npm:7.6.17": "patch:@storybook/react-dom-shim@npm%3A7.6.17#~/.yarn/patches/@storybook-react-dom-shim-npm-7.6.17-789bc900f0.patch" - } + "packageManager": "yarn@4.1.1" } diff --git a/packages/create-redwood-app/templates/ts/web/package.json b/packages/create-redwood-app/templates/ts/web/package.json index 20760391c43b..171b5331ccc6 100644 --- a/packages/create-redwood-app/templates/ts/web/package.json +++ b/packages/create-redwood-app/templates/ts/web/package.json @@ -14,8 +14,8 @@ "@redwoodjs/forms": "7.0.0", "@redwoodjs/router": "7.0.0", "@redwoodjs/web": "7.0.0", - "react": "19.0.0-canary-36e62c603-20240418", - "react-dom": "19.0.0-canary-36e62c603-20240418" + "react": "18.3.0-canary-a870b2d54-20240314", + "react-dom": "18.3.0-canary-a870b2d54-20240314" }, "devDependencies": { "@redwoodjs/vite": "7.0.0", diff --git a/packages/create-redwood-app/tests/templates.test.ts b/packages/create-redwood-app/tests/templates.test.ts index 8e490958fe05..61ed0219efab 100644 --- a/packages/create-redwood-app/tests/templates.test.ts +++ b/packages/create-redwood-app/tests/templates.test.ts @@ -21,10 +21,6 @@ describe('TS template', () => { "/.vscode/launch.json", "/.vscode/settings.json", "/.vscode/tasks.json", - "/.yarn", - "/.yarn/patches", - "/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch", - "/.yarn/patches/@storybook-react-dom-shim-npm-7.6.17-789bc900f0.patch", "/.yarnrc.yml", "/README.md", "/api", @@ -107,10 +103,6 @@ describe('JS template', () => { "/.vscode/launch.json", "/.vscode/settings.json", "/.vscode/tasks.json", - "/.yarn", - "/.yarn/patches", - "/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch", - "/.yarn/patches/@storybook-react-dom-shim-npm-7.6.17-789bc900f0.patch", "/.yarnrc.yml", "/README.md", "/api", diff --git a/packages/forms/package.json b/packages/forms/package.json index 9f0b2eb5e76a..9bffbe3c925c 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -40,13 +40,13 @@ "@types/react": "^18.2.55", "@types/react-dom": "^18.2.19", "nodemon": "3.1.0", - "react": "19.0.0-canary-36e62c603-20240418", - "react-dom": "19.0.0-canary-36e62c603-20240418", + "react": "18.3.0-canary-a870b2d54-20240314", + "react-dom": "18.3.0-canary-a870b2d54-20240314", "typescript": "5.4.5", "vitest": "1.4.0" }, "peerDependencies": { - "react": "19.0.0-canary-36e62c603-20240418" + "react": "18.3.0-canary-a870b2d54-20240314" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/ogimage-gen/package.json b/packages/ogimage-gen/package.json index 693bf969c1e0..8a3b844a531b 100644 --- a/packages/ogimage-gen/package.json +++ b/packages/ogimage-gen/package.json @@ -34,8 +34,8 @@ "@redwoodjs/router": "workspace:*", "@redwoodjs/vite": "workspace:*", "fast-glob": "3.3.2", - "react": "19.0.0-canary-36e62c603-20240418", - "react-dom": "19.0.0-canary-36e62c603-20240418" + "react": "18.3.0-canary-a870b2d54-20240314", + "react-dom": "18.3.0-canary-a870b2d54-20240314" }, "devDependencies": { "@redwoodjs/framework-tools": "workspace:*", diff --git a/packages/prerender/package.json b/packages/prerender/package.json index a1ae6a8fd294..4a63ad911e1f 100644 --- a/packages/prerender/package.json +++ b/packages/prerender/package.json @@ -48,8 +48,8 @@ "vitest": "1.4.0" }, "peerDependencies": { - "react": "19.0.0-canary-36e62c603-20240418", - "react-dom": "19.0.0-canary-36e62c603-20240418" + "react": "18.3.0-canary-a870b2d54-20240314", + "react-dom": "18.3.0-canary-a870b2d54-20240314" }, "externals": { "react": "react", diff --git a/packages/router/package.json b/packages/router/package.json index d90001282d38..d4cb82a03c2c 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -36,14 +36,14 @@ "@types/react-dom": "^18.2.19", "jest": "29.7.0", "jest-environment-jsdom": "29.7.0", - "react": "19.0.0-canary-36e62c603-20240418", - "react-dom": "19.0.0-canary-36e62c603-20240418", + "react": "18.3.0-canary-a870b2d54-20240314", + "react-dom": "18.3.0-canary-a870b2d54-20240314", "tstyche": "1.1.0", "typescript": "5.4.5" }, "peerDependencies": { - "react": "19.0.0-canary-36e62c603-20240418", - "react-dom": "19.0.0-canary-36e62c603-20240418" + "react": "18.3.0-canary-a870b2d54-20240314", + "react-dom": "18.3.0-canary-a870b2d54-20240314" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/packages/vite/package.json b/packages/vite/package.json index 0a78abf852a9..4a3e4ffcb5f6 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -81,8 +81,8 @@ "find-my-way": "8.1.0", "http-proxy-middleware": "2.0.6", "isbot": "3.8.0", - "react": "19.0.0-canary-36e62c603-20240418", - "react-server-dom-webpack": "19.0.0-canary-36e62c603-20240418", + "react": "18.3.0-canary-a870b2d54-20240314", + "react-server-dom-webpack": "18.3.0-canary-a870b2d54-20240314", "vite": "5.2.8", "vite-plugin-cjs-interop": "2.1.0", "yargs-parser": "21.1.1" diff --git a/packages/web/package.json b/packages/web/package.json index 7de2f5f33864..f7383cf1a608 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -37,7 +37,7 @@ "test:watch": "vitest watch" }, "dependencies": { - "@apollo/client": "patch:@apollo/client@npm%3A3.9.9#~/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch", + "@apollo/client": "3.9.9", "@babel/runtime-corejs3": "7.24.1", "@redwoodjs/auth": "workspace:*", "core-js": "3.36.1", @@ -61,15 +61,15 @@ "@types/react": "^18.2.55", "@types/react-dom": "^18.2.19", "nodemon": "3.1.0", - "react": "19.0.0-canary-36e62c603-20240418", - "react-dom": "19.0.0-canary-36e62c603-20240418", + "react": "18.3.0-canary-a870b2d54-20240314", + "react-dom": "18.3.0-canary-a870b2d54-20240314", "tstyche": "1.1.0", "typescript": "5.4.5", "vitest": "1.4.0" }, "peerDependencies": { - "react": "19.0.0-canary-36e62c603-20240418", - "react-dom": "19.0.0-canary-36e62c603-20240418" + "react": "18.3.0-canary-a870b2d54-20240314", + "react-dom": "18.3.0-canary-a870b2d54-20240314" }, "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1" } diff --git a/yarn.lock b/yarn.lock index 17e1b54eab2b..8c70d9c4c783 100644 --- a/yarn.lock +++ b/yarn.lock @@ -153,43 +153,6 @@ __metadata: languageName: node linkType: hard -"@apollo/client@patch:@apollo/client@npm%3A3.9.9#~/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch": - version: 3.9.9 - resolution: "@apollo/client@patch:@apollo/client@npm%3A3.9.9#~/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch::version=3.9.9&hash=da1f5d" - dependencies: - "@graphql-typed-document-node/core": "npm:^3.1.1" - "@wry/caches": "npm:^1.0.0" - "@wry/equality": "npm:^0.5.6" - "@wry/trie": "npm:^0.5.0" - graphql-tag: "npm:^2.12.6" - hoist-non-react-statics: "npm:^3.3.2" - optimism: "npm:^0.18.0" - prop-types: "npm:^15.7.2" - rehackt: "npm:0.0.6" - response-iterator: "npm:^0.2.6" - symbol-observable: "npm:^4.0.0" - ts-invariant: "npm:^0.10.3" - tslib: "npm:^2.3.0" - zen-observable-ts: "npm:^1.2.5" - peerDependencies: - graphql: ^15.0.0 || ^16.0.0 - graphql-ws: ^5.5.5 - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - subscriptions-transport-ws: ^0.9.0 || ^0.11.0 - peerDependenciesMeta: - graphql-ws: - optional: true - react: - optional: true - react-dom: - optional: true - subscriptions-transport-ws: - optional: true - checksum: 10c0/c4dfa8cb7d1ce77a3a3ea7e04e38b9da8aeb36e15701e8da0bc65e9ac133438972b2b19461eba4ce89d88332cb3f2c85b7b8a0ace2ddefc38cb9e269badf9296 - languageName: node - linkType: hard - "@ardatan/relay-compiler@npm:12.0.0": version: 12.0.0 resolution: "@ardatan/relay-compiler@npm:12.0.0" @@ -7611,7 +7574,7 @@ __metadata: "@redwoodjs/auth": "workspace:*" "@types/react": "npm:^18.2.55" core-js: "npm:3.36.1" - react: "npm:19.0.0-canary-36e62c603-20240418" + react: "npm:18.3.0-canary-a870b2d54-20240314" typescript: "npm:5.4.5" vitest: "npm:1.4.0" peerDependencies: @@ -7664,7 +7627,7 @@ __metadata: "@types/netlify-identity-widget": "npm:1.9.6" "@types/react": "npm:^18.2.55" core-js: "npm:3.36.1" - react: "npm:19.0.0-canary-36e62c603-20240418" + react: "npm:18.3.0-canary-a870b2d54-20240314" typescript: "npm:5.4.5" vitest: "npm:1.4.0" peerDependencies: @@ -7714,7 +7677,7 @@ __metadata: "@redwoodjs/auth": "workspace:*" "@types/react": "npm:^18.2.55" core-js: "npm:3.36.1" - react: "npm:19.0.0-canary-36e62c603-20240418" + react: "npm:18.3.0-canary-a870b2d54-20240314" typescript: "npm:5.4.5" vitest: "npm:1.4.0" peerDependencies: @@ -7807,7 +7770,7 @@ __metadata: core-js: "npm:3.36.1" jest: "npm:29.7.0" jest-environment-jsdom: "npm:29.7.0" - react: "npm:19.0.0-canary-36e62c603-20240418" + react: "npm:18.3.0-canary-a870b2d54-20240314" typescript: "npm:5.4.5" languageName: unknown linkType: soft @@ -7856,7 +7819,7 @@ __metadata: firebase: "npm:10.11.0" jest: "npm:29.7.0" jest-environment-jsdom: "npm:29.7.0" - react: "npm:19.0.0-canary-36e62c603-20240418" + react: "npm:18.3.0-canary-a870b2d54-20240314" typescript: "npm:5.4.5" peerDependencies: firebase: 10.11.0 @@ -7906,7 +7869,7 @@ __metadata: "@types/netlify-identity-widget": "npm:1.9.6" "@types/react": "npm:^18.2.55" core-js: "npm:3.36.1" - react: "npm:19.0.0-canary-36e62c603-20240418" + react: "npm:18.3.0-canary-a870b2d54-20240314" typescript: "npm:5.4.5" vitest: "npm:1.4.0" peerDependencies: @@ -7956,7 +7919,7 @@ __metadata: "@supabase/supabase-js": "npm:2.40.0" "@types/react": "npm:^18.2.55" core-js: "npm:3.36.1" - react: "npm:19.0.0-canary-36e62c603-20240418" + react: "npm:18.3.0-canary-a870b2d54-20240314" typescript: "npm:5.4.5" vitest: "npm:1.4.0" peerDependencies: @@ -8009,7 +7972,7 @@ __metadata: "@redwoodjs/auth": "workspace:*" "@types/react": "npm:^18.2.55" core-js: "npm:3.36.1" - react: "npm:19.0.0-canary-36e62c603-20240418" + react: "npm:18.3.0-canary-a870b2d54-20240314" supertokens-auth-react: "npm:0.39.1" typescript: "npm:5.4.5" vitest: "npm:1.4.0" @@ -8027,7 +7990,7 @@ __metadata: "@testing-library/react": "npm:14.2.2" core-js: "npm:3.36.1" msw: "npm:1.3.3" - react: "npm:19.0.0-canary-36e62c603-20240418" + react: "npm:18.3.0-canary-a870b2d54-20240314" tsx: "npm:4.7.1" typescript: "npm:5.4.5" vitest: "npm:1.4.0" @@ -8407,13 +8370,13 @@ __metadata: graphql: "npm:16.8.1" nodemon: "npm:3.1.0" pascalcase: "npm:1.0.0" - react: "npm:19.0.0-canary-36e62c603-20240418" - react-dom: "npm:19.0.0-canary-36e62c603-20240418" + react: "npm:18.3.0-canary-a870b2d54-20240314" + react-dom: "npm:18.3.0-canary-a870b2d54-20240314" react-hook-form: "npm:7.51.2" typescript: "npm:5.4.5" vitest: "npm:1.4.0" peerDependencies: - react: 19.0.0-canary-36e62c603-20240418 + react: 18.3.0-canary-a870b2d54-20240314 languageName: unknown linkType: soft @@ -8624,8 +8587,8 @@ __metadata: "@redwoodjs/router": "workspace:*" "@redwoodjs/vite": "workspace:*" fast-glob: "npm:3.3.2" - react: "npm:19.0.0-canary-36e62c603-20240418" - react-dom: "npm:19.0.0-canary-36e62c603-20240418" + react: "npm:18.3.0-canary-a870b2d54-20240314" + react-dom: "npm:18.3.0-canary-a870b2d54-20240314" ts-toolbelt: "npm:9.6.0" tsx: "npm:4.7.1" typescript: "npm:5.4.5" @@ -8658,8 +8621,8 @@ __metadata: typescript: "npm:5.4.5" vitest: "npm:1.4.0" peerDependencies: - react: 19.0.0-canary-36e62c603-20240418 - react-dom: 19.0.0-canary-36e62c603-20240418 + react: 18.3.0-canary-a870b2d54-20240314 + react-dom: 18.3.0-canary-a870b2d54-20240314 languageName: unknown linkType: soft @@ -8739,13 +8702,13 @@ __metadata: core-js: "npm:3.36.1" jest: "npm:29.7.0" jest-environment-jsdom: "npm:29.7.0" - react: "npm:19.0.0-canary-36e62c603-20240418" - react-dom: "npm:19.0.0-canary-36e62c603-20240418" + react: "npm:18.3.0-canary-a870b2d54-20240314" + react-dom: "npm:18.3.0-canary-a870b2d54-20240314" tstyche: "npm:1.1.0" typescript: "npm:5.4.5" peerDependencies: - react: 19.0.0-canary-36e62c603-20240418 - react-dom: 19.0.0-canary-36e62c603-20240418 + react: 18.3.0-canary-a870b2d54-20240314 + react-dom: 18.3.0-canary-a870b2d54-20240314 languageName: unknown linkType: soft @@ -8892,8 +8855,8 @@ __metadata: glob: "npm:10.3.12" http-proxy-middleware: "npm:2.0.6" isbot: "npm:3.8.0" - react: "npm:19.0.0-canary-36e62c603-20240418" - react-server-dom-webpack: "npm:19.0.0-canary-36e62c603-20240418" + react: "npm:18.3.0-canary-a870b2d54-20240314" + react-server-dom-webpack: "npm:18.3.0-canary-a870b2d54-20240314" rollup: "npm:4.13.0" tsx: "npm:4.7.1" typescript: "npm:5.4.5" @@ -8933,7 +8896,7 @@ __metadata: version: 0.0.0-use.local resolution: "@redwoodjs/web@workspace:packages/web" dependencies: - "@apollo/client": "patch:@apollo/client@npm%3A3.9.9#~/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch" + "@apollo/client": "npm:3.9.9" "@apollo/client-react-streaming": "npm:0.10.0" "@babel/cli": "npm:7.24.1" "@babel/core": "npm:^7.22.20" @@ -8951,8 +8914,8 @@ __metadata: graphql-sse: "npm:2.5.2" graphql-tag: "npm:2.12.6" nodemon: "npm:3.1.0" - react: "npm:19.0.0-canary-36e62c603-20240418" - react-dom: "npm:19.0.0-canary-36e62c603-20240418" + react: "npm:18.3.0-canary-a870b2d54-20240314" + react-dom: "npm:18.3.0-canary-a870b2d54-20240314" react-helmet-async: "npm:2.0.4" react-hot-toast: "npm:2.4.1" stacktracey: "npm:2.1.8" @@ -8961,8 +8924,8 @@ __metadata: typescript: "npm:5.4.5" vitest: "npm:1.4.0" peerDependencies: - react: 19.0.0-canary-36e62c603-20240418 - react-dom: 19.0.0-canary-36e62c603-20240418 + react: 18.3.0-canary-a870b2d54-20240314 + react-dom: 18.3.0-canary-a870b2d54-20240314 bin: cross-env: ./dist/bins/cross-env.js msw: ./dist/bins/msw.js @@ -10090,16 +10053,6 @@ __metadata: languageName: node linkType: hard -"@storybook/react-dom-shim@patch:@storybook/react-dom-shim@npm%3A7.6.17#~/.yarn/patches/@storybook-react-dom-shim-npm-7.6.17-789bc900f0.patch": - version: 7.6.17 - resolution: "@storybook/react-dom-shim@patch:@storybook/react-dom-shim@npm%3A7.6.17#~/.yarn/patches/@storybook-react-dom-shim-npm-7.6.17-789bc900f0.patch::version=7.6.17&hash=5d9d27" - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: 10c0/3a16df94b6c0ebd363fa76e6bc90fc70a3638ef6a5ce7f820524ebe222ac541e962a2b0879f59da31920cd798ecaa3fd668ed9b590bda5505670b3da69f9927c - languageName: node - linkType: hard - "@storybook/react-webpack5@npm:7.6.17": version: 7.6.17 resolution: "@storybook/react-webpack5@npm:7.6.17" @@ -27194,14 +27147,14 @@ __metadata: languageName: node linkType: hard -"react-dom@npm:19.0.0-canary-36e62c603-20240418": - version: 19.0.0-canary-36e62c603-20240418 - resolution: "react-dom@npm:19.0.0-canary-36e62c603-20240418" +"react-dom@npm:18.3.0-canary-a870b2d54-20240314": + version: 18.3.0-canary-a870b2d54-20240314 + resolution: "react-dom@npm:18.3.0-canary-a870b2d54-20240314" dependencies: - scheduler: "npm:0.25.0-canary-36e62c603-20240418" + scheduler: "npm:0.24.0-canary-a870b2d54-20240314" peerDependencies: - react: 19.0.0-canary-36e62c603-20240418 - checksum: 10c0/e793e44af18b02d7e684a9e1dfbeb51e24ebcf17295303813b4a9e91962c51c6d1857a10d06aaeb390d5b503251225a93ef7d8e8a6e696a21a2148812575870c + react: 18.3.0-canary-a870b2d54-20240314 + checksum: 10c0/6896473a3a7ed802f6b85c9601c64b0f1fe58ffbf3829ee5ac819a503fa16f5ec4d39b4b3f188cb2bf9ba9fb74cbdc28844c03cc2a4208303595220e5877d1b5 languageName: node linkType: hard @@ -27347,17 +27300,17 @@ __metadata: languageName: node linkType: hard -"react-server-dom-webpack@npm:19.0.0-canary-36e62c603-20240418": - version: 19.0.0-canary-36e62c603-20240418 - resolution: "react-server-dom-webpack@npm:19.0.0-canary-36e62c603-20240418" +"react-server-dom-webpack@npm:18.3.0-canary-a870b2d54-20240314": + version: 18.3.0-canary-a870b2d54-20240314 + resolution: "react-server-dom-webpack@npm:18.3.0-canary-a870b2d54-20240314" dependencies: acorn-loose: "npm:^8.3.0" neo-async: "npm:^2.6.1" peerDependencies: - react: 19.0.0-canary-36e62c603-20240418 - react-dom: 19.0.0-canary-36e62c603-20240418 + react: 18.3.0-canary-a870b2d54-20240314 + react-dom: 18.3.0-canary-a870b2d54-20240314 webpack: ^5.59.0 - checksum: 10c0/cea48503f3e5b45d8ceb6103a809eac7715917373a352a6f5bfa969378f2bbe0aeec05522b4e1819770cc2f40315e42bf4b5a3a06cffb1c9adf12d1dfc980bb4 + checksum: 10c0/9040df3d8549898dbf4afd7bc86a01948e47b6eda998bda0e663a69fefa6922fa5977aaec0d0795938aac62c97d1da9307636051d0d12ec429c3c416cad23ffb languageName: node linkType: hard @@ -27387,10 +27340,10 @@ __metadata: languageName: node linkType: hard -"react@npm:19.0.0-canary-36e62c603-20240418": - version: 19.0.0-canary-36e62c603-20240418 - resolution: "react@npm:19.0.0-canary-36e62c603-20240418" - checksum: 10c0/c9e48c9a21cd21736d6e0523bdf72f0b3d88b3581b70ccc0aba761927eaae823d1c8c2b047678827737792a92c01d40b977d422cd7195760e4f88879cca15446 +"react@npm:18.3.0-canary-a870b2d54-20240314": + version: 18.3.0-canary-a870b2d54-20240314 + resolution: "react@npm:18.3.0-canary-a870b2d54-20240314" + checksum: 10c0/f89b119c6fefc0956c815ad99e39ba83bc44485c4187143003a01906ef1d750a02f0018210eb192d1d0bdcd28a280139bf399bc59c972fc9e8f9938ee8c63387 languageName: node linkType: hard @@ -28496,10 +28449,10 @@ __metadata: languageName: node linkType: hard -"scheduler@npm:0.25.0-canary-36e62c603-20240418": - version: 0.25.0-canary-36e62c603-20240418 - resolution: "scheduler@npm:0.25.0-canary-36e62c603-20240418" - checksum: 10c0/bf7adcdd9c3d786405dd3f8c9a107cc7fd8e8b62dd491f308c68a07cbd62da4caa73a20431b42d47cd0bd7f97e809ec1e3f5e2d35a9eedf9f827d3eb4789c299 +"scheduler@npm:0.24.0-canary-a870b2d54-20240314": + version: 0.24.0-canary-a870b2d54-20240314 + resolution: "scheduler@npm:0.24.0-canary-a870b2d54-20240314" + checksum: 10c0/ac70f95c1d0cbf6de8bf0d1b2f1c8bb063d0ea0ce9410de720b9eeb17d85dc18bc9bc3c2ab89332cb0d7e746b68f7599ccc4915bcf3ea3a4541797bb1f2ec587 languageName: node linkType: hard