Skip to content

Commit 4eee9a1

Browse files
schmidt-sebastianschmidt-sebastian
committed
Merge
2 parents 7835818 + 537350e commit 4eee9a1

File tree

77 files changed

+2234
-912
lines changed

Some content is hidden

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

77 files changed

+2234
-912
lines changed

‎.github/CODEOWNERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ packages/storage @schmidt-sebastian @firebase/jssdk-global-approvers
5050
packages/storage-types @schmidt-sebastian @firebase/jssdk-global-approvers
5151

5252
# Messaging Code
53-
packages/messaging @firebase/jssdk-global-approvers
54-
packages/messaging-types @firebase/jssdk-global-approvers
55-
integration/messaging @firebase/jssdk-global-approvers
53+
packages/messaging @zwu52 @firebase/jssdk-global-approvers
54+
packages/messaging-types @zwu52 @firebase/jssdk-global-approvers
55+
integration/messaging @zwu52 @firebase/jssdk-global-approvers
5656

5757
# Auth Code
5858
packages/auth @bojeil-google @wti806 @firebase/jssdk-global-approvers

‎common/api-review/app-exp.api.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
55
```ts
66

7-
import { FirebaseApp } from '@firebase/app-types-exp';
8-
import { FirebaseAppConfig } from '@firebase/app-types-exp';
9-
import { FirebaseOptions } from '@firebase/app-types-exp';
7+
import { FirebaseApp } from '@firebase/app-types';
8+
import { FirebaseAppConfig } from '@firebase/app-types';
9+
import { FirebaseOptions } from '@firebase/app-types';
1010
import { LogCallback } from '@firebase/logger';
1111
import { LogLevel } from '@firebase/logger';
1212
import { LogOptions } from '@firebase/logger';

‎config/functions/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"dependencies": {
55
"cors": "2.8.5",
66
"firebase-admin": "8.10.0",
7-
"firebase-functions": "3.3.0"
7+
"firebase-functions": "3.6.0"
88
},
99
"private": true,
1010
"engines": {

‎config/karma.base.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright 2017 Google Inc.
3+
* Copyright 2017 Google LLC
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.
@@ -57,7 +57,10 @@ const config = {
5757
// preprocess matching files before serving them to the browser
5858
// available preprocessors:
5959
// https://npmjs.org/browse/keyword/karma-preprocessor
60-
preprocessors: { 'test/**/*.ts': ['webpack', 'sourcemap'] },
60+
preprocessors: {
61+
'test/**/*.ts': ['webpack', 'sourcemap'],
62+
'src/**/*.test.ts': ['webpack', 'sourcemap']
63+
},
6164

6265
mime: { 'text/x-typescript': ['ts', 'tsx'] },
6366

‎integration/browserify/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
"test": "karma start --single-run"
88
},
99
"dependencies": {
10-
"firebase": "7.13.2"
10+
"firebase": "7.14.0"
1111
},
1212
"devDependencies": {
13-
"@babel/core": "7.8.7",
14-
"@babel/preset-env": "7.8.7",
15-
"browserify": "16.5.0",
13+
"@babel/core": "7.9.0",
14+
"@babel/preset-env": "7.9.5",
15+
"browserify": "16.5.1",
1616
"chai": "4.2.0",
1717
"karma": "4.4.1",
1818
"karma-babel-preprocessor": "8.0.1",
@@ -21,7 +21,7 @@
2121
"karma-mocha": "1.3.0",
2222
"karma-sauce-launcher": "1.2.0",
2323
"karma-spec-reporter": "0.0.32",
24-
"mkdirp": "0.5.3",
25-
"mocha": "7.1.0"
24+
"mkdirp": "1.0.4",
25+
"mocha": "7.1.1"
2626
}
2727
}

‎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": "7.13.2"
9+
"firebase": "7.14.0"
1010
},
1111
"devDependencies": {
1212
"typescript": "3.8.3"

‎integration/firestore/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
"karma-firefox-launcher": "1.3.0",
2323
"karma-mocha": "1.3.0",
2424
"karma-spec-reporter": "0.0.32",
25-
"mocha": "7.1.0",
26-
"ts-loader": "6.2.1",
25+
"mocha": "7.1.1",
26+
"ts-loader": "6.2.2",
2727
"typescript": "3.8.3",
28-
"webpack": "4.42.0",
28+
"webpack": "4.42.1",
2929
"webpack-stream": "5.2.1"
3030
}
3131
}

‎integration/messaging/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
"test:manual": "mocha --exit"
99
},
1010
"dependencies": {
11-
"firebase": "7.13.2"
11+
"firebase": "7.14.0"
1212
},
1313
"devDependencies": {
1414
"chai": "4.2.0",
15-
"chromedriver": "80.0.1",
15+
"chromedriver": "80.0.2",
1616
"express": "4.17.1",
1717
"geckodriver": "1.19.1",
18-
"mocha": "7.1.0",
18+
"mocha": "7.1.1",
1919
"node-fetch": "2.6.0",
20-
"selenium-assistant": "6.0.0"
20+
"selenium-assistant": "6.1.0"
2121
}
2222
}

‎integration/typescript/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
"test": "karma start --single-run"
77
},
88
"dependencies": {
9-
"firebase": "7.13.2"
9+
"firebase": "7.14.0"
1010
},
1111
"devDependencies": {
12-
"@babel/core": "7.8.7",
13-
"@babel/preset-env": "7.8.7",
12+
"@babel/core": "7.9.0",
13+
"@babel/preset-env": "7.9.5",
1414
"@types/chai": "4.2.11",
1515
"@types/mocha": "7.0.2",
1616
"chai": "4.2.0",
@@ -21,8 +21,8 @@
2121
"karma-mocha": "1.3.0",
2222
"karma-sauce-launcher": "1.2.0",
2323
"karma-spec-reporter": "0.0.32",
24-
"karma-typescript": "5.0.0",
25-
"mocha": "7.1.0",
24+
"karma-typescript": "5.0.2",
25+
"mocha": "7.1.1",
2626
"npm-run-all": "4.1.5",
2727
"typescript": "3.8.3"
2828
}

‎integration/webpack/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
"test": "karma start --single-run"
88
},
99
"dependencies": {
10-
"firebase": "7.13.2"
10+
"firebase": "7.14.0"
1111
},
1212
"devDependencies": {
13-
"@babel/core": "7.8.7",
14-
"@babel/preset-env": "7.8.7",
13+
"@babel/core": "7.9.0",
14+
"@babel/preset-env": "7.9.5",
1515
"chai": "4.2.0",
1616
"karma": "4.4.1",
1717
"karma-babel-preprocessor": "8.0.1",
@@ -20,8 +20,8 @@
2020
"karma-mocha": "1.3.0",
2121
"karma-sauce-launcher": "1.2.0",
2222
"karma-spec-reporter": "0.0.32",
23-
"mocha": "7.1.0",
24-
"webpack": "4.42.0",
23+
"mocha": "7.1.1",
24+
"webpack": "4.42.1",
2525
"webpack-cli": "3.3.11"
2626
}
2727
}

‎package.json

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
"scripts": {
2424
"dev": "lerna run --parallel --scope @firebase/* --scope firebase --scope rxfire dev",
2525
"build": "lerna run --scope @firebase/* --scope firebase --scope rxfire prepare",
26-
"build:exp": "lerna run --scope @firebase/*-exp prepare",
26+
"build:exp": "lerna run --scope @firebase/*-exp --scope firebase-exp build",
2727
"link:packages": "lerna exec --scope @firebase/* --scope firebase --scope rxfire -- yarn link",
2828
"stage:packages": "./scripts/prepublish.sh",
2929
"repl": "node tools/repl.js",
3030
"release": "node scripts/release/cli.js",
3131
"pretest": "node tools/pretest.js",
3232
"test": "lerna run --concurrency 4 --stream test",
33-
"test:exp": "lerna run --concurrency 4 --stream --scope @firebase/*-exp test",
33+
"test:exp": "lerna run --concurrency 4 --stream --scope @firebase/*-exp --scope firebase-exp test",
3434
"pretest:coverage": "mkdirp coverage",
3535
"ci:coverage": "lcov-result-merger 'packages/**/lcov.info' 'lcov-all.info'",
3636
"test:coverage": "lcov-result-merger 'packages/**/lcov.info' | coveralls",
@@ -61,32 +61,32 @@
6161
"@types/chai-as-promised": "7.1.2",
6262
"@types/long": "4.0.1",
6363
"@types/mocha": "7.0.2",
64-
"@types/node": "12.12.34",
65-
"@types/sinon": "7.5.2",
66-
"@types/sinon-chai": "3.2.3",
67-
"@typescript-eslint/eslint-plugin": "2.24.0",
68-
"@typescript-eslint/eslint-plugin-tslint": "2.24.0",
69-
"@typescript-eslint/parser": "2.24.0",
70-
"babel-loader": "8.0.6",
64+
"@types/node": "12.12.35",
65+
"@types/sinon": "9.0.0",
66+
"@types/sinon-chai": "3.2.4",
67+
"@typescript-eslint/eslint-plugin": "2.28.0",
68+
"@typescript-eslint/eslint-plugin-tslint": "2.28.0",
69+
"@typescript-eslint/parser": "2.28.0",
70+
"babel-loader": "8.1.0",
7171
"chai": "4.2.0",
7272
"chai-as-promised": "7.1.1",
7373
"chalk": "3.0.0",
7474
"child-process-promise": "2.2.1",
7575
"clone": "2.1.2",
76-
"coveralls": "3.0.9",
76+
"coveralls": "3.0.11",
7777
"del": "5.1.0",
7878
"dependency-graph": "0.9.0",
7979
"eslint": "6.8.0",
80-
"eslint-plugin-import": "2.20.1",
80+
"eslint-plugin-import": "2.20.2",
8181
"express": "4.17.1",
8282
"find-free-port": "2.0.0",
83-
"firebase-functions": "3.3.0",
84-
"firebase-tools": "7.15.1",
83+
"firebase-functions": "3.6.0",
84+
"firebase-tools": "7.16.2",
8585
"git-rev-sync": "2.0.0",
8686
"glob": "7.1.6",
8787
"http-server": "0.12.1",
88-
"husky": "4.2.3",
89-
"indexeddbshim": "5.0.0",
88+
"husky": "4.2.5",
89+
"indexeddbshim": "6.1.0",
9090
"inquirer": "7.1.0",
9191
"istanbul-instrumenter-loader": "3.0.1",
9292
"js-yaml": "3.13.1",
@@ -108,32 +108,32 @@
108108
"lodash": "4.17.15",
109109
"long": "3.2.0",
110110
"merge2": "1.3.0",
111-
"mkdirp": "0.5.3",
112-
"mocha": "7.1.0",
111+
"mkdirp": "1.0.4",
112+
"mocha": "7.1.1",
113113
"mz": "2.7.0",
114114
"npm-run-all": "4.1.5",
115115
"npm-run-path": "4.0.1",
116-
"nyc": "15.0.0",
116+
"nyc": "15.0.1",
117117
"ora": "4.0.3",
118118
"prettier": "1.19.1",
119119
"protractor": "5.4.2",
120-
"rxjs": "6.5.4",
121-
"semver": "7.1.3",
120+
"rxjs": "6.5.5",
121+
"semver": "7.3.2",
122122
"simple-git": "1.132.0",
123-
"sinon": "9.0.1",
123+
"sinon": "9.0.2",
124124
"sinon-chai": "3.5.0",
125125
"source-map-loader": "0.2.4",
126-
"terser": "4.6.7",
127-
"ts-loader": "6.2.1",
128-
"ts-node": "8.6.2",
129-
"tslint": "6.1.0",
126+
"terser": "4.6.11",
127+
"ts-loader": "6.2.2",
128+
"ts-node": "8.8.2",
129+
"tslint": "6.1.1",
130130
"typedoc": "0.16.11",
131131
"typescript": "3.8.3",
132132
"watch": "1.0.2",
133-
"webpack": "4.42.0",
133+
"webpack": "4.42.1",
134134
"yargs": "15.3.1",
135-
"@microsoft/api-extractor": "7.7.8",
136-
"@microsoft/api-documenter": "7.7.12"
135+
"@microsoft/api-extractor": "7.7.13",
136+
"@microsoft/api-documenter": "7.7.18"
137137
},
138138
"husky": {
139139
"hooks": {

‎packages-exp/app-exp/package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,16 @@
1515
"lint": "eslint -c .eslintrc.js '**/*.ts' --ignore-path '../../.gitignore'",
1616
"lint:fix": "eslint --fix -c .eslintrc.js '**/*.ts' --ignore-path '../../.gitignore'",
1717
"build": "rollup -c",
18+
"build:release": "rollup -c rollup.config.release.js",
19+
"build:deps": "lerna run --scope @firebase/app-exp --include-dependencies build",
1820
"dev": "rollup -c -w",
1921
"test": "yarn type-check && run-p lint test:browser test:node",
2022
"test:browser": "karma start --single-run",
2123
"test:node": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha src/**/*.test.ts --opts ../../config/mocha.node.opts",
2224
"type-check": "tsc -p . --noEmit",
23-
"prepare": "yarn build",
25+
"prepare": "yarn build:release",
2426
"api-report": "api-extractor run --local --verbose",
25-
"predoc": "node ../../scripts/exp/remove_exp.js temp",
27+
"predoc": "node ../../scripts/exp/remove-exp.js temp",
2628
"doc": "api-documenter markdown --input temp --output docs",
2729
"build:doc": "yarn build && yarn api-report && yarn doc"
2830
},
@@ -38,7 +40,7 @@
3840
"rollup": "1.32.1",
3941
"rollup-plugin-json": "4.0.0",
4042
"rollup-plugin-replace": "2.2.0",
41-
"rollup-plugin-typescript2": "0.26.0",
43+
"rollup-plugin-typescript2": "0.27.0",
4244
"typescript": "3.8.3"
4345
},
4446
"repository": {

0 commit comments

Comments
 (0)