From e7a8fe57e728f2d6564643f252a0c94d93a0b73c Mon Sep 17 00:00:00 2001 From: Feiyang1 Date: Fri, 27 Aug 2021 15:55:44 -0700 Subject: [PATCH 1/4] remove named export from app-compat --- packages/analytics-compat/src/service.test.ts | 2 +- packages/app-check-compat/src/service.test.ts | 8 ++++---- packages/app-compat/src/index.lite.ts | 2 +- packages/app-compat/src/index.ts | 2 +- packages/functions-compat/src/callable.test.ts | 2 +- packages/functions-compat/src/index.node.ts | 2 +- packages/functions-compat/src/service.test.ts | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/analytics-compat/src/service.test.ts b/packages/analytics-compat/src/service.test.ts index 958f97c525c..30598025d61 100644 --- a/packages/analytics-compat/src/service.test.ts +++ b/packages/analytics-compat/src/service.test.ts @@ -16,7 +16,7 @@ */ import { expect, use } from 'chai'; import { AnalyticsService } from './service'; -import { firebase, FirebaseApp } from '@firebase/app-compat'; +import firebase, { FirebaseApp } from '@firebase/app-compat'; import * as analyticsExp from '@firebase/analytics'; import { stub, match, SinonStub } from 'sinon'; import * as sinonChai from 'sinon-chai'; diff --git a/packages/app-check-compat/src/service.test.ts b/packages/app-check-compat/src/service.test.ts index 79c86043fdb..b10e45d3f11 100644 --- a/packages/app-check-compat/src/service.test.ts +++ b/packages/app-check-compat/src/service.test.ts @@ -16,7 +16,7 @@ */ import { expect, use } from 'chai'; import { AppCheckService } from './service'; -import { firebase, FirebaseApp } from '@firebase/app-compat'; +import firebase, { FirebaseApp } from '@firebase/app-compat'; import * as appCheckExp from '@firebase/app-check'; import { stub, match, SinonStub } from 'sinon'; import * as sinonChai from 'sinon-chai'; @@ -65,7 +65,7 @@ describe('Firebase App Check > Service', () => { it( 'activate("string") calls modular initializeAppCheck() with a ' + - 'ReCaptchaV3Provider', + 'ReCaptchaV3Provider', () => { const initializeAppCheckStub = stub(appCheckExp, 'initializeAppCheck'); service = new AppCheckService(app); @@ -80,7 +80,7 @@ describe('Firebase App Check > Service', () => { it( 'activate(CustomProvider) calls modular initializeAppCheck() with' + - ' a CustomProvider', + ' a CustomProvider', () => { const initializeAppCheckStub = stub(appCheckExp, 'initializeAppCheck'); service = new AppCheckService(app); @@ -167,7 +167,7 @@ describe('Firebase App Check > Service', () => { it('onTokenChanged() throws if activate() has not been called', async () => { service = createTestService(app); - expect(() => service.onTokenChanged(() => {})).to.throw( + expect(() => service.onTokenChanged(() => { })).to.throw( AppCheckError.USE_BEFORE_ACTIVATION ); }); diff --git a/packages/app-compat/src/index.lite.ts b/packages/app-compat/src/index.lite.ts index c411c425822..fa79dd77a54 100644 --- a/packages/app-compat/src/index.lite.ts +++ b/packages/app-compat/src/index.lite.ts @@ -18,7 +18,7 @@ import { createFirebaseNamespaceLite } from './lite/firebaseNamespaceLite'; import { registerCoreComponents } from './registerCoreComponents'; -export const firebase = createFirebaseNamespaceLite(); +const firebase = createFirebaseNamespaceLite(); registerCoreComponents('lite'); diff --git a/packages/app-compat/src/index.ts b/packages/app-compat/src/index.ts index 2a3ae0a9a84..42b5f5a154a 100644 --- a/packages/app-compat/src/index.ts +++ b/packages/app-compat/src/index.ts @@ -39,7 +39,7 @@ if (isBrowser() && (self as any).firebase !== undefined) { } } -export const firebase = firebaseNamespace; +const firebase = firebaseNamespace; registerCoreComponents(); diff --git a/packages/functions-compat/src/callable.test.ts b/packages/functions-compat/src/callable.test.ts index bd7f70b9e98..cf7c58090fe 100644 --- a/packages/functions-compat/src/callable.test.ts +++ b/packages/functions-compat/src/callable.test.ts @@ -17,7 +17,7 @@ import { expect } from 'chai'; import { FunctionsErrorCode } from '@firebase/functions'; import { createTestService } from '../test/utils'; -import { firebase, FirebaseApp } from '@firebase/app-compat'; +import firebase, { FirebaseApp } from '@firebase/app-compat'; // eslint-disable-next-line @typescript-eslint/no-require-imports export const TEST_PROJECT = require('../../../config/project.json'); diff --git a/packages/functions-compat/src/index.node.ts b/packages/functions-compat/src/index.node.ts index f560f4aa251..e7b3c108ac4 100644 --- a/packages/functions-compat/src/index.node.ts +++ b/packages/functions-compat/src/index.node.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { firebase } from '@firebase/app-compat'; +import firebase from '@firebase/app-compat'; import { name, version } from '../package.json'; import { registerFunctions } from './register'; diff --git a/packages/functions-compat/src/service.test.ts b/packages/functions-compat/src/service.test.ts index 4ff312dd246..5a77e16b8e2 100644 --- a/packages/functions-compat/src/service.test.ts +++ b/packages/functions-compat/src/service.test.ts @@ -17,7 +17,7 @@ import { expect, use } from 'chai'; import { createTestService } from '../test/utils'; import { FunctionsService } from './service'; -import { firebase, FirebaseApp } from '@firebase/app-compat'; +import firebase, { FirebaseApp } from '@firebase/app-compat'; import * as functionsExp from '@firebase/functions'; import { stub, match, SinonStub } from 'sinon'; import * as sinonChai from 'sinon-chai'; From 2267889fb4d38ca099397b177747cb0853d87c46 Mon Sep 17 00:00:00 2001 From: Feiyang1 Date: Fri, 27 Aug 2021 15:57:30 -0700 Subject: [PATCH 2/4] cjs build --- .changeset/eleven-swans-drive.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .changeset/eleven-swans-drive.md diff --git a/.changeset/eleven-swans-drive.md b/.changeset/eleven-swans-drive.md new file mode 100644 index 00000000000..9fefcfbc4b5 --- /dev/null +++ b/.changeset/eleven-swans-drive.md @@ -0,0 +1,8 @@ +--- +'@firebase/analytics-compat': patch +'@firebase/app-check-compat': patch +'@firebase/app-compat': patch +'@firebase/functions-compat': patch +--- + +cjs build From b6be026a95ce8196ba8b771c93c9154855135ccd Mon Sep 17 00:00:00 2001 From: Feiyang1 Date: Fri, 27 Aug 2021 16:10:58 -0700 Subject: [PATCH 3/4] firestoer lite export --- .changeset/eleven-swans-drive.md | 1 + packages/firestore/package.json | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/.changeset/eleven-swans-drive.md b/.changeset/eleven-swans-drive.md index 9fefcfbc4b5..ebda46bf873 100644 --- a/.changeset/eleven-swans-drive.md +++ b/.changeset/eleven-swans-drive.md @@ -3,6 +3,7 @@ '@firebase/app-check-compat': patch '@firebase/app-compat': patch '@firebase/functions-compat': patch +'@firebase/firestore': patch --- cjs build diff --git a/packages/firestore/package.json b/packages/firestore/package.json index eaf55e65f55..eaf5cc9723c 100644 --- a/packages/firestore/package.json +++ b/packages/firestore/package.json @@ -45,6 +45,16 @@ "test:prepare": "node ./scripts/prepare-test.js", "typings:public": "node ../../scripts/exp/use_typings.js ./dist/index.d.ts" }, + "exports": { + ".": { + "node": "./dist/index.node.cjs.js", + "default": "./dist/index.esm2017.js" + }, + "./lite": { + "node": "./dist/lite/index.node.cjs.js", + "default": "./dist/lite/index.browser.esm2017.js" + } + }, "main": "dist/index.node.cjs.js", "main-esm": "dist/index.node.cjs.esm2017.js", "react-native": "dist/index.rn.js", From 7db1aac6c6c5ae914238299c96e56e5518b32e3f Mon Sep 17 00:00:00 2001 From: Feiyang1 Date: Fri, 27 Aug 2021 17:06:11 -0700 Subject: [PATCH 4/4] changeset --- .changeset/eleven-swans-drive.md | 3 +-- .changeset/late-bobcats-swim.md | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 .changeset/late-bobcats-swim.md diff --git a/.changeset/eleven-swans-drive.md b/.changeset/eleven-swans-drive.md index ebda46bf873..aebabc31bfc 100644 --- a/.changeset/eleven-swans-drive.md +++ b/.changeset/eleven-swans-drive.md @@ -3,7 +3,6 @@ '@firebase/app-check-compat': patch '@firebase/app-compat': patch '@firebase/functions-compat': patch -'@firebase/firestore': patch --- -cjs build +Fix cjs builds by removing the named export from app-compat diff --git a/.changeset/late-bobcats-swim.md b/.changeset/late-bobcats-swim.md new file mode 100644 index 00000000000..25469a654de --- /dev/null +++ b/.changeset/late-bobcats-swim.md @@ -0,0 +1,5 @@ +--- +'@firebase/firestore': patch +--- + +Make firestore/lite available in nodejs