Skip to content

Commit 2f96fc7

Browse files
committed
Move Prettier up to lerna repo
1 parent afb7283 commit 2f96fc7

File tree

7 files changed

+139
-568
lines changed

7 files changed

+139
-568
lines changed
File renamed without changes.
File renamed without changes.

package.json

+10-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@
2020
"javascript"
2121
],
2222
"devDependencies": {
23-
"lerna": "^2.5.1"
23+
"husky": "1.0.0-rc.12",
24+
"lerna": "^2.5.1",
25+
"prettier": "1.13.7",
26+
"pretty-quick": "1.6.0"
2427
},
2528
"workspaces": [
2629
"packages/*"
@@ -31,5 +34,10 @@
3134
"test": "lerna run test",
3235
"clean": "lerna clean"
3336
},
37+
"husky": {
38+
"hooks": {
39+
"pre-commit": "pretty-quick --staged"
40+
}
41+
},
3442
"license": "MIT"
35-
}
43+
}

packages/gitgraph-core/package.json

-8
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,8 @@
4242
"browserify": "^14.5.0",
4343
"commitizen": "^2.9.6",
4444
"cz-conventional-changelog": "^2.1.0",
45-
"husky": "^0.14.3",
4645
"jest": "^21.2.1",
4746
"npm-run-all": "^4.1.2",
48-
"prettier": "^1.12.1",
49-
"pretty-quick": "^1.6.0",
5047
"rimraf": "^2.6.2",
5148
"rollup": "^0.51.8",
5249
"ts-jest": "^21.2.3",
@@ -60,11 +57,6 @@
6057
"path": "cz-conventional-changelog"
6158
}
6259
},
63-
"husky": {
64-
"hooks": {
65-
"pre-commit": "pretty-quick --staged"
66-
}
67-
},
6860
"jest": {
6961
"transform": {
7062
".(ts)": "<rootDir>/../../node_modules/ts-jest/preprocessor.js"

packages/gitgraph-react/package.json

+1-9
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
"typings": "./lib/index.d.ts",
1515
"scripts": {
1616
"cm": "git-cz",
17-
"precommit": "lint-staged",
1817
"lint": "tslint --fix src/**/*",
1918
"test": "jest",
2019
"test:watch": "jest --watch",
@@ -60,15 +59,14 @@
6059
"browserify": "^14.5.0",
6160
"commitizen": "^2.9.6",
6261
"cz-conventional-changelog": "^2.1.0",
63-
"husky": "^0.14.3",
6462
"jest": "^21.2.1",
65-
"lint-staged": "^7.0.0",
6663
"npm-run-all": "^4.1.2",
6764
"rimraf": "^2.6.2",
6865
"rollup": "^0.51.8",
6966
"ts-jest": "^21.2.3",
7067
"ts-loader": "3.5.0",
7168
"tslint": "^5.9.1",
69+
"tslint-config-prettier": "1.13.0",
7270
"typescript": "^2.8.1",
7371
"uglifyjs": "^2.4.11"
7472
},
@@ -77,12 +75,6 @@
7775
"path": "cz-conventional-changelog"
7876
}
7977
},
80-
"lint-staged": {
81-
"*.ts": [
82-
"tslint --fix",
83-
"git add"
84-
]
85-
},
8678
"jest": {
8779
"transform": {
8880
".(ts)": "<rootDir>/../../node_modules/ts-jest/preprocessor.js"

packages/gitgraph-react/tslint.json

+14-18
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
{
2-
"defaultSeverity": "error",
3-
"extends": [
4-
"tslint:recommended"
5-
],
6-
"jsRules": {},
7-
"rules": {
8-
"interface-name": [
9-
true,
10-
"never-prefix"
11-
],
12-
"curly": false,
13-
"object-literal-sort-keys": false,
14-
"one-variable-per-declaration": false,
15-
"ordered-imports": false,
16-
"unified-signatures": false
17-
},
18-
"rulesDirectory": []
19-
}
2+
"defaultSeverity": "error",
3+
"extends": ["tslint:recommended", "tslint-config-prettier"],
4+
"jsRules": {},
5+
"rules": {
6+
"interface-name": [true, "never-prefix"],
7+
"curly": false,
8+
"object-literal-sort-keys": false,
9+
"one-variable-per-declaration": false,
10+
"ordered-imports": false,
11+
"unified-signatures": false,
12+
"trailing-comma": true
13+
},
14+
"rulesDirectory": []
15+
}

0 commit comments

Comments
 (0)