Skip to content

Commit 487b914

Browse files
committed
support default app
1 parent 65a4e85 commit 487b914

File tree

27 files changed

+120
-62
lines changed

27 files changed

+120
-62
lines changed

common/api-review/analytics-exp.api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
55
```ts
66

7-
import { FirebaseApp } from '@firebase/app-exp';
7+
import { FirebaseApp } from '@firebase/app';
88

99
// @public (undocumented)
1010
export interface Analytics {

common/api-review/auth-exp.api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import { CompleteFn } from '@firebase/util';
88
import { ErrorFactory } from '@firebase/util';
99
import { ErrorFn } from '@firebase/util';
10-
import { FirebaseApp } from '@firebase/app-exp';
10+
import { FirebaseApp } from '@firebase/app';
1111
import { FirebaseError } from '@firebase/util';
1212
import { NextFn } from '@firebase/util';
1313
import { Observer } from '@firebase/util';

common/api-review/functions-exp.api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
55
```ts
66

7-
import { FirebaseApp } from '@firebase/app-exp';
7+
import { FirebaseApp } from '@firebase/app';
88
import { FirebaseError } from '@firebase/util';
99

1010
// @public

common/api-review/installations-exp.api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
55
```ts
66

7-
import { FirebaseApp } from '@firebase/app-exp';
7+
import { FirebaseApp } from '@firebase/app';
88

99
// @public
1010
export function deleteInstallations(installations: FirebaseInstallations): Promise<void>;

common/api-review/messaging-exp.api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
55
```ts
66

7-
import { FirebaseApp } from '@firebase/app-exp';
7+
import { FirebaseApp } from '@firebase/app';
88
import { NextFn } from '@firebase/util';
99
import { Observer } from '@firebase/util';
1010
import { Unsubscribe } from '@firebase/util';

common/api-review/remote-config-exp.api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
55
```ts
66

7-
import { FirebaseApp } from '@firebase/app-exp';
7+
import { FirebaseApp } from '@firebase/app';
88

99
// @public
1010
export function activate(remoteConfig: RemoteConfig): Promise<boolean>;

packages-exp/analytics-exp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"bugs": {
5858
"url": "https://github.com/firebase/firebase-js-sdk/issues"
5959
},
60-
"typings": "dist/src/index.d.ts",
60+
"typings": "./dist/analytics-exp-public.d.ts",
6161
"nyc": {
6262
"extension": [
6363
".ts"

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,
@@ -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/app-exp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"bugs": {
5353
"url": "https://github.com/firebase/firebase-js-sdk/issues"
5454
},
55-
"typings": "./dist/packages-exp/app-exp/src/index.d.ts",
55+
"typings": "./dist/app-exp-public.d.ts",
5656
"nyc": {
5757
"extension": [
5858
".ts"

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/auth-exp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"bugs": {
7676
"url": "https://github.com/firebase/firebase-js-sdk/issues"
7777
},
78-
"typings": "dist/auth-exp.d.ts",
78+
"typings": "./dist/auth-exp-public.d.ts",
7979
"nyc": {
8080
"extension": [
8181
".ts"

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';
@@ -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/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"module": "dist/index.esm.js",
88
"browser": "dist/index.esm.js",
99
"esm2017": "dist/index.esm2017.js",
10-
"typings": "dist/src/index.d.ts",
10+
"typings": "./dist/installations-exp-public.d.ts",
1111
"license": "Apache-2.0",
1212
"files": [
1313
"dist"

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/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"main": "dist/index.cjs.js",
88
"module": "dist/index.esm.js",
99
"esm2017": "dist/index.esm2017.js",
10-
"typings": "dist/index.d.ts",
10+
"typings": "./dist/messaging-exp-public.d.ts",
1111
"sw": "dist/index.sw.esm2017.js",
1212
"files": [
1313
"dist"

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

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

Lines changed: 5 additions & 2 deletions
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/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"bugs": {
5656
"url": "https://github.com/firebase/firebase-js-sdk/issues"
5757
},
58-
"typings": "dist/src/index.d.ts",
58+
"typings": "./dist/remote-config-exp-public.d.ts",
5959
"nyc": {
6060
"extension": [
6161
".ts"

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,
@@ -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/package.json

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
{
22
"name": "@firebase/database",
3-
"version": "0.9.7",
3+
"version": "0.0.900",
44
"description": "",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
6-
"main": "dist/index.node.cjs.js",
7-
"browser": "dist/index.esm.js",
8-
"module": "dist/index.esm.js",
9-
"esm2017": "dist/index.esm2017.js",
6+
"main": "dist/exp/index.node.cjs.js",
7+
"browser": "dist/exp/index.esm.js",
8+
"module": "dist/exp/index.esm.js",
9+
"esm2017": "dist/exp/index.esm2017.js",
1010
"files": [
11-
"dist"
11+
"dist",
12+
"exp-types/index.d.ts",
13+
"exp-types/index.d.ts"
1214
],
1315
"scripts": {
1416
"lint": "eslint -c .eslintrc.js '**/*.ts' --ignore-path '../../.gitignore'",
@@ -30,7 +32,9 @@
3032
"doc": "api-documenter markdown --input temp --output docs"
3133
},
3234
"license": "Apache-2.0",
33-
"peerDependencies": {},
35+
"peerDependencies": {
36+
"@firebase/app-exp": "0.x"
37+
},
3438
"dependencies": {
3539
"@firebase/database-types": "0.7.0",
3640
"@firebase/logger": "0.2.6",
@@ -55,7 +59,7 @@
5559
"bugs": {
5660
"url": "https://github.com/firebase/firebase-js-sdk/issues"
5761
},
58-
"typings": "dist/index.d.ts",
62+
"typings": "exp-types/index.d.ts",
5963
"nyc": {
6064
"extension": [
6165
".ts"

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/package.json

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/firestore",
3-
"version": "2.2.2",
3+
"version": "0.0.900",
44
"engines": {
55
"node": "^8.13.0 || >=10.10.0"
66
},
@@ -50,18 +50,22 @@
5050
"doc": "api-documenter markdown --input temp --output docs",
5151
"add-compat-overloads": "ts-node-script ../../scripts/exp/create-overloads.ts -i dist/exp/index.d.ts -o dist/compat/esm5/packages/firestore/compat/index.d.ts -a -r FirebaseFirestore:types.FirebaseFirestore -r CollectionReference:types.CollectionReference -r DocumentReference:types.DocumentReference -r Query:types.Query -r FirebaseApp:FirebaseAppCompat --moduleToEnhance @firebase/firestore"
5252
},
53-
"main": "dist/node-cjs/index.js",
54-
"main-esm2017": "dist/node-esm2017/index.js",
55-
"react-native": "dist/rn/index.js",
56-
"browser": "dist/esm5/index.js",
57-
"module": "dist/esm5/index.js",
58-
"esm2017": "dist/esm2017/index.js",
53+
"main": "dist/exp/index.node.umd.js",
54+
"react-native": "dist/exp/index.rn.esm2017.js",
55+
"browser": "dist/exp/index.browser.esm2017.js",
56+
"module": "dist/exp/index.browser.esm2017.js",
5957
"license": "Apache-2.0",
6058
"files": [
6159
"dist",
6260
"memory/package.json",
6361
"bundle/package.json",
64-
"memory-bundle/package.json"
62+
"memory-bundle/package.json",
63+
"dist/exp/index.d.ts",
64+
"lite/package.json",
65+
"dist/lite/index.d.ts",
66+
"dist/exp/index.d.ts",
67+
"lite/package.json",
68+
"dist/lite/index.d.ts"
6569
],
6670
"dependencies": {
6771
"@firebase/component": "0.3.1",
@@ -75,8 +79,7 @@
7579
"tslib": "^2.1.0"
7680
},
7781
"peerDependencies": {
78-
"@firebase/app": "0.x",
79-
"@firebase/app-types": "0.x"
82+
"@firebase/app-exp": "0.x"
8083
},
8184
"devDependencies": {
8285
"@firebase/app": "0.6.18",
@@ -105,7 +108,7 @@
105108
"bugs": {
106109
"url": "https://github.com/firebase/firebase-js-sdk/issues"
107110
},
108-
"typings": "dist/firestore/index.d.ts",
111+
"typings": "dist/exp/index.d.ts",
109112
"nyc": {
110113
"extension": [
111114
".ts"

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

0 commit comments

Comments
 (0)