Skip to content

Commit d12d5f0

Browse files
Merge master
2 parents 8ebce61 + 7c1c7f1 commit d12d5f0

Some content is hidden

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

74 files changed

+2947
-655
lines changed

.changeset/honest-doors-poke.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/mean-queens-roll.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/moody-jobs-deliver.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/poor-eagles-think.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'firebase': minor
3+
'@firebase/functions': minor
4+
---
5+
6+
Allow setting a custom domain for callable Cloud Functions.

.github/workflows/canary-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Yarn install
2424
run: yarn
2525
- name: Deploy canary
26-
run: yarn release --canary
26+
run: yarn release canary
2727
env:
2828
NPM_TOKEN_ANALYTICS: ${{secrets.NPM_TOKEN_ANALYTICS}}
2929
NPM_TOKEN_ANALYTICS_INTEROP_TYPES: ${{secrets.NPM_TOKEN_ANALYTICS_INTEROP_TYPES}}
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
name: Prerelease manual deploy
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
prereleaseName:
7+
description: 'The prerelease name, as in 1.0.0-<prereleaseName>'
8+
required: true
9+
npmTag:
10+
description: 'The npm tag to publish to, as in npm install firebase@<npmTag>'
11+
required: true
12+
jobs:
13+
deploy:
14+
name: Prerelease Deploy
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
- name: Checkout Repo
19+
uses: actions/checkout@master
20+
with:
21+
# Canary release script requires git history and tags.
22+
fetch-depth: 0
23+
- name: Set up Node (10)
24+
uses: actions/setup-node@v1
25+
with:
26+
node-version: 10.x
27+
- name: Yarn install
28+
run: yarn
29+
- name: Deploy prerelease
30+
run: yarn release custom -p ${{ github.event.inputs.prereleaseName }} -t ${{ github.event.inputs.npmTag }}
31+
env:
32+
NPM_TOKEN_ANALYTICS: ${{secrets.NPM_TOKEN_ANALYTICS}}
33+
NPM_TOKEN_ANALYTICS_INTEROP_TYPES: ${{secrets.NPM_TOKEN_ANALYTICS_INTEROP_TYPES}}
34+
NPM_TOKEN_ANALYTICS_TYPES: ${{secrets.NPM_TOKEN_ANALYTICS_TYPES}}
35+
NPM_TOKEN_APP: ${{secrets.NPM_TOKEN_APP}}
36+
NPM_TOKEN_APP_TYPES: ${{secrets.NPM_TOKEN_APP_TYPES}}
37+
NPM_TOKEN_AUTH: ${{secrets.NPM_TOKEN_AUTH}}
38+
NPM_TOKEN_AUTH_INTEROP_TYPES: ${{secrets.NPM_TOKEN_AUTH_INTEROP_TYPES}}
39+
NPM_TOKEN_AUTH_TYPES: ${{secrets.NPM_TOKEN_AUTH_TYPES}}
40+
NPM_TOKEN_COMPONENT: ${{secrets.NPM_TOKEN_COMPONENT}}
41+
NPM_TOKEN_DATABASE: ${{secrets.NPM_TOKEN_DATABASE}}
42+
NPM_TOKEN_DATABASE_TYPES: ${{secrets.NPM_TOKEN_DATABASE_TYPES}}
43+
NPM_TOKEN_FIRESTORE: ${{secrets.NPM_TOKEN_FIRESTORE}}
44+
NPM_TOKEN_FIRESTORE_TYPES: ${{secrets.NPM_TOKEN_FIRESTORE_TYPES}}
45+
NPM_TOKEN_FUNCTIONS: ${{secrets.NPM_TOKEN_FUNCTIONS}}
46+
NPM_TOKEN_FUNCTIONS_TYPES: ${{secrets.NPM_TOKEN_FUNCTIONS_TYPES}}
47+
NPM_TOKEN_INSTALLATIONS: ${{secrets.NPM_TOKEN_INSTALLATIONS}}
48+
NPM_TOKEN_INSTALLATIONS_TYPES: ${{secrets.NPM_TOKEN_INSTALLATIONS_TYPES}}
49+
NPM_TOKEN_LOGGER: ${{secrets.NPM_TOKEN_LOGGER}}
50+
NPM_TOKEN_MESSAGING: ${{secrets.NPM_TOKEN_MESSAGING}}
51+
NPM_TOKEN_MESSAGING_TYPES: ${{secrets.NPM_TOKEN_MESSAGING_TYPES}}
52+
NPM_TOKEN_PERFORMANCE: ${{secrets.NPM_TOKEN_PERFORMANCE}}
53+
NPM_TOKEN_PERFORMANCE_TYPES: ${{secrets.NPM_TOKEN_PERFORMANCE_TYPES}}
54+
NPM_TOKEN_POLYFILL: ${{secrets.NPM_TOKEN_POLYFILL}}
55+
NPM_TOKEN_REMOTE_CONFIG: ${{secrets.NPM_TOKEN_REMOTE_CONFIG}}
56+
NPM_TOKEN_REMOTE_CONFIG_TYPES: ${{secrets.NPM_TOKEN_REMOTE_CONFIG_TYPES}}
57+
NPM_TOKEN_RULES_UNIT_TESTING: ${{secrets.NPM_TOKEN_RULES_UNIT_TESTING}}
58+
NPM_TOKEN_STORAGE: ${{secrets.NPM_TOKEN_STORAGE}}
59+
NPM_TOKEN_STORAGE_TYPES: ${{secrets.NPM_TOKEN_STORAGE_TYPES}}
60+
NPM_TOKEN_TESTING: ${{secrets.NPM_TOKEN_TESTING}}
61+
NPM_TOKEN_UTIL: ${{secrets.NPM_TOKEN_UTIL}}
62+
NPM_TOKEN_WEBCHANNEL_WRAPPER: ${{secrets.NPM_TOKEN_WEBCHANNEL_WRAPPER}}
63+
NPM_TOKEN_FIREBASE: ${{secrets.NPM_TOKEN_FIREBASE}}
64+
NPM_TOKEN_RXFIRE: ${{secrets.NPM_TOKEN_RXFIRE}}
65+
CI: true
66+

integration/firebase/package.json

Lines changed: 1 addition & 1 deletion
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": "7.21.0",
10+
"firebase": "7.21.1",
1111
"@babel/core": "7.11.6",
1212
"@babel/preset-env": "7.11.5",
1313
"@types/chai": "4.2.12",

integration/firestore/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"devDependencies": {
1717
"@firebase/app": "0.6.11",
18-
"@firebase/firestore": "1.17.0",
18+
"@firebase/firestore": "1.17.1",
1919
"@types/mocha": "7.0.2",
2020
"gulp": "4.0.2",
2121
"gulp-filter": "6.0.0",

integration/messaging/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"test:manual": "mocha --exit"
1010
},
1111
"devDependencies": {
12-
"firebase": "7.21.0",
12+
"firebase": "7.21.1",
1313
"chai": "4.2.0",
1414
"chromedriver": "85.0.1",
1515
"express": "4.17.1",

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

Lines changed: 9 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import typescriptPlugin from 'rollup-plugin-typescript2';
1919
import typescript from 'typescript';
2020
import json from 'rollup-plugin-json';
2121
import pkg from './package.json';
22+
import { es2017BuildsNoPlugin, es5BuildsNoPlugin } from './rollup.shared';
2223

2324
const deps = Object.keys(
2425
Object.assign({}, pkg.peerDependencies, pkg.dependencies)
@@ -34,26 +35,10 @@ const es5BuildPlugins = [
3435
json()
3536
];
3637

37-
const es5Builds = [
38-
/**
39-
* Browser Builds
40-
*/
41-
{
42-
input: 'src/index.ts',
43-
output: [{ file: pkg.browser, format: 'es', sourcemap: true }],
44-
plugins: es5BuildPlugins,
45-
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
46-
},
47-
/**
48-
* Node.js Build
49-
*/
50-
{
51-
input: 'src/index.ts',
52-
output: [{ file: pkg.main, format: 'cjs', sourcemap: true }],
53-
plugins: es5BuildPlugins,
54-
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
55-
}
56-
];
38+
const es5Builds = es5BuildsNoPlugin.map(build => ({
39+
...build,
40+
plugins: es5BuildPlugins
41+
}));
5742

5843
/**
5944
* ES2017 Builds
@@ -72,20 +57,9 @@ const es2017BuildPlugins = [
7257
})
7358
];
7459

75-
const es2017Builds = [
76-
/**
77-
* Browser Builds
78-
*/
79-
{
80-
input: 'src/index.ts',
81-
output: {
82-
file: pkg.esm2017,
83-
format: 'es',
84-
sourcemap: true
85-
},
86-
plugins: es2017BuildPlugins,
87-
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
88-
}
89-
];
60+
const es2017Builds = es2017BuildsNoPlugin.map(build => ({
61+
...build,
62+
plugins: es2017BuildPlugins
63+
}));
9064

9165
export default [...es5Builds, ...es2017Builds];

packages-exp/app-exp/rollup.config.release.js

Lines changed: 13 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,8 @@
1818
import typescriptPlugin from 'rollup-plugin-typescript2';
1919
import typescript from 'typescript';
2020
import json from 'rollup-plugin-json';
21-
import pkg from './package.json';
2221
import { importPathTransformer } from '../../scripts/exp/ts-transform-import-path';
23-
24-
const deps = Object.keys(
25-
Object.assign({}, pkg.peerDependencies, pkg.dependencies)
26-
);
22+
import { es2017BuildsNoPlugin, es5BuildsNoPlugin } from './rollup.shared';
2723

2824
/**
2925
* ES5 Builds
@@ -37,32 +33,13 @@ const es5BuildPlugins = [
3733
json()
3834
];
3935

40-
const es5Builds = [
41-
/**
42-
* Browser Builds
43-
*/
44-
{
45-
input: 'src/index.ts',
46-
output: [{ file: pkg.browser, format: 'es', sourcemap: true }],
47-
plugins: es5BuildPlugins,
48-
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
49-
treeshake: {
50-
moduleSideEffects: false
51-
}
52-
},
53-
/**
54-
* Node.js Build
55-
*/
56-
{
57-
input: 'src/index.ts',
58-
output: [{ file: pkg.main, format: 'cjs', sourcemap: true }],
59-
plugins: es5BuildPlugins,
60-
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
61-
treeshake: {
62-
moduleSideEffects: false
63-
}
36+
const es5Builds = es5BuildsNoPlugin.map(build => ({
37+
...build,
38+
plugins: es5BuildPlugins,
39+
treeshake: {
40+
moduleSideEffects: false
6441
}
65-
];
42+
}));
6643

6744
/**
6845
* ES2017 Builds
@@ -83,23 +60,12 @@ const es2017BuildPlugins = [
8360
})
8461
];
8562

86-
const es2017Builds = [
87-
/**
88-
* Browser Builds
89-
*/
90-
{
91-
input: 'src/index.ts',
92-
output: {
93-
file: pkg.esm2017,
94-
format: 'es',
95-
sourcemap: true
96-
},
97-
plugins: es2017BuildPlugins,
98-
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
99-
treeshake: {
100-
moduleSideEffects: false
101-
}
63+
const es2017Builds = es2017BuildsNoPlugin.map(build => ({
64+
...build,
65+
plugins: es2017BuildPlugins,
66+
treeshake: {
67+
moduleSideEffects: false
10268
}
103-
];
69+
}));
10470

10571
export default [...es5Builds, ...es2017Builds];

packages-exp/app-exp/rollup.shared.js

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
/**
2+
* @license
3+
* Copyright 2019 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+
import pkg from './package.json';
18+
19+
const deps = Object.keys(
20+
Object.assign({}, pkg.peerDependencies, pkg.dependencies)
21+
);
22+
23+
export const es5BuildsNoPlugin = [
24+
/**
25+
* Browser Builds
26+
*/
27+
{
28+
input: 'src/index.ts',
29+
output: [{ file: pkg.browser, format: 'es', sourcemap: true }],
30+
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
31+
},
32+
/**
33+
* Node.js Build
34+
*/
35+
{
36+
input: 'src/index.ts',
37+
output: [{ file: pkg.main, format: 'cjs', sourcemap: true }],
38+
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
39+
}
40+
];
41+
42+
export const es2017BuildsNoPlugin = [
43+
/**
44+
* Browser Builds
45+
*/
46+
{
47+
input: 'src/index.ts',
48+
output: {
49+
file: pkg.esm2017,
50+
format: 'es',
51+
sourcemap: true
52+
},
53+
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
54+
}
55+
];

packages-exp/firebase-exp/package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "firebase-exp",
3-
"version": "0.800.7",
3+
"version": "0.800.8",
44
"private": true,
55
"description": "Firebase JavaScript library for web and Node.js",
66
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
@@ -40,7 +40,8 @@
4040
"@firebase/app-exp": "0.0.800",
4141
"@firebase/app-compat": "0.0.800",
4242
"@firebase/functions-exp": "0.0.800",
43-
"@firebase/firestore": "1.17.0"
43+
"@firebase/firestore": "1.17.1",
44+
"@firebase/performance-exp": "0.0.800"
4445
},
4546
"devDependencies": {
4647
"rollup": "2.28.1",
@@ -60,6 +61,7 @@
6061
"app",
6162
"functions",
6263
"firestore",
63-
"firestore/lite"
64+
"firestore/lite",
65+
"performance"
6466
]
6567
}
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/performance-exp';
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"name": "firebase-exp/performance",
3+
"main": "dist/index.cjs.js",
4+
"browser": "dist/index.esm.js",
5+
"module": "dist/index.esm.js",
6+
"typings": "dist/index.d.ts"
7+
}

0 commit comments

Comments
 (0)