Skip to content

Commit 55dcc70

Browse files
schmidt-sebastianschmidt-sebastian
committed
Merge branch 'master' into mrschmidt/configureindexes
2 parents 71bd225 + 4bd3a88 commit 55dcc70

File tree

186 files changed

+16943
-4799
lines changed

Some content is hidden

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

186 files changed

+16943
-4799
lines changed

‎.changeset/cuddly-birds-stare.md

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

‎.changeset/moody-ways-learn.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@firebase/auth": patch
3+
---
4+
5+
Fix error code thrown when the network times out

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ assignees: ''
1111
<!-- Step 1 [READ THIS] -->
1212
<!--
1313
14-
**Thank you for submitting your issue. We are operating at reduced capacity from Dec 20 2021 to Jan 4 2022. While we are monitoring issues for major breakages and emergencies, there may be delayed responses. For more urgent requests please reach us via our support channels https://firebase.google.com/support**
15-
1614
Are you in the right place?
1715
* For issues or feature requests related to __the code in this repository__
1816
file a Github issue.

‎common/api-review/firestore-lite.api.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import { EmulatorMockTokenOptions } from '@firebase/util';
88
import { FirebaseApp } from '@firebase/app';
9+
import { FirebaseError } from '@firebase/util';
910
import { LogLevelString as LogLevel } from '@firebase/logger';
1011

1112
// @public
@@ -147,10 +148,9 @@ export interface FirestoreDataConverter<T> {
147148
}
148149

149150
// @public
150-
export class FirestoreError extends Error {
151+
export class FirestoreError extends FirebaseError {
151152
readonly code: FirestoreErrorCode;
152153
readonly message: string;
153-
readonly name: string;
154154
readonly stack?: string;
155155
}
156156

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import { EmulatorMockTokenOptions } from '@firebase/util';
88
import { FirebaseApp } from '@firebase/app';
9+
import { FirebaseError } from '@firebase/util';
910
import { LogLevelString as LogLevel } from '@firebase/logger';
1011

1112
// @public
@@ -177,10 +178,9 @@ export interface FirestoreDataConverter<T> {
177178
}
178179

179180
// @public
180-
export class FirestoreError extends Error {
181+
export class FirestoreError extends FirebaseError {
181182
readonly code: FirestoreErrorCode;
182183
readonly message: string;
183-
readonly name: string;
184184
readonly stack?: string;
185185
}
186186

‎e2e/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@
3535
"typescript": "4.3.4",
3636
"webpack": "5.41.1",
3737
"webpack-cli": "4.7.2",
38-
"webpack-dev-server": "3.10.1"
38+
"webpack-dev-server": "4.7.3"
3939
}
4040
}

‎e2e/yarn.lock

Lines changed: 493 additions & 1310 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.11",
12-
"@firebase/app-compat": "0.1.12",
13-
"@firebase/analytics": "0.7.4",
14-
"@firebase/analytics-compat": "0.1.5",
15-
"@firebase/auth": "0.19.4",
16-
"@firebase/auth-compat": "0.2.4",
17-
"@firebase/functions": "0.7.6",
18-
"@firebase/functions-compat": "0.1.7",
19-
"@firebase/messaging": "0.9.4",
20-
"@firebase/messaging-compat": "0.1.4",
21-
"@firebase/performance": "0.5.4",
22-
"@firebase/performance-compat": "0.1.4",
23-
"@firebase/remote-config": "0.3.3",
24-
"@firebase/remote-config-compat": "0.1.4"
11+
"@firebase/app": "0.7.13",
12+
"@firebase/app-compat": "0.1.14",
13+
"@firebase/analytics": "0.7.5",
14+
"@firebase/analytics-compat": "0.1.6",
15+
"@firebase/auth": "0.19.5",
16+
"@firebase/auth-compat": "0.2.5",
17+
"@firebase/functions": "0.7.7",
18+
"@firebase/functions-compat": "0.1.8",
19+
"@firebase/messaging": "0.9.6",
20+
"@firebase/messaging-compat": "0.1.6",
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"
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.1",
10+
"firebase": "9.6.3",
1111
"@types/chai": "4.2.22",
1212
"@types/mocha": "9.0.0",
1313
"chai": "4.3.4",

‎integration/firestore/firebase_export.ts

Lines changed: 12 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@
1515
* limitations under the License.
1616
*/
1717

18-
import firebase from '@firebase/app-compat';
19-
import '@firebase/firestore-compat';
20-
import { FirebaseApp } from '@firebase/app-types';
21-
import { Settings, FirebaseFirestore } from '@firebase/firestore-types';
18+
import { FirebaseApp, initializeApp } from '@firebase/app';
19+
import {
20+
Firestore,
21+
FirestoreSettings,
22+
initializeFirestore
23+
} from '@firebase/firestore';
2224

2325
// This file replaces "packages/firestore/test/integration/util/firebase_export"
2426
// and depends on the minified sources.
@@ -28,43 +30,18 @@ let appCount = 0;
2830
export function newTestFirestore(
2931
projectId: string,
3032
nameOrApp?: string | FirebaseApp,
31-
settings?: Settings
32-
): FirebaseFirestore {
33+
settings?: FirestoreSettings
34+
): Firestore {
3335
if (nameOrApp === undefined) {
3436
nameOrApp = 'test-app-' + appCount++;
3537
}
3638
const app =
3739
typeof nameOrApp === 'string'
38-
? firebase.initializeApp({ apiKey: 'fake-api-key', projectId }, nameOrApp)
40+
? initializeApp({ apiKey: 'fake-api-key', projectId }, nameOrApp)
3941
: nameOrApp;
40-
41-
const firestore = firebase.firestore(app);
42-
if (settings) {
43-
firestore.settings(settings);
44-
}
45-
return firestore;
42+
return initializeFirestore(app, settings || {});
4643
}
4744

48-
export function usesFunctionalApi(): false {
49-
return false;
50-
}
51-
52-
const Blob = firebase.firestore.Blob;
53-
const DocumentReference = firebase.firestore.DocumentReference;
54-
const FieldPath = firebase.firestore.FieldPath;
55-
const FieldValue = firebase.firestore.FieldValue;
56-
const Firestore = firebase.firestore.Firestore;
57-
const GeoPoint = firebase.firestore.GeoPoint;
58-
const QueryDocumentSnapshot = firebase.firestore.QueryDocumentSnapshot;
59-
const Timestamp = firebase.firestore.Timestamp;
45+
export * from '@firebase/firestore';
6046

61-
export {
62-
Blob,
63-
DocumentReference,
64-
FieldPath,
65-
FieldValue,
66-
Firestore,
67-
GeoPoint,
68-
QueryDocumentSnapshot,
69-
Timestamp
70-
};
47+
export type PrivateSettings = Record<string, any>;

‎integration/firestore/gulpfile.js

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -53,25 +53,18 @@ function copyTests() {
5353
.pipe(
5454
replace(
5555
/**
56-
* This regex is designed to match the following statement used in our
57-
* firestore integration test suites:
58-
*
59-
* import * as firebaseExport from '../../util/firebase_export';
60-
*
61-
* It will handle variations in whitespace, single/double quote
62-
* differences, as well as different paths to a valid firebase_export
56+
* This regex is designed to match the Firebase import in our
57+
* integration tests.
6358
*/
64-
/import\s+\* as firebaseExport\s+from\s+('|")[^\1]+firebase_export\1;?/,
65-
`import * as firebaseExport from '${resolve(
66-
__dirname,
67-
'./firebase_export'
68-
)}';
59+
/\s+from '\.(\.\/util)?\/firebase_export';/,
60+
` from '${resolve(__dirname, './firebase_export')}';
6961
70-
if (typeof process === 'undefined') {
71-
process = { env: { INCLUDE_FIRESTORE_PERSISTENCE: '${isPersistenceEnabled()}' } } as any;
72-
} else {
73-
process.env.INCLUDE_FIRESTORE_PERSISTENCE = '${isPersistenceEnabled()}';
74-
}`
62+
if (typeof process === 'undefined') {
63+
process = { env: { INCLUDE_FIRESTORE_PERSISTENCE: '${isPersistenceEnabled()}' } } as any;
64+
} else {
65+
process.env.INCLUDE_FIRESTORE_PERSISTENCE = '${isPersistenceEnabled()}';
66+
}
67+
`
7568
)
7669
)
7770
.pipe(

‎integration/firestore/package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,19 @@
66
"build:deps": "lerna run --scope @firebase/'{app,firestore}' --include-dependencies build",
77
"build:persistence": "INCLUDE_FIRESTORE_PERSISTENCE=true gulp compile-tests",
88
"build:memory": "INCLUDE_FIRESTORE_PERSISTENCE=false gulp compile-tests",
9+
"prettier": "prettier --write '*.js' '*.ts'",
910
"test": "yarn build:memory; karma start --single-run; yarn build:persistence; karma start --single-run;",
1011
"test:ci": "node ../../scripts/run_tests_in_ci.js -s test",
1112
"test:persistence": " yarn build:persistence; karma start --single-run",
1213
"test:persistence:debug": "yarn build:persistence; karma start --auto-watch --browsers Chrome",
1314
"test:memory": "yarn build:memory; karma start --single-run",
1415
"test:memory:debug": "yarn build:memory; karma start --auto-watch --browsers Chrome"
1516
},
17+
"dependencies": {
18+
"@firebase/app": "0.7.13",
19+
"@firebase/firestore": "3.4.3"
20+
},
1621
"devDependencies": {
17-
"@firebase/app": "0.7.11",
18-
"@firebase/firestore-compat": "0.1.10",
1922
"@types/mocha": "9.0.0",
2023
"gulp": "4.0.2",
2124
"gulp-filter": "7.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.1",
12+
"firebase": "9.6.3",
1313
"chai": "4.3.4",
1414
"chromedriver": "94.0.0",
1515
"express": "4.17.1",

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
"firebase-tools": "9.23.0",
111111
"git-rev-sync": "3.0.1",
112112
"glob": "7.2.0",
113-
"http-server": "13.0.2",
113+
"http-server": "14.1.0",
114114
"indexeddbshim": "8.0.0",
115115
"inquirer": "8.1.5",
116116
"istanbul-instrumenter-loader": "3.0.1",
@@ -130,7 +130,7 @@
130130
"lcov-result-merger": "3.1.0",
131131
"lerna": "4.0.0",
132132
"listr": "0.14.3",
133-
"lodash": "4.17.20",
133+
"lodash": "4.17.21",
134134
"long": "3.2.0",
135135
"merge2": "1.4.1",
136136
"mkdirp": "1.0.4",

‎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.6
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`3b481f572`](https://github.com/firebase/firebase-js-sdk/commit/3b481f572456e1eab3435bfc25717770d95a8c49)]:
8+
- @firebase/util@1.4.3
9+
- @firebase/analytics@0.7.5
10+
- @firebase/component@0.5.10
11+
312
## 0.1.5
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.5",
3+
"version": "0.1.6",
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.12",
26+
"@firebase/app-compat": "0.1.14",
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.9",
56-
"@firebase/analytics": "0.7.4",
55+
"@firebase/component": "0.5.10",
56+
"@firebase/analytics": "0.7.5",
5757
"@firebase/analytics-types": "0.7.0",
58-
"@firebase/util": "1.4.2",
58+
"@firebase/util": "1.4.3",
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.5
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`3b481f572`](https://github.com/firebase/firebase-js-sdk/commit/3b481f572456e1eab3435bfc25717770d95a8c49)]:
8+
- @firebase/util@1.4.3
9+
- @firebase/component@0.5.10
10+
- @firebase/installations@0.5.5
11+
312
## 0.7.4
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.4",
3+
"version": "0.7.5",
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.4",
42+
"@firebase/installations": "0.5.5",
4343
"@firebase/logger": "0.3.2",
44-
"@firebase/util": "1.4.2",
45-
"@firebase/component": "0.5.9",
44+
"@firebase/util": "1.4.3",
45+
"@firebase/component": "0.5.10",
4646
"tslib": "^2.1.0"
4747
},
4848
"license": "Apache-2.0",
4949
"devDependencies": {
50-
"@firebase/app": "0.7.11",
50+
"@firebase/app": "0.7.13",
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.3
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`3b481f572`](https://github.com/firebase/firebase-js-sdk/commit/3b481f572456e1eab3435bfc25717770d95a8c49)]:
8+
- @firebase/util@1.4.3
9+
- @firebase/app-check@0.5.3
10+
- @firebase/component@0.5.10
11+
312
## 0.2.2
413

514
### Patch Changes

‎packages/app-check-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/app-check-compat",
3-
"version": "0.2.2",
3+
"version": "0.2.3",
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,15 @@
3434
"@firebase/app-compat": "0.x"
3535
},
3636
"dependencies": {
37-
"@firebase/app-check": "0.5.2",
37+
"@firebase/app-check": "0.5.3",
3838
"@firebase/logger": "0.3.2",
39-
"@firebase/util": "1.4.2",
40-
"@firebase/component": "0.5.9",
39+
"@firebase/util": "1.4.3",
40+
"@firebase/component": "0.5.10",
4141
"tslib": "^2.1.0"
4242
},
4343
"license": "Apache-2.0",
4444
"devDependencies": {
45-
"@firebase/app-compat": "0.1.12",
45+
"@firebase/app-compat": "0.1.14",
4646
"rollup": "2.57.0",
4747
"@rollup/plugin-commonjs": "21.0.0",
4848
"@rollup/plugin-json": "4.1.0",

0 commit comments

Comments
 (0)