From 9cea67835306519eb4e144114b37b003aab1139d Mon Sep 17 00:00:00 2001
From: Feiyang1 <plane1113@gmail.com>
Date: Tue, 27 Apr 2021 16:15:45 -0700
Subject: [PATCH 01/10] report correct version for v8 and v9

---
 packages/firestore/exp/register.ts      | 3 +++
 packages/firestore/index.console.ts     | 4 ++++
 packages/firestore/index.memory.ts      | 3 +++
 packages/firestore/index.node.memory.ts | 3 +++
 packages/firestore/index.node.ts        | 3 +++
 packages/firestore/index.rn.memory.ts   | 3 +++
 packages/firestore/index.rn.ts          | 3 +++
 packages/firestore/index.ts             | 3 +++
 packages/firestore/lite/register.ts     | 3 +++
 packages/firestore/src/core/version.ts  | 5 ++++-
 10 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/packages/firestore/exp/register.ts b/packages/firestore/exp/register.ts
index 740f8d2e3c1..4e75e6371c1 100644
--- a/packages/firestore/exp/register.ts
+++ b/packages/firestore/exp/register.ts
@@ -19,8 +19,10 @@ import { _registerComponent, registerVersion } from '@firebase/app-exp';
 import { Component, ComponentType } from '@firebase/component';
 
 import { name, version } from '../package.json';
+import { version as SDK_VERSION } from '../../../packages-exp/firebase-exp/package.json';
 import { FirebaseFirestore } from '../src/exp/database';
 import { Settings } from '../src/exp/settings';
+import { setSDKVersion } from '../src/core/version';
 
 declare module '@firebase/component' {
   interface NameServiceMapping {
@@ -29,6 +31,7 @@ declare module '@firebase/component' {
 }
 
 export function registerFirestore(variant?: string): void {
+  setSDKVersion(SDK_VERSION);
   _registerComponent(
     new Component(
       'firestore-exp',
diff --git a/packages/firestore/index.console.ts b/packages/firestore/index.console.ts
index b93a346feff..6422214167e 100644
--- a/packages/firestore/index.console.ts
+++ b/packages/firestore/index.console.ts
@@ -23,8 +23,10 @@ import {
   MemoryPersistenceProvider
 } from './src/api/database';
 import { DatabaseId } from './src/core/database_info';
+import { setSDKVersion } from './src/core/version';
 import { FirebaseFirestore as FirestoreExp } from './src/exp/database';
 import { Code, FirestoreError } from './src/util/error';
+import { version as SDK_VERSION } from '../firebase/package.json';
 export {
   CollectionReference,
   DocumentReference,
@@ -71,3 +73,5 @@ function databaseIdFromFirestoreDatabase(
     firestoreDatabase.database
   );
 }
+
+setSDKVersion(SDK_VERSION);
diff --git a/packages/firestore/index.memory.ts b/packages/firestore/index.memory.ts
index 2a603e49c28..1f66f1696e5 100644
--- a/packages/firestore/index.memory.ts
+++ b/packages/firestore/index.memory.ts
@@ -18,6 +18,7 @@
 import firebase from '@firebase/app';
 import { FirebaseNamespace } from '@firebase/app-types';
 
+import { version as SDK_VERSION } from '../firebase/package.json';
 import {
   Firestore,
   MemoryPersistenceProvider,
@@ -27,11 +28,13 @@ import { name, version } from './package.json';
 import { configureForFirebase } from './src/config';
 
 import './register-module';
+import { setSDKVersion } from './src/core/version';
 
 /**
  * Registers the memory-only Firestore build with the components framework.
  */
 export function registerFirestore(instance: FirebaseNamespace): void {
+  setSDKVersion(SDK_VERSION);
   configureForFirebase(
     instance,
     (app, auth) =>
diff --git a/packages/firestore/index.node.memory.ts b/packages/firestore/index.node.memory.ts
index 1f1023847d1..0984e811521 100644
--- a/packages/firestore/index.node.memory.ts
+++ b/packages/firestore/index.node.memory.ts
@@ -18,18 +18,21 @@
 import firebase from '@firebase/app';
 import { FirebaseNamespace } from '@firebase/app-types';
 
+import { version as SDK_VERSION } from '../firebase/package.json';
 import { name, version } from './package.json';
 import { Firestore, MemoryPersistenceProvider } from './src/api/database';
 import { configureForFirebase } from './src/config';
 import { FirebaseFirestore } from './src/exp/database';
 
 import './register-module';
+import { setSDKVersion } from './src/core/version';
 
 /**
  * Registers the memory-only Firestore build for Node with the components
  * framework.
  */
 export function registerFirestore(instance: FirebaseNamespace): void {
+  setSDKVersion(SDK_VERSION);
   configureForFirebase(
     instance,
     (app, auth) =>
diff --git a/packages/firestore/index.node.ts b/packages/firestore/index.node.ts
index 0cf9ebe41bb..c34572390e0 100644
--- a/packages/firestore/index.node.ts
+++ b/packages/firestore/index.node.ts
@@ -17,18 +17,21 @@
 import firebase from '@firebase/app';
 import { FirebaseNamespace } from '@firebase/app-types';
 
+import { version as SDK_VERSION } from '../firebase/package.json';
 import { name, version } from './package.json';
 import { Firestore, IndexedDbPersistenceProvider } from './src/api/database';
 import { configureForFirebase } from './src/config';
 import { FirebaseFirestore as ExpFirebaseFirestore } from './src/exp/database';
 
 import './register-module';
+import { setSDKVersion } from './src/core/version';
 
 /**
  * Registers the main Firestore Node build with the components framework.
  * Persistence can be enabled via `firebase.firestore().enablePersistence()`.
  */
 export function registerFirestore(instance: FirebaseNamespace): void {
+  setSDKVersion(SDK_VERSION);
   configureForFirebase(
     instance,
     (app, auth) =>
diff --git a/packages/firestore/index.rn.memory.ts b/packages/firestore/index.rn.memory.ts
index d6b2e782e7a..cab1028a4a9 100644
--- a/packages/firestore/index.rn.memory.ts
+++ b/packages/firestore/index.rn.memory.ts
@@ -25,14 +25,17 @@ import {
 } from './export';
 import { name, version } from './package.json';
 import { configureForFirebase } from './src/config';
+import { version as SDK_VERSION } from '../firebase/package.json';
 
 import './register-module';
+import { setSDKVersion } from './src/core/version';
 
 /**
  * Registers the memory-only Firestore build for ReactNative with the components
  * framework.
  */
 export function registerFirestore(instance: FirebaseNamespace): void {
+  setSDKVersion(SDK_VERSION);
   configureForFirebase(
     instance,
     (app, auth) =>
diff --git a/packages/firestore/index.rn.ts b/packages/firestore/index.rn.ts
index 46f9ae67020..f045611f7c5 100644
--- a/packages/firestore/index.rn.ts
+++ b/packages/firestore/index.rn.ts
@@ -24,14 +24,17 @@ import {
 } from './export';
 import { name, version } from './package.json';
 import { configureForFirebase } from './src/config';
+import { version as SDK_VERSION } from '../firebase/package.json';
 
 import './register-module';
+import { setSDKVersion } from './src/core/version';
 
 /**
  * Registers the main Firestore ReactNative build with the components framework.
  * Persistence can be enabled via `firebase.firestore().enablePersistence()`.
  */
 export function registerFirestore(instance: FirebaseNamespace): void {
+  setSDKVersion(SDK_VERSION);
   configureForFirebase(
     instance,
     (app, auth) =>
diff --git a/packages/firestore/index.ts b/packages/firestore/index.ts
index aeb96e7ea8f..e0248b81013 100644
--- a/packages/firestore/index.ts
+++ b/packages/firestore/index.ts
@@ -25,14 +25,17 @@ import {
 } from './export';
 import { name, version } from './package.json';
 import { configureForFirebase } from './src/config';
+import { version as SDK_VERSION } from '../firebase/package.json';
 
 import './register-module';
+import { setSDKVersion } from './src/core/version';
 
 /**
  * Registers the main Firestore build with the components framework.
  * Persistence can be enabled via `firebase.firestore().enablePersistence()`.
  */
 export function registerFirestore(instance: FirebaseNamespace): void {
+  setSDKVersion(SDK_VERSION);
   configureForFirebase(
     instance,
     (app, auth) =>
diff --git a/packages/firestore/lite/register.ts b/packages/firestore/lite/register.ts
index cb17b6a25fe..439eb51cce7 100644
--- a/packages/firestore/lite/register.ts
+++ b/packages/firestore/lite/register.ts
@@ -18,7 +18,9 @@
 import { _registerComponent, registerVersion } from '@firebase/app-exp';
 import { Component, ComponentType } from '@firebase/component';
 
+import { version as SDK_VERSION } from '../../../packages-exp/firebase-exp/package.json';
 import { version } from '../package.json';
+import { setSDKVersion } from '../src/core/version';
 import { FirebaseFirestore } from '../src/lite/database';
 import { Settings } from '../src/lite/settings';
 
@@ -29,6 +31,7 @@ declare module '@firebase/component' {
 }
 
 export function registerFirestore(): void {
+  setSDKVersion(SDK_VERSION);
   _registerComponent(
     new Component(
       'firestore/lite',
diff --git a/packages/firestore/src/core/version.ts b/packages/firestore/src/core/version.ts
index 5d6dc71524e..36502f3abc0 100644
--- a/packages/firestore/src/core/version.ts
+++ b/packages/firestore/src/core/version.ts
@@ -16,4 +16,7 @@
  */
 
 /** The semver (www.semver.org) version of the SDK. */
-export { version as SDK_VERSION } from '../../../firebase/package.json';
+export let SDK_VERSION = '';
+export function setSDKVersion(version: string): void {
+  SDK_VERSION = version;
+}

From 4e57cac11333f53fd3888f0f58c188548a1d0cdd Mon Sep 17 00:00:00 2001
From: Feiyang1 <plane1113@gmail.com>
Date: Tue, 27 Apr 2021 16:19:37 -0700
Subject: [PATCH 02/10] set correct version for firestore compat

---
 packages/firestore/compat/index.node.ts | 3 +++
 packages/firestore/compat/index.rn.ts   | 4 +++-
 packages/firestore/compat/index.ts      | 4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/firestore/compat/index.node.ts b/packages/firestore/compat/index.node.ts
index 6370fd30631..c592b7e7d4b 100644
--- a/packages/firestore/compat/index.node.ts
+++ b/packages/firestore/compat/index.node.ts
@@ -24,12 +24,15 @@ import { Firestore, IndexedDbPersistenceProvider } from '../src/api/database';
 import { registerBundle } from './bundle';
 import { configureForFirebase } from './config';
 import { name, version } from './package.json';
+import { version as SDK_VERSION } from '../../../packages-exp/firebase-exp/package.json';
+import { setSDKVersion } from '../src/core/version';
 
 /**
  * Registers the main Firestore Node build with the components framework.
  * Persistence can be enabled via `firebase.firestore().enablePersistence()`.
  */
 export function registerFirestore(instance: FirebaseNamespace): void {
+  setSDKVersion(SDK_VERSION);
   configureForFirebase(
     instance,
     (app, firestoreExp) =>
diff --git a/packages/firestore/compat/index.rn.ts b/packages/firestore/compat/index.rn.ts
index a07370c6adb..f4c40d1712b 100644
--- a/packages/firestore/compat/index.rn.ts
+++ b/packages/firestore/compat/index.rn.ts
@@ -24,12 +24,14 @@ import { Firestore, IndexedDbPersistenceProvider } from '../src/api/database';
 import { registerBundle } from './bundle';
 import { configureForFirebase } from './config';
 import { name, version } from './package.json';
-
+import { version as SDK_VERSION } from '../../../packages-exp/firebase-exp/package.json';
+import { setSDKVersion } from '../src/core/version';
 /**
  * Registers the main Firestore ReactNative build with the components framework.
  * Persistence can be enabled via `firebase.firestore().enablePersistence()`.
  */
 export function registerFirestore(instance: FirebaseNamespace): void {
+  setSDKVersion(version);
   configureForFirebase(
     instance,
     (app, firestoreExp) =>
diff --git a/packages/firestore/compat/index.ts b/packages/firestore/compat/index.ts
index e35b68d823b..ece35693be7 100644
--- a/packages/firestore/compat/index.ts
+++ b/packages/firestore/compat/index.ts
@@ -25,14 +25,16 @@ import { Firestore, IndexedDbPersistenceProvider } from '../src/api/database';
 import { registerBundle } from './bundle';
 import { configureForFirebase } from './config';
 import { name, version } from './package.json';
-
+import { version as SDK_VERSION } from '../../../packages-exp/firebase-exp/package.json';
 import '../register-module';
+import { setSDKVersion } from '../src/core/version';
 
 /**
  * Registers the main Firestore build with the components framework.
  * Persistence can be enabled via `firebase.firestore().enablePersistence()`.
  */
 export function registerFirestore(instance: FirebaseNamespace): void {
+  setSDKVersion(SDK_VERSION);
   configureForFirebase(
     instance,
     (app, firestoreExp) =>

From 4ac6a79aebabff73f3a5a3c129bc14903ddab008 Mon Sep 17 00:00:00 2001
From: Feiyang1 <plane1113@gmail.com>
Date: Tue, 27 Apr 2021 16:24:58 -0700
Subject: [PATCH 03/10] use SDK_VERSION from app-exp

---
 packages/database/exp/register.ts       | 8 +++++++-
 packages/firestore/compat/index.node.ts | 3 +--
 packages/firestore/compat/index.rn.ts   | 3 +--
 packages/firestore/compat/index.ts      | 3 +--
 packages/firestore/exp/register.ts      | 7 +++++--
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/packages/database/exp/register.ts b/packages/database/exp/register.ts
index 45aafe51fa3..a612a9f2907 100644
--- a/packages/database/exp/register.ts
+++ b/packages/database/exp/register.ts
@@ -16,7 +16,11 @@
  */
 
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { _registerComponent, registerVersion } from '@firebase/app-exp';
+import {
+  _registerComponent,
+  registerVersion,
+  SDK_VERSION
+} from '@firebase/app-exp';
 import { Component, ComponentType } from '@firebase/component';
 
 import { name, version } from '../package.json';
@@ -24,6 +28,7 @@ import {
   FirebaseDatabase,
   repoManagerDatabaseFromApp
 } from '../src/exp/Database';
+import { setSDKVersion } from '../src/core/version';
 
 declare module '@firebase/component' {
   interface NameServiceMapping {
@@ -32,6 +37,7 @@ declare module '@firebase/component' {
 }
 
 export function registerDatabase(variant?: string): void {
+  setSDKVersion(SDK_VERSION);
   _registerComponent(
     new Component(
       'database-exp',
diff --git a/packages/firestore/compat/index.node.ts b/packages/firestore/compat/index.node.ts
index c592b7e7d4b..5e609678dd6 100644
--- a/packages/firestore/compat/index.node.ts
+++ b/packages/firestore/compat/index.node.ts
@@ -24,7 +24,6 @@ import { Firestore, IndexedDbPersistenceProvider } from '../src/api/database';
 import { registerBundle } from './bundle';
 import { configureForFirebase } from './config';
 import { name, version } from './package.json';
-import { version as SDK_VERSION } from '../../../packages-exp/firebase-exp/package.json';
 import { setSDKVersion } from '../src/core/version';
 
 /**
@@ -32,7 +31,7 @@ import { setSDKVersion } from '../src/core/version';
  * Persistence can be enabled via `firebase.firestore().enablePersistence()`.
  */
 export function registerFirestore(instance: FirebaseNamespace): void {
-  setSDKVersion(SDK_VERSION);
+  setSDKVersion(instance.SDK_VERSION);
   configureForFirebase(
     instance,
     (app, firestoreExp) =>
diff --git a/packages/firestore/compat/index.rn.ts b/packages/firestore/compat/index.rn.ts
index f4c40d1712b..b0013d4094d 100644
--- a/packages/firestore/compat/index.rn.ts
+++ b/packages/firestore/compat/index.rn.ts
@@ -24,14 +24,13 @@ import { Firestore, IndexedDbPersistenceProvider } from '../src/api/database';
 import { registerBundle } from './bundle';
 import { configureForFirebase } from './config';
 import { name, version } from './package.json';
-import { version as SDK_VERSION } from '../../../packages-exp/firebase-exp/package.json';
 import { setSDKVersion } from '../src/core/version';
 /**
  * Registers the main Firestore ReactNative build with the components framework.
  * Persistence can be enabled via `firebase.firestore().enablePersistence()`.
  */
 export function registerFirestore(instance: FirebaseNamespace): void {
-  setSDKVersion(version);
+  setSDKVersion(instance.SDK_VERSION);
   configureForFirebase(
     instance,
     (app, firestoreExp) =>
diff --git a/packages/firestore/compat/index.ts b/packages/firestore/compat/index.ts
index ece35693be7..a1044194601 100644
--- a/packages/firestore/compat/index.ts
+++ b/packages/firestore/compat/index.ts
@@ -25,7 +25,6 @@ import { Firestore, IndexedDbPersistenceProvider } from '../src/api/database';
 import { registerBundle } from './bundle';
 import { configureForFirebase } from './config';
 import { name, version } from './package.json';
-import { version as SDK_VERSION } from '../../../packages-exp/firebase-exp/package.json';
 import '../register-module';
 import { setSDKVersion } from '../src/core/version';
 
@@ -34,7 +33,7 @@ import { setSDKVersion } from '../src/core/version';
  * Persistence can be enabled via `firebase.firestore().enablePersistence()`.
  */
 export function registerFirestore(instance: FirebaseNamespace): void {
-  setSDKVersion(SDK_VERSION);
+  setSDKVersion(instance.SDK_VERSION);
   configureForFirebase(
     instance,
     (app, firestoreExp) =>
diff --git a/packages/firestore/exp/register.ts b/packages/firestore/exp/register.ts
index 4e75e6371c1..9f127e883db 100644
--- a/packages/firestore/exp/register.ts
+++ b/packages/firestore/exp/register.ts
@@ -15,11 +15,14 @@
  * limitations under the License.
  */
 
-import { _registerComponent, registerVersion } from '@firebase/app-exp';
+import {
+  _registerComponent,
+  registerVersion,
+  SDK_VERSION
+} from '@firebase/app-exp';
 import { Component, ComponentType } from '@firebase/component';
 
 import { name, version } from '../package.json';
-import { version as SDK_VERSION } from '../../../packages-exp/firebase-exp/package.json';
 import { FirebaseFirestore } from '../src/exp/database';
 import { Settings } from '../src/exp/settings';
 import { setSDKVersion } from '../src/core/version';

From a78043f5ab9b98c689e2fc7fe1fb723032182300 Mon Sep 17 00:00:00 2001
From: Feiyang1 <plane1113@gmail.com>
Date: Tue, 27 Apr 2021 16:49:30 -0700
Subject: [PATCH 04/10] use v8 version by default

---
 packages/firestore/index.console.ts     | 4 ----
 packages/firestore/index.memory.ts      | 3 ---
 packages/firestore/index.node.memory.ts | 3 ---
 packages/firestore/index.node.ts        | 3 ---
 packages/firestore/index.rn.memory.ts   | 3 ---
 packages/firestore/index.rn.ts          | 3 ---
 packages/firestore/index.ts             | 3 ---
 packages/firestore/src/core/version.ts  | 3 ++-
 8 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/packages/firestore/index.console.ts b/packages/firestore/index.console.ts
index 6422214167e..b93a346feff 100644
--- a/packages/firestore/index.console.ts
+++ b/packages/firestore/index.console.ts
@@ -23,10 +23,8 @@ import {
   MemoryPersistenceProvider
 } from './src/api/database';
 import { DatabaseId } from './src/core/database_info';
-import { setSDKVersion } from './src/core/version';
 import { FirebaseFirestore as FirestoreExp } from './src/exp/database';
 import { Code, FirestoreError } from './src/util/error';
-import { version as SDK_VERSION } from '../firebase/package.json';
 export {
   CollectionReference,
   DocumentReference,
@@ -73,5 +71,3 @@ function databaseIdFromFirestoreDatabase(
     firestoreDatabase.database
   );
 }
-
-setSDKVersion(SDK_VERSION);
diff --git a/packages/firestore/index.memory.ts b/packages/firestore/index.memory.ts
index 1f66f1696e5..2a603e49c28 100644
--- a/packages/firestore/index.memory.ts
+++ b/packages/firestore/index.memory.ts
@@ -18,7 +18,6 @@
 import firebase from '@firebase/app';
 import { FirebaseNamespace } from '@firebase/app-types';
 
-import { version as SDK_VERSION } from '../firebase/package.json';
 import {
   Firestore,
   MemoryPersistenceProvider,
@@ -28,13 +27,11 @@ import { name, version } from './package.json';
 import { configureForFirebase } from './src/config';
 
 import './register-module';
-import { setSDKVersion } from './src/core/version';
 
 /**
  * Registers the memory-only Firestore build with the components framework.
  */
 export function registerFirestore(instance: FirebaseNamespace): void {
-  setSDKVersion(SDK_VERSION);
   configureForFirebase(
     instance,
     (app, auth) =>
diff --git a/packages/firestore/index.node.memory.ts b/packages/firestore/index.node.memory.ts
index 0984e811521..1f1023847d1 100644
--- a/packages/firestore/index.node.memory.ts
+++ b/packages/firestore/index.node.memory.ts
@@ -18,21 +18,18 @@
 import firebase from '@firebase/app';
 import { FirebaseNamespace } from '@firebase/app-types';
 
-import { version as SDK_VERSION } from '../firebase/package.json';
 import { name, version } from './package.json';
 import { Firestore, MemoryPersistenceProvider } from './src/api/database';
 import { configureForFirebase } from './src/config';
 import { FirebaseFirestore } from './src/exp/database';
 
 import './register-module';
-import { setSDKVersion } from './src/core/version';
 
 /**
  * Registers the memory-only Firestore build for Node with the components
  * framework.
  */
 export function registerFirestore(instance: FirebaseNamespace): void {
-  setSDKVersion(SDK_VERSION);
   configureForFirebase(
     instance,
     (app, auth) =>
diff --git a/packages/firestore/index.node.ts b/packages/firestore/index.node.ts
index c34572390e0..0cf9ebe41bb 100644
--- a/packages/firestore/index.node.ts
+++ b/packages/firestore/index.node.ts
@@ -17,21 +17,18 @@
 import firebase from '@firebase/app';
 import { FirebaseNamespace } from '@firebase/app-types';
 
-import { version as SDK_VERSION } from '../firebase/package.json';
 import { name, version } from './package.json';
 import { Firestore, IndexedDbPersistenceProvider } from './src/api/database';
 import { configureForFirebase } from './src/config';
 import { FirebaseFirestore as ExpFirebaseFirestore } from './src/exp/database';
 
 import './register-module';
-import { setSDKVersion } from './src/core/version';
 
 /**
  * Registers the main Firestore Node build with the components framework.
  * Persistence can be enabled via `firebase.firestore().enablePersistence()`.
  */
 export function registerFirestore(instance: FirebaseNamespace): void {
-  setSDKVersion(SDK_VERSION);
   configureForFirebase(
     instance,
     (app, auth) =>
diff --git a/packages/firestore/index.rn.memory.ts b/packages/firestore/index.rn.memory.ts
index cab1028a4a9..d6b2e782e7a 100644
--- a/packages/firestore/index.rn.memory.ts
+++ b/packages/firestore/index.rn.memory.ts
@@ -25,17 +25,14 @@ import {
 } from './export';
 import { name, version } from './package.json';
 import { configureForFirebase } from './src/config';
-import { version as SDK_VERSION } from '../firebase/package.json';
 
 import './register-module';
-import { setSDKVersion } from './src/core/version';
 
 /**
  * Registers the memory-only Firestore build for ReactNative with the components
  * framework.
  */
 export function registerFirestore(instance: FirebaseNamespace): void {
-  setSDKVersion(SDK_VERSION);
   configureForFirebase(
     instance,
     (app, auth) =>
diff --git a/packages/firestore/index.rn.ts b/packages/firestore/index.rn.ts
index f045611f7c5..46f9ae67020 100644
--- a/packages/firestore/index.rn.ts
+++ b/packages/firestore/index.rn.ts
@@ -24,17 +24,14 @@ import {
 } from './export';
 import { name, version } from './package.json';
 import { configureForFirebase } from './src/config';
-import { version as SDK_VERSION } from '../firebase/package.json';
 
 import './register-module';
-import { setSDKVersion } from './src/core/version';
 
 /**
  * Registers the main Firestore ReactNative build with the components framework.
  * Persistence can be enabled via `firebase.firestore().enablePersistence()`.
  */
 export function registerFirestore(instance: FirebaseNamespace): void {
-  setSDKVersion(SDK_VERSION);
   configureForFirebase(
     instance,
     (app, auth) =>
diff --git a/packages/firestore/index.ts b/packages/firestore/index.ts
index e0248b81013..aeb96e7ea8f 100644
--- a/packages/firestore/index.ts
+++ b/packages/firestore/index.ts
@@ -25,17 +25,14 @@ import {
 } from './export';
 import { name, version } from './package.json';
 import { configureForFirebase } from './src/config';
-import { version as SDK_VERSION } from '../firebase/package.json';
 
 import './register-module';
-import { setSDKVersion } from './src/core/version';
 
 /**
  * Registers the main Firestore build with the components framework.
  * Persistence can be enabled via `firebase.firestore().enablePersistence()`.
  */
 export function registerFirestore(instance: FirebaseNamespace): void {
-  setSDKVersion(SDK_VERSION);
   configureForFirebase(
     instance,
     (app, auth) =>
diff --git a/packages/firestore/src/core/version.ts b/packages/firestore/src/core/version.ts
index 36502f3abc0..27f3ffc5589 100644
--- a/packages/firestore/src/core/version.ts
+++ b/packages/firestore/src/core/version.ts
@@ -16,7 +16,8 @@
  */
 
 /** The semver (www.semver.org) version of the SDK. */
-export let SDK_VERSION = '';
+import { version } from '../../../firebase/package.json';
+export let SDK_VERSION = version;
 export function setSDKVersion(version: string): void {
   SDK_VERSION = version;
 }

From 74fb5d3762561c5037bdc2fcd11575e075adef49 Mon Sep 17 00:00:00 2001
From: Feiyang1 <plane1113@gmail.com>
Date: Tue, 27 Apr 2021 16:58:37 -0700
Subject: [PATCH 05/10] update lite

---
 packages/firestore/lite/register.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/firestore/lite/register.ts b/packages/firestore/lite/register.ts
index 439eb51cce7..6b7650c63f2 100644
--- a/packages/firestore/lite/register.ts
+++ b/packages/firestore/lite/register.ts
@@ -15,10 +15,13 @@
  * limitations under the License.
  */
 
-import { _registerComponent, registerVersion } from '@firebase/app-exp';
+import {
+  _registerComponent,
+  registerVersion,
+  SDK_VERSION
+} from '@firebase/app-exp';
 import { Component, ComponentType } from '@firebase/component';
 
-import { version as SDK_VERSION } from '../../../packages-exp/firebase-exp/package.json';
 import { version } from '../package.json';
 import { setSDKVersion } from '../src/core/version';
 import { FirebaseFirestore } from '../src/lite/database';

From 8740edb71e1a6386ad398904ffc4ff203d3f9f90 Mon Sep 17 00:00:00 2001
From: Feiyang1 <plane1113@gmail.com>
Date: Tue, 27 Apr 2021 18:38:22 -0700
Subject: [PATCH 06/10] update lock

---
 yarn.lock | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 7cd52158485..11009a5f49f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1196,6 +1196,11 @@
   resolved "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.6.1.tgz#dcbd23030a71c0c74fc95d4a3f75ba81653850e9"
   integrity sha512-L/ZnJRAq7F++utfuoTKX4CLBG5YR7tFO3PLzG1/oXXKEezJ0kRL3CMRoueBEmTCzVb/6SIs2Qlaw++uDgi5Xyg==
 
+"@firebase/auth-interop-types@0.1.5":
+  version "0.1.5"
+  resolved "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.1.5.tgz#9fc9bd7c879f16b8d1bb08373a0f48c3a8b74557"
+  integrity sha512-88h74TMQ6wXChPA6h9Q3E1Jg6TkTHep2+k63OWg3s0ozyGVMeY+TTOti7PFPzq5RhszQPQOoCi59es4MaRvgCw==
+
 "@firebase/component@0.1.21":
   version "0.1.21"
   resolved "https://registry.npmjs.org/@firebase/component/-/component-0.1.21.tgz#56062eb0d449dc1e7bbef3c084a9b5fa48c7c14d"
@@ -7482,8 +7487,8 @@ firebase-admin@9.4.2:
     "@firebase/app-exp" "0.0.900"
     "@firebase/auth-compat" "0.0.900"
     "@firebase/auth-exp" "0.0.900"
-    "@firebase/database" "0.9.10"
-    "@firebase/firestore" "2.2.4"
+    "@firebase/database" "0.9.11"
+    "@firebase/firestore" "2.2.5"
     "@firebase/functions-compat" "0.0.900"
     "@firebase/functions-exp" "0.0.900"
     "@firebase/messaging-compat" "0.0.900"
@@ -7492,7 +7497,7 @@ firebase-admin@9.4.2:
     "@firebase/performance-exp" "0.0.900"
     "@firebase/remote-config-compat" "0.0.900"
     "@firebase/remote-config-exp" "0.0.900"
-    "@firebase/storage" "0.5.0"
+    "@firebase/storage" "0.5.1"
 
 firebase-functions@3.13.0:
   version "3.13.0"

From 4754c25d5d37ca0260909afbc1b22dda17e33a47 Mon Sep 17 00:00:00 2001
From: Feiyang1 <plane1113@gmail.com>
Date: Tue, 27 Apr 2021 19:00:20 -0700
Subject: [PATCH 07/10] fix lint errors

---
 packages/database/exp/register.ts       | 2 +-
 packages/firestore/compat/index.node.ts | 2 +-
 packages/firestore/compat/index.rn.ts   | 2 +-
 packages/firestore/compat/index.ts      | 3 ++-
 packages/firestore/exp/register.ts      | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/database/exp/register.ts b/packages/database/exp/register.ts
index a612a9f2907..410f4e12ae0 100644
--- a/packages/database/exp/register.ts
+++ b/packages/database/exp/register.ts
@@ -24,11 +24,11 @@ import {
 import { Component, ComponentType } from '@firebase/component';
 
 import { name, version } from '../package.json';
+import { setSDKVersion } from '../src/core/version';
 import {
   FirebaseDatabase,
   repoManagerDatabaseFromApp
 } from '../src/exp/Database';
-import { setSDKVersion } from '../src/core/version';
 
 declare module '@firebase/component' {
   interface NameServiceMapping {
diff --git a/packages/firestore/compat/index.node.ts b/packages/firestore/compat/index.node.ts
index 5e609678dd6..21ecd90dbf1 100644
--- a/packages/firestore/compat/index.node.ts
+++ b/packages/firestore/compat/index.node.ts
@@ -20,11 +20,11 @@ import firebase from '@firebase/app-compat';
 import { FirebaseNamespace } from '@firebase/app-types';
 
 import { Firestore, IndexedDbPersistenceProvider } from '../src/api/database';
+import { setSDKVersion } from '../src/core/version';
 
 import { registerBundle } from './bundle';
 import { configureForFirebase } from './config';
 import { name, version } from './package.json';
-import { setSDKVersion } from '../src/core/version';
 
 /**
  * Registers the main Firestore Node build with the components framework.
diff --git a/packages/firestore/compat/index.rn.ts b/packages/firestore/compat/index.rn.ts
index b0013d4094d..32f2e0dab4a 100644
--- a/packages/firestore/compat/index.rn.ts
+++ b/packages/firestore/compat/index.rn.ts
@@ -20,11 +20,11 @@ import firebase from '@firebase/app-compat';
 import { FirebaseNamespace } from '@firebase/app-types';
 
 import { Firestore, IndexedDbPersistenceProvider } from '../src/api/database';
+import { setSDKVersion } from '../src/core/version';
 
 import { registerBundle } from './bundle';
 import { configureForFirebase } from './config';
 import { name, version } from './package.json';
-import { setSDKVersion } from '../src/core/version';
 /**
  * Registers the main Firestore ReactNative build with the components framework.
  * Persistence can be enabled via `firebase.firestore().enablePersistence()`.
diff --git a/packages/firestore/compat/index.ts b/packages/firestore/compat/index.ts
index a1044194601..9084fe34150 100644
--- a/packages/firestore/compat/index.ts
+++ b/packages/firestore/compat/index.ts
@@ -21,12 +21,13 @@ import { FirebaseNamespace } from '@firebase/app-types';
 import * as types from '@firebase/firestore-types';
 
 import { Firestore, IndexedDbPersistenceProvider } from '../src/api/database';
+import { setSDKVersion } from '../src/core/version';
 
 import { registerBundle } from './bundle';
 import { configureForFirebase } from './config';
 import { name, version } from './package.json';
+
 import '../register-module';
-import { setSDKVersion } from '../src/core/version';
 
 /**
  * Registers the main Firestore build with the components framework.
diff --git a/packages/firestore/exp/register.ts b/packages/firestore/exp/register.ts
index 9f127e883db..20f54426322 100644
--- a/packages/firestore/exp/register.ts
+++ b/packages/firestore/exp/register.ts
@@ -23,9 +23,9 @@ import {
 import { Component, ComponentType } from '@firebase/component';
 
 import { name, version } from '../package.json';
+import { setSDKVersion } from '../src/core/version';
 import { FirebaseFirestore } from '../src/exp/database';
 import { Settings } from '../src/exp/settings';
-import { setSDKVersion } from '../src/core/version';
 
 declare module '@firebase/component' {
   interface NameServiceMapping {

From 182d4063feed7b5702deee4dca57cc8c5cd9f868 Mon Sep 17 00:00:00 2001
From: Feiyang1 <plane1113@gmail.com>
Date: Wed, 28 Apr 2021 10:15:31 -0700
Subject: [PATCH 08/10] address comments

---
 packages/database/exp/register.ts   | 2 +-
 packages/firestore/lite/register.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/database/exp/register.ts b/packages/database/exp/register.ts
index 410f4e12ae0..1f75347d813 100644
--- a/packages/database/exp/register.ts
+++ b/packages/database/exp/register.ts
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-// eslint-disable-next-line import/no-extraneous-dependencies
 import {
   _registerComponent,
   registerVersion,
   SDK_VERSION
+  // eslint-disable-next-line import/no-extraneous-dependencies
 } from '@firebase/app-exp';
 import { Component, ComponentType } from '@firebase/component';
 
diff --git a/packages/firestore/lite/register.ts b/packages/firestore/lite/register.ts
index 6b7650c63f2..e753a3d216b 100644
--- a/packages/firestore/lite/register.ts
+++ b/packages/firestore/lite/register.ts
@@ -34,7 +34,7 @@ declare module '@firebase/component' {
 }
 
 export function registerFirestore(): void {
-  setSDKVersion(SDK_VERSION);
+  setSDKVersion(`${SDK_VERSION}_lite`);
   _registerComponent(
     new Component(
       'firestore/lite',

From 86a70f953cd7b6554c35bc37a5aa23b7df65d5fc Mon Sep 17 00:00:00 2001
From: Feiyang1 <plane1113@gmail.com>
Date: Mon, 3 May 2021 22:11:01 -0700
Subject: [PATCH 09/10] get SDK_VERSION value correctly

---
 packages/firestore/src/remote/rest_connection.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/firestore/src/remote/rest_connection.ts b/packages/firestore/src/remote/rest_connection.ts
index 0ed08673a91..4df01705407 100644
--- a/packages/firestore/src/remote/rest_connection.ts
+++ b/packages/firestore/src/remote/rest_connection.ts
@@ -39,8 +39,12 @@ RPC_NAME_URL_MAPPING['Commit'] = 'commit';
 RPC_NAME_URL_MAPPING['RunQuery'] = 'runQuery';
 
 const RPC_URL_VERSION = 'v1';
-const X_GOOG_API_CLIENT_VALUE = 'gl-js/ fire/' + SDK_VERSION;
 
+// SDK_VERSION is updated to different value at runtime depending on the entry point,
+// so we need to get its value when we need it in a function.
+function getGoogApiClientValue() {
+  return 'gl-js/ fire/' + SDK_VERSION;
+}
 /**
  * Base class for all Rest-based connections to the backend (WebChannel and
  * HTTP).
@@ -118,7 +122,7 @@ export abstract class RestConnection implements Connection {
     headers: StringMap,
     token: Token | null
   ): void {
-    headers['X-Goog-Api-Client'] = X_GOOG_API_CLIENT_VALUE;
+    headers['X-Goog-Api-Client'] = getGoogApiClientValue();
 
     // Content-Type: text/plain will avoid preflight requests which might
     // mess with CORS and redirects by proxies. If we add custom headers

From 646df6ca2f3f19ee8e21fcc689fa9a07867db22d Mon Sep 17 00:00:00 2001
From: Feiyang1 <plane1113@gmail.com>
Date: Mon, 3 May 2021 22:22:27 -0700
Subject: [PATCH 10/10] fix lint

---
 packages/firestore/src/remote/rest_connection.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/firestore/src/remote/rest_connection.ts b/packages/firestore/src/remote/rest_connection.ts
index 4df01705407..2f4b75e192b 100644
--- a/packages/firestore/src/remote/rest_connection.ts
+++ b/packages/firestore/src/remote/rest_connection.ts
@@ -42,7 +42,7 @@ const RPC_URL_VERSION = 'v1';
 
 // SDK_VERSION is updated to different value at runtime depending on the entry point,
 // so we need to get its value when we need it in a function.
-function getGoogApiClientValue() {
+function getGoogApiClientValue(): string {
   return 'gl-js/ fire/' + SDK_VERSION;
 }
 /**