Skip to content

Commit 84902e3

Browse files
committed
Merge branch 'master' into mrschmidt/debug
2 parents ba01325 + 5473957 commit 84902e3

File tree

65 files changed

+366
-186
lines changed

Some content is hidden

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

65 files changed

+366
-186
lines changed

.changeset/a-dark-knight.md

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

.changeset/gentle-items-refuse.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@firebase/firestore': patch
3+
---
4+
5+
Fixes a regression that prevented Firestore from detecting Auth during its initial initialization, which could cause some writes to not be send.
6+
[4971](https://github.com/firebase/firebase-js-sdk/pull/4971) didn't actually fix it.

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.6.4",
10+
"firebase": "8.6.6",
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.23",
18-
"@firebase/firestore": "2.3.3",
17+
"@firebase/app": "0.6.25",
18+
"@firebase/firestore": "2.3.5",
1919
"@types/mocha": "7.0.2",
2020
"gulp": "4.0.2",
2121
"gulp-filter": "6.0.0",

integration/messaging/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
"test:manual": "mocha --exit"
1010
},
1111
"devDependencies": {
12-
"firebase": "8.6.4",
12+
"firebase": "8.6.6",
1313
"chai": "4.2.0",
14-
"chromedriver": "89.0.0",
14+
"chromedriver": "91.0.0",
1515
"express": "4.17.1",
1616
"geckodriver": "1.21.1",
1717
"mocha": "7.2.0",

packages-exp/analytics-compat/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
},
4545
"typings": "dist/src/index.d.ts",
4646
"dependencies": {
47-
"@firebase/component": "0.5.1",
47+
"@firebase/component": "0.5.2",
4848
"@firebase/analytics-exp": "0.0.900",
4949
"@firebase/analytics-types": "0.4.0",
5050
"@firebase/util": "1.1.0",

packages-exp/analytics-exp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"@firebase/installations-exp": "0.0.900",
3636
"@firebase/logger": "0.2.6",
3737
"@firebase/util": "1.1.0",
38-
"@firebase/component": "0.5.1",
38+
"@firebase/component": "0.5.2",
3939
"tslib": "^2.1.0"
4040
},
4141
"license": "Apache-2.0",

packages-exp/app-compat/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"@firebase/app-exp": "0.0.900",
3232
"@firebase/util": "1.1.0",
3333
"@firebase/logger": "0.2.6",
34-
"@firebase/component": "0.5.1",
34+
"@firebase/component": "0.5.2",
3535
"tslib": "^2.1.0",
3636
"dom-storage": "2.1.0",
3737
"xmlhttprequest": "1.8.0"

packages-exp/app-exp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"dependencies": {
3333
"@firebase/util": "1.1.0",
3434
"@firebase/logger": "0.2.6",
35-
"@firebase/component": "0.5.1",
35+
"@firebase/component": "0.5.2",
3636
"tslib": "^2.1.0"
3737
},
3838
"license": "Apache-2.0",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"dependencies": {
3535
"@firebase/auth-exp": "0.0.900",
3636
"@firebase/auth-types": "0.10.3",
37-
"@firebase/component": "0.5.1",
37+
"@firebase/component": "0.5.2",
3838
"@firebase/util": "1.1.0",
3939
"node-fetch": "2.6.1",
4040
"selenium-webdriver": "^4.0.0-beta.2",

packages-exp/auth-exp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"@firebase/app-exp": "0.x"
5252
},
5353
"dependencies": {
54-
"@firebase/component": "0.5.1",
54+
"@firebase/component": "0.5.2",
5555
"@firebase/logger": "0.2.6",
5656
"@firebase/util": "1.1.0",
5757
"node-fetch": "2.6.1",

packages-exp/auth-exp/src/api/authentication/mfa.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ describe('api/authentication/finalizeSignInPhoneMfa', () => {
158158

159159
await expect(finalizeSignInPhoneMfa(auth, request)).to.be.rejectedWith(
160160
FirebaseError,
161-
'Firebase: The SMS verification code used to create the phone auth credential is invalid. Please resend the verification code sms and be sure use the verification code provided by the user. (auth/invalid-verification-code).'
161+
'Firebase: The SMS verification code used to create the phone auth credential is invalid. Please resend the verification code sms and be sure to use the verification code provided by the user. (auth/invalid-verification-code).'
162162
);
163163
expect(mock.calls[0].request).to.eql({
164164
tenantId: null,

packages-exp/auth-exp/src/api/authentication/sms.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ describe('api/authentication/signInWithPhoneNumber', () => {
154154

155155
await expect(signInWithPhoneNumber(auth, request)).to.be.rejectedWith(
156156
FirebaseError,
157-
'Firebase: The SMS verification code used to create the phone auth credential is invalid. Please resend the verification code sms and be sure use the verification code provided by the user. (auth/invalid-verification-code).'
157+
'Firebase: The SMS verification code used to create the phone auth credential is invalid. Please resend the verification code sms and be sure to use the verification code provided by the user. (auth/invalid-verification-code).'
158158
);
159159
expect(mock.calls[0].request).to.eql(request);
160160
});
@@ -222,7 +222,7 @@ describe('api/authentication/linkWithPhoneNumber', () => {
222222

223223
await expect(linkWithPhoneNumber(auth, request)).to.be.rejectedWith(
224224
FirebaseError,
225-
'Firebase: The SMS verification code used to create the phone auth credential is invalid. Please resend the verification code sms and be sure use the verification code provided by the user. (auth/invalid-verification-code).'
225+
'Firebase: The SMS verification code used to create the phone auth credential is invalid. Please resend the verification code sms and be sure to use the verification code provided by the user. (auth/invalid-verification-code).'
226226
);
227227
expect(mock.calls[0].request).to.eql(request);
228228
});

packages-exp/auth-exp/src/core/errors.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ function _debugErrorMap(): ErrorMap<AuthErrorCode> {
186186
[AuthErrorCode.INVALID_AUTH_EVENT]: 'An internal AuthError has occurred.',
187187
[AuthErrorCode.INVALID_CODE]:
188188
'The SMS verification code used to create the phone auth credential is ' +
189-
'invalid. Please resend the verification code sms and be sure use the ' +
189+
'invalid. Please resend the verification code sms and be sure to use the ' +
190190
'verification code provided by the user.',
191191
[AuthErrorCode.INVALID_CONTINUE_URI]:
192192
'The continue URL provided in the request is invalid.',

packages-exp/firebase-exp/package.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "firebase-exp",
3-
"version": "9.0.0-beta.2",
3+
"version": "9.0.0-beta.3",
44
"private": true,
55
"description": "Firebase JavaScript library for web and Node.js",
66
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
@@ -56,6 +56,10 @@
5656
"node": "./messaging/dist/index.cjs.js",
5757
"default": "./messaging/dist/index.esm.js"
5858
},
59+
"./messaging/sw": {
60+
"node": "./messaging/sw/dist/index.cjs.js",
61+
"default": "./messaging/sw/dist/index.esm.js"
62+
},
5963
"./performance": {
6064
"node": "./performance/dist/index.cjs.js",
6165
"default": "./performance/dist/index.esm.js"
@@ -129,11 +133,11 @@
129133
"@firebase/app-compat": "0.0.900",
130134
"@firebase/auth-exp": "0.0.900",
131135
"@firebase/auth-compat": "0.0.900",
132-
"@firebase/database": "0.10.3",
136+
"@firebase/database": "0.10.4",
133137
"@firebase/functions-exp": "0.0.900",
134138
"@firebase/functions-compat": "0.0.900",
135-
"@firebase/firestore": "2.3.3",
136-
"@firebase/storage": "0.5.3",
139+
"@firebase/firestore": "2.3.5",
140+
"@firebase/storage": "0.5.4",
137141
"@firebase/performance-exp": "0.0.900",
138142
"@firebase/performance-compat": "0.0.900",
139143
"@firebase/remote-config-exp": "0.0.900",

packages-exp/functions-compat/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
},
4848
"typings": "dist/src/index.d.ts",
4949
"dependencies": {
50-
"@firebase/component": "0.5.1",
50+
"@firebase/component": "0.5.2",
5151
"@firebase/functions-exp": "0.0.900",
5252
"@firebase/functions-types": "0.4.0",
5353
"@firebase/messaging-types": "0.5.0",

packages-exp/functions-exp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
},
5151
"typings": "dist/functions-exp-public.d.ts",
5252
"dependencies": {
53-
"@firebase/component": "0.5.1",
53+
"@firebase/component": "0.5.2",
5454
"@firebase/messaging-types": "0.5.0",
5555
"@firebase/util": "1.1.0",
5656
"node-fetch": "2.6.1",

packages-exp/installations-compat/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"@firebase/installations-exp": "0.0.900",
5353
"@firebase/installations-types": "0.3.4",
5454
"@firebase/util": "1.1.0",
55-
"@firebase/component": "0.5.1",
55+
"@firebase/component": "0.5.2",
5656
"idb": "3.0.2",
5757
"tslib": "^2.1.0"
5858
},

packages-exp/installations-exp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
},
5757
"dependencies": {
5858
"@firebase/util": "1.1.0",
59-
"@firebase/component": "0.5.1",
59+
"@firebase/component": "0.5.2",
6060
"idb": "3.0.2",
6161
"tslib": "^2.1.0"
6262
},

packages-exp/messaging-compat/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
"test:karma": "karma start --single-run",
2626
"test:debug": "karma start --browsers=Chrome --auto-watch",
2727
"type-check": "tsc --noEmit",
28-
"add-compat-overloads": "ts-node-script ../../scripts/exp/create-overloads.ts -i ../messaging-exp/dist/messaging-exp-public.d.ts -o dist/src/index.d.ts -a -r FirebaseMessaging:MessagingCompat -r FirebaseApp:FirebaseAppCompat --moduleToEnhance @firebase/messaging"
28+
"add-compat-overloads": "ts-node-script ../../scripts/exp/create-overloads.ts -i ../messaging-exp/dist/index-public.d.ts -o dist/src/index.d.ts -a -r FirebaseMessaging:MessagingCompat -r FirebaseApp:FirebaseAppCompat --moduleToEnhance @firebase/messaging"
2929
},
3030
"peerDependencies": {
3131
"@firebase/app-compat": "0.x"
3232
},
3333
"dependencies": {
3434
"@firebase/messaging-exp": "0.0.900",
35-
"@firebase/component": "0.5.1",
35+
"@firebase/component": "0.5.2",
3636
"@firebase/installations-exp": "0.0.900",
3737
"@firebase/util": "1.1.0",
3838
"tslib": "^2.1.0"

packages-exp/messaging-exp/api-extractor.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,15 @@
88
}],
99
"dtsRollup": {
1010
/**
11-
* rollup is not supported when multiple entry points are present
11+
* rollup is not supported when multiple entry points are present.
12+
* npm script api-report:rollup is used to generate dts rollup.
1213
*/
1314
"enabled": false
14-
}
15+
},
16+
"apiReport": {
17+
/**
18+
* apiReport is handled by npm script api-report:rollup
19+
*/
20+
"enabled": false
21+
}
1522
}

packages-exp/messaging-exp/package.json

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,25 @@
1818
"lint:fix": "eslint --fix -c .eslintrc.js '**/*.ts' --ignore-path '../../.gitignore'",
1919
"build": "rollup -c && yarn api-report",
2020
"build:deps": "lerna run --scope @firebase/'{app-exp,messaging-exp}' --include-dependencies build",
21-
"build:release": "rollup -c rollup.config.release.js && yarn api-report",
21+
"build:release": "rollup -c rollup.config.release.js && yarn api-report && yarn typings:public",
2222
"dev": "rollup -c -w",
2323
"test": "run-p test:karma type-check lint ",
2424
"test:integration": "run-p test:karma type-check lint && cd ../../integration/messaging && npm run-script test",
2525
"test:ci": "node ../../scripts/run_tests_in_ci.js",
2626
"test:karma": "karma start --single-run",
2727
"test:debug": "karma start --browsers=Chrome --auto-watch",
28-
"api-report": "api-extractor run --local --verbose",
29-
"type-check": "tsc --noEmit"
28+
"api-report": "yarn api-report:rollup && yarn api-report:api-json",
29+
"api-report:rollup": "ts-node-script ../../repo-scripts/prune-dts/extract-public-api.ts --package messaging-exp --packageRoot . --typescriptDts ./dist/index.d.ts --rollupDts ./dist/private.d.ts --untrimmedRollupDts ./dist/internal.d.ts --publicDts ./dist/index-public.d.ts",
30+
"api-report:api-json": "api-extractor run --local --verbose",
31+
"type-check": "tsc --noEmit",
32+
"typings:public": "node ../../scripts/exp/use_typings.js ./dist/index-public.d.ts"
3033
},
3134
"license": "Apache-2.0",
3235
"peerDependencies": {
3336
"@firebase/app-exp": "0.x"
3437
},
3538
"dependencies": {
36-
"@firebase/component": "0.5.1",
39+
"@firebase/component": "0.5.2",
3740
"@firebase/installations-exp": "0.0.900",
3841
"@firebase/util": "1.1.0",
3942
"idb": "3.0.2",
@@ -54,4 +57,4 @@
5457
"url": "https://github.com/firebase/firebase-js-sdk/issues"
5558
},
5659
"esm5": "dist/index.esm.js"
57-
}
60+
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import { extractAppConfig } from './helpers/extract-app-config';
2727
export class MessagingService implements _FirebaseService {
2828
readonly app!: FirebaseApp;
2929
readonly firebaseDependencies!: FirebaseInternalDependencies;
30-
deleteService!: () => Promise<void>;
3130

3231
swRegistration?: ServiceWorkerRegistration;
3332
vapidKey?: string;
@@ -58,6 +57,6 @@ export class MessagingService implements _FirebaseService {
5857
}
5958

6059
_delete(): Promise<void> {
61-
return this.deleteService();
60+
return Promise.resolve();
6261
}
6362
}

packages-exp/performance-compat/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"@firebase/performance-types": "0.0.13",
3535
"@firebase/util": "1.1.0",
3636
"@firebase/logger": "0.2.6",
37-
"@firebase/component": "0.5.1",
37+
"@firebase/component": "0.5.2",
3838
"tslib": "^2.1.0"
3939
},
4040
"devDependencies": {

packages-exp/performance-exp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"@firebase/logger": "0.2.6",
3535
"@firebase/installations-exp": "0.0.900",
3636
"@firebase/util": "1.1.0",
37-
"@firebase/component": "0.5.1",
37+
"@firebase/component": "0.5.2",
3838
"tslib": "^2.1.0"
3939
},
4040
"license": "Apache-2.0",

packages-exp/remote-config-compat/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"@firebase/remote-config-types": "0.1.9",
3434
"@firebase/util": "1.1.0",
3535
"@firebase/logger": "0.2.6",
36-
"@firebase/component": "0.5.1",
36+
"@firebase/component": "0.5.2",
3737
"tslib": "^2.1.0"
3838
},
3939
"devDependencies": {

packages-exp/remote-config-exp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"@firebase/installations-exp": "0.0.900",
3737
"@firebase/logger": "0.2.6",
3838
"@firebase/util": "1.1.0",
39-
"@firebase/component": "0.5.1",
39+
"@firebase/component": "0.5.2",
4040
"tslib": "^2.1.0"
4141
},
4242
"license": "Apache-2.0",

packages/analytics/CHANGELOG.md

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

3+
## 0.6.12
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`4c4b6aed9`](https://github.com/firebase/firebase-js-sdk/commit/4c4b6aed9757c9a7e75fb698a15e53274f93880b)]:
8+
- @firebase/component@0.5.2
9+
- @firebase/installations@0.4.28
10+
311
## 0.6.11
412

513
### Patch Changes

packages/analytics/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/analytics",
3-
"version": "0.6.11",
3+
"version": "0.6.12",
44
"description": "A analytics package for new firebase packages",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.cjs.js",
@@ -27,15 +27,15 @@
2727
},
2828
"dependencies": {
2929
"@firebase/analytics-types": "0.4.0",
30-
"@firebase/installations": "0.4.27",
30+
"@firebase/installations": "0.4.28",
3131
"@firebase/logger": "0.2.6",
3232
"@firebase/util": "1.1.0",
33-
"@firebase/component": "0.5.1",
33+
"@firebase/component": "0.5.2",
3434
"tslib": "^2.1.0"
3535
},
3636
"license": "Apache-2.0",
3737
"devDependencies": {
38-
"@firebase/app": "0.6.23",
38+
"@firebase/app": "0.6.25",
3939
"rollup": "2.35.1",
4040
"@rollup/plugin-commonjs": "17.1.0",
4141
"@rollup/plugin-json": "4.1.0",

packages/app-check/CHANGELOG.md

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

3+
## 0.1.3
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`4c4b6aed9`](https://github.com/firebase/firebase-js-sdk/commit/4c4b6aed9757c9a7e75fb698a15e53274f93880b)]:
8+
- @firebase/component@0.5.2
9+
310
## 0.1.2
411

512
### Patch Changes

0 commit comments

Comments
 (0)