📦 [RUMF-1168] update typescript (#1368)

* 📦 [RUMF-1168] update typescript * 📦 [RUMF-1168] update ts-loader * 📦 [RUMF-1168] update ts-node * 📦 [RUMF-1168] fix developer extension typings To fix developer extension typings, this commit update some sub-dependencies. * 👌 simplify error condition
DataDog · Mar 2, 2022 · bb2e40f · bb2e40f
1 parent b52da4f
commit bb2e40f
Show file tree

Hide file tree

Showing 9 changed files with 124 additions and 101 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -41,4 +41,3 @@ updates:
       # typescript: RUMF-1168
       - dependency-name: 'ts-loader'
       - dependency-name: 'ts-node'
-      - dependency-name: 'typescript'
diff --git a/package.json b/package.json
@@ -81,17 +81,18 @@
     "replace-in-file": "6.3.2",
     "sinon": "9.2.4",
     "terser-webpack-plugin": "5.1.1",
-    "ts-loader": "8.0.18",
-    "ts-node": "9.1.1",
+    "ts-loader": "9.2.6",
+    "ts-node": "10.6.0",
     "tsconfig-paths-webpack-plugin": "3.5.1",
-    "typescript": "4.1.5",
+    "typescript": "4.6.2",
     "webdriverio": "6.1.4",
     "webpack": "5.28.0",
     "webpack-cli": "4.5.0",
     "webpack-dev-middleware": "4.1.0"
   },
   "resolutions": {
     "**/bumbag/lodash": "4.17.21",
+    "**/bumbag/reakit": "1.3.11",
     "ansi-regex": "5.0.1"
   }
 }
diff --git a/packages/core/src/browser/xhrObservable.ts b/packages/core/src/browser/xhrObservable.ts
@@ -63,11 +63,11 @@ function createXhrObservable() {
   return observable
 }
 
-function openXhr(this: XMLHttpRequest, method: string, url: string) {
+function openXhr(this: XMLHttpRequest, method: string, url: string | URL) {
   xhrContexts.set(this, {
     state: 'open',
     method,
-    url: normalizeUrl(url),
+    url: normalizeUrl(url.toString()),
   })
 }
 

diff --git a/packages/core/src/tools/utils.ts b/packages/core/src/tools/utils.ts
@@ -574,23 +574,17 @@ export function combine(...sources: any[]): unknown {
 export type TimeoutId = ReturnType<typeof setTimeout>
 
 export function requestIdleCallback(callback: () => void, opts?: { timeout?: number }) {
-  interface BrowserWindow extends Window {
-    requestIdleCallback: (callback: () => void, opts?: { timeout?: number }) => number
-    cancelIdleCallback: (handle?: number) => void
-  }
-  const browserWindow = window as unknown as BrowserWindow
-
   // Use 'requestIdleCallback' when available: it will throttle the mutation processing if the
   // browser is busy rendering frames (ex: when frames are below 60fps). When not available, the
   // fallback on 'requestAnimationFrame' will still ensure the mutations are processed after any
   // browser rendering process (Layout, Recalculate Style, etc.), so we can serialize DOM nodes
   // efficiently.
-  if (browserWindow.requestIdleCallback) {
-    const id = browserWindow.requestIdleCallback(monitor(callback), opts)
-    return () => browserWindow.cancelIdleCallback(id)
+  if (window.requestIdleCallback) {
+    const id = window.requestIdleCallback(monitor(callback), opts)
+    return () => window.cancelIdleCallback(id)
   }
-  const id = browserWindow.requestAnimationFrame(monitor(callback))
-  return () => browserWindow.cancelAnimationFrame(id)
+  const id = window.requestAnimationFrame(monitor(callback))
+  return () => window.cancelAnimationFrame(id)
 }
 
 export function removeDuplicates<T>(array: T[]) {

diff --git a/packages/logs/src/domain/trackNetworkError.ts b/packages/logs/src/domain/trackNetworkError.ts
@@ -197,7 +197,7 @@ function readLimitedAmountOfBytes(
 
   function readMore() {
     reader.read().then(
-      monitor((result: ReadableStreamReadResult<Uint8Array>) => {
+      monitor((result: ReadableStreamDefaultReadResult<Uint8Array>) => {
         if (result.done) {
           onDone()
           return

diff --git a/packages/rum/src/domain/segmentCollection/deflateWorker.js b/packages/rum/src/domain/segmentCollection/deflateWorker.js
@@ -25,7 +25,7 @@ function workerCodeFn() {
               type: 'initialized',
             })
             break
-          case 'write':
+          case 'write': {
             const additionalRawSize = pushData(data.data)
             self.postMessage({
               type: 'wrote',
@@ -34,7 +34,8 @@ function workerCodeFn() {
               additionalRawSize,
             })
             break
-          case 'flush':
+          }
+          case 'flush': {
             const additionalRawSize = data.data ? pushData(data.data) : 0
             deflate.push('', constants.Z_FINISH)
             self.postMessage({
@@ -47,6 +48,7 @@ function workerCodeFn() {
             deflate = new Deflate()
             rawSize = 0
             break
+          }
         }
       })
     )

diff --git a/packages/rum/src/domain/segmentCollection/startDeflateWorker.ts b/packages/rum/src/domain/segmentCollection/startDeflateWorker.ts
@@ -94,7 +94,7 @@ function onInitialized(worker: DeflateWorker) {
   }
 }
 
-function onError(error: ErrorEvent | Error | string) {
+function onError(error: unknown) {
   if (state.status === DeflateWorkerStatus.Loading) {
     display.error('Session Replay recording failed to start: an error occurred while creating the Worker:', error)
     if (error instanceof Event || (error instanceof Error && includes(error.message, 'Content Security Policy'))) {

diff --git a/test/e2e/lib/framework/httpServers.ts b/test/e2e/lib/framework/httpServers.ts
@@ -86,7 +86,7 @@ async function instantiateServer(): Promise<http.Server> {
     try {
       return await instantiateServerOnPort(port)
     } catch (error) {
-      if (error.code === 'EADDRINUSE') {
+      if ((error as NodeJS.ErrnoException).code === 'EADDRINUSE') {
         continue
       }
       throw error