chore: enable esModuleInterop

integration_test/functions/src/index.ts

@@ -3,7 +3,7 @@
 import { Request, Response } from "express";
 import * as admin from "firebase-admin";
 import * as functions from "firebase-functions";
-import * as fs from "fs";
+import fs from "fs";
 import fetch from "node-fetch";
 
 import * as v1 from "./v1";
@@ -17,13 +17,13 @@
 import { REGION } from "./region";
 import * as testLab from "./v1/testLab-utils";
 
 const firebaseConfig = JSON.parse(process.env.FIREBASE_CONFIG);
 admin.initializeApp();
 
 // Re-enable no-unused-var check once callable functions are testable again.
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 async function callHttpsTrigger(name: string, data: any) {
   const url = `https://${REGION}-${firebaseConfig.projectId}.cloudfunctions.net/${name}`;
   const client = await new GoogleAuth().getIdTokenClient("32555940559.apps.googleusercontent.com");
   const resp = await client.request({
     url,
@@ -31,7 +31,7 @@
     headers: {
       "Content-Type": "application/json",
     },
     body: JSON.stringify({ data }),
   });
   if (resp.status > 200) {
     throw Error(resp.statusText);
@@ -40,17 +40,17 @@
 
 // Re-enable no-unused-var check once callable functions are testable again.
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 async function callV2HttpsTrigger(name: string, data: any, accessToken: string) {
   const getFnResp = await fetch(
     `https://cloudfunctions.googleapis.com/v2beta/projects/${firebaseConfig.projectId}/locations/${REGION}/functions/${name}`,
     {
       headers: {
         Authorization: `Bearer ${accessToken}`,
       },
     }
   );
   if (!getFnResp.ok) {
     throw new Error(getFnResp.statusText);
   }
   const fn = await getFnResp.json();
   const uri = fn.serviceConfig?.uri;

mocha/setup.ts

@@ -1,17 +1,6 @@
-import * as chai from "chai";
-import * as chaiAsPromisedModule from "chai-as-promised";
-import * as nockModule from "nock";
-
-// Normalize CommonJS exports so ts-node (Node.js 20) and Node.js 22's strip-only loader
-// both receive callable modules without relying on esModuleInterop.
-type ChaiPlugin = Parameters<typeof chai.use>[0];
-type NockModule = typeof nockModule;
-
-const chaiAsPromisedExport = chaiAsPromisedModule as ChaiPlugin & { default?: ChaiPlugin };
-const chaiAsPromised = chaiAsPromisedExport.default ?? chaiAsPromisedExport;
-const nockExport = nockModule as NockModule & { default?: NockModule };
-const nock = nockExport.default ?? nockExport;
+import chai from "chai";
+import chaiAsPromised from "chai-as-promised";
+import nock from "nock";
 
 chai.use(chaiAsPromised);
-
 nock.disableNetConnect();

scripts/bin-test/mocha-setup.ts

@@ -1,11 +1,4 @@
-import * as chai from "chai";
-import * as chaiAsPromisedModule from "chai-as-promised";
-
-// Match the runtime shim in mocha/setup.ts so bin tests work on Node.js 20 ts-node
-// and Node.js 22's strip-only TypeScript loader without enabling esModuleInterop.
-type ChaiPlugin = Parameters<typeof chai.use>[0];
-
-const chaiAsPromisedExport = chaiAsPromisedModule as ChaiPlugin & { default?: ChaiPlugin };
-const chaiAsPromised = chaiAsPromisedExport.default ?? chaiAsPromisedExport;
+import chai from "chai";
+import chaiAsPromised from "chai-as-promised";
 
 chai.use(chaiAsPromised);

scripts/bin-test/test.ts

@@ -1,7 +1,7 @@
 import * as subprocess from "child_process";
 import * as path from "path";
 import { promisify } from "util";
-import * as fs from "fs/promises";
+import fs from "fs/promises";
 import * as os from "os";
 
 import { expect } from "chai";

spec/common/config.spec.ts

@@ -21,8 +21,7 @@
 // SOFTWARE.
 
 import { expect } from "chai";
-import * as fs from "fs";
-import * as process from "process";
+import fs from "fs";
 import * as sinon from "sinon";
 
 import { firebaseConfig, resetCache } from "../../src/common/config";

spec/fixtures/mockrequest.ts

@@ -1,8 +1,8 @@
 import { EventEmitter } from 'node:stream';
 
-import * as jwt from 'jsonwebtoken';
-import * as jwkToPem from 'jwk-to-pem';
-import * as nock from 'nock';
+import jwt from 'jsonwebtoken';
+import jwkToPem from 'jwk-to-pem';
+import nock from 'nock';
 import * as mockJWK from '../fixtures/credential/jwk.json';
 import * as mockKey from '../fixtures/credential/key.json';
 

src/bin/firebase-functions.ts

@@ -23,8 +23,8 @@
 // SOFTWARE.
 
 import * as http from "http";
-import * as express from "express";
-import * as fs from "fs/promises";
+import express from "express";
+import fs from "fs/promises";
 import * as path from "path";
 import { loadStack } from "../runtime/loader";
 import { stackToWire } from "../runtime/manifest";

src/common/config.ts

@@ -1,5 +1,5 @@
 import { AppOptions } from "firebase-admin/app";
-import { readFileSync } from "fs";
+import fs from "fs";
 import * as path from "path";
 
 import * as logger from "../logger";
@@ -29,7 +29,7 @@ export function firebaseConfig(): AppOptions | null {
     // explicitly state that the user can set the env to a file:
     // https://firebase.google.com/docs/admin/setup#initialize-without-parameters
     if (!env.startsWith("{")) {
-      env = readFileSync(path.join(process.env.PWD, env)).toString("utf8");
+      env = fs.readFileSync(path.join(process.env.PWD, env)).toString("utf8");
     }
 
     cache = JSON.parse(env);

src/common/providers/https.ts

@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import * as cors from "cors";
+import cors from "cors";
 import * as express from "express";
 import { DecodedAppCheckToken } from "firebase-admin/app-check";
 

src/v2/providers/https.ts

@@ -25,7 +25,7 @@
  * @packageDocumentation
  */
 
-import * as cors from "cors";
+import cors from "cors";
 import * as express from "express";
 import { convertIfPresent, convertInvoker, copyIfPresent } from "../../common/encoding";
 import { wrapTraceContext } from "../trace";

tsconfig.release.json

@@ -9,6 +9,7 @@
     "stripInternal": true,
     "target": "es2022",
     "useDefineForClassFields": false,
+    "esModuleInterop": true,
     "typeRoots": ["./node_modules/@types"]
   },
   "files": [