Skip to content

Commit 3f5c699

Browse files
committed
Merge branch 'master' into removing_rxfire
2 parents 07434f0 + f037995 commit 3f5c699

File tree

2,286 files changed

+91918
-34991
lines changed

Some content is hidden

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

2,286 files changed

+91918
-34991
lines changed

.changeset/config.json

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,23 @@
1313
"firebase-namespace-integration-test",
1414
"firebase-firestore-integration-test",
1515
"firebase-messaging-integration-test",
16+
"firebase-compat-interop-test",
17+
"firebase-compat-typings-test",
1618
"@firebase/app-exp",
17-
"@firebase/app-types-exp",
19+
"@firebase/app-check-exp",
20+
"@firebase/analytics-compat",
1821
"@firebase/analytics-exp",
19-
"@firebase/analytics-types-exp",
2022
"@firebase/auth-exp",
2123
"@firebase/auth-compat",
22-
"@firebase/auth-types-exp",
2324
"@firebase/functions-compat",
2425
"@firebase/functions-exp",
25-
"@firebase/functions-types-exp",
2626
"@firebase/installations-exp",
27-
"@firebase/installations-types-exp",
2827
"@firebase/installations-compat",
2928
"@firebase/messaging-exp",
30-
"@firebase/messaging-types-exp",
29+
"@firebase/messaging-compat",
3130
"@firebase/performance-exp",
32-
"@firebase/performance-types-exp",
31+
"@firebase/performance-compat",
3332
"@firebase/remote-config-exp",
34-
"@firebase/remote-config-types-exp",
3533
"@firebase/remote-config-compat",
3634
"firebase-exp",
3735
"@firebase/app-compat",

.changeset/hip-glasses-grin.md

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

.changeset/hip-turtles-travel.md

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

.changeset/neat-yaks-kneel.md

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

.changeset/wet-badgers-nail.md

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

.github/CODEOWNERS

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,17 @@ packages/storage @schmidt-sebastian @firebase/jssdk-global-approvers
5050
packages/storage-types @schmidt-sebastian @firebase/jssdk-global-approvers
5151

5252
# Messaging Code
53-
packages/messaging @zwu52 @firebase/jssdk-global-approvers
54-
packages/messaging-types @zwu52 @firebase/jssdk-global-approvers
55-
integration/messaging @zwu52 @firebase/jssdk-global-approvers
53+
packages/messaging @zwu52 @chliangGoogle @ciarand @firebase/jssdk-global-approvers
54+
packages/messaging-types @zwu52 @chliangGoogle @ciarand @firebase/jssdk-global-approvers
55+
integration/messaging @zwu52 @chliangGoogle @ciarand @firebase/jssdk-global-approvers
5656

5757
# Auth Code
58-
packages/auth @bojeil-google @avolkovi @samhorlbeck @yuchenshi @firebase/jssdk-global-approvers
59-
packages/auth-types @bojeil-google @avolkovi @samhorlbeck @yuchenshi @firebase/jssdk-global-approvers
58+
packages/auth @bojeil-google @avolkovi @sam-gc @yuchenshi @firebase/jssdk-global-approvers
59+
packages/auth-types @bojeil-google @avolkovi @sam-gc @yuchenshi @firebase/jssdk-global-approvers
6060

6161
# Testing Code
62-
packages/testing @avolkovi @samhorlbeck @yuchenshi @firebase/jssdk-global-approvers
63-
packages/rules-unit-testing @avolkovi @samhorlbeck @yuchenshi @firebase/jssdk-global-approvers
62+
packages/testing @avolkovi @sam-gc @yuchenshi @firebase/jssdk-global-approvers
63+
packages/rules-unit-testing @avolkovi @sam-gc @yuchenshi @firebase/jssdk-global-approvers
6464

6565
# Installations
6666
packages/installations @andirayo @ChaoqunCHEN @firebase/jssdk-global-approvers
@@ -79,16 +79,15 @@ packages/remote-config @erikeldridge @firebase/jssdk-global-approvers
7979
packages/remote-config-types @erikeldridge @firebase/jssdk-global-approvers
8080

8181
# Documentation Changes
82-
packages/firebase/index.d.ts @firebase/firebase-techwriters @firebase/jssdk-global-approvers
83-
scripts/docgen/content-sources/ @firebase/firebase-techwriters @firebase/jssdk-global-approvers
82+
packages/firebase/index.d.ts @egilmorez @firebase/jssdk-global-approvers
83+
scripts/docgen/content-sources/ @egilmorez @firebase/jssdk-global-approvers
8484

8585
# Changeset
86-
.changeset @firebase/firebase-techwriters @firebase/jssdk-changeset-approvers @firebase/firestore-js-team @firebase/jssdk-global-approvers
86+
.changeset @egilmorez @firebase/jssdk-changeset-approvers @firebase/firestore-js-team @firebase/jssdk-global-approvers
8787

8888
# Auth-Exp Code
89-
packages-exp/auth-exp @avolkovi @samhorlbeck @yuchenshi @firebase/jssdk-global-approvers
90-
packages-exp/auth-types-exp @avolkovi @samhorlbeck @yuchenshi @firebase/jssdk-global-approvers
91-
packages-exp/auth-compat-exp @avolkovi @samhorlbeck @yuchenshi @firebase/jssdk-global-approvers
89+
packages-exp/auth-exp @avolkovi @sam-gc @yuchenshi @firebase/jssdk-global-approvers
90+
packages-exp/auth-compat-exp @avolkovi @sam-gc @yuchenshi @firebase/jssdk-global-approvers
9291

9392
# Installations-Exp Code
9493
packages/installations-exp @andirayo @ChaoqunCHEN @firebase/jssdk-global-approvers
@@ -100,5 +99,4 @@ packages/performance-types-exp @alikn @zijianjoy @firebase/jssdk-global-approve
10099

101100
# RC-Exp Code
102101
packages/remote-config-exp @erikeldridge @firebase/jssdk-global-approvers
103-
packages/remote-config-types-exp @erikeldridge @firebase/jssdk-global-approvers
104102
packages/remote-config-compat @erikeldridge @firebase/jssdk-global-approvers

.github/ISSUE_TEMPLATE/alpha_bug_report.md

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

.github/workflows/canary-deploy.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ jobs:
3030
NPM_TOKEN_ANALYTICS_TYPES: ${{secrets.NPM_TOKEN_ANALYTICS_TYPES}}
3131
NPM_TOKEN_APP: ${{secrets.NPM_TOKEN_APP}}
3232
NPM_TOKEN_APP_TYPES: ${{secrets.NPM_TOKEN_APP_TYPES}}
33+
NPM_TOKEN_APP_CHECK: ${{secrets.NPM_TOKEN_APP_CHECK}}
34+
NPM_TOKEN_APP_CHECK_INTEROP_TYPES: ${{secrets.NPM_TOKEN_APP_CHECK_INTEROP_TYPES}}
35+
NPM_TOKEN_APP_CHECK_TYPES: ${{secrets.NPM_TOKEN_APP_CHECK_TYPES}}
3336
NPM_TOKEN_AUTH: ${{secrets.NPM_TOKEN_AUTH}}
3437
NPM_TOKEN_AUTH_INTEROP_TYPES: ${{secrets.NPM_TOKEN_AUTH_INTEROP_TYPES}}
3538
NPM_TOKEN_AUTH_TYPES: ${{secrets.NPM_TOKEN_AUTH_TYPES}}

.github/workflows/health-metrics-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ env:
66
METRICS_SERVICE_URL: ${{ secrets.METRICS_SERVICE_URL }}
77
GITHUB_PULL_REQUEST_NUMBER: ${{ github.event.pull_request.number }}
88
GITHUB_PULL_REQUEST_BASE_SHA: ${{ github.event.pull_request.base.sha }}
9+
NODE_OPTIONS: "--max-old-space-size=4096"
910

1011
jobs:
1112
binary-size:

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Lint All Packages
22

3-
on: push
3+
on: pull_request
44

55
jobs:
66
test:

.github/workflows/release.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ jobs:
2424
- name: Install Dependencies
2525
run: yarn
2626

27+
- name: Add a changeset for @firebase/app
28+
run: yarn ts-node-script scripts/add_changeset.ts
29+
2730
- name: Create Release Pull Request
2831
uses: changesets/action@master
2932
env:

LICENSE

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
This source code is licensed under Apache-2.0 apart from the protobuf library
2+
which is licensed under BSD-3-Clause, both licenses given below.
13

24
Apache License
35
Version 2.0, January 2004
@@ -200,3 +202,39 @@
200202
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201203
See the License for the specific language governing permissions and
202204
limitations under the License.
205+
206+
------------------------------------------------------------------------------
207+
208+
For Google protobuf source.
209+
210+
file: [source code root]/packages/firestore/src/protos/google/protobuf/any.proto
211+
212+
// Protocol Buffers - Google's data interchange format
213+
// Copyright 2008 Google Inc. All rights reserved.
214+
// https://developers.google.com/protocol-buffers/
215+
//
216+
// Redistribution and use in source and binary forms, with or without
217+
// modification, are permitted provided that the following conditions are
218+
// met:
219+
//
220+
// * Redistributions of source code must retain the above copyright
221+
// notice, this list of conditions and the following disclaimer.
222+
// * Redistributions in binary form must reproduce the above
223+
// copyright notice, this list of conditions and the following disclaimer
224+
// in the documentation and/or other materials provided with the
225+
// distribution.
226+
// * Neither the name of Google Inc. nor the names of its
227+
// contributors may be used to endorse or promote products derived from
228+
// this software without specific prior written permission.
229+
//
230+
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
231+
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
232+
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
233+
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
234+
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
235+
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
236+
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
237+
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
238+
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
239+
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
240+
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

0 commit comments

Comments
 (0)