Skip to content

Commit

Permalink
Merge main into ashish-kothari/rc-custom-targeting
Browse files Browse the repository at this point in the history
Squashed commit of the following:

commit ffbf5a6
Author: Google Open Source Bot <firebase-oss-bot@google.com>
Date:   Thu Nov 14 07:04:30 2024 -0800

    Version Packages (#8635)

    Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

commit 2c27206
Merge: a75082f e3e2078
Author: Google Open Source Bot <firebase-oss-bot@google.com>
Date:   Tue Nov 12 07:48:12 2024 -0800

    Merge main into release

commit e3e2078
Author: Daniel La Rocque <dlarocque@google.com>
Date:   Wed Nov 6 09:57:57 2024 -0500

    Consolidate CI test output into a single string (#8489)

    * Consolidate CI test output into a single string

    Having CI test process stdout and stderr in a single string makes it
    easier to read when looking through failures, since you can see the test
    output alongside the error messages.

    Without this, any stderr output written during a test will be captured
    seperately from the test output, so when we then log it after a test
    failure, we can't tell which test logged which errors.

    * Prefix stdout and stderr output

commit 274e9a5
Author: Daniel La Rocque <dlarocque@google.com>
Date:   Tue Nov 5 17:25:54 2024 -0500

    Remove unused `convertPropertiesForEnclosingClass" (#8618)

commit caf3090
Author: Daniel La Rocque <dlarocque@google.com>
Date:   Wed Oct 30 15:12:32 2024 -0400

    Upgrade ts-node to 10.19.2 (#8531)

commit 0f5714b
Author: Mark Duckworth <1124037+MarkDuckworth@users.noreply.github.com>
Date:   Wed Oct 30 10:05:19 2024 -0600

    Fix for 8474 - Prevent a possible condition of slow snapshots, caused by a rapid series of document update(s) followed by a delete. (#8595)

commit d4cb3f8
Author: Daniel La Rocque <dlarocque@google.com>
Date:   Mon Oct 28 14:32:13 2024 -0400

    Upgrade workflows Node version from `20.x` to `22.10.0` (#8601)

    Node 22 enters LTS on October 29th, 2024, so we should upgrade CI to run
    on Node 22.

commit b807119
Author: Daniel La Rocque <dlarocque@google.com>
Date:   Fri Oct 25 15:16:08 2024 -0400

    Remove modifiers from compat overloads (#8604)

    * Remove modifiers from compat overloads

    * format

    * Add changeset

commit 612335d
Author: Daniel La Rocque <dlarocque@google.com>
Date:   Fri Oct 25 14:31:32 2024 -0400

    Upgrade webpack dependencies in e2e tests (#8605)
  • Loading branch information
ashish-kothari committed Nov 24, 2024
1 parent 9e1b157 commit bb5871b
Show file tree
Hide file tree
Showing 141 changed files with 3,410 additions and 3,830 deletions.
5 changes: 0 additions & 5 deletions .changeset/nervous-timers-call.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/six-toys-chew.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/tall-peas-tell.md

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/canary-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Set up Node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: Yarn install
run: yarn
- name: Deploy canary
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-changeset.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Set up Node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: Yarn install
run: yarn
- name: Run changeset script
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Set up Node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: Yarn install
run: yarn
- name: Run doc generation
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-pkg-paths.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Set up Node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: Yarn install
run: yarn
- name: Yarn build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Set up node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: Yarn install
run: yarn
- name: Deploy project config if needed
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: Set up Node (20)
uses: actions/setup-node@master
with:
node-version: 20.x
node-version: 22.10.0
- name: install Chrome stable
run: |
sudo apt-get update
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Set up node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: Yarn install
run: yarn
- name: Run formatting script
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/health-metrics-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- uses: 'google-github-actions/auth@v0'
with:
credentials_json: '${{ secrets.GCP_SA_KEY }}'
Expand All @@ -58,7 +58,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- uses: 'google-github-actions/auth@v0'
with:
credentials_json: '${{ secrets.GCP_SA_KEY }}'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Set up node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: yarn install
run: yarn
- name: yarn lint
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prerelease-manual-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Set up node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: Yarn install
run: yarn
- name: Deploy prerelease
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-log.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Setup Node.js 20.x
uses: actions/setup-node@master
with:
node-version: 20.x
node-version: 22.10.0

- name: Get PR number and send to tracker.
run: node scripts/ci/log-changesets.js
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Setup Node.js 20.x
uses: actions/setup-node@master
with:
node-version: 20.x
node-version: 22.10.0

- name: Install Dependencies
run: yarn
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Set up node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: Checkout release branch (with history)
uses: actions/checkout@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
- name: Set up node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: Merge main into release
uses: actions/github-script@v6
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-tweet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Setup Node.js 20.x
uses: actions/setup-node@master
with:
node-version: 20.x
node-version: 22.10.0
- name: Poll release notes page on devsite
run: node scripts/ci/poll_release_notes.js
env:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: Set up Node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: Test setup and yarn install
run: |
cp config/ci.config.json config/project.json
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
- name: Set up Node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: Test setup and yarn install
run: |
cp config/ci.config.json config/project.json
Expand Down Expand Up @@ -133,7 +133,7 @@ jobs:
- name: Set up Node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: Test setup and yarn install
run: |
cp config/ci.config.json config/project.json
Expand Down Expand Up @@ -173,7 +173,7 @@ jobs:
- name: Set up Node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: Test setup and yarn install
run: |
cp config/ci.config.json config/project.json
Expand Down Expand Up @@ -217,7 +217,7 @@ jobs:
- name: Set up Node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- run: cp config/ci.config.json config/project.json
- run: yarn
- run: yarn build:${{ matrix.persistence }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-changed-auth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
- name: Set up Node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: Test setup and yarn install
run: |
cp config/ci.config.json config/project.json
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
- name: Set up Node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: Test setup and yarn install
run: |
cp config/ci.config.json config/project.json
Expand All @@ -115,7 +115,7 @@ jobs:
- name: Set up Node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: Test setup and yarn install
run: |
cp config/ci.config.json config/project.json
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-changed-fcm-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Set up Node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: Test setup and yarn install
run: |
cp config/ci.config.json config/project.json
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-changed-firestore-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
- name: Set up Node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: install Chrome stable
run: |
sudo apt-get update
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/test-changed-firestore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- name: Set up Node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: install Chrome stable
run: |
sudo apt-get update
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
- name: Set up Node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: install Chrome stable
run: |
sudo apt-get update
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
- name: Set up Node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: install Chrome stable
run: |
sudo apt-get update
Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:
- name: Set up Node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: install Chrome stable
run: |
sudo apt-get update
Expand Down Expand Up @@ -183,7 +183,7 @@ jobs:
- name: Set up Node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: Download build archive
uses: actions/download-artifact@v3
with:
Expand Down Expand Up @@ -222,7 +222,7 @@ jobs:
- name: Set up Node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: Test setup and yarn install
run: cp config/ci.config.json config/project.json
- name: Run tests
Expand All @@ -240,7 +240,7 @@ jobs:
- name: Set up Node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: Download build archive
uses: actions/download-artifact@v3
with:
Expand Down Expand Up @@ -277,7 +277,7 @@ jobs:
- name: Set up Node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: Test setup
run: |
cp config/ci.config.json config/project.json
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-changed-misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Set up Node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: install Chrome stable
run: |
sudo apt-get update
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-changed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Set up Node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: install Chrome stable
run: |
sudo apt-get update
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
- name: Set up Node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: install Firefox stable
run: |
sudo apt-get update
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
- name: Set up Node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: Test setup and yarn install
run: |
cp config/ci.config.json config/project.json
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-firebase-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Set up Node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: install Chrome stable
run: |
sudo apt-get update
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-api-reports.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Set up node (20)
uses: actions/setup-node@v3
with:
node-version: 20.x
node-version: 22.10.0
- name: Yarn install
run: yarn
- name: Update API reports
Expand Down
4 changes: 2 additions & 2 deletions e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"mocha": "9.2.2",
"typescript": "5.5.4",
"webpack": "5.76.0",
"webpack-cli": "4.10.0",
"webpack-dev-server": "4.11.1"
"webpack-cli": "5.1.4",
"webpack-dev-server": "5.1.0"
},
"engines": {
"node": ">=18.0.0"
Expand Down
Loading

0 comments on commit bb5871b

Please sign in to comment.