Skip to content

Commit 6ef0c69

Browse files
Merge pull request #568 from firebase/mrschmidt-multi-tab-merge
Merge Master into Multi-Tab
2 parents e0486ff + 2a5d3f6 commit 6ef0c69

File tree

180 files changed

+10402
-3841
lines changed

Some content is hidden

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

180 files changed

+10402
-3841
lines changed

.github/CODEOWNERS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,6 @@ integration/messaging @gauntface @pinarx
2626
# Auth Code
2727
packages/auth @bojeil-google @wti806 @tmsch
2828
packages/auth-types @bojeil-google @wti806 @tmsch
29+
30+
# Testing Code
31+
packages/testing @tonymeng @ryanpbrewster

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ before_install:
1111
# Yarn defaults to an old version, make sure we
1212
# get an up to date version
1313
- npm install -g yarn
14-
- echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" > $HOME/.npmrc
14+
- '[ "${NPM_TOKEN+x}" ] && echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" > $HOME/.npmrc || echo "Skipping .npmrc creation";'
1515
before_script:
1616
- cp config/ci.config.json config/project.json
1717
script:
@@ -37,4 +37,5 @@ deploy:
3737
provider: script
3838
script: yarn release --canary
3939
on:
40+
repo: firebase/firebase-js-sdk
4041
branch: master

config/tsconfig.base.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"compileOnSave": false,
33
"compilerOptions": {
44
"declaration": true,
5+
"importHelpers": true,
56
"lib": [
67
"es5",
78
"es2015",

integration/browserify/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
"test": "karma start --single-run"
88
},
99
"dependencies": {
10-
"firebase": "4.9.1"
10+
"firebase": "4.11.0"
1111
},
1212
"devDependencies": {
13-
"browserify": "^14.5.0",
13+
"browserify": "^16.1.0",
1414
"chai": "^4.1.1",
15-
"karma": "^1.7.0",
15+
"karma": "^2.0.0",
1616
"karma-chrome-launcher": "^2.2.0",
1717
"karma-mocha": "^1.3.0",
1818
"karma-sauce-launcher": "^1.2.0",
19-
"karma-spec-reporter": "0.0.31",
19+
"karma-spec-reporter": "0.0.32",
2020
"mkdirp": "^0.5.1",
21-
"mocha": "^4.0.1"
21+
"mocha": "^5.0.1"
2222
}
2323
}

integration/firebase-typings/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
"test": "tsc index.ts --outDir dist"
77
},
88
"dependencies": {
9-
"firebase": "4.9.1"
9+
"firebase": "4.11.0"
1010
},
1111
"devDependencies": {
12-
"typescript": "^2.4.2"
12+
"typescript": "^2.7.2"
1313
}
1414
}

integration/firestore/package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@
1111
"test:debug": "karma start --auto-watch --browsers Chrome"
1212
},
1313
"devDependencies": {
14-
"@types/mocha": "^2.2.44",
15-
"@types/node": "^8.0.47",
16-
"gulp": "gulpjs/gulp#4.0",
17-
"gulp-filter": "^5.0.1",
14+
"@types/mocha": "^2.2.48",
15+
"@types/node": "^9.4.6",
16+
"gulp": "^4.0.0",
17+
"gulp-filter": "^5.1.0",
1818
"gulp-replace": "^0.6.1",
19-
"karma": "^1.7.0",
19+
"karma": "^2.0.0",
2020
"karma-chrome-launcher": "^2.2.0",
2121
"karma-mocha": "^1.3.0",
22-
"karma-spec-reporter": "0.0.31",
23-
"mocha": "^4.0.1",
24-
"ts-loader": "^3.1.0",
25-
"typescript": "^2.4.2",
26-
"webpack": "^3.8.1",
27-
"webpack-stream": "^4.0.0"
22+
"karma-spec-reporter": "0.0.32",
23+
"mocha": "^5.0.1",
24+
"ts-loader": "^3.5.0",
25+
"typescript": "^2.7.2",
26+
"webpack": "^3.11.0",
27+
"webpack-stream": "^4.0.2"
2828
}
2929
}

integration/messaging/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
"test:manual": "mocha --exit"
99
},
1010
"dependencies": {
11-
"firebase": "4.9.1"
11+
"firebase": "4.11.0"
1212
},
1313
"devDependencies": {
1414
"chai": "^4.1.1",
15-
"chromedriver": "^2.31.0",
15+
"chromedriver": "^2.35.0",
1616
"express": "^4.15.4",
1717
"geckodriver": "^1.8.0",
18-
"mocha": "^4.0.1",
19-
"node-fetch": "^1.7.2",
20-
"selenium-assistant": "^5.2.0",
21-
"sinon": "^4.1.3"
18+
"mocha": "^5.0.1",
19+
"node-fetch": "^2.0.0",
20+
"selenium-assistant": "^5.3.0",
21+
"sinon": "^4.3.0"
2222
}
2323
}

integration/messaging/test/utils/test-server.js

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ class MessagingTestServer {
4242
return `http://localhost:${PORT_NUMBER}`;
4343
}
4444

45-
start() {
45+
async start() {
4646
if (this._server) {
47-
return Promise.resolve();
47+
return;
4848
}
4949

5050
return new Promise((resolve, reject) => {
@@ -56,15 +56,11 @@ class MessagingTestServer {
5656

5757
// Sometimes the server doesn't trigger the callback due to
5858
// currently open sockets. So call `closethis._server
59-
stop() {
60-
if (!this._server) {
61-
return Promise.resolve();
59+
async stop() {
60+
if (this._server) {
61+
this._server.close();
62+
this._server = null;
6263
}
63-
64-
this._server.close();
65-
this._server = null;
66-
67-
return Promise.resolve();
6864
}
6965
}
7066
module.exports = new MessagingTestServer();

integration/typescript/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@
66
"test": "karma start --single-run"
77
},
88
"dependencies": {
9-
"firebase": "4.9.1"
9+
"firebase": "4.11.0"
1010
},
1111
"devDependencies": {
12-
"@types/chai": "^4.0.4",
13-
"@types/mocha": "^2.2.44",
14-
"@types/node": "^8.0.47",
12+
"@types/chai": "^4.1.2",
13+
"@types/mocha": "^2.2.48",
14+
"@types/node": "^9.4.6",
1515
"chai": "^4.1.1",
16-
"karma": "^1.7.0",
16+
"karma": "^2.0.0",
1717
"karma-chrome-launcher": "^2.2.0",
1818
"karma-mocha": "^1.3.0",
1919
"karma-sauce-launcher": "^1.2.0",
20-
"karma-spec-reporter": "0.0.31",
21-
"karma-typescript": "^3.0.8",
22-
"mocha": "^4.0.1",
20+
"karma-spec-reporter": "0.0.32",
21+
"karma-typescript": "^3.0.12",
22+
"mocha": "^5.0.1",
2323
"npm-run-all": "^4.1.1",
24-
"typescript": "^2.4.2"
24+
"typescript": "^2.7.2"
2525
}
2626
}

integration/webpack/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
"test": "karma start --single-run"
88
},
99
"dependencies": {
10-
"firebase": "4.9.1"
10+
"firebase": "4.11.0"
1111
},
1212
"devDependencies": {
1313
"chai": "^4.1.1",
14-
"karma": "^1.7.0",
14+
"karma": "^2.0.0",
1515
"karma-chrome-launcher": "^2.2.0",
1616
"karma-mocha": "^1.3.0",
1717
"karma-sauce-launcher": "^1.2.0",
18-
"karma-spec-reporter": "0.0.31",
19-
"mocha": "^4.0.1",
20-
"webpack": "^3.8.1"
18+
"karma-spec-reporter": "0.0.32",
19+
"mocha": "^5.0.1",
20+
"webpack": "^3.11.0"
2121
}
2222
}

package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,29 +37,29 @@
3737
"integration/*"
3838
],
3939
"devDependencies": {
40-
"chalk": "^2.3.0",
40+
"chalk": "^2.3.1",
4141
"child-process-promise": "^2.2.1",
4242
"clone": "^2.1.1",
4343
"coveralls": "^3.0.0",
4444
"dependency-graph": "^0.7.0",
45-
"firebase-tools": "^3.10.1",
45+
"firebase-tools": "^3.17.4",
4646
"glob": "^7.1.2",
47-
"gulp-sourcemaps": "^2.6.1",
48-
"gulp-typescript": "^3.2.3",
47+
"gulp-sourcemaps": "^2.6.4",
48+
"gulp-typescript": "^4.0.1",
4949
"husky": "^0.14.3",
50-
"inquirer": "^5.0.0",
50+
"inquirer": "^5.1.0",
5151
"istanbul-instrumenter-loader": "^3.0.0",
52-
"lcov-result-merger": "^1.2.0",
53-
"lerna": "^2.1.0",
52+
"lcov-result-merger": "^2.0.0",
53+
"lerna": "^2.9.0",
5454
"listr": "^0.13.0",
55-
"merge2": "^1.2.0",
55+
"merge2": "^1.2.1",
5656
"mkdirp": "^0.5.1",
5757
"mz": "^2.7.0",
5858
"npm-run-path": "^2.0.2",
59-
"ora": "^1.3.0",
60-
"prettier": "^1.7.0",
59+
"ora": "^2.0.0",
60+
"prettier": "^1.10.2",
6161
"semver": "^5.5.0",
62-
"simple-git": "^1.80.1",
63-
"yargs": "^10.0.3"
62+
"simple-git": "^1.91.0",
63+
"yargs": "^11.0.0"
6464
}
6565
}

packages/app-types/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/app-types",
3-
"version": "0.1.1",
3+
"version": "0.1.2",
44
"description": "@firebase/app Types",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"license": "Apache-2.0",
@@ -12,7 +12,7 @@
1212
"private.d.ts"
1313
],
1414
"devDependencies": {
15-
"typescript": "^2.4.2"
15+
"typescript": "^2.7.2"
1616
},
1717
"repository": {
1818
"type": "git",

packages/app/package.json

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/app",
3-
"version": "0.1.8",
3+
"version": "0.1.10",
44
"description": "The primary entrypoint to the Firebase JS SDK",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/cjs/index.js",
@@ -15,35 +15,36 @@
1515
},
1616
"license": "Apache-2.0",
1717
"dependencies": {
18-
"@firebase/app-types": "0.1.1",
19-
"@firebase/util": "0.1.8"
18+
"@firebase/app-types": "0.1.2",
19+
"@firebase/util": "0.1.10",
20+
"tslib": "^1.9.0"
2021
},
2122
"devDependencies": {
22-
"@types/chai": "^4.0.4",
23-
"@types/mocha": "^2.2.44",
24-
"@types/sinon": "^2.3.7",
23+
"@types/chai": "^4.1.2",
24+
"@types/mocha": "^2.2.48",
25+
"@types/sinon": "^4.1.3",
2526
"chai": "^4.1.1",
26-
"gulp": "gulpjs/gulp#4.0",
27+
"gulp": "^4.0.0",
2728
"gulp-replace": "^0.6.1",
28-
"gulp-sourcemaps": "^2.6.1",
29-
"karma": "^1.7.0",
29+
"gulp-sourcemaps": "^2.6.4",
30+
"karma": "^2.0.0",
3031
"karma-chrome-launcher": "^2.2.0",
3132
"karma-cli": "^1.0.1",
32-
"karma-coverage-istanbul-reporter": "^1.3.0",
33+
"karma-coverage-istanbul-reporter": "^1.4.1",
3334
"karma-mocha": "^1.3.0",
3435
"karma-sauce-launcher": "^1.2.0",
3536
"karma-sourcemap-loader": "^0.3.7",
36-
"karma-spec-reporter": "^0.0.31",
37-
"karma-webpack": "^2.0.4",
38-
"mocha": "^4.0.1",
37+
"karma-spec-reporter": "^0.0.32",
38+
"karma-webpack": "^2.0.9",
39+
"mocha": "^5.0.1",
3940
"npm-run-all": "^4.1.1",
40-
"nyc": "^11.2.1",
41-
"sinon": "^4.0.2",
41+
"nyc": "^11.4.1",
42+
"sinon": "^4.3.0",
4243
"source-map-loader": "^0.2.3",
43-
"ts-loader": "^3.1.0",
44-
"ts-node": "^4.1.0",
45-
"typescript": "^2.4.2",
46-
"webpack": "^3.8.1"
44+
"ts-loader": "^3.5.0",
45+
"ts-node": "^5.0.0",
46+
"typescript": "^2.7.2",
47+
"webpack": "^3.11.0"
4748
},
4849
"repository": {
4950
"type": "git",

0 commit comments

Comments
 (0)