Merge branch 'release'

hsubox76 · hsubox76 · commit 4a8faadaf5a0 · 2019-05-07T08:57:58.000-07:00
v6.0.0
diff --git a/integration/browserify/package.json b/integration/browserify/package.json
@@ -7,7 +7,7 @@
     "test": "karma start --single-run"
   },
   "dependencies": {
-    "firebase": "5.11.0"
+    "firebase": "6.0.0"
   },
   "devDependencies": {
     "@babel/core": "7.4.4",
diff --git a/integration/firebase-typings/package.json b/integration/firebase-typings/package.json
@@ -6,7 +6,7 @@
     "test": "tsc index.ts --outDir dist"
   },
   "dependencies": {
-    "firebase": "5.11.0"
+    "firebase": "6.0.0"
   },
   "devDependencies": {
     "typescript": "3.4.5"
diff --git a/integration/messaging/package.json b/integration/messaging/package.json
@@ -8,7 +8,7 @@
     "test:manual": "mocha --exit"
   },
   "dependencies": {
-    "firebase": "5.11.0"
+    "firebase": "6.0.0"
   },
   "devDependencies": {
     "chai": "4.2.0",
diff --git a/integration/typescript/package.json b/integration/typescript/package.json
@@ -6,7 +6,7 @@
     "test": "karma start --single-run"
   },
   "dependencies": {
-    "firebase": "5.11.0"
+    "firebase": "6.0.0"
   },
   "devDependencies": {
     "@babel/core": "7.4.4",
diff --git a/integration/webpack/package.json b/integration/webpack/package.json
@@ -7,7 +7,7 @@
     "test": "karma start --single-run"
   },
   "dependencies": {
-    "firebase": "5.11.0"
+    "firebase": "6.0.0"
   },
   "devDependencies": {
     "@babel/core": "7.4.4",
diff --git a/packages/app-types/package.json b/packages/app-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@firebase/app-types",
-  "version": "0.3.10",
+  "version": "0.4.0",
   "description": "@firebase/app Types",
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
   "license": "Apache-2.0",
diff --git a/packages/app/package.json b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@firebase/app",
-  "version": "0.3.17",
+  "version": "0.4.0",
   "description": "The primary entrypoint to the Firebase JS SDK",
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
   "main": "dist/index.node.cjs.js",
@@ -24,7 +24,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@firebase/app-types": "0.3.10",
+    "@firebase/app-types": "0.4.0",
     "@firebase/util": "0.2.14",
     "tslib": "1.9.3",
     "dom-storage": "2.1.0",
diff --git a/packages/auth-types/package.json b/packages/auth-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@firebase/auth-types",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "@firebase/auth Types",
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
   "license": "Apache-2.0",
diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@firebase/auth",
-  "version": "0.10.2",
+  "version": "0.11.0",
   "main": "dist/auth.js",
   "module": "dist/auth.esm.js",
   "description": "Javascript library for Firebase Auth SDK",
@@ -19,7 +19,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@firebase/auth-types": "0.6.1"
+    "@firebase/auth-types": "0.7.0"
   },
   "devDependencies": {
     "del": "4.1.1",
diff --git a/packages/database-types/package.json b/packages/database-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@firebase/database-types",
-  "version": "0.3.11",
+  "version": "0.4.0",
   "description": "@firebase/database Types",
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
   "license": "Apache-2.0",
diff --git a/packages/database/package.json b/packages/database/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@firebase/database",
-  "version": "0.3.20",
+  "version": "0.4.0",
   "description": "",
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
   "main": "dist/index.node.cjs.js",
@@ -26,7 +26,7 @@
     "@firebase/app-types": "0.x"
   },
   "dependencies": {
-    "@firebase/database-types": "0.3.11",
+    "@firebase/database-types": "0.4.0",
     "@firebase/logger": "0.1.13",
     "@firebase/util": "0.2.14",
     "faye-websocket": "0.11.1",
diff --git a/packages/firebase/package.json b/packages/firebase/package.json
@@ -1,6 +1,6 @@
 {
   "name": "firebase",
-  "version": "5.11.0",
+  "version": "6.0.0",
   "description": "Firebase JavaScript library for web and Node.js",
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
   "license": "Apache-2.0",
@@ -37,10 +37,10 @@
   "module": "dist/index.esm.js",
   "react-native": "dist/index.rn.cjs.js",
   "dependencies": {
-    "@firebase/app": "0.3.17",
-    "@firebase/auth": "0.10.2",
-    "@firebase/database": "0.3.20",
-    "@firebase/firestore": "1.2.2",
+    "@firebase/app": "0.4.0",
+    "@firebase/auth": "0.11.0",
+    "@firebase/database": "0.4.0",
+    "@firebase/firestore": "1.3.0",
     "@firebase/functions": "0.4.6",
     "@firebase/messaging": "0.3.19",
     "@firebase/polyfill": "0.3.13",
diff --git a/packages/firestore-types/package.json b/packages/firestore-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@firebase/firestore-types",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "@firebase/firestore Types",
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
   "license": "Apache-2.0",
diff --git a/packages/firestore/package.json b/packages/firestore/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@firebase/firestore",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "description": "",
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
   "scripts": {
@@ -28,7 +28,7 @@
     "dist"
   ],
   "dependencies": {
-    "@firebase/firestore-types": "1.2.1",
+    "@firebase/firestore-types": "1.3.0",
     "@firebase/logger": "0.1.13",
     "@firebase/webchannel-wrapper": "0.2.19",
     "@grpc/proto-loader": "^0.5.0",
diff --git a/packages/performance/package.json b/packages/performance/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@firebase/performance",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Firebase performance for web",
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
   "main": "dist/index.cjs.js",
diff --git a/packages/performance/src/services/remote_config_service.test.ts b/packages/performance/src/services/remote_config_service.test.ts
@@ -176,5 +176,21 @@ describe('Performance Monitoring > remote_config_service', () => {
 
       expect(SettingsService.getInstance().loggingEnabled).to.be.true;
     });
+
+    it('uses secondary configs if the response does not have any fields', async () => {
+      // Expired local config.
+      const EXPIRY_LOCAL_STORAGE_VALUE = '1556524895320';
+      storageGetItemStub.callsFake(
+        storageGetItemFakeFactory(
+          EXPIRY_LOCAL_STORAGE_VALUE,
+          'not a valid config and should not be used'
+        )
+      );
+      const STRINGIFIED_PARTIAL_CONFIG = '{"state":"NO TEMPLATE"}';
+      fetchStub.resolves(new Response(STRINGIFIED_PARTIAL_CONFIG));
+      await getConfig(IID);
+
+      expect(SettingsService.getInstance().loggingEnabled).to.be.true;
+    });
   });
 });
diff --git a/packages/performance/src/services/remote_config_service.ts b/packages/performance/src/services/remote_config_service.ts
@@ -147,9 +147,9 @@ function getRemoteConfig(
 function processConfig(
   config: RemoteConfigResponse | undefined
 ): RemoteConfigResponse | undefined {
-  if (!config || !config.entries) return config;
+  if (!config) return config;
   const settingsServiceInstance = SettingsService.getInstance();
-  const entries = config.entries;
+  const entries = config.entries || {};
   if (entries.fpr_enabled !== undefined) {
     // TODO: Change the assignment of loggingEnabled once the received type is known.
     settingsServiceInstance.loggingEnabled =
diff --git a/packages/rxfire/package.json b/packages/rxfire/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rxfire",
-  "version": "3.4.2",
+  "version": "3.4.4",
   "private": false,
   "description": "Firebase JavaScript library RxJS",
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
@@ -36,7 +36,7 @@
     "rxjs": "6.x.x"
   },
   "devDependencies": {
-    "firebase": "5.11.0",
+    "firebase": "6.0.0",
     "rxjs": "^6.5.1",
     "rollup": "1.11.0",
     "rollup-plugin-commonjs": "9.3.4",
diff --git a/packages/testing/package.json b/packages/testing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@firebase/testing",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "description": "",
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
   "main": "dist/index.cjs.js",
@@ -15,7 +15,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "5.11.0",
+    "firebase": "6.0.0",
     "@firebase/logger": "0.1.13",
     "@firebase/util": "0.2.14",
     "@types/request": "2.48.1",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@firebase/app-types",`
`3`		`- "version": "0.3.10",`
	`3`	`+ "version": "0.4.0",`
`4`	`4`	`"description": "@firebase/app Types",`
`5`	`5`	`"author": "Firebase <[email protected]> (https://firebase.google.com/)",`
`6`	`6`	`"license": "Apache-2.0",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@firebase/auth-types",`
`3`		`- "version": "0.6.1",`
	`3`	`+ "version": "0.7.0",`
`4`	`4`	`"description": "@firebase/auth Types",`
`5`	`5`	`"author": "Firebase <[email protected]> (https://firebase.google.com/)",`
`6`	`6`	`"license": "Apache-2.0",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@firebase/database-types",`
`3`		`- "version": "0.3.11",`
	`3`	`+ "version": "0.4.0",`
`4`	`4`	`"description": "@firebase/database Types",`
`5`	`5`	`"author": "Firebase <[email protected]> (https://firebase.google.com/)",`
`6`	`6`	`"license": "Apache-2.0",`