Skip to content

Commit 917098a

Browse files
schmidt-sebastianschmidt-sebastian
committed
Merge branch 'master' into mrschmidt/storageapis
2 parents 3f07169 + 216eb63 commit 917098a

File tree

83 files changed

+1608
-1323
lines changed

Some content is hidden

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

83 files changed

+1608
-1323
lines changed

‎.github/workflows/cross-browser-test.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
name: Cross-Browser Test Flow
22

33
on:
4-
pull_request:
4+
push:
55
branches:
66
- master
7-
types:
8-
- closed
97

108
jobs:
119
cross-browser-test:

‎.github/workflows/test-all.yml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
1-
name: Run All Tests
1+
name: Test All Packages
22

3-
on:
4-
pull_request:
5-
branches:
6-
- master
7-
types:
8-
- closed
9-
schedule:
10-
- cron: '0 6,18 * * *'
3+
on: push
114

125
jobs:
136
test:
@@ -43,7 +36,7 @@ jobs:
4336
deploy:
4437
name: Canary Deploy
4538
runs-on: ubuntu-latest
46-
if: github.event.pull_request.merged
39+
if: github.ref == 'refs/heads/master'
4740
needs: test
4841

4942
steps:

‎.github/workflows/test-changed.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
name: Push/PR
1+
name: Test Modified Packages
22

3-
on: [push, pull_request]
3+
on: pull_request
44

55
jobs:
66
test:

‎config/functions/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Cloud Functions for Firebase",
44
"dependencies": {
55
"cors": "2.8.5",
6-
"firebase-admin": "8.9.2",
6+
"firebase-admin": "8.10.0",
77
"firebase-functions": "3.3.0"
88
},
99
"private": true,

‎integration/browserify/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"test": "karma start --single-run"
88
},
99
"dependencies": {
10-
"firebase": "7.11.0"
10+
"firebase": "7.12.0"
1111
},
1212
"devDependencies": {
1313
"@babel/core": "7.8.7",
@@ -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.1",
24+
"mkdirp": "0.5.3",
2525
"mocha": "7.1.0"
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.11.0"
9+
"firebase": "7.12.0"
1010
},
1111
"devDependencies": {
1212
"typescript": "3.8.3"

‎integration/firestore/gulpfile.js

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ function clean() {
2727
return del(['temp/**/*', 'dist/**/*']);
2828
}
2929

30+
function isPersistenceEnabled() {
31+
return process.env.INCLUDE_FIRESTORE_PERSISTENCE !== 'false';
32+
}
33+
3034
function copyTests() {
3135
/**
3236
* NOTE: We intentionally don't copy src/ files (to make sure we are only
@@ -37,7 +41,9 @@ function copyTests() {
3741
const firebaseAppSdk = 'firebase/app/dist/index.esm.js';
3842
const firebaseFirestoreSdk = resolve(
3943
__dirname,
40-
'../../packages/firestore/dist/index.esm.js'
44+
isPersistenceEnabled()
45+
? '../../packages/firestore/dist/index.esm.js'
46+
: '../../packages/firestore/dist/index.memory.esm.js'
4147
);
4248
return gulp
4349
.src(
@@ -63,7 +69,14 @@ function copyTests() {
6369
*/
6470
/import\s+firebase\s+from\s+('|")[^\1]+firebase_export\1;?/,
6571
`import firebase from '${firebaseAppSdk}';
66-
import '${firebaseFirestoreSdk}';`
72+
import '${firebaseFirestoreSdk}';
73+
74+
if (typeof process === 'undefined') {
75+
process = { env: { INCLUDE_FIRESTORE_PERSISTENCE: '${isPersistenceEnabled()}' } } as any;
76+
} else {
77+
process.env.INCLUDE_FIRESTORE_PERSISTENCE = '${isPersistenceEnabled()}';
78+
}
79+
`
6780
)
6881
)
6982
.pipe(

‎integration/firestore/package.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
"version": "1.0.1",
44
"private": true,
55
"scripts": {
6-
"build": "gulp compile-tests",
7-
"build:deps": "cd ../../ ; yarn build",
8-
"pretest:manual": "yarn build",
9-
"pretest:debug": "yarn build:deps && yarn build",
10-
"test": "echo 'Automated tests temporarily disabled, run `yarn test:manual` to execute these tests'",
11-
"test:manual": "karma start --single-run",
12-
"test:debug": "karma start --auto-watch --browsers Chrome"
6+
"build:deps": "cd ../../packages/firestore ; yarn build",
7+
"build:persistence": "INCLUDE_FIRESTORE_PERSISTENCE=true gulp compile-tests",
8+
"build:memory": "INCLUDE_FIRESTORE_PERSISTENCE=false gulp compile-tests",
9+
"test": "yarn build:memory; karma start --single-run; yarn build:persistence; karma start --single-run;",
10+
"test:persistence": " yarn build:persistence; karma start --single-run",
11+
"test:memory": "yarn build:memory; karma start --single-run",
12+
"test:debug:persistence": "yarn build:deps; yarn build:persistence; karma start --auto-watch --browsers Chrome",
13+
"test:debug:memory": "yarn build:deps; yarn build:memory; karma start --single-run"
1314
},
1415
"devDependencies": {
1516
"@types/mocha": "7.0.2",

‎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": "7.11.0"
11+
"firebase": "7.12.0"
1212
},
1313
"devDependencies": {
1414
"chai": "4.2.0",

‎integration/typescript/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
"test": "karma start --single-run"
77
},
88
"dependencies": {
9-
"firebase": "7.11.0"
9+
"firebase": "7.12.0"
1010
},
1111
"devDependencies": {
1212
"@babel/core": "7.8.7",
1313
"@babel/preset-env": "7.8.7",
14-
"@types/chai": "4.2.10",
14+
"@types/chai": "4.2.11",
1515
"@types/mocha": "7.0.2",
1616
"chai": "4.2.0",
1717
"karma": "4.4.1",

‎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": "7.11.0"
10+
"firebase": "7.12.0"
1111
},
1212
"devDependencies": {
1313
"@babel/core": "7.8.7",

‎package.json

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
"scripts": {
2020
"dev": "lerna run --parallel --scope @firebase/* --scope firebase --scope rxfire dev",
2121
"build": "lerna run --scope @firebase/* --scope firebase --scope rxfire prepare",
22-
"prepush": "node tools/gitHooks/prepush.js",
2322
"link:packages": "lerna exec --scope @firebase/* --scope firebase --scope rxfire -- yarn link",
2423
"stage:packages": "./scripts/prepublish.sh",
2524
"repl": "node tools/repl.js",
@@ -48,16 +47,16 @@
4847
"integration/*"
4948
],
5049
"devDependencies": {
51-
"@types/chai": "4.2.10",
50+
"@types/chai": "4.2.11",
5251
"@types/chai-as-promised": "7.1.2",
5352
"@types/long": "4.0.1",
5453
"@types/mocha": "7.0.2",
5554
"@types/node": "8.10.59",
5655
"@types/sinon": "7.5.2",
5756
"@types/sinon-chai": "3.2.3",
58-
"@typescript-eslint/eslint-plugin": "2.23.0",
59-
"@typescript-eslint/eslint-plugin-tslint": "2.23.0",
60-
"@typescript-eslint/parser": "2.23.0",
57+
"@typescript-eslint/eslint-plugin": "2.24.0",
58+
"@typescript-eslint/eslint-plugin-tslint": "2.24.0",
59+
"@typescript-eslint/parser": "2.24.0",
6160
"babel-loader": "8.0.6",
6261
"chai": "4.2.0",
6362
"chai-as-promised": "7.1.1",
@@ -72,13 +71,13 @@
7271
"express": "4.17.1",
7372
"find-free-port": "2.0.0",
7473
"firebase-functions": "3.3.0",
75-
"firebase-tools": "7.14.0",
74+
"firebase-tools": "7.15.1",
7675
"git-rev-sync": "2.0.0",
7776
"glob": "7.1.6",
7877
"http-server": "0.12.1",
7978
"husky": "4.2.3",
8079
"indexeddbshim": "5.0.0",
81-
"inquirer": "7.0.6",
80+
"inquirer": "7.1.0",
8281
"istanbul-instrumenter-loader": "3.0.1",
8382
"js-yaml": "3.13.1",
8483
"karma": "4.4.1",
@@ -98,7 +97,7 @@
9897
"listr": "0.14.3",
9998
"long": "3.2.0",
10099
"merge2": "1.3.0",
101-
"mkdirp": "0.5.1",
100+
"mkdirp": "0.5.3",
102101
"mocha": "7.1.0",
103102
"mz": "2.7.0",
104103
"npm-run-all": "4.1.5",
@@ -109,8 +108,8 @@
109108
"protractor": "5.4.2",
110109
"rxjs": "6.5.4",
111110
"semver": "7.1.3",
112-
"simple-git": "1.131.0",
113-
"sinon": "9.0.0",
111+
"simple-git": "1.132.0",
112+
"sinon": "9.0.1",
114113
"sinon-chai": "3.5.0",
115114
"source-map-loader": "0.2.4",
116115
"ts-loader": "6.2.1",
@@ -120,7 +119,12 @@
120119
"typescript": "3.8.3",
121120
"watch": "1.0.2",
122121
"webpack": "4.42.0",
123-
"yargs": "15.3.0",
122+
"yargs": "15.3.1",
124123
"lodash": "4.17.15"
124+
},
125+
"husky": {
126+
"hooks": {
127+
"pre-push": "node tools/gitHooks/prepush.js"
128+
}
125129
}
126130
}

‎packages/analytics/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/analytics",
3-
"version": "0.2.17",
3+
"version": "0.2.18",
44
"description": "A analytics package for new firebase packages",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.cjs.js",
@@ -25,10 +25,10 @@
2525
},
2626
"dependencies": {
2727
"@firebase/analytics-types": "0.2.8",
28-
"@firebase/installations": "0.4.5",
29-
"@firebase/logger": "0.1.37",
30-
"@firebase/util": "0.2.42",
31-
"@firebase/component": "0.1.7",
28+
"@firebase/installations": "0.4.6",
29+
"@firebase/logger": "0.2.0",
30+
"@firebase/util": "0.2.43",
31+
"@firebase/component": "0.1.8",
3232
"tslib": "1.11.1"
3333
},
3434
"license": "Apache-2.0",

‎packages/app-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/app-types",
3-
"version": "0.5.3",
3+
"version": "0.6.0",
44
"description": "@firebase/app Types",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"license": "Apache-2.0",

‎packages/app/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/app",
3-
"version": "0.5.6",
3+
"version": "0.6.0",
44
"description": "The primary entrypoint to the Firebase JS SDK",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.node.cjs.js",
@@ -27,10 +27,10 @@
2727
},
2828
"license": "Apache-2.0",
2929
"dependencies": {
30-
"@firebase/app-types": "0.5.3",
31-
"@firebase/util": "0.2.42",
32-
"@firebase/logger": "0.1.37",
33-
"@firebase/component": "0.1.7",
30+
"@firebase/app-types": "0.6.0",
31+
"@firebase/util": "0.2.43",
32+
"@firebase/logger": "0.2.0",
33+
"@firebase/component": "0.1.8",
3434
"tslib": "1.11.1",
3535
"dom-storage": "2.1.0",
3636
"xmlhttprequest": "1.8.0"

‎packages/auth/demo/functions/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"logs": "firebase functions:log"
1010
},
1111
"dependencies": {
12-
"firebase-admin": "8.9.2",
12+
"firebase-admin": "8.10.0",
1313
"firebase-functions": "3.3.0"
1414
},
1515
"private": true

‎packages/auth/demo/functions/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -674,10 +674,10 @@ finalhandler@~1.1.2:
674674
statuses "~1.5.0"
675675
unpipe "~1.0.0"
676676

677-
firebase-admin@8.9.2:
678-
version "8.9.2"
679-
resolved "https://registry.npmjs.org/firebase-admin/-/firebase-admin-8.9.2.tgz#248ba184dc13b4929b043870a2067787a0dd013e"
680-
integrity sha512-ix4qcx+hHnr3mnc41Z8EzQa9Mr+2nhogLEv6ktkOCCpdKJ+9HxW9vikRCElSbC8ICHLD0KIH0GVOIZK80vbvqw==
677+
firebase-admin@8.10.0:
678+
version "8.10.0"
679+
resolved "https://registry.npmjs.org/firebase-admin/-/firebase-admin-8.10.0.tgz#4a838aec52df49845eba07ad59a40b4df996e815"
680+
integrity sha512-QzJZ1sBh9xzKjb44aP6m1duy0Xe1ixexwh0eaOt1CkJYCOq2b6bievK4GNWMl5yGQ7FFBEbZO6hyDi+5wrctcg==
681681
dependencies:
682682
"@firebase/database" "^0.5.17"
683683
"@types/node" "^8.10.59"

‎packages/auth/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/auth",
3-
"version": "0.14.0",
3+
"version": "0.14.1",
44
"main": "dist/auth.js",
55
"module": "dist/auth.esm.js",
66
"description": "Javascript library for Firebase Auth SDK",

‎packages/auth/src/authcredential.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ goog.provide('fireauth.SAMLAuthCredential');
3636
goog.provide('fireauth.SAMLAuthProvider');
3737
goog.provide('fireauth.TwitterAuthProvider');
3838

39-
goog.forwardDeclare('fireauth.RpcHandler');
39+
goog.requireType('fireauth.RpcHandler');
4040
goog.require('fireauth.ActionCodeInfo');
4141
goog.require('fireauth.ActionCodeURL');
4242
goog.require('fireauth.AuthError');

‎packages/component/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/component",
3-
"version": "0.1.7",
3+
"version": "0.1.8",
44
"description": "Firebase Component Platform",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.cjs.js",
@@ -22,7 +22,7 @@
2222
"prepare": "yarn build"
2323
},
2424
"dependencies": {
25-
"@firebase/util": "0.2.42",
25+
"@firebase/util": "0.2.43",
2626
"tslib": "1.11.1"
2727
},
2828
"license": "Apache-2.0",

‎packages/database-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/database-types",
3-
"version": "0.4.13",
3+
"version": "0.4.14",
44
"description": "@firebase/database Types",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"license": "Apache-2.0",
@@ -11,7 +11,7 @@
1111
"index.d.ts"
1212
],
1313
"dependencies": {
14-
"@firebase/app-types": "0.5.3"
14+
"@firebase/app-types": "0.6.0"
1515
},
1616
"repository": {
1717
"directory": "packages/database-types",

0 commit comments

Comments
 (0)