Merge branch 'main' into renovate/supertokens-node-13.x

redwoodjs · Mar 1, 2023 · 98bdb32 · 98bdb32
2 parents 1ec1138 + 0678d11
commit 98bdb32
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -84,7 +84,7 @@
     "listr2": "5.0.7",
     "lodash.template": "4.5.0",
     "make-dir-cli": "3.0.0",
-    "msw": "0.49.3",
+    "msw": "1.0.0",
     "ncp": "2.0.0",
     "node-notifier": "10.0.1",
     "nodemon": "2.0.20",

diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -32,7 +32,7 @@
     "@testing-library/jest-dom": "5.16.5",
     "@testing-library/react": "13.4.0",
     "jest": "29.4.2",
-    "msw": "0.49.3",
+    "msw": "1.0.0",
     "typescript": "4.9.5"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"

diff --git a/packages/testing/package.json b/packages/testing/package.json
@@ -56,7 +56,7 @@
     "jest": "29.4.2",
     "jest-environment-jsdom": "29.4.2",
     "jest-watch-typeahead": "2.2.2",
-    "msw": "0.49.3",
+    "msw": "1.0.0",
     "ts-toolbelt": "9.6.0",
     "whatwg-fetch": "3.6.2"
   },

diff --git a/packages/testing/src/web/mockRequests.ts b/packages/testing/src/web/mockRequests.ts
@@ -9,15 +9,15 @@ import type {
   GraphQLContext,
   GraphQLRequest,
   ResponseTransformer,
-  SetupWorkerApi,
+  SetupWorker,
   ResponseComposition,
 } from 'msw'
 
 // Allow users to call "mockGraphQLQuery" and "mockGraphQLMutation"
 // before the server has started. We store the request handlers in
 // a queue that is drained once the server is started.
 let REQUEST_HANDLER_QUEUE: RequestHandler[] = []
-let SERVER_INSTANCE: SetupWorkerApi | any
+let SERVER_INSTANCE: SetupWorker | any
 
 /**
  * Plugs fetch for the correct target in order to capture requests.

diff --git a/yarn.lock b/yarn.lock
@@ -6787,7 +6787,7 @@ __metadata:
     "@testing-library/react": 13.4.0
     core-js: 3.29.0
     jest: 29.4.2
-    msw: 0.49.3
+    msw: 1.0.0
     react: 18.2.0
     typescript: 4.9.5
   languageName: unknown
@@ -7293,7 +7293,7 @@ __metadata:
     jest: 29.4.2
     jest-environment-jsdom: 29.4.2
     jest-watch-typeahead: 2.2.2
-    msw: 0.49.3
+    msw: 1.0.0
     ts-toolbelt: 9.6.0
     typescript: 4.9.5
     whatwg-fetch: 3.6.2
@@ -23427,9 +23427,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"msw@npm:0.49.3":
-  version: 0.49.3
-  resolution: "msw@npm:0.49.3"
+"msw@npm:1.0.0":
+  version: 1.0.0
+  resolution: "msw@npm:1.0.0"
   dependencies:
     "@mswjs/cookies": ^0.2.2
     "@mswjs/interceptors": ^0.17.5
@@ -23457,7 +23457,7 @@ __metadata:
       optional: true
   bin:
     msw: cli/index.js
-  checksum: 993e87ce639eae8edcbb492a7bbc4772bafe8ae2760ce543933e4598c24e371df9b20fe31f9d022e838810cc1fdc46438782fc6c7430be77d78d9526bd82ebee
+  checksum: 551b59e42bbe110d9f666b0a545c5e270a213e04b4d358c47c205bb1f8ced8aee76e41b3f507754268fa5e59e07de0a5dd0562ada19892c06154b3db0f62abb0
   languageName: node
   linkType: hard
 
@@ -27862,7 +27862,7 @@ __metadata:
     listr2: 5.0.7
     lodash.template: 4.5.0
     make-dir-cli: 3.0.0
-    msw: 0.49.3
+    msw: 1.0.0
     ncp: 2.0.0
     node-notifier: 10.0.1
     nodemon: 2.0.20