Skip to content

Commit 4f366f4

Browse files
ehsannasehsannas
committed
Merge remote-tracking branch 'origin/master' into port-overlays-3-rebased-squashed-2
2 parents 2fc215e + 3496489 commit 4f366f4

File tree

148 files changed

+2773
-1089
lines changed

Some content is hidden

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

148 files changed

+2773
-1089
lines changed

‎.changeset/fluffy-seahorses-thank.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+
Remove unneeded types from public typings file.

‎.changeset/fluffy-tools-thank.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@firebase/app-check-compat': patch
3+
---
4+
5+
Added `app-check-types` dependency to `app-check-compat` package.json.

‎.changeset/pretty-mayflies-worry.md

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

‎.changeset/quick-moons-play.md

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

‎.changeset/seven-dolphins-breathe.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@firebase/firestore": patch
3+
---
4+
5+
The format of some of the IndexedDB data changed. This increases the performance of document lookups after an initial migration. If you do not want to migrate data, you can call `clearIndexedDbPersistence()` before invoking `enableIndexedDbPersistence()`.

‎.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# Used for approving minor changes, large-scale refactorings, and emergency situations.
1414
# (secret team to avoid review requests)
1515
#
16-
# - @hiranya911
16+
# - @lahirumaramba
1717
# - @hsubox76
1818
# - @allspain
1919

‎common/api-review/util.api.md

Lines changed: 482 additions & 0 deletions
Large diffs are not rendered by default.

‎integration/compat-interop/package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@
88
"test:debug": "karma start --browsers Chrome --auto-watch"
99
},
1010
"dependencies": {
11-
"@firebase/app": "0.7.17",
12-
"@firebase/app-compat": "0.1.18",
13-
"@firebase/analytics": "0.7.5",
14-
"@firebase/analytics-compat": "0.1.6",
15-
"@firebase/auth": "0.19.9",
16-
"@firebase/auth-compat": "0.2.9",
17-
"@firebase/functions": "0.7.8",
18-
"@firebase/functions-compat": "0.1.9",
19-
"@firebase/messaging": "0.9.8",
20-
"@firebase/messaging-compat": "0.1.8",
21-
"@firebase/performance": "0.5.5",
22-
"@firebase/performance-compat": "0.1.5",
23-
"@firebase/remote-config": "0.3.4",
24-
"@firebase/remote-config-compat": "0.1.5"
11+
"@firebase/app": "0.7.19",
12+
"@firebase/app-compat": "0.1.20",
13+
"@firebase/analytics": "0.7.6",
14+
"@firebase/analytics-compat": "0.1.7",
15+
"@firebase/auth": "0.19.10",
16+
"@firebase/auth-compat": "0.2.10",
17+
"@firebase/functions": "0.7.9",
18+
"@firebase/functions-compat": "0.1.10",
19+
"@firebase/messaging": "0.9.10",
20+
"@firebase/messaging-compat": "0.1.10",
21+
"@firebase/performance": "0.5.6",
22+
"@firebase/performance-compat": "0.1.6",
23+
"@firebase/remote-config": "0.3.5",
24+
"@firebase/remote-config-compat": "0.1.6"
2525
},
2626
"devDependencies": {
2727
"typescript": "4.2.2"

‎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": "9.6.7",
10+
"firebase": "9.6.9",
1111
"@types/chai": "4.2.22",
1212
"@types/mocha": "9.0.0",
1313
"chai": "4.3.4",

‎integration/firestore/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"test:memory:debug": "yarn build:memory; karma start --auto-watch --browsers Chrome"
1616
},
1717
"dependencies": {
18-
"@firebase/app": "0.7.17",
19-
"@firebase/firestore": "3.4.5"
18+
"@firebase/app": "0.7.19",
19+
"@firebase/firestore": "3.4.6"
2020
},
2121
"devDependencies": {
2222
"@types/mocha": "9.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": "9.6.7",
12+
"firebase": "9.6.9",
1313
"chai": "4.3.4",
1414
"chromedriver": "94.0.0",
1515
"express": "4.17.1",

‎packages/analytics-compat/CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# @firebase/analytics-compat
22

3+
## 0.1.7
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`2d672cead`](https://github.com/firebase/firebase-js-sdk/commit/2d672cead167187cb714cd89b638c0884ba58f03)]:
8+
- @firebase/util@1.5.0
9+
- @firebase/analytics@0.7.6
10+
- @firebase/component@0.5.11
11+
312
## 0.1.6
413

514
### Patch Changes

‎packages/analytics-compat/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/analytics-compat",
3-
"version": "0.1.6",
3+
"version": "0.1.7",
44
"description": "",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.cjs.js",
@@ -23,7 +23,7 @@
2323
"@firebase/app-compat": "0.x"
2424
},
2525
"devDependencies": {
26-
"@firebase/app-compat": "0.1.18",
26+
"@firebase/app-compat": "0.1.20",
2727
"rollup": "2.57.0",
2828
"@rollup/plugin-json": "4.1.0",
2929
"rollup-plugin-typescript2": "0.30.0",
@@ -52,10 +52,10 @@
5252
},
5353
"typings": "dist/src/index.d.ts",
5454
"dependencies": {
55-
"@firebase/component": "0.5.10",
56-
"@firebase/analytics": "0.7.5",
55+
"@firebase/component": "0.5.11",
56+
"@firebase/analytics": "0.7.6",
5757
"@firebase/analytics-types": "0.7.0",
58-
"@firebase/util": "1.4.3",
58+
"@firebase/util": "1.5.0",
5959
"tslib": "^2.1.0"
6060
},
6161
"nyc": {

‎packages/analytics/CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# @firebase/analytics
22

3+
## 0.7.6
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`2d672cead`](https://github.com/firebase/firebase-js-sdk/commit/2d672cead167187cb714cd89b638c0884ba58f03), [`ddeff8384`](https://github.com/firebase/firebase-js-sdk/commit/ddeff8384ab8a927f02244e2591db525fd58c7dd)]:
8+
- @firebase/installations@0.5.6
9+
- @firebase/util@1.5.0
10+
- @firebase/component@0.5.11
11+
312
## 0.7.5
413

514
### Patch Changes

‎packages/analytics/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/analytics",
3-
"version": "0.7.5",
3+
"version": "0.7.6",
44
"description": "A analytics package for new firebase packages",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.cjs.js",
@@ -39,15 +39,15 @@
3939
"@firebase/app": "0.x"
4040
},
4141
"dependencies": {
42-
"@firebase/installations": "0.5.5",
42+
"@firebase/installations": "0.5.6",
4343
"@firebase/logger": "0.3.2",
44-
"@firebase/util": "1.4.3",
45-
"@firebase/component": "0.5.10",
44+
"@firebase/util": "1.5.0",
45+
"@firebase/component": "0.5.11",
4646
"tslib": "^2.1.0"
4747
},
4848
"license": "Apache-2.0",
4949
"devDependencies": {
50-
"@firebase/app": "0.7.17",
50+
"@firebase/app": "0.7.19",
5151
"rollup": "2.57.0",
5252
"@rollup/plugin-commonjs": "21.0.0",
5353
"@rollup/plugin-json": "4.1.0",

‎packages/app-check-compat/CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# @firebase/app-check-compat
22

3+
## 0.2.4
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`2d672cead`](https://github.com/firebase/firebase-js-sdk/commit/2d672cead167187cb714cd89b638c0884ba58f03), [`a7f4a2eb6`](https://github.com/firebase/firebase-js-sdk/commit/a7f4a2eb6ed08596dffe75825bca1a2034bfcd2e)]:
8+
- @firebase/util@1.5.0
9+
- @firebase/app-check@0.5.4
10+
- @firebase/component@0.5.11
11+
312
## 0.2.3
413

514
### Patch Changes

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/app-check-compat",
3-
"version": "0.2.3",
3+
"version": "0.2.4",
44
"description": "A compat App Check package for new firebase packages",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.cjs.js",
@@ -34,15 +34,16 @@
3434
"@firebase/app-compat": "0.x"
3535
},
3636
"dependencies": {
37-
"@firebase/app-check": "0.5.3",
37+
"@firebase/app-check": "0.5.4",
38+
"@firebase/app-check-types": "0.4.0",
3839
"@firebase/logger": "0.3.2",
39-
"@firebase/util": "1.4.3",
40-
"@firebase/component": "0.5.10",
40+
"@firebase/util": "1.5.0",
41+
"@firebase/component": "0.5.11",
4142
"tslib": "^2.1.0"
4243
},
4344
"license": "Apache-2.0",
4445
"devDependencies": {
45-
"@firebase/app-compat": "0.1.18",
46+
"@firebase/app-compat": "0.1.20",
4647
"rollup": "2.57.0",
4748
"@rollup/plugin-commonjs": "21.0.0",
4849
"@rollup/plugin-json": "4.1.0",

‎packages/app-check/CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# @firebase/app-check
22

3+
## 0.5.4
4+
5+
### Patch Changes
6+
7+
- [`a7f4a2eb6`](https://github.com/firebase/firebase-js-sdk/commit/a7f4a2eb6ed08596dffe75825bca1a2034bfcd2e) [#5967](https://github.com/firebase/firebase-js-sdk/pull/5967) - Update platform logging to use new endpoint.
8+
9+
- Updated dependencies [[`2d672cead`](https://github.com/firebase/firebase-js-sdk/commit/2d672cead167187cb714cd89b638c0884ba58f03)]:
10+
- @firebase/util@1.5.0
11+
- @firebase/component@0.5.11
12+
313
## 0.5.3
414

515
### Patch Changes

‎packages/app-check/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/app-check",
3-
"version": "0.5.3",
3+
"version": "0.5.4",
44
"description": "The App Check component of the Firebase JS SDK",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.cjs.js",
@@ -37,14 +37,14 @@
3737
"@firebase/app": "0.x"
3838
},
3939
"dependencies": {
40-
"@firebase/util": "1.4.3",
41-
"@firebase/component": "0.5.10",
40+
"@firebase/util": "1.5.0",
41+
"@firebase/component": "0.5.11",
4242
"@firebase/logger": "0.3.2",
4343
"tslib": "^2.1.0"
4444
},
4545
"license": "Apache-2.0",
4646
"devDependencies": {
47-
"@firebase/app": "0.7.17",
47+
"@firebase/app": "0.7.19",
4848
"rollup": "2.57.0",
4949
"@rollup/plugin-commonjs": "21.0.0",
5050
"@rollup/plugin-json": "4.1.0",

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import '../test/setup';
1919
import { expect } from 'chai';
2020
import { stub, SinonStub, useFakeTimers } from 'sinon';
2121
import { FirebaseApp } from '@firebase/app';
22-
import { getFakeApp, getFakePlatformLoggingProvider } from '../test/util';
22+
import { getFakeApp, getFakeHeartbeatServiceProvider } from '../test/util';
2323
import {
2424
getExchangeRecaptchaV3TokenRequest,
2525
exchangeToken,
@@ -86,7 +86,7 @@ describe('client', () => {
8686

8787
const response = await exchangeToken(
8888
getExchangeRecaptchaV3TokenRequest(app, 'fake-custom-token'),
89-
getFakePlatformLoggingProvider('a/1.2.3 fire-app-check/2.3.4')
89+
getFakeHeartbeatServiceProvider('a/1.2.3 fire-app-check/2.3.4')
9090
);
9191

9292
expect(
@@ -114,7 +114,7 @@ describe('client', () => {
114114
try {
115115
await exchangeToken(
116116
getExchangeRecaptchaV3TokenRequest(app, 'fake-custom-token'),
117-
getFakePlatformLoggingProvider()
117+
getFakeHeartbeatServiceProvider()
118118
);
119119
} catch (e) {
120120
expect(e).instanceOf(FirebaseError);
@@ -143,7 +143,7 @@ describe('client', () => {
143143
try {
144144
await exchangeToken(
145145
getExchangeRecaptchaV3TokenRequest(app, 'fake-custom-token'),
146-
getFakePlatformLoggingProvider()
146+
getFakeHeartbeatServiceProvider()
147147
);
148148
} catch (e) {
149149
expect(e).instanceOf(FirebaseError);
@@ -171,7 +171,7 @@ describe('client', () => {
171171
try {
172172
await exchangeToken(
173173
getExchangeRecaptchaV3TokenRequest(app, 'fake-custom-token'),
174-
getFakePlatformLoggingProvider()
174+
getFakeHeartbeatServiceProvider()
175175
);
176176
} catch (e) {
177177
expect(e).instanceOf(FirebaseError);
@@ -205,7 +205,7 @@ describe('client', () => {
205205
try {
206206
await exchangeToken(
207207
getExchangeRecaptchaV3TokenRequest(app, 'fake-custom-token'),
208-
getFakePlatformLoggingProvider()
208+
getFakeHeartbeatServiceProvider()
209209
);
210210
} catch (e) {
211211
expect(e).instanceOf(FirebaseError);

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,20 @@ interface AppCheckRequest {
4242

4343
export async function exchangeToken(
4444
{ url, body }: AppCheckRequest,
45-
platformLoggerProvider: Provider<'platform-logger'>
45+
heartbeatServiceProvider: Provider<'heartbeat'>
4646
): Promise<AppCheckTokenInternal> {
4747
const headers: HeadersInit = {
4848
'Content-Type': 'application/json'
4949
};
50-
// If platform logger exists, add the platform info string to the header.
51-
const platformLogger = platformLoggerProvider.getImmediate({
50+
// If heartbeat service exists, add heartbeat header string to the header.
51+
const heartbeatService = heartbeatServiceProvider.getImmediate({
5252
optional: true
5353
});
54-
if (platformLogger) {
55-
headers['X-Firebase-Client'] = platformLogger.getPlatformInfoString();
54+
if (heartbeatService) {
55+
const heartbeatsHeader = await heartbeatService.getHeartbeatsHeader();
56+
if (heartbeatsHeader) {
57+
headers['X-Firebase-Client'] = heartbeatsHeader;
58+
}
5659
}
5760
const options: RequestInit = {
5861
method: 'POST',

‎packages/app-check/src/factory.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import { getState } from './state';
3232
export class AppCheckService implements AppCheck, _FirebaseService {
3333
constructor(
3434
public app: FirebaseApp,
35-
public platformLoggerProvider: Provider<'platform-logger'>
35+
public heartbeatServiceProvider: Provider<'heartbeat'>
3636
) {}
3737
_delete(): Promise<void> {
3838
const { tokenObservers } = getState(this.app);
@@ -45,9 +45,9 @@ export class AppCheckService implements AppCheck, _FirebaseService {
4545

4646
export function factory(
4747
app: FirebaseApp,
48-
platformLoggerProvider: Provider<'platform-logger'>
48+
heartbeatServiceProvider: Provider<'heartbeat'>
4949
): AppCheckService {
50-
return new AppCheckService(app, platformLoggerProvider);
50+
return new AppCheckService(app, heartbeatServiceProvider);
5151
}
5252

5353
export function internalFactory(

‎packages/app-check/src/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ function registerAppCheck(): void {
4848
container => {
4949
// getImmediate for FirebaseApp will always succeed
5050
const app = container.getProvider('app').getImmediate();
51-
const platformLoggerProvider = container.getProvider('platform-logger');
52-
return factory(app, platformLoggerProvider);
51+
const heartbeatServiceProvider = container.getProvider('heartbeat');
52+
return factory(app, heartbeatServiceProvider);
5353
},
5454
ComponentType.PUBLIC
5555
)

‎packages/app-check/src/internal-api.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ export async function getToken(
106106
if (!state.exchangeTokenPromise) {
107107
state.exchangeTokenPromise = exchangeToken(
108108
getExchangeDebugTokenRequest(app, await getDebugToken()),
109-
appCheck.platformLoggerProvider
109+
appCheck.heartbeatServiceProvider
110110
).then(token => {
111111
state.exchangeTokenPromise = undefined;
112112
return token;

0 commit comments

Comments
 (0)