From af8b10e06a4fb8552d73ea19772ba1c90f5c52c7 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@paulusschoutsen.nl>
Date: Sun, 25 Jun 2017 21:50:21 -0700
Subject: [PATCH] Fix bower dependency resolution (#317)

---
 .travis.yml |  2 +-
 bower.json  | 62 +++++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6c0e7ab26f..22ce3a7c66 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ cache:
   - bower_components
 install:
   - yarn install
-  - bower install
+  - ./node_modules/.bin/bower install
 addons:
   firefox: latest
   apt:
diff --git a/bower.json b/bower.json
index f4a0c3be67..8ec94284aa 100644
--- a/bower.json
+++ b/bower.json
@@ -7,7 +7,7 @@
   "main": "src/home-assistant.html",
   "license": "MIT",
   "private": true,
-  "devDependencies": {
+  "dependencies": {
     "app-layout": "^2.0.0",
     "app-storage": "^2.0.2",
     "fecha": "~2.3.0",
@@ -53,12 +53,62 @@
     "web-animations-js": "^2.2.5"
   },
   "resolutions": {
-    "polymer": "^1.0.0",
-    "webcomponentsjs": "^0.7.24",
+    "iron-a11y-announcer": "^2.0.0",
+    "iron-a11y-keys-behavior": "^2.0.0",
+    "iron-ajax": "^2.0.0",
+    "iron-autogrow-textarea": "^2.0.0",
+    "iron-behaviors": "^2.0.0",
+    "iron-checked-element-behavior": "^2.0.0",
+    "iron-dropdown": "^2.0.0",
+    "iron-fit-behavior": "^2.0.0",
     "iron-flex-layout": "^2.0.0",
-    "paper-input": "^2.0.0",
-    "paper-styles": "2.0.0",
+    "iron-form": "2.0-preview",
+    "iron-form-element-behavior": "^2.0.0",
+    "iron-icon": "^2.0.0",
+    "iron-iconset-svg": "^2.0.0",
+    "iron-image": "^2.0.0",
+    "iron-input": "^2.0.0",
+    "iron-jsonp-library": "^2.0.0",
+    "iron-list": "^2.0.0",
+    "iron-media-query": "^2.0.0",
+    "iron-menu-behavior": "^2.0.0",
+    "iron-meta": "^2.0.0",
+    "iron-overlay-behavior": "^2.0.0",
+    "iron-pages": "^2.0.0",
+    "iron-range-behavior": "^2.0.0",
     "iron-resizable-behavior": "^2.0.0",
-    "iron-a11y-keys-behavior": "^2.0.0"
+    "iron-scroll-target-behavior": "^2.0.0",
+    "iron-selector": "^2.0.0",
+    "iron-validatable-behavior": "^2.0.0",
+    "paper-behaviors": "^2.0.0",
+    "paper-button": "^2.0.0",
+    "paper-card": "^2.0.0",
+    "paper-checkbox": "^2.0.0",
+    "paper-dialog": "^2.0.0",
+    "paper-dialog-behavior": "^2.0.0",
+    "paper-dialog-scrollable": "^2.0.0",
+    "paper-drawer-panel": "^2.0.0",
+    "paper-dropdown-menu": "^2.0.0",
+    "paper-fab": "^2.0.0",
+    "paper-icon-button": "^2.0.0",
+    "paper-input": "^2.0.1",
+    "paper-item": "^2.0.0",
+    "paper-listbox": "^2.0.0",
+    "paper-material": "^2.0.0",
+    "paper-menu-button": "^2.0.0",
+    "paper-progress": "^2.0.0",
+    "paper-radio-button": "^2.0.0",
+    "paper-radio-group": "^2.0.0",
+    "paper-ripple": "^2.0.0",
+    "paper-scroll-header-panel": "^2.0.0",
+    "paper-slider": "^2.0.0",
+    "paper-spinner": "^2.0.0",
+    "paper-styles": "2.0.0",
+    "paper-styles": "^2.0.0",
+    "paper-tabs": "^2.0.0",
+    "paper-toast": "^2.0.0",
+    "paper-toggle-button": "^2.0.0",
+    "polymer": "~1.9.2",
+    "webcomponentsjs": "^0.7.24"
   }
 }