From c67f1e6009229f55842de4a2094a0aa2a2e8b443 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Sun, 5 Aug 2018 21:57:26 +0200 Subject: [PATCH] REVERT polymer & webcomponents upgrade (would love help getting them upgraded) --- app/polymer/package.json | 2 +- app/polymer/src/client/preview/globals.js | 2 +- examples/polymer-cli/package.json | 4 ++-- yarn.lock | 18 ++++++------------ 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/app/polymer/package.json b/app/polymer/package.json index 4a34094af80..248474a917e 100644 --- a/app/polymer/package.json +++ b/app/polymer/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "@storybook/core": "4.0.0-alpha.15", - "@webcomponents/webcomponentsjs": "^2.0.4", + "@webcomponents/webcomponentsjs": "^1.2.0", "babel-polyfill": "^6.26.0", "common-tags": "^1.8.0", "global": "^4.3.2", diff --git a/app/polymer/src/client/preview/globals.js b/app/polymer/src/client/preview/globals.js index 17400cd1d8d..e50f387ec93 100644 --- a/app/polymer/src/client/preview/globals.js +++ b/app/polymer/src/client/preview/globals.js @@ -1,4 +1,4 @@ -import '@webcomponents/webcomponentsjs/webcomponents-loader'; +import '@webcomponents/webcomponentsjs/webcomponents-lite'; import '@webcomponents/webcomponentsjs/custom-elements-es5-adapter'; import 'babel-polyfill'; diff --git a/examples/polymer-cli/package.json b/examples/polymer-cli/package.json index cc729e9e84d..a357acd834e 100644 --- a/examples/polymer-cli/package.json +++ b/examples/polymer-cli/package.json @@ -8,7 +8,7 @@ "storybook": "start-storybook -p 9001 -c .storybook" }, "dependencies": { - "@polymer/polymer": "^3.0.5", + "@polymer/polymer": "^2.6.0", "@storybook/addon-actions": "4.0.0-alpha.15", "@storybook/addon-backgrounds": "4.0.0-alpha.15", "@storybook/addon-knobs": "4.0.0-alpha.15", @@ -18,7 +18,7 @@ "@storybook/addon-storysource": "4.0.0-alpha.15", "@storybook/addon-viewport": "4.0.0-alpha.15", "@storybook/polymer": "4.0.0-alpha.15", - "@webcomponents/webcomponentsjs": "^2.0.4", + "@webcomponents/webcomponentsjs": "^1.2.0", "global": "^4.3.2", "lit-html": "^0.10.2", "polymer-webpack-loader": "^2.0.3", diff --git a/yarn.lock b/yarn.lock index 81449e930b5..8c5e9ed0b80 100644 --- a/yarn.lock +++ b/yarn.lock @@ -844,11 +844,9 @@ node-fetch "^2.1.1" url-template "^2.0.8" -"@polymer/polymer@^3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@polymer/polymer/-/polymer-3.0.5.tgz#eaa42e70df7de818b5e1839452c82a5f83e39929" - dependencies: - "@webcomponents/shadycss" "^1.2.0" +"@polymer/polymer@^2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@polymer/polymer/-/polymer-2.6.0.tgz#98601124122a045e74f4b41f55975006ef327dbc" "@samverschueren/stream-to-observable@^0.3.0": version "0.3.0" @@ -1255,13 +1253,9 @@ "@webassemblyjs/wast-parser" "1.5.13" long "^3.2.0" -"@webcomponents/shadycss@^1.2.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@webcomponents/shadycss/-/shadycss-1.4.0.tgz#2b2b66443252f81d02ebb2dd139e4a717655bfa9" - -"@webcomponents/webcomponentsjs@^2.0.4": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.0.4.tgz#fe18c288f99b7103e9ae7a766020f9702cedcc08" +"@webcomponents/webcomponentsjs@^1.2.0": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@webcomponents/webcomponentsjs/-/webcomponentsjs-1.2.4.tgz#4c945cff61acb7e37534fa6f1d45acc662ecf26e" Base64@~0.2.0: version "0.2.1"