🔀 Merge branch 'greenkeeper/@webcomponents/webcomponentsjs-2.0.0' int…

…o develop

package.json

@@ -20,7 +20,7 @@
     "@polymer/paper-spinner": "^3.0.0-pre.1",
     "@polymer/paper-toast": "^3.0.0-pre.1",
     "@polymer/polymer": "^3.0.0-pre.1",
-    "@webcomponents/webcomponentsjs": "^1.0.22",
+    "@webcomponents/webcomponentsjs": "^2.0.0",
     "dom-flip": "^0.4.0",
     "firebase": "^5.0.2",
     "fit-html": "^0.7.0",
@@ -32,8 +32,7 @@
     "redux": "^4.0.0",
     "redux-devtools-extension": "^2.13.2",
     "redux-saga": "^0.16.0",
-    "reselect": "^3.0.1",
-    "webcomponents-loader-no-hi": "^0.1.0"
+    "reselect": "^3.0.1"
   },
   "devDependencies": {
     "@mraerino/rollup-plugin-minifyliterals": "^1.2.0",

rollup.config.js

@@ -58,7 +58,6 @@ export default {
         }),
         typescript(),
         copy({
-            'node_modules/webcomponents-loader-no-hi': dist('node_modules/webcomponents-loader-no-hi'),
             'node_modules/@webcomponents/webcomponentsjs': dist('node_modules/@webcomponents/webcomponentsjs'),
             'assets': dist(''),
             [src('index.html')]: dist('index.html'),

src/index.html

@@ -63,20 +63,18 @@ <h1><span class="flash">⚡️</span> Oh, no! Unsupported Browser!</h1>
     <script>
         try {
             eval('"use strict"; class ES6CompatTestClass {}; const test = () => {}; function* iterator() { yield 1; }');
-
-            window.addEventListener('WebComponentsReady', function() {
-                const s = document.createElement('script');
-                s.src = '/index.js';
-                s.async = true;
-                s.defer = true;
-                document.body.appendChild(s);
-            });
         } catch (e) {
             console.error("Your browser doesn't support ES6 classes, ES6 generators or arrow functions (or all of them). Please upgrade to a modern one.");
+
             document.getElementsByClassName('no-es6').item(0).style.display = 'block';
+            document.getElementById('entry').remove();
+            document.getElementById('loader').remove();
         }
     </script>
-    <script src="/node_modules/webcomponents-loader-no-hi/webcomponents-loader.js"></script>
+
+    <script id="loader" src="/node_modules/@webcomponents/webcomponentsjs/webcomponents-loader.js"></script>
+    <script id="entry" src="/index.js"></script>
+
     <script>
         (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
                 (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),

yarn.lock

@@ -429,9 +429,9 @@
   version "1.2.0-0"
   resolved "https://registry.yarnpkg.com/@webcomponents/shadycss/-/shadycss-1.2.0-0.tgz#3c1dd63c934de6bb253abb6d13e658e5f08e3371"
 
-"@webcomponents/webcomponentsjs@^1.0.22":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@webcomponents/webcomponentsjs/-/webcomponentsjs-1.2.0.tgz#c9e129340c3e4637f5fa6505e968e85face7bd5b"
+"@webcomponents/webcomponentsjs@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.0.0.tgz#166e7489b9ce66f5c082a3360120cb27505f762f"
 
 abbrev@1:
   version "1.1.1"
@@ -4165,10 +4165,6 @@ warning@^3.0.0:
   dependencies:
     loose-envify "^1.0.0"
 
-webcomponents-loader-no-hi@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/webcomponents-loader-no-hi/-/webcomponents-loader-no-hi-0.1.0.tgz#a0092f07a89596420075fffd5643730c7d9451e9"
-
 websocket-driver@>=0.5.1:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"