Merge branch '3.x' into 3.x-linter-warnings

2025-02-25 18:55:30 -06:00 · 2018-04-30 15:07:25 -07:00
parent 268313d148 1ed2b310ec
commit 90946038af
102 changed files with 4118 additions and 1047 deletions
--- a/test/unit/array-selector.html
+++ b/test/unit/array-selector.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/async.html
+++ b/test/unit/async.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/attributes.html
+++ b/test/unit/attributes.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/behaviors.html
+++ b/test/unit/behaviors.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/case-map.html
+++ b/test/unit/case-map.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/configure.html
+++ b/test/unit/configure.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/css-parse.html
+++ b/test/unit/css-parse.html
@@ -13,7 +13,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN

  <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>

--- a/test/unit/custom-style-async-import.js
+++ b/test/unit/custom-style-async-import.js
@@ -0,0 +1,31 @@
+import { Polymer } from '../../lib/legacy/polymer-fn.js';
+
+const $_documentContainer = document.createElement('template');
+
+$_documentContainer.innerHTML = `<custom-style>
+<style is="custom-style">
+  html {
+    --cs-blue: {
+      border : 8px solid blue;
+    };
+  }
+</style>
+</custom-style>
+<dom-module id="x-client">
+<template>
+  <style>
+    :host {
+      display: inline-block;
+      border : 4px solid red;
+      @apply (--cs-blue);
+    }
+  </style>
+  x-client
+</template>
+</dom-module>`;
+
+document.body.appendChild($_documentContainer.content);
+
+Polymer({
+  is: 'x-client'
+});
--- a/test/unit/custom-style-async.html
+++ b/test/unit/custom-style-async.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
@@ -48,7 +48,7 @@ import { afterNextRender } from '../../lib/utils/render-status.js';
 suite('async global custom-style', function() {

  test('async loaded custom-style applies', function(done) {
-    host.importHref('custom-style-async-import.html', function() {
+    import('./custom-style-async-import.js').then(() => {
      afterNextRender(null, function() {
        assertComputed(host.$.client, '8px');
        done();
--- a/test/unit/custom-style-import.js
+++ b/test/unit/custom-style-import.js
@@ -9,7 +9,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 */

 import './sub/style-import.js';
-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');
 $_documentContainer.setAttribute('style', 'display: none;');

 $_documentContainer.innerHTML = `<dom-module id="shared-style">
@@ -42,4 +42,4 @@ $_documentContainer.innerHTML = `<dom-module id="shared-style">
 </style>
 </custom-style>`;

-document.head.appendChild($_documentContainer);
+document.head.appendChild($_documentContainer.content);
--- a/test/unit/custom-style-late.html
+++ b/test/unit/custom-style-late.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/custom-style-scope-cache.html
+++ b/test/unit/custom-style-scope-cache.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/custom-style.html
+++ b/test/unit/custom-style.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
@@ -27,7 +27,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
        See: https://github.com/Polymer/polymer-modulizer/issues/154
        -->
    <script type="module">
-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');

 $_documentContainer.innerHTML = `<custom-style>
  <style is="custom-style">
@@ -79,10 +79,10 @@ $_documentContainer.innerHTML = `<custom-style>
  </style>
 </custom-style>`;

-document.body.appendChild($_documentContainer);
+document.body.appendChild($_documentContainer.content);
 </script>
  <script type="module">
-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');

 $_documentContainer.innerHTML = `<custom-style>
  <style is="custom-style">
@@ -113,11 +113,11 @@ $_documentContainer.innerHTML = `<custom-style>
  </style>
 </custom-style>`;

-document.body.appendChild($_documentContainer);
+document.body.appendChild($_documentContainer.content);
 </script>

 <script type="module">
-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');

 $_documentContainer.innerHTML = `<custom-style>
  <style is="custom-style" include="shared-style2">
@@ -132,10 +132,10 @@ $_documentContainer.innerHTML = `<custom-style>
  </style>
 </custom-style>`;

-document.body.appendChild($_documentContainer);
+document.body.appendChild($_documentContainer.content);
 </script>
 <script type="module">
-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');

 $_documentContainer.innerHTML = `<custom-style>
  <style is="custom-style">
@@ -147,100 +147,100 @@ $_documentContainer.innerHTML = `<custom-style>
  </style>
 </custom-style>`;

-document.body.appendChild($_documentContainer);
+document.body.appendChild($_documentContainer.content);
 </script>
  <script type="module">
-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');
 $_documentContainer.innerHTML = `<div class="italic">italic</div>`;
-document.body.appendChild($_documentContainer);
+document.body.appendChild($_documentContainer.content);
 </script>
  <script type="module">
-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');
 $_documentContainer.innerHTML = `<div class="bag">bag</div>`;
-document.body.appendChild($_documentContainer);
+document.body.appendChild($_documentContainer.content);
 </script>
  <script type="module">
-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');
 $_documentContainer.innerHTML = `<div class="mix">mix</div>`;
-document.body.appendChild($_documentContainer);
+document.body.appendChild($_documentContainer.content);
 </script>

  <script type="module">
-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');
 $_documentContainer.innerHTML = `<div class="dynamic">dynamic</div>`;
-document.body.appendChild($_documentContainer);
+document.body.appendChild($_documentContainer.content);
 </script>

  <script type="module">
-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');
 $_documentContainer.innerHTML = `<div class="import-mixin">import-mixin</div>`;
-document.body.appendChild($_documentContainer);
+document.body.appendChild($_documentContainer.content);
 </script>
  <script type="module">
-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');
 $_documentContainer.innerHTML = `<div class="import-var">import-var</div>`;
-document.body.appendChild($_documentContainer);
+document.body.appendChild($_documentContainer.content);
 </script>

  <script type="module">
-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');
 $_documentContainer.innerHTML = `<x-bar></x-bar>`;
-document.body.appendChild($_documentContainer);
+document.body.appendChild($_documentContainer.content);
 </script>

  <script type="module">
-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');
 $_documentContainer.innerHTML = `<x-foo></x-foo>`;
-document.body.appendChild($_documentContainer);
+document.body.appendChild($_documentContainer.content);
 </script>

  <script type="module">
-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');
 $_documentContainer.innerHTML = `<x-red-text></x-red-text>`;
-document.body.appendChild($_documentContainer);
+document.body.appendChild($_documentContainer.content);
 </script>

  <script type="module">
-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');
 $_documentContainer.innerHTML = `<x-blue-bold-text></x-blue-bold-text>`;
-document.body.appendChild($_documentContainer);
+document.body.appendChild($_documentContainer.content);
 </script>

  <script type="module">
-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');
 $_documentContainer.innerHTML = `<parent-variable-with-var></parent-variable-with-var>`;
-document.body.appendChild($_documentContainer);
+document.body.appendChild($_documentContainer.content);
 </script>

  <script type="module">
-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');
 $_documentContainer.innerHTML = `<br>`;
-document.body.appendChild($_documentContainer);
+document.body.appendChild($_documentContainer.content);
 </script><script type="module">
-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');
 $_documentContainer.innerHTML = `<br>`;
-document.body.appendChild($_documentContainer);
+document.body.appendChild($_documentContainer.content);
 </script>
  <script type="module">
-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');
 $_documentContainer.innerHTML = `<div id="after"></div>`;
-document.body.appendChild($_documentContainer);
+document.body.appendChild($_documentContainer.content);
 </script>

  <script type="module">
-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');
 $_documentContainer.innerHTML = `<div class="foo"></div>`;
-document.body.appendChild($_documentContainer);
+document.body.appendChild($_documentContainer.content);
 </script>

  <script type="module">
-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');
 $_documentContainer.innerHTML = `<div class="foo--bar"></div>`;
-document.body.appendChild($_documentContainer);
+document.body.appendChild($_documentContainer.content);
 </script>

  <script type="module">
-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');

 $_documentContainer.innerHTML = `<dom-module id="x-baz">
    <template>
@@ -253,11 +253,11 @@ $_documentContainer.innerHTML = `<dom-module id="x-baz">
    </template>
  </dom-module>`;

-document.body.appendChild($_documentContainer);
+document.body.appendChild($_documentContainer.content);
 </script>

  <script type="module">
-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');

 $_documentContainer.innerHTML = `<dom-module id="x-bar">
    <template>
@@ -271,11 +271,11 @@ $_documentContainer.innerHTML = `<dom-module id="x-bar">
    </template>
  </dom-module>`;

-document.body.appendChild($_documentContainer);
+document.body.appendChild($_documentContainer.content);
 </script>

  <script type="module">
-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');

 $_documentContainer.innerHTML = `<dom-module id="x-foo">
    <template>
@@ -302,11 +302,11 @@ $_documentContainer.innerHTML = `<dom-module id="x-foo">
    </template>
  </dom-module>`;

-document.body.appendChild($_documentContainer);
+document.body.appendChild($_documentContainer.content);
 </script>

  <script type="module">
-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');

 $_documentContainer.innerHTML = `<dom-module id="x-red-text">
    <template>
@@ -319,11 +319,11 @@ $_documentContainer.innerHTML = `<dom-module id="x-red-text">
    </template>
  </dom-module>`;

-document.body.appendChild($_documentContainer);
+document.body.appendChild($_documentContainer.content);
 </script>

  <script type="module">
-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');

 $_documentContainer.innerHTML = `<dom-module id="x-blue-bold-text">
    <template>
@@ -334,11 +334,11 @@ $_documentContainer.innerHTML = `<dom-module id="x-blue-bold-text">
    </template>
  </dom-module>`;

-document.body.appendChild($_documentContainer);
+document.body.appendChild($_documentContainer.content);
 </script>

  <script type="module">
-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');

 $_documentContainer.innerHTML = `<dom-module id="parent-variable-with-var">
    <template>
@@ -359,11 +359,11 @@ $_documentContainer.innerHTML = `<dom-module id="parent-variable-with-var">
    </template>
  </dom-module>`;

-document.body.appendChild($_documentContainer);
+document.body.appendChild($_documentContainer.content);
 </script>

  <script type="module">
-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');

 $_documentContainer.innerHTML = `<dom-module id="child-variable-with-var">
    <template>
@@ -387,11 +387,11 @@ $_documentContainer.innerHTML = `<dom-module id="child-variable-with-var">
    </template>
  </dom-module>`;

-document.body.appendChild($_documentContainer);
+document.body.appendChild($_documentContainer.content);
 </script>

  <script type="module">
-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');

 $_documentContainer.innerHTML = `<dom-module id="child-of-child-with-var">
    <template>
@@ -410,7 +410,7 @@ $_documentContainer.innerHTML = `<dom-module id="child-of-child-with-var">
    </template>
  </dom-module>`;

-document.body.appendChild($_documentContainer);
+document.body.appendChild($_documentContainer.content);
 </script>

  <script type="module">
--- a/test/unit/debounce.html
+++ b/test/unit/debounce.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/dir.html
+++ b/test/unit/dir.html
@@ -10,7 +10,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 -->
 <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>
--- a/test/unit/disable-upgrade.html
+++ b/test/unit/disable-upgrade.html
@@ -10,7 +10,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 -->
 <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>
--- a/test/unit/dom-bind.html
+++ b/test/unit/dom-bind.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/dom-if.html
+++ b/test/unit/dom-if.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/dom-repeat.html
+++ b/test/unit/dom-repeat.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/dynamic-import.html
+++ b/test/unit/dynamic-import.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/events.html
+++ b/test/unit/events.html
@@ -12,7 +12,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>

--- a/test/unit/flattened-nodes-observer.html
+++ b/test/unit/flattened-nodes-observer.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/gestures.html
+++ b/test/unit/gestures.html
@@ -12,7 +12,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/globals.html
+++ b/test/unit/globals.html
@@ -13,7 +13,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
  <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">
 window.origOwnProps = Object.getOwnPropertyNames(window).reduce(function(props, prop) {
  return props[prop] = true && props;
--- a/test/unit/html-tag.html
+++ b/test/unit/html-tag.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/importHref.html
+++ b/test/unit/importHref.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/inheritance.html
+++ b/test/unit/inheritance.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/logging.html
+++ b/test/unit/logging.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/mixin-behaviors.html
+++ b/test/unit/mixin-behaviors.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/mixin-utils.html
+++ b/test/unit/mixin-utils.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/path-effects.html
+++ b/test/unit/path-effects.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/path.html
+++ b/test/unit/path.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/polymer-dom-observeNodes.html
+++ b/test/unit/polymer-dom-observeNodes.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/polymer-dom.html
+++ b/test/unit/polymer-dom.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/polymer.element.html
+++ b/test/unit/polymer.element.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/polymer.legacyelement.html
+++ b/test/unit/polymer.legacyelement.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/polymer.properties-mixin-with-property-accessors.html
+++ b/test/unit/polymer.properties-mixin-with-property-accessors.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/polymer.properties-mixin.html
+++ b/test/unit/polymer.properties-mixin.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/properties-changed.html
+++ b/test/unit/properties-changed.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/property-accessors.html
+++ b/test/unit/property-accessors.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/property-effects-template.html
+++ b/test/unit/property-effects-template.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/property-effects.html
+++ b/test/unit/property-effects.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/ready-attached-order-class.html
+++ b/test/unit/ready-attached-order-class.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/ready-attached-order.html
+++ b/test/unit/ready-attached-order.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/render-status.html
+++ b/test/unit/render-status.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/resolveurl.html
+++ b/test/unit/resolveurl.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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">
--- a/test/unit/shady-content.html
+++ b/test/unit/shady-content.html
@@ -20,7 +20,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
      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>
--- a/test/unit/shady-dynamic.html
+++ b/test/unit/shady-dynamic.html
@@ -20,7 +20,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
      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>
--- a/test/unit/shady-events.html
+++ b/test/unit/shady-events.html
@@ -19,7 +19,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
    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>
--- a/test/unit/shady-unscoped-style-import.js
+++ b/test/unit/shady-unscoped-style-import.js
@@ -8,7 +8,7 @@ Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 */

-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');
 $_documentContainer.setAttribute('style', 'display: none;');

 $_documentContainer.innerHTML = `<dom-module id="global-shared1">
@@ -33,4 +33,4 @@ $_documentContainer.innerHTML = `<dom-module id="global-shared1">
 </dom-module><dom-module id="global-shared2">
 </dom-module>`;

-document.head.appendChild($_documentContainer);
+document.head.appendChild($_documentContainer.content);
--- a/test/unit/shady-unscoped-style.html
+++ b/test/unit/shady-unscoped-style.html
@@ -10,7 +10,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 -->
 <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>
--- a/test/unit/shady.html
+++ b/test/unit/shady.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/styling-cross-scope-apply.html
+++ b/test/unit/styling-cross-scope-apply.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/styling-cross-scope-unknown-host.html
+++ b/test/unit/styling-cross-scope-unknown-host.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/styling-cross-scope-var.html
+++ b/test/unit/styling-cross-scope-var.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/styling-import-shared-styles.js
+++ b/test/unit/styling-import-shared-styles.js
@@ -8,7 +8,7 @@ Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 */

-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');
 $_documentContainer.setAttribute('style', 'display: none;');

 $_documentContainer.innerHTML = `<dom-module id="shared-styles">
@@ -28,4 +28,4 @@ $_documentContainer.innerHTML = `<dom-module id="shared-styles">
  </template>
 </dom-module>`;

-document.head.appendChild($_documentContainer);
+document.head.appendChild($_documentContainer.content);
--- a/test/unit/styling-import.html
+++ b/test/unit/styling-import.html
@@ -1,119 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
-->
-<html>
-<head>
-  <meta charset="utf-8">
-  <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.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" src="./styling-import-shared-styles.js"></script>
-</head>
-<body>
-
-  <dom-module id="x-include-module">
-    <template>
-      <style include="shared-styles"></style>
-      <div id="one"></div>
-      <div id="two"></div>
-      <div id="three"></div>
-    </template>
-    <script type="module">
-import './styling-import-shared-styles.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
-Polymer({ is: 'x-include-module'});
-</script>
-  </dom-module>
-
-  <dom-module id="x-include-import">
-    <link rel="import" type="css" href="styling-import1.css">
-    <link rel="import" type="css" href="styling-import2.css">
-    <template>
-      <style>
-        #three {
-          border: 3px solid tomato;
-        }
-      </style>
-      <div id="one"></div>
-      <div id="two"></div>
-      <div id="three"></div>
-    </template>
-    <script type="module">
-import './styling-import-shared-styles.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
-Polymer({ is: 'x-include-import'});
-</script>
-  </dom-module>
-
-  <dom-module id="x-import-order">
-    <link rel="import" type="css" href="styling-import2.css">
-    <template>
-      <style>
-        #two {
-          border: 1px solid black;
-        }
-      </style>
-      <div id="two"></div>
-    </template>
-    <script type="module">
-import './styling-import-shared-styles.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
-Polymer({is: 'x-import-order'});
-</script>
-  </dom-module>
-
-
-<script type="module">
-import './styling-import-shared-styles.js';
-import { flush } from '../../lib/utils/flush.js';
-suite('style-imports', function() {
-
-function assertComputed(element, value) {
-  var computed = getComputedStyle(element);
-  assert.equal(computed['border-top-width'], value, 'computed style incorrect');
-}
-
-test('styles included via link rel="import" type="css"', function() {
-  var el = document.createElement('x-include-import');
-  document.body.appendChild(el);
-  flush();
-  assertComputed(el.$.one, '1px');
-  assertComputed(el.$.two, '2px');
-  assertComputed(el.$.three, '3px');
-  assertComputed(el, '0px', 'style outside template not ignored');
-  document.body.removeChild(el);
-
-});
-
-test('styles included via include that loads via link rel="import" type="css"', function() {
-  var el = document.createElement('x-include-module');
-  document.body.appendChild(el);
-  flush();
-  assertComputed(el.$.one, '1px');
-  assertComputed(el.$.two, '2px');
-  assertComputed(el.$.three, '3px');
-  assertComputed(el, '0px', 'style outside template not ignored');
-  document.body.removeChild(el);
-
-});
-
-test('styles included via link rel="import" type="css" are overridden by styles in template', function() {
-  var el = document.createElement('x-import-order');
-  document.body.appendChild(el);
-  flush();
-  assertComputed(el.$.two, '1px');
-  document.body.removeChild(el);
-});
-
-});
-</script>
-</body>
-</html>
--- a/test/unit/styling-import1.css
+++ b/test/unit/styling-import1.css
@@ -1,12 +0,0 @@
-/*
-@license
-Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
-*/
-#one {
-  border: 1px solid orange;
-}
--- a/test/unit/styling-import2.css
+++ b/test/unit/styling-import2.css
@@ -1,13 +0,0 @@
-/*
-@license
-Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
-*/
-#two {
-  display: block;
-  border: 2px solid brown;
-}
--- a/test/unit/styling-only-with-template.html
+++ b/test/unit/styling-only-with-template.html
@@ -12,7 +12,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN

 <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>
--- a/test/unit/styling-scoped.html
+++ b/test/unit/styling-scoped.html
@@ -11,19 +11,18 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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 @@ import { Polymer } from '../../polymer-legacy.js';
 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 @@ import { Polymer } from '../../polymer-legacy.js';
 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 @@ import { Polymer } from '../../polymer-legacy.js';
 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>
@@ -694,19 +687,6 @@ customElements.define(XInterleaved.is, XInterleaved);
 </script>
  </dom-module>

-  <dom-module id="x-only-link-style">
-    <link rel="import" type="css" href="styling-import-host.css">
-    <link rel="import" type="css" href="styling-import-host2.css">
-    <template></template>
-    <script type="module">
-import { PolymerElement } from '../../polymer-element.js';
-class XOnlyLink extends PolymerElement {
-  static get is() { return 'x-only-link-style'; }
-}
-customElements.define(XOnlyLink.is, XOnlyLink);
-</script>
-  </dom-module>
-
  <dom-module id="double-shared-style">
    <template>
      <style>
@@ -1013,12 +993,6 @@ suite('scoped-styling', function() {
    assertComputed(e, '5px', 'padding-top');
  });

-  test('elements without styles work', function() {
-    var e = document.createElement('x-only-link-style');
-    document.body.appendChild(e);
-    assertComputed(e, '2px');
-  });
-
 });

 suite('double including style sheets', function() {
--- a/test/unit/sub/resolveurl-elements.js
+++ b/test/unit/sub/resolveurl-elements.js
@@ -14,11 +14,11 @@ import { DomModule } from '../../../lib/elements/dom-module.js';
 import { Polymer } from '../../../lib/legacy/polymer-fn.js';
 import { pathFromUrl } from '../../../lib/utils/resolve-url.js';

-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');
 $_documentContainer.setAttribute('style', 'display: none;');
 const baseAssetPath = pathFromUrl(import.meta.url);
 $_documentContainer.innerHTML = `<dom-module id="p-r-ap" assetpath="${baseAssetPath}../../assets/"></dom-module>`;
-document.head.appendChild($_documentContainer);
+document.head.appendChild($_documentContainer.content);

 class PR extends PolymerElement {
  static get template() {
--- a/test/unit/sub/style-import.js
+++ b/test/unit/sub/style-import.js
@@ -1,6 +1,6 @@
 import { pathFromUrl } from '../../../lib/utils/resolve-url.js';

-const $_documentContainer = document.createElement('div');
+const $_documentContainer = document.createElement('template');
 $_documentContainer.setAttribute('style', 'display: none;');
 const baseAssetPath = pathFromUrl(import.meta.url);
 $_documentContainer.innerHTML = `<dom-module id="style-import" assetpath="${baseAssetPath}">
@@ -23,4 +23,4 @@ $_documentContainer.innerHTML = `<dom-module id="style-import" assetpath="${base
  </template>
 </dom-module>`;

-document.head.appendChild($_documentContainer);
+document.head.appendChild($_documentContainer.content);
--- a/test/unit/template-stamp.html
+++ b/test/unit/template-stamp.html
@@ -12,7 +12,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>

--- a/test/unit/template-whitespace.html
+++ b/test/unit/template-whitespace.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>
--- a/test/unit/templatize.html
+++ b/test/unit/templatize.html
@@ -11,7 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <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>