Skip to content

Commit 0dbb8e6

Browse files
hsubox76hsubox76
committed
Merge branch 'main' into v11
2 parents 95d3309 + f3b8e4c commit 0dbb8e6

File tree

127 files changed

+5029
-100
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+5029
-100
lines changed

‎.changeset/four-pillows-fetch.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@firebase/messaging': patch
3+
---
4+
5+
The logging endpoint has been updated to ensure proper logging of WebPush entries. This resolves an issue where BigQuery logs were missing WebPush data. The payload structure has also been updated in alignment with the latest logging requirements as specified in go/firelog.

‎.changeset/sharp-dingos-admire.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.changeset/small-geckos-mix.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.github/workflows/canary-deploy.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ jobs:
5252
NPM_TOKEN_AUTH_INTEROP_TYPES: ${{secrets.NPM_TOKEN_AUTH_INTEROP_TYPES}}
5353
NPM_TOKEN_AUTH_TYPES: ${{secrets.NPM_TOKEN_AUTH_TYPES}}
5454
NPM_TOKEN_COMPONENT: ${{secrets.NPM_TOKEN_COMPONENT}}
55+
NPM_TOKEN_DATA_CONNECT: ${{secrets.NPM_TOKEN_DATA_CONNECT}}
5556
NPM_TOKEN_DATABASE: ${{secrets.NPM_TOKEN_DATABASE}}
5657
NPM_TOKEN_DATABASE_TYPES: ${{secrets.NPM_TOKEN_DATABASE_TYPES}}
5758
NPM_TOKEN_FIRESTORE: ${{secrets.NPM_TOKEN_FIRESTORE}}

‎.github/workflows/prerelease-manual-deploy.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ jobs:
5555
NPM_TOKEN_AUTH_INTEROP_TYPES: ${{secrets.NPM_TOKEN_AUTH_INTEROP_TYPES}}
5656
NPM_TOKEN_AUTH_TYPES: ${{secrets.NPM_TOKEN_AUTH_TYPES}}
5757
NPM_TOKEN_COMPONENT: ${{secrets.NPM_TOKEN_COMPONENT}}
58+
NPM_TOKEN_DATA_CONNECT: ${{secrets.NPM_TOKEN_DATA_CONNECT}}
5859
NPM_TOKEN_DATABASE: ${{secrets.NPM_TOKEN_DATABASE}}
5960
NPM_TOKEN_DATABASE_TYPES: ${{secrets.NPM_TOKEN_DATABASE_TYPES}}
6061
NPM_TOKEN_FIRESTORE: ${{secrets.NPM_TOKEN_FIRESTORE}}

‎.github/workflows/release-prod.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ jobs:
6565
NPM_TOKEN_AUTH_INTEROP_TYPES: ${{secrets.NPM_TOKEN_AUTH_INTEROP_TYPES}}
6666
NPM_TOKEN_AUTH_TYPES: ${{secrets.NPM_TOKEN_AUTH_TYPES}}
6767
NPM_TOKEN_COMPONENT: ${{secrets.NPM_TOKEN_COMPONENT}}
68+
NPM_TOKEN_DATA_CONNECT: ${{secrets.NPM_TOKEN_DATA_CONNECT}}
6869
NPM_TOKEN_DATABASE: ${{secrets.NPM_TOKEN_DATABASE}}
6970
NPM_TOKEN_DATABASE_TYPES: ${{secrets.NPM_TOKEN_DATABASE_TYPES}}
7071
NPM_TOKEN_FIRESTORE: ${{secrets.NPM_TOKEN_FIRESTORE}}

‎.github/workflows/release-staging.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ jobs:
9191
NPM_TOKEN_AUTH_INTEROP_TYPES: ${{secrets.NPM_TOKEN_AUTH_INTEROP_TYPES}}
9292
NPM_TOKEN_AUTH_TYPES: ${{secrets.NPM_TOKEN_AUTH_TYPES}}
9393
NPM_TOKEN_COMPONENT: ${{secrets.NPM_TOKEN_COMPONENT}}
94+
NPM_TOKEN_DATA_CONNECT: ${{secrets.NPM_TOKEN_DATA_CONNECT}}
9495
NPM_TOKEN_DATABASE: ${{secrets.NPM_TOKEN_DATABASE}}
9596
NPM_TOKEN_DATABASE_TYPES: ${{secrets.NPM_TOKEN_DATABASE_TYPES}}
9697
NPM_TOKEN_FIRESTORE: ${{secrets.NPM_TOKEN_FIRESTORE}}

‎.github/workflows/test-changed-auth.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,28 @@ jobs:
102102
run: xvfb-run yarn test:changed auth
103103
env:
104104
BROWSERS: 'Firefox'
105+
106+
test-webkit:
107+
name: Test Auth on Webkit if Changed
108+
runs-on: macos-latest
109+
110+
steps:
111+
- name: Checkout Repo
112+
uses: actions/checkout@v4
113+
with:
114+
fetch-depth: 0
115+
- name: Set up Node (20)
116+
uses: actions/setup-node@v3
117+
with:
118+
node-version: 20.x
119+
- name: Test setup and yarn install
120+
run: |
121+
cp config/ci.config.json config/project.json
122+
yarn
123+
npx playwright install webkit
124+
- name: build
125+
run: yarn build:changed auth
126+
- name: Run tests on changed packages
127+
run: yarn test:changed auth
128+
env:
129+
BROWSERS: 'WebkitHeadless'

‎.github/workflows/test-changed-firestore.yml

Lines changed: 57 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,62 @@ jobs:
231231
BROWSERS: 'Firefox'
232232
EXPERIMENTAL_MODE: true
233233

234+
compat-test-webkit:
235+
name: Test Firestore Compatible on Webkit
236+
runs-on: macos-latest
237+
needs: build
238+
if: ${{ needs.build.outputs.changed == 'true'}}
239+
steps:
240+
- name: Set up Node (20)
241+
uses: actions/setup-node@v3
242+
with:
243+
node-version: 20.x
244+
- name: Download build archive
245+
uses: actions/download-artifact@v3
246+
with:
247+
name: build.tar.gz
248+
- name: Unzip build artifact
249+
run: tar xf build.tar.gz
250+
- name: Test setup
251+
run: |
252+
cp config/ci.config.json config/project.json
253+
npx playwright install webkit
254+
- name: Run compat tests
255+
run: cd packages/firestore-compat && yarn run test:ci
256+
env:
257+
BROWSERS: 'WebkitHeadless'
258+
259+
test-webkit:
260+
name: Test Firestore on Webkit
261+
strategy:
262+
matrix:
263+
# TODO (dlarocque): Add test:travis once the browser tests are isolated
264+
# Exclude test:travis for now, since it includes node tests, which are failing for
265+
# some reason.
266+
test-name: ["test:browser", "test:lite:browser", "test:browser:prod:nameddb", "test:lite:browser:nameddb"]
267+
runs-on: macos-latest
268+
needs: build
269+
if: ${{ needs.build.outputs.changed == 'true'}}
270+
steps:
271+
- name: Download build archive
272+
uses: actions/download-artifact@v3
273+
with:
274+
name: build.tar.gz
275+
- name: Unzip build artifact
276+
run: tar xf build.tar.gz
277+
- name: Set up Node (20)
278+
uses: actions/setup-node@v3
279+
with:
280+
node-version: 20.x
281+
- name: Test setup
282+
run: |
283+
cp config/ci.config.json config/project.json
284+
npx playwright install webkit
285+
- name: Run tests
286+
run: cd packages/firestore && yarn run ${{ matrix.test-name }}
287+
env:
288+
BROWSERS: 'WebkitHeadless'
289+
EXPERIMENTAL_MODE: true
234290
# A job that fails if any required job in the test matrix fails,
235291
# to be used as a required check for merging.
236292
check-required-tests:
@@ -241,4 +297,4 @@ jobs:
241297
steps:
242298
- name: Check test matrix
243299
if: needs.build.result == 'failure' || needs.test-chrome.result == 'failure' || needs.compat-test-chrome.result == 'failure'
244-
run: exit 1
300+
run: exit 1

‎.github/workflows/test-changed.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,3 +78,29 @@ jobs:
7878
run: xvfb-run yarn test:changed core
7979
env:
8080
BROWSERS: 'Firefox'
81+
82+
83+
test-webkit:
84+
name: Test Packages With Changed Files in Webkit
85+
runs-on: macos-latest
86+
87+
steps:
88+
- name: Checkout Repo
89+
uses: actions/checkout@v4
90+
with:
91+
fetch-depth: 0
92+
- name: Set up Node (20)
93+
uses: actions/setup-node@v3
94+
with:
95+
node-version: 20.x
96+
- name: Test setup and yarn install
97+
run: |
98+
cp config/ci.config.json config/project.json
99+
yarn
100+
npx playwright install webkit
101+
- name: build
102+
run: yarn build:changed core
103+
- name: Run tests on changed packages
104+
run: yarn test:changed core
105+
env:
106+
BROWSERS: 'WebkitHeadless'

0 commit comments

Comments
 (0)