Skip to content

Commit 71561e4

Browse files
zwu52zwu52
committed
Merge branch 'master' of https://github.com/firebase/firebase-js-sdk into fix-fcm-observer
Sync to head to pick up changeset related chnages
2 parents af71124 + ddbe218 commit 71561e4

File tree

235 files changed

+13507
-4652
lines changed

Some content is hidden

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

235 files changed

+13507
-4652
lines changed

‎.changeset/README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Changesets
2+
3+
Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
4+
with multi-package repos, or single-package repos to help you version and publish your code. You can
5+
find the full documentation for it [in our repository](https://github.com/changesets/changesets)
6+
7+
We have a quick list of common questions to get you started engaging with this project in
8+
[our documentation](https://github.com/changesets/changesets/blob/master/docs/common-questions.md)

‎.changeset/config.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
3+
"changelog": ["@changesets/changelog-github", { "repo": "firebase/firebase-js-sdk"}],
4+
"commit": false,
5+
"linked": [],
6+
"access": "restricted",
7+
"baseBranch": "master",
8+
"updateInternalDependencies": "patch",
9+
"ignore": [
10+
"firebase-browserify-test",
11+
"firebase-package-typings-test",
12+
"firebase-firestore-integration-test",
13+
"firebase-messaging-selenium-test",
14+
"firebase-typescript-test",
15+
"firebase-webpack-test",
16+
"@firebase/app-exp",
17+
"@firebase/app-types-exp",
18+
"@firebase/functions-exp",
19+
"@firebase/functions-types-exp",
20+
"firebase-exp"
21+
],
22+
"___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
23+
"onlyUpdatePeerDependentsWhenOutOfRange": true,
24+
"useCalculatedVersionForSnapshots": true
25+
}
26+
}

‎.changeset/firebsae-messaging.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
---
3+
4+
Update testing policy. Since this is neither a major nor minor update use an empty changeset.

‎.changeset/perfect-carpets-chew.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
3+
---

‎.changeset/poor-eggs-bow.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---

‎.changeset/quiet-coats-type.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'firebase': minor
3+
'@firebase/firestore': minor
4+
'@firebase/firestore-types': minor
5+
---
6+
7+
Added support for `set()` with merge options when using `FirestoreDataConverter`.

‎.changeset/twelve-pets-joke.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
3+
---

‎.github/workflows/changesets.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Changeset Check
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- master
7+
8+
jobs:
9+
release:
10+
name: Changeset Check
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout Repo
14+
uses: actions/checkout@master
15+
with:
16+
## fetch all history for all branches and tags, so we can compare with master
17+
fetch-depth: 0
18+
19+
- name: Setup Node.js 12.x
20+
uses: actions/setup-node@master
21+
with:
22+
node-version: 12.x
23+
24+
- name: Install Dependencies
25+
run: yarn
26+
27+
- name: Check if any Changeset file exists
28+
run: yarn changeset status --since=origin/master

‎.github/workflows/release.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Release
2+
3+
on:
4+
push:
5+
branches:
6+
- release
7+
8+
jobs:
9+
release:
10+
name: Release
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout Repo
14+
uses: actions/checkout@master
15+
with:
16+
# This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
17+
fetch-depth: 0
18+
19+
- name: Setup Node.js 12.x
20+
uses: actions/setup-node@master
21+
with:
22+
node-version: 12.x
23+
24+
- name: Install Dependencies
25+
run: yarn
26+
27+
- name: Create Release Pull Request
28+
uses: changesets/action@master
29+
env:
30+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎CONTRIBUTING.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,40 @@ Before you start working on a larger contribution, you should get in touch with
9797
```
9898

9999
* In GitHub, send a pull request to `firebase-js-sdk:master`.
100+
* Add changeset. See [Adding changeset to PR](#adding-changeset-to-pr)
100101
* All pull requests must be reviewed by a member of the Firebase JS SDK team, who will merge it when/if they feel it is good to go.
101102

102103
That's it! Thank you for your contribution!
103104
105+
#### Adding changeset to PR
106+
Every PR that would trigger a release should include a changeset file. To make
107+
this process easy, a message will be sent to every PR with a link that you can
108+
click to add changeset files in the Github UI directly.
109+
[Example message](https://github.com/firebase/firebase-js-sdk/pull/3284#issuecomment-649718617).
110+
111+
#### What to include in the changset file
112+
113+
You should include the version bump for your package as well as the description
114+
for the change. Valid version bump types are `patch`, `minor` and `major`.
115+
Please always include the `firebase` package with the same version bump type as
116+
your package. This is to ensure that the version of the `firebase` package will
117+
be bumped correctly. For example,
118+
119+
```
120+
---
121+
"@firebase/storage": minor
122+
"firebase": minor
123+
---
124+
125+
This is a test.
126+
```
127+
128+
#### Multiple changeset files
129+
130+
If your PR touches multiple SDKs or addresses multiple issues that require
131+
different version bump or different description, you can create multiple
132+
changeset files in the PR.
133+
104134
## <a name="docs"></a> Updating Documentation
105135
106136
Reference docs for the Firebase [JS SDK](https://firebase.google.com/docs/reference/js/) and [Node (client) SDK](https://firebase.google.com/docs/reference/node/) are generated by [Typedoc](https://typedoc.org/).

‎common/api-review/app-exp.api.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ export function _registerComponent(component: Component): boolean;
5858
// @public
5959
export function registerVersion(libraryKeyOrName: string, version: string, variant?: string): void;
6060

61+
// @internal (undocumented)
62+
export function _removeServiceInstance<T extends Name>(app: FirebaseApp, name: T, instanceIdentifier?: string): void;
63+
6164
// @public
6265
export const SDK_VERSION: string;
6366

‎common/api-review/functions-exp.api.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
## API Report File for "@firebase/functions-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 { Functions } from '@firebase/functions-types-exp';
9+
import { HttpsCallable } from '@firebase/functions-types-exp';
10+
import { HttpsCallableOptions } from '@firebase/functions-types-exp';
11+
12+
// @public
13+
export function getFunctions(app: FirebaseApp, region?: string): Functions;
14+
15+
// @public
16+
export function httpsCallable(functionsInstance: Functions, name: string, options?: HttpsCallableOptions): HttpsCallable;
17+
18+
// @public
19+
export function useFunctionsEmulator(functionsInstance: Functions, origin: string): void;
20+
21+
22+
// (No @packageDocumentation comment for this package)
23+
24+
```

‎config/webpack.test.js

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright 2017 Google Inc.
3+
* Copyright 2017 Google LLC
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.
@@ -18,6 +18,12 @@
1818
const path = require('path');
1919
const webpack = require('webpack');
2020

21+
/**
22+
* A regular expression used to replace Firestore's platform specific modules,
23+
* which are located under 'packages/firestore/src/platform/'.
24+
*/
25+
const FIRESTORE_PLATFORM_RE = /^(.*)\/platform\/([^.\/]*)(\.ts)?$/;
26+
2127
module.exports = {
2228
mode: 'development',
2329
devtool: 'source-map',
@@ -77,6 +83,15 @@ module.exports = {
7783
extensions: ['.js', '.ts']
7884
},
7985
plugins: [
86+
new webpack.NormalModuleReplacementPlugin(
87+
FIRESTORE_PLATFORM_RE,
88+
resource => {
89+
resource.request = resource.request.replace(
90+
FIRESTORE_PLATFORM_RE,
91+
'$1/platform/browser/$2.ts'
92+
);
93+
}
94+
),
8095
new webpack.EnvironmentPlugin([
8196
'RTDB_EMULATOR_PORT',
8297
'RTDB_EMULATOR_NAMESPACE'

‎integration/browserify/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77
"test": "karma start --single-run",
88
"test:ci": "node ../../scripts/run_tests_in_ci.js"
99
},
10-
"dependencies": {
11-
"firebase": "7.15.1"
12-
},
1310
"devDependencies": {
11+
"firebase": "7.15.5",
1412
"@babel/core": "7.9.6",
1513
"@babel/preset-env": "7.9.6",
1614
"browserify": "16.5.1",

‎integration/firebase-typings/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@
66
"test": "tsc",
77
"test:ci": "node ../../scripts/run_tests_in_ci.js"
88
},
9-
"dependencies": {
10-
"firebase": "7.15.1"
11-
},
129
"devDependencies": {
10+
"firebase": "7.15.5",
1311
"typescript": "3.8.3"
1412
}
1513
}

‎integration/messaging/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77
"test": "mocha --exit",
88
"test:manual": "mocha --exit"
99
},
10-
"dependencies": {
11-
"firebase": "7.15.1"
12-
},
1310
"devDependencies": {
11+
"firebase": "7.15.5",
1412
"chai": "4.2.0",
1513
"chromedriver": "^83.0.0",
1614
"express": "4.17.1",

‎integration/typescript/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@
66
"test": "karma start --single-run",
77
"test:ci": "node ../../scripts/run_tests_in_ci.js"
88
},
9-
"dependencies": {
10-
"firebase": "7.15.1"
11-
},
129
"devDependencies": {
10+
"firebase": "7.15.5",
1311
"@babel/core": "7.9.6",
1412
"@babel/preset-env": "7.9.6",
1513
"@types/chai": "4.2.11",

‎integration/webpack/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77
"test": "karma start --single-run",
88
"test:ci": "node ../../scripts/run_tests_in_ci.js"
99
},
10-
"dependencies": {
11-
"firebase": "7.15.1"
12-
},
1310
"devDependencies": {
11+
"firebase": "7.15.5",
1412
"@babel/core": "7.9.6",
1513
"@babel/preset-env": "7.9.6",
1614
"chai": "4.2.0",

‎package.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,11 @@
2929
"link:packages": "lerna exec --scope @firebase/* --scope firebase --scope rxfire -- yarn link",
3030
"stage:packages": "./scripts/prepublish.sh",
3131
"repl": "node tools/repl.js",
32-
"release": "node scripts/release/cli.js",
32+
"release": "ts-node-script scripts/release/cli.ts",
3333
"pretest": "node tools/pretest.js",
3434
"test": "lerna run --concurrency 4 --stream test",
3535
"test:ci": "lerna run --concurrency 4 --stream test:ci",
36+
"test:release": "lerna run --concurrency 4 --ignore @firebase/*-exp --ignore firebase-exp --stream test:ci",
3637
"test:exp": "lerna run --concurrency 4 --stream --scope @firebase/*-exp --scope firebase-exp test",
3738
"pretest:coverage": "mkdirp coverage",
3839
"ci:coverage": "lcov-result-merger 'packages/**/lcov.info' 'lcov-all.info'",
@@ -59,17 +60,23 @@
5960
"integration/*"
6061
],
6162
"devDependencies": {
63+
"@changesets/changelog-github": "0.2.5",
64+
"@changesets/cli": "2.9.1",
6265
"@microsoft/api-documenter": "7.7.20",
6366
"@microsoft/api-extractor": "7.7.13",
6467
"@types/chai": "4.2.11",
6568
"@types/chai-as-promised": "7.1.2",
69+
"@types/child-process-promise": "2.2.1",
70+
"@types/clone": "0.1.30",
71+
"@types/inquirer": "6.5.0",
6672
"@types/long": "4.0.1",
6773
"@types/mocha": "7.0.2",
6874
"@types/node": "12.12.37",
6975
"@types/sinon": "9.0.0",
7076
"@types/sinon-chai": "3.2.4",
7177
"@types/tmp": "0.2.0",
7278
"@types/yargs": "15.0.4",
79+
"@types/listr": "0.14.2",
7380
"@typescript-eslint/eslint-plugin": "2.30.0",
7481
"@typescript-eslint/eslint-plugin-tslint": "2.30.0",
7582
"@typescript-eslint/parser": "2.30.0",

‎packages-exp/app-exp/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
},
3434
"dependencies": {
3535
"@firebase/app-types-exp": "0.0.800",
36-
"@firebase/util": "0.2.48",
36+
"@firebase/util": "0.2.50",
3737
"@firebase/logger": "0.2.5",
38-
"@firebase/component": "0.1.13",
38+
"@firebase/component": "0.1.15",
3939
"tslib": "^1.11.1"
4040
},
4141
"license": "Apache-2.0",

‎packages-exp/app-exp/src/constants.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,20 @@
1515
* limitations under the License.
1616
*/
1717

18-
export const DEFAULT_ENTRY_NAME = '[DEFAULT]';
1918
import { name as appName } from '../package.json';
2019
import { name as analyticsName } from '../../../packages/analytics/package.json';
2120
import { name as authName } from '../../../packages/auth/package.json';
2221
import { name as databaseName } from '../../../packages/database/package.json';
23-
import { name as functionsName } from '../../../packages/functions/package.json';
22+
import { name as functionsName } from '../../../packages-exp/functions-exp/package.json';
2423
import { name as installationsName } from '../../../packages/installations/package.json';
2524
import { name as messagingName } from '../../../packages/messaging/package.json';
2625
import { name as performanceName } from '../../../packages/performance/package.json';
2726
import { name as remoteConfigName } from '../../../packages/remote-config/package.json';
2827
import { name as storageName } from '../../../packages/storage/package.json';
2928
import { name as firestoreName } from '../../../packages/firestore/package.json';
30-
import { name as packageName } from '../../../packages/firebase/package.json';
29+
import { name as packageName } from '../../../packages-exp/firebase-exp/package.json';
30+
31+
export const DEFAULT_ENTRY_NAME = '[DEFAULT]';
3132

3233
export const PLATFORM_LOG_STRING = {
3334
[appName]: 'fire-core',

0 commit comments

Comments
 (0)