Skip to content

Commit b80c880

Browse files
committed
Merge branch 'master' into wuandy/Bundles
# Conflicts: # packages/firestore/exp/src/api/database.ts # packages/firestore/src/api/database.ts # packages/firestore/src/core/firestore_client.ts
2 parents 223bc9a + 878a1bf commit b80c880

File tree

565 files changed

+9958
-6340
lines changed

Some content is hidden

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

565 files changed

+9958
-6340
lines changed

.changeset/fuzzy-impalas-brake.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@firebase/util": patch
3+
---
4+
5+
Do not merge `__proto__` in `deepExtend` to prevent `__proto__` pollution.

.changeset/great-rice-smash.md

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

.changeset/short-icons-travel.md

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

.changeset/shy-trees-divide.md

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

.changeset/silver-books-reply.md

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

.changeset/strange-rabbits-wait.md

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

.changeset/stupid-dots-grab.md

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

.github/workflows/check-changeset.yml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,43 +22,42 @@ jobs:
2222
- name: Run changeset script
2323
run: yarn ts-node-script scripts/check_changeset.ts
2424
id: check-changeset
25-
- name: Read output
26-
run: echo "${{steps.check-changeset.outputs.MISSING_PACKAGES}}"
25+
- name: Print changeset checker output
26+
run: echo "${{steps.check-changeset.outputs.CHANGESET_ERROR_MESSAGE}}"
2727
- name: Find Comment
2828
uses: peter-evans/find-comment@v1
2929
id: fc
3030
with:
3131
issue-number: ${{github.event.number}}
3232
body-includes: Changeset File Check
3333
- name: Create comment (missing packages)
34-
if: ${{!steps.fc.outputs.comment-id && steps.check-changeset.outputs.MISSING_PACKAGES}}
34+
if: ${{!steps.fc.outputs.comment-id && steps.check-changeset.outputs.CHANGESET_ERROR_MESSAGE}}
3535
uses: peter-evans/create-or-update-comment@v1
3636
with:
3737
issue-number: ${{github.event.number}}
3838
body: |
3939
### Changeset File Check :warning:
40-
Warning: This PR modifies files in the following packages but they have not been included in the changeset file:
41-
${{steps.check-changeset.outputs.MISSING_PACKAGES}}
42-
43-
Make sure this was intentional.
40+
${{steps.check-changeset.outputs.CHANGESET_ERROR_MESSAGE}}
4441
- name: Update comment (missing packages)
4542
if: ${{steps.fc.outputs.comment-id}}
4643
uses: peter-evans/create-or-update-comment@v1
4744
with:
48-
comment-id: ${{steps.fc.outputs.comment-id}} && steps.check-changeset.outputs.MISSING_PACKAGES}}
45+
comment-id: ${{steps.fc.outputs.comment-id}} && steps.check-changeset.outputs.CHANGESET_ERROR_MESSAGE}}
4946
edit-mode: replace
5047
body: |
5148
### Changeset File Check :warning:
52-
Warning: This PR modifies files in the following packages but they have not been included in the changeset file:
53-
${{steps.check-changeset.outputs.MISSING_PACKAGES}}
54-
55-
Make sure this was intentional.
49+
${{steps.check-changeset.outputs.CHANGESET_ERROR_MESSAGE}}
5650
- name: Update comment (no missing packages)
57-
if: ${{steps.fc.outputs.comment-id && !steps.check-changeset.outputs.MISSING_PACKAGES}}
51+
if: ${{steps.fc.outputs.comment-id && !steps.check-changeset.outputs.CHANGESET_ERROR_MESSAGE}}
5852
uses: peter-evans/create-or-update-comment@v1
5953
with:
6054
comment-id: ${{steps.fc.outputs.comment-id}}
6155
edit-mode: replace
6256
body: |
6357
### Changeset File Check :white_check_mark:
64-
No modified packages are missing from the changeset file.
58+
- No modified packages are missing from the changeset file.
59+
- No changeset formatting errors detected.
60+
# Don't want it to throw before editing the comment.
61+
- name: Fail if checker script logged a blocking failure
62+
if: ${{steps.check-changeset.outputs.BLOCKING_FAILURE}}
63+
run: exit 1

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ packages-exp/**/temp
8888

8989
# temp markdowns generated for individual SDKs
9090
packages-exp/**/docs
91+
packages/**/docs
9192

9293
# files generated by api-extractor that should not be tracked
9394
tsdoc-metadata.json

0 commit comments

Comments
 (0)