Skip to content

Commit afbe16b

Browse files
author
Guillaume Chau
committed
chore: update desp and eslint 5 beta
1 parent e34da17 commit afbe16b

15 files changed

+459
-405
lines changed

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@
4949
"cross-env": "^5.1.3",
5050
"css-loader": "^0.28.7",
5151
"cypress": "^3.0.2",
52-
"eslint": "^4.13.1",
52+
"eslint": "^5.2.0",
5353
"eslint-config-standard": "^11.0.0",
5454
"eslint-plugin-cypress": "^2.0.1",
5555
"eslint-plugin-import": "^2.13.0",
5656
"eslint-plugin-node": "^7.0.1",
5757
"eslint-plugin-promise": "^3.8.0",
5858
"eslint-plugin-standard": "^3.1.0",
59-
"eslint-plugin-vue": "^4.7.1",
59+
"eslint-plugin-vue": "next",
6060
"file-loader": "^1.1.6",
6161
"friendly-errors-webpack-plugin": "^1.6.1",
6262
"inquirer": "^5.0.0",

‎src/devtools/App.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,21 +70,21 @@
7070
</VueGroup>
7171

7272
<VueButton
73-
v-tooltip="$t('App.refresh.tooltip')"
7473
ref="refresh"
74+
v-tooltip="$t('App.refresh.tooltip')"
75+
class="refresh-button flat"
7576
:class="{
7677
'icon-button': !$responsive.wide
7778
}"
7879
icon-left="refresh"
79-
class="refresh-button flat"
8080
@click="refresh"
8181
>
8282
Refresh
8383
</VueButton>
8484
</div>
8585
</div>
8686

87-
<router-view class="container"/>
87+
<router-view class="container" />
8888
</div>
8989
</template>
9090

‎src/devtools/components/ActionHeader.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div class="action-header">
3-
<slot/>
3+
<slot />
44
</div>
55
</template>
66

‎src/devtools/components/DataField.vue

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
>
3131
<input
3232
ref="keyInput"
33-
:class="{ error: !keyValid }"
3433
v-model="editedKey"
3534
class="edit-input key-input"
35+
:class="{ error: !keyValid }"
3636
@keydown.esc.capture.stop.prevent="cancelEdit()"
3737
@keydown.enter="submitEdit()"
3838
>
@@ -52,17 +52,17 @@
5252
>
5353
<input
5454
ref="editInput"
55-
:class="{ error: !valueValid }"
5655
v-model="editedValue"
5756
class="edit-input value-input"
57+
:class="{ error: !valueValid }"
5858
list="special-tokens"
5959
@keydown.esc.capture.stop.prevent="cancelEdit()"
6060
@keydown.enter="submitEdit()"
6161
>
6262
<span class="actions">
6363
<VueIcon
64-
v-tooltip="editErrorMessage"
6564
v-if="!editValid"
65+
v-tooltip="editErrorMessage"
6666
class="small-icon warning"
6767
icon="warning"
6868
/>
@@ -83,42 +83,44 @@
8383
</span>
8484
</span>
8585
<template v-else>
86+
<!-- eslint-disable vue/no-v-html -->
8687
<span
8788
v-tooltip="valueTooltip"
8889
:class="valueClass"
8990
class="value"
9091
@dblclick="openEdit()"
9192
v-html="formattedValue"
9293
/>
94+
<!-- eslint-enable vue/no-v-html -->
9395
<span class="actions">
9496
<VueButton
95-
v-tooltip="'Edit value'"
9697
v-if="isValueEditable"
98+
v-tooltip="'Edit value'"
9799
class="edit-value icon-button flat"
98100
icon-left="edit"
99101
@click="openEdit()"
100102
/>
101103
<template v-if="quickEdits">
102104
<VueButton
103-
v-tooltip="info.title || 'Quick edit'"
104105
v-for="(info, index) of quickEdits"
105106
:key="index"
107+
v-tooltip="info.title || 'Quick edit'"
106108
:class="info.class"
107109
:icon-left="info.icon"
108110
class="quick-edit icon-button"
109111
@click="quickEdit(info, $event)"
110112
/>
111113
</template>
112114
<VueButton
113-
v-tooltip="'Add new value'"
114115
v-if="isSubfieldsEditable && !addingValue"
116+
v-tooltip="'Add new value'"
115117
class="add-value icon-button flat"
116118
icon-left="add_circle"
117119
@click="addNewValue()"
118120
/>
119121
<VueButton
120-
v-tooltip="'Remove value'"
121122
v-if="removable"
123+
v-tooltip="'Remove value'"
122124
class="remove-field icon-button flat"
123125
icon-left="delete"
124126
@click="removeField()"

‎src/devtools/components/ScrollPane.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<template>
22
<div class="scroll-pane">
33
<div class="header">
4-
<slot name="header"/>
4+
<slot name="header" />
55
</div>
66
<div
77
ref="scrollContainer"
88
class="scroll"
99
>
10-
<slot name="scroll"/>
10+
<slot name="scroll" />
1111
</div>
1212
</div>
1313
</template>

‎src/devtools/components/SplitPane.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
:style="leftStyles"
1111
class="left top"
1212
>
13-
<slot name="left"/>
13+
<slot name="left" />
1414
<div
1515
class="dragger"
1616
@mousedown.prevent="dragStart"
@@ -20,7 +20,7 @@
2020
:style="rightStyles"
2121
class="right bottom"
2222
>
23-
<slot name="right"/>
23+
<slot name="right" />
2424
</div>
2525
</div>
2626
</template>

‎src/devtools/views/components/ComponentInspector.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,28 @@
1010
<span class="title-bracket">&gt;</span>
1111
</span>
1212
<div class="search">
13-
<VueIcon icon="search"/>
13+
<VueIcon icon="search" />
1414
<input
1515
v-model.trim="filter"
1616
placeholder="Filter inspected data"
1717
>
1818
</div>
1919
<a
20-
v-tooltip="'Inspect DOM'"
2120
v-if="$isChrome"
21+
v-tooltip="'Inspect DOM'"
2222
class="button inspect"
2323
@click="inspectDOM"
2424
>
25-
<VueIcon icon="code"/>
25+
<VueIcon icon="code" />
2626
<span>Inspect DOM</span>
2727
</a>
2828
<a
29-
v-tooltip="target.file && $t('ComponentInspector.openInEditor.tooltip', { file: target.file })"
3029
v-if="target.file"
30+
v-tooltip="target.file && $t('ComponentInspector.openInEditor.tooltip', { file: target.file })"
3131
class="button"
3232
@click="openInEditor"
3333
>
34-
<VueIcon icon="launch"/>
34+
<VueIcon icon="launch" />
3535
<span>Open in editor</span>
3636
</a>
3737
</action-header>

‎src/devtools/views/components/ComponentInstance.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
<span class="angle-bracket">&gt;</span>
4545
</span>
4646
<span
47-
v-tooltip="$t('ComponentInstance.consoleId.tooltip', { id: instance.consoleId })"
4847
v-if="instance.consoleId"
48+
v-tooltip="$t('ComponentInstance.consoleId.tooltip', { id: instance.consoleId })"
4949
class="info console"
5050
>
5151
= {{ instance.consoleId }}
@@ -69,7 +69,7 @@
6969
inactive
7070
</span>
7171

72-
<span class="spacer"/>
72+
<span class="spacer" />
7373

7474
<VueIcon
7575
v-tooltip="'Scroll into view'"

‎src/devtools/views/components/ComponentTree.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
v-tooltip="$t('ComponentTree.filter.tooltip')"
66
class="search"
77
>
8-
<VueIcon icon="search"/>
8+
<VueIcon icon="search" />
99
<input
1010
ref="filterInstances"
1111
placeholder="Filter components"
@@ -18,7 +18,7 @@
1818
class="button select-component"
1919
@click="setSelecting(!selecting)"
2020
>
21-
<VueIcon :icon="selecting ? 'gps_fixed' : 'gps_not_fixed'"/>
21+
<VueIcon :icon="selecting ? 'gps_fixed' : 'gps_not_fixed'" />
2222
<span>Select</span>
2323
</a>
2424
<a
@@ -27,7 +27,7 @@
2727
class="button classify-names"
2828
@click="$shared.classifyComponents = !$shared.classifyComponents"
2929
>
30-
<VueIcon icon="text_fields"/>
30+
<VueIcon icon="text_fields" />
3131
<span>Format</span>
3232
</a>
3333
</action-header>

‎src/devtools/views/events/EventsHistory.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
v-tooltip="$t('EventsHistory.filter.tooltip')"
66
class="search"
77
>
8-
<VueIcon icon="search"/>
8+
<VueIcon icon="search" />
99
<input
1010
ref="filterEvents"
1111
v-model.trim="filter"

‎src/devtools/views/events/EventsTab.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<template>
22
<div>
33
<split-pane>
4-
<events-history slot="left"/>
5-
<event-inspector slot="right"/>
4+
<events-history slot="left" />
5+
<event-inspector slot="right" />
66
</split-pane>
77
</div>
88
</template>

‎src/devtools/views/vuex/VuexHistory.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
v-tooltip="$t('VuexHistory.filter.tooltip')"
66
class="search"
77
>
8-
<VueIcon icon="search"/>
8+
<VueIcon icon="search" />
99
<input
1010
ref="filterMutations"
11-
:class="{ invalid: filterRegexInvalid }"
1211
v-model.trim="filter"
12+
:class="{ invalid: filterRegexInvalid }"
1313
placeholder="Filter mutations"
1414
>
1515
</div>
@@ -19,7 +19,7 @@
1919
class="button commit-all"
2020
@click="commitAll"
2121
>
22-
<VueIcon icon="get_app"/>
22+
<VueIcon icon="get_app" />
2323
<span>Commit All</span>
2424
</a>
2525
<a
@@ -116,8 +116,8 @@
116116
<span>Revert</span>
117117
</a>
118118
<a
119-
v-tooltip="'Time Travel to This State'"
120119
v-if="!isActive(entry)"
120+
v-tooltip="'Time Travel to This State'"
121121
class="action"
122122
@click.stop="timeTravelTo(entry)"
123123
>

‎src/devtools/views/vuex/VuexStateInspector.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<scroll-pane>
33
<action-header slot="header">
44
<div class="search">
5-
<VueIcon icon="search"/>
5+
<VueIcon icon="search" />
66
<input
77
v-model.trim="filter"
88
placeholder="Filter inspected state"
@@ -13,7 +13,7 @@
1313
class="button export"
1414
@click="copyStateToClipboard"
1515
>
16-
<VueIcon icon="content_copy"/>
16+
<VueIcon icon="content_copy" />
1717
<span>Export</span>
1818
<transition name="slide-up">
1919
<span
@@ -29,7 +29,7 @@
2929
class="button import"
3030
@click="toggleImportStatePopup"
3131
>
32-
<VueIcon icon="content_paste"/>
32+
<VueIcon icon="content_paste" />
3333
<span>Import</span>
3434
</a>
3535
<transition name="slide-down">

‎src/devtools/views/vuex/VuexTab.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<template>
22
<div>
33
<split-pane v-if="hasVuex">
4-
<vuex-history slot="left"/>
5-
<vuex-state-inspector slot="right"/>
4+
<vuex-history slot="left" />
5+
<vuex-state-inspector slot="right" />
66
</split-pane>
77
<div
88
v-else

0 commit comments

Comments
 (0)