Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(format): 使用 prettierjs 格式化项目 #429

Open
wants to merge 1 commit into
base: release
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[*]
charset = utf-8
indent_size = 2
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true
6 changes: 6 additions & 0 deletions .huskyrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"hooks": {
"pre-commit": "lint-staged",
"pre-push": "npm test"
}
}
4 changes: 4 additions & 0 deletions .lintstagedrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"*.{js,json,md}": ["prettier --write", "git add"],
"*.ts": ["prettier --write", "tslint --fix", "git add"]
}
13 changes: 13 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"arrowParens": "always",
"semi": false,
"singleQuote": true,
"overrides": [
{
"files": "{tslint.json,package.json}",
"options": {
"printWidth": 1e3
}
}
]
}
17 changes: 12 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,18 @@
"type": "git",
"url": "git+ssh://[email protected]/teambition/teambition-sdk.git"
},
"keywords": [
"teambition",
"sdk",
"teambition-sdk"
],
"keywords": ["teambition", "sdk", "teambition-sdk"],
"author": "[email protected]",
"license": "MIT",
"bugs": {
"url": "https://github.com/teambition/teambition-sdk/issues"
},
"homepage": "https://github.com/teambition/teambition-sdk#readme",
"config": {
"commitizen": {
"path": "cz-conventional-changelog"
}
},
"peerDependencies": {
"reactivedb": "~0.9.13",
"rrule": "2.2.0",
Expand All @@ -55,16 +56,21 @@
"@types/sinon": "^4.0.0",
"@types/sinon-chai": "^2.7.29",
"chai": "^4.1.2",
"commitizen": "^2.9.6",
"coveralls": "^3.0.0",
"cz-conventional-changelog": "^2.1.0",
"engine.io-client": "^3.1.0",
"fetch-mock": "^5.12.2",
"google-closure-compiler-js": "^20180101.0.0",
"husky": "^0.15.0-rc.8",
"isomorphic-fetch": "^2.2.1",
"jsonrpc-lite": "^1.3.0",
"lint-staged": "^7.0.0",
"madge": "^1.6.0",
"moment": "^2.18.1",
"node-watch": "^0.5.5",
"nyc": "^11.2.1",
"prettier": "^1.11.1",
"reactivedb": "~0.9.13",
"rollup": "^0.54.0",
"rollup-plugin-alias": "^1.3.1",
Expand All @@ -80,6 +86,7 @@
"ts-node": "^4.0.0",
"tslib": "^1.7.1",
"tslint": "^5.7.0",
"tslint-config-prettier": "^1.9.0",
"tslint-eslint-rules": "^4.1.1",
"typescript": "^2.6.2"
}
Expand Down
38 changes: 15 additions & 23 deletions tslint.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"extends": ["tslint-eslint-rules"],
"extends": ["tslint-eslint-rules", "tslint-config-prettier"],
"rules": {
"curly": true,
"eofline": true,
"align": [true, "parameters"],
"class-name": true,
"indent": [true, 2],
"indent": [true, "spaces", 2],
"max-line-length": [true, 150],
"no-consecutive-blank-lines": true,
"no-trailing-whitespace": true,
Expand All @@ -20,31 +20,23 @@
"no-require-imports": false,
"no-shadowed-variable": true,
"object-curly-spacing": true,
"one-line": [true,
"check-else",
"check-whitespace",
"check-open-brace"],
"one-line": [true, "check-else", "check-whitespace", "check-open-brace"],
"prefer-const": true,
"quotemark": [true,
"single",
"avoid-escape",
"jsx-single"],
"quotemark": [true, "single", "avoid-escape", "jsx-single"],
"semicolon": [true, "never"],
"ter-prefer-arrow-callback": true,
"typedef-whitespace": [true, {
"call-signature": "nospace",
"index-signature": "nospace",
"parameter": "nospace",
"property-declaration": "nospace",
"variable-declaration": "nospace"
}],
"typedef-whitespace": [
true,
{
"call-signature": "nospace",
"index-signature": "nospace",
"parameter": "nospace",
"property-declaration": "nospace",
"variable-declaration": "nospace"
}
],
"use-isnan": true,
"whitespace": [true,
"check-branch",
"check-decl",
"check-operator",
"check-separator",
"check-type"],
"whitespace": [true, "check-branch", "check-decl", "check-operator", "check-separator", "check-type"],
"comment-format": [true, "check-space", "check-lowercase"]
}
}
Loading