Merge branch 'master' into mrschmidt/fetchstreams

Author: schmidt-sebastian

.changeset/config.json

@@ -13,6 +13,7 @@
     "firebase-namespace-integration-test",
     "firebase-firestore-integration-test",
     "firebase-messaging-integration-test",
+    "firebase-compat-interop-test",
     "firebase-compat-typings-test",
     "@firebase/app-exp",
     "@firebase/analytics-compat",

.changeset/fast-mangos-serve.md

@@ -0,0 +1,5 @@
+---
+"@firebase/component": patch
+---
+
+handle `undefined` correctly from input.

.changeset/fuzzy-teachers-guess.md

@@ -0,0 +1,5 @@
+---
+"firebase": patch
+---
+
+set firebase.SDK_VERSION to the latest value

.changeset/perfect-comics-march.md

@@ -29,10 +29,13 @@ export type _FirebaseMessagingName = 'messaging';
 export function getMessaging(app?: FirebaseApp): FirebaseMessaging;
 
 // @public
-export function getToken(messaging: FirebaseMessaging, options?: {
-    vapidKey?: string;
+export function getToken(messaging: FirebaseMessaging, options?: GetTokenOptions): Promise<string>;
+
+// @public
+export interface GetTokenOptions {
     swReg?: ServiceWorkerRegistration;
-}): Promise<string>;
+    vapidKey?: string;
+}
 
 // @public
 export function isSupported(): Promise<boolean>;

.changeset/silent-planets-raise.md

@@ -0,0 +1,56 @@
+## API Report File for "@firebase/messaging-exp/sw"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { FirebaseApp } from '@firebase/app-exp';
+import { NextFn } from '@firebase/util';
+import { Observer } from '@firebase/util';
+import { Unsubscribe } from '@firebase/util';
+
+// @public
+export interface FcmOptions {
+    analyticsLabel?: string;
+    link?: string;
+}
+
+// @public
+export interface FirebaseMessaging {
+}
+
+// @public
+export function getMessaging(app?: FirebaseApp): FirebaseMessaging;
+
+// @public
+export function isSupported(): Promise<boolean>;
+
+// @public
+export interface MessagePayload {
+    collapseKey: string;
+    data?: {
+        [key: string]: string;
+    };
+    fcmOptions?: FcmOptions;
+    from: string;
+    notification?: NotificationPayload;
+}
+
+export { NextFn }
+
+// @public
+export interface NotificationPayload {
+    body?: string;
+    image?: string;
+    title?: string;
+}
+
+export { Observer }
+
+// @public
+export function onBackgroundMessage(messaging: FirebaseMessaging, nextOrObserver: NextFn<MessagePayload> | Observer<MessagePayload>): Unsubscribe;
+
+export { Unsubscribe }
+
+
+```

.changeset/tender-eels-greet.md

@@ -0,0 +1,35 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ *
+ * 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.
+ */
+
+import { getModularInstance } from '@firebase/util';
+import { expect } from 'chai';
+import { getAnalytics } from '@firebase/analytics-exp';
+import firebase from '@firebase/app-compat';
+import '@firebase/analytics-compat';
+
+import { TEST_PROJECT_CONFIG } from './util';
+
+firebase.initializeApp(TEST_PROJECT_CONFIG);
+
+const compatAnalytics = firebase.analytics();
+const modularAnalytics = getAnalytics();
+
+describe('Analytics compat interop', () => {
+  it('Analytics compat instance references modular Analytics instance', () => {
+    expect(getModularInstance(compatAnalytics)).to.equal(modularAnalytics);
+  });
+});

.changeset/twenty-scissors-exist.md

@@ -0,0 +1,50 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ *
+ * 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.
+ */
+
+import { getModularInstance } from '@firebase/util';
+import { expect } from 'chai';
+import { getApp, getApps } from '@firebase/app-exp';
+import firebase from '@firebase/app-compat';
+
+import { TEST_PROJECT_CONFIG } from './util';
+//TODO: add Storage, Firestore and Database tests once v8 is removed. Currently it's too difficult to set them up in integration tests.
+describe('App compat interop', () => {
+  afterEach(() => {
+    const deletePromises = [];
+    for (const app of firebase.apps) {
+      deletePromises.push(app.delete());
+    }
+
+    return Promise.all(deletePromises);
+  });
+
+  it('App compat instance references modular App instance', () => {
+    const compatApp = firebase.initializeApp(TEST_PROJECT_CONFIG);
+    const modularApp = getApp();
+    expect(getModularInstance(compatApp)).to.equal(modularApp);
+  });
+
+  it('deleting compat app deletes modular app', async () => {
+    const compatApp = firebase.initializeApp(TEST_PROJECT_CONFIG);
+    expect(firebase.apps.length).to.equal(1);
+    expect(getApps().length).to.equal(1);
+
+    await compatApp.delete();
+    expect(firebase.apps.length).to.equal(0);
+    expect(getApps().length).to.equal(0);
+  });
+});

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

@@ -0,0 +1,49 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ *
+ * 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.
+ */
+
+import { getModularInstance } from '@firebase/util';
+import { expect } from 'chai';
+import { getAuth, signOut } from '@firebase/auth-exp';
+import firebase from '@firebase/app-compat';
+import '@firebase/auth-compat';
+
+import { TEST_PROJECT_CONFIG } from './util';
+
+firebase.initializeApp(TEST_PROJECT_CONFIG);
+
+const compatAuth = firebase.auth();
+const modularAuth = getAuth();
+
+describe('Auth compat interop', () => {
+  it('Auth compat instance references modular Auth instance', () => {
+    expect(getModularInstance(compatAuth)).to.equal(modularAuth);
+  });
+
+  it('Auth compat and modular Auth share the same user state', async () => {
+    expect(compatAuth.currentUser).to.equal(null);
+    expect(modularAuth.currentUser).to.equal(null);
+    const userCred = await compatAuth.signInAnonymously();
+    expect(userCred.user?.uid).to.equal(modularAuth.currentUser?.uid);
+    expect(await userCred.user?.getIdToken()).to.equal(
+      await modularAuth.currentUser?.getIdToken()
+    );
+
+    await signOut(modularAuth);
+    expect(compatAuth.currentUser).to.equal(null);
+    expect(modularAuth.currentUser).to.equal(null);
+  });
+});

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

@@ -0,0 +1,35 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ *
+ * 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.
+ */
+
+import { getModularInstance } from '@firebase/util';
+import { expect } from 'chai';
+import { getFunctions } from '@firebase/functions-exp';
+import firebase from '@firebase/app-compat';
+import '@firebase/functions-compat';
+
+import { TEST_PROJECT_CONFIG } from './util';
+
+firebase.initializeApp(TEST_PROJECT_CONFIG);
+
+const compatFunction = firebase.functions();
+const modularFunctions = getFunctions();
+
+describe('Functions compat interop', () => {
+  it('Functions compat instance references modular Functions instance', () => {
+    expect(getModularInstance(compatFunction)).to.equal(modularFunctions);
+  });
+});

integration/compat-interop/analytics.test.ts

@@ -0,0 +1,36 @@
+/**
+ * @license
+ * Copyright 2017 Google LLC
+ *
+ * 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.
+ */
+
+const karma = require('karma');
+const karmaBase = require('../../config/karma.base');
+
+const files = ['*.test.*'];
+
+module.exports = function (config) {
+  const karmaConfig = Object.assign({}, karmaBase, {
+    // files to load into karma
+    files: files,
+    preprocessors: { '**/*.ts': ['webpack', 'sourcemap'] },
+    // frameworks to use
+    // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
+    frameworks: ['mocha']
+  });
+
+  config.set(karmaConfig);
+};
+
+module.exports.files = files;

integration/compat-interop/app.test.ts

@@ -0,0 +1,35 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ *
+ * 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.
+ */
+
+import { getModularInstance } from '@firebase/util';
+import { expect } from 'chai';
+import { getMessaging } from '@firebase/messaging-exp';
+import firebase from '@firebase/app-compat';
+import '@firebase/messaging-compat';
+
+import { TEST_PROJECT_CONFIG } from './util';
+
+firebase.initializeApp(TEST_PROJECT_CONFIG);
+
+const compatMessaging = firebase.messaging();
+const modularMessaging = getMessaging();
+
+describe('Messaging compat interop', () => {
+  it('Messaging compat instance references modular Messaging instance', () => {
+    expect(getModularInstance(compatMessaging)).to.equal(modularMessaging);
+  });
+});

integration/compat-interop/auth.test.ts

@@ -0,0 +1,29 @@
+{
+    "name": "firebase-compat-interop-test",
+    "private": true,
+    "version": "0.1.0",
+    "scripts": {
+        "test": "karma start --single-run",
+        "test:ci": "node ../../scripts/run_tests_in_ci.js -s test",
+        "test:debug": "karma start --browsers Chrome --auto-watch"
+    },
+    "dependencies": {
+      "@firebase/app-exp": "0.0.900",
+      "@firebase/app-compat": "0.0.900",
+      "@firebase/analytics-exp": "0.0.900",
+      "@firebase/analytics-compat": "0.0.900",
+      "@firebase/auth-exp": "0.0.900",
+      "@firebase/auth-compat": "0.0.900",
+      "@firebase/functions-exp": "0.0.900",
+      "@firebase/functions-compat": "0.0.900",
+      "@firebase/messaging-exp": "0.0.900",
+      "@firebase/messaging-compat": "0.0.900",
+      "@firebase/performance-exp": "0.0.900",
+      "@firebase/performance-compat": "0.0.900",
+      "@firebase/remote-config-exp": "0.0.900",
+      "@firebase/remote-config-compat": "0.0.900"
+    },
+    "devDependencies": {
+      "typescript": "4.2.2"
+    }
+  }