Skip to content

Commit e835f25

Browse files
Feiyang1Feiyang1
authored
Merge branch 'master' into fei-exp-release-fix
2 parents 2b81326 + b98cd65 commit e835f25

File tree

71 files changed

+2198
-638
lines changed

Some content is hidden

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

71 files changed

+2198
-638
lines changed

‎.changeset/clever-kangaroos-hug.md

-5
This file was deleted.

‎.changeset/hip-glasses-grin.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@firebase/database': minor
3+
---
4+
5+
Add `startAfter` and `endBefore` filters for paginating RTDB queries.

‎config/functions/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"description": "Cloud Functions for Firebase",
44
"dependencies": {
55
"cors": "2.8.5",
6-
"firebase-admin": "9.4.1",
7-
"firebase-functions": "3.11.0"
6+
"firebase-admin": "9.4.2",
7+
"firebase-functions": "3.13.0"
88
},
99
"private": true,
1010
"engines": {

‎config/karma.base.js

+1-41
Original file line numberDiff line numberDiff line change
@@ -20,33 +20,6 @@ const path = require('path');
2020
const webpackTestConfig = require('./webpack.test');
2121
const { argv } = require('yargs');
2222

23-
/**
24-
* Custom SauceLabs Launchers
25-
*/
26-
const sauceLabsBrowsers = {
27-
desktop_Safari: {
28-
base: 'SauceLabs',
29-
browserName: 'safari',
30-
platform: 'OS X 10.11',
31-
version: '9.0'
32-
},
33-
iOS_Safari: {
34-
appiumVersion: '1.6.5',
35-
base: 'SauceLabs',
36-
browserName: 'Safari',
37-
deviceName: 'iPhone Simulator',
38-
deviceOrientation: 'portrait',
39-
platformName: 'iOS',
40-
platformVersion: '9.0'
41-
},
42-
IE_11: {
43-
base: 'SauceLabs',
44-
browserName: 'internet explorer',
45-
platform: 'Windows 8.1',
46-
version: '11'
47-
}
48-
};
49-
5023
const config = {
5124
// disable watcher
5225
autoWatch: false,
@@ -67,7 +40,7 @@ const config = {
6740
// test results reporter to use
6841
// possible values: 'dots', 'progress'
6942
// available reporters: https://npmjs.org/browse/keyword/karma-reporter
70-
reporters: ['mocha', 'coverage-istanbul' /*, 'saucelabs' */],
43+
reporters: ['mocha', 'coverage-istanbul'],
7144

7245
// web server port
7346
port: 8089,
@@ -84,8 +57,6 @@ const config = {
8457
// changes
8558
autoWatch: false,
8659

87-
customLaunchers: sauceLabsBrowsers,
88-
8960
// start these browsers
9061
// available browser launchers:
9162
// https://npmjs.org/browse/keyword/karma-launcher
@@ -95,13 +66,6 @@ const config = {
9566

9667
webpackMiddleware: { quiet: true, stats: { colors: true } },
9768

98-
sauceLabs: {
99-
tunnelIdentifier: process.env.TRAVIS_JOB_NUMBER,
100-
username: process.env.SAUCE_USERNAME,
101-
accessKey: process.env.SAUCE_ACCESS_KEY,
102-
startConnect: false
103-
},
104-
10569
singleRun: false,
10670

10771
client: {
@@ -120,10 +84,6 @@ const config = {
12084
}
12185
};
12286

123-
// In CI environment, use saucelabs to test
124-
if (false /* process.env.TRAVIS */) {
125-
config.browsers = [...config.browsers, ...Object.keys(sauceLabsBrowsers)];
126-
}
12787
config.mochaReporter = {
12888
showDiff: true
12989
};

‎integration/firebase/package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"test:ci": "node ../../scripts/run_tests_in_ci.js -s test"
88
},
99
"devDependencies": {
10-
"firebase": "8.2.2",
10+
"firebase": "8.2.3",
1111
"@types/chai": "4.2.14",
1212
"@types/mocha": "7.0.2",
1313
"chai": "4.2.0",
@@ -16,7 +16,6 @@
1616
"karma-chrome-launcher": "3.1.0",
1717
"karma-firefox-launcher": "2.1.0",
1818
"karma-mocha": "2.0.1",
19-
"karma-sauce-launcher": "1.2.0",
2019
"karma-spec-reporter": "0.0.32",
2120
"karma-typescript": "5.2.0",
2221
"mocha": "7.2.0",

‎integration/firestore/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"karma-mocha": "2.0.1",
2727
"karma-spec-reporter": "0.0.32",
2828
"mocha": "7.2.0",
29-
"ts-loader": "8.0.11",
29+
"ts-loader": "8.0.12",
3030
"typescript": "4.0.5",
3131
"webpack": "4.44.2",
3232
"webpack-stream": "6.1.1"

‎integration/messaging/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
"test:manual": "mocha --exit"
1010
},
1111
"devDependencies": {
12-
"firebase": "8.2.2",
12+
"firebase": "8.2.3",
1313
"chai": "4.2.0",
1414
"chromedriver": "86.0.0",
1515
"express": "4.17.1",
16-
"geckodriver": "1.20.0",
16+
"geckodriver": "1.21.1",
1717
"mocha": "7.2.0",
1818
"node-fetch": "2.6.1",
1919
"selenium-assistant": "6.1.0"

‎package.json

+28-30
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424
"dev": "lerna run --parallel --scope @firebase/* --scope firebase --scope rxfire dev",
2525
"build": "lerna run --scope @firebase/app-exp build:deps && lerna run --scope @firebase/* --scope firebase --scope rxfire --ignore @firebase/app-exp build",
2626
"build:exp": "lerna run --scope @firebase/*-exp --scope @firebase/*-compat --scope firebase-exp build",
27-
"build:release": "lerna run --scope @firebase/app-exp build:deps && lerna run --scope @firebase/* --scope firebase --scope rxfire --ignore @firebase/*-exp --ignore @firebase/*-compat prepare",
28-
"build:exp:release": "yarn --cwd packages/app build:deps && lerna run --scope @firebase/*-exp --scope @firebase/*-compat --scope firebase-exp prepare && yarn --cwd packages-exp/app-exp typings:public",
27+
"build:release": "lerna run --scope @firebase/app-exp build:deps && lerna run --scope @firebase/* --scope firebase --scope rxfire --ignore @firebase/*-exp --ignore @firebase/*-compat build",
2928
"build:changed": "ts-node-script scripts/ci-test/build_changed.ts",
3029
"link:packages": "lerna exec --scope @firebase/* --scope firebase --scope rxfire -- yarn link",
3130
"stage:packages": "./scripts/prepublish.sh",
@@ -67,32 +66,32 @@
6766
"repo-scripts/*"
6867
],
6968
"devDependencies": {
70-
"@babel/core": "7.12.3",
69+
"@babel/core": "7.12.10",
7170
"@babel/plugin-transform-modules-commonjs": "7.12.1",
72-
"@babel/preset-env": "7.12.1",
71+
"@babel/preset-env": "7.12.11",
7372
"@changesets/changelog-github": "0.2.7",
74-
"@changesets/cli": "2.11.2",
73+
"@changesets/cli": "2.12.0",
7574
"@types/chai": "4.2.14",
7675
"@types/chai-as-promised": "7.1.3",
7776
"@types/child-process-promise": "2.2.1",
7877
"@types/clone": "2.1.0",
79-
"@types/eslint": "7.2.5",
78+
"@types/eslint": "7.2.6",
8079
"@types/inquirer": "7.3.1",
8180
"@types/listr": "0.14.2",
8281
"@types/long": "4.0.1",
8382
"@types/mocha": "7.0.2",
84-
"@types/mz": "2.7.2",
85-
"@types/node": "12.19.4",
86-
"@types/sinon": "9.0.8",
83+
"@types/mz": "2.7.3",
84+
"@types/node": "12.19.11",
85+
"@types/sinon": "9.0.10",
8786
"@types/sinon-chai": "3.2.5",
8887
"@types/tmp": "0.2.0",
89-
"@types/yargs": "15.0.9",
90-
"@typescript-eslint/eslint-plugin": "4.8.1",
91-
"@typescript-eslint/eslint-plugin-tslint": "4.8.1",
92-
"@typescript-eslint/parser": "4.8.1",
88+
"@types/yargs": "15.0.12",
89+
"@typescript-eslint/eslint-plugin": "4.11.1",
90+
"@typescript-eslint/eslint-plugin-tslint": "4.11.1",
91+
"@typescript-eslint/parser": "4.11.1",
9392
"api-documenter-me": "0.1.0",
9493
"api-extractor-me": "0.1.1",
95-
"babel-loader": "8.2.1",
94+
"babel-loader": "8.2.2",
9695
"chai": "4.2.0",
9796
"chai-as-promised": "7.1.1",
9897
"chalk": "4.1.0",
@@ -101,21 +100,21 @@
101100
"coveralls": "3.1.0",
102101
"del": "6.0.0",
103102
"dependency-graph": "0.9.0",
104-
"eslint": "7.13.0",
103+
"eslint": "7.16.0",
105104
"eslint-plugin-import": "2.22.1",
106-
"eslint-plugin-unused-imports": "1.0.0",
105+
"eslint-plugin-unused-imports": "1.0.1",
107106
"express": "4.17.1",
108107
"find-free-port": "2.0.0",
109-
"firebase-functions": "3.11.0",
110-
"firebase-tools": "9.0.1",
108+
"firebase-functions": "3.13.0",
109+
"firebase-tools": "9.1.0",
111110
"git-rev-sync": "3.0.1",
112111
"glob": "7.1.6",
113112
"http-server": "0.12.3",
114-
"husky": "4.3.0",
113+
"husky": "4.3.6",
115114
"indexeddbshim": "7.0.0",
116115
"inquirer": "7.3.3",
117116
"istanbul-instrumenter-loader": "3.0.1",
118-
"js-yaml": "3.14.0",
117+
"js-yaml": "3.14.1",
119118
"karma": "5.2.3",
120119
"karma-chrome-launcher": "3.1.0",
121120
"karma-cli": "2.0.0",
@@ -124,7 +123,6 @@
124123
"karma-mocha": "2.0.1",
125124
"karma-mocha-reporter": "2.2.5",
126125
"karma-safari-launcher": "1.0.0",
127-
"karma-sauce-launcher": "1.2.0",
128126
"karma-sourcemap-loader": "0.3.8",
129127
"karma-spec-reporter": "0.0.32",
130128
"karma-summary-reporter": "1.9.0",
@@ -142,23 +140,23 @@
142140
"npm-run-path": "4.0.1",
143141
"nyc": "15.1.0",
144142
"ora": "5.1.0",
145-
"prettier": "2.1.2",
143+
"prettier": "2.2.1",
146144
"protractor": "5.4.2",
147145
"rxjs": "6.6.3",
148-
"semver": "7.3.2",
149-
"simple-git": "2.22.0",
150-
"sinon": "9.2.1",
146+
"semver": "7.3.4",
147+
"simple-git": "2.31.0",
148+
"sinon": "9.2.2",
151149
"sinon-chai": "3.5.0",
152-
"source-map-loader": "1.1.2",
153-
"terser": "5.4.0",
154-
"ts-loader": "8.0.11",
155-
"ts-node": "9.0.0",
150+
"source-map-loader": "1.1.3",
151+
"terser": "5.5.1",
152+
"ts-loader": "8.0.12",
153+
"ts-node": "9.1.1",
156154
"tslint": "6.1.3",
157155
"typedoc": "0.16.11",
158156
"typescript": "4.0.5",
159157
"watch": "1.0.2",
160158
"webpack": "4.44.2",
161-
"yargs": "16.1.1"
159+
"yargs": "16.2.0"
162160
},
163161
"husky": {
164162
"hooks": {

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
"test:ci": "node ../../scripts/run_tests_in_ci.js -s test:all",
2424
"test:browser": "karma start --single-run",
2525
"test:browser:debug": "karma start --browsers Chrome --auto-watch",
26-
"test:node": "TS_NODE_FILES=true TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha test/**/*.test.* src/**/*.test.ts --config ../../config/mocharc.node.js",
27-
"prepare": "yarn build:release"
26+
"test:node": "TS_NODE_FILES=true TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha test/**/*.test.* src/**/*.test.ts --config ../../config/mocharc.node.js"
2827
},
2928
"license": "Apache-2.0",
3029
"dependencies": {
@@ -37,7 +36,7 @@
3736
"xmlhttprequest": "1.8.0"
3837
},
3938
"devDependencies": {
40-
"rollup": "2.33.2",
39+
"rollup": "2.35.1",
4140
"@rollup/plugin-json": "4.1.0",
4241
"rollup-plugin-replace": "2.2.0",
4342
"rollup-plugin-typescript2": "0.29.0",

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
"test:all": "run-p test:browser test:node",
2222
"test:browser": "karma start --single-run",
2323
"test:node": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha src/**/*.test.ts --config ../../config/mocharc.node.js",
24-
"prepare": "rollup -c rollup.config.release.js && yarn api-report",
2524
"api-report": "api-extractor run --local --verbose",
2625
"predoc": "node ../../scripts/exp/remove-exp.js temp",
2726
"doc": "api-documenter markdown --input temp --output docs",
@@ -38,7 +37,7 @@
3837
},
3938
"license": "Apache-2.0",
4039
"devDependencies": {
41-
"rollup": "2.33.2",
40+
"rollup": "2.35.1",
4241
"@rollup/plugin-json": "4.1.0",
4342
"rollup-plugin-replace": "2.2.0",
4443
"rollup-plugin-typescript2": "0.29.0",

‎packages-exp/auth-compat-exp/demo/functions/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"dependencies": {
1212
"firebase-admin": "8.13.0",
13-
"firebase-functions": "3.11.0"
13+
"firebase-functions": "3.13.0"
1414
},
1515
"private": true
1616
}

‎packages-exp/auth-compat-exp/demo/functions/yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -705,10 +705,10 @@ [email protected]:
705705
"@google-cloud/firestore" "^3.0.0"
706706
"@google-cloud/storage" "^4.1.2"
707707

708-
firebase-functions@3.11.0:
709-
version "3.11.0"
710-
resolved "https://registry.npmjs.org/firebase-functions/-/firebase-functions-3.11.0.tgz#92f5a6af6a10641da6dc9b41b29974658b621a7b"
711-
integrity sha512-i1uMhZ/M6i5SCI3ulKo7EWX0/LD+I5o6N+sk0HbOWfzyWfOl0iJTvQkR3BVDcjrlhPVC4xG1bDTLxd+DTkLqaw==
708+
firebase-functions@3.13.0:
709+
version "3.13.0"
710+
resolved "https://registry.npmjs.org/firebase-functions/-/firebase-functions-3.13.0.tgz#66278dbeb45f343a179814f2b1d95b383beec5e7"
711+
integrity sha512-tnltJL5KlGtbeBD9scsVjoKTSTMeo6EAy1gsdOfRlrwAu6idgLRKYVdmw0YymS8N7SwJ3CXo+3fuvSSihKhXbA==
712712
dependencies:
713713
"@types/express" "4.17.3"
714714
cors "^2.8.5"

‎packages-exp/auth-compat-exp/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"license": "Apache-2.0",
3838
"devDependencies": {
3939
"@firebase/app-compat": "0.x",
40-
"rollup": "2.33.2",
40+
"rollup": "2.35.1",
4141
"@rollup/plugin-json": "4.1.0",
4242
"rollup-plugin-replace": "2.2.0",
4343
"rollup-plugin-typescript2": "0.29.0",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"dependencies": {
1212
"firebase-admin": "8.13.0",
13-
"firebase-functions": "3.11.0"
13+
"firebase-functions": "3.13.0"
1414
},
1515
"private": true,
1616
"engines": {

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -705,10 +705,10 @@ [email protected]:
705705
"@google-cloud/firestore" "^3.0.0"
706706
"@google-cloud/storage" "^4.1.2"
707707

708-
firebase-functions@3.11.0:
709-
version "3.11.0"
710-
resolved "https://registry.npmjs.org/firebase-functions/-/firebase-functions-3.11.0.tgz#92f5a6af6a10641da6dc9b41b29974658b621a7b"
711-
integrity sha512-i1uMhZ/M6i5SCI3ulKo7EWX0/LD+I5o6N+sk0HbOWfzyWfOl0iJTvQkR3BVDcjrlhPVC4xG1bDTLxd+DTkLqaw==
708+
firebase-functions@3.13.0:
709+
version "3.13.0"
710+
resolved "https://registry.npmjs.org/firebase-functions/-/firebase-functions-3.13.0.tgz#66278dbeb45f343a179814f2b1d95b383beec5e7"
711+
integrity sha512-tnltJL5KlGtbeBD9scsVjoKTSTMeo6EAy1gsdOfRlrwAu6idgLRKYVdmw0YymS8N7SwJ3CXo+3fuvSSihKhXbA==
712712
dependencies:
713713
"@types/express" "4.17.3"
714714
cors "^2.8.5"

‎packages-exp/auth-exp/demo/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"license": "Apache-2.0",
2828
"devDependencies": {
2929
"@rollup/plugin-strip": "2.0.0",
30-
"rollup": "2.33.2",
30+
"rollup": "2.35.1",
3131
"@rollup/plugin-json": "4.1.0",
3232
"rollup-plugin-replace": "2.2.0",
3333
"rollup-plugin-terser": "6.1.0",

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
"test:browser:debug": "karma start --auto-watch",
2828
"test:browser:unit:debug": "karma start --auto-watch --unit",
2929
"test:node": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'src/!(platform_browser|platform_react_native)/**/*.test.ts' --file index.node.ts --config ../../config/mocharc.node.js",
30-
"prepare": "rollup -c rollup.config.release.js",
3130
"api-report": "api-extractor run --local --verbose",
3231
"predoc": "node ../../scripts/exp/remove-exp.js temp",
3332
"doc": "api-documenter markdown --input temp --output docs",
@@ -48,7 +47,7 @@
4847
"license": "Apache-2.0",
4948
"devDependencies": {
5049
"@firebase/app-exp": "0.0.900",
51-
"rollup": "2.33.2",
50+
"rollup": "2.35.1",
5251
"@rollup/plugin-json": "4.1.0",
5352
"rollup-plugin-sourcemaps": "0.6.3",
5453
"rollup-plugin-typescript2": "0.29.0",

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
"build:compat": "rollup -c compat/rollup.config.js",
3333
"build:compat:release": "rollup -c compat/rollup.config.release.js",
3434
"dev": "rollup -c -w",
35-
"prepare": "yarn build:release",
3635
"test": "echo 'No test suite for firebase wrapper'",
3736
"test:ci": "echo 'No test suite for firebase wrapper'"
3837
},
@@ -47,7 +46,7 @@
4746
"@firebase/messaging-exp": "0.0.900"
4847
},
4948
"devDependencies": {
50-
"rollup": "2.33.2",
49+
"rollup": "2.35.1",
5150
"@rollup/plugin-commonjs": "15.1.0",
5251
"rollup-plugin-license": "2.2.0",
5352
"@rollup/plugin-node-resolve": "9.0.0",

0 commit comments

Comments
 (0)