Skip to content

Commit 4bd34f1

Browse files
milaGGLmilaGGL
committed
Merge branch 'master' into mila/BloomFilter
2 parents a3fb711 + 649e7f3 commit 4bd34f1

File tree

127 files changed

+936
-382
lines changed

Some content is hidden

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

127 files changed

+936
-382
lines changed

‎.changeset/eighty-ants-do.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'firebase': patch
3+
---
4+
5+
Modify entry point ESM bundles to conform to Node ESM specs.

‎.changeset/three-glasses-judge.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@firebase/util': patch
3+
---
4+
5+
Fix for third party window content that cannot access IndexedDB if the browser is set to never accept third party cookies on Firefox.

‎.changeset/tidy-games-fry.md

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
---
2+
'@firebase/analytics': minor
3+
'@firebase/analytics-compat': minor
4+
'@firebase/analytics-interop-types': minor
5+
'@firebase/analytics-types': minor
6+
'@firebase/app': minor
7+
'@firebase/app-check': minor
8+
'@firebase/app-check-compat': minor
9+
'@firebase/app-check-interop-types': minor
10+
'@firebase/app-check-types': minor
11+
'@firebase/app-compat': minor
12+
'@firebase/app-types': minor
13+
'@firebase/auth': minor
14+
'@firebase/auth-compat': minor
15+
'@firebase/auth-interop-types': minor
16+
'@firebase/auth-types': minor
17+
'@firebase/component': minor
18+
'@firebase/database': minor
19+
'@firebase/database-compat': minor
20+
'@firebase/database-types': minor
21+
'@firebase/functions': minor
22+
'@firebase/functions-compat': minor
23+
'@firebase/functions-types': minor
24+
'@firebase/installations': minor
25+
'@firebase/installations-compat': minor
26+
'@firebase/installations-types': minor
27+
'@firebase/logger': minor
28+
'@firebase/messaging': minor
29+
'@firebase/messaging-compat': minor
30+
'@firebase/messaging-interop-types': minor
31+
'@firebase/performance': minor
32+
'@firebase/performance-compat': minor
33+
'@firebase/performance-types': minor
34+
'@firebase/remote-config': minor
35+
'@firebase/remote-config-compat': minor
36+
'@firebase/remote-config-types': minor
37+
'@firebase/storage': minor
38+
'@firebase/storage-compat': minor
39+
'@firebase/storage-types': minor
40+
'@firebase/template': minor
41+
'@firebase/template-types': minor
42+
'@firebase/util': minor
43+
'@firebase/webchannel-wrapper': minor
44+
'firebase': minor
45+
---
46+
47+
Update TypeScript version to 4.7.4.

‎e2e/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"devDependencies": {
2222
"@babel/core": "7.17.10",
2323
"@babel/preset-env": "7.19.4",
24-
"@types/chai": "4.3.3",
24+
"@types/chai": "4.3.4",
2525
"@types/mocha": "9.1.1",
2626
"babel-loader": "8.2.5",
2727
"chai": "4.3.6",

‎integration/compat-interop/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
"@firebase/remote-config-compat": "0.1.16"
2525
},
2626
"devDependencies": {
27-
"typescript": "4.2.2"
27+
"typescript": "4.7.4"
2828
}
29-
}
29+
}

‎integration/compat-typings/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
"firebase": "*"
1111
},
1212
"devDependencies": {
13-
"typescript": "4.2.2"
13+
"typescript": "4.7.4"
1414
}
1515
}

‎integration/firebase/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"devDependencies": {
1010
"firebase": "9.14.0",
11-
"@types/chai": "4.3.3",
11+
"@types/chai": "4.3.4",
1212
"@types/mocha": "9.1.1",
1313
"chai": "4.3.6",
1414
"karma": "6.4.1",
@@ -20,6 +20,6 @@
2020
"karma-typescript": "5.5.3",
2121
"mocha": "9.2.2",
2222
"npm-run-all": "4.1.5",
23-
"typescript": "4.2.2"
23+
"typescript": "4.7.4"
2424
}
2525
}

‎integration/messaging/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"firebase": "9.14.0",
1313
"chai": "4.3.6",
1414
"chromedriver": "98.0.1",
15-
"express": "4.18.1",
15+
"express": "4.18.2",
1616
"geckodriver": "2.0.4",
1717
"mocha": "9.2.2",
1818
"node-fetch": "2.6.7",

‎package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"@babel/register": "7.18.9",
7070
"@changesets/changelog-github": "0.4.7",
7171
"@changesets/cli": "2.25.0",
72-
"@types/chai": "4.3.3",
72+
"@types/chai": "4.3.4",
7373
"@types/chai-as-promised": "7.1.5",
7474
"@types/child-process-promise": "2.2.2",
7575
"@types/clone": "2.1.1",
@@ -86,9 +86,9 @@
8686
"@types/sinon-chai": "3.2.8",
8787
"@types/tmp": "0.2.3",
8888
"@types/yargs": "17.0.13",
89-
"@typescript-eslint/eslint-plugin": "4.33.0",
90-
"@typescript-eslint/eslint-plugin-tslint": "4.33.0",
91-
"@typescript-eslint/parser": "4.33.0",
89+
"@typescript-eslint/eslint-plugin": "5.43.0",
90+
"@typescript-eslint/eslint-plugin-tslint": "5.43.0",
91+
"@typescript-eslint/parser": "5.43.0",
9292
"api-documenter-me": "0.1.1",
9393
"api-extractor-me": "0.1.2",
9494
"babel-loader": "8.2.5",
@@ -103,7 +103,7 @@
103103
"eslint": "7.32.0",
104104
"eslint-plugin-import": "2.26.0",
105105
"eslint-plugin-unused-imports": "2.0.0",
106-
"express": "4.18.1",
106+
"express": "4.18.2",
107107
"find-free-port": "2.0.0",
108108
"firebase-tools": "11.2.2",
109109
"glob": "7.2.3",
@@ -152,6 +152,6 @@
152152
"typescript": "4.7.4",
153153
"watch": "1.0.2",
154154
"webpack": "4.46.0",
155-
"yargs": "17.6.0"
155+
"yargs": "17.6.2"
156156
}
157157
}

‎packages/analytics-compat/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"rollup": "2.79.1",
2929
"@rollup/plugin-json": "4.1.0",
3030
"rollup-plugin-typescript2": "0.31.2",
31-
"typescript": "4.2.2"
31+
"typescript": "4.7.4"
3232
},
3333
"repository": {
3434
"directory": "packages/analytics-compat",

‎packages/analytics-interop-types/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
"url": "https://github.com/firebase/firebase-js-sdk/issues"
2121
},
2222
"devDependencies": {
23-
"typescript": "4.2.2"
23+
"typescript": "4.7.4"
2424
}
2525
}

‎packages/analytics-types/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
"url": "https://github.com/firebase/firebase-js-sdk/issues"
2121
},
2222
"devDependencies": {
23-
"typescript": "4.2.2"
23+
"typescript": "4.7.4"
2424
}
2525
}

‎packages/analytics/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"@rollup/plugin-json": "4.1.0",
5555
"@rollup/plugin-node-resolve": "13.3.0",
5656
"rollup-plugin-typescript2": "0.31.2",
57-
"typescript": "4.2.2"
57+
"typescript": "4.7.4"
5858
},
5959
"repository": {
6060
"directory": "packages/analytics",

‎packages/analytics/src/get-config.test.ts

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

1818
import { expect } from 'chai';
19-
import { SinonStub, stub, useFakeTimers, restore } from 'sinon';
19+
import { SinonStub, stub, useFakeTimers, restore, match } from 'sinon';
2020
import '../testing/setup';
2121
import {
2222
fetchDynamicConfig,
@@ -246,7 +246,7 @@ describe('Dynamic Config Fetch Functions', () => {
246246
});
247247
// Set fetch timeout to 50 ms.
248248
await fetchDynamicConfigWithRetry(app, fakeRetryData, 50);
249-
expect(consoleStub.args[0][1]).to.include(fakeMeasurementId);
249+
expect(consoleStub).calledWith(match.any, match(fakeMeasurementId));
250250
consoleStub.restore();
251251
}
252252
);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"@rollup/plugin-json": "4.1.0",
5151
"@rollup/plugin-node-resolve": "13.3.0",
5252
"rollup-plugin-typescript2": "0.31.2",
53-
"typescript": "4.2.2"
53+
"typescript": "4.7.4"
5454
},
5555
"repository": {
5656
"directory": "packages/app-check",

‎packages/app-check-interop-types/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
"url": "https://github.com/firebase/firebase-js-sdk/issues"
2121
},
2222
"devDependencies": {
23-
"typescript": "4.2.2"
23+
"typescript": "4.7.4"
2424
}
2525
}

‎packages/app-check-types/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
"url": "https://github.com/firebase/firebase-js-sdk/issues"
2121
},
2222
"devDependencies": {
23-
"typescript": "4.2.2"
23+
"typescript": "4.7.4"
2424
}
2525
}

‎packages/app-check/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"@rollup/plugin-json": "4.1.0",
5252
"@rollup/plugin-node-resolve": "13.3.0",
5353
"rollup-plugin-typescript2": "0.31.2",
54-
"typescript": "4.2.2"
54+
"typescript": "4.7.4"
5555
},
5656
"repository": {
5757
"directory": "packages/app-check",

‎packages/app-check/src/client.test.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@ import { BASE_ENDPOINT } from './constants';
3131

3232
describe('client', () => {
3333
let app: FirebaseApp;
34-
let fetchStub: SinonStub<[RequestInfo, RequestInit?], Promise<Response>>;
34+
let fetchStub: SinonStub<
35+
[RequestInfo | URL, RequestInit?],
36+
Promise<Response>
37+
>;
3538
beforeEach(() => {
3639
app = getFakeApp();
3740
fetchStub = stub(window, 'fetch').returns(

‎packages/app-compat/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"@rollup/plugin-json": "4.1.0",
5252
"rollup-plugin-replace": "2.2.0",
5353
"rollup-plugin-typescript2": "0.31.2",
54-
"typescript": "4.2.2"
54+
"typescript": "4.7.4"
5555
},
5656
"repository": {
5757
"directory": "packages/app-compat",

‎packages/app-types/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
"@firebase/logger": "0.2.6"
2525
},
2626
"devDependencies": {
27-
"typescript": "4.2.2"
27+
"typescript": "4.7.4"
2828
}
2929
}

‎packages/app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"rollup": "2.79.1",
5151
"rollup-plugin-replace": "2.2.0",
5252
"rollup-plugin-typescript2": "0.31.2",
53-
"typescript": "4.2.2"
53+
"typescript": "4.7.4"
5454
},
5555
"repository": {
5656
"directory": "packages/app",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"rollup-plugin-sourcemaps": "0.6.3",
3535
"rollup-plugin-typescript2": "0.31.2",
3636
"rollup-plugin-uglify": "6.0.4",
37-
"typescript": "4.2.2"
37+
"typescript": "4.7.4"
3838
},
3939
"repository": {
4040
"directory": "packages/auth-compat/demo",

‎packages/auth-compat/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"rollup-plugin-replace": "2.2.0",
6262
"rollup-plugin-typescript2": "0.31.2",
6363
"selenium-webdriver": "4.5.0",
64-
"typescript": "4.2.2"
64+
"typescript": "4.7.4"
6565
},
6666
"repository": {
6767
"directory": "packages/auth-compat",

‎packages/auth-interop-types/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
"url": "https://github.com/firebase/firebase-js-sdk/issues"
2525
},
2626
"devDependencies": {
27-
"typescript": "4.2.2"
27+
"typescript": "4.7.4"
2828
}
2929
}

‎packages/auth-types/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
"url": "https://github.com/firebase/firebase-js-sdk/issues"
2525
},
2626
"devDependencies": {
27-
"typescript": "4.2.2"
27+
"typescript": "4.7.4"
2828
}
2929
}

‎packages/auth/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
"rollup-plugin-sourcemaps": "0.6.3",
119119
"rollup-plugin-typescript2": "0.31.2",
120120
"selenium-webdriver": "4.5.0",
121-
"typescript": "4.2.2",
121+
"typescript": "4.7.4",
122122
"@types/express": "4.17.14"
123123
},
124124
"repository": {

‎packages/auth/src/api/index.test.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,9 @@ describe('api/_performApiRequest', () => {
383383
);
384384
assert.fail('Call should have failed');
385385
} catch (e) {
386-
expect(e.code).to.eq(`auth/${AuthErrorCode.NEED_CONFIRMATION}`);
386+
expect((e as FirebaseError).code).to.eq(
387+
`auth/${AuthErrorCode.NEED_CONFIRMATION}`
388+
);
387389
expect((e as FirebaseError).customData!._tokenResponse).to.eql({
388390
needConfirmation: true,
389391
idToken: 'id-token'
@@ -413,7 +415,9 @@ describe('api/_performApiRequest', () => {
413415
);
414416
assert.fail('Call should have failed');
415417
} catch (e) {
416-
expect(e.code).to.eq(`auth/${AuthErrorCode.CREDENTIAL_ALREADY_IN_USE}`);
418+
expect((e as FirebaseError).code).to.eq(
419+
`auth/${AuthErrorCode.CREDENTIAL_ALREADY_IN_USE}`
420+
);
417421
expect((e as FirebaseError).customData!._tokenResponse).to.eql(
418422
response
419423
);
@@ -444,7 +448,9 @@ describe('api/_performApiRequest', () => {
444448
);
445449
assert.fail('Call should have failed');
446450
} catch (e) {
447-
expect(e.code).to.eq(`auth/${AuthErrorCode.EMAIL_EXISTS}`);
451+
expect((e as FirebaseError).code).to.eq(
452+
`auth/${AuthErrorCode.EMAIL_EXISTS}`
453+
);
448454
expect((e as FirebaseError).customData!.email).to.eq('[email protected]');
449455
expect((e as FirebaseError).customData!.phoneNumber).to.eq(
450456
'+1555-this-is-a-number'

‎packages/auth/src/core/strategies/abstract_popup_redirect_operation.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export abstract class AbstractPopupRedirectOperation
7676
await this.onExecution();
7777
this.eventManager.registerConsumer(this);
7878
} catch (e) {
79-
this.reject(e);
79+
this.reject(e as Error);
8080
}
8181
}
8282
);
@@ -102,7 +102,7 @@ export abstract class AbstractPopupRedirectOperation
102102
try {
103103
this.resolve(await this.getIdpTask(type)(params));
104104
} catch (e) {
105-
this.reject(e);
105+
this.reject(e as Error);
106106
}
107107
}
108108

‎packages/auth/src/platform_browser/popup_redirect.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ describe('platform_browser/popup_redirect', () => {
9393
});
9494

9595
context('#_openPopup', () => {
96-
let popupUrl: string | undefined;
96+
let popupUrl: string | URL | undefined;
9797
let provider: OAuthProvider;
9898
const event = AuthEventType.LINK_VIA_POPUP;
9999

‎packages/auth/test/helpers/mock_fetch.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ let fetchImpl: typeof fetch | null;
3434
const routes = new Map<string, Route>();
3535

3636
// Using a constant rather than a function to enforce the type matches fetch()
37-
const fakeFetch: typeof fetch = (input: RequestInfo, request?: RequestInit) => {
37+
const fakeFetch: typeof fetch = (
38+
input: RequestInfo | URL,
39+
request?: RequestInit
40+
) => {
3841
if (typeof input !== 'string') {
3942
throw new Error('URL passed to fetch was not a string');
4043
}

0 commit comments

Comments
 (0)