Merge branch 'master' into yifany/size

Author: yifanyang

package.json

@@ -19,7 +19,6 @@
   "scripts": {
     "dev": "lerna run --parallel --scope @firebase/* --scope firebase --scope rxfire dev",
     "build": "lerna run --scope @firebase/* --scope firebase --scope rxfire prepare",
-    "prepush": "node tools/gitHooks/prepush.js",
     "link:packages": "lerna exec --scope @firebase/* --scope firebase --scope rxfire -- yarn link",
     "stage:packages": "./scripts/prepublish.sh",
     "repl": "node tools/repl.js",
@@ -124,5 +123,10 @@
     "yargs": "15.3.1",
     "lodash": "4.17.15",
     "terser": "4.6.7"
+  },
+  "husky": {
+    "hooks": {
+      "pre-push": "node tools/gitHooks/prepush.js"
+    }
   }
 }

packages/firestore/rollup.config.js

@@ -194,7 +194,11 @@ const browserBuilds = [
 // MARK: Node builds
 
 const nodeBuildPlugins = [
-  ...es5BuildPlugins,
+  typescriptPlugin({
+    typescript,
+    cacheRoot: `./.cache/node/`
+  }),
+  json(),
   // Needed as we also use the *.proto files
   copy({
     assets: ['./src/protos']

packages/firestore/src/local/indexeddb_persistence.ts

@@ -325,7 +325,7 @@ export class IndexedDbPersistence implements Persistence {
         this.scheduleClientMetadataAndPrimaryLeaseRefreshes();
 
         return this.simpleDb.runTransaction(
-          'readonly-idempotent',
+          'readonly',
           [DbTargetGlobal.store],
           txn => getHighestListenSequenceNumber(txn)
         );
@@ -388,7 +388,7 @@ export class IndexedDbPersistence implements Persistence {
    */
   private updateClientMetadataAndTryBecomePrimary(): Promise<void> {
     return this.simpleDb
-      .runTransaction('readwrite-idempotent', ALL_STORES, txn => {
+      .runTransaction('readwrite', ALL_STORES, txn => {
         const metadataStore = clientMetadataStore(txn);
         return metadataStore
           .put(
@@ -474,7 +474,7 @@ export class IndexedDbPersistence implements Persistence {
 
       const inactiveClients = await this.runTransaction(
         'maybeGarbageCollectMultiClientState',
-        'readwrite-primary-idempotent',
+        'readwrite-primary',
         txn => {
           const metadataStore = IndexedDbPersistence.getStore<
             DbClientMetadataKey,
@@ -658,7 +658,7 @@ export class IndexedDbPersistence implements Persistence {
     this.detachVisibilityHandler();
     this.detachWindowUnloadHook();
     await this.simpleDb.runTransaction(
-      'readwrite-idempotent',
+      'readwrite',
       [DbPrimaryClient.store, DbClientMetadata.store],
       txn => {
         return this.releasePrimaryLeaseIfHeld(txn).next(() =>
@@ -690,7 +690,7 @@ export class IndexedDbPersistence implements Persistence {
 
   getActiveClients(): Promise<ClientId[]> {
     return this.simpleDb.runTransaction(
-      'readonly-idempotent',
+      'readonly',
       [DbClientMetadata.store],
       txn => {
         return clientMetadataStore(txn)
@@ -762,16 +762,7 @@ export class IndexedDbPersistence implements Persistence {
   ): Promise<T> {
     log.debug(LOG_TAG, 'Starting transaction:', action);
 
-    // TODO(schmidt-sebastian): Simplify once all transactions are idempotent.
-    const idempotent = mode.endsWith('idempotent');
-    const readonly = mode.startsWith('readonly');
-    const simpleDbMode = readonly
-      ? idempotent
-        ? 'readonly-idempotent'
-        : 'readonly'
-      : idempotent
-      ? 'readwrite-idempotent'
-      : 'readwrite';
+    const simpleDbMode = mode === 'readonly' ? 'readonly' : 'readwrite';
 
     let persistenceTransaction: PersistenceTransaction;
 
@@ -784,10 +775,7 @@ export class IndexedDbPersistence implements Persistence {
           this.listenSequence.next()
         );
 
-        if (
-          mode === 'readwrite-primary' ||
-          mode === 'readwrite-primary-idempotent'
-        ) {
+        if (mode === 'readwrite-primary') {
           // While we merely verify that we have (or can acquire) the lease
           // immediately, we wait to extend the primary lease until after
           // executing transactionOperation(). This ensures that even if the