Merge

Author: schmidt-sebastian

.changeset/firebsae-messaging.md

@@ -0,0 +1,4 @@
+---
+---
+
+Update testing policy. Since this is neither a major nor minor update use an empty changeset.

.changeset/perfect-carpets-chew.md

@@ -0,0 +1,3 @@
+---
+
+---

.changeset/poor-eggs-bow.md

@@ -0,0 +1,2 @@
+---
+---

.changeset/popular-beds-yell.md

@@ -0,0 +1,3 @@
+
+---
+---

.changeset/popular-beds-yell2.md

@@ -0,0 +1,3 @@
+
+---
+---

.changeset/quiet-coats-type.md

@@ -0,0 +1,7 @@
+---
+'firebase': minor
+'@firebase/firestore': minor
+'@firebase/firestore-types': minor
+---
+
+Added support for `set()` with merge options when using `FirestoreDataConverter`.

.changeset/twelve-pets-joke.md

@@ -0,0 +1,3 @@
+---
+
+---

.github/workflows/changesets.yml

@@ -12,6 +12,9 @@ jobs:
     steps:
       - name: Checkout Repo
         uses: actions/checkout@master
+        with:
+          ## fetch all history for all branches and tags, so we can compare with master
+          fetch-depth: 0
 
       - name: Setup Node.js 12.x
         uses: actions/setup-node@master
@@ -22,4 +25,4 @@ jobs:
         run: yarn
 
       - name: Check if any Changeset file exists
-        run: yarn changeset status --since=master
+        run: yarn changeset status --since=origin/master

CONTRIBUTING.md

@@ -97,10 +97,40 @@ Before you start working on a larger contribution, you should get in touch with
     ```
 
 * In GitHub, send a pull request to `firebase-js-sdk:master`.
+* Add changeset. See [Adding changeset to PR](#adding-changeset-to-pr)
 * All pull requests must be reviewed by a member of the Firebase JS SDK team, who will merge it when/if they feel it is good to go.
 
 That's it! Thank you for your contribution!
 
+#### Adding changeset to PR
+Every PR that would trigger a release should include a changeset file. To make
+this process easy, a message will be sent to every PR with a link that you can
+click to add changeset files in the Github UI directly.
+[Example message](https://github.com/firebase/firebase-js-sdk/pull/3284#issuecomment-649718617).
+
+#### What to include in the changset file
+
+You should include the version bump for your package as well as the description
+for the change. Valid version bump types are `patch`, `minor` and `major`.
+Please always include the `firebase` package with the same version bump type as
+your package. This is to ensure that the version of the `firebase` package will
+be bumped correctly. For example,
+
+```
+---
+"@firebase/storage": minor
+"firebase": minor
+---
+
+This is a test.
+```
+
+#### Multiple changeset files
+
+If your PR touches multiple SDKs or addresses multiple issues that require
+different version bump or different description, you can create multiple
+changeset files in the PR.
+
 ## <a name="docs"></a> Updating Documentation
 
 Reference docs for the Firebase [JS SDK](https://firebase.google.com/docs/reference/js/) and [Node (client) SDK](https://firebase.google.com/docs/reference/node/) are generated by [Typedoc](https://typedoc.org/).

integration/browserify/package.json

@@ -8,7 +8,7 @@
     "test:ci": "node ../../scripts/run_tests_in_ci.js"
   },
   "devDependencies": {
-    "firebase": "7.15.4",
+    "firebase": "7.15.5",
     "@babel/core": "7.9.6",
     "@babel/preset-env": "7.9.6",
     "browserify": "16.5.1",

integration/firebase-typings/package.json

@@ -7,7 +7,7 @@
     "test:ci": "node ../../scripts/run_tests_in_ci.js"
   },
   "devDependencies": {
-    "firebase": "7.15.4",
+    "firebase": "7.15.5",
     "typescript": "3.8.3"
   }
 }

integration/messaging/package.json

@@ -8,7 +8,7 @@
     "test:manual": "mocha --exit"
   },
   "devDependencies": {
-    "firebase": "7.15.4",
+    "firebase": "7.15.5",
     "chai": "4.2.0",
     "chromedriver": "^83.0.0",
     "express": "4.17.1",

integration/typescript/package.json

@@ -7,7 +7,7 @@
     "test:ci": "node ../../scripts/run_tests_in_ci.js"
   },
   "devDependencies": {
-    "firebase": "7.15.4",
+    "firebase": "7.15.5",
     "@babel/core": "7.9.6",
     "@babel/preset-env": "7.9.6",
     "@types/chai": "4.2.11",

integration/webpack/package.json

@@ -8,7 +8,7 @@
     "test:ci": "node ../../scripts/run_tests_in_ci.js"
   },
   "devDependencies": {
-    "firebase": "7.15.4",
+    "firebase": "7.15.5",
     "@babel/core": "7.9.6",
     "@babel/preset-env": "7.9.6",
     "chai": "4.2.0",

packages-exp/app-exp/package.json

@@ -33,9 +33,9 @@
   },
   "dependencies": {
     "@firebase/app-types-exp": "0.0.800",
-    "@firebase/util": "0.2.49",
+    "@firebase/util": "0.2.50",
     "@firebase/logger": "0.2.5",
-    "@firebase/component": "0.1.14",
+    "@firebase/component": "0.1.15",
     "tslib": "^1.11.1"
   },
   "license": "Apache-2.0",

packages-exp/functions-exp/package.json

@@ -51,11 +51,11 @@
   },
   "typings": "dist/index.d.ts",
   "dependencies": {
-    "@firebase/component": "0.1.14",
+    "@firebase/component": "0.1.15",
     "@firebase/functions-types-exp": "0.0.800",
-    "@firebase/messaging": "0.6.18",
+    "@firebase/messaging": "0.6.19",
     "@firebase/messaging-types": "0.4.5",
-    "@firebase/util": "0.2.49",
+    "@firebase/util": "0.2.50",
     "isomorphic-fetch": "2.2.1",
     "tslib": "1.11.1"
   },
@@ -65,4 +65,4 @@
     ],
     "reportDir": "./coverage/node"
   }
-}
+}

packages/analytics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/analytics",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "description": "A analytics package for new firebase packages",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.cjs.js",
@@ -27,10 +27,10 @@
   },
   "dependencies": {
     "@firebase/analytics-types": "0.3.1",
-    "@firebase/installations": "0.4.12",
+    "@firebase/installations": "0.4.13",
     "@firebase/logger": "0.2.5",
-    "@firebase/util": "0.2.49",
-    "@firebase/component": "0.1.14",
+    "@firebase/util": "0.2.50",
+    "@firebase/component": "0.1.15",
     "tslib": "^1.11.1"
   },
   "license": "Apache-2.0",

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/app",
-  "version": "0.6.6",
+  "version": "0.6.7",
   "description": "The primary entrypoint to the Firebase JS SDK",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.node.cjs.js",
@@ -30,9 +30,9 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@firebase/app-types": "0.6.1",
-    "@firebase/util": "0.2.49",
+    "@firebase/util": "0.2.50",
     "@firebase/logger": "0.2.5",
-    "@firebase/component": "0.1.14",
+    "@firebase/component": "0.1.15",
     "tslib": "^1.11.1",
     "dom-storage": "2.1.0",
     "xmlhttprequest": "1.8.0"

packages/component/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/component",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "description": "Firebase Component Platform",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.cjs.js",
@@ -24,7 +24,7 @@
     "prepare": "yarn build"
   },
   "dependencies": {
-    "@firebase/util": "0.2.49",
+    "@firebase/util": "0.2.50",
     "tslib": "^1.11.1"
   },
   "license": "Apache-2.0",

packages/database/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/database",
-  "version": "0.6.5",
+  "version": "0.6.6",
   "description": "",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.node.cjs.js",
@@ -29,14 +29,14 @@
   "dependencies": {
     "@firebase/database-types": "0.5.1",
     "@firebase/logger": "0.2.5",
-    "@firebase/util": "0.2.49",
-    "@firebase/component": "0.1.14",
+    "@firebase/util": "0.2.50",
+    "@firebase/component": "0.1.15",
     "@firebase/auth-interop-types": "0.1.5",
     "faye-websocket": "0.11.3",
     "tslib": "^1.11.1"
   },
   "devDependencies": {
-    "@firebase/app": "0.6.6",
+    "@firebase/app": "0.6.7",
     "@firebase/app-types": "0.6.1",
     "rollup": "2.7.6",
     "rollup-plugin-typescript2": "0.27.0",

packages/firebase/index.d.ts

@@ -7859,9 +7859,11 @@ declare namespace firebase.firestore {
     /**
      * Called by the Firestore SDK to convert a custom model object of type T
      * into a plain Javascript object (suitable for writing directly to the
-     * Firestore database).
+     * Firestore database). To use `set()` with `merge` and `mergeFields`,
+     * `toFirestore()` must be defined with `Partial<T>`.
      */
     toFirestore(modelObject: T): DocumentData;
+    toFirestore(modelObject: Partial<T>, options: SetOptions): DocumentData;
 
     /**
      * Called by the Firestore SDK to convert Firestore data into an object of
@@ -8310,10 +8312,21 @@ declare namespace firebase.firestore {
      */
     set<T>(
       documentRef: DocumentReference<T>,
-      data: T,
-      options?: SetOptions
+      data: Partial<T>,
+      options: SetOptions
     ): Transaction;
 
+    /**
+     * Writes to the document referred to by the provided `DocumentReference`.
+     * If the document does not exist yet, it will be created. If you pass
+     * `SetOptions`, the provided data can be merged into the existing document.
+     *
+     * @param documentRef A reference to the document to be set.
+     * @param data An object of the fields and values for the document.
+     * @return This `Transaction` instance. Used for chaining method calls.
+     */
+    set<T>(documentRef: DocumentReference<T>, data: T): Transaction;
+
     /**
      * Updates fields in the document referred to by the provided
      * `DocumentReference`. The update will fail if applied to a document that
@@ -8384,10 +8397,21 @@ declare namespace firebase.firestore {
      */
     set<T>(
       documentRef: DocumentReference<T>,
-      data: T,
-      options?: SetOptions
+      data: Partial<T>,
+      options: SetOptions
     ): WriteBatch;
 
+    /**
+     * Writes to the document referred to by the provided `DocumentReference`.
+     * If the document does not exist yet, it will be created. If you pass
+     * `SetOptions`, the provided data can be merged into the existing document.
+     *
+     * @param documentRef A reference to the document to be set.
+     * @param data An object of the fields and values for the document.
+     * @return This `WriteBatch` instance. Used for chaining method calls.
+     */
+    set<T>(documentRef: DocumentReference<T>, data: T): WriteBatch;
+
     /**
      * Updates fields in the document referred to by the provided
      * `DocumentReference`. The update will fail if applied to a document that
@@ -8566,7 +8590,18 @@ declare namespace firebase.firestore {
      * @return A Promise resolved once the data has been successfully written
      * to the backend (Note that it won't resolve while you're offline).
      */
-    set(data: T, options?: SetOptions): Promise<void>;
+    set(data: Partial<T>, options: SetOptions): Promise<void>;
+
+    /**
+     * Writes to the document referred to by this `DocumentReference`. If the
+     * document does not yet exist, it will be created. If you pass
+     * `SetOptions`, the provided data can be merged into an existing document.
+     *
+     * @param data A map of the fields and values for the document.
+     * @return A Promise resolved once the data has been successfully written
+     * to the backend (Note that it won't resolve while you're offline).
+     */
+    set(data: T): Promise<void>;
 
     /**
      * Updates fields in the document referred to by this `DocumentReference`.

packages/firebase/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase",
-  "version": "7.15.4",
+  "version": "7.15.5",
   "description": "Firebase JavaScript library for web and Node.js",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "license": "Apache-2.0",
@@ -45,20 +45,20 @@
   "module": "dist/index.esm.js",
   "react-native": "dist/index.rn.cjs.js",
   "dependencies": {
-    "@firebase/app": "0.6.6",
+    "@firebase/app": "0.6.7",
     "@firebase/app-types": "0.6.1",
     "@firebase/auth": "0.14.7",
-    "@firebase/database": "0.6.5",
-    "@firebase/firestore": "1.15.4",
-    "@firebase/functions": "0.4.46",
-    "@firebase/installations": "0.4.12",
-    "@firebase/messaging": "0.6.18",
+    "@firebase/database": "0.6.6",
+    "@firebase/firestore": "1.15.5",
+    "@firebase/functions": "0.4.47",
+    "@firebase/installations": "0.4.13",
+    "@firebase/messaging": "0.6.19",
     "@firebase/polyfill": "0.3.36",
-    "@firebase/storage": "0.3.36",
-    "@firebase/performance": "0.3.7",
-    "@firebase/remote-config": "0.1.23",
-    "@firebase/analytics": "0.3.7",
-    "@firebase/util": "0.2.49"
+    "@firebase/storage": "0.3.37",
+    "@firebase/performance": "0.3.8",
+    "@firebase/remote-config": "0.1.24",
+    "@firebase/analytics": "0.3.8",
+    "@firebase/util": "0.2.50"
   },
   "devDependencies": {
     "rollup": "2.7.6",