Upgrade to TypeScript 5

.vscode/launch.json

@@ -4,6 +4,24 @@
   // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
   "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Prune .d.ts",
+      "program": "${workspaceRoot}/repo-scripts/prune-dts/node_modules/.bin/_mocha",
+      "cwd": "${workspaceRoot}/repo-scripts/prune-dts",
+      "args": [
+        "--require",
+        "ts-node/register",
+        "--timeout",
+        "5000",
+        "${workspaceFolder}/repo-scripts/prune-dts/*.test.ts"
+      ],
+      "env": {
+        "TS_NODE_COMPILER_OPTIONS" : "{\"module\":\"commonjs\"}"
+      },
+      "sourceMaps": true,
+    },
     {
       "type": "node",
       "request": "launch",

common/api-review/rules-unit-testing.api.md

@@ -16,13 +16,14 @@ export function assertSucceeds<T>(pr: Promise<T>): Promise<T>;
 // @public
 export type EmulatorConfig = {
     rules?: string;
-} & (HostAndPort | {});
+    endpoint?: HostAndPort;
+};
 
 // @public
-export interface HostAndPort {
+export type HostAndPort = {
     host: string;
     port: number;
-}
+};
 
 // @public
 export function initializeTestEnvironment(config: TestEnvironmentConfig): Promise<RulesTestEnvironment>;

e2e/package.json

@@ -34,7 +34,7 @@
     "karma-typescript": "5.5.4",
     "karma-typescript-es6-transform": "5.5.4",
     "mocha": "9.2.2",
-    "typescript": "4.7.4",
+    "typescript": "5.5.4",
     "webpack": "5.76.0",
     "webpack-cli": "4.10.0",
     "webpack-dev-server": "4.11.1"

integration/compat-interop/package.json

@@ -24,7 +24,7 @@
     "@firebase/remote-config-compat": "0.2.9"
   },
   "devDependencies": {
-    "typescript": "4.7.4"
+    "typescript": "5.5.4"
   },
   "engines": {
     "node": ">=18.0.0"

integration/compat-typings/package.json

@@ -10,7 +10,7 @@
     "firebase": "*"
   },
   "devDependencies": {
-    "typescript": "4.7.4"
+    "typescript": "5.5.4"
   },
   "engines": {
     "node": ">=18.0.0"

integration/firebase/package.json

@@ -20,7 +20,7 @@
     "karma-typescript": "5.5.4",
     "mocha": "9.2.2",
     "npm-run-all": "4.1.5",
-    "typescript": "4.7.4"
+    "typescript": "5.5.4"
   },
   "engines": {
     "node": ">=18.0.0"

integration/firestore/package.json

@@ -29,7 +29,7 @@
     "karma-spec-reporter": "0.0.36",
     "mocha": "9.2.2",
     "ts-loader": "9.5.1",
-    "typescript": "4.2.2",
+    "typescript": "5.5.4",
     "webpack": "5.76.0",
     "webpack-stream": "7.0.0"
   },

package.json

@@ -80,7 +80,7 @@
     "@types/long": "4.0.2",
     "@types/mocha": "9.1.1",
     "@types/mz": "2.7.8",
-    "@types/node": "16.18.68",
+    "@types/node": "22.7.5",
     "@types/request": "2.48.12",
     "@types/sinon": "9.0.11",
     "@types/sinon-chai": "3.2.12",
@@ -156,7 +156,7 @@
     "tsec": "0.2.8",
     "tslint": "6.1.3",
     "typedoc": "0.16.11",
-    "typescript": "4.7.4",
+    "typescript": "5.5.4",
     "watch": "1.0.2",
     "webpack": "5.76.0",
     "yargs": "17.7.2"

packages/analytics-compat/package.json

@@ -26,7 +26,7 @@
     "rollup": "2.79.1",
     "@rollup/plugin-json": "4.1.0",
     "rollup-plugin-typescript2": "0.31.2",
-    "typescript": "4.7.4"
+    "typescript": "5.5.4"
   },
   "repository": {
     "directory": "packages/analytics-compat",

packages/analytics-interop-types/package.json

@@ -20,6 +20,6 @@
     "url": "https://github.com/firebase/firebase-js-sdk/issues"
   },
   "devDependencies": {
-    "typescript": "4.7.4"
+    "typescript": "5.5.4"
   }
 }

packages/analytics-types/package.json

@@ -20,6 +20,6 @@
     "url": "https://github.com/firebase/firebase-js-sdk/issues"
   },
   "devDependencies": {
-    "typescript": "4.7.4"
+    "typescript": "5.5.4"
   }
 }

packages/analytics/package.json

@@ -53,7 +53,7 @@
     "@rollup/plugin-json": "4.1.0",
     "@rollup/plugin-node-resolve": "13.3.0",
     "rollup-plugin-typescript2": "0.31.2",
-    "typescript": "4.7.4"
+    "typescript": "5.5.4"
   },
   "repository": {
     "directory": "packages/analytics",

packages/app-check-compat/package.json

@@ -49,7 +49,7 @@
     "@rollup/plugin-json": "4.1.0",
     "@rollup/plugin-node-resolve": "13.3.0",
     "rollup-plugin-typescript2": "0.31.2",
-    "typescript": "4.7.4"
+    "typescript": "5.5.4"
   },
   "repository": {
     "directory": "packages/app-check",

packages/app-check-interop-types/package.json

@@ -20,6 +20,6 @@
     "url": "https://github.com/firebase/firebase-js-sdk/issues"
   },
   "devDependencies": {
-    "typescript": "4.7.4"
+    "typescript": "5.5.4"
   }
 }

packages/app-check-types/package.json

@@ -20,6 +20,6 @@
     "url": "https://github.com/firebase/firebase-js-sdk/issues"
   },
   "devDependencies": {
-    "typescript": "4.7.4"
+    "typescript": "5.5.4"
   }
 }

packages/app-check/package.json

@@ -50,7 +50,7 @@
     "@rollup/plugin-json": "4.1.0",
     "@rollup/plugin-node-resolve": "13.3.0",
     "rollup-plugin-typescript2": "0.31.2",
-    "typescript": "4.7.4"
+    "typescript": "5.5.4"
   },
   "repository": {
     "directory": "packages/app-check",

packages/app-compat/package.json

@@ -48,7 +48,7 @@
     "@rollup/plugin-json": "4.1.0",
     "rollup-plugin-replace": "2.2.0",
     "rollup-plugin-typescript2": "0.31.2",
-    "typescript": "4.7.4"
+    "typescript": "5.5.4"
   },
   "repository": {
     "directory": "packages/app-compat",

packages/app-types/package.json

@@ -24,6 +24,6 @@
     "@firebase/logger": "0.2.6"
   },
   "devDependencies": {
-    "typescript": "4.7.4"
+    "typescript": "5.5.4"
   }
 }

packages/app/package.json

@@ -50,7 +50,7 @@
     "rollup-plugin-replace": "2.2.0",
     "rollup-plugin-typescript2": "0.31.2",
     "rollup-plugin-dts": "5.3.1",
-    "typescript": "4.7.4"
+    "typescript": "5.5.4"
   },
   "repository": {
     "directory": "packages/app",

packages/auth-compat/demo/package.json

@@ -34,7 +34,7 @@
     "rollup-plugin-sourcemaps": "0.6.3",
     "rollup-plugin-typescript2": "0.31.2",
     "rollup-plugin-uglify": "6.0.4",
-    "typescript": "4.7.4"
+    "typescript": "5.5.4"
   },
   "repository": {
     "directory": "packages/auth-compat/demo",

packages/auth-compat/package.json

@@ -63,7 +63,7 @@
     "rollup-plugin-replace": "2.2.0",
     "rollup-plugin-typescript2": "0.31.2",
     "selenium-webdriver": "4.8.0",
-    "typescript": "4.7.4"
+    "typescript": "5.5.4"
   },
   "repository": {
     "directory": "packages/auth-compat",

packages/auth-interop-types/package.json

@@ -20,6 +20,6 @@
     "url": "https://github.com/firebase/firebase-js-sdk/issues"
   },
   "devDependencies": {
-    "typescript": "4.7.4"
+    "typescript": "5.5.4"
   }
 }

packages/auth-types/package.json

@@ -24,6 +24,6 @@
     "url": "https://github.com/firebase/firebase-js-sdk/issues"
   },
   "devDependencies": {
-    "typescript": "4.7.4"
+    "typescript": "5.5.4"
   }
 }

packages/auth/package.json

@@ -141,7 +141,7 @@
     "rollup-plugin-typescript2": "0.31.2",
     "selenium-webdriver": "4.8.0",
     "totp-generator": "0.0.14",
-    "typescript": "4.7.4"
+    "typescript": "5.5.4"
   },
   "repository": {
     "directory": "packages/auth",

packages/auth/src/api/index.ts

@@ -241,20 +241,20 @@ export async function _performSignInRequest<T, V extends IdTokenResponse>(
   request?: T,
   customErrorMap: Partial<ServerErrorMap<ServerError>> = {}
 ): Promise<V> {
-  const serverResponse = (await _performApiRequest<T, V | IdTokenMfaResponse>(
+  const serverResponse = await _performApiRequest<T, V | IdTokenMfaResponse>(
     auth,
     method,
     path,
     request,
     customErrorMap
-  )) as V;
+  );
   if ('mfaPendingCredential' in serverResponse) {
     _fail(auth, AuthErrorCode.MFA_REQUIRED, {
       _serverResponse: serverResponse
     });
   }
 
-  return serverResponse;
+  return serverResponse as V;
 }
 
 export function _getFinalTarget(

packages/auth/src/platform_browser/recaptcha/recaptcha_enterprise_verifier.ts

@@ -162,7 +162,7 @@ export class RecaptchaEnterpriseVerifier {
   }
 }
 
-export async function injectRecaptchaFields<T>(
+export async function injectRecaptchaFields<T extends object>(
   auth: AuthInternal,
   request: T,
   action: RecaptchaActionName,
@@ -238,7 +238,7 @@ type ActionMethod<TRequest, TResponse> = (
   request: TRequest
 ) => Promise<TResponse>;
 
-export async function handleRecaptchaFlow<TRequest, TResponse>(
+export async function handleRecaptchaFlow<TRequest extends object, TResponse>(
   authInstance: AuthInternal,
   request: TRequest,
   actionName: RecaptchaActionName,

packages/auth/src/platform_browser/strategies/phone.ts

@@ -462,7 +462,7 @@ export async function updatePhoneNumber(
 }
 
 // Helper function that fetches and injects a reCAPTCHA v2 token into the request.
-export async function injectRecaptchaV2Token<T>(
+export async function injectRecaptchaV2Token<T extends object>(
   auth: AuthInternal,
   request: T,
   recaptchaV2Verifier: ApplicationVerifierInternal

packages/auth/test/integration/flows/recaptcha_enterprise.test.ts

@@ -18,6 +18,7 @@
 import { expect, use } from 'chai';
 import chaiAsPromised from 'chai-as-promised';
 import sinonChai from 'sinon-chai';
+// eslint-disable-next-line import/no-extraneous-dependencies
 import {
   linkWithPhoneNumber,
   PhoneAuthProvider,

packages/component/package.json

@@ -38,7 +38,7 @@
   "devDependencies": {
     "rollup": "2.79.1",
     "rollup-plugin-typescript2": "0.31.2",
-    "typescript": "4.7.4"
+    "typescript": "5.5.4"
   },
   "repository": {
     "directory": "packages/component",

packages/data-connect/package.json

@@ -58,7 +58,7 @@
     "@firebase/app": "0.10.13",
     "rollup": "2.79.1",
     "rollup-plugin-typescript2": "0.31.2",
-    "typescript": "4.7.4"
+    "typescript": "5.5.4"
   },
   "repository": {
     "directory": "packages/data-connect",

packages/database-compat/package.json

@@ -58,7 +58,7 @@
   },
   "devDependencies": {
     "@firebase/app-compat": "0.2.43",
-    "typescript": "4.7.4"
+    "typescript": "5.5.4"
   },
   "repository": {
     "directory": "packages/database-compat",

packages/database-compat/test/transaction.test.ts

@@ -847,9 +847,11 @@ describe('Transaction Tests', () => {
       ref1.transaction(
         current => {
           retries++;
-          // We should be getting server events while the transaction is outstanding.
-          for (let i = 0; i < (current || 0); i++) {
-            expect(events[i]).to.equal(i);
+          if (typeof current === 'number') {
+            // We should be getting server events while the transaction is outstanding.
+            for (let i = 0; i < (current || 0); i++) {
+              expect(events[i]).to.equal(i);
+            }
           }
 
           if (current === SETS - 1) {
@@ -919,7 +921,7 @@ describe('Transaction Tests', () => {
         current => {
           if (current == null) {
             return 0;
-          } else if (current < COUNT) {
+          } else if (typeof current === 'number' && current < COUNT) {
             return (current as number) + 1;
           } else {
             shouldCommit = false;

packages/database-types/package.json

@@ -24,6 +24,6 @@
     "url": "https://github.com/firebase/firebase-js-sdk/issues"
   },
   "devDependencies": {
-    "typescript": "4.7.4"
+    "typescript": "5.5.4"
   }
 }

packages/database/package.json

@@ -60,7 +60,7 @@
     "@firebase/app": "0.10.13",
     "rollup": "2.79.1",
     "rollup-plugin-typescript2": "0.31.2",
-    "typescript": "4.7.4"
+    "typescript": "5.5.4"
   },
   "repository": {
     "directory": "packages/database",

packages/firebase/package.json

@@ -439,7 +439,7 @@
     "gulp": "4.0.2",
     "gulp-sourcemaps": "3.0.0",
     "gulp-replace": "1.1.4",
-    "typescript": "4.2.2",
+    "typescript": "5.5.4",
     "rollup-plugin-license": "3.0.1"
   },
   "components": [

packages/firestore-compat/package.json

@@ -61,7 +61,7 @@
     "rollup-plugin-typescript2": "0.31.2",
     "@rollup/plugin-node-resolve": "13.3.0",
     "ts-node": "10.9.1",
-    "typescript": "4.7.4"
+    "typescript": "5.5.4"
   },
   "license": "Apache-2.0",
   "typings": "dist/src/index.d.ts",

packages/firestore-types/package.json

@@ -24,6 +24,6 @@
     "url": "https://github.com/firebase/firebase-js-sdk/issues"
   },
   "devDependencies": {
-    "typescript": "4.2.2"
+    "typescript": "5.5.4"
   }
 }