From 6351f98610a07f6f20bdc48333b28baf1ee7d820 Mon Sep 17 00:00:00 2001 From: Russell Bicknell <bicknellr@google.com> Date: Tue, 13 Jun 2017 15:32:53 -0700 Subject: [PATCH 1/4] Enable properties of the iron-meta without connecting it to the document. --- bower.json | 18 ++++++++++++++++++ iron-iconset-svg.html | 8 +++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 346c7c7..90ac655 100644 --- a/bower.json +++ b/bower.json @@ -31,6 +31,24 @@ "web-component-tester": "^6.0.0" }, "variants": { + "2.x_polymer-2.x_iron-meta-1.x": { + "dependencies": { + "polymer": "Polymer/polymer#^2.0.0", + "iron-meta": "PolymerElements/iron-meta#^1.0.0" + }, + "devDependencies": { + "paper-styles": "PolymerElements/paper-styles#1 - 2", + "iron-component-page": "polymerelements/iron-component-page#1 - 2", + "iron-icon": "PolymerElements/iron-icon#1 - 2", + "promise-polyfill": "polymerlabs/promise-polyfill#1 - 2", + "webcomponentsjs": "webcomponents/webcomponentsjs#^1.0.0", + "web-component-tester": "^6.0.0" + }, + "resolutions": { + "polymer": "^2.0.0", + "webcomponentsjs": "^1.0.0" + } + }, "1.x": { "dependencies": { "polymer": "Polymer/polymer#^1.9", diff --git a/iron-iconset-svg.html b/iron-iconset-svg.html index bf72f27..3ca9ed3 100644 --- a/iron-iconset-svg.html +++ b/iron-iconset-svg.html @@ -84,7 +84,13 @@ }, created: function() { - this._meta = new Polymer.IronMeta({type: 'iconset', key: null, value: null}); + var meta = this._meta = document.createElement('iron-meta'); + if (typeof this._meta._enableProperties === "function") { + this._meta._enableProperties(); + } + this._meta.type = 'iconset'; + this._meta.key = null; + this._meta.value = null; }, attached: function() { From d7e3ef0073a8a46cee615fbe87c8404f6fd77fe6 Mon Sep 17 00:00:00 2001 From: Russell Bicknell <bicknellr@google.com> Date: Mon, 19 Jun 2017 11:37:05 -0700 Subject: [PATCH 2/4] New variants for different iron-meta versions. --- bower.json | 50 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/bower.json b/bower.json index 90ac655..f82f151 100644 --- a/bower.json +++ b/bower.json @@ -30,29 +30,31 @@ "webcomponentsjs": "webcomponents/webcomponentsjs#^1.0.0", "web-component-tester": "^6.0.0" }, + "resolutions": { + "webcomponentsjs": "^1.0.0" + }, "variants": { - "2.x_polymer-2.x_iron-meta-1.x": { + "1.x": { "dependencies": { - "polymer": "Polymer/polymer#^2.0.0", - "iron-meta": "PolymerElements/iron-meta#^1.0.0" + "polymer": "Polymer/polymer#^1.9", + "iron-meta": "polymerelements/iron-meta#^1.0.0" }, "devDependencies": { - "paper-styles": "PolymerElements/paper-styles#1 - 2", - "iron-component-page": "polymerelements/iron-component-page#1 - 2", - "iron-icon": "PolymerElements/iron-icon#1 - 2", - "promise-polyfill": "polymerlabs/promise-polyfill#1 - 2", - "webcomponentsjs": "webcomponents/webcomponentsjs#^1.0.0", - "web-component-tester": "^6.0.0" + "paper-styles": "polymerelements/paper-styles#^1.0.2", + "iron-component-page": "polymerelements/iron-component-page#^1.0.0", + "iron-icon": "polymerelements/iron-icon#^1.0.0", + "promise-polyfill": "polymerlabs/promise-polyfill#^1.0.0", + "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0", + "web-component-tester": "^4.0.0" }, "resolutions": { - "polymer": "^2.0.0", - "webcomponentsjs": "^1.0.0" + "webcomponentsjs": "^0.7" } }, - "1.x": { + "polymer-1.x_iron-meta-2.x": { "dependencies": { "polymer": "Polymer/polymer#^1.9", - "iron-meta": "polymerelements/iron-meta#^1.0.0" + "iron-meta": "polymerelements/iron-meta#^2.0.0" }, "devDependencies": { "paper-styles": "polymerelements/paper-styles#^1.0.2", @@ -63,11 +65,27 @@ "web-component-tester": "^4.0.0" }, "resolutions": { + "iron-meta": "^2.0.0", "webcomponentsjs": "^0.7" } + }, + "polymer-2.x_iron-meta-1.x": { + "dependencies": { + "polymer": "Polymer/polymer#1.9 - 2", + "iron-meta": "PolymerElements/iron-meta#^1.0.0" + }, + "devDependencies": { + "paper-styles": "PolymerElements/paper-styles#1 - 2", + "iron-component-page": "polymerelements/iron-component-page#1 - 2", + "iron-icon": "PolymerElements/iron-icon#1 - 2", + "promise-polyfill": "polymerlabs/promise-polyfill#1 - 2", + "webcomponentsjs": "webcomponents/webcomponentsjs#^1.0.0", + "web-component-tester": "^6.0.0" + }, + "resolutions": { + "webcomponentsjs": "^1.0.0", + "iron-meta": "^1.0.0" + } } - }, - "resolutions": { - "webcomponentsjs": "^1.0.0" } } From 31331a3715f8aa8ea4d74f542d61765de86d5d47 Mon Sep 17 00:00:00 2001 From: Russell Bicknell <bicknellr@google.com> Date: Mon, 19 Jun 2017 13:48:45 -0700 Subject: [PATCH 3/4] Fix dependency error in 'polymer-2.x_iron-meta-1.x' variant. --- bower.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bower.json b/bower.json index f82f151..83561e3 100644 --- a/bower.json +++ b/bower.json @@ -71,7 +71,7 @@ }, "polymer-2.x_iron-meta-1.x": { "dependencies": { - "polymer": "Polymer/polymer#1.9 - 2", + "polymer": "Polymer/polymer#^2", "iron-meta": "PolymerElements/iron-meta#^1.0.0" }, "devDependencies": { @@ -84,6 +84,7 @@ }, "resolutions": { "webcomponentsjs": "^1.0.0", + "polymer": "^2.0.0", "iron-meta": "^1.0.0" } } From 8aae207ae5c83e9243e3508ab3a00df4e614129e Mon Sep 17 00:00:00 2001 From: Russell Bicknell <bicknellr@google.com> Date: Mon, 19 Jun 2017 15:51:30 -0700 Subject: [PATCH 4/4] Remove 'polymer-2.x_iron-meta-1.x' variant; this is not a supported combination. --- bower.json | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/bower.json b/bower.json index 83561e3..a714abb 100644 --- a/bower.json +++ b/bower.json @@ -68,25 +68,6 @@ "iron-meta": "^2.0.0", "webcomponentsjs": "^0.7" } - }, - "polymer-2.x_iron-meta-1.x": { - "dependencies": { - "polymer": "Polymer/polymer#^2", - "iron-meta": "PolymerElements/iron-meta#^1.0.0" - }, - "devDependencies": { - "paper-styles": "PolymerElements/paper-styles#1 - 2", - "iron-component-page": "polymerelements/iron-component-page#1 - 2", - "iron-icon": "PolymerElements/iron-icon#1 - 2", - "promise-polyfill": "polymerlabs/promise-polyfill#1 - 2", - "webcomponentsjs": "webcomponents/webcomponentsjs#^1.0.0", - "web-component-tester": "^6.0.0" - }, - "resolutions": { - "webcomponentsjs": "^1.0.0", - "polymer": "^2.0.0", - "iron-meta": "^1.0.0" - } } } }