Skip to content

Merge Master into Multi-Tab #568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 35 commits into from
Mar 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
fc81427
Publish [email protected]
jshcrowthe Feb 16, 2018
2e147ff
Fix query string parsing (#518)
tonymeng Feb 16, 2018
b6b4e2f
Add testing module (#514)
tonymeng Feb 16, 2018
e784110
Version Patch for Firebase Admin (#524)
jshcrowthe Feb 21, 2018
dbe5fff
Messaging - IDB Cleanup (#523)
Feb 21, 2018
3aec5ac
Updating API surface (#527)
Feb 21, 2018
3ee5bdf
Remove `return Promise.resolve()` statements from the codebase (#422)
merlinnot Feb 21, 2018
1b44b4d
Fixing fork testing issues
jshcrowthe Feb 21, 2018
0226ed2
Remove bash grouping
jshcrowthe Feb 22, 2018
cde4e44
Dependencies Update (#528)
jshcrowthe Feb 22, 2018
e70ef37
Publish [email protected]
jshcrowthe Feb 22, 2018
9cda9c9
Keep track of number of queries in the query cache (#510)
Feb 27, 2018
3d6289d
@firebase/logger (#473)
jshcrowthe Feb 28, 2018
c1a07da
Refactor npm publish command (#536)
jshcrowthe Feb 28, 2018
fbb2aab
Remove the "private" flag from the @firebase/logger package (#537)
jshcrowthe Feb 28, 2018
dbed689
Database API: Ref from Ref (#534)
schmidt-sebastian Mar 1, 2018
aba869c
[AUTOMATED]: Prettier Code Styling
Mar 2, 2018
0fa319e
Add 10 second timeout waiting for connection before client behaves as…
mikelehen Mar 3, 2018
a0583f7
Shim refactor (#550)
jshcrowthe Mar 5, 2018
2b20a14
removes unecessary lcov-result-merger dependency (#547)
zevdg Mar 6, 2018
03d224f
Release Fixes (#551)
jshcrowthe Mar 6, 2018
121c167
Fixes an issue with staged release version (#552)
jshcrowthe Mar 6, 2018
7681d03
Remove "google-cloud-resource-prefix" header in favor of "database" u…
mikelehen Mar 7, 2018
98ab8e5
Publish [email protected]
jshcrowthe Mar 8, 2018
6aed77a
Update yarn.lock
jshcrowthe Mar 8, 2018
69c9a97
Fix issues that arose in latest release flow
jshcrowthe Mar 8, 2018
786082d
Fix MutationQueue issue resulting in re-sending acknowledged writes. …
mikelehen Mar 12, 2018
0c5cbe0
Fixes #562, Adds usePublicVapidKey to firebase/index.d.ts (#563)
abeisgoat Mar 14, 2018
bf7a221
Set log level to VERBOSE if enableLogging(true) is passed (#561)
Mar 14, 2018
b949d81
Fix for b/74749605: Cancel pending backoff operations when closing st…
mikelehen Mar 14, 2018
2cb9ef5
Passwordless (#529)
wti806 Mar 15, 2018
1b3ba41
Refactor Auth storage test (#530)
wti806 Mar 15, 2018
df183a5
Remove assert I accidentally left in (I meant to remove it when I re-…
mikelehen Mar 15, 2018
f11a000
Merge
schmidt-sebastian Mar 16, 2018
2a5d3f6
Manual merge
schmidt-sebastian Mar 16, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,6 @@ integration/messaging @gauntface @pinarx
# Auth Code
packages/auth @bojeil-google @wti806 @tmsch
packages/auth-types @bojeil-google @wti806 @tmsch

# Testing Code
packages/testing @tonymeng @ryanpbrewster
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ before_install:
# Yarn defaults to an old version, make sure we
# get an up to date version
- npm install -g yarn
- echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" > $HOME/.npmrc
- '[ "${NPM_TOKEN+x}" ] && echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" > $HOME/.npmrc || echo "Skipping .npmrc creation";'
before_script:
- cp config/ci.config.json config/project.json
script:
Expand All @@ -37,4 +37,5 @@ deploy:
provider: script
script: yarn release --canary
on:
repo: firebase/firebase-js-sdk
branch: master
1 change: 1 addition & 0 deletions config/tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"compileOnSave": false,
"compilerOptions": {
"declaration": true,
"importHelpers": true,
"lib": [
"es5",
"es2015",
Expand Down
10 changes: 5 additions & 5 deletions integration/browserify/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
"test": "karma start --single-run"
},
"dependencies": {
"firebase": "4.9.1"
"firebase": "4.11.0"
},
"devDependencies": {
"browserify": "^14.5.0",
"browserify": "^16.1.0",
"chai": "^4.1.1",
"karma": "^1.7.0",
"karma": "^2.0.0",
"karma-chrome-launcher": "^2.2.0",
"karma-mocha": "^1.3.0",
"karma-sauce-launcher": "^1.2.0",
"karma-spec-reporter": "0.0.31",
"karma-spec-reporter": "0.0.32",
"mkdirp": "^0.5.1",
"mocha": "^4.0.1"
"mocha": "^5.0.1"
}
}
4 changes: 2 additions & 2 deletions integration/firebase-typings/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
"test": "tsc index.ts --outDir dist"
},
"dependencies": {
"firebase": "4.9.1"
"firebase": "4.11.0"
},
"devDependencies": {
"typescript": "^2.4.2"
"typescript": "^2.7.2"
}
}
22 changes: 11 additions & 11 deletions integration/firestore/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@
"test:debug": "karma start --auto-watch --browsers Chrome"
},
"devDependencies": {
"@types/mocha": "^2.2.44",
"@types/node": "^8.0.47",
"gulp": "gulpjs/gulp#4.0",
"gulp-filter": "^5.0.1",
"@types/mocha": "^2.2.48",
"@types/node": "^9.4.6",
"gulp": "^4.0.0",
"gulp-filter": "^5.1.0",
"gulp-replace": "^0.6.1",
"karma": "^1.7.0",
"karma": "^2.0.0",
"karma-chrome-launcher": "^2.2.0",
"karma-mocha": "^1.3.0",
"karma-spec-reporter": "0.0.31",
"mocha": "^4.0.1",
"ts-loader": "^3.1.0",
"typescript": "^2.4.2",
"webpack": "^3.8.1",
"webpack-stream": "^4.0.0"
"karma-spec-reporter": "0.0.32",
"mocha": "^5.0.1",
"ts-loader": "^3.5.0",
"typescript": "^2.7.2",
"webpack": "^3.11.0",
"webpack-stream": "^4.0.2"
}
}
12 changes: 6 additions & 6 deletions integration/messaging/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@
"test:manual": "mocha --exit"
},
"dependencies": {
"firebase": "4.9.1"
"firebase": "4.11.0"
},
"devDependencies": {
"chai": "^4.1.1",
"chromedriver": "^2.31.0",
"chromedriver": "^2.35.0",
"express": "^4.15.4",
"geckodriver": "^1.8.0",
"mocha": "^4.0.1",
"node-fetch": "^1.7.2",
"selenium-assistant": "^5.2.0",
"sinon": "^4.1.3"
"mocha": "^5.0.1",
"node-fetch": "^2.0.0",
"selenium-assistant": "^5.3.0",
"sinon": "^4.3.0"
}
}
16 changes: 6 additions & 10 deletions integration/messaging/test/utils/test-server.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ class MessagingTestServer {
return `http://localhost:${PORT_NUMBER}`;
}

start() {
async start() {
if (this._server) {
return Promise.resolve();
return;
}

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

// Sometimes the server doesn't trigger the callback due to
// currently open sockets. So call `closethis._server
stop() {
if (!this._server) {
return Promise.resolve();
async stop() {
if (this._server) {
this._server.close();
this._server = null;
}

this._server.close();
this._server = null;

return Promise.resolve();
}
}
module.exports = new MessagingTestServer();
18 changes: 9 additions & 9 deletions integration/typescript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@
"test": "karma start --single-run"
},
"dependencies": {
"firebase": "4.9.1"
"firebase": "4.11.0"
},
"devDependencies": {
"@types/chai": "^4.0.4",
"@types/mocha": "^2.2.44",
"@types/node": "^8.0.47",
"@types/chai": "^4.1.2",
"@types/mocha": "^2.2.48",
"@types/node": "^9.4.6",
"chai": "^4.1.1",
"karma": "^1.7.0",
"karma": "^2.0.0",
"karma-chrome-launcher": "^2.2.0",
"karma-mocha": "^1.3.0",
"karma-sauce-launcher": "^1.2.0",
"karma-spec-reporter": "0.0.31",
"karma-typescript": "^3.0.8",
"mocha": "^4.0.1",
"karma-spec-reporter": "0.0.32",
"karma-typescript": "^3.0.12",
"mocha": "^5.0.1",
"npm-run-all": "^4.1.1",
"typescript": "^2.4.2"
"typescript": "^2.7.2"
}
}
10 changes: 5 additions & 5 deletions integration/webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
"test": "karma start --single-run"
},
"dependencies": {
"firebase": "4.9.1"
"firebase": "4.11.0"
},
"devDependencies": {
"chai": "^4.1.1",
"karma": "^1.7.0",
"karma": "^2.0.0",
"karma-chrome-launcher": "^2.2.0",
"karma-mocha": "^1.3.0",
"karma-sauce-launcher": "^1.2.0",
"karma-spec-reporter": "0.0.31",
"mocha": "^4.0.1",
"webpack": "^3.8.1"
"karma-spec-reporter": "0.0.32",
"mocha": "^5.0.1",
"webpack": "^3.11.0"
}
}
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,29 +37,29 @@
"integration/*"
],
"devDependencies": {
"chalk": "^2.3.0",
"chalk": "^2.3.1",
"child-process-promise": "^2.2.1",
"clone": "^2.1.1",
"coveralls": "^3.0.0",
"dependency-graph": "^0.7.0",
"firebase-tools": "^3.10.1",
"firebase-tools": "^3.17.4",
"glob": "^7.1.2",
"gulp-sourcemaps": "^2.6.1",
"gulp-typescript": "^3.2.3",
"gulp-sourcemaps": "^2.6.4",
"gulp-typescript": "^4.0.1",
"husky": "^0.14.3",
"inquirer": "^5.0.0",
"inquirer": "^5.1.0",
"istanbul-instrumenter-loader": "^3.0.0",
"lcov-result-merger": "^1.2.0",
"lerna": "^2.1.0",
"lcov-result-merger": "^2.0.0",
"lerna": "^2.9.0",
"listr": "^0.13.0",
"merge2": "^1.2.0",
"merge2": "^1.2.1",
"mkdirp": "^0.5.1",
"mz": "^2.7.0",
"npm-run-path": "^2.0.2",
"ora": "^1.3.0",
"prettier": "^1.7.0",
"ora": "^2.0.0",
"prettier": "^1.10.2",
"semver": "^5.5.0",
"simple-git": "^1.80.1",
"yargs": "^10.0.3"
"simple-git": "^1.91.0",
"yargs": "^11.0.0"
}
}
4 changes: 2 additions & 2 deletions packages/app-types/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@firebase/app-types",
"version": "0.1.1",
"version": "0.1.2",
"description": "@firebase/app Types",
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
"license": "Apache-2.0",
Expand All @@ -12,7 +12,7 @@
"private.d.ts"
],
"devDependencies": {
"typescript": "^2.4.2"
"typescript": "^2.7.2"
},
"repository": {
"type": "git",
Expand Down
39 changes: 20 additions & 19 deletions packages/app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@firebase/app",
"version": "0.1.8",
"version": "0.1.10",
"description": "The primary entrypoint to the Firebase JS SDK",
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
"main": "dist/cjs/index.js",
Expand All @@ -15,35 +15,36 @@
},
"license": "Apache-2.0",
"dependencies": {
"@firebase/app-types": "0.1.1",
"@firebase/util": "0.1.8"
"@firebase/app-types": "0.1.2",
"@firebase/util": "0.1.10",
"tslib": "^1.9.0"
},
"devDependencies": {
"@types/chai": "^4.0.4",
"@types/mocha": "^2.2.44",
"@types/sinon": "^2.3.7",
"@types/chai": "^4.1.2",
"@types/mocha": "^2.2.48",
"@types/sinon": "^4.1.3",
"chai": "^4.1.1",
"gulp": "gulpjs/gulp#4.0",
"gulp": "^4.0.0",
"gulp-replace": "^0.6.1",
"gulp-sourcemaps": "^2.6.1",
"karma": "^1.7.0",
"gulp-sourcemaps": "^2.6.4",
"karma": "^2.0.0",
"karma-chrome-launcher": "^2.2.0",
"karma-cli": "^1.0.1",
"karma-coverage-istanbul-reporter": "^1.3.0",
"karma-coverage-istanbul-reporter": "^1.4.1",
"karma-mocha": "^1.3.0",
"karma-sauce-launcher": "^1.2.0",
"karma-sourcemap-loader": "^0.3.7",
"karma-spec-reporter": "^0.0.31",
"karma-webpack": "^2.0.4",
"mocha": "^4.0.1",
"karma-spec-reporter": "^0.0.32",
"karma-webpack": "^2.0.9",
"mocha": "^5.0.1",
"npm-run-all": "^4.1.1",
"nyc": "^11.2.1",
"sinon": "^4.0.2",
"nyc": "^11.4.1",
"sinon": "^4.3.0",
"source-map-loader": "^0.2.3",
"ts-loader": "^3.1.0",
"ts-node": "^4.1.0",
"typescript": "^2.4.2",
"webpack": "^3.8.1"
"ts-loader": "^3.5.0",
"ts-node": "^5.0.0",
"typescript": "^2.7.2",
"webpack": "^3.11.0"
},
"repository": {
"type": "git",
Expand Down
Loading