schmidt-sebastian

mrschmidt@mrschmidt-macbookpro3 firebase-js-sdk (mrschmidt-closewhenidle) $ (cd packages/firebase; yarn prepare) && (cd packages/firestore; yarn prepare) && (cd integration/firestore; yarn pretest && yarn test)
yarn run v1.2.1
$ gulp build
[16:44:34] Using gulpfile ~/GitHub/Firebase/firebase-js-sdk/packages/firebase/gulpfile.js
[16:44:34] Starting 'build'...
[16:44:34] Starting '<anonymous>'...
[16:44:48] Version: webpack 3.8.1
Child
                        Asset     Size  Chunks                    Chunk Names
    firebase-messaging.js.map   152 kB       3  [emitted]         firebase-messaging

schmidt-sebastian

5:30:10.233 PM
warning	
write
Error: Stream removed at /user_code/node_modules/@google-cloud/firestore/node_modules/grpc/src/client.js:554:15
5:30:10.232 PM
info	
write
Firestore (0.10.0) 2017-12-21T01:30:10.232Z [Firestore._retry]: Request failed with unrecoverable error: { Error: Stream removed at /user_code/node_modules/@google-cloud/firestore/node_modules/grpc/src/client.js:554:15 code: 2, metadata: Metadata { _internal_repr: {} }, note: 'Exception occurred in retry method that was not classified as transient' }
5:30:10.231 PM

schmidt-sebastian

/**
 * Copyright 2017 Google Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *   http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software

schmidt-sebastian

1) Change SharedClientState prefix to "firestore_"

schmidt-sebastian

===================================================================
--- test/unit/local/indexeddb_schema.test.ts	(date 1521229629000)
+++ test/unit/local/indexeddb_schema.test.ts	(date 1521229629000)
@@ -21,7 +21,9 @@
   createOrUpgradeDb,
   DbTarget,
   DbTargetGlobal,
-  DbTargetGlobalKey
+  DbTargetGlobalKey,
+  V1_STORES,

schmidt-sebastian

===================================================================
--- src/util/async_queue.ts	(date 1521229072000)
+++ src/util/async_queue.ts	(date 1521229072000)
@@ -31,13 +31,6 @@
  * The string values are used when encoding these timer IDs in JSON spec tests.
  */
 export enum TimerId {
-<<<<<<< HEAD
-  ListenStreamIdle,
-  ListenStreamConnection,

schmidt-sebastian

===================================================================
--- test/unit/specs/spec_builder.ts	(date 1521229074000)
+++ test/unit/specs/spec_builder.ts	(date 1521229074000)
@@ -196,7 +196,6 @@
     return this;
   }
 
-<<<<<<< HEAD
   // PORTING NOTE: Only used by web multi-tab tests.

schmidt-sebastian

===================================================================
--- test/unit/specs/spec_test_runner.ts	(date 1521222146000)
+++ test/unit/specs/spec_test_runner.ts	(date 1521222146000)
@@ -479,9 +479,6 @@
       return step.enableNetwork!
         ? this.doEnableNetwork()
         : this.doDisableNetwork();
-    } else if ('acquirePrimaryLease' in step) {
-      // PORTING NOTE: Only used by web multi-tab tests.
-      return this.doAcquirePrimaryLease();

schmidt-sebastian

===================================================================
--- src/local/indexeddb_schema.ts	(date 1521229071000)
+++ src/local/indexeddb_schema.ts	(date 1521229071000)
@@ -26,51 +26,32 @@
 import { SnapshotVersion } from '../core/snapshot_version';
 
 /**
-<<<<<<< HEAD
- * Schema Version for the Web client (containing the Mutation Queue, the Query
- * and the Remote Document Cache) and Multi-Tab Support.

schmidt-sebastian

diff --git a/packages/firestore/src/api/user_data_converter.ts b/packages/firestore/src/api/user_data_converter.ts
index a37f1be1..9544dbef 100644
--- a/packages/firestore/src/api/user_data_converter.ts
+++ b/packages/firestore/src/api/user_data_converter.ts
@@ -173,6 +173,7 @@ class ParseContext {
   constructor(
     readonly dataSource: UserDataSource,
     readonly methodName: string,
+    readonly localWriteTime: Timestamp,
     readonly path: FieldPath | null,