Merge branch 'master' of https://github.com/firebase/firebase-js-sdk into ida-size-analysis-phase-2

Author: XuechunHou

.changeset/little-cycles-fold.md

@@ -0,0 +1,6 @@
+---
+"firebase": minor
+"@firebase/performance": minor
+---
+
+Issue 2393 - Add environment check to Performance Module

.changeset/mean-jokes-tan.md

@@ -0,0 +1,8 @@
+---
+'firebase': patch
+'@firebase/firestore': patch
+'@firebase/firestore-types': patch
+---
+feat: Added `merge` option to `firestore.settings()`, which merges the provided settings with
+settings from a previous call. This allows adding settings on top of the settings that were applied
+by `@firebase/testing`.

.changeset/silver-trainers-rhyme.md

@@ -0,0 +1,5 @@
+---
+"@firebase/firestore": patch
+---
+
+Enable fallback for auto-generated identifiers in environments that support `crypto` but not `crypto.getRandomValues`.

packages/firebase/index.d.ts

@@ -6952,9 +6952,9 @@ declare namespace firebase.messaging {
    * Do not call this constructor directly. Instead, use
    * {@link firebase.messaging `firebase.messaging()`}.
    *
-   * See {@link https://firebase.google.com/docs/cloud-messaging/js/client Set Up a JavaScript
-   * Firebase Cloud Messaging Client App} for a full guide on how to use the Firebase Messaging
-   * service.
+   * See {@link https://firebase.google.com/docs/cloud-messaging/js/client 
+   * Set Up a JavaScript Firebase Cloud Messaging Client App} for a full guide on how to use the
+   * Firebase Messaging service.
    *
    */
   interface Messaging {
@@ -7109,13 +7109,13 @@ declare namespace firebase.messaging {
 
   /**
    * Message payload that contains the notification payload that is represented with
-   * {@link firebase.Messaging.NotificationPayload} and the data payload that contains an arbitrary
+   * {@link firebase.messaging.NotificationPayload} and the data payload that contains an arbitrary
    * number of key-value pairs sent by developers through the
    * {@link https://firebase.google.com/docs/reference/fcm/rest/v1/projects.messages#notification Send API}
    */
   export interface MessagePayload {
     /**
-     * See {@link firebase.Messaging.NotificationPayload}.
+     * See {@link firebase.messaging.NotificationPayload}.
      */
     notification?: NotificationPayload;
 
@@ -7125,7 +7125,7 @@ declare namespace firebase.messaging {
     data?: { [key: string]: string };
 
     /**
-     * See {@link firebase.Messaging.FcmOptions}.
+     * See {@link firebase.messaging.FcmOptions}.
      */
     fcmOptions?: FcmOptions;
 
@@ -7135,15 +7135,17 @@ declare namespace firebase.messaging {
     from: string;
 
     /**
-     * The collapse key of this message. See more
-     * {@link https://firebase.google.com/docs/cloud-messaging/concept-options#collapsible_and_non-collapsible_messages}.
+     * The collapse key of this message. See
+     * {@link https://firebase.google.com/docs/cloud-messaging/concept-options#collapsible_and_non-collapsible_messages
+     * Collapsible and non-collapsible messages}.
      */
     collapseKey: string;
   }
 
   /**
-   * Options for features provided by the FCM SDK for Web. See more
-   * {@link https://firebase.google.com/docs/reference/fcm/rest/v1/projects.messages#webpushfcmoptions}.
+   * Options for features provided by the FCM SDK for Web. See
+   * {@link https://firebase.google.com/docs/reference/fcm/rest/v1/projects.messages#webpushfcmoptions
+   * WebpushFcmOptions}.
    */
   export interface FcmOptions {
     /**
@@ -7154,8 +7156,9 @@ declare namespace firebase.messaging {
     link?: string;
 
     /**
-     * Label associated with the message's analytics data. See more
-     * {@link https://firebase.google.com/docs/cloud-messaging/understand-delivery#adding-analytics-labels-to-messages}.
+     * Label associated with the message's analytics data. See
+     * {@link https://firebase.google.com/docs/cloud-messaging/understand-delivery#adding-analytics-labels-to-messages
+     * Adding analytics labels}.
      */
     analyticsLabel?: string;
   }
@@ -7176,8 +7179,8 @@ declare namespace firebase.messaging {
 
     /**
      * The URL of the image that is shown with the notification. See
-     * {@link https://firebase.google.com/docs/reference/fcm/rest/v1/projects.messages#notification}
-     * for supported image format.
+     * {@link https://firebase.google.com/docs/reference/fcm/rest/v1/projects.messages#notification
+     * `notification.image`} for supported image format.
      */
     image?: string;
   }
@@ -7888,10 +7891,18 @@ declare namespace firebase.firestore {
     /**
      * Whether to skip nested properties that are set to `undefined` during
      * object serialization. If set to `true`, these properties are skipped
-     * and not written to Firestore. If set `false` or omitted, the SDK throws
-     * an exception when it encounters properties of type `undefined`.
+     * and not written to Firestore. If set to `false` or omitted, the SDK
+     * throws an exception when it encounters properties of type `undefined`.
      */
     ignoreUndefinedProperties?: boolean;
+
+    /**
+     * Whether to merge the provided settings with the existing settings. If
+     * set to `true`, the settings are merged with existing settings. If
+     * set to `false` or left unset, the settings replace the existing
+     * settings.
+     */
+    merge?: boolean;
   }
 
   /**

packages/firestore-types/index.d.ts

@@ -30,6 +30,7 @@ export interface Settings {
   cacheSizeBytes?: number;
   experimentalForceLongPolling?: boolean;
   ignoreUndefinedProperties?: boolean;
+  merge?: boolean;
 }
 
 export interface PersistenceSettings {

packages/firestore/package.json

@@ -10,7 +10,7 @@
     "bundle": "rollup -c",
     "build": "run-p 'bundle rollup.config.browser.js' 'bundle rollup.config.browser.memory.js' 'bundle rollup.config.node.js' 'bundle rollup.config.node.memory.js' 'bundle rollup.config.rn.js' 'bundle rollup.config.rn.memory.js' build:lite build:exp",
     "build:scripts": "tsc -moduleResolution node --module commonjs scripts/*.ts && ls scripts/*.js | xargs -I % sh -c 'terser %  -o %'",
-    "build:release": "rollup -c rollup.config.es2017.js && rollup -c rollup.config.es5.js",
+    "build:release": "run-p 'bundle rollup.config.browser.js' 'bundle rollup.config.browser.memory.js' 'bundle rollup.config.node.js' 'bundle rollup.config.node.memory.js' 'bundle rollup.config.rn.js' 'bundle rollup.config.rn.memory.js'",
     "build:deps": "lerna run --scope @firebase/'{app,firestore}' --include-dependencies build",
     "build:console": "node tools/console.build.js",
     "build:exp": "rollup -c rollup.config.exp.js",
@@ -57,7 +57,6 @@
   "license": "Apache-2.0",
   "files": [
     "dist",
-    "lite/package.json",
     "memory/package.json"
   ],
   "dependencies": {

packages/firestore/rollup.config.exp.js

@@ -21,7 +21,8 @@ import alias from '@rollup/plugin-alias';
 import typescriptPlugin from 'rollup-plugin-typescript2';
 import typescript from 'typescript';
 import path from 'path';
-import sourcemaps from 'rollup-plugin-sourcemaps';
+import replace from 'rollup-plugin-replace';
+import copy from 'rollup-plugin-copy-assets';
 import { terser } from 'rollup-plugin-terser';
 import { importPathTransformer } from '../../scripts/exp/ts-transform-import-path';
 
@@ -41,7 +42,14 @@ const nodePlugins = [
     abortOnError: false,
     transformers: [util.removeAssertTransformer, importPathTransformer]
   }),
-  json({ preferConst: true })
+  json({ preferConst: true }),
+  // Needed as we also use the *.proto files
+  copy({
+    assets: ['./src/protos']
+  }),
+  replace({
+    'process.env.FIRESTORE_PROTO_ROOT': JSON.stringify('../src/protos')
+  })
 ];
 
 const browserPlugins = [
@@ -87,18 +95,7 @@ const allBuilds = [
       name: 'firebase.firestore',
       sourcemap: true
     },
-    plugins: [
-      typescriptPlugin({
-        typescript,
-        compilerOptions: {
-          allowJs: true,
-          target: 'es5'
-        },
-        include: ['dist/exp/*.js']
-      }),
-      json(),
-      sourcemaps()
-    ],
+    plugins: util.es2017ToEs5Plugins(/* mangled= */ false),
     external: util.resolveNodeExterns,
     treeshake: {
       moduleSideEffects: false

packages/firestore/rollup.shared.js

@@ -178,7 +178,7 @@ exports.es2017ToEs5Plugins = function (mangled = false) {
         compilerOptions: {
           allowJs: true
         },
-        include: ['dist/*.js']
+        include: ['dist/*.js', 'dist/exp/*.js']
       }),
       terser({
         output: {
@@ -196,7 +196,7 @@ exports.es2017ToEs5Plugins = function (mangled = false) {
         compilerOptions: {
           allowJs: true
         },
-        include: ['dist/*.js']
+        include: ['dist/*.js', 'dist/exp/*.js']
       }),
       sourcemaps()
     ];

packages/firestore/src/api/database.ts

@@ -160,7 +160,7 @@ class FirestoreSettings {
 
   readonly cacheSizeBytes: number;
 
-  readonly forceLongPolling: boolean;
+  readonly experimentalForceLongPolling: boolean;
 
   readonly ignoreUndefinedProperties: boolean;
 
@@ -263,7 +263,7 @@ class FirestoreSettings {
       'experimentalForceLongPolling',
       settings.experimentalForceLongPolling
     );
-    this.forceLongPolling =
+    this.experimentalForceLongPolling =
       settings.experimentalForceLongPolling ?? DEFAULT_FORCE_LONG_POLLING;
   }
 
@@ -274,7 +274,8 @@ class FirestoreSettings {
       this.timestampsInSnapshots === other.timestampsInSnapshots &&
       this.credentials === other.credentials &&
       this.cacheSizeBytes === other.cacheSizeBytes &&
-      this.forceLongPolling === other.forceLongPolling &&
+      this.experimentalForceLongPolling ===
+        other.experimentalForceLongPolling &&
       this.ignoreUndefinedProperties === other.ignoreUndefinedProperties
     );
   }
@@ -361,6 +362,12 @@ export class Firestore implements firestore.FirebaseFirestore, FirebaseService {
     validateExactNumberOfArgs('Firestore.settings', arguments, 1);
     validateArgType('Firestore.settings', 'object', 1, settingsLiteral);
 
+    if (settingsLiteral.merge) {
+      settingsLiteral = { ...this._settings, ...settingsLiteral };
+      // Remove the property from the settings once the merge is completed
+      delete settingsLiteral.merge;
+    }
+
     const newSettings = new FirestoreSettings(settingsLiteral);
     if (this._firestoreClient && !this._settings.isEqual(newSettings)) {
       throw new FirestoreError(
@@ -516,7 +523,7 @@ export class Firestore implements firestore.FirebaseFirestore, FirebaseService {
       this._persistenceKey,
       this._settings.host,
       this._settings.ssl,
-      this._settings.forceLongPolling
+      this._settings.experimentalForceLongPolling
     );
   }
 
@@ -681,6 +688,11 @@ export class Firestore implements firestore.FirebaseFirestore, FirebaseService {
   _areTimestampsInSnapshotsEnabled(): boolean {
     return this._settings.timestampsInSnapshots;
   }
+
+  // Visible for testing.
+  _getSettings(): firestore.Settings {
+    return this._settings;
+  }
 }
 
 /**

packages/firestore/src/core/transaction.ts

@@ -33,7 +33,6 @@ import {
 import { fail, debugAssert } from '../util/assert';
 import { Code, FirestoreError } from '../util/error';
 import { SnapshotVersion } from './snapshot_version';
-import { ResourcePath } from '../model/path';
 
 /**
  * Internal transaction object responsible for accumulating the mutations to
@@ -57,7 +56,7 @@ export class Transaction {
    * When there's more than one write to the same key in a transaction, any
    * writes after the first are handled differently.
    */
-  private writtenDocs: Set<DocumentKey> = new Set();
+  private writtenDocs: Set</* path= */ string> = new Set();
 
   constructor(private datastore: Datastore) {}
 
@@ -83,7 +82,7 @@ export class Transaction {
 
   set(key: DocumentKey, data: ParsedSetData): void {
     this.write(data.toMutations(key, this.precondition(key)));
-    this.writtenDocs.add(key);
+    this.writtenDocs.add(key.toString());
   }
 
   update(key: DocumentKey, data: ParsedUpdateData): void {
@@ -92,12 +91,12 @@ export class Transaction {
     } catch (e) {
       this.lastWriteError = e;
     }
-    this.writtenDocs.add(key);
+    this.writtenDocs.add(key.toString());
   }
 
   delete(key: DocumentKey): void {
     this.write([new DeleteMutation(key, this.precondition(key))]);
-    this.writtenDocs.add(key);
+    this.writtenDocs.add(key.toString());
   }
 
   async commit(): Promise<void> {
@@ -114,7 +113,7 @@ export class Transaction {
     // For each document that was read but not written to, we want to perform
     // a `verify` operation.
     unwritten.forEach((_, path) => {
-      const key = new DocumentKey(ResourcePath.fromString(path));
+      const key = DocumentKey.fromPath(path);
       this.mutations.push(new VerifyMutation(key, this.precondition(key)));
     });
     await invokeCommitRpc(this.datastore, this.mutations);
@@ -153,7 +152,7 @@ export class Transaction {
    */
   private precondition(key: DocumentKey): Precondition {
     const version = this.readVersions.get(key.toString());
-    if (!this.writtenDocs.has(key) && version) {
+    if (!this.writtenDocs.has(key.toString()) && version) {
       return Precondition.updateTime(version);
     } else {
       return Precondition.none();
@@ -167,7 +166,7 @@ export class Transaction {
     const version = this.readVersions.get(key.toString());
     // The first time a document is written, we want to take into account the
     // read time and existence
-    if (!this.writtenDocs.has(key) && version) {
+    if (!this.writtenDocs.has(key.toString()) && version) {
       if (version.isEqual(SnapshotVersion.min())) {
         // The document doesn't exist, so fail the transaction.