Skip to content

Commit 2f48295

Browse files
authored
Make compat script work (#3916)
* expose modular APIs from compat * build compat script that works with exp packages
1 parent f33dc14 commit 2f48295

File tree

2 files changed

+16
-19
lines changed

2 files changed

+16
-19
lines changed

packages-exp/app-compat/src/firebaseNamespaceCore.ts

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,7 @@ import {
2626
FirebaseService,
2727
FirebaseServiceNamespace
2828
} from '@firebase/app-types/private';
29-
import {
30-
SDK_VERSION,
31-
initializeApp,
32-
registerVersion,
33-
onLog,
34-
setLogLevel,
35-
_registerComponent,
36-
_DEFAULT_ENTRY_NAME
37-
} from '@firebase/app-exp';
29+
import * as modularAPIs from '@firebase/app-exp';
3830
import { _FirebaseAppInternal } from '@firebase/app-types-exp';
3931
import { Component, ComponentType } from '@firebase/component';
4032

@@ -66,16 +58,17 @@ export function createFirebaseNamespaceCore(
6658
initializeApp: initializeAppCompat,
6759
// @ts-ignore
6860
app,
69-
registerVersion,
70-
setLogLevel,
71-
onLog,
61+
registerVersion: modularAPIs.registerVersion,
62+
setLogLevel: modularAPIs.setLogLevel,
63+
onLog: modularAPIs.onLog,
7264
// @ts-ignore
7365
apps: null,
74-
SDK_VERSION,
66+
SDK_VERSION: modularAPIs.SDK_VERSION,
7567
INTERNAL: {
7668
registerComponent: registerComponentCompat,
7769
removeApp,
78-
useAsService
70+
useAsService,
71+
modularAPIs
7972
}
8073
};
8174

@@ -109,7 +102,7 @@ export function createFirebaseNamespaceCore(
109102
* Get the App object for a given name (or DEFAULT).
110103
*/
111104
function app(name?: string): FirebaseApp {
112-
name = name || _DEFAULT_ENTRY_NAME;
105+
name = name || modularAPIs._DEFAULT_ENTRY_NAME;
113106
if (!contains(apps, name)) {
114107
throw ERROR_FACTORY.create(AppError.NO_APP, { appName: name });
115108
}
@@ -126,7 +119,10 @@ export function createFirebaseNamespaceCore(
126119
options: FirebaseOptions,
127120
rawConfig = {}
128121
): FirebaseApp {
129-
const app = initializeApp(options, rawConfig) as _FirebaseAppInternal;
122+
const app = modularAPIs.initializeApp(
123+
options,
124+
rawConfig
125+
) as _FirebaseAppInternal;
130126
const appCompat = new firebaseAppImpl(app, namespace as _FirebaseNamespace);
131127
apps[app.name] = appCompat;
132128
return appCompat;
@@ -145,7 +141,7 @@ export function createFirebaseNamespaceCore(
145141
): FirebaseServiceNamespace<FirebaseService> | null {
146142
const componentName = component.name;
147143
if (
148-
_registerComponent(component) &&
144+
modularAPIs._registerComponent(component) &&
149145
component.type === ComponentType.PUBLIC
150146
) {
151147
// create service namespace for public components

packages-exp/auth-compat-exp/demo/rollup.config.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ const umdBuilds = [
5959
extend: true,
6060
name: 'firebase',
6161
globals: {
62-
'@firebase/app-compat': 'firebase'
62+
'@firebase/app-compat': 'firebase',
63+
'@firebase/app-exp': 'firebase.INTERNAL.modularAPIs'
6364
},
6465
/**
6566
* use iife to avoid below error in the old Safari browser
@@ -81,7 +82,7 @@ const umdBuilds = [
8182
}`
8283
},
8384
plugins: [...plugins],
84-
external: ['@firebase/app-compat']
85+
external: ['@firebase/app-compat', '@firebase/app-exp']
8586
}
8687
];
8788

0 commit comments

Comments
 (0)