Skip to content

Commit 2bfa185

Browse files
committed
Merge branch 'master' into wuandy/Bundles
2 parents 0bf9c73 + b07f822 commit 2bfa185

File tree

282 files changed

+25734
-5213
lines changed

Some content is hidden

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

282 files changed

+25734
-5213
lines changed

.changeset/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"changelog": ["@changesets/changelog-github", { "repo": "firebase/firebase-js-sdk"}],
44
"commit": false,
55
"linked": [],
6-
"access": "restricted",
6+
"access": "public",
77
"baseBranch": "master",
88
"updateInternalDependencies": "patch",
99
"ignore": [

.changeset/cuddly-rivers-add.md

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

.changeset/cyan-books-melt.md

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

.changeset/firebsae-messaging.md

Lines changed: 0 additions & 4 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.

.changeset/kind-melons-obey.md

Lines changed: 0 additions & 5 deletions
This file was deleted.
File renamed without changes.

.changeset/many-gifts-invent.md

Lines changed: 0 additions & 5 deletions
This file was deleted.
File renamed without changes.

.changeset/popular-beds-yell.md

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

.changeset/popular-beds-yell2.md

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

.changeset/popular-cups-melt.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"firebase": patch
3+
"@firebase/storage-types": patch
4+
"@firebase/storage": patch
5+
---
6+
7+
[fix] Updated the TypeScript types for all APIs using Observers to allow callback omission.

.changeset/quiet-coats-type.md

Lines changed: 0 additions & 7 deletions
This file was deleted.
File renamed without changes.

.changeset/small-ghosts-visit.md

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

.changeset/smart-cars-doubt.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"firebase": patch
3+
"@firebase/firestore": patch
4+
---
5+
6+
The SDK no longer crashes if an IndexedDB failure occurs when unsubscribing from a Query.

.changeset/tame-countries-marry.md

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

.changeset/thick-rabbits-guess.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
"firebase": patch
3+
"@firebase/firestore": patch
4+
---
5+
6+
[fixed] Removed a delay that may have prevented Firestore from immediately
7+
reestablishing a network connection if a connectivity change occurred while
8+
the app was in the background.

.changeset/twelve-pets-joke.md

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
---
2-
32
---

.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/changesets.yml

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

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ jobs:
2727
- name: Create Release Pull Request
2828
uses: changesets/action@master
2929
env:
30-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
30+
GITHUB_TOKEN: ${{ secrets.OSS_BOT_GITHUB_TOKEN }}

.prettierrc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
{
22
singleQuote: true,
33
printWidth: 80,
4-
quoteProps: preserve
5-
}
4+
quoteProps: preserve,
5+
trailingComma: none,
6+
arrowParens: avoid
7+
}

config/functions/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
"description": "Cloud Functions for Firebase",
44
"dependencies": {
55
"cors": "2.8.5",
6-
"firebase-admin": "8.11.0",
7-
"firebase-functions": "3.6.1"
6+
"firebase-admin": "8.13.0",
7+
"firebase-functions": "3.7.0"
88
},
99
"private": true,
1010
"engines": {
11-
"node": "8"
11+
"node": "10"
1212
}
1313
}

config/karma.base.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ const config = {
6767
// test results reporter to use
6868
// possible values: 'dots', 'progress'
6969
// available reporters: https://npmjs.org/browse/keyword/karma-reporter
70-
reporters: ['spec', 'coverage-istanbul' /*, 'saucelabs' */],
70+
reporters: ['mocha', 'coverage-istanbul' /*, 'saucelabs' */],
7171

7272
// web server port
7373
port: 8089,
@@ -124,13 +124,13 @@ const config = {
124124
if (false /* process.env.TRAVIS */) {
125125
config.browsers = [...config.browsers, ...Object.keys(sauceLabsBrowsers)];
126126
}
127-
127+
config.mochaReporter = {
128+
showDiff: true
129+
};
128130
// Make it easy to spot failed tests in CI
129131
if (process.env.CI) {
130-
config.specReporter = {
131-
suppressErrorSummary: true,
132-
suppressPassed: true, // do not print information about passed tests
133-
suppressSkipped: true
132+
config.mochaReporter = {
133+
output: 'minimal'
134134
};
135135
}
136136

config/karma.saucelabs.js

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,22 @@ const browserMap = {
4646
* Any special options per package.
4747
*/
4848
const packageConfigs = {
49-
messaging: {
49+
'@firebase/messaging': {
5050
// Messaging currently only supports these browsers.
5151
browsers: ['Chrome_Windows', 'Firefox_Windows', 'Edge_Windows']
5252
},
53-
firestore: {
53+
// Firestore unit tests have OOM problems compiling with Babel for IE.
54+
// Firestore integration/firestore tests do run on all browsers.
55+
'@firebase/firestore': {
56+
browsers: [
57+
'Chrome_Windows',
58+
'Firefox_Windows',
59+
'Edge_Windows',
60+
'Safari_macOS'
61+
]
62+
},
63+
// Installations has IE errors related to `idb` library that need to be figured out.
64+
'@firebase/installations': {
5465
browsers: [
5566
'Chrome_Windows',
5667
'Firefox_Windows',
@@ -84,12 +95,12 @@ function getSauceLabsBrowsers(packageName) {
8495
*/
8596
function getPackageLabels() {
8697
const match = testConfigFile.match(
87-
/([a-zA-Z]+)\/([a-zA-Z-]+)\/karma\.conf\.js/
98+
/([a-zA-Z]+\/[a-zA-Z-]+)\/karma\.conf\.js/
8899
);
89-
return {
90-
type: match[1],
91-
name: match[2]
92-
};
100+
const packagePath = match[1];
101+
const root = path.resolve(__dirname, '..');
102+
const pkg = require(path.join(root, packagePath, 'package.json'));
103+
return pkg.name;
93104
}
94105

95106
/**
@@ -106,11 +117,8 @@ function getTestFiles() {
106117
}
107118

108119
function seleniumLauncher(browserName, platform, version) {
109-
const { name, type } = getPackageLabels();
110-
const testName =
111-
type === 'integration'
112-
? `${type}-${name}-${browserName}`
113-
: `${name}-${browserName}`;
120+
const { name } = getPackageLabels();
121+
const testName = `${name}-${browserName}`;
114122
return {
115123
base: 'SauceLabs',
116124
browserName: browserName,
@@ -145,13 +153,13 @@ function appiumLauncher(
145153
};
146154
}
147155

148-
module.exports = function(config) {
156+
module.exports = function (config) {
149157
const { packageName, files: testFiles } = getTestFiles();
150158
const sauceLabsBrowsers = getSauceLabsBrowsers(packageName);
151159

152160
const sauceLabsConfig = {
153-
tunnelIdentifier: process.env.TRAVIS_JOB_NUMBER + '-' + packageName,
154-
build: process.env.TRAVIS_BUILD_NUMBER || argv['buildNumber'],
161+
tunnelIdentifier: process.env.GITHUB_RUN_ID + '-' + packageName,
162+
build: process.env.GITHUB_RUN_ID || argv['buildNumber'],
155163
username: process.env.SAUCE_USERNAME,
156164
accessKey: process.env.SAUCE_ACCESS_KEY,
157165
startConnect: true,
@@ -210,7 +218,7 @@ module.exports = function(config) {
210218
maxLogLines: 5,
211219
suppressErrorSummary: false,
212220
suppressFailed: false,
213-
suppressPassed: false,
221+
suppressPassed: true,
214222
suppressSkipped: true,
215223
showSpecTiming: true,
216224
failFast: false

integration/browserify/karma.conf.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright 2017 Google Inc.
3+
* Copyright 2017 Google LLC
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ const karmaBase = require('../../config/karma.base');
2121

2222
const files = [`dist/**/*`];
2323

24-
module.exports = function(config) {
24+
module.exports = function (config) {
2525
const karmaConfig = Object.assign({}, karmaBase, {
2626
// files to load into karma
2727
files: files,

integration/browserify/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@
88
"test:ci": "node ../../scripts/run_tests_in_ci.js"
99
},
1010
"devDependencies": {
11-
"firebase": "7.15.5",
12-
"@babel/core": "7.9.6",
13-
"@babel/preset-env": "7.9.6",
11+
"firebase": "7.16.0",
12+
"@babel/core": "7.10.4",
13+
"@babel/preset-env": "7.10.4",
1414
"browserify": "16.5.1",
1515
"chai": "4.2.0",
16-
"karma": "4.4.1",
16+
"karma": "5.1.0",
1717
"karma-babel-preprocessor": "8.0.1",
1818
"karma-chrome-launcher": "3.1.0",
1919
"karma-firefox-launcher": "1.3.0",
20-
"karma-mocha": "1.3.0",
20+
"karma-mocha": "2.0.1",
2121
"karma-sauce-launcher": "1.2.0",
2222
"karma-spec-reporter": "0.0.32",
2323
"mkdirp": "1.0.4",
24-
"mocha": "7.1.2"
24+
"mocha": "7.2.0"
2525
}
2626
}

integration/browserify/src/namespace.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright 2017 Google Inc.
3+
* Copyright 2017 Google LLC
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.
@@ -29,6 +29,6 @@ firebase.initializeApp({
2929
appId: 'myAppId'
3030
});
3131

32-
describe('Firebase Namespace Validation', function() {
32+
describe('Firebase Namespace Validation', function () {
3333
validateNamespace(namespaceDefinition, firebase);
3434
});

integration/firebase-typings/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"test:ci": "node ../../scripts/run_tests_in_ci.js"
88
},
99
"devDependencies": {
10-
"firebase": "7.15.5",
11-
"typescript": "3.8.3"
10+
"firebase": "7.16.0",
11+
"typescript": "3.9.6"
1212
}
1313
}

integration/firestore/karma.conf.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright 2017 Google Inc.
3+
* Copyright 2017 Google LLC
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.
@@ -19,13 +19,9 @@ const karma = require('karma');
1919
const path = require('path');
2020
const karmaBase = require('../../config/karma.base');
2121

22-
const files = [
23-
`${path.dirname(require.resolve('firebase'))}/firebase.js`,
24-
`${path.dirname(require.resolve('firebase'))}/firebase-firestore.js`,
25-
'./dist/test-harness.js'
26-
];
22+
const files = ['./dist/test-harness.js'];
2723

28-
module.exports = function(config) {
24+
module.exports = function (config) {
2925
const karmaConfig = Object.assign({}, karmaBase, {
3026
// files to load into karma
3127
files: files,

integration/firestore/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
"devDependencies": {
1717
"@types/mocha": "7.0.2",
1818
"gulp": "4.0.2",
19-
"gulp-filter": "5.1.0",
19+
"gulp-filter": "6.0.0",
2020
"gulp-replace": "1.0.0",
21-
"karma": "4.4.1",
21+
"karma": "5.1.0",
2222
"karma-chrome-launcher": "3.1.0",
2323
"karma-firefox-launcher": "1.3.0",
24-
"karma-mocha": "1.3.0",
24+
"karma-mocha": "2.0.1",
2525
"karma-spec-reporter": "0.0.32",
26-
"mocha": "7.1.2",
26+
"mocha": "7.2.0",
2727
"ts-loader": "6.2.2",
28-
"typescript": "3.8.3",
28+
"typescript": "3.9.6",
2929
"webpack": "4.43.0",
3030
"webpack-stream": "5.2.1"
3131
}

0 commit comments

Comments
 (0)