Merge branch 'esm-js-extensions' of https://github.com/firebase/firebase-functions into esm-js-extensions

Author: taeold

package-lock.json

@@ -24,10 +24,7 @@
 
 import * as http from "http";
 import express from "express";
-<<<<<<< HEAD
 import fs from "fs/promises";
-=======
-import * as fs from "fs/promises";
 >>>>>>> f054321 (chore: enable esModuleInterop)
 import * as path from "path";
 import { loadStack } from "../runtime/loader";