From a4d80d0929d4ed3afb23ea5da1d95924667b83c8 Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Thu, 26 Apr 2018 15:43:17 -0700
Subject: [PATCH] Update to webcomponents 2.0.0 and webcomponents-bundle.js

---
 package.json                                  |  8 +--
 test/unit/array-selector.html                 |  2 +-
 test/unit/async.html                          |  2 +-
 test/unit/attributes.html                     |  2 +-
 test/unit/behaviors.html                      |  2 +-
 test/unit/case-map.html                       |  2 +-
 test/unit/configure.html                      |  2 +-
 test/unit/css-parse.html                      |  2 +-
 test/unit/custom-style-async.html             |  2 +-
 test/unit/custom-style-late.html              |  2 +-
 test/unit/custom-style-scope-cache.html       |  2 +-
 test/unit/custom-style.html                   |  2 +-
 test/unit/debounce.html                       |  2 +-
 test/unit/dir.html                            |  2 +-
 test/unit/disable-upgrade.html                |  2 +-
 test/unit/dom-bind.html                       |  2 +-
 test/unit/dom-if.html                         |  2 +-
 test/unit/dom-repeat.html                     |  2 +-
 test/unit/dynamic-import.html                 |  2 +-
 test/unit/events.html                         |  2 +-
 test/unit/flattened-nodes-observer.html       |  2 +-
 test/unit/gestures.html                       |  2 +-
 test/unit/globals.html                        |  2 +-
 test/unit/html-tag.html                       |  2 +-
 test/unit/importHref.html                     |  2 +-
 test/unit/inheritance.html                    |  2 +-
 test/unit/logging.html                        |  2 +-
 test/unit/mixin-behaviors.html                |  2 +-
 test/unit/mixin-utils.html                    |  2 +-
 test/unit/path-effects.html                   |  2 +-
 test/unit/path.html                           |  2 +-
 test/unit/polymer-dom-observeNodes.html       |  2 +-
 test/unit/polymer-dom.html                    |  2 +-
 test/unit/polymer.element.html                |  2 +-
 test/unit/polymer.legacyelement.html          |  2 +-
 ...perties-mixin-with-property-accessors.html |  2 +-
 test/unit/polymer.properties-mixin.html       |  2 +-
 test/unit/properties-changed.html             |  2 +-
 test/unit/property-accessors.html             |  2 +-
 test/unit/property-effects-template.html      |  2 +-
 test/unit/property-effects.html               |  2 +-
 test/unit/ready-attached-order-class.html     |  2 +-
 test/unit/ready-attached-order.html           |  2 +-
 test/unit/render-status.html                  |  2 +-
 test/unit/resolveurl.html                     |  2 +-
 test/unit/shady-content.html                  |  2 +-
 test/unit/shady-dynamic.html                  |  2 +-
 test/unit/shady-events.html                   |  2 +-
 test/unit/shady-unscoped-style.html           |  2 +-
 test/unit/shady.html                          |  2 +-
 test/unit/styling-cross-scope-apply.html      |  2 +-
 .../styling-cross-scope-unknown-host.html     |  2 +-
 test/unit/styling-cross-scope-var.html        |  2 +-
 test/unit/styling-import.html                 |  2 +-
 test/unit/styling-only-with-template.html     |  2 +-
 test/unit/styling-scoped.html                 | 65 +++++++++----------
 test/unit/template-stamp.html                 |  2 +-
 test/unit/template-whitespace.html            |  2 +-
 test/unit/templatize.html                     |  2 +-
 59 files changed, 90 insertions(+), 97 deletions(-)

diff --git a/package.json b/package.json
index 42feff32ad..9f9c6967f2 100644
--- a/package.json
+++ b/package.json
@@ -12,8 +12,8 @@
     "@polymer/gen-typescript-declarations": "^1.2.0",
     "@polymer/iron-component-page": "3.0.0-pre.12",
     "@polymer/test-fixture": "3.0.0-pre.12",
-    "@webcomponents/shadycss": "^1.1.0",
-    "@webcomponents/webcomponentsjs": "^1.1.0",
+    "@webcomponents/shadycss": "^1.2.0-0",
+    "@webcomponents/webcomponentsjs": "^2.0.0-0",
     "babel-preset-minify": "^0.2.0",
     "del": "^3.0.0",
     "dom5": "^3.0.0",
@@ -63,7 +63,7 @@
     "type-detect": "1.0.0"
   },
   "dependencies": {
-    "@webcomponents/shadycss": "^1.0.0",
-    "@webcomponents/webcomponentsjs": "^1.0.0"
+    "@webcomponents/shadycss": "^1.2.0-0",
+    "@webcomponents/webcomponentsjs": "^2.0.0-0"
   }
 }
diff --git a/test/unit/array-selector.html b/test/unit/array-selector.html
index a0386832fc..21c2de0ab4 100644
--- a/test/unit/array-selector.html
+++ b/test/unit/array-selector.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/async.html b/test/unit/async.html
index 56c94e4718..0cfec019b1 100644
--- a/test/unit/async.html
+++ b/test/unit/async.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../lib/utils/async.js"></script>
diff --git a/test/unit/attributes.html b/test/unit/attributes.html
index 9fb934224a..4630509d02 100644
--- a/test/unit/attributes.html
+++ b/test/unit/attributes.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/behaviors.html b/test/unit/behaviors.html
index 58cb052ec2..a96f4f067c 100644
--- a/test/unit/behaviors.html
+++ b/test/unit/behaviors.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/case-map.html b/test/unit/case-map.html
index 31cb4a28ec..46f02ba8ff 100644
--- a/test/unit/case-map.html
+++ b/test/unit/case-map.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../lib/utils/case-map.js"></script>
diff --git a/test/unit/configure.html b/test/unit/configure.html
index f4c1962dbb..ba33c9cb0c 100644
--- a/test/unit/configure.html
+++ b/test/unit/configure.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/css-parse.html b/test/unit/css-parse.html
index e383892135..d276d9fb4a 100644
--- a/test/unit/css-parse.html
+++ b/test/unit/css-parse.html
@@ -13,7 +13,7 @@
 
   <meta charset="utf-8">
 
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
 
diff --git a/test/unit/custom-style-async.html b/test/unit/custom-style-async.html
index 5fa9b0a2d4..41af8f62d5 100644
--- a/test/unit/custom-style-async.html
+++ b/test/unit/custom-style-async.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/custom-style-late.html b/test/unit/custom-style-late.html
index da059c5be1..53b5513792 100644
--- a/test/unit/custom-style-late.html
+++ b/test/unit/custom-style-late.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/custom-style-scope-cache.html b/test/unit/custom-style-scope-cache.html
index b76cbb3240..2107207f10 100644
--- a/test/unit/custom-style-scope-cache.html
+++ b/test/unit/custom-style-scope-cache.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/custom-style.html b/test/unit/custom-style.html
index 8a5dce4ad1..c77bab220b 100644
--- a/test/unit/custom-style.html
+++ b/test/unit/custom-style.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/debounce.html b/test/unit/debounce.html
index 1644fc4774..ece33b94a4 100644
--- a/test/unit/debounce.html
+++ b/test/unit/debounce.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/dir.html b/test/unit/dir.html
index 4ce47aa541..4d65101e15 100644
--- a/test/unit/dir.html
+++ b/test/unit/dir.html
@@ -10,7 +10,7 @@
 -->
 <html dir="rtl">
 <head>
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/disable-upgrade.html b/test/unit/disable-upgrade.html
index 4f30669333..14dae2b60d 100644
--- a/test/unit/disable-upgrade.html
+++ b/test/unit/disable-upgrade.html
@@ -10,7 +10,7 @@
 -->
 <html dir="rtl">
 <head>
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/dom-bind.html b/test/unit/dom-bind.html
index 5514a60db5..43b6132508 100644
--- a/test/unit/dom-bind.html
+++ b/test/unit/dom-bind.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
 </head>
diff --git a/test/unit/dom-if.html b/test/unit/dom-if.html
index 38096e2cde..bdb1935b2b 100644
--- a/test/unit/dom-if.html
+++ b/test/unit/dom-if.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/dom-repeat.html b/test/unit/dom-repeat.html
index 4199665ed2..1a8d10f9dd 100644
--- a/test/unit/dom-repeat.html
+++ b/test/unit/dom-repeat.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/dynamic-import.html b/test/unit/dynamic-import.html
index 6cff86be14..588c2f5f8c 100644
--- a/test/unit/dynamic-import.html
+++ b/test/unit/dynamic-import.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="./dynamic-imports/dynamic-element.js"></script>
diff --git a/test/unit/events.html b/test/unit/events.html
index 933cdd14a1..d9bd9f4fda 100644
--- a/test/unit/events.html
+++ b/test/unit/events.html
@@ -12,7 +12,7 @@
 <head>
   <meta charset="UTF-8">
 
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
 
diff --git a/test/unit/flattened-nodes-observer.html b/test/unit/flattened-nodes-observer.html
index 6459170d6c..8d111e8a5e 100644
--- a/test/unit/flattened-nodes-observer.html
+++ b/test/unit/flattened-nodes-observer.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-element.js"></script>
diff --git a/test/unit/gestures.html b/test/unit/gestures.html
index 06dd208451..84f35507ea 100644
--- a/test/unit/gestures.html
+++ b/test/unit/gestures.html
@@ -12,7 +12,7 @@
 <head>
   <meta charset="utf-8">
 
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/globals.html b/test/unit/globals.html
index c40be6f442..f2d2b8ccc9 100644
--- a/test/unit/globals.html
+++ b/test/unit/globals.html
@@ -13,7 +13,7 @@
   <meta charset="utf-8">
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script type="module">
 /* global origOwnProps:true */
 window.origOwnProps = Object.getOwnPropertyNames(window).reduce(function(props, prop) {
diff --git a/test/unit/html-tag.html b/test/unit/html-tag.html
index e11c011b56..b55d9813ba 100644
--- a/test/unit/html-tag.html
+++ b/test/unit/html-tag.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/importHref.html b/test/unit/importHref.html
index 752e7c03a4..746db8687d 100644
--- a/test/unit/importHref.html
+++ b/test/unit/importHref.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../lib/utils/import-href.js"></script>
diff --git a/test/unit/inheritance.html b/test/unit/inheritance.html
index 46e45c773f..346498a935 100644
--- a/test/unit/inheritance.html
+++ b/test/unit/inheritance.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/logging.html b/test/unit/logging.html
index 84c486f0e3..a6102b9426 100644
--- a/test/unit/logging.html
+++ b/test/unit/logging.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/mixin-behaviors.html b/test/unit/mixin-behaviors.html
index f8451d1182..7c16962b20 100644
--- a/test/unit/mixin-behaviors.html
+++ b/test/unit/mixin-behaviors.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/mixin-utils.html b/test/unit/mixin-utils.html
index efaabe8c91..92aab93cc1 100644
--- a/test/unit/mixin-utils.html
+++ b/test/unit/mixin-utils.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/path-effects.html b/test/unit/path-effects.html
index d98d0c0d32..b597469d72 100644
--- a/test/unit/path-effects.html
+++ b/test/unit/path-effects.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/path.html b/test/unit/path.html
index 65467ff1b9..a008a4e08a 100644
--- a/test/unit/path.html
+++ b/test/unit/path.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../lib/utils/path.js"></script>
diff --git a/test/unit/polymer-dom-observeNodes.html b/test/unit/polymer-dom-observeNodes.html
index 605fe99a52..3c33026c8a 100644
--- a/test/unit/polymer-dom-observeNodes.html
+++ b/test/unit/polymer-dom-observeNodes.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/polymer-dom.html b/test/unit/polymer-dom.html
index 7279064d85..8bea7e1c1f 100644
--- a/test/unit/polymer-dom.html
+++ b/test/unit/polymer-dom.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/polymer.element.html b/test/unit/polymer.element.html
index e68557746c..357cd270b4 100644
--- a/test/unit/polymer.element.html
+++ b/test/unit/polymer.element.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-element.js"></script>
diff --git a/test/unit/polymer.legacyelement.html b/test/unit/polymer.legacyelement.html
index df34251824..eebd4c4295 100644
--- a/test/unit/polymer.legacyelement.html
+++ b/test/unit/polymer.legacyelement.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/polymer.properties-mixin-with-property-accessors.html b/test/unit/polymer.properties-mixin-with-property-accessors.html
index c44eaeacf4..0a7514f476 100644
--- a/test/unit/polymer.properties-mixin-with-property-accessors.html
+++ b/test/unit/polymer.properties-mixin-with-property-accessors.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../lib/mixins/properties-mixin.js"></script>
diff --git a/test/unit/polymer.properties-mixin.html b/test/unit/polymer.properties-mixin.html
index 27d7f760e4..3943c01660 100644
--- a/test/unit/polymer.properties-mixin.html
+++ b/test/unit/polymer.properties-mixin.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../lib/mixins/properties-mixin.js"></script>
diff --git a/test/unit/properties-changed.html b/test/unit/properties-changed.html
index fb3c4d39e9..4d3329c242 100644
--- a/test/unit/properties-changed.html
+++ b/test/unit/properties-changed.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/property-accessors.html b/test/unit/property-accessors.html
index a034655d1a..b50510b5fb 100644
--- a/test/unit/property-accessors.html
+++ b/test/unit/property-accessors.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/property-effects-template.html b/test/unit/property-effects-template.html
index 10a542e1c8..2f761f672a 100644
--- a/test/unit/property-effects-template.html
+++ b/test/unit/property-effects-template.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
diff --git a/test/unit/property-effects.html b/test/unit/property-effects.html
index d310427659..ca6ff7daef 100644
--- a/test/unit/property-effects.html
+++ b/test/unit/property-effects.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/ready-attached-order-class.html b/test/unit/ready-attached-order-class.html
index 6064108cab..18427fb38e 100644
--- a/test/unit/ready-attached-order-class.html
+++ b/test/unit/ready-attached-order-class.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/ready-attached-order.html b/test/unit/ready-attached-order.html
index ca6db06d60..f02e8fc4e3 100644
--- a/test/unit/ready-attached-order.html
+++ b/test/unit/ready-attached-order.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/render-status.html b/test/unit/render-status.html
index 6011079647..3f43129395 100644
--- a/test/unit/render-status.html
+++ b/test/unit/render-status.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/resolveurl.html b/test/unit/resolveurl.html
index e1349cc369..7a3106beca 100644
--- a/test/unit/resolveurl.html
+++ b/test/unit/resolveurl.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="UTF-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module">
diff --git a/test/unit/shady-content.html b/test/unit/shady-content.html
index 4c51a6edcc..d5a0e362ef 100644
--- a/test/unit/shady-content.html
+++ b/test/unit/shady-content.html
@@ -20,7 +20,7 @@
       force: true
     };
   </script>
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/shady-dynamic.html b/test/unit/shady-dynamic.html
index 095bcfe023..9e70c6e7d0 100644
--- a/test/unit/shady-dynamic.html
+++ b/test/unit/shady-dynamic.html
@@ -20,7 +20,7 @@
       force: true
     };
   </script>
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/shady-events.html b/test/unit/shady-events.html
index 2d5fd49caa..2f47d4e156 100644
--- a/test/unit/shady-events.html
+++ b/test/unit/shady-events.html
@@ -19,7 +19,7 @@
     force: true
   };
 </script>
-<script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+<script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
 <script src="wct-browser-config.js"></script>
 <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
 <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/shady-unscoped-style.html b/test/unit/shady-unscoped-style.html
index 708d78706f..7f84896edc 100644
--- a/test/unit/shady-unscoped-style.html
+++ b/test/unit/shady-unscoped-style.html
@@ -10,7 +10,7 @@
 -->
 <html>
 <head>
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/shady.html b/test/unit/shady.html
index 6c05f8bc62..7dfba7bb5e 100644
--- a/test/unit/shady.html
+++ b/test/unit/shady.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js" register="true" shadydom="true"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js" register="true" shadydom="true"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/styling-cross-scope-apply.html b/test/unit/styling-cross-scope-apply.html
index 9107484459..3f3c9fc240 100644
--- a/test/unit/styling-cross-scope-apply.html
+++ b/test/unit/styling-cross-scope-apply.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/styling-cross-scope-unknown-host.html b/test/unit/styling-cross-scope-unknown-host.html
index 91ac08a932..6583b84646 100644
--- a/test/unit/styling-cross-scope-unknown-host.html
+++ b/test/unit/styling-cross-scope-unknown-host.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/styling-cross-scope-var.html b/test/unit/styling-cross-scope-var.html
index 5f923abd2a..41ec306765 100644
--- a/test/unit/styling-cross-scope-var.html
+++ b/test/unit/styling-cross-scope-var.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/styling-import.html b/test/unit/styling-import.html
index 2dbf93f819..e02f61d789 100644
--- a/test/unit/styling-import.html
+++ b/test/unit/styling-import.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/styling-only-with-template.html b/test/unit/styling-only-with-template.html
index 4a26e5a138..f1cc2d1a90 100644
--- a/test/unit/styling-only-with-template.html
+++ b/test/unit/styling-only-with-template.html
@@ -12,7 +12,7 @@
 
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/styling-scoped.html b/test/unit/styling-scoped.html
index 82eb875e94..8282a1ea9e 100644
--- a/test/unit/styling-scoped.html
+++ b/test/unit/styling-scoped.html
@@ -11,19 +11,18 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
-  <script type="module">
-let define = window.customElements.define;
-let order = [];
-window.customElements.define = function(name, fn, options) {
-  order.push(name);
-  return define.call(window.customElements, name, fn, options);
-};
-customElements.defineOrder = order;
-</script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
-  <script type="module" src="../../polymer-legacy.js"></script>
+  <script type="module">
+    let define = window.customElements.define;
+    let order = [];
+    window.customElements.define = function(name, fn, options) {
+      order.push(name);
+      return define.call(window.customElements, name, fn, options);
+    };
+    customElements.defineOrder = order;
+  </script>
   <style>
     #priority[style-scope=x-styled], #priority.style-scope.x-styled {
       border: 1px solid black;
@@ -312,15 +311,13 @@
 var doc = window.document;
 var dynamic = doc.querySelector('template#dynamic');
 
-HTMLImports.whenReady(function() {
-  Polymer({
-    is: 'x-dynamic-scope',
-    ready: function() {
-      // simulate 3rd party action by using normal dom to add to element.
-      var dom = document.importNode(dynamic.content, true);
-      this.$.container.appendChild(dom);
-    }
-  });
+Polymer({
+  is: 'x-dynamic-scope',
+  ready: function() {
+    // simulate 3rd party action by using normal dom to add to element.
+    var dom = document.importNode(dynamic.content, true);
+    this.$.container.appendChild(dom);
+  }
 });
 </script>
 
@@ -338,13 +335,11 @@
 var doc = window.document;
 var template = doc.querySelector('template#dynamic-style-template');
 
-HTMLImports.whenReady(function() {
-  Polymer({
-    is: 'x-dynamic-template',
-    registered: function() {
-      this._template = template;
-    }
-  });
+Polymer({
+  is: 'x-dynamic-template',
+  registered: function() {
+    this._template = template;
+  }
 });
 </script>
 
@@ -373,15 +368,13 @@
 var doc = window.document;
 var template = doc.querySelector('template#svg');
 
-HTMLImports.whenReady(function() {
-  Polymer({
-    is: 'x-dynamic-svg',
-    ready: function() {
-      this.scopeSubtree(this.$.container, true);
-      var dom = document.importNode(template.content, true);
-      this.$.container.appendChild(dom);
-    }
-  });
+Polymer({
+  is: 'x-dynamic-svg',
+  ready: function() {
+    this.scopeSubtree(this.$.container, true);
+    var dom = document.importNode(template.content, true);
+    this.$.container.appendChild(dom);
+  }
 });
 </script>
 </dom-module>
diff --git a/test/unit/template-stamp.html b/test/unit/template-stamp.html
index 261bd4f0ae..6337a156a3 100644
--- a/test/unit/template-stamp.html
+++ b/test/unit/template-stamp.html
@@ -12,7 +12,7 @@
 <head>
   <meta charset="UTF-8">
 
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
 
diff --git a/test/unit/template-whitespace.html b/test/unit/template-whitespace.html
index 29d92905d2..b080748459 100644
--- a/test/unit/template-whitespace.html
+++ b/test/unit/template-whitespace.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>
diff --git a/test/unit/templatize.html b/test/unit/templatize.html
index b4f8ef9846..487f87038e 100644
--- a/test/unit/templatize.html
+++ b/test/unit/templatize.html
@@ -11,7 +11,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
   <script type="module" src="../../polymer-legacy.js"></script>