Merge branch 'master' into mrschmidt/smallererrors

Author: schmidt-sebastian

.github/workflows/cross-browser-test.yml

@@ -9,7 +9,6 @@ jobs:
   cross-browser-test:
     name: Cross-Browser (Saucelabs) Tests
     runs-on: ubuntu-latest
-    if: github.event.pull_request.merged
     env:
       SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
       SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}

config/karma.saucelabs.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -201,7 +201,7 @@ module.exports = function(config) {
       maxLogLines: 5,
       suppressErrorSummary: false,
       suppressFailed: false,
-      suppressPassed: true,
+      suppressPassed: false,
       suppressSkipped: true,
       showSpecTiming: true,
       failFast: false

integration/browserify/package.json

@@ -7,7 +7,7 @@
     "test": "karma start --single-run"
   },
   "dependencies": {
-    "firebase": "7.13.1"
+    "firebase": "7.13.2"
   },
   "devDependencies": {
     "@babel/core": "7.8.7",

integration/firebase-typings/package.json

@@ -6,7 +6,7 @@
     "test": "tsc"
   },
   "dependencies": {
-    "firebase": "7.13.1"
+    "firebase": "7.13.2"
   },
   "devDependencies": {
     "typescript": "3.8.3"

integration/messaging/package.json

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

integration/typescript/package.json

@@ -6,7 +6,7 @@
     "test": "karma start --single-run"
   },
   "dependencies": {
-    "firebase": "7.13.1"
+    "firebase": "7.13.2"
   },
   "devDependencies": {
     "@babel/core": "7.8.7",

integration/webpack/package.json

@@ -7,7 +7,7 @@
     "test": "karma start --single-run"
   },
   "dependencies": {
-    "firebase": "7.13.1"
+    "firebase": "7.13.2"
   },
   "devDependencies": {
     "@babel/core": "7.8.7",

packages-exp/app-exp/package.json

@@ -24,9 +24,9 @@
   },
   "dependencies": {
     "@firebase/app-types-exp": "0.800.0",
-    "@firebase/util": "0.2.43",
-    "@firebase/logger": "0.2.0",
-    "@firebase/component": "0.1.8",
+    "@firebase/util": "0.2.44",
+    "@firebase/logger": "0.2.1",
+    "@firebase/component": "0.1.9",
     "tslib": "1.11.1"
   },
   "license": "Apache-2.0",

packages/analytics/index.test.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2019 Google Inc.
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -88,7 +88,9 @@ describe('FirebaseAnalytics instance tests', () => {
         currency: 'USD'
       });
       // Clear event stack of async FID call.
-      await fidDeferred.promise;
+      // For IE: Need then() or else "expect" runs immediately on FID resolve
+      // before the other statements in initializeGAId.
+      await fidDeferred.promise.then();
       expect(gtagStub).to.have.been.calledWith('js');
       expect(gtagStub).to.have.been.calledWith(
         GtagCommand.CONFIG,
@@ -158,7 +160,9 @@ describe('FirebaseAnalytics instance tests', () => {
         currency: 'USD'
       });
       // Clear event stack of async FID call.
-      await fidDeferred.promise;
+      // For IE: Need then() or else "expect" runs immediately on FID resolve
+      // before the other statements in initializeGAId.
+      await fidDeferred.promise.then();
       expect(gtagStub).to.have.been.calledWith('js');
       expect(gtagStub).to.have.been.calledWith(
         GtagCommand.CONFIG,
@@ -195,8 +199,12 @@ describe('FirebaseAnalytics instance tests', () => {
       delete window['dataLayer'];
       removeGtagScript();
     });
-    it('Adds the script tag to the page', () => {
+    it('Adds the script tag to the page', async () => {
+      const { initializedIdPromisesMap } = getGlobalVars();
+      await initializedIdPromisesMap[analyticsId];
       expect(findGtagScriptOnPage()).to.not.be.null;
+      expect(typeof window['gtag']).to.equal('function');
+      expect(Array.isArray(window['dataLayer'])).to.be.true;
     });
   });
 });

packages/analytics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/analytics",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "A analytics package for new firebase packages",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.cjs.js",
@@ -26,10 +26,10 @@
   },
   "dependencies": {
     "@firebase/analytics-types": "0.3.0",
-    "@firebase/installations": "0.4.6",
-    "@firebase/logger": "0.2.0",
-    "@firebase/util": "0.2.43",
-    "@firebase/component": "0.1.8",
+    "@firebase/installations": "0.4.7",
+    "@firebase/logger": "0.2.1",
+    "@firebase/util": "0.2.44",
+    "@firebase/component": "0.1.9",
     "tslib": "1.11.1"
   },
   "license": "Apache-2.0",

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/app",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "The primary entrypoint to the Firebase JS SDK",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.node.cjs.js",
@@ -29,9 +29,9 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@firebase/app-types": "0.6.0",
-    "@firebase/util": "0.2.43",
-    "@firebase/logger": "0.2.0",
-    "@firebase/component": "0.1.8",
+    "@firebase/util": "0.2.44",
+    "@firebase/logger": "0.2.1",
+    "@firebase/component": "0.1.9",
     "tslib": "1.11.1",
     "dom-storage": "2.1.0",
     "xmlhttprequest": "1.8.0"

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/auth",
-  "version": "0.14.1",
+  "version": "0.14.2",
   "main": "dist/auth.js",
   "module": "dist/auth.esm.js",
   "description": "Javascript library for Firebase Auth SDK",

packages/component/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/component",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "Firebase Component Platform",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.cjs.js",
@@ -23,7 +23,7 @@
     "prepare": "yarn build"
   },
   "dependencies": {
-    "@firebase/util": "0.2.43",
+    "@firebase/util": "0.2.44",
     "tslib": "1.11.1"
   },
   "license": "Apache-2.0",

packages/database/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/database",
-  "version": "0.5.24",
+  "version": "0.5.25",
   "description": "",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.node.cjs.js",
@@ -27,15 +27,15 @@
   "peerDependencies": {},
   "dependencies": {
     "@firebase/database-types": "0.4.14",
-    "@firebase/logger": "0.2.0",
-    "@firebase/util": "0.2.43",
-    "@firebase/component": "0.1.8",
+    "@firebase/logger": "0.2.1",
+    "@firebase/util": "0.2.44",
+    "@firebase/component": "0.1.9",
     "@firebase/auth-interop-types": "0.1.4",
     "faye-websocket": "0.11.3",
     "tslib": "1.11.1"
   },
   "devDependencies": {
-    "@firebase/app": "0.6.0",
+    "@firebase/app": "0.6.1",
     "@firebase/app-types": "0.6.0",
     "rollup": "2.0.6",
     "rollup-plugin-typescript2": "0.26.0",

packages/firebase/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase",
-  "version": "7.13.1",
+  "version": "7.13.2",
   "description": "Firebase JavaScript library for web and Node.js",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "license": "Apache-2.0",
@@ -39,20 +39,20 @@
   "module": "dist/index.esm.js",
   "react-native": "dist/index.rn.cjs.js",
   "dependencies": {
-    "@firebase/app": "0.6.0",
+    "@firebase/app": "0.6.1",
     "@firebase/app-types": "0.6.0",
-    "@firebase/auth": "0.14.1",
-    "@firebase/database": "0.5.24",
-    "@firebase/firestore": "1.13.0",
-    "@firebase/functions": "0.4.38",
-    "@firebase/installations": "0.4.6",
-    "@firebase/messaging": "0.6.10",
+    "@firebase/auth": "0.14.2",
+    "@firebase/database": "0.5.25",
+    "@firebase/firestore": "1.13.1",
+    "@firebase/functions": "0.4.39",
+    "@firebase/installations": "0.4.7",
+    "@firebase/messaging": "0.6.11",
     "@firebase/polyfill": "0.3.33",
-    "@firebase/storage": "0.3.30",
-    "@firebase/performance": "0.2.36",
-    "@firebase/remote-config": "0.1.17",
-    "@firebase/analytics": "0.3.0",
-    "@firebase/util": "0.2.43"
+    "@firebase/storage": "0.3.31",
+    "@firebase/performance": "0.2.37",
+    "@firebase/remote-config": "0.1.18",
+    "@firebase/analytics": "0.3.1",
+    "@firebase/util": "0.2.44"
   },
   "devDependencies": {
     "rollup": "2.0.6",

packages/firestore/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/firestore",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "description": "The Cloud Firestore component of the Firebase JS SDK.",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "scripts": {
@@ -36,10 +36,10 @@
     "memory/package.json"
   ],
   "dependencies": {
-    "@firebase/component": "0.1.8",
+    "@firebase/component": "0.1.9",
     "@firebase/firestore-types": "1.10.1",
-    "@firebase/logger": "0.2.0",
-    "@firebase/util": "0.2.43",
+    "@firebase/logger": "0.2.1",
+    "@firebase/util": "0.2.44",
     "@firebase/webchannel-wrapper": "0.2.38",
     "@grpc/proto-loader": "^0.5.0",
     "grpc": "1.24.2",
@@ -50,6 +50,8 @@
     "@firebase/app-types": "0.x"
   },
   "devDependencies": {
+    "@types/json-stable-stringify": "1.0.32",
+    "json-stable-stringify": "1.0.1",
     "protobufjs": "6.8.9",
     "rollup": "2.0.6",
     "rollup-plugin-copy-assets": "1.1.0",

packages/firestore/src/core/target_id_generator.ts

@@ -15,83 +15,43 @@
  * limitations under the License.
  */
 
-import { assert } from '../util/assert';
 import { TargetId } from './types';
 
-const RESERVED_BITS = 1;
-
-const enum GeneratorIds {
-  QueryCache = 0, // The target IDs for user-issued queries are even (end in 0).
-  SyncEngine = 1 // The target IDs for limbo detection are odd (end in 1).
-}
+/** Offset to ensure non-overlapping target ids. */
+const OFFSET = 2;
 
 /**
  * Generates monotonically increasing target IDs for sending targets to the
  * watch stream.
  *
- * The client constructs two generators, one for the query cache (via
- * forQueryCache()), and one for limbo documents (via forSyncEngine()). These
- * two generators produce non-overlapping IDs (by using even and odd IDs
+ * The client constructs two generators, one for the target cache, and one for
+ * for the sync engine (to generate limbo documents targets). These
+ * generators produce non-overlapping IDs (by using even and odd IDs
  * respectively).
  *
  * By separating the target ID space, the query cache can generate target IDs
  * that persist across client restarts, while sync engine can independently
  * generate in-memory target IDs that are transient and can be reused after a
  * restart.
  */
-// TODO(mrschmidt): Explore removing this class in favor of generating these IDs
-// directly in SyncEngine and LocalStore.
 export class TargetIdGenerator {
-  // Initialized in the constructor via call to seek().
-  private nextId!: TargetId;
-
-  /**
-   * Instantiates a new TargetIdGenerator. If a seed is provided, the generator
-   * will use the seed value as the next target ID.
-   */
-  constructor(private generatorId: number, seed?: number) {
-    assert(
-      (generatorId & RESERVED_BITS) === generatorId,
-      `Generator ID ${generatorId} contains more than ${RESERVED_BITS} reserved bits`
-    );
-    this.seek(seed !== undefined ? seed : this.generatorId);
-  }
+  constructor(private lastId: number) {}
 
   next(): TargetId {
-    const nextId = this.nextId;
-    this.nextId += 1 << RESERVED_BITS;
-    return nextId;
-  }
-
-  /**
-   * Returns the ID that follows the given ID. Subsequent calls to `next()`
-   * use the newly returned target ID as their base.
-   */
-  // PORTING NOTE: Multi-tab only.
-  after(targetId: TargetId): TargetId {
-    this.seek(targetId + (1 << RESERVED_BITS));
-    return this.next();
-  }
-
-  private seek(targetId: TargetId): void {
-    assert(
-      (targetId & RESERVED_BITS) === this.generatorId,
-      'Cannot supply target ID from different generator ID'
-    );
-    this.nextId = targetId;
+    this.lastId += OFFSET;
+    return this.lastId;
   }
 
   static forTargetCache(): TargetIdGenerator {
-    // We seed the query cache generator to return '2' as its first ID, as there
-    // is no differentiation in the protocol layer between an unset number and
-    // the number '0'. If we were to sent a target with target ID '0', the
-    // backend would consider it unset and replace it with its own ID.
-    const targetIdGenerator = new TargetIdGenerator(GeneratorIds.QueryCache, 2);
-    return targetIdGenerator;
+    // The target cache generator must return '2' in its first call to `next()`
+    // as there is no differentiation in the protocol layer between an unset
+    // number and the number '0'. If we were to sent a target with target ID
+    // '0', the backend would consider it unset and replace it with its own ID.
+    return new TargetIdGenerator(2 - OFFSET);
   }
 
   static forSyncEngine(): TargetIdGenerator {
     // Sync engine assigns target IDs for limbo document detection.
-    return new TargetIdGenerator(GeneratorIds.SyncEngine);
+    return new TargetIdGenerator(1 - OFFSET);
   }
 }