Skip to content

Commit fa6ee7d

Browse files
nazarepiedadynazarepiedady
authored
Merge branch 'vuejs:dev' into translate-to-portuguese
2 parents 960142d + f2cade2 commit fa6ee7d

File tree

79 files changed

+497
-402
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+497
-402
lines changed

Diff for: ‎.eslintignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
dist
1+
**/dist/**

Diff for: ‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.DS_Store
22
node_modules/
3+
.eslintcache
34

45
# Editor files
56
/.idea

Diff for: ‎.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v10
1+
v16

Diff for: ‎.prettierrc.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{
22
"semi": false,
3-
"singleQuote": true
3+
"singleQuote": true,
4+
"trailingComma": "none",
5+
"arrowParens": "avoid"
46
}

Diff for: ‎docs/api/options.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ You can also pass a function that takes the props as an argument:
169169
```js
170170
shallowMount(Component, {
171171
scopedSlots: {
172-
foo: function(props) {
172+
foo: function (props) {
173173
return this.$createElement('div', props.index)
174174
}
175175
}

Diff for: ‎docs/fr/api/options.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ Vous pouvez également passer une fonction qui prend les props comme argument :
168168
```js
169169
shallowMount(Component, {
170170
scopedSlots: {
171-
foo: function(props) {
171+
foo: function (props) {
172172
return this.$createElement('div', props.index)
173173
}
174174
}

Diff for: ‎docs/fr/guides/common-tips.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ En pratique, bien que nous appelions et attendions `setData` pour assurer la mis
221221

222222
```js
223223
const transitionStub = () => ({
224-
render: function(h) {
224+
render: function (h) {
225225
return this.$options._renderChildren
226226
}
227227
})

Diff for: ‎docs/fr/guides/dom-events.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ Ce composant permet d'incrémenter/décrémenter la quantité à l'aide de diff
144144
},
145145
146146
watch: {
147-
quantity: function(newValue) {
147+
quantity: function (newValue) {
148148
this.$emit('input', newValue)
149149
}
150150
}

Diff for: ‎docs/fr/installation/using-other-test-runners.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Vous trouverez ci-dessous une configuration de base de Karma pour Vue Test Utils
1212
// karma.conf.js
1313
var webpackConfig = require('./webpack.config.js')
1414

15-
module.exports = function(config) {
15+
module.exports = function (config) {
1616
config.set({
1717
frameworks: ['mocha'],
1818
files: ['test/**/*.spec.js'],

Diff for: ‎docs/guides/common-tips.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ In practice, although we are calling and awaiting `setData` to ensure the DOM is
223223

224224
```js
225225
const transitionStub = () => ({
226-
render: function(h) {
226+
render: function (h) {
227227
return this.$options._renderChildren
228228
}
229229
})

Diff for: ‎docs/guides/dom-events.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ This component allows to increment/decrement the quantity using various keys.
142142
},
143143
144144
watch: {
145-
quantity: function(newValue) {
145+
quantity: function (newValue) {
146146
this.$emit('input', newValue)
147147
}
148148
}

Diff for: ‎docs/installation/using-other-test-runners.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Following is a basic Karma config for Vue Test Utils:
1212
// karma.conf.js
1313
var webpackConfig = require('./webpack.config.js')
1414

15-
module.exports = function(config) {
15+
module.exports = function (config) {
1616
config.set({
1717
frameworks: ['mocha'],
1818
files: ['test/**/*.spec.js'],

Diff for: ‎docs/ja/api/options.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ props を引数に取る関数を渡すことができます。
9494
```js
9595
shallowMount(Component, {
9696
scopedSlots: {
97-
foo: function(props) {
97+
foo: function (props) {
9898
return this.$createElement('div', props.index)
9999
}
100100
}

Diff for: ‎docs/ja/guides/dom-events.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ it('Click on yes button calls our method with argument "yes"', async () => {
134134
}
135135
},
136136
watch: {
137-
quantity: function(newValue) {
137+
quantity: function (newValue) {
138138
this.$emit('input', newValue)
139139
}
140140
}

Diff for: ‎docs/ja/guides/getting-started.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ it('will catch the error using done', done => {
131131
})
132132

133133
it('will catch the error using a promise', () => {
134-
return Vue.nextTick().then(function() {
134+
return Vue.nextTick().then(function () {
135135
expect(true).toBe(false)
136136
})
137137
})

Diff for: ‎docs/ja/installation/testing-single-file-components-with-karma.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ npm install --save-dev @vue/test-utils karma karma-chrome-launcher karma-mocha k
3636

3737
var webpackConfig = require('./webpack.config.js')
3838

39-
module.exports = function(config) {
39+
module.exports = function (config) {
4040
config.set({
4141
frameworks: ['mocha'],
4242

@@ -160,7 +160,7 @@ npm install --save-dev babel-plugin-istanbul
160160
```js
161161
// karma.conf.js
162162

163-
module.exports = function(config) {
163+
module.exports = function (config) {
164164
config.set({
165165
// ...
166166

Diff for: ‎docs/ru/api/options.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ shallowMount(Component, {
107107
```js
108108
shallowMount(Component, {
109109
scopedSlots: {
110-
foo: function(props) {
110+
foo: function (props) {
111111
return this.$createElement('div', props.index)
112112
}
113113
}

Diff for: ‎docs/ru/guides/dom-events.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ describe('Click event', () => {
136136
},
137137
138138
watch: {
139-
quantity: function(newValue) {
139+
quantity: function (newValue) {
140140
this.$emit('input', newValue)
141141
}
142142
}

Diff for: ‎docs/ru/guides/getting-started.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ it('должен отлавливать ошибку с использовани
131131
})
132132

133133
it('должен отлавливать ошибку с использованием promise', () => {
134-
return Vue.nextTick().then(function() {
134+
return Vue.nextTick().then(function () {
135135
expect(true).toBe(false)
136136
})
137137
})

Diff for: ‎docs/ru/installation/testing-single-file-components-with-karma.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ npm install --save-dev @vue/test-utils karma karma-chrome-launcher karma-mocha k
3636

3737
var webpackConfig = require('./webpack.config.js')
3838

39-
module.exports = function(config) {
39+
module.exports = function (config) {
4040
config.set({
4141
frameworks: ['mocha'],
4242

@@ -160,7 +160,7 @@ npm install --save-dev babel-plugin-istanbul
160160
```js
161161
// karma.conf.js
162162

163-
module.exports = function(config) {
163+
module.exports = function (config) {
164164
config.set({
165165
// ...
166166

Diff for: ‎docs/zh/api/options.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ shallowMount(Component, {
167167
```js
168168
shallowMount(Component, {
169169
scopedSlots: {
170-
foo: function(props) {
170+
foo: function (props) {
171171
return this.$createElement('div', props.index)
172172
}
173173
}

Diff for: ‎docs/zh/api/wrapper/emitted.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ test('emit demo', async () => {
3030
// 断言事件的数量
3131
expect(wrapper.emitted().foo.length).toBe(2)
3232

33-
// 断言事件的数量
33+
// 断言事件的有效数据
3434
expect(wrapper.emitted().foo[1]).toEqual([123])
3535
})
3636
```

Diff for: ‎docs/zh/guides/common-tips.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ test('should render Foo, then hide it', async () => {
222222

223223
```js
224224
const transitionStub = () => ({
225-
render: function(h) {
225+
render: function (h) {
226226
return this.$options._renderChildren
227227
}
228228
})

Diff for: ‎docs/zh/guides/dom-events.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ it('Click on yes button calls our method with argument "yes"', async () => {
142142
},
143143
144144
watch: {
145-
quantity: function(newValue) {
145+
quantity: function (newValue) {
146146
this.$emit('input', newValue)
147147
}
148148
}

Diff for: ‎docs/zh/guides/getting-started.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ it('will catch the error using done', done => {
164164
})
165165

166166
it('will catch the error using a promise', () => {
167-
return Vue.nextTick().then(function() {
167+
return Vue.nextTick().then(function () {
168168
expect(true).toBe(false)
169169
})
170170
})

Diff for: ‎docs/zh/installation/testing-single-file-components-with-karma.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ npm install --save-dev @vue/test-utils karma karma-chrome-launcher karma-mocha k
3636

3737
var webpackConfig = require('./webpack.config.js')
3838

39-
module.exports = function(config) {
39+
module.exports = function (config) {
4040
config.set({
4141
frameworks: ['mocha'],
4242

@@ -160,7 +160,7 @@ npm install --save-dev babel-plugin-istanbul
160160
```js
161161
// karma.conf.js
162162

163-
module.exports = function(config) {
163+
module.exports = function (config) {
164164
config.set({
165165
// ...
166166

Diff for: ‎package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
"docs": "vuepress dev docs",
1818
"docs:build": "vuepress build docs",
1919
"flow": "flow check",
20-
"lint": "eslint --ext js,vue .",
20+
"lint": "eslint --ext js,vue . --cache",
2121
"lint:docs": "eslint --ext js,vue,md docs --ignore-path .gitignore",
2222
"lint:fix": "yarn lint -- --fix",
23-
"format": "prettier --write \"**/*.{js,json,vue,md}\"",
23+
"format": "prettier --write \"**/*.{js,json,vue,md}\" --cache",
2424
"format:check": "prettier --check \"**/*.{js,json,vue,md}\"",
2525
"release": "yarn build && yarn test:unit && lerna publish --conventional-commits -m \"chore(release): publish %s\"",
2626
"test": "yarn format:check && yarn lint && yarn lint:docs && yarn flow && yarn test:types && yarn test:unit -w 1 && yarn test:unit:browser",
@@ -91,7 +91,7 @@
9191
"karma-spec-reporter": "^0.0.32",
9292
"karma-webpack": "^4.0.2",
9393
"lint-staged": "^9.5.0",
94-
"prettier": "^1.16.0",
94+
"prettier": "^2.8.1",
9595
"puppeteer": "^5.2.1",
9696
"rollup-plugin-delete": "^2.0.0",
9797
"@rollup/plugin-replace": "^2.3.3",

Diff for: ‎packages/create-instance/add-mocks.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// @flow
22
import $$Vue from 'vue'
3-
import { warn } from 'shared/util'
3+
import { warn, keys } from 'shared/util'
44

55
export default function addMocks(
66
_Vue: Component,
@@ -9,7 +9,7 @@ export default function addMocks(
99
if (mockedProperties === false) {
1010
return
1111
}
12-
Object.keys(mockedProperties).forEach(key => {
12+
keys(mockedProperties).forEach(key => {
1313
try {
1414
// $FlowIgnore
1515
_Vue.prototype[key] = mockedProperties[key]

Diff for: ‎packages/create-instance/create-component-stubs.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ function resolveComponent(obj: Object, component: string): Object {
4343
)
4444
}
4545

46-
function getCoreProperties(componentOptions: Component): Object {
46+
function getCoreProperties(componentOptions: Component, name?: string): Object {
4747
return {
4848
attrs: componentOptions.attrs,
49-
name: componentOptions.name,
49+
name: componentOptions.name || name,
5050
model: componentOptions.model,
5151
props: componentOptions.props,
5252
on: componentOptions.on,
@@ -108,7 +108,7 @@ export function createStubFromComponent(
108108
}
109109

110110
return {
111-
...getCoreProperties(componentOptions),
111+
...getCoreProperties(componentOptions, name),
112112
$_vueTestUtils_original: originalComponent,
113113
$_doNotStubChildren: true,
114114
render(h, context) {
@@ -195,7 +195,7 @@ export function createStubsFromStubsObject(
195195
stubs: Object,
196196
_Vue: Component
197197
): Components {
198-
return Object.keys(stubs || {}).reduce((acc, stubName) => {
198+
return keys(stubs || {}).reduce((acc, stubName) => {
199199
let stub = stubs[stubName]
200200

201201
validateStub(stub)

Diff for: ‎packages/create-instance/create-instance.js

+6-5
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { componentNeedsCompiling, isConstructor } from 'shared/validators'
1010
import createScopedSlots from './create-scoped-slots'
1111
import { createStubsFromStubsObject } from './create-component-stubs'
1212
import { patchCreateElement } from './patch-create-element'
13+
import { keys } from 'shared/util'
1314

1415
function createContext(options, scopedSlots, currentProps) {
1516
const on = {
@@ -86,8 +87,8 @@ export default function createInstance(
8687

8788
// watchers provided in mounting options should override preexisting ones
8889
if (componentOptions.watch && instanceOptions.watch) {
89-
const componentWatchers = Object.keys(componentOptions.watch)
90-
const instanceWatchers = Object.keys(instanceOptions.watch)
90+
const componentWatchers = keys(componentOptions.watch)
91+
const instanceWatchers = keys(instanceOptions.watch)
9192

9293
for (let i = 0; i < instanceWatchers.length; i++) {
9394
const k = instanceWatchers[i]
@@ -107,7 +108,7 @@ export default function createInstance(
107108
const parentComponentOptions = options.parentComponent || {}
108109

109110
const originalParentComponentProvide = parentComponentOptions.provide
110-
parentComponentOptions.provide = function() {
111+
parentComponentOptions.provide = function () {
111112
return {
112113
...getValuesFromCallableOption.call(this, originalParentComponentProvide),
113114
// $FlowIgnore
@@ -116,7 +117,7 @@ export default function createInstance(
116117
}
117118

118119
const originalParentComponentData = parentComponentOptions.data
119-
parentComponentOptions.data = function() {
120+
parentComponentOptions.data = function () {
120121
return {
121122
...getValuesFromCallableOption.call(this, originalParentComponentData),
122123
vueTestUtils_childProps: { ...options.propsData }
@@ -126,7 +127,7 @@ export default function createInstance(
126127
parentComponentOptions.$_doNotStubChildren = true
127128
parentComponentOptions.$_isWrapperParent = true
128129
parentComponentOptions._isFunctionalContainer = componentOptions.functional
129-
parentComponentOptions.render = function(h) {
130+
parentComponentOptions.render = function (h) {
130131
return h(
131132
Constructor,
132133
createContext(options, scopedSlots, this.vueTestUtils_childProps),

Diff for: ‎packages/create-instance/create-scoped-slots.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ function isDestructuringSlotScope(slotScope: string): boolean {
88
return /^{.*}$/.test(slotScope)
99
}
1010

11-
function getVueTemplateCompilerHelpers(
12-
_Vue: Component
13-
): { [name: string]: Function } {
11+
function getVueTemplateCompilerHelpers(_Vue: Component): {
12+
[name: string]: Function
13+
} {
1414
// $FlowIgnore
1515
const vue = new _Vue()
1616
const helpers = {}
@@ -111,7 +111,7 @@ export default function createScopedSlots(
111111

112112
const slotScope = scopedSlotMatches.match && scopedSlotMatches.match[1]
113113

114-
scopedSlots[scopedSlotName] = function(props) {
114+
scopedSlots[scopedSlotName] = function (props) {
115115
let res
116116
if (isFn) {
117117
res = renderFn.call({ ...helpers }, props)

Diff for: ‎packages/create-instance/log-events.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export function logEvents(
1515

1616
export function addEventLogger(_Vue: Component): void {
1717
_Vue.mixin({
18-
beforeCreate: function() {
18+
beforeCreate: function () {
1919
this.__emitted = Object.create(null)
2020
this.__emittedByOrder = []
2121
logEvents(this, this.__emitted, this.__emittedByOrder)

0 commit comments

Comments
 (0)