Upgrade redwood to version 0.24.0

api/package.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "@redwoodjs/api": "^0.23.0",
+    "@redwoodjs/api": "^0.24.0",
     "cloudinary": "^1.23.0"
   }
 }

package.json

@@ -9,7 +9,7 @@
   "scripts": {
   },
   "devDependencies": {
-    "@redwoodjs/core": "^0.23.0"
+    "@redwoodjs/core": "^0.24.0"
   },
   "eslintConfig": {
     "extends": "@redwoodjs/eslint-config"

web/package.json

@@ -14,10 +14,10 @@
   },
   "dependencies": {
     "@material-ui/core": "^4.11.0",
-    "@redwoodjs/auth": "^0.23.0",
-    "@redwoodjs/forms": "^0.23.0",
-    "@redwoodjs/router": "^0.23.0",
-    "@redwoodjs/web": "^0.23.0",
+    "@redwoodjs/auth": "^0.24.0",
+    "@redwoodjs/forms": "^0.24.0",
+    "@redwoodjs/router": "^0.24.0",
+    "@redwoodjs/web": "^0.24.0",
     "cloudinary-react": "^1.6.7",
     "controlkit": "^0.1.9",
     "get-active-classes": "^0.0.11",

web/src/index.js

@@ -2,7 +2,8 @@ import { AuthProvider } from '@redwoodjs/auth'
 import GoTrue from 'gotrue-js'
 
 import ReactDOM from 'react-dom'
-import { RedwoodProvider, FatalErrorBoundary } from '@redwoodjs/web'
+import { FatalErrorBoundary } from '@redwoodjs/web'
+import { RedwoodApolloProvider } from '@redwoodjs/web/apollo'
 import FatalErrorPage from 'src/pages/FatalErrorPage'
 import ReactGA from 'react-ga'
 
@@ -21,9 +22,9 @@ const goTrueClient = new GoTrue({
 ReactDOM.render(
   <FatalErrorBoundary page={FatalErrorPage}>
     <AuthProvider client={goTrueClient} type="goTrue">
-      <RedwoodProvider>
+      <RedwoodApolloProvider>
         <Routes />
-      </RedwoodProvider>
+      </RedwoodApolloProvider>
     </AuthProvider>
   </FatalErrorBoundary>,
   document.getElementById('redwood-app')

yarn.lock

@@ -1522,34 +1522,6 @@
     postcss "7.0.32"
     purgecss "^2.3.0"
 
-"@graphql-toolkit/common@0.10.4":
-  version "0.10.4"
-  resolved "https://registry.yarnpkg.com/@graphql-toolkit/common/-/common-0.10.4.tgz#7785f2a3f14559d0778859c49f4442078c196695"
-  integrity sha512-HQ3HaxCqX+UE8y/0h7LMDBBGSIKJxY/gaQesaksvE2Y+N4NpSWdiW6HpOcgXfC2HGf9yM0hEdsERzzL8z3mbHQ==
-  dependencies:
-    aggregate-error "3.0.1"
-    camel-case "4.1.1"
-    graphql-tools "5.0.0"
-    lodash "4.17.15"
-
-"@graphql-toolkit/file-loading@0.10.4":
-  version "0.10.4"
-  resolved "https://registry.yarnpkg.com/@graphql-toolkit/file-loading/-/file-loading-0.10.4.tgz#50e8933e44b17853544c1fe63350df93f33a5e80"
-  integrity sha512-oUmy/sO3BJfax85pVKI7FZ6TWrViNuWXoJkRM293YV9bKGuYU9TgqZoHyM+oEqWO5ruXCL/nCdw3cIBau+rSNA==
-  dependencies:
-    globby "11.0.0"
-    unixify "1.0.0"
-
-"@graphql-toolkit/schema-merging@0.10.4":
-  version "0.10.4"
-  resolved "https://registry.yarnpkg.com/@graphql-toolkit/schema-merging/-/schema-merging-0.10.4.tgz#2428590a531a33e9fe03be27cce9030f1c4c044b"
-  integrity sha512-naL6reYBuILLMrkMfKz0lOLL0kl6gGYnaaywnO/Dgp9F4NeAxDdAs5CV6Fy9NO5OzePFP58Dnc4sh2RyYrrFJg==
-  dependencies:
-    "@graphql-toolkit/common" "0.10.4"
-    deepmerge "4.2.2"
-    graphql-tools "5.0.0"
-    tslib "1.11.1"
-
 "@graphql-tools/batch-delegate@^6.2.4":
   version "6.2.6"
   resolved "https://registry.yarnpkg.com/@graphql-tools/batch-delegate/-/batch-delegate-6.2.6.tgz#fbea98dc825f87ef29ea5f3f371912c2a2aa2f2c"
@@ -2389,13 +2361,14 @@
     prop-types "^15.6.1"
     react-lifecycles-compat "^3.0.4"
 
-"@redwoodjs/api@^0.23.0":
-  version "0.23.0"
-  resolved "https://registry.yarnpkg.com/@redwoodjs/api/-/api-0.23.0.tgz#ac2b8a49a5a8010065d68fb603e6d2d64a928136"
-  integrity sha512-9rn/ji8A4O0wna3fxJGz+6KyI31K+pCcsIdFW2Rx/J3aDaw0DSKJvVbeg5AEPho+nYZYze3UnN73C8N7ecUwtg==
+"@redwoodjs/api@^0.24.0":
+  version "0.24.0"
+  resolved "https://registry.yarnpkg.com/@redwoodjs/api/-/api-0.24.0.tgz#4a4836ae8b93570f3e98b4a96419f468f1c0747f"
+  integrity sha512-ER7zywk2MQpXvRdTiXX0vOCmwXSS1Rmn6/47ZFljnh02RYPKd9ZD5SMwnBY4pNP9YlAWIFeUCeCrQtsQglGAVQ==
   dependencies:
+    "@graphql-tools/merge" "^6.2.4"
     "@prisma/client" "2.12.1"
-    "@redwoodjs/internal" "^0.23.0"
+    "@redwoodjs/internal" "^0.24.0"
     apollo-server-lambda "2.18.2"
     core-js "3.6.5"
     graphql "^15.3.0"
@@ -2405,21 +2378,20 @@
     jwks-rsa "^1.8.1"
     lodash.merge "^4.6.2"
     lodash.omitby "^4.6.0"
-    merge-graphql-schemas "^1.7.6"
 
-"@redwoodjs/auth@^0.23.0":
-  version "0.23.0"
-  resolved "https://registry.yarnpkg.com/@redwoodjs/auth/-/auth-0.23.0.tgz#78bfb53d52502ddaa85d56c92e1285bc40d15628"
-  integrity sha512-kjIjmiwvxJR2VSX9c2JQwE7PBQbKnvcEmE+rIHJY7geHd9C22nXM8gBG1wA3Waqv01eeSn6qN+LSS9eVSgdUAw==
+"@redwoodjs/auth@^0.24.0":
+  version "0.24.0"
+  resolved "https://registry.yarnpkg.com/@redwoodjs/auth/-/auth-0.24.0.tgz#9cdbe56cb562d783d37a68fa2475d41573d54e67"
+  integrity sha512-37Eq686kMe7q82Pnak0sDMOlrO+M7HegRZ3q8GNLfSv9sek291hs6r6igsL5B4zWUG9mFN2rPCU427FzxpsVCw==
 
-"@redwoodjs/cli@^0.23.0":
-  version "0.23.0"
-  resolved "https://registry.yarnpkg.com/@redwoodjs/cli/-/cli-0.23.0.tgz#40f34de8613fa20969e9a06f7fc9cabbe71e3c4f"
-  integrity sha512-xHthmd0AzsWg0zHeJg8hYibZCdA+DWEUQaZG2qu+NPRghF1IZPgD5kqPevL5aY5VtGqfMQ8swIjrG5qMjSqrlA==
+"@redwoodjs/cli@^0.24.0":
+  version "0.24.0"
+  resolved "https://registry.yarnpkg.com/@redwoodjs/cli/-/cli-0.24.0.tgz#ee135f68709d6223e4ddd93d6d8bbeeeb602ca89"
+  integrity sha512-tEnR8qVaAX5Qug74aqzEu8cdgeoL9DWY9R7pZ+3fncq52Fiwo0ZKTIXtMV0vBvHgsz1R1SjpVozhsWvTcNzcvQ==
   dependencies:
     "@prisma/sdk" "2.12.1"
-    "@redwoodjs/internal" "^0.23.0"
-    "@redwoodjs/structure" "^0.23.0"
+    "@redwoodjs/internal" "^0.24.0"
+    "@redwoodjs/structure" "^0.24.0"
     boxen "^4.2.0"
     camelcase "^6.0.0"
     chalk "^4.1.0"
@@ -2442,10 +2414,10 @@
     terminal-link "^2.1.1"
     yargs "^16.0.3"
 
-"@redwoodjs/core@^0.23.0":
-  version "0.23.0"
-  resolved "https://registry.yarnpkg.com/@redwoodjs/core/-/core-0.23.0.tgz#b160c65fd6a7d2ca1f87067521aa1d39b33d96e1"
-  integrity sha512-BxPzOPLp8nzJl3/Zqb1YLNNqjaVF9EHbeZ/wEa+mHTgDaaXbjOSrRQ8cEVTsR6o/sTkPTqxjkRCYBvs3Ps+TIg==
+"@redwoodjs/core@^0.24.0":
+  version "0.24.0"
+  resolved "https://registry.yarnpkg.com/@redwoodjs/core/-/core-0.24.0.tgz#026b12981ac4734b03f02a9b8532d965531906bb"
+  integrity sha512-KZWdMcaiEYE0YC+j4luh0YQcVqlznUPk4ICgYDRjptOwZEAwhFhpwxuImyNViNeGPOfJbpmVCkqYD3Cw6ka3uQ==
   dependencies:
     "@babel/cli" "^7.11.6"
     "@babel/core" "^7.11.6"
@@ -2458,11 +2430,11 @@
     "@babel/runtime-corejs3" "^7.11.2"
     "@pmmmwh/react-refresh-webpack-plugin" "^0.4.3"
     "@prisma/cli" "2.12.1"
-    "@redwoodjs/cli" "^0.23.0"
-    "@redwoodjs/dev-server" "^0.23.0"
-    "@redwoodjs/eslint-config" "^0.23.0"
-    "@redwoodjs/internal" "^0.23.0"
-    "@redwoodjs/testing" "^0.23.0"
+    "@redwoodjs/cli" "^0.24.0"
+    "@redwoodjs/dev-server" "^0.24.0"
+    "@redwoodjs/eslint-config" "^0.24.0"
+    "@redwoodjs/internal" "^0.24.0"
+    "@redwoodjs/testing" "^0.24.0"
     "@storybook/react" "^5.3.19"
     "@testing-library/jest-dom" "5.11.6"
     "@types/jest" "^26.0.10"
@@ -2503,13 +2475,13 @@
     webpack-retry-chunk-load-plugin "^1.4.0"
     whatwg-fetch "^3.5.0"
 
-"@redwoodjs/dev-server@^0.23.0":
-  version "0.23.0"
-  resolved "https://registry.yarnpkg.com/@redwoodjs/dev-server/-/dev-server-0.23.0.tgz#e542e4f4f78a88ccdbf6016d7b7a7579064845d4"
-  integrity sha512-ZfvUl7bnQ0L3c5Yk4IkSdpV9ckE7csyaT4uLhuO4ZnvrjHAH2Nx2gUp/UsxUzNfkbWLNGMJu5T9NYQlXNuWlxg==
+"@redwoodjs/dev-server@^0.24.0":
+  version "0.24.0"
+  resolved "https://registry.yarnpkg.com/@redwoodjs/dev-server/-/dev-server-0.24.0.tgz#8ef059745efabc4c2bb00f150097429fd5075b77"
+  integrity sha512-M0VwQl6dx/u7iWvqznyF2k7+nYB8lvPcCG8rWV7pjtU9tRADdnZ7zptnyerqIhqGJA8WMnaDSK9ZaqUuVaX3CQ==
   dependencies:
     "@babel/register" "^7.9.0"
-    "@redwoodjs/internal" "^0.23.0"
+    "@redwoodjs/internal" "^0.24.0"
     body-parser "^1.19.0"
     chokidar "^3.4.3"
     express "^4.17.1"
@@ -2520,12 +2492,12 @@
     youch "^2.1.1"
     youch-terminal "^1.0.1"
 
-"@redwoodjs/eslint-config@^0.23.0":
-  version "0.23.0"
-  resolved "https://registry.yarnpkg.com/@redwoodjs/eslint-config/-/eslint-config-0.23.0.tgz#0c11862d471438af48ed8174b687b4cb2af9410e"
-  integrity sha512-Qi8ei7+F1jMM/cWJcwrcpUf3nMftACOQ7euuNi/8DA+Z6rjcxjE92KiMAef7z61za6Lf+MHgdlVHrk+QaifJOw==
+"@redwoodjs/eslint-config@^0.24.0":
+  version "0.24.0"
+  resolved "https://registry.yarnpkg.com/@redwoodjs/eslint-config/-/eslint-config-0.24.0.tgz#4dd5b2e2fa93f5337ec456806cf83d2de0c11cd0"
+  integrity sha512-qiTULqRf3YXkymSKojaNN0Flw5YU9UpumW8pEui90e58okoLPpdnlklnehLcE3J/jKHQw4oPvxFau2H6aU9h+A==
   dependencies:
-    "@redwoodjs/eslint-plugin-redwood" "^0.23.0"
+    "@redwoodjs/eslint-plugin-redwood" "^0.24.0"
     "@typescript-eslint/eslint-plugin" "^4.0.1"
     "@typescript-eslint/parser" "^4.0.1"
     babel-eslint "^10.1.0"
@@ -2541,47 +2513,48 @@
     eslint-plugin-react-hooks "^4.1.0"
     prettier "^2.1.1"
 
-"@redwoodjs/eslint-plugin-redwood@^0.23.0":
-  version "0.23.0"
-  resolved "https://registry.yarnpkg.com/@redwoodjs/eslint-plugin-redwood/-/eslint-plugin-redwood-0.23.0.tgz#78dc76b3252e275fb6a663fed8786cdca725fc87"
-  integrity sha512-3i+UTAZdtHHBsnHuHIhIiRTzzXeZSF6dWsmO+anVbXRpQFVMXyZHOenrklP97eXS0ct0+hERUX6SbGtHPIkwPA==
+"@redwoodjs/eslint-plugin-redwood@^0.24.0":
+  version "0.24.0"
+  resolved "https://registry.yarnpkg.com/@redwoodjs/eslint-plugin-redwood/-/eslint-plugin-redwood-0.24.0.tgz#571c9222ab3f00a6ba0716f48934f74708ed2441"
+  integrity sha512-WhhebCYDHHQl6l6H9wyAxyV2qpyUXbPzzKlPBHpsV4dGfRvFFjH1LJVc2ofn8amWJ77lhqdRmuH15dWbL2GJpQ==
 
-"@redwoodjs/forms@^0.23.0":
-  version "0.23.0"
-  resolved "https://registry.yarnpkg.com/@redwoodjs/forms/-/forms-0.23.0.tgz#106049ae43ded2f077340f39ef12f6e4e2525919"
-  integrity sha512-XLBPOoOjvRJvWtsj79+SUlF1v9zf431h2Vm1jDeYdi/MLtV+bi6qcKwNzKzbQQTB5P2VlzY0ubqqWNpJdyRRrg==
+"@redwoodjs/forms@^0.24.0":
+  version "0.24.0"
+  resolved "https://registry.yarnpkg.com/@redwoodjs/forms/-/forms-0.24.0.tgz#b76c4924b45772895c44f6803de22d1bf7a21fa4"
+  integrity sha512-WMVr9dPBl2iUysUGXLMKT5Rd9yXsjveIqKhvJzFmnF+1OOL9bjUUYW0+kDMLHdTMzjnsq/Z3qa75yc5qhsYWcg==
   dependencies:
     "@types/pascalcase" "^1.0.0"
     core-js "3.6.5"
     pascalcase "1.0.0"
     react-hook-form "^6.9.5"
 
-"@redwoodjs/internal@^0.23.0":
-  version "0.23.0"
-  resolved "https://registry.yarnpkg.com/@redwoodjs/internal/-/internal-0.23.0.tgz#cf9efdd4a4ab3fd43ead7920fe26d748d2bdae27"
-  integrity sha512-RES27ippknWsugf+DquJ/Xav7ad/LaHZkZZFtnADIxkqcwaqMyJiWzuARp6vW3jGfJZ1kc/7bENbccT98ZhToQ==
+"@redwoodjs/internal@^0.24.0":
+  version "0.24.0"
+  resolved "https://registry.yarnpkg.com/@redwoodjs/internal/-/internal-0.24.0.tgz#d4986781ffafa96e81c2245b0445e6c9a81321de"
+  integrity sha512-nRTw5Z57im+hkljOJ0n8fi32wijRG/iyU7+JvqnqZ3vV0NZhoNigA/EVXA31b1VANW0QfPQatZQrJKxgNBb45Q==
   dependencies:
     deepmerge "^4.2.2"
     findup-sync "^4.0.0"
+    glob "7.1.6"
     kill-port "^1.6.1"
     toml "^3.0.0"
 
-"@redwoodjs/router@^0.23.0":
-  version "0.23.0"
-  resolved "https://registry.yarnpkg.com/@redwoodjs/router/-/router-0.23.0.tgz#bec6da84e5c17c430d3e7cf464bf8ee79beeb61d"
-  integrity sha512-ArLAJnll2+dWKkDjTrtFWEEt0nzmG+bbZUK0FJafMIVd9NvJUuw5r/9JNXrNtrN6D2GV5IDxhzzOWftTUrDRow==
+"@redwoodjs/router@^0.24.0":
+  version "0.24.0"
+  resolved "https://registry.yarnpkg.com/@redwoodjs/router/-/router-0.24.0.tgz#a3c97f03075d610de381230699b8d8a81bb363c5"
+  integrity sha512-IDY2cKfd2hfry5BKfwyiu5c6Wppn5Twf4Iz2Y9T6a2+YLo9hJ8Su3yIjWHf4A15Qzpy4WGlgIKy2797qxd0yhQ==
   dependencies:
-    "@redwoodjs/auth" "^0.23.0"
+    "@redwoodjs/auth" "^0.24.0"
     core-js "3.6.5"
     lodash.isequal "^4.5.0"
 
-"@redwoodjs/structure@^0.23.0":
-  version "0.23.0"
-  resolved "https://registry.yarnpkg.com/@redwoodjs/structure/-/structure-0.23.0.tgz#20f09b3a94819421852f826ca4bc9b4e0f0eeaa7"
-  integrity sha512-jCUXIJB2TJvhTRL/HmCEpg7ag79mpTP3Z1eKGpwCtpfCfGJpVlzlva0ZX7hKKT0DHajzs6Q1SYG7UYqX5QraNA==
+"@redwoodjs/structure@^0.24.0":
+  version "0.24.0"
+  resolved "https://registry.yarnpkg.com/@redwoodjs/structure/-/structure-0.24.0.tgz#358f1bd35d54d2b59a4c41e480ab054cd2ce02b5"
+  integrity sha512-psclGk0vSGCyc1crwOWL1GfP6l0dHXberODNEBYrL/JkGac+PUbhRRALUHI3xGces11Qa9c80m0ZLZkmSfvqpA==
   dependencies:
     "@prisma/sdk" "2.12.1"
-    "@redwoodjs/internal" "^0.23.0"
+    "@redwoodjs/internal" "^0.24.0"
     "@types/line-column" "^1.0.0"
     camelcase "^6.0.0"
     deepmerge "^4.2.2"
@@ -2602,21 +2575,23 @@
     vscode-languageserver-types "^3.15.1"
     yargs-parser "^18.1.3"
 
-"@redwoodjs/testing@^0.23.0":
-  version "0.23.0"
-  resolved "https://registry.yarnpkg.com/@redwoodjs/testing/-/testing-0.23.0.tgz#40de2ebd0a58b5d7c8dd6eb1bab454d653dfbd51"
-  integrity sha512-eo9cY2JmIW75x9p7GTgFYSit6pEtttVrhRDkkuDF72Qv6QP/qlyKvRV+zJBg+XjrRyYcrPoC8WUh3VvuP3ZmrQ==
+"@redwoodjs/testing@^0.24.0":
+  version "0.24.0"
+  resolved "https://registry.yarnpkg.com/@redwoodjs/testing/-/testing-0.24.0.tgz#97cfcee74ca8b22f6f47f41d4fefd93a16cda16e"
+  integrity sha512-j+pmUOlVmAUYoanbhCDkHQZdWC+g+5COR2Dsxb5ID+l704cydP22DV1GgAI/4NjyG8PUZLZpNnmg0LC8BYKmGw==
   dependencies:
-    "@redwoodjs/internal" "^0.23.0"
-    "@redwoodjs/web" "^0.23.0"
+    "@redwoodjs/auth" "^0.24.0"
+    "@redwoodjs/internal" "^0.24.0"
+    "@redwoodjs/router" "^0.24.0"
+    "@redwoodjs/web" "^0.24.0"
     "@testing-library/react" "11.2.2"
     "@types/react" "16.9.53"
     msw "^0.21.2"
 
-"@redwoodjs/web@^0.23.0":
-  version "0.23.0"
-  resolved "https://registry.yarnpkg.com/@redwoodjs/web/-/web-0.23.0.tgz#5ea1ebec066da36d3134275e841ff0f0bf25f51e"
-  integrity sha512-62okDO16Ukb81kOjvmbgSFWwGA9Q797XBFDizkDlqySmsZ1KHPLUJjJfs+qL5UocTxBEFZ61VQqP/fI7oAZKGg==
+"@redwoodjs/web@^0.24.0":
+  version "0.24.0"
+  resolved "https://registry.yarnpkg.com/@redwoodjs/web/-/web-0.24.0.tgz#225412abb2f47cab61a0f6a9dbf60f47d0780b7d"
+  integrity sha512-6ScBQZrj5P2gPT+rvnjs+JNfCoSbRcIUv01Bd9hF0On2LVVG2kYzu8djxkg3b4U8TjdBUGr/Of1JhOs0bWqqJA==
   dependencies:
     "@apollo/client" "^3.2.5"
     "@types/react" "16.9.53"
@@ -4046,7 +4021,7 @@ agent-base@6:
   dependencies:
     debug "4"
 
-aggregate-error@3.0.1, aggregate-error@^3.0.0:
+aggregate-error@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.1.tgz#db2fe7246e536f40d9b5442a39e117d7dd6a24e0"
   integrity sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==
@@ -4263,16 +4238,7 @@ apollo-graphql@^0.6.0:
     apollo-env "^0.6.5"
     lodash.sortby "^4.7.0"
 
-apollo-link-http-common@^0.2.14:
-  version "0.2.16"
-  resolved "https://registry.yarnpkg.com/apollo-link-http-common/-/apollo-link-http-common-0.2.16.tgz#756749dafc732792c8ca0923f9a40564b7c59ecc"
-  integrity sha512-2tIhOIrnaF4UbQHf7kjeQA/EmSorB7+HyJIIrUjJOKBgnXwuexi8aMecRlqTIDWcyVXCeqLhUnztMa6bOH/jTg==
-  dependencies:
-    apollo-link "^1.2.14"
-    ts-invariant "^0.4.0"
-    tslib "^1.9.3"
-
-apollo-link@1.2.14, apollo-link@^1.2.12, apollo-link@^1.2.14:
+apollo-link@1.2.14, apollo-link@^1.2.14:
   version "1.2.14"
   resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.14.tgz#3feda4b47f9ebba7f4160bef8b977ba725b684d9"
   integrity sha512-p67CMEFP7kOG1JZ0ZkYZwRDa369w5PIjtMjvrQd/HnIV8FRsHRqLqK+oAZQnFa1DDdZtOtHTi+aMIW6EatC2jg==
@@ -4386,16 +4352,6 @@ apollo-upload-client@14.1.2:
     "@babel/runtime" "^7.11.2"
     extract-files "^9.0.0"
 
-apollo-upload-client@^13.0.0:
-  version "13.0.0"
-  resolved "https://registry.yarnpkg.com/apollo-upload-client/-/apollo-upload-client-13.0.0.tgz#146d1ddd85d711fcac8ca97a72d3ca6787f2b71b"
-  integrity sha512-lJ9/bk1BH1lD15WhWRha2J3+LrXrPIX5LP5EwiOUHv8PCORp4EUrcujrA3rI5hZeZygrTX8bshcuMdpqpSrvtA==
-  dependencies:
-    "@babel/runtime" "^7.9.2"
-    apollo-link "^1.2.12"
-    apollo-link-http-common "^0.2.14"
-    extract-files "^8.0.0"
-
 apollo-utilities@^1.0.1, apollo-utilities@^1.3.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.4.tgz#6129e438e8be201b6c55b0f13ce49d2c7175c9cf"
@@ -6864,7 +6820,7 @@ deep-object-diff@^1.1.0:
   resolved "https://registry.yarnpkg.com/deep-object-diff/-/deep-object-diff-1.1.0.tgz#d6fabf476c2ed1751fc94d5ca693d2ed8c18bc5a"
   integrity sha512-b+QLs5vHgS+IoSNcUE4n9HP2NwcHj7aqnJWsjPtuG75Rh5TOaGt0OjAYInh77d5T16V5cRDC+Pw/6ZZZiETBGw==
 
-deepmerge@4.2.2, deepmerge@^4.2.2:
+deepmerge@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
   integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
@@ -8021,11 +7977,6 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-extract-files@^8.0.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-8.1.0.tgz#46a0690d0fe77411a2e3804852adeaa65cd59288"
-  integrity sha512-PTGtfthZK79WUMk+avLmwx3NGdU8+iVFXC2NMGxKsn0MnihOG2lvumj+AZo8CTwTrwjXDgZ5tztbRlEdRjBonQ==
-
 extract-files@^9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-9.0.0.tgz#8a7744f2437f81f5ed3250ed9f1550de902fe54a"
@@ -8685,7 +8636,7 @@ glob-to-regexp@^0.3.0:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
   integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+glob@7.1.6, glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -8767,18 +8718,6 @@ globalthis@^1.0.0:
   dependencies:
     define-properties "^1.1.3"
 
-globby@11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.0.tgz#56fd0e9f0d4f8fb0c456f1ab0dee96e1380bc154"
-  integrity sha512-iuehFnR3xu5wBBtm4xi0dMe92Ob87ufyu/dHwpDYfbcpYpIbrO5OnS8M1vWvrBhSGEJ3/Ecj7gnX76P8YxpPEg==
-  dependencies:
-    array-union "^2.1.0"
-    dir-glob "^3.0.1"
-    fast-glob "^3.1.1"
-    ignore "^5.1.4"
-    merge2 "^1.3.0"
-    slash "^3.0.0"
-
 globby@11.0.1, globby@^11.0.0, globby@^11.0.1:
   version "11.0.1"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357"
@@ -8869,20 +8808,6 @@ graphql-tag@^2.12.0:
   dependencies:
     tslib "^1.14.1"
 
-graphql-tools@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/graphql-tools/-/graphql-tools-5.0.0.tgz#67281c834a0e29f458adba8018f424816fa627e9"
-  integrity sha512-5zn3vtn//382b7G3Wzz3d5q/sh+f7tVrnxeuhTMTJ7pWJijNqLxH7VEzv8VwXCq19zAzHYEosFHfXiK7qzvk7w==
-  dependencies:
-    apollo-link "^1.2.14"
-    apollo-upload-client "^13.0.0"
-    deprecated-decorator "^0.1.6"
-    form-data "^3.0.0"
-    iterall "^1.3.0"
-    node-fetch "^2.6.0"
-    tslib "^1.11.1"
-    uuid "^7.0.3"
-
 graphql-tools@6.2.4:
   version "6.2.4"
   resolved "https://registry.yarnpkg.com/graphql-tools/-/graphql-tools-6.2.4.tgz#e4573ab65ea53a1e64dbe1fd4ccb483b59946fd2"
@@ -10092,7 +10017,7 @@ istanbul-reports@^3.0.2:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
-iterall@^1.1.3, iterall@^1.2.1, iterall@^1.2.2, iterall@^1.3.0:
+iterall@^1.1.3, iterall@^1.2.1, iterall@^1.2.2:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.3.0.tgz#afcb08492e2915cbd8a0884eb93a8c94d0d72fea"
   integrity sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg==
@@ -11261,11 +11186,6 @@ lodash.union@^4.6.0:
   resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88"
   integrity sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=
 
-lodash@4.17.15:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
-  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
-
 lodash@4.17.20, lodash@^4.17.20:
   version "4.17.20"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
@@ -11493,15 +11413,6 @@ merge-descriptors@1.0.1, merge-descriptors@~1.0.0:
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
   integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
 
-merge-graphql-schemas@^1.7.6:
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/merge-graphql-schemas/-/merge-graphql-schemas-1.7.8.tgz#11a0a672a38a61d988c09ffdebe1bd4f8418de48"
-  integrity sha512-C3EJ1i86OjmbcCT524wVPRl17M5VZzgyh9kIGYAlYnAILX+7xfh8cCbMKfehh9n4opZg6CtcPogCiVZ6PB2NyQ==
-  dependencies:
-    "@graphql-toolkit/file-loading" "0.10.4"
-    "@graphql-toolkit/schema-merging" "0.10.4"
-    tslib "1.11.1"
-
 merge-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
@@ -15725,17 +15636,12 @@ tsconfig-paths@^3.9.0:
     minimist "^1.2.0"
     strip-bom "^3.0.0"
 
-tslib@1.11.1:
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
-  integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==
-
 tslib@^1.10.0, tslib@^1.14.1, tslib@^1.9.3:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^1.11.1, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.2:
+tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.2:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
   integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
@@ -16115,11 +16021,6 @@ uuid@^3.1.0, uuid@^3.3.2, uuid@^3.4.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
-uuid@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b"
-  integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==
-
 uuid@^8.3.0:
   version "8.3.1"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31"