From bc653d10f0b915a48cf5605fa5a9d2cd48521bd2 Mon Sep 17 00:00:00 2001 From: Michel Parpaillon Date: Thu, 16 Sep 2021 12:40:11 +0200 Subject: [PATCH 1/3] More complete example connectEmulator does not exist. It's connectFirestoreEmulator. Also I've added an example for all the others. Including auth which has different arguments (port is included in the URL) --- docs/version-7-upgrade.md | 44 +++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/docs/version-7-upgrade.md b/docs/version-7-upgrade.md index 5946e4915..1fe5f5fc6 100644 --- a/docs/version-7-upgrade.md +++ b/docs/version-7-upgrade.md @@ -42,16 +42,48 @@ In order to better support the tree-shakability introduced in Firebase v9 & to r **Modular SDK:** ```ts +import { initializeApp, provideFirebaseApp } from '@angular/fire/app'; +import { connectAuthEmulator, getAuth, provideAuth } from '@angular/fire/auth'; +import { connectDatabaseEmulator, getDatabase, provideDatabase } from '@angular/fire/database'; +import { connectFirestoreEmulator, getFirestore, provideFirestore } from '@angular/fire/firestore'; +import { connectFunctionsEmulator, getFunctions, provideFunctions } from '@angular/fire/functions'; +import { connectStorageEmulator, getStorage, provideStorage } from '@angular/fire/storage'; +import { getAnalytics, provideAnalytics } from '@angular/fire/analytics'; +import { getMessaging, provideMessaging } from '@angular/fire/messaging'; +import { getPerformance, providePerformance } from '@angular/fire/performance'; + @NgModule({ - imports: [ + imports: [ provideFirebaseApp(() => initializeApp(config)), + provideAuth(() => { + const auth = getAuth(); + if (emulator) connectAuthEmulator(auth, `localhost:${authPort}`); + return auth; + }), + provideDatabase(() => { + const database = getDatabase(); + if (emulator) connectDatabaseEmulator(database, 'localhost', databasePort); + return database; + }), + provideFunctions(() => { + const functions = getFunctions(); + if (emulator) connectFunctionsEmulator(functions, 'localhost', functionsPort); + return functions; + }), + provideStorage(() => { + const storage = getStorage(); + if (emulator) connectStorageEmulator(storage, 'localhost', storagePort); + return storage; + }), provideFirestore(() => { - const firestore = getFirestore(); - connectEmulator(firestore, 'localhost', 8080); - enableIndexedDbPersistence(firestore); - return firestore; + const firestore = getFirestore(); + if (emulator) connectFirestoreEmulator(firestore, 'localhost', firestorePort); + enableIndexedDbPersistence(firestore); + return firestore; }), - provideStorage(() => getStorage()), + provideAnalytics(() => getAnalytics()), + providePerformance(() => getPerformance()), + provideMessaging(() => getMessaging()) ], }) ``` From 0ccabf545fb7a6928a3a162fc748cc65e4bc1365 Mon Sep 17 00:00:00 2001 From: Michel Parpaillon Date: Thu, 16 Sep 2021 12:49:27 +0200 Subject: [PATCH 2/3] Added http to localhost to prevent error --- docs/version-7-upgrade.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/version-7-upgrade.md b/docs/version-7-upgrade.md index 1fe5f5fc6..9d1cff47a 100644 --- a/docs/version-7-upgrade.md +++ b/docs/version-7-upgrade.md @@ -53,31 +53,31 @@ import { getMessaging, provideMessaging } from '@angular/fire/messaging'; import { getPerformance, providePerformance } from '@angular/fire/performance'; @NgModule({ - imports: [ + imports: [ provideFirebaseApp(() => initializeApp(config)), provideAuth(() => { const auth = getAuth(); - if (emulator) connectAuthEmulator(auth, `localhost:${authPort}`); + if (emulator) connectAuthEmulator(auth, `http://localhost:${authPort}`); return auth; }), provideDatabase(() => { const database = getDatabase(); - if (emulator) connectDatabaseEmulator(database, 'localhost', databasePort); + if (emulator) connectDatabaseEmulator(database, 'http://localhost', databasePort); return database; }), provideFunctions(() => { const functions = getFunctions(); - if (emulator) connectFunctionsEmulator(functions, 'localhost', functionsPort); + if (emulator) connectFunctionsEmulator(functions, 'http://localhost', functionsPort); return functions; }), provideStorage(() => { const storage = getStorage(); - if (emulator) connectStorageEmulator(storage, 'localhost', storagePort); + if (emulator) connectStorageEmulator(storage, 'http://localhost', storagePort); return storage; }), provideFirestore(() => { const firestore = getFirestore(); - if (emulator) connectFirestoreEmulator(firestore, 'localhost', firestorePort); + if (emulator) connectFirestoreEmulator(firestore, 'http://localhost', firestorePort); enableIndexedDbPersistence(firestore); return firestore; }), From f02ccf35127fa0dab871d353a5590a5366976636 Mon Sep 17 00:00:00 2001 From: Michel Parpaillon Date: Thu, 16 Sep 2021 12:51:34 +0200 Subject: [PATCH 3/3] Only auth need the http my bad --- docs/version-7-upgrade.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/version-7-upgrade.md b/docs/version-7-upgrade.md index 9d1cff47a..244f4be8a 100644 --- a/docs/version-7-upgrade.md +++ b/docs/version-7-upgrade.md @@ -62,22 +62,22 @@ import { getPerformance, providePerformance } from '@angular/fire/performance'; }), provideDatabase(() => { const database = getDatabase(); - if (emulator) connectDatabaseEmulator(database, 'http://localhost', databasePort); + if (emulator) connectDatabaseEmulator(database, 'localhost', databasePort); return database; }), provideFunctions(() => { const functions = getFunctions(); - if (emulator) connectFunctionsEmulator(functions, 'http://localhost', functionsPort); + if (emulator) connectFunctionsEmulator(functions, 'localhost', functionsPort); return functions; }), provideStorage(() => { const storage = getStorage(); - if (emulator) connectStorageEmulator(storage, 'http://localhost', storagePort); + if (emulator) connectStorageEmulator(storage, 'localhost', storagePort); return storage; }), provideFirestore(() => { const firestore = getFirestore(); - if (emulator) connectFirestoreEmulator(firestore, 'http://localhost', firestorePort); + if (emulator) connectFirestoreEmulator(firestore, 'localhost', firestorePort); enableIndexedDbPersistence(firestore); return firestore; }),