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/__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/package.json b/__fixtures__/test-project-rsa/package.json index 81f76184b7c3..0b351d7de940 100644 --- a/__fixtures__/test-project-rsa/package.json +++ b/__fixtures__/test-project-rsa/package.json @@ -21,6 +21,7 @@ }, "packageManager": "yarn@4.1.1", "resolutions": { - "@apollo/client-react-streaming/superjson": "^1.12.2" + "@apollo/client-react-streaming/superjson": "^1.12.2", + "@apollo/client/rehackt": "0.0.0-pr.10.0" } } 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/package.json b/__fixtures__/test-project-rsc-external-packages-and-cells/package.json index a758ee224fab..71ff0ba5f28f 100644 --- a/__fixtures__/test-project-rsc-external-packages-and-cells/package.json +++ b/__fixtures__/test-project-rsc-external-packages-and-cells/package.json @@ -22,6 +22,7 @@ }, "packageManager": "yarn@4.1.1", "resolutions": { - "@apollo/client-react-streaming/superjson": "^1.12.2" + "@apollo/client-react-streaming/superjson": "^1.12.2", + "@apollo/client/rehackt": "0.0.0-pr.10.0" } } 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/package.json b/__fixtures__/test-project/package.json index e9d5e7f3a963..b948aac2629e 100644 --- a/__fixtures__/test-project/package.json +++ b/__fixtures__/test-project/package.json @@ -22,6 +22,7 @@ }, "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" + "@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", + "@apollo/client/rehackt": "0.0.0-pr.10.0" } } 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/package.json b/packages/create-redwood-app/templates/js/package.json index e9d5e7f3a963..b948aac2629e 100644 --- a/packages/create-redwood-app/templates/js/package.json +++ b/packages/create-redwood-app/templates/js/package.json @@ -22,6 +22,7 @@ }, "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" + "@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", + "@apollo/client/rehackt": "0.0.0-pr.10.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/package.json b/packages/create-redwood-app/templates/ts/package.json index e9d5e7f3a963..b948aac2629e 100644 --- a/packages/create-redwood-app/templates/ts/package.json +++ b/packages/create-redwood-app/templates/ts/package.json @@ -22,6 +22,7 @@ }, "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" + "@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", + "@apollo/client/rehackt": "0.0.0-pr.10.0" } } diff --git a/packages/create-redwood-app/tests/templates.test.ts b/packages/create-redwood-app/tests/templates.test.ts index 8e490958fe05..6da4c6dca4d2 100644 --- a/packages/create-redwood-app/tests/templates.test.ts +++ b/packages/create-redwood-app/tests/templates.test.ts @@ -23,7 +23,6 @@ describe('TS template', () => { "/.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", @@ -109,7 +108,6 @@ describe('JS template', () => { "/.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", diff --git a/packages/web/package.json b/packages/web/package.json index 7de2f5f33864..69e2f038c37d 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", diff --git a/yarn.lock b/yarn.lock index 17e1b54eab2b..31c4b1d5574b 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" @@ -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"