Skip to content

Commit 906ac39

Browse files
author
Brian Chen
committed
Merge branch 'master' into bc/lite-set
2 parents dc4239a + 39ca8ec commit 906ac39

File tree

27 files changed

+254
-115
lines changed

27 files changed

+254
-115
lines changed

.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/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+
---

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/).

integration/browserify/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"test:ci": "node ../../scripts/run_tests_in_ci.js"
99
},
1010
"devDependencies": {
11-
"firebase": "7.15.4",
11+
"firebase": "7.15.5",
1212
"@babel/core": "7.9.6",
1313
"@babel/preset-env": "7.9.6",
1414
"browserify": "16.5.1",

integration/firebase-typings/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"
88
},
99
"devDependencies": {
10-
"firebase": "7.15.4",
10+
"firebase": "7.15.5",
1111
"typescript": "3.8.3"
1212
}
1313
}

integration/messaging/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"test:manual": "mocha --exit"
99
},
1010
"devDependencies": {
11-
"firebase": "7.15.4",
11+
"firebase": "7.15.5",
1212
"chai": "4.2.0",
1313
"chromedriver": "^83.0.0",
1414
"express": "4.17.1",

integration/typescript/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"
88
},
99
"devDependencies": {
10-
"firebase": "7.15.4",
10+
"firebase": "7.15.5",
1111
"@babel/core": "7.9.6",
1212
"@babel/preset-env": "7.9.6",
1313
"@types/chai": "4.2.11",

integration/webpack/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"test:ci": "node ../../scripts/run_tests_in_ci.js"
99
},
1010
"devDependencies": {
11-
"firebase": "7.15.4",
11+
"firebase": "7.15.5",
1212
"@babel/core": "7.9.6",
1313
"@babel/preset-env": "7.9.6",
1414
"chai": "4.2.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.49",
36+
"@firebase/util": "0.2.50",
3737
"@firebase/logger": "0.2.5",
38-
"@firebase/component": "0.1.14",
38+
"@firebase/component": "0.1.15",
3939
"tslib": "^1.11.1"
4040
},
4141
"license": "Apache-2.0",

packages-exp/functions-exp/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@
5151
},
5252
"typings": "dist/index.d.ts",
5353
"dependencies": {
54-
"@firebase/component": "0.1.14",
54+
"@firebase/component": "0.1.15",
5555
"@firebase/functions-types-exp": "0.0.800",
56-
"@firebase/messaging": "0.6.18",
56+
"@firebase/messaging": "0.6.19",
5757
"@firebase/messaging-types": "0.4.5",
58-
"@firebase/util": "0.2.49",
58+
"@firebase/util": "0.2.50",
5959
"isomorphic-fetch": "2.2.1",
6060
"tslib": "1.11.1"
6161
},
@@ -65,4 +65,4 @@
6565
],
6666
"reportDir": "./coverage/node"
6767
}
68-
}
68+
}

packages/analytics/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/analytics",
3-
"version": "0.3.7",
3+
"version": "0.3.8",
44
"description": "A analytics package for new firebase packages",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.cjs.js",
@@ -27,10 +27,10 @@
2727
},
2828
"dependencies": {
2929
"@firebase/analytics-types": "0.3.1",
30-
"@firebase/installations": "0.4.12",
30+
"@firebase/installations": "0.4.13",
3131
"@firebase/logger": "0.2.5",
32-
"@firebase/util": "0.2.49",
33-
"@firebase/component": "0.1.14",
32+
"@firebase/util": "0.2.50",
33+
"@firebase/component": "0.1.15",
3434
"tslib": "^1.11.1"
3535
},
3636
"license": "Apache-2.0",

packages/app/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/app",
3-
"version": "0.6.6",
3+
"version": "0.6.7",
44
"description": "The primary entrypoint to the Firebase JS SDK",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.node.cjs.js",
@@ -30,9 +30,9 @@
3030
"license": "Apache-2.0",
3131
"dependencies": {
3232
"@firebase/app-types": "0.6.1",
33-
"@firebase/util": "0.2.49",
33+
"@firebase/util": "0.2.50",
3434
"@firebase/logger": "0.2.5",
35-
"@firebase/component": "0.1.14",
35+
"@firebase/component": "0.1.15",
3636
"tslib": "^1.11.1",
3737
"dom-storage": "2.1.0",
3838
"xmlhttprequest": "1.8.0"

packages/component/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/component",
3-
"version": "0.1.14",
3+
"version": "0.1.15",
44
"description": "Firebase Component Platform",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.cjs.js",
@@ -24,7 +24,7 @@
2424
"prepare": "yarn build"
2525
},
2626
"dependencies": {
27-
"@firebase/util": "0.2.49",
27+
"@firebase/util": "0.2.50",
2828
"tslib": "^1.11.1"
2929
},
3030
"license": "Apache-2.0",

packages/database/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/database",
3-
"version": "0.6.5",
3+
"version": "0.6.6",
44
"description": "",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.node.cjs.js",
@@ -29,14 +29,14 @@
2929
"dependencies": {
3030
"@firebase/database-types": "0.5.1",
3131
"@firebase/logger": "0.2.5",
32-
"@firebase/util": "0.2.49",
33-
"@firebase/component": "0.1.14",
32+
"@firebase/util": "0.2.50",
33+
"@firebase/component": "0.1.15",
3434
"@firebase/auth-interop-types": "0.1.5",
3535
"faye-websocket": "0.11.3",
3636
"tslib": "^1.11.1"
3737
},
3838
"devDependencies": {
39-
"@firebase/app": "0.6.6",
39+
"@firebase/app": "0.6.7",
4040
"@firebase/app-types": "0.6.1",
4141
"rollup": "2.7.6",
4242
"rollup-plugin-typescript2": "0.27.0",

packages/firebase/package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "firebase",
3-
"version": "7.15.4",
3+
"version": "7.15.5",
44
"description": "Firebase JavaScript library for web and Node.js",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"license": "Apache-2.0",
@@ -45,20 +45,20 @@
4545
"module": "dist/index.esm.js",
4646
"react-native": "dist/index.rn.cjs.js",
4747
"dependencies": {
48-
"@firebase/app": "0.6.6",
48+
"@firebase/app": "0.6.7",
4949
"@firebase/app-types": "0.6.1",
5050
"@firebase/auth": "0.14.7",
51-
"@firebase/database": "0.6.5",
52-
"@firebase/firestore": "1.15.4",
53-
"@firebase/functions": "0.4.46",
54-
"@firebase/installations": "0.4.12",
55-
"@firebase/messaging": "0.6.18",
51+
"@firebase/database": "0.6.6",
52+
"@firebase/firestore": "1.15.5",
53+
"@firebase/functions": "0.4.47",
54+
"@firebase/installations": "0.4.13",
55+
"@firebase/messaging": "0.6.19",
5656
"@firebase/polyfill": "0.3.36",
57-
"@firebase/storage": "0.3.36",
58-
"@firebase/performance": "0.3.7",
59-
"@firebase/remote-config": "0.1.23",
60-
"@firebase/analytics": "0.3.7",
61-
"@firebase/util": "0.2.49"
57+
"@firebase/storage": "0.3.37",
58+
"@firebase/performance": "0.3.8",
59+
"@firebase/remote-config": "0.1.24",
60+
"@firebase/analytics": "0.3.8",
61+
"@firebase/util": "0.2.50"
6262
},
6363
"devDependencies": {
6464
"rollup": "2.7.6",

packages/firestore/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/firestore",
3-
"version": "1.15.4",
3+
"version": "1.15.5",
44
"engines": {
55
"node": "^8.13.0 || >=10.10.0"
66
},
@@ -52,10 +52,10 @@
5252
"memory/package.json"
5353
],
5454
"dependencies": {
55-
"@firebase/component": "0.1.14",
55+
"@firebase/component": "0.1.15",
5656
"@firebase/firestore-types": "1.11.0",
5757
"@firebase/logger": "0.2.5",
58-
"@firebase/util": "0.2.49",
58+
"@firebase/util": "0.2.50",
5959
"@firebase/webchannel-wrapper": "0.2.41",
6060
"@grpc/grpc-js": "^1.0.0",
6161
"@grpc/proto-loader": "^0.5.0",

packages/firestore/src/core/component_provider.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,12 @@ import {
2727
newLocalStore,
2828
newMultiTabLocalStore
2929
} from '../local/local_store';
30-
import { MultiTabSyncEngine, SyncEngine } from './sync_engine';
30+
import {
31+
MultiTabSyncEngine,
32+
newMultiTabSyncEngine,
33+
newSyncEngine,
34+
SyncEngine
35+
} from './sync_engine';
3136
import { RemoteStore } from '../remote/remote_store';
3237
import { EventManager } from './event_manager';
3338
import { AsyncQueue } from '../util/async_queue';
@@ -167,7 +172,7 @@ export class MemoryComponentProvider implements ComponentProvider {
167172
}
168173

169174
createSyncEngine(cfg: ComponentConfiguration): SyncEngine {
170-
return new SyncEngine(
175+
return newSyncEngine(
171176
this.localStore,
172177
this.remoteStore,
173178
cfg.datastore,
@@ -225,7 +230,7 @@ export class IndexedDbComponentProvider extends MemoryComponentProvider {
225230
}
226231

227232
createSyncEngine(cfg: ComponentConfiguration): SyncEngine {
228-
const syncEngine = new MultiTabSyncEngine(
233+
const syncEngine = newMultiTabSyncEngine(
229234
this.localStore,
230235
this.remoteStore,
231236
cfg.datastore,

0 commit comments

Comments
 (0)