Comment

Author: schmidt-sebastian

.changeset/blue-geese-approve.md

@@ -0,0 +1,5 @@
+---
+"@firebase/firestore": patch
+---
+
+Internal changes for the upcoming modular API.

.changeset/fast-impalas-tickle.md

@@ -7,7 +7,7 @@
     "test:ci": "node ../../scripts/run_tests_in_ci.js -s test"
   },
   "devDependencies": {
-    "firebase": "8.0.1",
+    "firebase": "8.0.2",
     "@types/chai": "4.2.14",
     "@types/mocha": "7.0.2",
     "chai": "4.2.0",

.changeset/gentle-gifts-sort.md

@@ -15,7 +15,7 @@
   },
   "devDependencies": {
     "@firebase/app": "0.6.13",
-    "@firebase/firestore": "2.0.1",
+    "@firebase/firestore": "2.0.2",
     "@types/mocha": "7.0.2",
     "gulp": "4.0.2",
     "gulp-filter": "6.0.0",

.changeset/lemon-steaks-draw.md

@@ -9,7 +9,7 @@
     "test:manual": "mocha --exit"
   },
   "devDependencies": {
-    "firebase": "8.0.1",
+    "firebase": "8.0.2",
     "chai": "4.2.0",
     "chromedriver": "86.0.0",
     "express": "4.17.1",

.changeset/short-mangos-beg.md

@@ -41,7 +41,7 @@
     "@firebase/app-compat": "0.0.800",
     "@firebase/auth-exp": "0.0.800",
     "@firebase/functions-exp": "0.0.800",
-    "@firebase/firestore": "2.0.1",
+    "@firebase/firestore": "2.0.2",
     "@firebase/performance-exp": "0.0.800",
     "@firebase/remote-config-exp": "0.0.800"
   },

.changeset/silly-boats-roll.md

@@ -1,5 +1,11 @@
 # @firebase/auth
 
+## 0.15.2
+
+### Patch Changes
+
+- [`c2b215c19`](https://github.com/firebase/firebase-js-sdk/commit/c2b215c1950b2f75abb6a8dd58544a79bda968f6) [#4059](https://github.com/firebase/firebase-js-sdk/pull/4059) (fixes [#1926](https://github.com/firebase/firebase-js-sdk/issues/1926)) - Retry IndexedDB errors a fixed number of times to handle connection issues in mobile webkit.
+
 ## 0.15.1
 
 ### Patch Changes

integration/firebase/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/auth",
-  "version": "0.15.1",
+  "version": "0.15.2",
   "main": "dist/auth.js",
   "browser": "dist/auth.esm.js",
   "module": "dist/auth.esm.js",

integration/firestore/package.json

@@ -1,5 +1,14 @@
 # firebase
 
+## 8.0.2
+
+### Patch Changes
+
+- Updated dependencies [[`d2adf4e3e`](https://github.com/firebase/firebase-js-sdk/commit/d2adf4e3e69da3a4312828137f9721ea84b87fe2), [`c2b215c19`](https://github.com/firebase/firebase-js-sdk/commit/c2b215c1950b2f75abb6a8dd58544a79bda968f6), [`6dffdf2eb`](https://github.com/firebase/firebase-js-sdk/commit/6dffdf2eb1323ec9047af4ed78302a68f7dacce3), [`484e90a1d`](https://github.com/firebase/firebase-js-sdk/commit/484e90a1d8f63e04268ff5bce4e3e0873c56c8e1), [`f9dc50e35`](https://github.com/firebase/firebase-js-sdk/commit/f9dc50e3520d50b70eecd28b81887e0053f9f636)]:
+  - @firebase/firestore@2.0.2
+  - @firebase/auth@0.15.2
+  - @firebase/storage@0.4.2
+
 ## 8.0.1
 
 ### Patch Changes

integration/messaging/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "description": "Firebase JavaScript library for web and Node.js",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "license": "Apache-2.0",
@@ -47,14 +47,14 @@
   "dependencies": {
     "@firebase/app": "0.6.13",
     "@firebase/app-types": "0.6.1",
-    "@firebase/auth": "0.15.1",
+    "@firebase/auth": "0.15.2",
     "@firebase/database": "0.7.1",
-    "@firebase/firestore": "2.0.1",
+    "@firebase/firestore": "2.0.2",
     "@firebase/functions": "0.6.1",
     "@firebase/installations": "0.4.19",
     "@firebase/messaging": "0.7.3",
     "@firebase/polyfill": "0.3.36",
-    "@firebase/storage": "0.4.1",
+    "@firebase/storage": "0.4.2",
     "@firebase/performance": "0.4.4",
     "@firebase/remote-config": "0.1.30",
     "@firebase/analytics": "0.6.2",

packages-exp/firebase-exp/package.json

@@ -1,5 +1,15 @@
 # @firebase/firestore
 
+## 2.0.2
+
+### Patch Changes
+
+- [`d2adf4e3e`](https://github.com/firebase/firebase-js-sdk/commit/d2adf4e3e69da3a4312828137f9721ea84b87fe2) [#4051](https://github.com/firebase/firebase-js-sdk/pull/4051) - Fixed an issue that caused `DocumentReference`s in `DocumentSnapshot`s to be returned with the custom converter of the original `DocumentReference`.
+
+* [`6dffdf2eb`](https://github.com/firebase/firebase-js-sdk/commit/6dffdf2eb1323ec9047af4ed78302a68f7dacce3) [#3594](https://github.com/firebase/firebase-js-sdk/pull/3594) - Merge bundle loading implementation without exposing public API
+
+- [`484e90a1d`](https://github.com/firebase/firebase-js-sdk/commit/484e90a1d8f63e04268ff5bce4e3e0873c56c8e1) [#4043](https://github.com/firebase/firebase-js-sdk/pull/4043) - Internal changes to support upcoming modular API.
+
 ## 2.0.1
 
 ### Patch Changes

packages/auth/CHANGELOG.md

@@ -20,6 +20,8 @@ import { FirebaseFirestore } from './database';
 import { executeWrite } from './reference';
 import { ensureFirestoreConfigured } from '../../../src/api/database';
 
+export { WriteBatch };
+
 /**
  * Creates a write batch, used for performing multiple writes as a single
  * atomic operation. The maximum number of writes allowed in a single WriteBatch

packages/auth/package.json

@@ -104,63 +104,6 @@ export class Transaction
   }
 }
 
-export class WriteBatch
-  extends Compat<exp.WriteBatch>
-  implements legacy.WriteBatch {
-  set<T>(
-    documentRef: DocumentReference<T>,
-    data: T,
-    options?: legacy.SetOptions
-  ): WriteBatch {
-    if (options) {
-      validateSetOptions('WriteBatch.set', options);
-      this._delegate.set(documentRef._delegate, unwrap(data), options);
-    } else {
-      this._delegate.set(documentRef._delegate, unwrap(data));
-    }
-    return this;
-  }
-
-  update(
-    documentRef: DocumentReference<any>,
-    data: legacy.UpdateData
-  ): WriteBatch;
-  update(
-    documentRef: DocumentReference<any>,
-    field: string | FieldPath,
-    value: any,
-    ...moreFieldsAndValues: any[]
-  ): WriteBatch;
-  update(
-    documentRef: DocumentReference<any>,
-    dataOrField: any,
-    value?: any,
-    ...moreFieldsAndValues: any[]
-  ): WriteBatch {
-    if (arguments.length === 2) {
-      this._delegate.update(documentRef._delegate, unwrap(dataOrField));
-    } else {
-      this._delegate.update(
-        documentRef._delegate,
-        unwrap(dataOrField),
-        unwrap(value),
-        ...unwrap(moreFieldsAndValues)
-      );
-    }
-
-    return this;
-  }
-
-  delete(documentRef: DocumentReference<any>): WriteBatch {
-    this._delegate.delete(documentRef._delegate);
-    return this;
-  }
-
-  commit(): Promise<void> {
-    return this._delegate.commit();
-  }
-}
-
 export class FieldPath
   extends Compat<FieldPathExp>
   implements legacy.FieldPath {

packages/firebase/CHANGELOG.md

@@ -1520,6 +1520,12 @@ export function updateDoc(
 ): Promise<void> {
   const dataReader = newUserDataReader(reference.firestore);
 
+  // For Compat types, we have to "extract" the underlying types before
+  // performing validation.
+  if (fieldOrUpdateData instanceof Compat) {
+    fieldOrUpdateData = fieldOrUpdateData._delegate;
+  }
+
   let parsed: ParsedUpdateData;
   if (
     typeof fieldOrUpdateData === 'string' ||

packages/firebase/package.json

@@ -44,6 +44,7 @@ import {
 } from './reference';
 import { FieldPath } from './field_path';
 import { getDatastore } from './components';
+import { Compat } from '../../../src/compat/compat';
 
 // TODO(mrschmidt) Consider using `BaseTransaction` as the base class in the
 // legacy SDK.
@@ -198,6 +199,12 @@ export class Transaction {
   ): this {
     const ref = validateReference(documentRef, this._firestore);
 
+    // For Compat types, we have to "extract" the underlying types before
+    // performing validation.
+    if (fieldOrUpdateData instanceof Compat) {
+      fieldOrUpdateData = fieldOrUpdateData._delegate;
+    }
+
     let parsed;
     if (
       typeof fieldOrUpdateData === 'string' ||

packages/firestore/CHANGELOG.md

@@ -38,6 +38,7 @@ import { FirebaseFirestore } from './database';
 import { invokeCommitRpc } from '../../../src/remote/datastore';
 import { FieldPath } from './field_path';
 import { getDatastore } from './components';
+import { Compat } from '../../../src/compat/compat';
 
 /**
  * A write batch, used to perform multiple writes as a single atomic unit.
@@ -155,8 +156,13 @@ export class WriteBatch {
     this.verifyNotCommitted();
     const ref = validateReference(documentRef, this._firestore);
 
-    let parsed;
+    // For Compat types, we have to "extract" the underlying types before
+    // performing validation.
+    if (fieldOrUpdateData instanceof Compat) {
+      fieldOrUpdateData = fieldOrUpdateData._delegate;
+    }
 
+    let parsed;
     if (
       typeof fieldOrUpdateData === 'string' ||
       fieldOrUpdateData instanceof FieldPath
@@ -233,9 +239,12 @@ export class WriteBatch {
 }
 
 export function validateReference<T>(
-  documentRef: DocumentReference<T>,
+  documentRef: DocumentReference<T> | Compat<DocumentReference<T>>,
   firestore: FirebaseFirestore
 ): DocumentReference<T> {
+  if (documentRef instanceof Compat) {
+    documentRef = documentRef._delegate;
+  }
   if (documentRef.firestore !== firestore) {
     throw new FirestoreError(
       Code.INVALID_ARGUMENT,

packages/firestore/exp/src/api/write_batch.ts

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/firestore",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "engines": {
     "node": "^8.13.0 || >=10.10.0"
   },