Merge branch 'main' into leoortizz_nextjsintegrationtests

Author: joehan

.github/workflows/node-test.yml

@@ -270,7 +270,7 @@ jobs:
           # - npm run test:storage-emulator-integration
           # - npm run test:dataconnect-deploy #  TODO (joehanley): Reenable this - it should be safe to run in parallel
           # - npm run test:dataconnect-emulator # TODO (joehanley): Figure out why this is failing
-          - npm run test:frameworks
+          # - npm run test:frameworks
     steps:
       - name: Setup Java JDK
         uses: actions/[email protected]

CHANGELOG.md

@@ -1,2 +0,0 @@
-- Updated TypeScript templates for `ext:dev:init` to fix build failures (#9524)
-- Fixed a bug when `firebase emulators:start` incorrectly deletes discovery file of another emulator process (#9672)