From 0d93d7593fceeebea140d12669109dc514d247e3 Mon Sep 17 00:00:00 2001 From: Sebastian Schmidt Date: Mon, 20 Jul 2020 16:18:35 -0700 Subject: [PATCH 1/2] Use the SDK version from Firebase package.json This change is needed since the firebase-exp SDK is not meant to depend on @firebase/app --- packages/firestore/src/core/version.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/firestore/src/core/version.ts b/packages/firestore/src/core/version.ts index 77382d352c9..5d6dc71524e 100644 --- a/packages/firestore/src/core/version.ts +++ b/packages/firestore/src/core/version.ts @@ -15,7 +15,5 @@ * limitations under the License. */ -import firebase from '@firebase/app'; - /** The semver (www.semver.org) version of the SDK. */ -export const SDK_VERSION = firebase.SDK_VERSION; +export { version as SDK_VERSION } from '../../../firebase/package.json'; From 9d2ab11fa2566580489486c3987932aef5b33941 Mon Sep 17 00:00:00 2001 From: Sebastian Schmidt Date: Mon, 20 Jul 2020 18:49:37 -0700 Subject: [PATCH 2/2] Remove const from ES5 build --- packages/firestore/rollup.config.exp.js | 2 +- packages/firestore/rollup.config.lite.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/firestore/rollup.config.exp.js b/packages/firestore/rollup.config.exp.js index 8dc16535095..aaf94a82a7a 100644 --- a/packages/firestore/rollup.config.exp.js +++ b/packages/firestore/rollup.config.exp.js @@ -44,7 +44,7 @@ const nodePlugins = [ clean: true, transformers: removeAssertTransformer }), - json({ preferConst: true }) + json() ]; const browserPlugins = [ diff --git a/packages/firestore/rollup.config.lite.js b/packages/firestore/rollup.config.lite.js index 2646909d402..52a2f12f037 100644 --- a/packages/firestore/rollup.config.lite.js +++ b/packages/firestore/rollup.config.lite.js @@ -44,7 +44,7 @@ const nodePlugins = [ clean: true, transformers: removeAssertTransformer }), - json({ preferConst: true }) + json() ]; const browserPlugins = [