Skip to content

Commit 4e00688

Browse files
yyx990803yyx990803
committed
build: update dev dependencies
1 parent a5924a5 commit 4e00688

File tree

15 files changed

+1741
-1201
lines changed

15 files changed

+1741
-1201
lines changed

Diff for: ‎package-lock.json

+1,650-1,103
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎package.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"@types/node": "^8.0.33",
6161
"@types/webpack": "^3.0.13",
6262
"babel-core": "^6.25.0",
63-
"babel-eslint": "^7.2.3",
63+
"babel-eslint": "^8.0.3",
6464
"babel-helper-vue-jsx-merge-props": "^2.0.2",
6565
"babel-loader": "^7.0.0",
6666
"babel-plugin-istanbul": "^4.1.4",
@@ -69,8 +69,8 @@
6969
"babel-plugin-transform-vue-jsx": "^3.4.3",
7070
"babel-preset-es2015": "^6.24.1",
7171
"babel-preset-flow-vue": "^1.0.0",
72-
"buble": "^0.16.0",
73-
"chalk": "^1.1.3",
72+
"buble": "^0.18.0",
73+
"chalk": "^2.3.0",
7474
"chromedriver": "^2.30.1",
7575
"codecov.io": "^0.1.6",
7676
"commitizen": "^2.9.6",
@@ -79,12 +79,12 @@
7979
"cz-conventional-changelog": "^2.0.0",
8080
"de-indent": "^1.0.2",
8181
"es6-promise": "^4.1.0",
82-
"eslint": "^3.0.0",
82+
"eslint": "^4.13.1",
8383
"eslint-loader": "^1.7.1",
8484
"eslint-plugin-flowtype": "^2.34.0",
8585
"eslint-plugin-jasmine": "^2.8.4",
86-
"eslint-plugin-vue-libs": "^1.2.0",
87-
"file-loader": "^0.11.2",
86+
"eslint-plugin-vue-libs": "^2.0.1",
87+
"file-loader": "^1.1.5",
8888
"flow-bin": "^0.54.0",
8989
"hash-sum": "^1.0.2",
9090
"he": "^1.1.1",
@@ -110,10 +110,10 @@
110110
"nightwatch-helpers": "^1.2.0",
111111
"phantomjs-prebuilt": "^2.1.14",
112112
"resolve": "^1.3.3",
113-
"rollup": "^0.50.0",
113+
"rollup": "^0.52.1",
114114
"rollup-plugin-alias": "^1.3.1",
115115
"rollup-plugin-babel": "^3.0.2",
116-
"rollup-plugin-buble": "^0.16.0",
116+
"rollup-plugin-buble": "^0.18.0",
117117
"rollup-plugin-commonjs": "^8.0.2",
118118
"rollup-plugin-flow-no-whitespace": "^1.0.0",
119119
"rollup-plugin-node-resolve": "^3.0.0",
@@ -124,7 +124,7 @@
124124
"shelljs": "^0.7.8",
125125
"typescript": "^2.6.1",
126126
"uglify-js": "^3.0.15",
127-
"webpack": "^2.6.1",
127+
"webpack": "^3.10.0",
128128
"weex-js-runtime": "^0.23.0",
129129
"weex-styler": "^0.3.0"
130130
},

Diff for: ‎src/compiler/codegen/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ function genScopedSlot (
353353
? `${el.if}?${genChildren(el, state) || 'undefined'}:undefined`
354354
: genChildren(el, state) || 'undefined'
355355
: genElement(el, state)
356-
}}`
356+
}}`
357357
return `{key:${key},fn:${fn}}`
358358
}
359359

Diff for: ‎src/core/instance/inject.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ export function resolveInject (inject: any, vm: Component): ?Object {
4141
// inject is :any because flow is not smart enough to figure out cached
4242
const result = Object.create(null)
4343
const keys = hasSymbol
44-
? Reflect.ownKeys(inject).filter(key => {
45-
/* istanbul ignore next */
46-
return Object.getOwnPropertyDescriptor(inject, key).enumerable
47-
})
48-
: Object.keys(inject)
44+
? Reflect.ownKeys(inject).filter(key => {
45+
/* istanbul ignore next */
46+
return Object.getOwnPropertyDescriptor(inject, key).enumerable
47+
})
48+
: Object.keys(inject)
4949

5050
for (let i = 0; i < keys.length; i++) {
5151
const key = keys[i]

Diff for: ‎src/core/observer/array.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ export const arrayMethods = Object.create(arrayProto)
1919
'splice',
2020
'sort',
2121
'reverse'
22-
]
23-
.forEach(function (method) {
22+
].forEach(function (method) {
2423
// cache original method
2524
const original = arrayProto[method]
2625
def(arrayMethods, method, function mutator (...args) {

Diff for: ‎src/platforms/web/compiler/directives/model.js

+11-11
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@ function genCheckboxModel (
7373
const falseValueBinding = getBindingAttr(el, 'false-value') || 'false'
7474
addProp(el, 'checked',
7575
`Array.isArray(${value})` +
76-
`?_i(${value},${valueBinding})>-1` + (
77-
trueValueBinding === 'true'
78-
? `:(${value})`
79-
: `:_q(${value},${trueValueBinding})`
80-
)
76+
`?_i(${value},${valueBinding})>-1` + (
77+
trueValueBinding === 'true'
78+
? `:(${value})`
79+
: `:_q(${value},${trueValueBinding})`
80+
)
8181
)
8282
addHandler(el, 'change',
8383
`var $$a=${value},` +
@@ -94,9 +94,9 @@ function genCheckboxModel (
9494
}
9595

9696
function genRadioModel (
97-
el: ASTElement,
98-
value: string,
99-
modifiers: ?ASTModifiers
97+
el: ASTElement,
98+
value: string,
99+
modifiers: ?ASTModifiers
100100
) {
101101
const number = modifiers && modifiers.number
102102
let valueBinding = getBindingAttr(el, 'value') || 'null'
@@ -106,9 +106,9 @@ function genRadioModel (
106106
}
107107

108108
function genSelect (
109-
el: ASTElement,
110-
value: string,
111-
modifiers: ?ASTModifiers
109+
el: ASTElement,
110+
value: string,
111+
modifiers: ?ASTModifiers
112112
) {
113113
const number = modifiers && modifiers.number
114114
const selectedVal = `Array.prototype.filter` +

Diff for: ‎src/server/template-renderer/index.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -191,13 +191,12 @@ export default class TemplateRenderer {
191191
contextKey = 'state',
192192
windowKey = '__INITIAL_STATE__'
193193
} = options || {}
194+
const state = serialize(context[contextKey], { isJSON: true })
194195
const autoRemove = process.env.NODE_ENV === 'production'
195196
? ';(function(){var s;(s=document.currentScript||document.scripts[document.scripts.length-1]).parentNode.removeChild(s);}());'
196197
: ''
197198
return context[contextKey]
198-
? `<script>window.${windowKey}=${
199-
serialize(context[contextKey], { isJSON: true })
200-
}${autoRemove}</script>`
199+
? `<script>window.${windowKey}=${state}${autoRemove}</script>`
201200
: ''
202201
}
203202

Diff for: ‎src/sfc/parser.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ type Attribute = {
1919
export function parseComponent (
2020
content: string,
2121
options?: Object = {}
22-
): SFCDescriptor {
22+
): SFCDescriptor {
2323
const sfc: SFCDescriptor = {
2424
template: null,
2525
script: null,

Diff for: ‎test/unit/features/component/component.spec.js

+5-6
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,10 @@ describe('Component', () => {
106106
expect(vm.$el.outerHTML).toBe('<div view="view-b">bar b</div>')
107107
vm.view = ''
108108
})
109-
.then(() => {
110-
expect(vm.$el.nodeType).toBe(8)
111-
expect(vm.$el.data).toBe('')
112-
}).then(done)
109+
.then(() => {
110+
expect(vm.$el.nodeType).toBe(8)
111+
expect(vm.$el.data).toBe('')
112+
}).then(done)
113113
})
114114

115115
it('dynamic with props', done => {
@@ -134,8 +134,7 @@ describe('Component', () => {
134134
waitForUpdate(() => {
135135
expect(vm.$el.outerHTML).toBe('<div>bar view-b</div>')
136136
vm.view = ''
137-
})
138-
.then(() => {
137+
}).then(() => {
139138
expect(vm.$el.nodeType).toBe(8)
140139
expect(vm.$el.data).toBe('')
141140
}).then(done)

Diff for: ‎test/unit/features/debug.spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ describe('Debug utilities', () => {
4141
}).$mount()
4242

4343
expect(
44-
`Failed to mount component: template or render function not defined.
44+
`Failed to mount component: template or render function not defined.
4545
4646
found in
4747
@@ -70,7 +70,7 @@ found in
7070
}).$mount()
7171

7272
expect(
73-
`Failed to mount component: template or render function not defined.
73+
`Failed to mount component: template or render function not defined.
7474
7575
found in
7676

Diff for: ‎test/unit/features/options/delimiters.spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ describe('Delimiters', () => {
8282
}).$mount()
8383

8484
expect(vm.$el.textContent).toEqual('1 - 2')
85-
// restore default options
85+
// restore default options
8686
delete Vue.options.delimiters
8787
})
8888

@@ -110,7 +110,7 @@ describe('Delimiters', () => {
110110
}).$mount()
111111

112112
expect(vm.$el.textContent).toEqual('1 - 2')
113-
// restore default options
113+
// restore default options
114114
delete Vue.options.delimiters
115115
})
116116
})

Diff for: ‎test/unit/modules/compiler/codegen.spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ describe('codegen', () => {
104104

105105
it('generate multi v-else-if with v-else directive', () => {
106106
assertCodegen(
107-
'<div><p v-if="show">hello</p><p v-else-if="hide">world</p><p v-else-if="3">elseif</p><p v-else>bye</p></div>',
108-
`with(this){return _c('div',[(show)?_c('p',[_v("hello")]):(hide)?_c('p',[_v("world")]):(3)?_c('p',[_v("elseif")]):_c('p',[_v("bye")])])}`
107+
'<div><p v-if="show">hello</p><p v-else-if="hide">world</p><p v-else-if="3">elseif</p><p v-else>bye</p></div>',
108+
`with(this){return _c('div',[(show)?_c('p',[_v("hello")]):(hide)?_c('p',[_v("world")]):(3)?_c('p',[_v("elseif")]):_c('p',[_v("bye")])])}`
109109
)
110110
})
111111

Diff for: ‎test/unit/modules/compiler/compiler-options.spec.js

+42-42
Original file line numberDiff line numberDiff line change
@@ -9,58 +9,58 @@ describe('compile options', () => {
99
<input type="text" v-model="msg" required max="8" v-validate:field1.group1.group2>
1010
</div>
1111
`, {
12-
directives: {
13-
validate (el, dir) {
14-
if (dir.name === 'validate' && dir.arg) {
15-
el.validate = {
16-
field: dir.arg,
17-
groups: dir.modifiers ? Object.keys(dir.modifiers) : []
12+
directives: {
13+
validate (el, dir) {
14+
if (dir.name === 'validate' && dir.arg) {
15+
el.validate = {
16+
field: dir.arg,
17+
groups: dir.modifiers ? Object.keys(dir.modifiers) : []
18+
}
1819
}
1920
}
20-
}
21-
},
22-
modules: [{
23-
transformNode (el) {
24-
el.validators = el.validators || []
25-
const validators = ['required', 'min', 'max', 'pattern', 'maxlength', 'minlength']
26-
validators.forEach(name => {
27-
const rule = getAndRemoveAttr(el, name)
28-
if (rule !== undefined) {
29-
el.validators.push({ name, rule })
30-
}
31-
})
3221
},
33-
genData (el) {
34-
let data = ''
35-
if (el.validate) {
36-
data += `validate:${JSON.stringify(el.validate)},`
37-
}
38-
if (el.validators) {
39-
data += `validators:${JSON.stringify(el.validators)},`
40-
}
41-
return data
42-
},
43-
transformCode (el, code) {
22+
modules: [{
23+
transformNode (el) {
24+
el.validators = el.validators || []
25+
const validators = ['required', 'min', 'max', 'pattern', 'maxlength', 'minlength']
26+
validators.forEach(name => {
27+
const rule = getAndRemoveAttr(el, name)
28+
if (rule !== undefined) {
29+
el.validators.push({ name, rule })
30+
}
31+
})
32+
},
33+
genData (el) {
34+
let data = ''
35+
if (el.validate) {
36+
data += `validate:${JSON.stringify(el.validate)},`
37+
}
38+
if (el.validators) {
39+
data += `validators:${JSON.stringify(el.validators)},`
40+
}
41+
return data
42+
},
43+
transformCode (el, code) {
4444
// check
45-
if (!el.validate || !el.validators) {
46-
return code
47-
}
48-
// setup validation result props
49-
const result = { dirty: false } // define something other prop
50-
el.validators.forEach(validator => {
51-
result[validator.name] = null
52-
})
53-
// generate code
54-
return `_c('validate',{props:{
45+
if (!el.validate || !el.validators) {
46+
return code
47+
}
48+
// setup validation result props
49+
const result = { dirty: false } // define something other prop
50+
el.validators.forEach(validator => {
51+
result[validator.name] = null
52+
})
53+
// generate code
54+
return `_c('validate',{props:{
5555
field:${JSON.stringify(el.validate.field)},
5656
groups:${JSON.stringify(el.validate.groups)},
5757
validators:${JSON.stringify(el.validators)},
5858
result:${JSON.stringify(result)},
5959
child:${code}}
6060
})`
61-
}
62-
}]
63-
})
61+
}
62+
}]
63+
})
6464
expect(render).not.toBeUndefined()
6565
expect(staticRenderFns).toEqual([])
6666
expect(errors).toEqual([])

Diff for: ‎test/unit/modules/compiler/parser.spec.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ describe('parser', () => {
123123
it('not warn 3 root elements with v-if, v-else-if and v-else', () => {
124124
parse('<div v-if="1"></div><div v-else-if="2"></div><div v-else></div>', baseOptions)
125125
expect('Component template should contain exactly one root element')
126-
.not.toHaveBeenWarned()
126+
.not.toHaveBeenWarned()
127127
})
128128

129129
it('not warn 2 root elements with v-if and v-else on separate lines', () => {
@@ -142,7 +142,7 @@ describe('parser', () => {
142142
<div v-else></div>
143143
`, baseOptions)
144144
expect('Component template should contain exactly one root element')
145-
.not.toHaveBeenWarned()
145+
.not.toHaveBeenWarned()
146146

147147
parse(`
148148
<div v-if="1"></div>
@@ -152,7 +152,7 @@ describe('parser', () => {
152152
<div v-else></div>
153153
`, baseOptions)
154154
expect('Component template should contain exactly one root element')
155-
.not.toHaveBeenWarned()
155+
.not.toHaveBeenWarned()
156156
})
157157

158158
it('generate correct ast for 2 root elements with v-if and v-else on separate lines', () => {
@@ -219,7 +219,7 @@ describe('parser', () => {
219219
it('warn 2 root elements with v-if and v-else-if with v-for on 2nd', () => {
220220
parse('<div v-if="1"></div><div v-else-if="2" v-for="i in [1]"></div>', baseOptions)
221221
expect('Cannot use v-for on stateful component root element because it renders multiple elements')
222-
.toHaveBeenWarned()
222+
.toHaveBeenWarned()
223223
})
224224

225225
it('warn <template> as root element', () => {

Diff for: ‎test/unit/modules/vdom/patch/edge-cases.spec.js

+4-8
Original file line numberDiff line numberDiff line change
@@ -96,23 +96,19 @@ describe('vdom patch: edge cases', () => {
9696
expect(compVm.$vnode.parent).toBe(wrapperVm.$vnode)
9797
expect(vm.$el.innerHTML).toBe('<div>row</div><a>atag</a>')
9898
vm.swap = false
99-
})
100-
.then(() => {
99+
}).then(() => {
101100
expect(compVm.$vnode.parent).toBe(wrapperVm.$vnode)
102101
expect(vm.$el.innerHTML).toBe('<a>atag</a><div>row</div>')
103102
compVm.swap = false
104-
})
105-
.then(() => {
103+
}).then(() => {
106104
expect(vm.$el.innerHTML).toBe('<span>span</span><div>row</div>')
107105
expect(compVm.$vnode.parent).toBe(wrapperVm.$vnode)
108106
vm.swap = true
109-
})
110-
.then(() => {
107+
}).then(() => {
111108
expect(vm.$el.innerHTML).toBe('<div>row</div><span>span</span>')
112109
expect(compVm.$vnode.parent).toBe(wrapperVm.$vnode)
113110
vm.swap = true
114-
})
115-
.then(done)
111+
}).then(done)
116112
})
117113

118114
// #4530

0 commit comments

Comments
 (0)