Merge branch 'master' into release

Author: hsubox76

.changeset/blue-hairs-scream.md

@@ -0,0 +1,5 @@
+---
+'@firebase/firestore': patch
+---
+
+Added a warning message when the host settings are overridden without `{merge: true}`.

.changeset/rotten-wombats-shop.md

@@ -0,0 +1,5 @@
+---
+'@firebase/database': patch
+---
+
+Fix `index not defined` errors for orderByChild get requests

.github/CODEOWNERS

@@ -82,11 +82,11 @@ packages/remote-config @erikeldridge @firebase/jssdk-global-approvers
 packages/remote-config-types @erikeldridge @firebase/jssdk-global-approvers
 
 # Documentation Changes
-packages/firebase/index.d.ts @firebase/firebase-techwriters @firebase/jssdk-global-approvers
-scripts/docgen/content-sources/ @firebase/firebase-techwriters @firebase/jssdk-global-approvers
+packages/firebase/index.d.ts @egilmorez @firebase/jssdk-global-approvers
+scripts/docgen/content-sources/ @egilmorez @firebase/jssdk-global-approvers
 
 # Changeset
-.changeset @firebase/firebase-techwriters @firebase/jssdk-changeset-approvers @firebase/firestore-js-team @firebase/jssdk-global-approvers
+.changeset @egilmorez @firebase/jssdk-changeset-approvers @firebase/firestore-js-team @firebase/jssdk-global-approvers
 
 # Auth-Exp Code
 packages-exp/auth-exp  @avolkovi @sam-gc @yuchenshi @firebase/jssdk-global-approvers

common/api-review/messaging-exp.api.md

@@ -59,11 +59,6 @@ export interface NotificationPayload {
 
 export { Observer }
 
-// Warning: (ae-internal-missing-underscore) The name "onBackgroundMessage" should be prefixed with an underscore because the declaration is marked as @internal
-//
-// @internal
-export function onBackgroundMessage(messaging: FirebaseMessaging, nextOrObserver: NextFn<MessagePayload> | Observer<MessagePayload>): Unsubscribe;
-
 // @public
 export function onMessage(messaging: FirebaseMessaging, nextOrObserver: NextFn<MessagePayload> | Observer<MessagePayload>): Unsubscribe;
 

package.json

@@ -54,8 +54,7 @@
     "docgen:exp": "ts-node-script scripts/exp/docgen.ts",
     "postinstall": "yarn --cwd repo-scripts/changelog-generator build",
     "sa": "ts-node-script repo-scripts/size-analysis/cli.ts",
-    "api-documenter-devsite": "ts-node-script repo-scripts/api-documenter/src/start.ts",
-    "toc-devsite": "ts-node-script scripts/exp/generate-devsite-toc.ts -i temp"
+    "api-documenter-devsite": "ts-node-script repo-scripts/api-documenter/src/start.ts"
   },
   "repository": {
     "type": "git",
@@ -77,7 +76,7 @@
     "@types/chai-as-promised": "7.1.3",
     "@types/child-process-promise": "2.2.1",
     "@types/clone": "2.1.0",
-    "@types/eslint": "7.2.6",
+    "@types/eslint": "7.2.10",
     "@types/inquirer": "7.3.1",
     "@types/listr": "0.14.2",
     "@types/long": "4.0.1",

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

@@ -0,0 +1,6 @@
+{
+  "name": "@firebase/auth-exp/cordova",
+  "description": "A Cordova-specific build of the Firebase Auth JS SDK",
+  "browser": "../dist/cordova/index.js",
+  "typings": "../dist/cordova/index.cordova.d.ts"
+}

packages-exp/auth-exp/package.json

@@ -12,7 +12,9 @@
   "webworker": "dist/index.webworker.esm5.js",
   "files": [
     "dist",
-    "internal/package.json"
+    "cordova/package.json",
+    "internal/package.json",
+    "react-native/package.json"
   ],
   "scripts": {
     "lint": "eslint -c .eslintrc.js '**/*.ts' --ignore-path '../../.gitignore'",

packages-exp/auth-exp/react-native/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "@firebase/auth-exp/react-native",
+  "description": "A React Native-specific build of the Firebase Auth JS SDK",
+  "browser": "../dist/rn/index.js",
+  "typings": "../dist/rn/index.rn.d.ts"
+}

packages-exp/messaging-compat/src/messaging-compat.ts

@@ -24,11 +24,12 @@ import {
   MessagePayload,
   deleteToken,
   getToken,
-  onBackgroundMessage,
   onMessage
 } from '@firebase/messaging-exp';
 import { NextFn, Observer, Unsubscribe } from '@firebase/util';
 
+import { onBackgroundMessage } from '@firebase/messaging-exp/sw';
+
 export interface MessagingCompat {
   getToken(options?: {
     vapidKey?: string;
@@ -88,19 +89,6 @@ function isSwSupported(): boolean {
 }
 
 export class MessagingCompatImpl implements MessagingCompat, _FirebaseService {
-  swRegistration?: ServiceWorkerRegistration;
-  vapidKey?: string;
-
-  onBackgroundMessageHandler:
-    | NextFn<MessagePayload>
-    | Observer<MessagePayload>
-    | null = null;
-
-  onMessageHandler:
-    | NextFn<MessagePayload>
-    | Observer<MessagePayload>
-    | null = null;
-
   constructor(readonly app: AppCompat, readonly _delegate: FirebaseMessaging) {
     this.app = app;
     this._delegate = _delegate;

packages-exp/messaging-compat/src/registerMessagingCompat.ts

@@ -22,6 +22,7 @@ import {
   InstanceFactory
 } from '@firebase/component';
 import firebase, { _FirebaseNamespace } from '@firebase/app-compat';
+
 import { MessagingCompatImpl } from './messaging-compat';
 
 declare module '@firebase/component' {
@@ -33,10 +34,19 @@ declare module '@firebase/component' {
 const messagingCompatFactory: InstanceFactory<'messaging-compat'> = (
   container: ComponentContainer
 ) => {
-  return new MessagingCompatImpl(
-    container.getProvider('app-compat').getImmediate(),
-    container.getProvider('messaging-exp').getImmediate()
-  );
+  if (!!navigator) {
+    // in window
+    return new MessagingCompatImpl(
+      container.getProvider('app-compat').getImmediate(),
+      container.getProvider('messaging-exp').getImmediate()
+    );
+  } else {
+    // in sw
+    return new MessagingCompatImpl(
+      container.getProvider('app-compat').getImmediate(),
+      container.getProvider('messaging-sw-exp').getImmediate()
+    );
+  }
 };
 
 export function registerMessagingCompat(): void {