Skip to content

Commit fd7d493

Browse files
committed
Merge branch 'master' of https://github.com/firebase/firebase-js-sdk into test
sync to head
2 parents 8598b8a + 992432e commit fd7d493

File tree

128 files changed

+18750
-1547
lines changed

Some content is hidden

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

128 files changed

+18750
-1547
lines changed

.changeset/brave-lies-crash.md

Lines changed: 16 additions & 0 deletions

.changeset/breezy-queens-give.md

Lines changed: 2 additions & 0 deletions

.changeset/chilled-beers-chew.md

Lines changed: 3 additions & 0 deletions

.changeset/cuddly-rivers-add.md

Lines changed: 6 additions & 0 deletions

.changeset/cyan-books-melt.md

Lines changed: 3 additions & 0 deletions

.changeset/few-snails-walk.md

Lines changed: 2 additions & 0 deletions

.changeset/many-gifts-invent.md

Lines changed: 5 additions & 0 deletions

.changeset/many-lamps-bake.md

Lines changed: 2 additions & 0 deletions

.changeset/nice-seas-type.md

Lines changed: 2 additions & 0 deletions

.changeset/odd-roses-smile.md

Lines changed: 5 additions & 0 deletions

.changeset/plenty-maps-brush.md

Lines changed: 2 additions & 0 deletions

.changeset/seven-crabs-join.md

Lines changed: 2 additions & 0 deletions

.changeset/shy-forks-speak.md

Lines changed: 6 additions & 0 deletions

.changeset/small-ghosts-visit.md

Lines changed: 6 additions & 0 deletions

.changeset/tall-glasses-move.md

Lines changed: 3 additions & 0 deletions

.changeset/tall-pots-brush.md

Lines changed: 2 additions & 0 deletions

.changeset/tame-countries-marry.md

Lines changed: 3 additions & 0 deletions

.changeset/ten-plants-sort.md

Lines changed: 2 additions & 0 deletions

.changeset/thin-hornets-admire.md

Lines changed: 2 additions & 0 deletions

.changeset/thin-ligers-fold.md

Lines changed: 2 additions & 0 deletions

.changeset/tough-bananas-attend.md

Lines changed: 2 additions & 0 deletions

.changeset/tricky-rocks-dream.md

Lines changed: 2 additions & 0 deletions

.changeset/twelve-spiders-return.md

Lines changed: 2 additions & 0 deletions

.changeset/two-weeks-thank.md

Lines changed: 5 additions & 0 deletions

.changeset/warm-suns-dream.md

Lines changed: 4 additions & 0 deletions

.changeset/yellow-lamps-greet.md

Lines changed: 5 additions & 0 deletions

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,4 @@ packages/firebase/index.d.ts @egilmorez @firebase/jssdk-global-approvers
8585
scripts/docgen/content-sources/ @egilmorez @firebase/jssdk-global-approvers
8686

8787
# Changeset
88-
.changeset @egilmorez @erikeldridge @alikn @zijianjoy @andirayo @avolkovi @samhorlbeck @scottcrossen @yuchenshi @zwu52 @firebase/firestore-js-team @firebase/jssdk-global-approvers
88+
.changeset @firebase/jssdk-changeset-approvers @firebase/firestore-js-team @firebase/jssdk-global-approvers

.github/workflows/test-all.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ jobs:
2525
run: yarn build
2626
- name: Run unit tests
2727
run: xvfb-run yarn test:ci
28-
env:
29-
FCM_TEST_PROJECT_SERVER_KEY: $${{secrets.FCM_TEST_PROJECT_SERVER_KEY}}
3028
- name: Generate coverage file
3129
run: yarn ci:coverage
3230
- name: Run coverage

.github/workflows/test-changed.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,4 @@ jobs:
2727
- name: yarn build
2828
run: yarn build
2929
- name: Run tests on changed packages
30-
run: xvfb-run yarn test:changed
31-
env:
32-
FCM_TEST_PROJECT_SERVER_KEY: $${{secrets.FCM_TEST_PROJECT_SERVER_KEY}}
30+
run: xvfb-run yarn test:changed

integration/firebase-typings/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
},
99
"devDependencies": {
1010
"firebase": "7.15.5",
11-
"typescript": "3.8.3"
11+
"typescript": "3.9.5"
1212
}
1313
}

integration/firestore/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"karma-spec-reporter": "0.0.32",
2626
"mocha": "7.1.2",
2727
"ts-loader": "6.2.2",
28-
"typescript": "3.8.3",
28+
"typescript": "3.9.5",
2929
"webpack": "4.43.0",
3030
"webpack-stream": "5.2.1"
3131
}

integration/typescript/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
"karma-typescript": "5.0.2",
2424
"mocha": "7.1.2",
2525
"npm-run-all": "4.1.5",
26-
"typescript": "3.8.3"
26+
"typescript": "3.9.5"
2727
}
2828
}

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"build": "lerna run --scope @firebase/* --scope firebase --scope rxfire build",
2626
"build:exp": "lerna run --scope @firebase/*-exp --scope firebase-exp build",
2727
"build:release": "lerna run --scope @firebase/* --scope firebase --ignore @firebase/*-exp --ignore firebase-exp prepare",
28-
"build:exp:release": "lerna run --scope @firebase/*-exp --scope firebase-exp prepare && yarn --cwd packages-exp/app-exp typings:public",
28+
"build:exp:release": "yarn --cwd packages/app build:deps && lerna run --scope @firebase/*-exp --scope firebase-exp prepare && yarn --cwd packages-exp/app-exp typings:public",
2929
"link:packages": "lerna exec --scope @firebase/* --scope firebase --scope rxfire -- yarn link",
3030
"stage:packages": "./scripts/prepublish.sh",
3131
"repl": "node tools/repl.js",
@@ -83,18 +83,18 @@
8383
"babel-loader": "8.1.0",
8484
"chai": "4.2.0",
8585
"chai-as-promised": "7.1.1",
86-
"chalk": "3.0.0",
86+
"chalk": "4.1.0",
8787
"child-process-promise": "2.2.1",
8888
"clone": "2.1.2",
8989
"coveralls": "3.1.0",
9090
"del": "5.1.0",
9191
"dependency-graph": "0.9.0",
92-
"eslint": "6.8.0",
92+
"eslint": "7.3.1",
9393
"eslint-plugin-import": "2.20.2",
9494
"express": "4.17.1",
9595
"find-free-port": "2.0.0",
9696
"firebase-functions": "3.6.1",
97-
"firebase-tools": "7.16.2",
97+
"firebase-tools": "8.4.3",
9898
"git-rev-sync": "2.0.0",
9999
"glob": "7.1.6",
100100
"http-server": "0.12.3",
@@ -141,7 +141,7 @@
141141
"ts-node": "8.10.1",
142142
"tslint": "6.1.2",
143143
"typedoc": "0.16.11",
144-
"typescript": "3.8.3",
144+
"typescript": "3.9.5",
145145
"watch": "1.0.2",
146146
"webpack": "4.43.0",
147147
"yargs": "15.3.1"

packages-exp/app-exp/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
"test:browser": "karma start --single-run",
2424
"test:node": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha src/**/*.test.ts --config ../../config/mocharc.node.js",
2525
"type-check": "tsc -p . --noEmit",
26-
"prepare": "rollup -c rollup.config.release.js",
26+
"prepare": "rollup -c rollup.config.release.js && yarn api-report",
2727
"api-report": "api-extractor run --local --verbose",
2828
"predoc": "node ../../scripts/exp/remove-exp.js temp",
2929
"doc": "api-documenter markdown --input temp --output docs",
3030
"build:doc": "yarn build && yarn doc",
31-
"typings:public": "node ./use_public_typings.js --public",
32-
"typings:internal": "node ./use_public_typings.js"
31+
"typings:public": "node ./use_typings.js --public",
32+
"typings:internal": "node ./use_typings.js"
3333
},
3434
"dependencies": {
3535
"@firebase/app-types-exp": "0.0.800",
@@ -44,7 +44,7 @@
4444
"rollup-plugin-json": "4.0.0",
4545
"rollup-plugin-replace": "2.2.0",
4646
"rollup-plugin-typescript2": "0.27.0",
47-
"typescript": "3.8.3"
47+
"typescript": "3.9.5"
4848
},
4949
"repository": {
5050
"directory": "packages-exp/app-exp",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@
2626
"url": "https://github.com/firebase/firebase-js-sdk/issues"
2727
},
2828
"devDependencies": {
29-
"typescript": "3.8.3"
29+
"typescript": "3.9.5"
3030
}
3131
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/**
2+
* @license
3+
* Copyright 2020 Google LLC
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
export * from '@firebase/functions-exp';
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/**
2+
* @license
3+
* Copyright 2020 Google LLC
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
export * from '@firebase/functions-exp';
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"name": "firebase-exp/functions",
3+
"main": "dist/index.cjs.js",
4+
"browser": "dist/index.esm.js",
5+
"module": "dist/index.esm.js",
6+
"typings": "dist/functions/index.d.ts"
7+
}

packages-exp/firebase-exp/package.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "firebase-exp",
3-
"version": "0.800.1",
3+
"version": "0.800.3",
44
"private": true,
55
"description": "Firebase JavaScript library for web and Node.js",
66
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
@@ -35,7 +35,8 @@
3535
"test:ci": "echo 'No test suite for firebase wrapper'"
3636
},
3737
"dependencies": {
38-
"@firebase/app-exp": "0.0.800"
38+
"@firebase/app-exp": "0.0.800",
39+
"@firebase/functions-exp": "0.0.800"
3940
},
4041
"devDependencies": {
4142
"rollup": "1.32.1",
@@ -49,9 +50,10 @@
4950
"gulp": "4.0.2",
5051
"gulp-sourcemaps": "2.6.5",
5152
"gulp-concat": "2.6.1",
52-
"typescript": "3.7.5"
53+
"typescript": "3.9.5"
5354
},
5455
"components": [
55-
"app"
56+
"app",
57+
"functions"
5658
]
5759
}

packages-exp/functions-exp/package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"test:browser:debug": "karma start --browsers=Chrome --auto-watch",
2525
"test:node": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'src/{,!(browser)/**/}*.test.ts' --file src/index.node.ts --config ../../config/mocharc.node.js",
2626
"test:emulator": "env FIREBASE_FUNCTIONS_EMULATOR_ORIGIN=http://localhost:5005 run-p test:node",
27-
"prepare": "yarn build",
27+
"prepare": "rollup -c rollup.config.release.js && yarn api-report",
2828
"api-report": "api-extractor run --local --verbose",
2929
"predoc": "node ../../scripts/exp/remove-exp.js temp",
3030
"doc": "api-documenter markdown --input temp --output docs",
@@ -39,7 +39,7 @@
3939
"@firebase/app-exp": "0.0.800",
4040
"rollup": "2.7.6",
4141
"rollup-plugin-typescript2": "0.27.0",
42-
"typescript": "3.8.3"
42+
"typescript": "3.9.5"
4343
},
4444
"repository": {
4545
"directory": "packages/functions",
@@ -49,11 +49,10 @@
4949
"bugs": {
5050
"url": "https://github.com/firebase/firebase-js-sdk/issues"
5151
},
52-
"typings": "dist/index.d.ts",
52+
"typings": "dist/functions-exp-public.d.ts",
5353
"dependencies": {
5454
"@firebase/component": "0.1.15",
5555
"@firebase/functions-types-exp": "0.0.800",
56-
"@firebase/messaging": "0.6.19",
5756
"@firebase/messaging-types": "0.4.5",
5857
"@firebase/util": "0.2.50",
5958
"isomorphic-fetch": "2.2.1",

packages-exp/functions-exp/rollup.config.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,7 @@ const es5Builds = [
4040
*/
4141
{
4242
input: 'src/index.ts',
43-
output: [
44-
{ file: pkg.browser, format: 'cjs', sourcemap: true },
45-
{ file: pkg.module, format: 'es', sourcemap: true }
46-
],
43+
output: [{ file: pkg.module, format: 'es', sourcemap: true }],
4744
plugins: es5BuildPlugins,
4845
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
4946
},

0 commit comments

Comments
 (0)