Update to use latest modulizer and webcomponents polyfill

vaadin · May 2, 2018 · 59b4c96 · 59b4c96
1 parent bd0dffb
commit 59b4c96
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,7 @@ addons:
   chrome: stable
 
 before_script:
-  - npm install -g bower polymer-cli@next
+  - npm install -g bower polymer-cli@1.7.0-pre.15
   - bower install
 
 env:
@@ -33,7 +33,7 @@ script:
 
   - if [[ "$POLYMER" = "3" ]]; then
       npm install -g yarn magi-cli &&
-      (cd .. && git clone --depth 1 -b vaadin-components git://github.com/web-padawan/polymer-modulizer.git && cd polymer-modulizer && npm link) &&
+      (cd .. && git clone --depth 1 -b polyfill-v2 git://github.com/web-padawan/polymer-modulizer.git && cd polymer-modulizer && npm link) &&
       rm -rf node_modules &&
       magi p3-convert --out . --import-style=name &&
       yarn install --flat &&

diff --git a/bower.json b/bower.json
@@ -23,7 +23,7 @@
     "wct.conf.js"
   ],
   "dependencies": {
-    "polymer": "^2.0.0",
+    "polymer": "Polymer/polymer#5f5d2c2",
     "vaadin-control-state-mixin": "vaadin/vaadin-control-state-mixin#p3-preview",
     "vaadin-themable-mixin": "vaadin/vaadin-themable-mixin#p3-preview",
     "vaadin-lumo-styles": "vaadin/vaadin-lumo-styles#p3-preview",
@@ -37,5 +37,8 @@
     "web-component-tester": "^6.1.5",
     "vaadin-demo-helpers": "vaadin/vaadin-demo-helpers#p3-preview",
     "iron-form": "^2.0.1"
+  },
+  "resolutions": {
+    "polymer": "5f5d2c2"
   }
 }