From ae513004462ccba1ac9c0f5927d9f45f6244d58d Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Sat, 22 Jun 2019 12:36:30 -0700
Subject: [PATCH] Revert Polymer to 3.1 (#3297)

* Revert Polymer to 3.1

* Only install 1 polymer
---
 package.json |  6 ++++--
 yarn.lock    | 12 ++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 4864f21a4a..ca1ee1b457 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
     "@polymer/paper-toast": "^3.0.1",
     "@polymer/paper-toggle-button": "^3.0.1",
     "@polymer/paper-tooltip": "^3.0.1",
-    "@polymer/polymer": "^3.2.0",
+    "@polymer/polymer": "3.1.0",
     "@vaadin/vaadin-combo-box": "^4.2.8",
     "@vaadin/vaadin-date-picker": "^3.3.3",
     "@webcomponents/shadycss": "^1.9.0",
@@ -170,9 +170,11 @@
     "webpack-manifest-plugin": "^2.0.4",
     "workbox-webpack-plugin": "^4.1.1"
   },
+  "_comment": "Polymer fixed to 3.1 because 3.2 throws on logbook page",
   "resolutions": {
     "@webcomponents/webcomponentsjs": "^2.2.10",
-    "@vaadin/vaadin-lumo-styles": "^1.4.2"
+    "@vaadin/vaadin-lumo-styles": "^1.4.2",
+    "@polymer/polymer": "3.1.0"
   },
   "main": "src/home-assistant.js",
   "husky": {
diff --git a/yarn.lock b/yarn.lock
index 734ab7ee1c..76f0a3a2e9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1451,12 +1451,12 @@
     "@polymer/paper-styles" "^3.0.0-pre.26"
     "@polymer/polymer" "^3.0.0"
 
-"@polymer/polymer@^3.0.0", "@polymer/polymer@^3.2.0":
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/@polymer/polymer/-/polymer-3.2.0.tgz#b41fddec4ecac63b12936b93726678d23add7afd"
-  integrity sha512-L6uV1oM6T6xbwbVx6t3biG5T2VSSB03LxnIrUd9M2pr6RkHVPFHJ37pC5MUwBAEhkGFJif7eks7fdMMSGZTeEQ==
+"@polymer/polymer@3.1.0", "@polymer/polymer@^3.0.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@polymer/polymer/-/polymer-3.1.0.tgz#3e1b7447a1e350fd654e1823def655d0f0828a70"
+  integrity sha512-hwN8IMERsFATz/9dSMxYHL+84J9uBkPuuarxJWlTsppZ4CAYTZKnepBfNrKoyNsafBmA3yXBiiKPPf+fJtza7A==
   dependencies:
-    "@webcomponents/shadycss" "^1.8.0"
+    "@webcomponents/shadycss" "^1.5.2"
 
 "@polymer/sinonjs@^1.14.1":
   version "1.17.1"
@@ -2368,7 +2368,7 @@
     "@webassemblyjs/wast-parser" "1.8.5"
     "@xtuc/long" "4.2.2"
 
-"@webcomponents/shadycss@^1.8.0", "@webcomponents/shadycss@^1.9.0":
+"@webcomponents/shadycss@^1.5.2", "@webcomponents/shadycss@^1.9.0":
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/@webcomponents/shadycss/-/shadycss-1.9.1.tgz#d769fbadfa504f11b84caeef26701f89070ec49a"
   integrity sha512-IaZOnWOKXHghqk/WfPNDRIgDBi3RsVPY2IFAw6tYiL9UBGvQRy5R6uC+Fk7qTZsReTJ0xh5MTT8yAcb3MUR4mQ==