From 592120ce4a1f121f78b0e60ed41e726322f6b2e1 Mon Sep 17 00:00:00 2001
From: Elliott Marquez <emarquez@google.com>
Date: Tue, 27 Sep 2016 18:57:58 -0700
Subject: [PATCH 1/8] Updated Bower

---
 bower.json | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/bower.json b/bower.json
index b33bd7c..c8c1300 100644
--- a/bower.json
+++ b/bower.json
@@ -17,24 +17,42 @@
   "private": true,
   "ignore": [],
   "dependencies": {
-    "polymer": "polymer/polymer#^v1.2.0",
+    "polymer": "polymer/polymer#2.0-preview",
     "pouchdb": "^6.0.4",
     "pouchdb-find": "^0.10.0",
-    "promise-polyfill": "polymerlabs/promise-polyfill#^1.0.0",
-    "app-storage": "polymerelements/app-storage#~0.9.0"
+    "app-storage": "polymerelements/app-storage#2.0-preview"
   },
   "devDependencies": {
     "web-component-tester": "^4.0.0",
     "iron-component-page": "polymerelements/iron-component-page#^1.0.0",
     "paper-input": "polymerelements/paper-input#^1.0.0",
-    "paper-styles": "polymerelements/paper-styles#^1.0.0",
+    "paper-styles": "polymerelements/paper-styles#2.0-preview",
     "font-roboto": "polymerelements/font-roboto#^1.0.0",
-    "iron-flex-layout": "polymerelements/iron-flex-layout#^1.0.0",
-    "iron-icon": "polymerelements/iron-icon#^1.0.0",
-    "paper-fab": "polymerelements/paper-fab#^1.0.0",
-    "iron-icons": "polymerelements/iron-icons#^1.0.0",
-    "paper-button": "polymerelements/paper-button#^1.0.0",
+    "iron-flex-layout": "polymerelements/iron-flex-layout#2.0-preview",
+    "iron-icon": "polymerelements/iron-icon#2.0-preview",
+    "paper-fab": "polymerelements/paper-fab#2.0-preview",
+    "iron-icons": "polymerelements/iron-icons#2.0-preview",
+    "paper-button": "polymerelements/paper-button#2.0-preview",
     "platinum-sw": "polymerelements/platinum-sw#^1.3.0",
     "note-app-elements": "polymerlabs/note-app-elements"
+  },
+  "resolutions": {
+    "paper-styles": "2.0-preview",
+    "iron-flex-layout": "2.0-preview",
+    "iron-icon": "2.0-preview",
+    "paper-fab": "2.0-preview",
+    "iron-icons": "2.0-preview",
+    "polymer": "2.0-preview",
+    "paper-button": "2.0-preview",
+    "iron-behaviors": "2.0-preview",
+    "iron-a11y-keys-behavior": "2.0-preview",
+    "paper-material": "2.0-preview",
+    "paper-behaviors": "2.0-preview",
+    "iron-meta": "2.0-preview",
+    "iron-validatable-behavior": "2.0-preview",
+    "iron-iconset-svg": "2.0-preview",
+    "iron-checked-element-behavior": "2.0-preview",
+    "paper-ripple": "2.0-preview",
+    "webcomponentsjs": "v1"
   }
 }

From 107072521aa43675fa5d6124f0ce58506eeed0a1 Mon Sep 17 00:00:00 2001
From: Elliott Marquez <emarquez@google.com>
Date: Thu, 29 Sep 2016 10:10:16 -0700
Subject: [PATCH 2/8] some small fixes and demo fixes

---
 app-pouchdb-database-behavior.html | 2 +-
 bower.json                         | 2 +-
 demo/index.html                    | 2 +-
 demo/note-app.html                 | 4 +---
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app-pouchdb-database-behavior.html b/app-pouchdb-database-behavior.html
index b091105..5de1ce6 100644
--- a/app-pouchdb-database-behavior.html
+++ b/app-pouchdb-database-behavior.html
@@ -21,7 +21,7 @@
      * operations that might be performed on the database, including "upsert"
      * and conflict-aware "put" and "post" operations.
      *
-     * @polymerBehavior
+     * @polymerBehavior Polymer.AppPouchDBDatabaseBehavior
      */
     Polymer.AppPouchDBDatabaseBehavior = {
       properties: {
diff --git a/bower.json b/bower.json
index c8c1300..c7a3e1a 100644
--- a/bower.json
+++ b/bower.json
@@ -33,7 +33,7 @@
     "paper-fab": "polymerelements/paper-fab#2.0-preview",
     "iron-icons": "polymerelements/iron-icons#2.0-preview",
     "paper-button": "polymerelements/paper-button#2.0-preview",
-    "platinum-sw": "polymerelements/platinum-sw#^1.3.0",
+    "platinum-sw": "polymerelements/platinum-sw#2.0-preview",
     "note-app-elements": "polymerlabs/note-app-elements"
   },
   "resolutions": {
diff --git a/demo/index.html b/demo/index.html
index 298dd71..35d1922 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -39,7 +39,7 @@
   <script src="../../webcomponentsjs/webcomponents-lite.js"></script>
   <script src="../../web-animations-js/web-animations-next.min.js"></script>
   <link rel="import" href="../../platinum-sw/platinum-sw-elements.html">
-  <link rel="import" href="../pouchdb-sync.html">
+  <link rel="import" href="../app-pouchdb-sync.html">
   <link rel="import" href="note-app.html">
 
   <style>
diff --git a/demo/note-app.html b/demo/note-app.html
index ff0e6a8..3746b57 100644
--- a/demo/note-app.html
+++ b/demo/note-app.html
@@ -69,9 +69,7 @@
       Polymer({
         is: 'note-app',
 
-        behaviors: [
-          Polymer.NoteAppBehavior
-        ]
+        behaviors: [ Polymer.NoteAppBehavior ]
       });
     })();
   </script>

From 17b9fb46f713aeb0344027945ebf54ca7ad742eb Mon Sep 17 00:00:00 2001
From: Elliott Marquez <emarquez@google.com>
Date: Thu, 29 Sep 2016 12:20:28 -0700
Subject: [PATCH 3/8] bower update

---
 bower.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bower.json b/bower.json
index c7a3e1a..9a7528d 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "app-pouchdb",
-  "version": "0.9.2",
+  "version": "2.0.0",
   "authors": [
     "The Polymer Authors"
   ],
@@ -34,7 +34,7 @@
     "iron-icons": "polymerelements/iron-icons#2.0-preview",
     "paper-button": "polymerelements/paper-button#2.0-preview",
     "platinum-sw": "polymerelements/platinum-sw#2.0-preview",
-    "note-app-elements": "polymerlabs/note-app-elements"
+    "note-app-elements": "polymerlabs/note-app-elements#2.0-preview"
   },
   "resolutions": {
     "paper-styles": "2.0-preview",

From fdd4632b64cf3425c4d72e9edeaaff8143754b25 Mon Sep 17 00:00:00 2001
From: Elliott Marquez <emarquez@google.com>
Date: Mon, 24 Oct 2016 12:39:53 -0700
Subject: [PATCH 4/8] bower resolutions

---
 bower.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bower.json b/bower.json
index 9a7528d..c5c94f8 100644
--- a/bower.json
+++ b/bower.json
@@ -53,6 +53,9 @@
     "iron-iconset-svg": "2.0-preview",
     "iron-checked-element-behavior": "2.0-preview",
     "paper-ripple": "2.0-preview",
-    "webcomponentsjs": "v1"
+    "webcomponentsjs": "v1",
+    "iron-autogrow-textarea": "2.0-preview",
+    "iron-input": "2.0-preview",
+    "iron-a11y-announcer": "2.0-preview"
   }
 }

From edb8f02d44ea5056923ba2a2e1621898cee3ea6d Mon Sep 17 00:00:00 2001
From: Martynas <martynas@firmfirm.co>
Date: Thu, 22 Dec 2016 14:30:50 +0200
Subject: [PATCH 5/8] Properly cancel changes

https://github.com/pouchdb/pouchdb/issues/5791
---
 app-pouchdb-document.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-pouchdb-document.html b/app-pouchdb-document.html
index 458c406..9d1045d 100644
--- a/app-pouchdb-document.html
+++ b/app-pouchdb-document.html
@@ -181,7 +181,7 @@
 
       __computeChanges: function(db, docId) {
         if (this.changes) {
-          this.changes.removeAllListeners();
+          this.changes.cancel();
         }
 
         if (db == null || docId == null) {

From 4edb275c2eff71c886ac8e89b193a3882fca9aae Mon Sep 17 00:00:00 2001
From: Tedium Bot <format-bot@polymer-project.org>
Date: Wed, 25 Jan 2017 12:37:27 -0800
Subject: [PATCH 6/8] auto-generated: update repo for v2

---
 bower.json | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/bower.json b/bower.json
index c5c94f8..45e647e 100644
--- a/bower.json
+++ b/bower.json
@@ -23,7 +23,7 @@
     "app-storage": "polymerelements/app-storage#2.0-preview"
   },
   "devDependencies": {
-    "web-component-tester": "^4.0.0",
+    "web-component-tester": "v6.0.0-prerelease.5",
     "iron-component-page": "polymerelements/iron-component-page#^1.0.0",
     "paper-input": "polymerelements/paper-input#^1.0.0",
     "paper-styles": "polymerelements/paper-styles#2.0-preview",
@@ -57,5 +57,25 @@
     "iron-autogrow-textarea": "2.0-preview",
     "iron-input": "2.0-preview",
     "iron-a11y-announcer": "2.0-preview"
+  },
+  "variants": {
+    "1.x": {
+      "dependencies": {
+        "polymer": "Polymer/polymer#^1.1.0",
+        "app-storage": "polymerelements/app-storage#^1.0.0"
+      },
+      "devDependencies": {
+        "iron-component-page": "polymerelements/iron-component-page#^1.0.0",
+        "paper-input": "polymerelements/paper-input#^1.0.0",
+        "paper-styles": "polymerelements/paper-styles#^1.0.0",
+        "font-roboto": "polymerelements/font-roboto#^1.0.0",
+        "iron-flex-layout": "polymerelements/iron-flex-layout#^1.0.0",
+        "iron-icon": "polymerelements/iron-icon#^1.0.0",
+        "paper-fab": "polymerelements/paper-fab#^1.0.0",
+        "iron-icons": "polymerelements/iron-icons#^1.0.0",
+        "paper-button": "polymerelements/paper-button#^1.0.0",
+        "platinum-sw": "polymerelements/platinum-sw#^1.0.0"
+      }
+    }
   }
 }

From 7f804ddf994afbc8205dfefcc06e1ad5a782384f Mon Sep 17 00:00:00 2001
From: Martynas Kazlauskas <martynas@firmfirm.co>
Date: Wed, 8 Feb 2017 15:00:41 +0200
Subject: [PATCH 7/8] fix shared data bug

---
 app-pouchdb-document.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-pouchdb-document.html b/app-pouchdb-document.html
index 9d1045d..e9aecdd 100644
--- a/app-pouchdb-document.html
+++ b/app-pouchdb-document.html
@@ -170,7 +170,7 @@
       __docChanged: function(db, doc, docId) {
         this._log('Doc / ID changed', doc, docId);
         if (db && doc != null && docId != null && doc._id != docId) {
-          doc._id = docId;
+          this.data = Object.assign({}, doc, {_id: docId});
           this._initializeStoredValue();
         }
       },

From b3555f642fc97a0844e9dba388257d1fc98b23ed Mon Sep 17 00:00:00 2001
From: Martynas Kazlauskas <martynas@firmfirm.co>
Date: Thu, 9 Feb 2017 13:30:16 +0200
Subject: [PATCH 8/8] initialization fixes

---
 app-pouchdb-database-behavior.html | 2 +-
 app-pouchdb-document.html          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-pouchdb-database-behavior.html b/app-pouchdb-database-behavior.html
index 5de1ce6..95de65f 100644
--- a/app-pouchdb-database-behavior.html
+++ b/app-pouchdb-database-behavior.html
@@ -96,7 +96,7 @@
        * @return {Promise} A promise that resolves when the document update has
        * completed, or rejects with any unhandled error.
        */
-      _put: function(path, value, doc) {
+      _put: function(path, value, doc = value) {
         if (this.upsert) {
           return this._upsert(path, value, doc);
         } else {
diff --git a/app-pouchdb-document.html b/app-pouchdb-document.html
index e9aecdd..9d1045d 100644
--- a/app-pouchdb-document.html
+++ b/app-pouchdb-document.html
@@ -170,7 +170,7 @@
       __docChanged: function(db, doc, docId) {
         this._log('Doc / ID changed', doc, docId);
         if (db && doc != null && docId != null && doc._id != docId) {
-          this.data = Object.assign({}, doc, {_id: docId});
+          doc._id = docId;
           this._initializeStoredValue();
         }
       },