Skip to content

Commit 9e4fe21

Browse files
authored
Merge branch 'master' into fis-compat
2 parents 37048b5 + ba59a0f commit 9e4fe21

File tree

103 files changed

+5081
-345
lines changed

Some content is hidden

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

103 files changed

+5081
-345
lines changed

.changeset/config.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
"@firebase/installations-exp",
2525
"@firebase/installations-types-exp",
2626
"@firebase/installations-compat",
27+
"@firebase/messaging-exp",
28+
"@firebase/messaging-types-exp",
2729
"@firebase/performance-exp",
2830
"@firebase/performance-types-exp",
2931
"@firebase/remote-config-exp",

.changeset/large-books-call.md

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

.changeset/slimy-mugs-type.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@firebase/firestore": patch
3+
---
4+
5+
Fixes an issue in the Transaction API that caused the SDK to return invalid DocumentReferences through `DocumentSnapshot.data()` calls.

.changeset/wicked-actors-clap.md

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

.github/ISSUE_TEMPLATE/alpha_bug_report.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
---
22
name: 🧪 Alpha SDK bug report
33
about: Have you found a bug in one of our pre-release or alpha SDKs? File it here.
4-
title: ""
5-
labels: "alpha"
6-
assignees: ""
4+
title: ''
5+
labels: alpha
6+
assignees: ''
7+
78
---
89

910
<!-- Step 1 [READ THIS] -->

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
---
22
name: 🐞 Bug report
33
about: Found a bug in the JS SDK? File it here.
4-
title: ""
5-
labels: ""
6-
assignees: ""
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
78
---
89

10+
911
<!-- Step 1 [READ THIS] -->
1012
<!--
13+
14+
**Thank you for submitting your issue. We are operating at reduced capacity from Dec 18 2020 to Jan 4 2021. Please expect delayed responses. For more urgent requests please reach us via our support channels https://firebase.google.com/support**
15+
1116
Are you in the right place?
1217
* For issues or feature requests related to __the code in this repository__
1318
file a Github issue.
@@ -19,6 +24,7 @@ Are you in the right place?
1924
* For help troubleshooting your application that does not fall under one
2025
of the above categories, reach out to the personalized
2126
[Firebase support channel](https://firebase.google.com/support/).
27+
2228
-->
2329

2430
<!-- Step 2 -->

.github/workflows/canary-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
# Canary release script requires git history and tags.
1818
fetch-depth: 0
1919
- name: Set up Node (10)
20-
uses: actions/setup-node@v1
20+
uses: actions/setup-node@v2
2121
with:
2222
node-version: 10.x
2323
- name: Yarn install

.github/workflows/check-changeset.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
# This makes Actions fetch all Git history so check_changeset script can diff properly.
1515
fetch-depth: 0
1616
- name: Set up Node (10)
17-
uses: actions/setup-node@v1
17+
uses: actions/setup-node@v2
1818
with:
1919
node-version: 10.x
2020
- name: Yarn install

.github/workflows/cross-browser-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@v2
1818
- name: Use Node.js 10.x
19-
uses: actions/setup-node@v1
19+
uses: actions/setup-node@v2
2020
with:
2121
node-version: 10.x
2222
- name: Test setup and yarn install

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v2
17-
- uses: actions/setup-node@v1
17+
- uses: actions/setup-node@v2
1818
with:
1919
node-version: 10.x
2020
- uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: ubuntu-latest
3131
steps:
3232
- uses: actions/checkout@v2
33-
- uses: actions/setup-node@v1
33+
- uses: actions/setup-node@v2
3434
with:
3535
node-version: 10.x
3636
- uses: GoogleCloudPlatform/github-actions/setup-gcloud@master

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
steps:
1111
- uses: actions/checkout@v2
1212
- name: Set up Node (10)
13-
uses: actions/setup-node@v1
13+
uses: actions/setup-node@v2
1414
with:
1515
node-version: 10.x
1616
- name: yarn install

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
# Canary release script requires git history and tags.
2222
fetch-depth: 0
2323
- name: Set up Node (10)
24-
uses: actions/setup-node@v1
24+
uses: actions/setup-node@v2
2525
with:
2626
node-version: 10.x
2727
- name: Yarn install

.github/workflows/test-all.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
steps:
1111
- uses: actions/checkout@v2
1212
- name: Set up Node (10)
13-
uses: actions/setup-node@v1
13+
uses: actions/setup-node@v2
1414
with:
1515
node-version: 10.x
1616
- name: install Chrome stable

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
# This makes Actions fetch all Git history so run-changed script can diff properly.
1515
fetch-depth: 0
1616
- name: Set up Node (10)
17-
uses: actions/setup-node@v1
17+
uses: actions/setup-node@v2
1818
with:
1919
node-version: 10.x
2020
- name: install Chrome stable

.github/workflows/test-changed-fcm-integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
# This makes Actions fetch all Git history so run-changed script can diff properly.
1515
fetch-depth: 0
1616
- name: Set up Node (10)
17-
uses: actions/setup-node@v1
17+
uses: actions/setup-node@v2
1818
with:
1919
node-version: 10.x
2020
- name: install Chrome stable

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
# This makes Actions fetch all Git history so run-changed script can diff properly.
1515
fetch-depth: 0
1616
- name: Set up Node (10)
17-
uses: actions/setup-node@v1
17+
uses: actions/setup-node@v2
1818
with:
1919
node-version: 10.x
2020
- name: install Chrome stable

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
# This makes Actions fetch all Git history so run-changed script can diff properly.
1515
fetch-depth: 0
1616
- name: Set up Node (10)
17-
uses: actions/setup-node@v1
17+
uses: actions/setup-node@v2
1818
with:
1919
node-version: 10.x
2020
- name: install Chrome stable

.github/workflows/test-changed-misc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
# This makes Actions fetch all Git history so run-changed script can diff properly.
1515
fetch-depth: 0
1616
- name: Set up Node (10)
17-
uses: actions/setup-node@v1
17+
uses: actions/setup-node@v2
1818
with:
1919
node-version: 10.x
2020
- name: install Chrome stable

.github/workflows/test-changed.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
# This makes Actions fetch all Git history so run-changed script can diff properly.
1515
fetch-depth: 0
1616
- name: Set up Node (10)
17-
uses: actions/setup-node@v1
17+
uses: actions/setup-node@v2
1818
with:
1919
node-version: 10.x
2020
- name: install Chrome stable

.github/workflows/test-firebase-integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
# This makes Actions fetch all Git history so run-changed script can diff properly.
1515
fetch-depth: 0
1616
- name: Set up Node (10)
17-
uses: actions/setup-node@v1
17+
uses: actions/setup-node@v2
1818
with:
1919
node-version: 10.x
2020
- name: install Chrome stable

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
},
1212
"typescript.tsdk": "node_modules/typescript/lib",
1313
"files.associations": { "*.json": "jsonc" }
14-
}
14+
}
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
## API Report File for "@firebase/messaging-exp"
2+
3+
> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
4+
5+
```ts
6+
7+
import { FirebaseApp } from '@firebase/app-types-exp';
8+
import { FirebaseMessaging } from '@firebase/messaging-types-exp';
9+
import { MessagePayload } from '@firebase/messaging-types-exp';
10+
import { NextFn } from '@firebase/util';
11+
import { Observer } from '@firebase/util';
12+
import { Unsubscribe } from '@firebase/util';
13+
14+
// @public
15+
export function deleteToken(messaging: FirebaseMessaging): Promise<boolean>;
16+
17+
// @public
18+
export function getMessaging(app: FirebaseApp): FirebaseMessaging;
19+
20+
// @public
21+
export function getToken(messaging: FirebaseMessaging, options?: {
22+
vapidKey?: string;
23+
swReg?: ServiceWorkerRegistration;
24+
}): Promise<string>;
25+
26+
// @public
27+
export function onMessage(messaging: FirebaseMessaging, nextOrObserver: NextFn<MessagePayload> | Observer<MessagePayload>): Unsubscribe;
28+
29+
30+
// (No @packageDocumentation comment for this package)
31+
32+
```

integration/firebase/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"test:ci": "node ../../scripts/run_tests_in_ci.js -s test"
88
},
99
"devDependencies": {
10-
"firebase": "8.2.0",
10+
"firebase": "8.2.1",
1111
"@types/chai": "4.2.14",
1212
"@types/mocha": "7.0.2",
1313
"chai": "4.2.0",

integration/firestore/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"devDependencies": {
1717
"@firebase/app": "0.6.13",
18-
"@firebase/firestore": "2.1.0",
18+
"@firebase/firestore": "2.1.1",
1919
"@types/mocha": "7.0.2",
2020
"gulp": "4.0.2",
2121
"gulp-filter": "6.0.0",

integration/messaging/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"test:manual": "mocha --exit"
1010
},
1111
"devDependencies": {
12-
"firebase": "8.2.0",
12+
"firebase": "8.2.1",
1313
"chai": "4.2.0",
1414
"chromedriver": "86.0.0",
1515
"express": "4.17.1",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
"express": "4.17.1",
107107
"find-free-port": "2.0.0",
108108
"firebase-functions": "3.11.0",
109-
"firebase-tools": "8.16.2",
109+
"firebase-tools": "9.0.1",
110110
"git-rev-sync": "3.0.1",
111111
"glob": "7.1.6",
112112
"http-server": "0.12.3",
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/**
2+
* @license
3+
* Copyright 2020 Google LLC
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
export * from '@firebase/messaging-exp';
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"name": "firebase-exp/messaging",
3+
"main": "dist/index.cjs.js",
4+
"browser": "dist/index.esm.js",
5+
"module": "dist/index.esm.js",
6+
"typings": "dist/messaging/index.d.ts"
7+
}

packages-exp/firebase-exp/package.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,11 @@
4141
"@firebase/app-compat": "0.0.900",
4242
"@firebase/auth-exp": "0.0.900",
4343
"@firebase/functions-exp": "0.0.900",
44-
"@firebase/firestore": "2.1.0",
44+
"@firebase/firestore": "2.1.1",
4545
"@firebase/performance-exp": "0.0.900",
46-
"@firebase/remote-config-exp": "0.0.900"
46+
"@firebase/remote-config-exp": "0.0.900",
47+
"@firebase/messaging-exp": "0.0.900"
48+
4749
},
4850
"devDependencies": {
4951
"rollup": "2.33.2",
@@ -66,6 +68,7 @@
6668
"firestore",
6769
"firestore/lite",
6870
"performance",
69-
"remote-config"
71+
"remote-config",
72+
"messaging"
7073
]
7174
}
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/**
2+
* @license
3+
* Copyright 2020 Google LLC
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
module.exports = {
19+
extends: '../../config/.eslintrc.js',
20+
parserOptions: {
21+
project: 'tsconfig.json',
22+
// to make vscode-eslint work with monorepo
23+
// https://github.com/typescript-eslint/typescript-eslint/issues/251#issuecomment-463943250
24+
tsconfigRootDir: __dirname
25+
}
26+
};

packages-exp/messaging-exp/README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# @firebase/messaging
2+
3+
This is the Firebase Cloud Messaging component of the Firebase JS SDK.
4+
5+
**This package is not intended for direct usage, and should only be used via the officially supported [firebase](https://www.npmjs.com/package/firebase) package.**
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"extends": "../../config/api-extractor.json",
3+
// Point it to your entry point d.ts file.
4+
"mainEntryPointFilePath": "<projectFolder>/dist/index.d.ts",
5+
"dtsRollup": {
6+
"enabled": true
7+
}
8+
}

0 commit comments

Comments
 (0)