Merge branch 'release' into master-io

Author: Feiyang1

integration/browserify/package.json

@@ -7,7 +7,7 @@
     "test": "karma start --single-run"
   },
   "dependencies": {
-    "firebase": "5.11.0"
+    "firebase": "5.11.1"
   },
   "devDependencies": {
     "@babel/core": "7.4.3",

integration/firebase-typings/package.json

@@ -6,7 +6,7 @@
     "test": "tsc index.ts --outDir dist"
   },
   "dependencies": {
-    "firebase": "5.11.0"
+    "firebase": "5.11.1"
   },
   "devDependencies": {
     "typescript": "3.4.5"

integration/messaging/package.json

@@ -8,7 +8,7 @@
     "test:manual": "mocha --exit"
   },
   "dependencies": {
-    "firebase": "5.11.0"
+    "firebase": "5.11.1"
   },
   "devDependencies": {
     "chai": "4.2.0",

integration/typescript/package.json

@@ -6,7 +6,7 @@
     "test": "karma start --single-run"
   },
   "dependencies": {
-    "firebase": "5.11.0"
+    "firebase": "5.11.1"
   },
   "devDependencies": {
     "@babel/core": "7.4.3",

integration/webpack/package.json

@@ -7,7 +7,7 @@
     "test": "karma start --single-run"
   },
   "dependencies": {
-    "firebase": "5.11.0"
+    "firebase": "5.11.1"
   },
   "devDependencies": {
     "@babel/core": "7.4.3",

packages/firebase/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase",
-  "version": "5.11.0",
+  "version": "5.11.1",
   "description": "Firebase JavaScript library for web and Node.js",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "license": "Apache-2.0",
@@ -45,7 +45,7 @@
     "@firebase/messaging": "0.3.19",
     "@firebase/polyfill": "0.3.13",
     "@firebase/storage": "0.2.15",
-    "@firebase/performance": "0.2.0"
+    "@firebase/performance": "0.2.1"
   },
   "devDependencies": {
     "git-rev-sync": "1.12.0",

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 <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.cjs.js",

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;
+    });
   });
 });

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 =

packages/rxfire/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rxfire",
-  "version": "3.4.2",
+  "version": "3.4.3",
   "private": false,
   "description": "Firebase JavaScript library RxJS",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
@@ -36,7 +36,7 @@
     "rxjs": "6.x.x"
   },
   "devDependencies": {
-    "firebase": "5.11.0",
+    "firebase": "5.11.1",
     "rxjs": "^6.5.1",
     "rollup": "1.10.1",
     "rollup-plugin-commonjs": "9.3.4",

packages/testing/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/testing",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.cjs.js",
@@ -15,7 +15,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "5.11.0",
+    "firebase": "5.11.1",
     "@firebase/logger": "0.1.13",
     "@firebase/util": "0.2.14",
     "@types/request": "2.48.1",