pulled from master

Author: XuechunHou

config/webpack.test.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.
@@ -18,6 +18,12 @@
 const path = require('path');
 const webpack = require('webpack');
 
+/**
+ * A regular expression used to replace Firestore's platform specific modules,
+ * which are located under 'packages/firestore/src/platform/'.
+ */
+const FIRESTORE_PLATFORM_RE = /^(.*)\/platform\/([^.\/]*)(\.ts)?$/;
+
 module.exports = {
   mode: 'development',
   devtool: 'source-map',
@@ -77,6 +83,15 @@ module.exports = {
     extensions: ['.js', '.ts']
   },
   plugins: [
+    new webpack.NormalModuleReplacementPlugin(
+      FIRESTORE_PLATFORM_RE,
+      resource => {
+        resource.request = resource.request.replace(
+          FIRESTORE_PLATFORM_RE,
+          '$1/platform/browser/$2.ts'
+        );
+      }
+    ),
     new webpack.EnvironmentPlugin([
       'RTDB_EMULATOR_PORT',
       'RTDB_EMULATOR_NAMESPACE'

packages/firebase/src/index.rn.ts

@@ -23,7 +23,6 @@ import '../database';
 // TODO(b/158625454): Storage doesn't actually work by default in RN (it uses
 //  `atob`). We should provide a RN build that works out of the box.
 import '../storage';
-import '../firestore';
 
 firebase.registerVersion(name, version, 'rn');
 

packages/firestore/index.console.ts

@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-import './src/platform_browser/browser_init';
+// TODO(mrschmidt): Once imported into Google3, fix
+// third_party/javascript/firebase/src/packages/firestore/tools/console.build.js
 
 export { Firestore, FirestoreDatabase } from './src/api/database';
 export {
@@ -25,7 +26,7 @@ export {
   PublicQuerySnapshot as QuerySnapshot,
   PublicFieldValue as FieldValue,
   PublicBlob as Blob
-} from './src/platform/config';
+} from './src/config';
 export { GeoPoint } from './src/api/geo_point';
 export { FirstPartyCredentialsSettings } from './src/api/credentials';
 export { FieldPath } from './src/api/field_path';

packages/firestore/index.memory.ts

@@ -20,10 +20,9 @@ import { FirebaseNamespace } from '@firebase/app-types';
 
 import { Firestore } from './src/api/database';
 import { MemoryComponentProvider } from './src/core/component_provider';
-import { configureForFirebase } from './src/platform/config';
+import { configureForFirebase } from './src/config';
 
 import './register-module';
-import './src/platform_browser/browser_init';
 
 import { name, version } from './package.json';
 

packages/firestore/index.node.memory.ts

@@ -20,9 +20,8 @@ import { FirebaseNamespace } from '@firebase/app-types';
 
 import { Firestore } from './src/api/database';
 import { MemoryComponentProvider } from './src/core/component_provider';
-import { configureForFirebase } from './src/platform/config';
+import { configureForFirebase } from './src/config';
 import './register-module';
-import './src/platform_node/node_init';
 
 import { name, version } from './package.json';
 

packages/firestore/index.node.ts

@@ -19,10 +19,9 @@ import { FirebaseNamespace } from '@firebase/app-types';
 
 import { Firestore } from './src/api/database';
 import { IndexedDbComponentProvider } from './src/core/component_provider';
-import { configureForFirebase } from './src/platform/config';
+import { configureForFirebase } from './src/config';
 
 import './register-module';
-import './src/platform_node/node_init';
 
 import { name, version } from './package.json';
 

packages/firestore/index.rn.memory.ts

@@ -20,10 +20,9 @@ import { FirebaseNamespace } from '@firebase/app-types';
 
 import { Firestore } from './src/api/database';
 import { MemoryComponentProvider } from './src/core/component_provider';
-import { configureForFirebase } from './src/platform/config';
+import { configureForFirebase } from './src/config';
 
 import './register-module';
-import './src/platform_rn/rn_init';
 
 import { name, version } from './package.json';
 

packages/firestore/index.rn.ts

@@ -19,11 +19,9 @@ import { FirebaseNamespace } from '@firebase/app-types';
 
 import { Firestore } from './src/api/database';
 import { IndexedDbComponentProvider } from './src/core/component_provider';
-import { configureForFirebase } from './src/platform/config';
+import { configureForFirebase } from './src/config';
 
 import './register-module';
-import './src/platform_rn/rn_init';
-
 import { name, version } from './package.json';
 
 /**

packages/firestore/index.ts

@@ -20,11 +20,10 @@ import { FirebaseNamespace } from '@firebase/app-types';
 
 import { Firestore } from './src/api/database';
 import { IndexedDbComponentProvider } from './src/core/component_provider';
-import { configureForFirebase } from './src/platform/config';
+import { configureForFirebase } from './src/config';
 import { name, version } from './package.json';
 
 import './register-module';
-import './src/platform_browser/browser_init';
 
 /**
  * Registers the main Firestore build with the components framework.

packages/firestore/lite/index.node.ts

@@ -20,8 +20,6 @@ import { Firestore } from './src/api/database';
 import { version } from '../package.json';
 import { Component, ComponentType } from '@firebase/component';
 
-import '../src/platform_node/node_init';
-
 export {
   Firestore as FirebaseFirestore,
   initializeFirestore,

packages/firestore/lite/src/api/database.ts

@@ -33,7 +33,8 @@ import {
   newDatastore,
   terminateDatastore
 } from '../../../src/remote/datastore';
-import { PlatformSupport } from '../../../src/platform/platform';
+import { newConnection } from '../../../src/platform/connection';
+import { newSerializer } from '../../../src/platform/serializer';
 import { cast } from './util';
 import { Settings } from '../../';
 
@@ -90,14 +91,10 @@ export class Firestore implements firestore.FirebaseFirestore {
   _getDatastore(): Promise<Datastore> {
     if (!this._datastorePromise) {
       const databaseInfo = this._makeDatabaseInfo(this._getSettings());
-      this._datastorePromise = PlatformSupport.getPlatform()
-        .loadConnection(databaseInfo)
-        .then(connection => {
-          const serializer = PlatformSupport.getPlatform().newSerializer(
-            databaseInfo.databaseId
-          );
-          return newDatastore(connection, this._credentials, serializer);
-        });
+      this._datastorePromise = newConnection(databaseInfo).then(connection => {
+        const serializer = newSerializer(databaseInfo.databaseId);
+        return newDatastore(connection, this._credentials, serializer);
+      });
     }
 
     return this._datastorePromise;

packages/firestore/lite/src/api/reference.ts

@@ -46,7 +46,6 @@ import {
 } from '../../../src/remote/datastore';
 import { hardAssert } from '../../../src/util/assert';
 import { DeleteMutation, Precondition } from '../../../src/model/mutation';
-import { PlatformSupport } from '../../../src/platform/platform';
 import {
   applyFirestoreDataConverter,
   BaseQuery
@@ -60,6 +59,7 @@ import {
   validateExactNumberOfArgs,
   validatePositiveNumber
 } from '../../../src/util/input_validation';
+import { newSerializer } from '../../../src/platform/serializer';
 import { FieldPath as ExternalFieldPath } from '../../../src/api/field_path';
 import { Code, FirestoreError } from '../../../src/util/error';
 
@@ -592,9 +592,7 @@ export function queryEqual<T>(
 
 export function newUserDataReader(firestore: Firestore): UserDataReader {
   const settings = firestore._getSettings();
-  const serializer = PlatformSupport.getPlatform().newSerializer(
-    firestore._databaseId
-  );
+  const serializer = newSerializer(firestore._databaseId);
   return new UserDataReader(
     firestore._databaseId,
     !!settings.ignoreUndefinedProperties,