From 0d95f72e24a3aeb43c6e62e7f49190fc74b77b41 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Thu, 27 Apr 2023 11:11:05 -0700
Subject: [PATCH 1/2] deps: update to typescript 5.0.4

---
 build/build-cdt-lib.js              | 2 +-
 core/legacy/gather/gather-runner.js | 2 +-
 package.json                        | 2 +-
 types/internal/test.d.ts            | 2 +-
 yarn.lock                           | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build/build-cdt-lib.js b/build/build-cdt-lib.js
index d240295ae446..cbe9c0a99ac5 100644
--- a/build/build-cdt-lib.js
+++ b/build/build-cdt-lib.js
@@ -221,7 +221,7 @@ function doModification(modification) {
       }
 
       if (removeNode) {
-        return ts.createNode(ts.SyntaxKind.Unknown);
+        return /** @type {ts.Node} */ ({kind: ts.SyntaxKind.Unknown});
       }
 
       return node;
diff --git a/core/legacy/gather/gather-runner.js b/core/legacy/gather/gather-runner.js
index 78b3377c3de0..a27724e97cb6 100644
--- a/core/legacy/gather/gather-runner.js
+++ b/core/legacy/gather/gather-runner.js
@@ -452,7 +452,7 @@ class GatherRunner {
       // Add a `bidx=20` query param, eg: https://www.example.com/?bidx=50
       const parsedUrl = UrlUtils.isValid(options.requestedUrl) && new URL(options.requestedUrl);
       if (options.settings.channel === 'lr' && parsedUrl && parsedUrl.searchParams.has('bidx')) {
-        const bidxRunCount = parsedUrl.searchParams.get('bidx') || 0;
+        const bidxRunCount = Number(parsedUrl.searchParams.get('bidx')) || 0;
         // Add the first bidx into the new set
         const indexes = [baseArtifacts.BenchmarkIndex];
         for (let i = 0; i < bidxRunCount; i++) {
diff --git a/package.json b/package.json
index abad417dbf61..7d1765699bef 100644
--- a/package.json
+++ b/package.json
@@ -181,7 +181,7 @@
     "terser": "^5.3.8",
     "testdouble": "^3.16.8",
     "typed-query-selector": "^2.6.1",
-    "typescript": "^4.9.4",
+    "typescript": "^5.0.4",
     "wait-for-expect": "^3.0.2",
     "webtreemap-cdt": "^3.2.1"
   },
diff --git a/types/internal/test.d.ts b/types/internal/test.d.ts
index af106254c85a..990e9abe9dfe 100644
--- a/types/internal/test.d.ts
+++ b/types/internal/test.d.ts
@@ -6,7 +6,7 @@
 
 declare global {
   var expect: import('expect').Expect;
-  type Mock<T, Y> = import('jest-mock').Mock<T, Y>;
+  type Mock<T, Y extends unknown[]> = import('jest-mock').Mock<T, Y>;
 }
 
 declare module 'expect' {
diff --git a/yarn.lock b/yarn.lock
index b233ef042672..5e80345d6790 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7239,10 +7239,10 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-typescript@^4.9.4:
-  version "4.9.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.4.tgz#a2a3d2756c079abda241d75f149df9d561091e78"
-  integrity sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==
+typescript@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.4.tgz#b217fd20119bd61a94d4011274e0ab369058da3b"
+  integrity sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==
 
 uglify-js@^3.1.4:
   version "3.14.4"

From 2fc58b431325f62e9ef1cb57ce9ba94a8df9aa2b Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Thu, 27 Apr 2023 14:29:04 -0700
Subject: [PATCH 2/2] ts.factory.createNotEmittedStatement

---
 build/build-cdt-lib.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/build-cdt-lib.js b/build/build-cdt-lib.js
index cbe9c0a99ac5..cac2eaf2fdc3 100644
--- a/build/build-cdt-lib.js
+++ b/build/build-cdt-lib.js
@@ -221,7 +221,7 @@ function doModification(modification) {
       }
 
       if (removeNode) {
-        return /** @type {ts.Node} */ ({kind: ts.SyntaxKind.Unknown});
+        return ts.factory.createNotEmittedStatement(node);
       }
 
       return node;