Skip to content

Commit eee082d

Browse files
authored
feat: bump lint-staged to v10 (#6136)
1 parent 10fc575 commit eee082d

File tree

9 files changed

+16
-35
lines changed

9 files changed

+16
-35
lines changed

docs/guide/cli-service.md

+1-4
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,7 @@ When installed, `@vue/cli-service` also installs [yorkie](https://github.com/yyx
169169
"pre-commit": "lint-staged"
170170
},
171171
"lint-staged": {
172-
"*.{js,vue}": [
173-
"vue-cli-service lint",
174-
"git add"
175-
]
172+
"*.{js,vue}": "vue-cli-service lint"
176173
}
177174
}
178175
```

docs/ru/guide/cli-service.md

+1-4
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,7 @@ npx vue-cli-service build --skip-plugins @vue/cli-plugin-pwa
166166
"pre-commit": "lint-staged"
167167
},
168168
"lint-staged": {
169-
"*.{js,vue}": [
170-
"vue-cli-service lint",
171-
"git add"
172-
]
169+
"*.{js,vue}": "vue-cli-service lint"
173170
}
174171
}
175172
```

docs/zh/guide/cli-service.md

+1-4
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,7 @@ npx vue-cli-service help [command]
128128
"pre-commit": "lint-staged"
129129
},
130130
"lint-staged": {
131-
"*.{js,vue}": [
132-
"vue-cli-service lint",
133-
"git add"
134-
]
131+
"*.{js,vue}": "vue-cli-service lint"
135132
}
136133
}
137134
```

package.json

+3-9
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,8 @@
2626
"commit-msg": "node scripts/verifyCommitMsg.js"
2727
},
2828
"lint-staged": {
29-
"*.{js,vue}": [
30-
"eslint --fix",
31-
"git add"
32-
],
33-
"packages/**/bin/*": [
34-
"eslint --fix",
35-
"git add"
36-
]
29+
"*.{js,vue}": "eslint --fix",
30+
"packages/**/bin/*": "eslint --fix"
3731
},
3832
"devDependencies": {
3933
"@babel/core": "^7.12.9",
@@ -67,7 +61,7 @@
6761
"jest": "^26.6.3",
6862
"lerna": "^3.22.0",
6963
"lerna-changelog": "^1.0.1",
70-
"lint-staged": "^9.5.0",
64+
"lint-staged": "^10.5.3",
7165
"memfs": "^3.2.0",
7266
"minimist": "^1.2.5",
7367
"node-fetch": "^2.6.1",

packages/@vue/cli-plugin-eslint/__tests__/eslintGenerator.spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ test('lint on commit', async () => {
157157
expect(pkg.gitHooks['pre-commit']).toBe('lint-staged')
158158
expect(pkg.devDependencies).toHaveProperty('lint-staged')
159159
expect(pkg['lint-staged']).toEqual({
160-
'*.{js,jsx,vue}': ['vue-cli-service lint', 'git add']
160+
'*.{js,jsx,vue}': 'vue-cli-service lint'
161161
})
162162
expect(pkg.vue).toEqual({
163163
lintOnSave: false
@@ -176,7 +176,7 @@ test('should lint ts files when typescript plugin co-exists', async () => {
176176
const pkg = JSON.parse(await read('package.json'))
177177
expect(pkg).toMatchObject({
178178
'lint-staged': {
179-
'*.{js,jsx,vue,ts,tsx}': ['vue-cli-service lint', 'git add']
179+
'*.{js,jsx,vue,ts,tsx}': 'vue-cli-service lint'
180180
}
181181
})
182182
})

packages/@vue/cli-plugin-eslint/__tests__/eslintPlugin.spec.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ test('should work', async () => {
4545
})
4646
const hook = await read('.git/hooks/pre-commit')
4747
expect(hook).toMatch('#yorkie')
48-
await write('src/main.js', updatedMain)
48+
// add a trivial change to avoid empty changeset after running lint-staged
49+
await write('src/main.js', updatedMain.replace('false', 'true'))
4950
// nvm doesn't like PREFIX env
5051
if (process.platform === 'darwin') {
5152
delete process.env.PREFIX

packages/@vue/cli-plugin-eslint/generator/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ module.exports = (api, { config, lintOn = [] }, rootOptions, invoking) => {
3838

3939
if (lintOn.includes('commit')) {
4040
Object.assign(pkg.devDependencies, {
41-
'lint-staged': '^9.5.0'
41+
'lint-staged': '^10.5.3'
4242
})
4343
pkg.gitHooks = {
4444
'pre-commit': 'lint-staged'
4545
}
4646
const extensions = require('../eslintOptions').extensions(api)
4747
.map(ext => ext.replace(/^\./, '')) // remove the leading `.`
4848
pkg['lint-staged'] = {
49-
[`*.{${extensions.join(',')}}`]: ['vue-cli-service lint', 'git add']
49+
[`*.{${extensions.join(',')}}`]: 'vue-cli-service lint'
5050
}
5151
}
5252

packages/@vue/cli-service/migrator/index.js

+2
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,6 @@ module.exports = (api) => {
1111

1212
api.exitLog('vue-cli-plugin-vue-next is removed because Vue 3 support has been built into the core plugins.')
1313
}
14+
15+
// TODO: lint-staged update
1416
}

packages/@vue/cli-ui/package.json

+2-9
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
"eslint-plugin-node": "^11.1.0",
8585
"eslint-plugin-promise": "^4.2.1",
8686
"eslint-plugin-vue": "^7.2.0",
87-
"lint-staged": "^9.5.0",
87+
"lint-staged": "^10.5.3",
8888
"lodash.debounce": "^4.0.8",
8989
"portal-vue": "^1.3.0",
9090
"rimraf": "^3.0.2",
@@ -123,14 +123,7 @@
123123
"pre-commit": "lint-staged"
124124
},
125125
"lint-staged": {
126-
"*.js": [
127-
"vue-cli-service lint",
128-
"git add"
129-
],
130-
"*.vue": [
131-
"vue-cli-service lint",
132-
"git add"
133-
]
126+
"*.{js,vue}": "vue-cli-service lint"
134127
},
135128
"vuePlugins": {
136129
"ui": [

0 commit comments

Comments
 (0)