Skip to content

Commit ac1ac0c

Browse files
committed
support default app
1 parent 9a9f647 commit ac1ac0c

File tree

11 files changed

+37
-20
lines changed

11 files changed

+37
-20
lines changed

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

Lines changed: 2 additions & 2 deletions
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,
@@ -62,7 +62,7 @@ declare module '@firebase/component' {
6262
*
6363
* @param app - The FirebaseApp to use.
6464
*/
65-
export function getAnalytics(app: FirebaseApp): Analytics {
65+
export function getAnalytics(app: FirebaseApp = getApp()): Analytics {
6666
// Dependencies
6767
const analyticsProvider: Provider<'analytics-exp'> = _getProvider(
6868
app,

packages-exp/auth-exp/index.ts

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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';
@@ -38,7 +38,7 @@ export * from './public-types';
3838
* @public
3939
*/
4040
export function getFunctions(
41-
app: FirebaseApp,
41+
app: FirebaseApp = getApp(),
4242
regionOrCustomDomain: string = DEFAULT_REGION
4343
): Functions {
4444
// Dependencies

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

Lines changed: 4 additions & 2 deletions
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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import { _getProvider, FirebaseApp } 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';
33+
import { getApp } from '../../app-exp/dist/packages-exp/app-exp/src';
3334

3435
/**
3536
* Retrieves a firebase messaging instance.
@@ -38,7 +39,7 @@ import { onMessage as _onMessage } from './api/onMessage';
3839
*
3940
* @public
4041
*/
41-
export function getMessaging(app: FirebaseApp): FirebaseMessaging {
42+
export function getMessaging(app: FirebaseApp = getApp()): FirebaseMessaging {
4243
const messagingProvider: Provider<'messaging-exp'> = _getProvider(
4344
app,
4445
'messaging-exp'

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import {
3838
import { name, version } from '../package.json';
3939
import { Trace } from './resources/trace';
4040
import '@firebase/installations-exp';
41+
import { getApp } from '../../app-exp/dist/packages-exp/app-exp/src';
4142

4243
const DEFAULT_ENTRY_NAME = '[DEFAULT]';
4344

@@ -46,7 +47,9 @@ const DEFAULT_ENTRY_NAME = '[DEFAULT]';
4647
* @param app - The FirebaseApp to use.
4748
* @public
4849
*/
49-
export function getPerformance(app: FirebaseApp): FirebasePerformance {
50+
export function getPerformance(
51+
app: FirebaseApp = getApp()
52+
): FirebasePerformance {
5053
const provider = _getProvider(app, 'performance-exp');
5154
const perfInstance = provider.getImmediate() as PerformanceController;
5255
return perfInstance;

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

Lines changed: 2 additions & 2 deletions
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,
@@ -35,7 +35,7 @@ import { LogLevel as FirebaseLogLevel } from '@firebase/logger';
3535
*
3636
* @public
3737
*/
38-
export function getRemoteConfig(app: FirebaseApp): RemoteConfig {
38+
export function getRemoteConfig(app: FirebaseApp = getApp()): RemoteConfig {
3939
const rcProvider = _getProvider(app, RC_COMPONENT_NAME);
4040
return rcProvider.getImmediate();
4141
}

packages/database/src/exp/Database.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,12 @@
1616
*/
1717

1818
// eslint-disable-next-line import/no-extraneous-dependencies
19-
import { _FirebaseService, _getProvider, FirebaseApp } from '@firebase/app-exp';
19+
import {
20+
_FirebaseService,
21+
_getProvider,
22+
FirebaseApp,
23+
getApp
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

Lines changed: 3 additions & 2 deletions
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

Lines changed: 3 additions & 2 deletions
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

Lines changed: 3 additions & 2 deletions
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

@@ -279,7 +280,7 @@ export { StringFormat } from '../src/implementation/string';
279280
* @returns A Firebase StorageService instance.
280281
*/
281282
export function getStorage(
282-
app: FirebaseApp,
283+
app: FirebaseApp = getApp(),
283284
bucketUrl?: string
284285
): StorageService {
285286
// Dependencies

0 commit comments

Comments
 (0)