Skip to content

Commit 4a8faad

Browse files
hsubox76hsubox76
committed
Merge branch 'release'
v6.0.0
2 parents 52bdce3 + 0f35ed6 commit 4a8faad

File tree

19 files changed

+45
-29
lines changed

19 files changed

+45
-29
lines changed

‎integration/browserify/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"test": "karma start --single-run"
88
},
99
"dependencies": {
10-
"firebase": "5.11.0"
10+
"firebase": "6.0.0"
1111
},
1212
"devDependencies": {
1313
"@babel/core": "7.4.4",

‎integration/firebase-typings/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"test": "tsc index.ts --outDir dist"
77
},
88
"dependencies": {
9-
"firebase": "5.11.0"
9+
"firebase": "6.0.0"
1010
},
1111
"devDependencies": {
1212
"typescript": "3.4.5"

‎integration/messaging/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"test:manual": "mocha --exit"
99
},
1010
"dependencies": {
11-
"firebase": "5.11.0"
11+
"firebase": "6.0.0"
1212
},
1313
"devDependencies": {
1414
"chai": "4.2.0",

‎integration/typescript/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"test": "karma start --single-run"
77
},
88
"dependencies": {
9-
"firebase": "5.11.0"
9+
"firebase": "6.0.0"
1010
},
1111
"devDependencies": {
1212
"@babel/core": "7.4.4",

‎integration/webpack/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"test": "karma start --single-run"
88
},
99
"dependencies": {
10-
"firebase": "5.11.0"
10+
"firebase": "6.0.0"
1111
},
1212
"devDependencies": {
1313
"@babel/core": "7.4.4",

‎packages/app-types/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/app-types",
3-
"version": "0.3.10",
3+
"version": "0.4.0",
44
"description": "@firebase/app Types",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"license": "Apache-2.0",

‎packages/app/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/app",
3-
"version": "0.3.17",
3+
"version": "0.4.0",
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",
@@ -24,7 +24,7 @@
2424
},
2525
"license": "Apache-2.0",
2626
"dependencies": {
27-
"@firebase/app-types": "0.3.10",
27+
"@firebase/app-types": "0.4.0",
2828
"@firebase/util": "0.2.14",
2929
"tslib": "1.9.3",
3030
"dom-storage": "2.1.0",

‎packages/auth-types/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/auth-types",
3-
"version": "0.6.1",
3+
"version": "0.7.0",
44
"description": "@firebase/auth Types",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"license": "Apache-2.0",

‎packages/auth/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/auth",
3-
"version": "0.10.2",
3+
"version": "0.11.0",
44
"main": "dist/auth.js",
55
"module": "dist/auth.esm.js",
66
"description": "Javascript library for Firebase Auth SDK",
@@ -19,7 +19,7 @@
1919
},
2020
"license": "Apache-2.0",
2121
"dependencies": {
22-
"@firebase/auth-types": "0.6.1"
22+
"@firebase/auth-types": "0.7.0"
2323
},
2424
"devDependencies": {
2525
"del": "4.1.1",

‎packages/database-types/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/database-types",
3-
"version": "0.3.11",
3+
"version": "0.4.0",
44
"description": "@firebase/database Types",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"license": "Apache-2.0",

‎packages/database/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/database",
3-
"version": "0.3.20",
3+
"version": "0.4.0",
44
"description": "",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.node.cjs.js",
@@ -26,7 +26,7 @@
2626
"@firebase/app-types": "0.x"
2727
},
2828
"dependencies": {
29-
"@firebase/database-types": "0.3.11",
29+
"@firebase/database-types": "0.4.0",
3030
"@firebase/logger": "0.1.13",
3131
"@firebase/util": "0.2.14",
3232
"faye-websocket": "0.11.1",

‎packages/firebase/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "firebase",
3-
"version": "5.11.0",
3+
"version": "6.0.0",
44
"description": "Firebase JavaScript library for web and Node.js",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"license": "Apache-2.0",
@@ -37,10 +37,10 @@
3737
"module": "dist/index.esm.js",
3838
"react-native": "dist/index.rn.cjs.js",
3939
"dependencies": {
40-
"@firebase/app": "0.3.17",
41-
"@firebase/auth": "0.10.2",
42-
"@firebase/database": "0.3.20",
43-
"@firebase/firestore": "1.2.2",
40+
"@firebase/app": "0.4.0",
41+
"@firebase/auth": "0.11.0",
42+
"@firebase/database": "0.4.0",
43+
"@firebase/firestore": "1.3.0",
4444
"@firebase/functions": "0.4.6",
4545
"@firebase/messaging": "0.3.19",
4646
"@firebase/polyfill": "0.3.13",

‎packages/firestore-types/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/firestore-types",
3-
"version": "1.2.1",
3+
"version": "1.3.0",
44
"description": "@firebase/firestore Types",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"license": "Apache-2.0",

‎packages/firestore/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/firestore",
3-
"version": "1.2.2",
3+
"version": "1.3.0",
44
"description": "",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"scripts": {
@@ -28,7 +28,7 @@
2828
"dist"
2929
],
3030
"dependencies": {
31-
"@firebase/firestore-types": "1.2.1",
31+
"@firebase/firestore-types": "1.3.0",
3232
"@firebase/logger": "0.1.13",
3333
"@firebase/webchannel-wrapper": "0.2.19",
3434
"@grpc/proto-loader": "^0.5.0",

‎packages/performance/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/performance",
3-
"version": "0.2.0",
3+
"version": "0.2.1",
44
"description": "Firebase performance for web",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.cjs.js",

‎packages/performance/src/services/remote_config_service.test.ts

+16
Original file line numberDiff line numberDiff line change
@@ -176,5 +176,21 @@ describe('Performance Monitoring > remote_config_service', () => {
176176

177177
expect(SettingsService.getInstance().loggingEnabled).to.be.true;
178178
});
179+
180+
it('uses secondary configs if the response does not have any fields', async () => {
181+
// Expired local config.
182+
const EXPIRY_LOCAL_STORAGE_VALUE = '1556524895320';
183+
storageGetItemStub.callsFake(
184+
storageGetItemFakeFactory(
185+
EXPIRY_LOCAL_STORAGE_VALUE,
186+
'not a valid config and should not be used'
187+
)
188+
);
189+
const STRINGIFIED_PARTIAL_CONFIG = '{"state":"NO TEMPLATE"}';
190+
fetchStub.resolves(new Response(STRINGIFIED_PARTIAL_CONFIG));
191+
await getConfig(IID);
192+
193+
expect(SettingsService.getInstance().loggingEnabled).to.be.true;
194+
});
179195
});
180196
});

‎packages/performance/src/services/remote_config_service.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,9 @@ function getRemoteConfig(
147147
function processConfig(
148148
config: RemoteConfigResponse | undefined
149149
): RemoteConfigResponse | undefined {
150-
if (!config || !config.entries) return config;
150+
if (!config) return config;
151151
const settingsServiceInstance = SettingsService.getInstance();
152-
const entries = config.entries;
152+
const entries = config.entries || {};
153153
if (entries.fpr_enabled !== undefined) {
154154
// TODO: Change the assignment of loggingEnabled once the received type is known.
155155
settingsServiceInstance.loggingEnabled =

‎packages/rxfire/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "rxfire",
3-
"version": "3.4.2",
3+
"version": "3.4.4",
44
"private": false,
55
"description": "Firebase JavaScript library RxJS",
66
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
@@ -36,7 +36,7 @@
3636
"rxjs": "6.x.x"
3737
},
3838
"devDependencies": {
39-
"firebase": "5.11.0",
39+
"firebase": "6.0.0",
4040
"rxjs": "^6.5.1",
4141
"rollup": "1.11.0",
4242
"rollup-plugin-commonjs": "9.3.4",

‎packages/testing/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/testing",
3-
"version": "0.9.0",
3+
"version": "0.9.2",
44
"description": "",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.cjs.js",
@@ -15,7 +15,7 @@
1515
},
1616
"license": "Apache-2.0",
1717
"dependencies": {
18-
"firebase": "5.11.0",
18+
"firebase": "6.0.0",
1919
"@firebase/logger": "0.1.13",
2020
"@firebase/util": "0.2.14",
2121
"@types/request": "2.48.1",

0 commit comments

Comments
 (0)