From 7ca086254520fd2c72759e019ba1dc7e8790caaa Mon Sep 17 00:00:00 2001 From: Richie Foreman Date: Tue, 1 Sep 2020 11:22:34 -0400 Subject: [PATCH 1/5] Firestore Externs: @type -> @typedef --- packages/firebase/externs/firebase-firestore-externs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/firebase/externs/firebase-firestore-externs.js b/packages/firebase/externs/firebase-firestore-externs.js index 3513c8e0450..0a653c4e082 100644 --- a/packages/firebase/externs/firebase-firestore-externs.js +++ b/packages/firebase/externs/firebase-firestore-externs.js @@ -755,7 +755,7 @@ firebase.firestore.DocumentSnapshot.prototype.metadata; /** * An object containing all the data in a document. - * @type {Object} + * @typedef {Object} */ firebase.firestore.DocumentData; From 9b0271cfb1a349f2b1116e1db35cf843a23f137a Mon Sep 17 00:00:00 2001 From: Richie Foreman Date: Tue, 1 Sep 2020 12:04:58 -0400 Subject: [PATCH 2/5] Add @override to Recaptcha Verify method in Auth Externs --- packages/firebase/externs/firebase-client-auth-externs.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/firebase/externs/firebase-client-auth-externs.js b/packages/firebase/externs/firebase-client-auth-externs.js index 7184a54322a..3cd0a87774f 100644 --- a/packages/firebase/externs/firebase-client-auth-externs.js +++ b/packages/firebase/externs/firebase-client-auth-externs.js @@ -497,5 +497,6 @@ firebase.auth.RecaptchaVerifier.prototype.render = function () {}; * Waits for the user to solve the reCAPTCHA and resolves with the reCAPTCHA * token. * @return {!firebase.Promise} A Promise for the reCAPTCHA token. + * @override */ firebase.auth.RecaptchaVerifier.prototype.verify = function () {}; From bb34d4c2730eeac220522ad93cf9cb029bdece6d Mon Sep 17 00:00:00 2001 From: Richie Foreman Date: Tue, 1 Sep 2020 18:51:41 -0400 Subject: [PATCH 3/5] Add proper closure `@license` annotation to generated internal rollup boilerplate --- packages/firebase/rollup-internal.config.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/firebase/rollup-internal.config.js b/packages/firebase/rollup-internal.config.js index bf50e6623ae..c9ab1231b47 100644 --- a/packages/firebase/rollup-internal.config.js +++ b/packages/firebase/rollup-internal.config.js @@ -1,6 +1,6 @@ /** * @license - * Copyright 2019 Google Inc. + * Copyright 2019 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +25,8 @@ import baseBuilds from './rollup-main.config.js'; import license from 'rollup-plugin-license'; const firebaseLicense = license({ - banner: `Copyright ${new Date().getFullYear()} Google Inc. + banner: `@license + Copyright ${new Date().getFullYear()} Google Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From 56e3bbd356dc3ce2a224581acb5a4a50f0cb3cbe Mon Sep 17 00:00:00 2001 From: Richie Foreman Date: Tue, 1 Sep 2020 18:57:39 -0400 Subject: [PATCH 4/5] Google LLC + SPDX License ID --- packages/firebase/rollup-internal.config.js | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/packages/firebase/rollup-internal.config.js b/packages/firebase/rollup-internal.config.js index c9ab1231b47..f51611c330d 100644 --- a/packages/firebase/rollup-internal.config.js +++ b/packages/firebase/rollup-internal.config.js @@ -26,19 +26,8 @@ import license from 'rollup-plugin-license'; const firebaseLicense = license({ banner: `@license - Copyright ${new Date().getFullYear()} Google Inc. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License.` + Copyright ${new Date().getFullYear()} Google LLC. + SPDX-License-Identifier: Apache-2.0` }); const buildsWithLicense = baseBuilds.map(build => { From fab2d6d581d340c9771f894e206bf2ceea186108 Mon Sep 17 00:00:00 2001 From: Richie Foreman Date: Wed, 2 Sep 2020 09:59:49 -0400 Subject: [PATCH 5/5] Fix tab char in Firestore SDK --- packages/firestore/src/remote/rest_connection.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/firestore/src/remote/rest_connection.ts b/packages/firestore/src/remote/rest_connection.ts index e39852707cc..a3cd1e3eace 100644 --- a/packages/firestore/src/remote/rest_connection.ts +++ b/packages/firestore/src/remote/rest_connection.ts @@ -122,7 +122,7 @@ export abstract class RestConnection implements Connection { // Content-Type: text/plain will avoid preflight requests which might // mess with CORS and redirects by proxies. If we add custom headers // we will need to change this code to potentially use the $httpOverwrite - // parameter supported by ESF to avoid triggering preflight requests. + // parameter supported by ESF to avoid triggering preflight requests. headers['Content-Type'] = 'text/plain'; if (token) {