Skip to content

Commit 318d9bf

Browse files
authored
Support default app in the modular SDK (#4702)
* support default app * fix lint error
1 parent 5ae52a0 commit 318d9bf

File tree

11 files changed

+39
-23
lines changed

11 files changed

+39
-23
lines changed

packages-exp/analytics-exp/src/api.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* limitations under the License.
1818
*/
1919

20-
import { _getProvider, FirebaseApp } from '@firebase/app-exp';
20+
import { _getProvider, FirebaseApp, getApp } from '@firebase/app-exp';
2121
import {
2222
Analytics,
2323
AnalyticsCallOptions,
@@ -63,7 +63,7 @@ declare module '@firebase/component' {
6363
*
6464
* @param app - The FirebaseApp to use.
6565
*/
66-
export function getAnalytics(app: FirebaseApp): Analytics {
66+
export function getAnalytics(app: FirebaseApp = getApp()): Analytics {
6767
app = getModularInstance(app);
6868
// Dependencies
6969
const analyticsProvider: Provider<'analytics-exp'> = _getProvider(

packages-exp/auth-exp/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
import { FirebaseApp, _getProvider } from '@firebase/app-exp';
18+
import { FirebaseApp, getApp, _getProvider } from '@firebase/app-exp';
1919

2020
import { initializeAuth } from './src';
2121
import { registerAuth } from './src/core/auth/register';
@@ -118,7 +118,7 @@ export { PhoneMultiFactorGenerator } from './src/platform_browser/mfa/assertions
118118
*
119119
* @public
120120
*/
121-
export function getAuth(app: FirebaseApp): Auth {
121+
export function getAuth(app: FirebaseApp = getApp()): Auth {
122122
const provider = _getProvider(app, 'auth-exp');
123123

124124
if (provider.isInitialized()) {

packages-exp/functions-exp/src/api.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
import { _getProvider, FirebaseApp } from '@firebase/app-exp';
18+
import { _getProvider, FirebaseApp, getApp } from '@firebase/app-exp';
1919
import { FUNCTIONS_TYPE } from './constants';
2020

2121
import { Provider } from '@firebase/component';
@@ -39,7 +39,7 @@ export * from './public-types';
3939
* @public
4040
*/
4141
export function getFunctions(
42-
app: FirebaseApp,
42+
app: FirebaseApp = getApp(),
4343
regionOrCustomDomain: string = DEFAULT_REGION
4444
): Functions {
4545
// Dependencies

packages-exp/installations-exp/src/api/get-installations.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,17 @@
1515
* limitations under the License.
1616
*/
1717

18-
import { FirebaseApp, _getProvider } from '@firebase/app-exp';
18+
import { FirebaseApp, getApp, _getProvider } from '@firebase/app-exp';
1919
import { FirebaseInstallations } from '../interfaces/public-types';
2020

2121
/**
2222
* Returns an instance of FirebaseInstallations associated with the given FirebaseApp instance.
2323
*
2424
* @public
2525
*/
26-
export function getInstallations(app: FirebaseApp): FirebaseInstallations {
26+
export function getInstallations(
27+
app: FirebaseApp = getApp()
28+
): FirebaseInstallations {
2729
const installationsImpl = _getProvider(
2830
app,
2931
'installations-exp'

packages-exp/messaging-exp/src/api.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import {
2626
import { MessagingService } from './messaging-service';
2727
import { Provider } from '@firebase/component';
2828
import { deleteToken as _deleteToken } from './api/deleteToken';
29-
import { _getProvider, FirebaseApp } from '@firebase/app-exp';
29+
import { _getProvider, FirebaseApp, getApp } from '@firebase/app-exp';
3030
import { getToken as _getToken } from './api/getToken';
3131
import { onBackgroundMessage as _onBackgroundMessage } from './api/onBackgroundMessage';
3232
import { onMessage as _onMessage } from './api/onMessage';
@@ -39,7 +39,7 @@ import { getModularInstance } from '@firebase/util';
3939
*
4040
* @public
4141
*/
42-
export function getMessaging(app: FirebaseApp): FirebaseMessaging {
42+
export function getMessaging(app: FirebaseApp = getApp()): FirebaseMessaging {
4343
app = getModularInstance(app);
4444
const messagingProvider: Provider<'messaging-exp'> = _getProvider(
4545
app,

packages-exp/performance-exp/src/index.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ import {
2727
_registerComponent,
2828
_getProvider,
2929
registerVersion,
30-
FirebaseApp
30+
FirebaseApp,
31+
getApp
3132
} from '@firebase/app-exp';
3233
import {
3334
InstanceFactory,
@@ -47,7 +48,9 @@ const DEFAULT_ENTRY_NAME = '[DEFAULT]';
4748
* @param app - The FirebaseApp to use.
4849
* @public
4950
*/
50-
export function getPerformance(app: FirebaseApp): FirebasePerformance {
51+
export function getPerformance(
52+
app: FirebaseApp = getApp()
53+
): FirebasePerformance {
5154
app = getModularInstance(app);
5255
const provider = _getProvider(app, 'performance-exp');
5356
const perfInstance = provider.getImmediate() as PerformanceController;

packages-exp/remote-config-exp/src/api.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
import { _getProvider, FirebaseApp } from '@firebase/app-exp';
18+
import { _getProvider, FirebaseApp, getApp } from '@firebase/app-exp';
1919
import {
2020
LogLevel as RemoteConfigLogLevel,
2121
RemoteConfig,
@@ -36,7 +36,7 @@ import { getModularInstance } from '@firebase/util';
3636
*
3737
* @public
3838
*/
39-
export function getRemoteConfig(app: FirebaseApp): RemoteConfig {
39+
export function getRemoteConfig(app: FirebaseApp = getApp()): RemoteConfig {
4040
app = getModularInstance(app);
4141
const rcProvider = _getProvider(app, RC_COMPONENT_NAME);
4242
return rcProvider.getImmediate();

packages/database/src/exp/Database.ts

+11-3
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,13 @@
1515
* limitations under the License.
1616
*/
1717

18-
// eslint-disable-next-line import/no-extraneous-dependencies
19-
import { _FirebaseService, _getProvider, FirebaseApp } from '@firebase/app-exp';
18+
import {
19+
_FirebaseService,
20+
_getProvider,
21+
FirebaseApp,
22+
getApp
23+
// eslint-disable-next-line import/no-extraneous-dependencies
24+
} from '@firebase/app-exp';
2025
import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';
2126
import { Provider } from '@firebase/component';
2227

@@ -115,7 +120,10 @@ export { ServerValue };
115120
* provided, the SDK connects to the default instance of the Firebase App.
116121
* @returns The `FirebaseDatabase` instance of the provided app.
117122
*/
118-
export function getDatabase(app: FirebaseApp, url?: string): FirebaseDatabase {
123+
export function getDatabase(
124+
app: FirebaseApp = getApp(),
125+
url?: string
126+
): FirebaseDatabase {
119127
return _getProvider(app, 'database-exp').getImmediate({
120128
identifier: url
121129
}) as FirebaseDatabase;

packages/firestore/src/exp/database.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
import {
1919
_getProvider,
2020
_removeServiceInstance,
21-
FirebaseApp
21+
FirebaseApp,
22+
getApp
2223
// eslint-disable-next-line import/no-extraneous-dependencies
2324
} from '@firebase/app-exp';
2425
import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';
@@ -151,7 +152,7 @@ export function initializeFirestore(
151152
* instance is associated with.
152153
* @returns The `Firestore` instance of the provided app.
153154
*/
154-
export function getFirestore(app: FirebaseApp): FirebaseFirestore {
155+
export function getFirestore(app: FirebaseApp = getApp()): FirebaseFirestore {
155156
return _getProvider(app, 'firestore-exp').getImmediate() as FirebaseFirestore;
156157
}
157158

packages/firestore/src/lite/database.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
import {
1919
_getProvider,
2020
_removeServiceInstance,
21-
FirebaseApp
21+
FirebaseApp,
22+
getApp
2223
// eslint-disable-next-line import/no-extraneous-dependencies
2324
} from '@firebase/app-exp';
2425
import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';
@@ -205,7 +206,7 @@ export function initializeFirestore(
205206
* instance is associated with.
206207
* @returns The `Firestore` instance of the provided app.
207208
*/
208-
export function getFirestore(app: FirebaseApp): FirebaseFirestore {
209+
export function getFirestore(app: FirebaseApp = getApp()): FirebaseFirestore {
209210
return _getProvider(
210211
app,
211212
'firestore/lite'

packages/storage/exp/api.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717

1818
import {
1919
_getProvider,
20-
FirebaseApp
20+
FirebaseApp,
21+
getApp
2122
// eslint-disable-next-line import/no-extraneous-dependencies
2223
} from '@firebase/app-exp';
2324

@@ -290,7 +291,7 @@ export { StringFormat } from '../src/implementation/string';
290291
* @returns A Firebase StorageService instance.
291292
*/
292293
export function getStorage(
293-
app: FirebaseApp,
294+
app: FirebaseApp = getApp(),
294295
bucketUrl?: string
295296
): StorageService {
296297
app = getModularInstance(app);

0 commit comments

Comments
 (0)