Clean up Polymer fn import

Polymer · Apr 20, 2018 · 8069dff · 8069dff
1 parent f126684
commit 8069dff
Show file tree

Hide file tree

Showing 25 changed files with 171 additions and 342 deletions.
diff --git a/test/smoke/behavior-mixin.html b/test/smoke/behavior-mixin.html
@@ -22,8 +22,7 @@
   </template>
 </dom-module>
 <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 import { DomModule } from '../../lib/elements/dom-module.js';
 import { mixinBehaviors } from '../../lib/legacy/class.js';
 /** @polymerBehavior */

diff --git a/test/smoke/data-table.html b/test/smoke/data-table.html
@@ -47,8 +47,7 @@
       <slot></slot>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'data-popup'
 });
@@ -97,8 +96,7 @@
       <data-popup>{{value}}</data-popup>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'data-cell',
   properties: {
@@ -159,8 +157,7 @@
       </template>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'data-row',
   properties: {

diff --git a/test/smoke/passive-gestures.html b/test/smoke/passive-gestures.html
@@ -40,8 +40,7 @@
     </template>
   </dom-module>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-passive',
   listeners: {

diff --git a/test/unit/behaviors.html b/test/unit/behaviors.html
@@ -24,8 +24,7 @@
   </dom-module>
 
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 window.BehaviorA = {
   properties: {
 
@@ -311,8 +310,7 @@
     </template>
   </test-fixture>
 <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 
 suite('single behavior element', function() {
   var el;

diff --git a/test/unit/configure.html b/test/unit/configure.html
@@ -39,8 +39,7 @@
       <span id="content">{{content}}</span>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
 
   is: 'x-configure-value',
@@ -78,8 +77,7 @@
       <span id="content">{{content}}</span>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
 
   is: 'x-configure-gchild',
@@ -117,8 +115,7 @@
       <x-configure-gchild id="gchild" content="{{content}}" object="{{object}}"></x-configure-gchild>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
 
   is: 'x-configure-child',
@@ -185,8 +182,7 @@
 
   <dom-module id="x-configure-simple-child">
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
 
   is: 'x-configure-simple-child',
@@ -218,8 +214,7 @@
       <x-configure-simple-child id="simple" noeffect="{{simple}}"></x-configure-simple-child>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
 
   is: 'x-configure-host',
@@ -324,8 +319,7 @@
       <x-config-lazy-nodefaults prop="[[foo]]"></x-config-lazy-nodefaults>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-config-lazy-host',
   properties: {
@@ -350,8 +344,7 @@
   <x-configure-host content="attr"></x-configure-host>
 
 <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 
 function testValueAndChangeHandler(e, value) {
   assert.equal(e.content, value, 'Property does not equal configured value');

diff --git a/test/unit/custom-style-async.html b/test/unit/custom-style-async.html
@@ -33,8 +33,7 @@
     </template>
   </dom-module>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-host'
 });

diff --git a/test/unit/custom-style-late.html b/test/unit/custom-style-late.html
@@ -42,8 +42,7 @@
   <x-input id="input"></x-input>
 
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 import { afterNextRender } from '../../lib/utils/render-status.js';
 /* global input */
 

diff --git a/test/unit/custom-style-scope-cache.html b/test/unit/custom-style-scope-cache.html
@@ -36,8 +36,7 @@
       cache-element
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'cache-element'
 });

diff --git a/test/unit/debounce.html b/test/unit/debounce.html
@@ -30,8 +30,7 @@
   </test-fixture>
 
 <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 import { Debouncer } from '../../lib/utils/debounce.js';
 import { microTask, timeOut, animationFrame, idlePeriod } from '../../lib/utils/async.js';
 Polymer({is: 'x-basic'});

diff --git a/test/unit/globals.html b/test/unit/globals.html
@@ -36,8 +36,7 @@
     <div class$="{{stuff.is.here}}">{{bindings(are, cool)}}</div>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'global-test',
   properties: {
@@ -64,8 +63,7 @@
 <global-test></global-test>
 
 <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 
 suite('globals', function() {
 

diff --git a/test/unit/logging.html b/test/unit/logging.html
@@ -19,8 +19,7 @@
 <body>
   <dom-module id="x-logging">
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-logging',
   properties: {

diff --git a/test/unit/mixin-behaviors.html b/test/unit/mixin-behaviors.html
@@ -377,8 +377,7 @@
     </template>
   </test-fixture>
 <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 import { mixinBehaviors } from '../../lib/legacy/class.js';
 import { PolymerElement } from '../../polymer-element.js';
 

diff --git a/test/unit/multi-style.html b/test/unit/multi-style.html
@@ -62,8 +62,7 @@
   </dom-module>
 
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 import { PolymerElement } from '../../polymer-element.js';
 import { DomModule } from '../../lib/elements/dom-module.js';
 suite('elements including multiple styles', function() {

diff --git a/test/unit/polymer-dom-observeNodes.html b/test/unit/polymer-dom-observeNodes.html
@@ -23,8 +23,7 @@
       <slot id="slot"></slot>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 import { dom } from '../../lib/legacy/polymer.dom.js';
 Polymer({
   is:'test-self-observe',
@@ -45,8 +44,7 @@
       <div>static</div>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is:'test-static'
 });
@@ -58,8 +56,7 @@
       <span id="slotContainer">[<slot id="slot"></slot>]</span>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is:'test-slot'
 });
@@ -71,8 +68,7 @@
       <test-slot id="slot"><slot></slot></test-slot>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is:'test-slot1'
 });
@@ -84,8 +80,7 @@
       <test-slot1 id="slot"><slot></slot></test-slot1>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is:'test-slot2'
 });
@@ -97,8 +92,7 @@
       <test-slot2 id="slot"><slot></slot></test-slot2>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is:'test-slot3'
 });
@@ -110,8 +104,7 @@
       <div id="slot"><slot></slot></div>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is:'test-slot-raw'
 });
@@ -123,8 +116,7 @@
       [<slot id="slot" name="d"></slot>]
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is:'test-slot-attr'
 });
@@ -136,8 +128,7 @@
       <test-slot-attr id="slot"><slot name="c" slot="d"></slot></test-slot-attr>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is:'test-slot-attr1'
 });
@@ -149,8 +140,7 @@
       <test-slot-attr1 id="slot"><slot name="b" slot="c"></slot></test-slot-attr1>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is:'test-slot-attr2'
 });
@@ -162,8 +152,7 @@
       <test-slot-attr2 id="slot"><slot name="a" slot="b"></slot></test-slot-attr2>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is:'test-slot-attr3'
 });
@@ -175,8 +164,7 @@
       <test-slot-attr3 id="slot"><slot name="a" slot="a"></slot></test-slot-attr3>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is:'test-slot-attr-inside'
 });

diff --git a/test/unit/polymer-dom.html b/test/unit/polymer-dom.html
@@ -23,8 +23,7 @@
       <div id="container"><slot id="slot"></slot></div>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-slot'
 });
@@ -36,8 +35,7 @@
       <x-slot id="container"><div id="first">first</div><slot id="slot"></slot><div id="last">last</div></x-slot>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-container-slot'
 });
@@ -49,8 +47,7 @@
       <div id="scoped"></div>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-event-scoped',
   fireComposed: function() {
@@ -65,8 +62,7 @@
       <input id="focusable"></input>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-focusable-in-shadow'
 });