From 8c222bb467be03ea53dbb52fb1c475c411047314 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Wed, 3 Apr 2019 23:07:35 -0700 Subject: [PATCH] Remove unnecessary resolutions (#3056) * Remove vaadin-lumo-styles resolution * Remove iron-overlay-behavior resolution * Remove polymer and shadycss resolutions * Add lumo-styles back to resolution --- package.json | 6 +----- yarn.lock | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 06ba277552..9a3b5beb1e 100644 --- a/package.json +++ b/package.json @@ -164,12 +164,8 @@ "workbox-webpack-plugin": "^4.1.1" }, "resolutions": { - "@polymer/polymer": "3.2.0", "@webcomponents/webcomponentsjs": "^2.2.7", - "@webcomponents/shadycss": "^1.9.0", - "@vaadin/vaadin-overlay": "3.2.2", - "@vaadin/vaadin-lumo-styles": "1.3.0", - "@polymer/iron-overlay-behavior": "^3.0.2" + "@vaadin/vaadin-lumo-styles": "^1.4.2" }, "main": "src/home-assistant.js", "husky": { diff --git a/yarn.lock b/yarn.lock index c841748a93..4a4417a7a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1033,7 +1033,7 @@ dependencies: "@polymer/polymer" "^3.0.0" -"@polymer/iron-icon@^3.0.0-pre.18", "@polymer/iron-icon@^3.0.0-pre.26", "@polymer/iron-icon@^3.0.1": +"@polymer/iron-icon@^3.0.0", "@polymer/iron-icon@^3.0.0-pre.26", "@polymer/iron-icon@^3.0.1": version "3.0.1" resolved "https://registry.yarnpkg.com/@polymer/iron-icon/-/iron-icon-3.0.1.tgz#93211c39d8825fe4965a68419566036c1df291eb" integrity sha512-QLPwirk+UPZNaLnMew9VludXA4CWUCenRewgEcGYwdzVgDPCDbXxy6vRJjmweZobMQv/oVLppT2JZtJFnPxX6g== @@ -1042,7 +1042,7 @@ "@polymer/iron-meta" "^3.0.0-pre.26" "@polymer/polymer" "^3.0.0" -"@polymer/iron-iconset-svg@^3.0.0-pre.18", "@polymer/iron-iconset-svg@^3.0.0-pre.26", "@polymer/iron-iconset-svg@^3.0.1": +"@polymer/iron-iconset-svg@^3.0.0", "@polymer/iron-iconset-svg@^3.0.0-pre.26", "@polymer/iron-iconset-svg@^3.0.1": version "3.0.1" resolved "https://registry.yarnpkg.com/@polymer/iron-iconset-svg/-/iron-iconset-svg-3.0.1.tgz#568d6e7dbc120299dae63be3600aeba0d30ddbea" integrity sha512-XNwURbNHRw6u2fJe05O5fMYye6GSgDlDqCO+q6K1zAnKIrpgZwf2vTkBd5uCcZwsN0FyCB3mvNZx4jkh85dRDw== @@ -1456,7 +1456,7 @@ "@polymer/paper-styles" "^3.0.0-pre.26" "@polymer/polymer" "^3.0.0" -"@polymer/polymer@3.2.0", "@polymer/polymer@^3.0.0", "@polymer/polymer@^3.2.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== @@ -2189,13 +2189,13 @@ "@vaadin/vaadin-material-styles" "^1.1.0" "@vaadin/vaadin-themable-mixin" "^1.2.1" -"@vaadin/vaadin-lumo-styles@1.3.0", "@vaadin/vaadin-lumo-styles@^1.1.0", "@vaadin/vaadin-lumo-styles@^1.1.1", "@vaadin/vaadin-lumo-styles@^1.2.0", "@vaadin/vaadin-lumo-styles@^1.3.0", "@vaadin/vaadin-lumo-styles@^1.3.3", "@vaadin/vaadin-lumo-styles@^1.4.1": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@vaadin/vaadin-lumo-styles/-/vaadin-lumo-styles-1.3.0.tgz#a7192cef4eae9c79f1e3cc17451c936cfa9daa6a" - integrity sha512-JS8Ls8LZtbNRP7kfgsvc3BxMWRua+Lpw8JvAoZ7jUcXvG43SFhk6rbdueTy5uanh1zta4LwrnFtAhNFtoM3GFg== +"@vaadin/vaadin-lumo-styles@^1.1.0", "@vaadin/vaadin-lumo-styles@^1.1.1", "@vaadin/vaadin-lumo-styles@^1.2.0", "@vaadin/vaadin-lumo-styles@^1.3.0", "@vaadin/vaadin-lumo-styles@^1.3.3", "@vaadin/vaadin-lumo-styles@^1.4.1": + version "1.4.2" + resolved "https://registry.yarnpkg.com/@vaadin/vaadin-lumo-styles/-/vaadin-lumo-styles-1.4.2.tgz#c0f8c6bfeccace2db3601b6f043912da65bdc6ee" + integrity sha512-6JrmxxQRkDfght5JiViVtd9xoIEwFAHIZjgEwW5ygQw2Zbr++vz6+9oBe6l93nM5JjOMHjR/TXW/+md0FrAZ+w== dependencies: - "@polymer/iron-icon" "^3.0.0-pre.18" - "@polymer/iron-iconset-svg" "^3.0.0-pre.18" + "@polymer/iron-icon" "^3.0.0" + "@polymer/iron-iconset-svg" "^3.0.0" "@polymer/polymer" "^3.0.0" "@vaadin/vaadin-material-styles@^1.1.0", "@vaadin/vaadin-material-styles@^1.1.2", "@vaadin/vaadin-material-styles@^1.2.0": @@ -2205,7 +2205,7 @@ dependencies: "@polymer/polymer" "^3.0.0" -"@vaadin/vaadin-overlay@3.2.2", "@vaadin/vaadin-overlay@^3.2.0": +"@vaadin/vaadin-overlay@^3.2.0": version "3.2.2" resolved "https://registry.yarnpkg.com/@vaadin/vaadin-overlay/-/vaadin-overlay-3.2.2.tgz#ea72cd66637dc6dc0da50508bf2d6a52b6729ee8" integrity sha512-bWXRe0y33WbAoVg22OmN/qhGhJyBsy0cTSd/0hi+c3t5a/7jwYmrRgbK+gsmngnWPeOJVJBmXjBgANny4ArN8w==