Skip to content

Commit 8069dff

Browse files
kevinpschaafkevinpschaaf
committed
Clean up Polymer fn import
1 parent f126684 commit 8069dff

25 files changed

Lines changed: 171 additions & 342 deletions

‎test/smoke/behavior-mixin.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
</template>
2323
</dom-module>
2424
<script type="module">
25-
import '../../polymer-legacy.js';
26-
import { Polymer } from '../../lib/legacy/polymer-fn.js';
25+
import { Polymer } from '../../polymer-legacy.js';
2726
import { DomModule } from '../../lib/elements/dom-module.js';
2827
import { mixinBehaviors } from '../../lib/legacy/class.js';
2928
/** @polymerBehavior */

‎test/smoke/data-table.html‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@
4747
<slot></slot>
4848
</template>
4949
<script type="module">
50-
import '../../polymer-legacy.js';
51-
import { Polymer } from '../../lib/legacy/polymer-fn.js';
50+
import { Polymer } from '../../polymer-legacy.js';
5251
Polymer({
5352
is: 'data-popup'
5453
});
@@ -97,8 +96,7 @@
9796
<data-popup>{{value}}</data-popup>
9897
</template>
9998
<script type="module">
100-
import '../../polymer-legacy.js';
101-
import { Polymer } from '../../lib/legacy/polymer-fn.js';
99+
import { Polymer } from '../../polymer-legacy.js';
102100
Polymer({
103101
is: 'data-cell',
104102
properties: {
@@ -159,8 +157,7 @@
159157
</template>
160158
</template>
161159
<script type="module">
162-
import '../../polymer-legacy.js';
163-
import { Polymer } from '../../lib/legacy/polymer-fn.js';
160+
import { Polymer } from '../../polymer-legacy.js';
164161
Polymer({
165162
is: 'data-row',
166163
properties: {

‎test/smoke/passive-gestures.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@
4040
</template>
4141
</dom-module>
4242
<script type="module">
43-
import '../../polymer-legacy.js';
44-
import { Polymer } from '../../lib/legacy/polymer-fn.js';
43+
import { Polymer } from '../../polymer-legacy.js';
4544
Polymer({
4645
is: 'x-passive',
4746
listeners: {

‎test/unit/behaviors.html‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424
</dom-module>
2525

2626
<script type="module">
27-
import '../../polymer-legacy.js';
28-
import { Polymer } from '../../lib/legacy/polymer-fn.js';
27+
import { Polymer } from '../../polymer-legacy.js';
2928
window.BehaviorA = {
3029
properties: {
3130

@@ -311,8 +310,7 @@
311310
</template>
312311
</test-fixture>
313312
<script type="module">
314-
import '../../polymer-legacy.js';
315-
import { Polymer } from '../../lib/legacy/polymer-fn.js';
313+
import { Polymer } from '../../polymer-legacy.js';
316314

317315
suite('single behavior element', function() {
318316
var el;

‎test/unit/configure.html‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@
3939
<span id="content">{{content}}</span>
4040
</template>
4141
<script type="module">
42-
import '../../polymer-legacy.js';
43-
import { Polymer } from '../../lib/legacy/polymer-fn.js';
42+
import { Polymer } from '../../polymer-legacy.js';
4443
Polymer({
4544

4645
is: 'x-configure-value',
@@ -78,8 +77,7 @@
7877
<span id="content">{{content}}</span>
7978
</template>
8079
<script type="module">
81-
import '../../polymer-legacy.js';
82-
import { Polymer } from '../../lib/legacy/polymer-fn.js';
80+
import { Polymer } from '../../polymer-legacy.js';
8381
Polymer({
8482

8583
is: 'x-configure-gchild',
@@ -117,8 +115,7 @@
117115
<x-configure-gchild id="gchild" content="{{content}}" object="{{object}}"></x-configure-gchild>
118116
</template>
119117
<script type="module">
120-
import '../../polymer-legacy.js';
121-
import { Polymer } from '../../lib/legacy/polymer-fn.js';
118+
import { Polymer } from '../../polymer-legacy.js';
122119
Polymer({
123120

124121
is: 'x-configure-child',
@@ -185,8 +182,7 @@
185182

186183
<dom-module id="x-configure-simple-child">
187184
<script type="module">
188-
import '../../polymer-legacy.js';
189-
import { Polymer } from '../../lib/legacy/polymer-fn.js';
185+
import { Polymer } from '../../polymer-legacy.js';
190186
Polymer({
191187

192188
is: 'x-configure-simple-child',
@@ -218,8 +214,7 @@
218214
<x-configure-simple-child id="simple" noeffect="{{simple}}"></x-configure-simple-child>
219215
</template>
220216
<script type="module">
221-
import '../../polymer-legacy.js';
222-
import { Polymer } from '../../lib/legacy/polymer-fn.js';
217+
import { Polymer } from '../../polymer-legacy.js';
223218
Polymer({
224219

225220
is: 'x-configure-host',
@@ -324,8 +319,7 @@
324319
<x-config-lazy-nodefaults prop="[[foo]]"></x-config-lazy-nodefaults>
325320
</template>
326321
<script type="module">
327-
import '../../polymer-legacy.js';
328-
import { Polymer } from '../../lib/legacy/polymer-fn.js';
322+
import { Polymer } from '../../polymer-legacy.js';
329323
Polymer({
330324
is: 'x-config-lazy-host',
331325
properties: {
@@ -350,8 +344,7 @@
350344
<x-configure-host content="attr"></x-configure-host>
351345

352346
<script type="module">
353-
import '../../polymer-legacy.js';
354-
import { Polymer } from '../../lib/legacy/polymer-fn.js';
347+
import { Polymer } from '../../polymer-legacy.js';
355348

356349
function testValueAndChangeHandler(e, value) {
357350
assert.equal(e.content, value, 'Property does not equal configured value');

‎test/unit/custom-style-async.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333
</template>
3434
</dom-module>
3535
<script type="module">
36-
import '../../polymer-legacy.js';
37-
import { Polymer } from '../../lib/legacy/polymer-fn.js';
36+
import { Polymer } from '../../polymer-legacy.js';
3837
Polymer({
3938
is: 'x-host'
4039
});

‎test/unit/custom-style-late.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@
4242
<x-input id="input"></x-input>
4343

4444
<script type="module">
45-
import '../../polymer-legacy.js';
46-
import { Polymer } from '../../lib/legacy/polymer-fn.js';
45+
import { Polymer } from '../../polymer-legacy.js';
4746
import { afterNextRender } from '../../lib/utils/render-status.js';
4847
/* global input */
4948

‎test/unit/custom-style-scope-cache.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
cache-element
3737
</template>
3838
<script type="module">
39-
import '../../polymer-legacy.js';
40-
import { Polymer } from '../../lib/legacy/polymer-fn.js';
39+
import { Polymer } from '../../polymer-legacy.js';
4140
Polymer({
4241
is: 'cache-element'
4342
});

‎test/unit/debounce.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@
3030
</test-fixture>
3131

3232
<script type="module">
33-
import '../../polymer-legacy.js';
34-
import { Polymer } from '../../lib/legacy/polymer-fn.js';
33+
import { Polymer } from '../../polymer-legacy.js';
3534
import { Debouncer } from '../../lib/utils/debounce.js';
3635
import { microTask, timeOut, animationFrame, idlePeriod } from '../../lib/utils/async.js';
3736
Polymer({is: 'x-basic'});

‎test/unit/globals.html‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
<div class$="{{stuff.is.here}}">{{bindings(are, cool)}}</div>
3737
</template>
3838
<script type="module">
39-
import '../../polymer-legacy.js';
40-
import { Polymer } from '../../lib/legacy/polymer-fn.js';
39+
import { Polymer } from '../../polymer-legacy.js';
4140
Polymer({
4241
is: 'global-test',
4342
properties: {
@@ -64,8 +63,7 @@
6463
<global-test></global-test>
6564

6665
<script type="module">
67-
import '../../polymer-legacy.js';
68-
import { Polymer } from '../../lib/legacy/polymer-fn.js';
66+
import { Polymer } from '../../polymer-legacy.js';
6967

7068
suite('globals', function() {
7169

0 commit comments

Comments
 (0)