fix: support typescript 4.4.x, 4.5.x, 4.6.x (#1245)

* fix: support typescript 4.4.x, 4.5.x, 4.6.x * test(hard-reload): use "location.replace"
mswjs · May 20, 2022 · 5378416 · 5378416
1 parent 0233a9e
commit 5378416
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 26 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -44,7 +44,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ts: ['4.2', '4.3']
+        ts: ['4.2', '4.3', '4.4', '4.5', '4.6']
     steps:
       - name: Checkout
         uses: actions/checkout@v3

diff --git a/package.json b/package.json
@@ -135,13 +135,13 @@
     "ts-jest": "26",
     "ts-loader": "^9.2.6",
     "ts-node": "^10.1.0",
-    "typescript": "^4.3.5",
+    "typescript": "^4.6.4",
     "url-loader": "^4.1.1",
     "webpack": "^5.68.0",
     "webpack-dev-server": "^3.11.2"
   },
   "peerDependencies": {
-    "typescript": "4.2.x || 4.3.x"
+    "typescript": ">= 4.2.x <= 4.6.x"
   },
   "peerDependenciesMeta": {
     "typescript": {
@@ -156,4 +156,4 @@
       "path": "./node_modules/cz-conventional-changelog"
     }
   }
-}
+}
diff --git a/src/utils/internal/parseGraphQLRequest.ts b/src/utils/internal/parseGraphQLRequest.ts
@@ -44,7 +44,7 @@ function parseQuery(query: string): ParsedGraphQLQuery | Error {
     const ast = parse(query)
     return parseDocumentNode(ast)
   } catch (error) {
-    return error
+    return error as Error
   }
 }
 

diff --git a/src/utils/internal/tryCatch.ts b/src/utils/internal/tryCatch.ts
@@ -6,6 +6,6 @@ export function tryCatch<Fn extends (...args: any[]) => any>(
     const result = fn()
     return result
   } catch (error) {
-    onException?.(error)
+    onException?.(error as Error)
   }
 }
diff --git a/src/utils/worker/createRequestListener.ts b/src/utils/worker/createRequestListener.ts
@@ -80,19 +80,21 @@ export const createRequestListener = (
         })
       }
 
-      // Treat all the other exceptions in a request handler
-      // as unintended, alerting that there is a problem needs fixing.
-      channel.send({
-        type: 'INTERNAL_ERROR',
-        payload: {
-          status: 500,
-          body: JSON.stringify({
-            errorType: error.constructor.name,
-            message: error.message,
-            location: error.stack,
-          }),
-        },
-      })
+      if (error instanceof Error) {
+        // Treat all the other exceptions in a request handler
+        // as unintended, alerting that there is a problem needs fixing.
+        channel.send({
+          type: 'INTERNAL_ERROR',
+          payload: {
+            status: 500,
+            body: JSON.stringify({
+              errorType: error.constructor.name,
+              message: error.message,
+              location: error.stack,
+            }),
+          },
+        })
+      }
     }
   }
 }
diff --git a/test/msw-api/hard-reload.test.ts b/test/msw-api/hard-reload.test.ts
@@ -10,8 +10,15 @@ function createRuntime() {
 test('keeps the mocking enabled after hard-reload of the page', async () => {
   const runtime = await createRuntime()
 
-  // Passing `true` to `location.reload()` forces a hard reload
-  runtime.page.evaluate(() => location.reload(true))
+  runtime.page.evaluate(() => {
+    /**
+     * Emulate a forced reload.
+     * Since `location.reload(true)` is deprecated,
+     * use a workaround.
+     * @see https://stackoverflow.com/a/65544086/2754939
+     */
+    location.replace(location.href)
+  })
 
   await runtime.page.waitForNavigation({
     waitUntil: 'networkidle',

diff --git a/yarn.lock b/yarn.lock
@@ -9366,16 +9366,16 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-typescript@^4.3.5:
-  version "4.3.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4"
-  integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==
-
 typescript@^4.4.3:
   version "4.5.4"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.4.tgz#a17d3a0263bf5c8723b9c52f43c5084edf13c2e8"
   integrity sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==
 
+typescript@^4.6.4:
+  version "4.6.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9"
+  integrity sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==
+
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"