Skip to content

Commit edd42a9

Browse files
author
Guillaume Chau
committed
chore(eslint): enable no-var rule
1 parent 15bb71b commit edd42a9

File tree

10 files changed

+51
-47
lines changed

10 files changed

+51
-47
lines changed

.eslintrc.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ module.exports = {
1818
'vue/html-closing-bracket-newline': ['error', {
1919
'singleline': 'never',
2020
'multiline': 'always'
21-
}]
21+
}],
22+
'no-var': ['error']
2223
}
2324
}

packages/app-backend/src/clone.js

+16-16
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ export default function clone (parent, {
3232
} = {}) {
3333
// maintain two arrays for circular references, where corresponding parents
3434
// and children have the same index
35-
var allParents = []
36-
var allChildren = []
35+
let allParents = []
36+
let allChildren = []
3737

38-
var useBuffer = typeof Buffer !== 'undefined' && typeof Buffer.isBuffer === 'function'
38+
let useBuffer = typeof Buffer !== 'undefined' && typeof Buffer.isBuffer === 'function'
3939

4040
const isBuffer = typeof window !== 'undefined' ? browserIsBuffer : Buffer.isBuffer
4141

@@ -46,8 +46,8 @@ export default function clone (parent, {
4646

4747
if (depth === 0) { return parent }
4848

49-
var child
50-
var proto
49+
let child
50+
let proto
5151
if (typeof parent !== 'object') {
5252
return parent
5353
}
@@ -95,7 +95,7 @@ export default function clone (parent, {
9595
}
9696

9797
if (circular) {
98-
var index = allParents.indexOf(parent)
98+
let index = allParents.indexOf(parent)
9999

100100
if (index !== -1) {
101101
return allChildren[index]
@@ -106,20 +106,20 @@ export default function clone (parent, {
106106

107107
if (_instanceof(parent, NativeMap)) {
108108
parent.forEach(function (value, key) {
109-
var keyChild = _clone(key, depth - 1)
110-
var valueChild = _clone(value, depth - 1)
109+
let keyChild = _clone(key, depth - 1)
110+
let valueChild = _clone(value, depth - 1)
111111
child.set(keyChild, valueChild)
112112
})
113113
}
114114
if (_instanceof(parent, NativeSet)) {
115115
parent.forEach(function (value) {
116-
var entryChild = _clone(value, depth - 1)
116+
let entryChild = _clone(value, depth - 1)
117117
child.add(entryChild)
118118
})
119119
}
120120

121-
for (var i in parent) {
122-
var attrs = Object.getOwnPropertyDescriptor(parent, i)
121+
for (let i in parent) {
122+
let attrs = Object.getOwnPropertyDescriptor(parent, i)
123123
if (attrs) {
124124
if (attrs.hasOwnProperty('get') && attrs.get.name === 'computedGetter') {
125125
Object.defineProperty(child, i, attrs)
@@ -131,12 +131,12 @@ export default function clone (parent, {
131131
}
132132

133133
if (Object.getOwnPropertySymbols) {
134-
var symbols = Object.getOwnPropertySymbols(parent)
134+
let symbols = Object.getOwnPropertySymbols(parent)
135135
for (let i = 0; i < symbols.length; i++) {
136136
// Don't need to worry about cloning a symbol because it is a primitive,
137137
// like a number or string.
138-
var symbol = symbols[i]
139-
var descriptor = Object.getOwnPropertyDescriptor(parent, symbol)
138+
let symbol = symbols[i]
139+
let descriptor = Object.getOwnPropertyDescriptor(parent, symbol)
140140
if (descriptor && !descriptor.enumerable && !includeNonEnumerable) {
141141
continue
142142
}
@@ -146,7 +146,7 @@ export default function clone (parent, {
146146
}
147147

148148
if (includeNonEnumerable) {
149-
var allPropertyNames = Object.getOwnPropertyNames(parent)
149+
let allPropertyNames = Object.getOwnPropertyNames(parent)
150150
for (let i = 0; i < allPropertyNames.length; i++) {
151151
const propertyName = allPropertyNames[i]
152152
let descriptor = Object.getOwnPropertyDescriptor(parent, propertyName)
@@ -187,7 +187,7 @@ function __isRegExp (o) {
187187
clone.__isRegExp = __isRegExp
188188

189189
function __getRegExpFlags (re) {
190-
var flags = ''
190+
let flags = ''
191191
if (re.global) flags += 'g'
192192
if (re.ignoreCase) flags += 'i'
193193
if (re.multiline) flags += 'm'

packages/app-backend/src/hook.js

+17-17
Original file line numberDiff line numberDiff line change
@@ -176,12 +176,12 @@ export function installHook (target) {
176176
}
177177
// maintain two arrays for circular references, where corresponding parents
178178
// and children have the same index
179-
var allParents = []
180-
var allChildren = []
179+
let allParents = []
180+
let allChildren = []
181181

182-
var useBuffer = typeof Buffer !== 'undefined' && typeof Buffer.isBuffer === 'function'
182+
let useBuffer = typeof Buffer !== 'undefined' && typeof Buffer.isBuffer === 'function'
183183

184-
var isBuffer = typeof window !== 'undefined' ? browserIsBuffer : Buffer.isBuffer
184+
let isBuffer = typeof window !== 'undefined' ? browserIsBuffer : Buffer.isBuffer
185185

186186
if (typeof circular === 'undefined') { circular = true }
187187

@@ -194,8 +194,8 @@ export function installHook (target) {
194194

195195
if (depth === 0) { return parent }
196196

197-
var child
198-
var proto
197+
let child
198+
let proto
199199
if (typeof parent !== 'object') {
200200
return parent
201201
}
@@ -243,7 +243,7 @@ export function installHook (target) {
243243
}
244244

245245
if (circular) {
246-
var index = allParents.indexOf(parent)
246+
let index = allParents.indexOf(parent)
247247

248248
if (index !== -1) {
249249
return allChildren[index]
@@ -254,20 +254,20 @@ export function installHook (target) {
254254

255255
if (_instanceof(parent, NativeMap)) {
256256
parent.forEach(function (value, key) {
257-
var keyChild = _clone(key, depth - 1)
258-
var valueChild = _clone(value, depth - 1)
257+
let keyChild = _clone(key, depth - 1)
258+
let valueChild = _clone(value, depth - 1)
259259
child.set(keyChild, valueChild)
260260
})
261261
}
262262
if (_instanceof(parent, NativeSet)) {
263263
parent.forEach(function (value) {
264-
var entryChild = _clone(value, depth - 1)
264+
let entryChild = _clone(value, depth - 1)
265265
child.add(entryChild)
266266
})
267267
}
268268

269-
for (var i in parent) {
270-
var attrs = Object.getOwnPropertyDescriptor(parent, i)
269+
for (let i in parent) {
270+
let attrs = Object.getOwnPropertyDescriptor(parent, i)
271271
if (attrs) {
272272
if (attrs.hasOwnProperty('get') && attrs.get.name === 'computedGetter') {
273273
Object.defineProperty(child, i, attrs)
@@ -279,12 +279,12 @@ export function installHook (target) {
279279
}
280280

281281
if (Object.getOwnPropertySymbols) {
282-
var symbols = Object.getOwnPropertySymbols(parent)
282+
let symbols = Object.getOwnPropertySymbols(parent)
283283
for (let i = 0; i < symbols.length; i++) {
284284
// Don't need to worry about cloning a symbol because it is a primitive,
285285
// like a number or string.
286-
var symbol = symbols[i]
287-
var descriptor = Object.getOwnPropertyDescriptor(parent, symbol)
286+
let symbol = symbols[i]
287+
let descriptor = Object.getOwnPropertyDescriptor(parent, symbol)
288288
if (descriptor && !descriptor.enumerable && !includeNonEnumerable) {
289289
continue
290290
}
@@ -294,7 +294,7 @@ export function installHook (target) {
294294
}
295295

296296
if (includeNonEnumerable) {
297-
var allPropertyNames = Object.getOwnPropertyNames(parent)
297+
let allPropertyNames = Object.getOwnPropertyNames(parent)
298298
for (let i = 0; i < allPropertyNames.length; i++) {
299299
const propertyName = allPropertyNames[i]
300300
let descriptor = Object.getOwnPropertyDescriptor(parent, propertyName)
@@ -335,7 +335,7 @@ export function installHook (target) {
335335
clone.__isRegExp = __isRegExp
336336

337337
function __getRegExpFlags (re) {
338-
var flags = ''
338+
let flags = ''
339339
if (re.global) flags += 'g'
340340
if (re.ignoreCase) flags += 'i'
341341
if (re.multiline) flags += 'm'

packages/app-backend/src/index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,7 @@ function processVuexGetters (instance) {
849849
*/
850850

851851
function processFirebaseBindings (instance) {
852-
var refs = instance.$firebaseRefs
852+
const refs = instance.$firebaseRefs
853853
if (refs) {
854854
return Object.keys(refs).map(key => {
855855
return {
@@ -871,7 +871,7 @@ function processFirebaseBindings (instance) {
871871
*/
872872

873873
function processObservables (instance) {
874-
var obs = instance.$observables
874+
const obs = instance.$observables
875875
if (obs) {
876876
return Object.keys(obs).map(key => {
877877
return {
@@ -919,7 +919,7 @@ function bindToConsole (instance) {
919919
}
920920

921921
consoleBoundInstances.unshift(id)
922-
for (var i = 0; i < 5; i++) {
922+
for (let i = 0; i < 5; i++) {
923923
window['$vm' + i] = instanceMap.get(consoleBoundInstances[i])
924924
}
925925
window.$vm = instance

packages/app-frontend/src/components/DataField.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ export default {
351351
} else if (this.valueType.includes('native')) {
352352
return escape(specialTypeRE.exec(value)[2])
353353
} else if (typeof value === 'string') {
354-
var typeMatch = value.match(rawTypeRE)
354+
const typeMatch = value.match(rawTypeRE)
355355
if (typeMatch) {
356356
value = escape(typeMatch[1])
357357
} else {

packages/app-frontend/src/components/StateFields.vue

+4-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@ export default {
4848
required: true
4949
},
5050
51-
forceCollapse: String
51+
forceCollapse: {
52+
type: String,
53+
default: null
54+
}
5255
},
5356
5457
data () {

packages/app-frontend/src/views/routes/module.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const getters = {
3232
if (typeof state.inspectedIndex === 'string') {
3333
const path = state.inspectedIndex.split('_')
3434
let obj = state.routeChanges[parseInt(path[0])]
35-
for (var i = 1, len = path.length; i < len; ++i) {
35+
for (let i = 1, len = path.length; i < len; ++i) {
3636
obj = obj.children[parseInt(path[i])]
3737
}
3838
return obj

packages/shared-utils/src/transfer.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -82,20 +82,20 @@ export function parse (data, reviver) {
8282
if (Array.isArray(data)) {
8383
data = data.join('')
8484
}
85-
var hasCircular = /^\s/.test(data)
85+
const hasCircular = /^\s/.test(data)
8686
if (!hasCircular) {
8787
return arguments.length === 1
8888
? JSON.parse(data)
8989
: JSON.parse(data, reviver)
9090
} else {
91-
var list = JSON.parse(data)
91+
const list = JSON.parse(data)
9292
decode(list, reviver)
9393
return list[0]
9494
}
9595
}
9696

9797
export function stringifyStrict (data, replacer, space) {
98-
var list = []
98+
const list = []
9999
encode(data, replacer, list, new Map())
100100
return space
101101
? ' ' + JSON.stringify(list, null, space)

packages/shared-utils/src/util.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function cached (fn) {
1414
}
1515
}
1616

17-
var classifyRE = /(?:^|[-_/])(\w)/g
17+
const classifyRE = /(?:^|[-_/])(\w)/g
1818
export const classify = cached((str) => {
1919
return str && str.replace(classifyRE, toUpper)
2020
})
@@ -51,8 +51,8 @@ export function getComponentDisplayName (originalName, style = 'class') {
5151

5252
export function inDoc (node) {
5353
if (!node) return false
54-
var doc = node.ownerDocument.documentElement
55-
var parent = node.parentNode
54+
const doc = node.ownerDocument.documentElement
55+
const parent = node.parentNode
5656
return doc === node ||
5757
doc === parent ||
5858
!!(parent && parent.nodeType === 1 && (doc.contains(parent)))

packages/shell-chrome/src/backend.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ function handshake (e) {
2020
let listeners = []
2121
const bridge = new Bridge({
2222
listen (fn) {
23-
var listener = evt => {
23+
const listener = evt => {
2424
if (evt.data.source === 'vue-devtools-proxy' && evt.data.payload) {
2525
fn(evt.data.payload)
2626
}

0 commit comments

Comments
 (0)