Skip to content

Commit 64cfe5f

Browse files
schmidt-sebastianschmidt-sebastian
committed
Merge branch 'mrschmidt/indexfree-master' into mrschmidt/persistreadtime
2 parents fd5678b + 16253f6 commit 64cfe5f

File tree

22 files changed

+105
-89
lines changed

22 files changed

+105
-89
lines changed

‎config/.eslintrc.json

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,9 @@
9797
],
9898
"@typescript-eslint/array-type": [
9999
"error",
100-
"array-simple"
100+
{
101+
"default": "array-simple"
102+
}
101103
],
102104
"@typescript-eslint/ban-types": [
103105
"error",
@@ -115,7 +117,7 @@
115117
"error",
116118
"never"
117119
],
118-
"@typescript-eslint/prefer-interface": "error",
120+
"@typescript-eslint/consistent-type-definitions": ["error", "interface"],
119121
"@typescript-eslint/explicit-member-accessibility": [
120122
"error",
121123
{
@@ -125,15 +127,27 @@
125127
}
126128
}
127129
],
128-
"@typescript-eslint/no-angle-bracket-type-assertion": "error",
130+
"@typescript-eslint/consistent-type-assertions": [
131+
"error",
132+
{
133+
"assertionStyle": "as"
134+
}
135+
],
129136
"@typescript-eslint/no-explicit-any": "error",
130137
"@typescript-eslint/no-namespace": [
131138
"error",
132139
{
133140
"allowDeclarations": true
134141
}
135142
],
136-
"@typescript-eslint/no-triple-slash-reference": "error",
143+
"@typescript-eslint/triple-slash-reference": [
144+
"error",
145+
{
146+
"path": "never",
147+
"types": "never",
148+
"lib": "never"
149+
}
150+
],
137151
"@typescript-eslint/no-require-imports": "error",
138152
"@typescript-eslint/no-useless-constructor": "error",
139153
"@typescript-eslint/semi": "error",

‎integration/browserify/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"test": "karma start --single-run"
88
},
99
"dependencies": {
10-
"firebase": "6.4.2"
10+
"firebase": "6.5.0"
1111
},
1212
"devDependencies": {
1313
"@babel/core": "7.5.5",

‎integration/firebase-typings/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"test": "tsc"
77
},
88
"dependencies": {
9-
"firebase": "6.4.2"
9+
"firebase": "6.5.0"
1010
},
1111
"devDependencies": {
1212
"typescript": "3.5.3"

‎integration/messaging/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"test:manual": "mocha --exit"
99
},
1010
"dependencies": {
11-
"firebase": "6.4.2"
11+
"firebase": "6.5.0"
1212
},
1313
"devDependencies": {
1414
"chai": "4.2.0",

‎integration/typescript/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"test": "karma start --single-run"
77
},
88
"dependencies": {
9-
"firebase": "6.4.2"
9+
"firebase": "6.5.0"
1010
},
1111
"devDependencies": {
1212
"@babel/core": "7.5.5",

‎integration/webpack/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"test": "karma start --single-run"
88
},
99
"dependencies": {
10-
"firebase": "6.4.2"
10+
"firebase": "6.5.0"
1111
},
1212
"devDependencies": {
1313
"@babel/core": "7.5.5",

‎packages/app/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@
6262
"typescript": "3.5.3",
6363
"webpack": "4.39.3",
6464
"eslint": "5.16.0",
65-
"@typescript-eslint/parser": "1.13.0",
66-
"@typescript-eslint/eslint-plugin": "1.13.0",
67-
"@typescript-eslint/eslint-plugin-tslint": "1.13.0",
65+
"@typescript-eslint/parser": "2.0.0",
66+
"@typescript-eslint/eslint-plugin": "2.0.0",
67+
"@typescript-eslint/eslint-plugin-tslint": "2.0.0",
6868
"eslint-plugin-import": "2.18.2"
6969
},
7070
"repository": {

‎packages/firebase/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "firebase",
3-
"version": "6.4.2",
3+
"version": "6.5.0",
44
"description": "Firebase JavaScript library for web and Node.js",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"license": "Apache-2.0",
@@ -41,7 +41,7 @@
4141
"@firebase/app-types": "0.4.3",
4242
"@firebase/auth": "0.11.8",
4343
"@firebase/database": "0.5.1",
44-
"@firebase/firestore": "1.4.12",
44+
"@firebase/firestore": "1.5.0",
4545
"@firebase/functions": "0.4.16",
4646
"@firebase/installations": "0.2.5",
4747
"@firebase/messaging": "0.4.9",

‎packages/firestore-types/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/firestore-types",
3-
"version": "1.4.4",
3+
"version": "1.5.0",
44
"description": "@firebase/firestore Types",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"license": "Apache-2.0",

‎packages/firestore/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/firestore",
3-
"version": "1.4.12",
3+
"version": "1.5.0",
44
"description": "",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"scripts": {
@@ -30,7 +30,7 @@
3030
"dist"
3131
],
3232
"dependencies": {
33-
"@firebase/firestore-types": "1.4.4",
33+
"@firebase/firestore-types": "1.5.0",
3434
"@firebase/logger": "0.1.23",
3535
"@firebase/webchannel-wrapper": "0.2.25",
3636
"@grpc/proto-loader": "^0.5.0",
@@ -82,9 +82,9 @@
8282
"webpack": "4.39.3",
8383
"yargs": "14.0.0",
8484
"eslint": "5.16.0",
85-
"@typescript-eslint/parser": "1.13.0",
86-
"@typescript-eslint/eslint-plugin": "1.13.0",
87-
"@typescript-eslint/eslint-plugin-tslint": "1.13.0",
85+
"@typescript-eslint/parser": "2.0.0",
86+
"@typescript-eslint/eslint-plugin": "2.0.0",
87+
"@typescript-eslint/eslint-plugin-tslint": "2.0.0",
8888
"eslint-plugin-import": "2.18.2"
8989
},
9090
"repository": {

‎packages/functions/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@
5656
"webpack": "4.39.3",
5757
"yargs": "14.0.0",
5858
"eslint": "5.16.0",
59-
"@typescript-eslint/parser": "1.13.0",
60-
"@typescript-eslint/eslint-plugin": "1.13.0",
61-
"@typescript-eslint/eslint-plugin-tslint": "1.13.0",
59+
"@typescript-eslint/parser": "2.0.0",
60+
"@typescript-eslint/eslint-plugin": "2.0.0",
61+
"@typescript-eslint/eslint-plugin-tslint": "2.0.0",
6262
"@firebase/messaging": "0.4.9"
6363
},
6464
"repository": {

‎packages/installations/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
"tslint": "5.19.0",
4242
"typescript": "3.5.3",
4343
"eslint": "5.16.0",
44-
"@typescript-eslint/parser": "1.13.0",
45-
"@typescript-eslint/eslint-plugin": "1.13.0",
46-
"@typescript-eslint/eslint-plugin-tslint": "1.13.0",
44+
"@typescript-eslint/parser": "2.0.0",
45+
"@typescript-eslint/eslint-plugin": "2.0.0",
46+
"@typescript-eslint/eslint-plugin-tslint": "2.0.0",
4747
"eslint-plugin-import": "2.18.2"
4848
},
4949
"peerDependencies": {

‎packages/logger/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
"typescript": "3.5.3",
4646
"webpack": "4.39.3",
4747
"eslint": "5.16.0",
48-
"@typescript-eslint/parser": "1.13.0",
49-
"@typescript-eslint/eslint-plugin": "1.13.0",
50-
"@typescript-eslint/eslint-plugin-tslint": "1.13.0",
48+
"@typescript-eslint/parser": "2.0.0",
49+
"@typescript-eslint/eslint-plugin": "2.0.0",
50+
"@typescript-eslint/eslint-plugin-tslint": "2.0.0",
5151
"eslint-plugin-import": "2.18.2"
5252
},
5353
"repository": {

‎packages/messaging/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@
5252
"tslint": "5.19.0",
5353
"typescript": "3.5.3",
5454
"eslint": "5.16.0",
55-
"@typescript-eslint/parser": "1.13.0",
56-
"@typescript-eslint/eslint-plugin": "1.13.0",
57-
"@typescript-eslint/eslint-plugin-tslint": "1.13.0",
55+
"@typescript-eslint/parser": "2.0.0",
56+
"@typescript-eslint/eslint-plugin": "2.0.0",
57+
"@typescript-eslint/eslint-plugin-tslint": "2.0.0",
5858
"eslint-plugin-import": "2.18.2"
5959
},
6060
"repository": {

‎packages/performance/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949
"chai-as-promised": "7.1.1",
5050
"typescript": "3.5.3",
5151
"eslint": "5.16.0",
52-
"@typescript-eslint/parser": "1.13.0",
53-
"@typescript-eslint/eslint-plugin": "1.13.0",
54-
"@typescript-eslint/eslint-plugin-tslint": "1.13.0",
52+
"@typescript-eslint/parser": "2.0.0",
53+
"@typescript-eslint/eslint-plugin": "2.0.0",
54+
"@typescript-eslint/eslint-plugin-tslint": "2.0.0",
5555
"eslint-plugin-import": "2.18.2"
5656
},
5757
"repository": {

‎packages/rxfire/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "rxfire",
3-
"version": "3.7.0",
3+
"version": "3.7.1",
44
"private": false,
55
"description": "Firebase JavaScript library RxJS",
66
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
@@ -38,7 +38,7 @@
3838
"rxjs": "6.x.x"
3939
},
4040
"devDependencies": {
41-
"firebase": "6.4.2",
41+
"firebase": "6.5.0",
4242
"rxjs": "6.5.2",
4343
"rollup": "1.20.3",
4444
"rollup-plugin-commonjs": "10.1.0",
@@ -71,9 +71,9 @@
7171
"webpack": "4.39.3",
7272
"yargs": "14.0.0",
7373
"eslint": "5.16.0",
74-
"@typescript-eslint/parser": "1.13.0",
75-
"@typescript-eslint/eslint-plugin": "1.13.0",
76-
"@typescript-eslint/eslint-plugin-tslint": "1.13.0",
74+
"@typescript-eslint/parser": "2.0.0",
75+
"@typescript-eslint/eslint-plugin": "2.0.0",
76+
"@typescript-eslint/eslint-plugin-tslint": "2.0.0",
7777
"eslint-plugin-import": "2.18.2"
7878
},
7979
"typings": "dist/index.d.ts",

‎packages/storage/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
"typescript": "3.5.3",
5252
"webpack": "4.39.3",
5353
"eslint": "5.16.0",
54-
"@typescript-eslint/parser": "1.13.0",
55-
"@typescript-eslint/eslint-plugin": "1.13.0",
56-
"@typescript-eslint/eslint-plugin-tslint": "1.13.0"
54+
"@typescript-eslint/parser": "2.0.0",
55+
"@typescript-eslint/eslint-plugin": "2.0.0",
56+
"@typescript-eslint/eslint-plugin-tslint": "2.0.0"
5757
},
5858
"repository": {
5959
"directory": "packages/storage",

‎packages/template/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@
5353
"typescript": "3.5.3",
5454
"webpack": "4.39.3",
5555
"eslint": "5.16.0",
56-
"@typescript-eslint/parser": "1.13.0",
57-
"@typescript-eslint/eslint-plugin": "1.13.0",
58-
"@typescript-eslint/eslint-plugin-tslint": "1.13.0",
56+
"@typescript-eslint/parser": "2.0.0",
57+
"@typescript-eslint/eslint-plugin": "2.0.0",
58+
"@typescript-eslint/eslint-plugin-tslint": "2.0.0",
5959
"eslint-plugin-import": "2.18.2"
6060
},
6161
"repository": {

‎packages/testing/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/testing",
3-
"version": "0.12.2",
3+
"version": "0.12.3",
44
"description": "",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.cjs.js",
@@ -15,7 +15,7 @@
1515
},
1616
"license": "Apache-2.0",
1717
"dependencies": {
18-
"firebase": "6.4.2",
18+
"firebase": "6.5.0",
1919
"@firebase/logger": "0.1.23",
2020
"@firebase/util": "0.2.26",
2121
"@types/request": "2.48.2",

‎packages/util/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
"typescript": "3.5.3",
4949
"webpack": "4.39.3",
5050
"eslint": "5.16.0",
51-
"@typescript-eslint/parser": "1.13.0",
52-
"@typescript-eslint/eslint-plugin": "1.13.0",
53-
"@typescript-eslint/eslint-plugin-tslint": "1.13.0",
51+
"@typescript-eslint/parser": "2.0.0",
52+
"@typescript-eslint/eslint-plugin": "2.0.0",
53+
"@typescript-eslint/eslint-plugin-tslint": "2.0.0",
5454
"eslint-plugin-import": "2.18.2"
5555
},
5656
"repository": {

‎scripts/emulator-testing/emulators/firestore-emulator.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export class FirestoreEmulator extends Emulator {
2626
// Use locked version of emulator for test to be deterministic.
2727
// The latest version can be found from firestore emulator doc:
2828
// https://firebase.google.com/docs/firestore/security/test-rules-emulator
29-
'https://storage.googleapis.com/firebase-preview-drop/emulator/cloud-firestore-emulator-v1.5.0.jar',
29+
'https://storage.googleapis.com/firebase-preview-drop/emulator/cloud-firestore-emulator-v1.8.2.jar',
3030
port
3131
);
3232
this.projectId = projectId;

0 commit comments

Comments
 (0)