Skip to content

Commit ba9c4ed

Browse files
committed
switch to yorkie for git hook management
1 parent d8340eb commit ba9c4ed

File tree

5 files changed

+13
-10
lines changed

5 files changed

+13
-10
lines changed

package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66
],
77
"scripts": {
88
"test": "jest --env node",
9-
"lint": "eslint --fix packages/**/*.js packages/**/bin/* test/**/*.js",
10-
"precommit": "lint-staged"
9+
"lint": "eslint --fix packages/**/*.js packages/**/bin/* test/**/*.js"
10+
},
11+
"gitHooks": {
12+
"pre-commit": "lint-staged"
1113
},
1214
"jest": {
1315
"testEnvironment": "node",
@@ -34,7 +36,6 @@
3436
"eslint": "^4.14.0",
3537
"eslint-plugin-vue-libs": "^2.1.0",
3638
"globby": "^7.1.1",
37-
"husky": "^0.14.3",
3839
"jest": "^22.0.4",
3940
"lerna": "^2.5.1",
4041
"lint-staged": "^6.0.0",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ test('lint on commit', async () => {
7070
lintOn: 'commit'
7171
}
7272
})
73-
expect(pkg.scripts.precommit).toBe('lint-staged')
73+
expect(pkg.gitHooks['pre-commit']).toBe('lint-staged')
7474
expect(pkg.devDependencies).toHaveProperty('lint-staged')
7575
expect(pkg['lint-staged']).toEqual({
7676
'*.js': ['vue-cli-service lint', 'git add'],

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ module.exports = (api, { config, lintOn }) => {
3434
Object.assign(pkg.devDependencies, {
3535
'lint-staged': '^6.0.0'
3636
})
37-
pkg.scripts.precommit = 'lint-staged'
37+
pkg.gitHooks = {
38+
'pre-commit': 'lint-staged'
39+
}
3840
pkg['lint-staged'] = {
3941
'*.js': ['vue-cli-service lint', 'git add'],
4042
'*.vue': ['vue-cli-service lint', 'git add']

packages/@vue/cli-service/bin/install.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ const projectDir =
44
process.env.VUE_CLI_CONTEXT ||
55
path.dirname(require('read-pkg-up').sync().path)
66

7-
const huskyWorkingPath = path.resolve(projectDir, 'node_modules', '@vue')
7+
const yorkieWorkingPath = path.resolve(projectDir, 'node_modules/@vue')
88

9-
require('husky/src/install')(huskyWorkingPath)
9+
require('yorkie/src/install')(yorkieWorkingPath)

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
"friendly-errors-webpack-plugin": "^1.6.1",
4040
"get-value": "^2.0.6",
4141
"html-webpack-plugin": "^2.30.1",
42-
"husky": "^0.14.3",
4342
"javascript-stringify": "^1.6.0",
4443
"minimist": "^1.2.0",
4544
"opn": "^5.1.0",
@@ -59,8 +58,9 @@
5958
"vue-template-compiler": "^2.5.13",
6059
"webpack": "^3.10.0",
6160
"webpack-chain": "^4.5.0",
62-
"webpack-dev-server": "^2.9.7",
63-
"webpack-merge": "^4.1.1"
61+
"webpack-dev-server": "^2.10.0",
62+
"webpack-merge": "^4.1.1",
63+
"yorkie": "^1.0.0"
6464
},
6565
"devDependencies": {
6666
"vue": "^2.5.13"

0 commit comments

Comments
 (0)