Skip to content

Commit b9735d0

Browse files
committed
rebase on master
1 parent 14edd3d commit b9735d0

File tree

7 files changed

+29
-12
lines changed

7 files changed

+29
-12
lines changed

packages/rxfire/.eslintrc.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,8 @@
22
"extends": "../../config/.eslintrc.json",
33
"parserOptions": {
44
"project": "tsconfig.json"
5+
},
6+
"rules": {
7+
"import/no-extraneous-dependencies" : "off"
58
}
69
}

packages/rxfire/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
node_modules
2+
dist
3+
14
/rxfire*.js
25
/rxfire*.map
36
/rxfire*.gz

packages/rxfire/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"url": "https://github.com/firebase/firebase-js-sdk.git"
2222
},
2323
"scripts": {
24-
"lint": "eslint -c .eslintrc.json '**/*.ts' --ignore-path '../../.gitignore'",
25-
"lint:fix": "eslint --fix -c .eslintrc.json '**/*.ts' --ignore-path '../../.gitignore'",
24+
"lint": "eslint -c .eslintrc.json '**/*.ts' --ignore-path './.gitignore'",
25+
"lint:fix": "eslint --fix -c .eslintrc.json '**/*.ts' --ignore-path './.gitignore'",
2626
"build": "rollup -c",
2727
"dev": "rollup -c -w",
2828
"prepare": "yarn build",

packages/rxfire/storage/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ export function getMetadata(ref: storage.Reference): Observable<any> {
4444

4545
export function put(
4646
ref: storage.Reference,
47-
data: unknown,
47+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
48+
data: any,
4849
metadata?: storage.UploadMetadata
4950
): Observable<storage.UploadTaskSnapshot> {
5051
return fromTask(ref.put(data, metadata));
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/**
2+
* @license
3+
* Copyright 2018 Google Inc.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
export declare const TEST_PROJECT: any;

packages/rxfire/test/database.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ const rando = (): string =>
4141
.toString(36)
4242
.substring(5);
4343

44-
let batch = (items: { name: string; key: string }[]): Readonly<{}> => {
45-
let batch: { [key: string]: unknown } = {};
44+
const batch = (items: Array<{ name: string; key: string }>): Readonly<{[key: string]: unknown}> => {
45+
const batch: { [key: string]: unknown } = {};
4646
items.forEach(item => {
4747
batch[item.key] = item;
4848
});

yarn.lock

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12498,13 +12498,6 @@ rxjs@^6.3.3, rxjs@^6.4.0:
1249812498
dependencies:
1249912499
tslib "^1.9.0"
1250012500

12501-
rxjs@^6.5.1:
12502-
version "6.5.1"
12503-
resolved "https://registry.npmjs.org/rxjs/-/rxjs-6.5.1.tgz#f7a005a9386361921b8524f38f54cbf80e5d08f4"
12504-
integrity sha512-y0j31WJc83wPu31vS1VlAFW5JGrnGC+j+TtGAa1fRQphy48+fDYiDmX8tjGloToEsMkxnouOg/1IzXGKkJnZMg==
12505-
dependencies:
12506-
tslib "^1.9.0"
12507-
1250812501
1250912502
version "5.1.1"
1251012503
resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"

0 commit comments

Comments
 (0)