Merge main into release

Author: google-oss-bot

.changeset/config.json

@@ -7,7 +7,7 @@
   "commit": false,
   "linked": [],
   "access": "public",
-  "baseBranch": "master",
+  "baseBranch": "main",
   "updateInternalDependencies": "patch",
   "ignore": [
     "firebase-namespace-integration-test",

.changeset/late-humans-tan.md

@@ -0,0 +1,12 @@
+---
+'@firebase/firestore-compat': patch
+'@firebase/database-compat': patch
+'@firebase/auth-compat': patch
+'@firebase/app-compat': patch
+'@firebase/firestore': patch
+'@firebase/database': patch
+'firebase': patch
+'@firebase/auth': patch
+---
+
+Fixed typos in documentation and some internal variables and parameters.

.changeset/spicy-dragons-pay.md

@@ -0,0 +1,5 @@
+---
+'@firebase/app-compat': patch
+---
+
+Properly handle the case in app-compat checks where `window` exists but `self` does not. (This occurs in Ionic Stencil's Jest preset.)

.changeset/tender-apes-clap.md

@@ -0,0 +1,6 @@
+---
+'@firebase/analytics': patch
+'@firebase/app-check': patch
+---
+
+Revert introduction of safevalues to prevent issues from arising in Browser CommonJS environments due to ES5 incompatibility. For more information, see [GitHub PR #8395](https://github.com/firebase/firebase-js-sdk/pull/8395)

.editorconfig

@@ -11,7 +11,7 @@ root = true
 end_of_line = lf
 insert_final_newline = true
 
-# Javascript and Typescript look like Google-style
+# JavaScript and TypeScript look like Google-style
 [*.{js,json,ts}]
 charset = utf-8
 indent_style = space

.github/ISSUE_TEMPLATE/bug_report_v2.yaml

@@ -22,7 +22,7 @@ body:
     attributes:
       value: |
         *[READ THIS]:* to evaluate if you are in the right place?
-        - For issues or feature requests related to __the code in this repository__, file a Github issue.
+        - For issues or feature requests related to __the code in this repository__, file a GitHub issue.
         - If this is a __feature request__, make sure the issue title starts with "FR:".
         - For general technical questions, post a question on [StackOverflow](http://stackoverflow.com/) with the firebase tag.
         - For general Firebase discussion, use the [firebase-talk](https://groups.google.com/forum/#!forum/firebase-talk) google group.

.github/workflows/canary-deploy.yml

@@ -17,7 +17,7 @@ name: Canary Deploy
 on:
   push:
     branches:
-      - master
+      - main
   workflow_dispatch:
 
 jobs:

.github/workflows/check-changeset.yml

@@ -17,7 +17,7 @@ name: Check Changeset
 on:
   pull_request:
     branches:
-      - master
+      - main
 
 env:
   GITHUB_PULL_REQUEST_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
@@ -41,9 +41,9 @@ jobs:
     - name: Yarn install
       run: yarn
     - name: Run changeset script
-      # pull master so changeset can diff against it
+      # pull main so changeset can diff against it
       run: |
-        git pull -f --no-rebase origin master:master
+        git pull -f --no-rebase origin main:main
         yarn ts-node-script scripts/ci/check_changeset.ts
       id: check-changeset
     - name: Print changeset checker output
@@ -54,22 +54,22 @@ jobs:
     - name: Print blocking failure status
       run: echo "${{steps.check-changeset.outputs.BLOCKING_FAILURE}}"
     - name: Find Comment
-      uses: peter-evans/find-comment@v1
+      uses: peter-evans/find-comment@v3
       id: fc
       with:
         issue-number: ${{github.event.number}}
         body-includes: Changeset File Check
     - name: Create comment (missing packages)
       if: ${{!steps.fc.outputs.comment-id && steps.check-changeset.outputs.CHANGESET_ERROR_MESSAGE}}
-      uses: peter-evans/create-or-update-comment@v1
+      uses: peter-evans/create-or-update-comment@v4
       with:
         issue-number: ${{github.event.number}}
         body: |
           ### Changeset File Check :warning:
           ${{steps.check-changeset.outputs.CHANGESET_ERROR_MESSAGE}}
     - name: Update comment (missing packages)
       if: ${{steps.fc.outputs.comment-id}}
-      uses: peter-evans/create-or-update-comment@v1
+      uses: peter-evans/create-or-update-comment@v4
       with:
         comment-id: ${{steps.fc.outputs.comment-id}} && steps.check-changeset.outputs.CHANGESET_ERROR_MESSAGE}}
         edit-mode: replace
@@ -78,7 +78,7 @@ jobs:
           ${{steps.check-changeset.outputs.CHANGESET_ERROR_MESSAGE}}
     - name: Update comment (no missing packages)
       if: ${{steps.fc.outputs.comment-id && !steps.check-changeset.outputs.CHANGESET_ERROR_MESSAGE}}
-      uses: peter-evans/create-or-update-comment@v1
+      uses: peter-evans/create-or-update-comment@v4
       with:
         comment-id: ${{steps.fc.outputs.comment-id}}
         edit-mode: replace

.github/workflows/merge-release-branch.yml

@@ -12,12 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: Merge Release Into Master
+name: Merge Release Into Main
 
 on: workflow_dispatch
 
 jobs:
-  merge_to_master:
+  merge_to_main:
     runs-on: ubuntu-latest
     # Allow GITHUB_TOKEN to have write permissions
     permissions:
@@ -36,15 +36,15 @@ jobs:
       - name: Echo version in shell
         run: |
           echo "Merging release ${{ steps.get-version.outputs.RELEASE_VERSION }}"
-      - name: Merge to master
+      - name: Merge to main
         uses: actions/github-script@v6
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
             github.rest.repos.merge({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              base: 'master',
+              base: 'main',
               head: 'release',
               commit_message: 'Release ${{ steps.get-version.outputs.RELEASE_VERSION }}'
             })

.github/workflows/release-pr.yml

@@ -43,9 +43,9 @@ jobs:
       # Ensures a new @firebase/app is published with every release.
       # This keeps the SDK_VERSION variable up to date.
       - name: Add a changeset for @firebase/app
-        # pull master so changeset can diff against it
+        # pull main so changeset can diff against it
         run: |
-          git pull -f --no-rebase origin master:master
+          git pull -f --no-rebase origin main:main
           yarn ts-node-script scripts/ci/add_changeset.ts
 
       - name: Create Release Pull Request