Skip to content

Commit 5489339

Browse files
slichlyter12yyx990803
slichlyter12
authored and
yyx990803
committed
refactor(core): Replace "var" (vuejs#8299)
Replaces instances of "var" with "let" and "const" where applicable using the eslint 'no-var' and 'prefer-const' rules
1 parent 5cfdf1a commit 5489339

30 files changed

+82
-82
lines changed

‎scripts/build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function buildEntry (config) {
4848
.then(bundle => bundle.generate(output))
4949
.then(({ code }) => {
5050
if (isProd) {
51-
var minified = (banner ? banner + '\n' : '') + terser.minify(code, {
51+
const minified = (banner ? banner + '\n' : '') + terser.minify(code, {
5252
output: {
5353
ascii_only: true
5454
},

‎scripts/get-weex-version.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
var coreVersion = require('../package.json').version
2-
var weexVersion = require('../packages/weex-vue-framework/package.json').version
3-
var weexBaseVersion = weexVersion.match(/^[\d.]+/)[0]
4-
var weexSubVersion = Number(weexVersion.match(/-weex\.(\d+)$/)[1])
1+
const coreVersion = require('../package.json').version
2+
const weexVersion = require('../packages/weex-vue-framework/package.json').version
3+
let weexBaseVersion = weexVersion.match(/^[\d.]+/)[0]
4+
let weexSubVersion = Number(weexVersion.match(/-weex\.(\d+)$/)[1])
55

66
if (weexBaseVersion === coreVersion) {
77
// same core version, increment sub version

‎src/platforms/web/runtime/components/transition-group.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ export default {
111111

112112
children.forEach((c: VNode) => {
113113
if (c.data.moved) {
114-
var el: any = c.elm
115-
var s: any = el.style
114+
const el: any = c.elm
115+
const s: any = el.style
116116
addTransitionClass(el, moveClass)
117117
s.transform = s.WebkitTransform = s.transitionDuration = ''
118118
el.addEventListener(transitionEndEvent, el._moveCb = function cb (e) {

‎src/platforms/web/util/style.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export const parseStyleText = cached(function (cssText) {
88
const propertyDelimiter = /:(.+)/
99
cssText.split(listDelimiter).forEach(function (item) {
1010
if (item) {
11-
var tmp = item.split(propertyDelimiter)
11+
const tmp = item.split(propertyDelimiter)
1212
tmp.length > 1 && (res[tmp[0].trim()] = tmp[1].trim())
1313
}
1414
})

‎src/platforms/weex/runtime/modules/style.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ function updateStyle (oldVnode: VNodeWithData, vnode: VNodeWithData) {
7070

7171
function toObject (arr) {
7272
const res = {}
73-
for (var i = 0; i < arr.length; i++) {
73+
for (let i = 0; i < arr.length; i++) {
7474
if (arr[i]) {
7575
extend(res, arr[i])
7676
}

‎test/e2e/runner.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
var path = require('path')
2-
var spawn = require('cross-spawn')
3-
var httpServer = require('http-server')
4-
var server = httpServer.createServer({
1+
const path = require('path')
2+
const spawn = require('cross-spawn')
3+
const httpServer = require('http-server')
4+
const server = httpServer.createServer({
55
root: path.resolve(__dirname, '../../')
66
})
77

88
server.listen(8080)
99

10-
var args = process.argv.slice(2)
10+
let args = process.argv.slice(2)
1111
if (args.indexOf('--config') === -1) {
1212
args = args.concat(['--config', 'test/e2e/nightwatch.config.js'])
1313
}
1414
if (args.indexOf('--env') === -1) {
1515
args = args.concat(['--env', 'chrome,phantomjs'])
1616
}
17-
var i = args.indexOf('--test')
17+
const i = args.indexOf('--test')
1818
if (i > -1) {
1919
args[i + 1] = 'test/e2e/specs/' + args[i + 1] + '.js'
2020
}
2121

22-
var runner = spawn('./node_modules/.bin/nightwatch', args, {
22+
const runner = spawn('./node_modules/.bin/nightwatch', args, {
2323
stdio: 'inherit'
2424
})
2525

‎test/e2e/specs/grid.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module.exports = {
22
'grid': function (browser) {
3-
var columns = ['name', 'power']
3+
const columns = ['name', 'power']
44

55
browser
66
.url('http://localhost:8080/examples/grid/')
@@ -92,8 +92,8 @@ module.exports = {
9292

9393
function assertTable (data) {
9494
browser.assert.count('td', data.length * columns.length)
95-
for (var i = 0; i < data.length; i++) {
96-
for (var j = 0; j < columns.length; j++) {
95+
for (let i = 0; i < data.length; i++) {
96+
for (let j = 0; j < columns.length; j++) {
9797
browser.assert.containsText(
9898
'tr:nth-child(' + (i + 1) + ') td:nth-child(' + (j + 1) + ')',
9999
data[i][columns[j]]

‎test/e2e/specs/svg.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ module.exports = {
1212
.assert.count('button', 7)
1313
.assert.count('input[type="range"]', 6)
1414
.assert.evaluate(function () {
15-
var points = stats.map(function (stat, i) {
16-
var point = valueToPoint(stat.value, i, 6)
15+
const points = stats.map(function (stat, i) {
16+
const point = valueToPoint(stat.value, i, 6)
1717
return point.x + ',' + point.y
1818
}).join(' ')
1919
return document.querySelector('polygon').attributes[0].value === points
@@ -24,8 +24,8 @@ module.exports = {
2424
.assert.count('button', 6)
2525
.assert.count('input[type="range"]', 5)
2626
.assert.evaluate(function () {
27-
var points = stats.map(function (stat, i) {
28-
var point = valueToPoint(stat.value, i, 5)
27+
const points = stats.map(function (stat, i) {
28+
const point = valueToPoint(stat.value, i, 5)
2929
return point.x + ',' + point.y
3030
}).join(' ')
3131
return document.querySelector('polygon').attributes[0].value === points
@@ -37,8 +37,8 @@ module.exports = {
3737
.assert.count('button', 7)
3838
.assert.count('input[type="range"]', 6)
3939
.assert.evaluate(function () {
40-
var points = stats.map(function (stat, i) {
41-
var point = valueToPoint(stat.value, i, 6)
40+
const points = stats.map(function (stat, i) {
41+
const point = valueToPoint(stat.value, i, 6)
4242
return point.x + ',' + point.y
4343
}).join(' ')
4444
return document.querySelector('polygon').attributes[0].value === points

‎test/e2e/specs/tree.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ module.exports = {
6363
.assert.count('.item > ul', 5)
6464
.assert.containsText('#demo ul > .item:nth-child(1)', '[-]')
6565
.assert.evaluate(function () {
66-
var firstItem = document.querySelector('#demo ul > .item:nth-child(1)')
67-
var ul = firstItem.querySelector('ul')
66+
const firstItem = document.querySelector('#demo ul > .item:nth-child(1)')
67+
const ul = firstItem.querySelector('ul')
6868
return ul.children.length === 2
6969
})
7070
.end()

‎test/helpers/to-have-been-warned.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ let asserted
1414

1515
function createCompareFn (spy) {
1616
const hasWarned = msg => {
17-
var count = spy.calls.count()
18-
var args
17+
let count = spy.calls.count()
18+
let args
1919
while (count--) {
2020
args = spy.calls.argsFor(count)
2121
if (args.some(containsMsg)) {
@@ -31,7 +31,7 @@ function createCompareFn (spy) {
3131
return {
3232
compare: msg => {
3333
asserted = asserted.concat(msg)
34-
var warned = Array.isArray(msg)
34+
const warned = Array.isArray(msg)
3535
? msg.some(hasWarned)
3636
: hasWarned(msg)
3737
return {

0 commit comments

Comments
 (0)