Skip to content

Commit 7ecdef3

Browse files
hsubox76hsubox76
committed
Merge branch 'master' into ch-index-types
2 parents be0cea2 + ecdc5a0 commit 7ecdef3

File tree

60 files changed

+285
-172
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+285
-172
lines changed

‎.changeset/cyan-wasps-worry.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.changeset/honest-hounds-sin.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎integration/firebase/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"test:ci": "node ../../scripts/run_tests_in_ci.js -s test"
88
},
99
"devDependencies": {
10-
"firebase": "8.3.1",
10+
"firebase": "8.3.2",
1111
"@types/chai": "4.2.14",
1212
"@types/mocha": "7.0.2",
1313
"chai": "4.2.0",

‎integration/firestore/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"test:memory:debug": "yarn build:memory; karma start --auto-watch --browsers Chrome"
1515
},
1616
"devDependencies": {
17-
"@firebase/app": "0.6.17",
18-
"@firebase/firestore": "2.2.1",
17+
"@firebase/app": "0.6.18",
18+
"@firebase/firestore": "2.2.2",
1919
"@types/mocha": "7.0.2",
2020
"gulp": "4.0.2",
2121
"gulp-filter": "6.0.0",

‎integration/messaging/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"test:manual": "mocha --exit"
1010
},
1111
"devDependencies": {
12-
"firebase": "8.3.1",
12+
"firebase": "8.3.2",
1313
"chai": "4.2.0",
1414
"chromedriver": "89.0.0",
1515
"express": "4.17.1",

‎packages-exp/analytics-compat/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@
4545
},
4646
"typings": "dist/src/index.d.ts",
4747
"dependencies": {
48-
"@firebase/component": "0.3.0",
48+
"@firebase/component": "0.3.1",
4949
"@firebase/analytics-exp": "0.0.900",
5050
"@firebase/analytics-types": "0.4.0",
51-
"@firebase/util": "0.4.0",
51+
"@firebase/util": "0.4.1",
5252
"tslib": "^2.1.0"
5353
},
5454
"nyc": {

‎packages-exp/analytics-exp/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
"dependencies": {
3636
"@firebase/installations-exp": "0.0.900",
3737
"@firebase/logger": "0.2.6",
38-
"@firebase/util": "0.4.0",
39-
"@firebase/component": "0.3.0",
38+
"@firebase/util": "0.4.1",
39+
"@firebase/component": "0.3.1",
4040
"tslib": "^2.1.0"
4141
},
4242
"license": "Apache-2.0",

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ import {
3030
isIndexedDBAvailable,
3131
validateIndexedDBOpenable,
3232
areCookiesEnabled,
33-
isBrowserExtension
33+
isBrowserExtension,
34+
getModularInstance
3435
} from '@firebase/util';
3536
import { ANALYTICS_TYPE } from './constants';
3637
import {
@@ -63,6 +64,7 @@ declare module '@firebase/component' {
6364
* @param app - The FirebaseApp to use.
6465
*/
6566
export function getAnalytics(app: FirebaseApp): Analytics {
67+
app = getModularInstance(app);
6668
// Dependencies
6769
const analyticsProvider: Provider<'analytics-exp'> = _getProvider(
6870
app,
@@ -115,6 +117,7 @@ export function setCurrentScreen(
115117
screenName: string,
116118
options?: AnalyticsCallOptions
117119
): void {
120+
analyticsInstance = getModularInstance(analyticsInstance);
118121
internalSetCurrentScreen(
119122
wrappedGtagFunction,
120123
initializationPromisesMap[analyticsInstance.app.options.appId!],
@@ -136,6 +139,7 @@ export function setUserId(
136139
id: string,
137140
options?: AnalyticsCallOptions
138141
): void {
142+
analyticsInstance = getModularInstance(analyticsInstance);
139143
internalSetUserId(
140144
wrappedGtagFunction,
141145
initializationPromisesMap[analyticsInstance.app.options.appId!],
@@ -154,6 +158,7 @@ export function setUserProperties(
154158
properties: CustomParams,
155159
options?: AnalyticsCallOptions
156160
): void {
161+
analyticsInstance = getModularInstance(analyticsInstance);
157162
internalSetUserProperties(
158163
wrappedGtagFunction,
159164
initializationPromisesMap[analyticsInstance.app.options.appId!],
@@ -175,6 +180,7 @@ export function setAnalyticsCollectionEnabled(
175180
analyticsInstance: Analytics,
176181
enabled: boolean
177182
): void {
183+
analyticsInstance = getModularInstance(analyticsInstance);
178184
internalSetAnalyticsCollectionEnabled(
179185
initializationPromisesMap[analyticsInstance.app.options.appId!],
180186
enabled
@@ -663,6 +669,7 @@ export function logEvent(
663669
eventParams?: EventParams,
664670
options?: AnalyticsCallOptions
665671
): void {
672+
analyticsInstance = getModularInstance(analyticsInstance);
666673
internalLogEvent(
667674
wrappedGtagFunction,
668675
initializationPromisesMap[analyticsInstance.app.options.appId!],

‎packages-exp/app-compat/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
"license": "Apache-2.0",
3131
"dependencies": {
3232
"@firebase/app-exp": "0.0.900",
33-
"@firebase/util": "0.4.0",
33+
"@firebase/util": "0.4.1",
3434
"@firebase/logger": "0.2.6",
35-
"@firebase/component": "0.3.0",
35+
"@firebase/component": "0.3.1",
3636
"tslib": "^2.1.0",
3737
"dom-storage": "2.1.0",
3838
"xmlhttprequest": "1.8.0"

‎packages-exp/app-exp/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
"typings:internal": "node ../../scripts/exp/use_typings.js ./dist/app-exp.d.ts"
3232
},
3333
"dependencies": {
34-
"@firebase/util": "0.4.0",
34+
"@firebase/util": "0.4.1",
3535
"@firebase/logger": "0.2.6",
36-
"@firebase/component": "0.3.0",
36+
"@firebase/component": "0.3.1",
3737
"tslib": "^2.1.0"
3838
},
3939
"license": "Apache-2.0",

‎packages-exp/auth-compat-exp/index.ts

Lines changed: 22 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,7 @@ import {
2626
InstantiationMode
2727
} from '@firebase/component';
2828

29-
import {
30-
EmailAuthProvider,
31-
EmailAuthProvider_Instance,
32-
FacebookAuthProvider,
33-
FacebookAuthProvider_Instance,
34-
FirebaseAuth as AuthCompat,
35-
GithubAuthProvider,
36-
GithubAuthProvider_Instance,
37-
GoogleAuthProvider,
38-
GoogleAuthProvider_Instance,
39-
OAuthProvider,
40-
PhoneAuthProvider,
41-
PhoneAuthProvider_Instance,
42-
PhoneMultiFactorGenerator,
43-
RecaptchaVerifier,
44-
RecaptchaVerifier_Instance,
45-
SAMLAuthProvider,
46-
TwitterAuthProvider,
47-
TwitterAuthProvider_Instance
48-
} from '@firebase/auth-types';
29+
import * as types from '@firebase/auth-types';
4930
import { version } from './package.json';
5031
import { Auth } from './src/auth';
5132
import { Persistence } from './src/persistence';
@@ -56,36 +37,36 @@ const AUTH_TYPE = 'auth-compat';
5637

5738
declare module '@firebase/component' {
5839
interface NameServiceMapping {
59-
'auth-compat': AuthCompat;
40+
'auth-compat': types.FirebaseAuth;
6041
}
6142
}
6243

6344
declare module '@firebase/app-compat' {
6445
interface FirebaseNamespace {
6546
auth: {
66-
(app?: FirebaseApp): AuthCompat;
67-
Auth: typeof AuthCompat;
68-
EmailAuthProvider: typeof EmailAuthProvider;
69-
EmailAuthProvider_Instance: typeof EmailAuthProvider_Instance;
70-
FacebookAuthProvider: typeof FacebookAuthProvider;
71-
FacebookAuthProvider_Instance: typeof FacebookAuthProvider_Instance;
72-
GithubAuthProvider: typeof GithubAuthProvider;
73-
GithubAuthProvider_Instance: typeof GithubAuthProvider_Instance;
74-
GoogleAuthProvider: typeof GoogleAuthProvider;
75-
GoogleAuthProvider_Instance: typeof GoogleAuthProvider_Instance;
76-
OAuthProvider: typeof OAuthProvider;
77-
SAMLAuthProvider: typeof SAMLAuthProvider;
78-
PhoneAuthProvider: typeof PhoneAuthProvider;
79-
PhoneAuthProvider_Instance: typeof PhoneAuthProvider_Instance;
80-
PhoneMultiFactorGenerator: typeof PhoneMultiFactorGenerator;
81-
RecaptchaVerifier: typeof RecaptchaVerifier;
82-
RecaptchaVerifier_Instance: typeof RecaptchaVerifier_Instance;
83-
TwitterAuthProvider: typeof TwitterAuthProvider;
84-
TwitterAuthProvider_Instance: typeof TwitterAuthProvider_Instance;
47+
(app?: FirebaseApp): types.FirebaseAuth;
48+
Auth: typeof types.FirebaseAuth;
49+
EmailAuthProvider: typeof types.EmailAuthProvider;
50+
EmailAuthProvider_Instance: typeof types.EmailAuthProvider_Instance;
51+
FacebookAuthProvider: typeof types.FacebookAuthProvider;
52+
FacebookAuthProvider_Instance: typeof types.FacebookAuthProvider_Instance;
53+
GithubAuthProvider: typeof types.GithubAuthProvider;
54+
GithubAuthProvider_Instance: typeof types.GithubAuthProvider_Instance;
55+
GoogleAuthProvider: typeof types.GoogleAuthProvider;
56+
GoogleAuthProvider_Instance: typeof types.GoogleAuthProvider_Instance;
57+
OAuthProvider: typeof types.OAuthProvider;
58+
SAMLAuthProvider: typeof types.SAMLAuthProvider;
59+
PhoneAuthProvider: typeof types.PhoneAuthProvider;
60+
PhoneAuthProvider_Instance: typeof types.PhoneAuthProvider_Instance;
61+
PhoneMultiFactorGenerator: typeof types.PhoneMultiFactorGenerator;
62+
RecaptchaVerifier: typeof types.RecaptchaVerifier;
63+
RecaptchaVerifier_Instance: typeof types.RecaptchaVerifier_Instance;
64+
TwitterAuthProvider: typeof types.TwitterAuthProvider;
65+
TwitterAuthProvider_Instance: typeof types.TwitterAuthProvider_Instance;
8566
};
8667
}
8768
interface FirebaseApp {
88-
auth?(): AuthCompat;
69+
auth?(): types.FirebaseAuth;
8970
}
9071
}
9172

‎packages-exp/auth-compat-exp/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@
2727
"test:node:integration": "ts-node -O '{\"module\": \"commonjs\", \"target\": \"es6\"}' scripts/run_node_tests.ts --integration",
2828
"test:webdriver": "rollup -c test/integration/webdriver/static/rollup.config.js && ts-node -O '{\"module\": \"commonjs\", \"target\": \"es6\"}' scripts/run_node_tests.ts --webdriver",
2929
"test:integration": "run-s test:browser:integration test:node:integration test:webdriver",
30-
"add-compat-overloads": "ts-node-script ../../scripts/exp/create-overloads.ts -i ../auth-exp/dist/auth-exp-public.d.ts -o dist/auth-compat-exp/index.d.ts -a -r Auth:AuthCompat -r FirebaseApp:FirebaseAppCompat --moduleToEnhance @firebase/auth"
30+
"add-compat-overloads": "ts-node-script ../../scripts/exp/create-overloads.ts -i ../auth-exp/dist/auth-exp-public.d.ts -o dist/auth-compat-exp/index.d.ts -a -r Auth:types.FirebaseAuth -r User:types.User -r FirebaseApp:FirebaseAppCompat --moduleToEnhance @firebase/auth"
3131
},
3232
"peerDependencies": {
3333
"@firebase/app-compat": "0.x"
3434
},
3535
"dependencies": {
3636
"@firebase/auth-types": "0.10.2",
3737
"@firebase/auth-exp": "0.0.900",
38-
"@firebase/component": "0.3.0",
39-
"@firebase/util": "0.4.0",
38+
"@firebase/component": "0.3.1",
39+
"@firebase/util": "0.4.1",
4040
"node-fetch": "2.6.1",
4141
"tslib": "^2.1.0"
4242
},

‎packages-exp/auth-exp/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
"@firebase/app-exp": "0.x"
5151
},
5252
"dependencies": {
53-
"@firebase/component": "0.3.0",
53+
"@firebase/component": "0.3.1",
5454
"@firebase/logger": "0.2.6",
55-
"@firebase/util": "0.4.0",
55+
"@firebase/util": "0.4.1",
5656
"node-fetch": "2.6.1",
5757
"selenium-webdriver": "4.0.0-beta.1",
5858
"tslib": "^2.1.0"

‎packages-exp/auth-exp/src/core/user/account_info.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@ import { UserInternal } from '../../model/user';
2626
import { _logoutIfInvalidated } from './invalidation';
2727
import { getModularInstance } from '@firebase/util';
2828

29-
interface Profile {
30-
displayName?: string | null;
31-
photoURL?: string | null;
32-
}
33-
3429
/**
3530
* Updates a user's profile data.
3631
*
@@ -41,7 +36,10 @@ interface Profile {
4136
*/
4237
export async function updateProfile(
4338
user: User,
44-
{ displayName, photoURL: photoUrl }: Profile
39+
{
40+
displayName,
41+
photoURL: photoUrl
42+
}: { displayName?: string | null; photoURL?: string | null }
4543
): Promise<void> {
4644
if (displayName === undefined && photoUrl === undefined) {
4745
return;

‎packages-exp/firebase-exp/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@
4242
"@firebase/app-compat": "0.0.900",
4343
"@firebase/auth-exp": "0.0.900",
4444
"@firebase/auth-compat": "0.0.900",
45-
"@firebase/database": "0.9.6",
45+
"@firebase/database": "0.9.7",
4646
"@firebase/functions-exp": "0.0.900",
4747
"@firebase/functions-compat": "0.0.900",
48-
"@firebase/firestore": "2.2.1",
49-
"@firebase/storage": "0.4.5",
48+
"@firebase/firestore": "2.2.2",
49+
"@firebase/storage": "0.4.6",
5050
"@firebase/performance-exp": "0.0.900",
5151
"@firebase/performance-compat": "0.0.900",
5252
"@firebase/remote-config-exp": "0.0.900",

‎packages-exp/functions-compat/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@
4848
},
4949
"typings": "dist/src/index.d.ts",
5050
"dependencies": {
51-
"@firebase/component": "0.3.0",
51+
"@firebase/component": "0.3.1",
5252
"@firebase/functions-exp": "0.0.900",
5353
"@firebase/functions-types": "0.4.0",
5454
"@firebase/messaging-types": "0.5.0",
55-
"@firebase/util": "0.4.0",
55+
"@firebase/util": "0.4.1",
5656
"tslib": "^2.1.0"
5757
},
5858
"nyc": {

‎packages-exp/functions-exp/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
},
5252
"typings": "dist/functions-exp-public.d.ts",
5353
"dependencies": {
54-
"@firebase/component": "0.3.0",
54+
"@firebase/component": "0.3.1",
5555
"@firebase/messaging-types": "0.5.0",
56-
"@firebase/util": "0.4.0",
56+
"@firebase/util": "0.4.1",
5757
"node-fetch": "2.6.1",
5858
"tslib": "^2.1.0"
5959
},

‎packages-exp/installations-compat/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
"dependencies": {
5353
"@firebase/installations-exp": "0.0.900",
5454
"@firebase/installations-types": "0.3.4",
55-
"@firebase/util": "0.4.0",
56-
"@firebase/component": "0.3.0",
55+
"@firebase/util": "0.4.1",
56+
"@firebase/component": "0.3.1",
5757
"idb": "3.0.2",
5858
"tslib": "^2.1.0"
5959
}

‎packages-exp/installations-exp/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
"@firebase/app-exp": "0.x"
5757
},
5858
"dependencies": {
59-
"@firebase/util": "0.4.0",
60-
"@firebase/component": "0.3.0",
59+
"@firebase/util": "0.4.1",
60+
"@firebase/component": "0.3.1",
6161
"idb": "3.0.2",
6262
"tslib": "^2.1.0"
6363
}

‎packages-exp/messaging-compat/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
},
3333
"dependencies": {
3434
"@firebase/messaging-exp": "0.0.900",
35-
"@firebase/component": "0.3.0",
35+
"@firebase/component": "0.3.1",
3636
"@firebase/installations-exp": "0.0.900",
37-
"@firebase/util": "0.4.0",
37+
"@firebase/util": "0.4.1",
3838
"tslib": "^2.1.0"
3939
},
4040
"devDependencies": {

‎packages-exp/messaging-exp/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
"@firebase/app-exp": "0.x"
3434
},
3535
"dependencies": {
36-
"@firebase/component": "0.3.0",
36+
"@firebase/component": "0.3.1",
3737
"@firebase/installations-exp": "0.0.900",
38-
"@firebase/util": "0.4.0",
38+
"@firebase/util": "0.4.1",
3939
"idb": "3.0.2",
4040
"tslib": "^2.1.0"
4141
},

0 commit comments

Comments
 (0)