Skip to content

Commit e1be16b

Browse files
committed
Change lint option
1 parent da1cc85 commit e1be16b

File tree

3 files changed

+17
-44
lines changed

3 files changed

+17
-44
lines changed

package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
"author": "CodeChain Team <[email protected]>",
55
"license": "Apache-2.0",
66
"scripts": {
7-
"lint": "tsfmt --verify",
87
"start": "ts-node ./bin/www.ts",
9-
"test": "npm run lint && jest --env node"
8+
"test": "yarn lint && jest --env node",
9+
"lint": "tslint -p . && prettier '**/*.ts' -l",
10+
"fmt": "tslint -p . --fix && prettier '**/*ts' --write"
1011
},
1112
"dependencies": {
1213
"codechain-keystore": "git://github.com/CodeChain-io/codechain-keystore.git#9061ad1279fc46e140757873a02bdf9e7dc4e239",
@@ -31,13 +32,14 @@
3132
"@types/supertest": "^2.0.5",
3233
"jest": "^23.5.0",
3334
"pm2": "^3.0.3",
35+
"prettier": "1.14.2",
3436
"superagent": "^3.8.3",
3537
"supertest": "^3.1.0",
38+
"ts-node": "^7.0.0",
3639
"ts-jest": "^23.1.3",
3740
"tsc": "^1.20150623.0",
3841
"tslint": "^5.11.0",
3942
"tslint-config-prettier": "^1.14.0",
40-
"ts-node": "^7.0.0",
4143
"typescript": "^3.0.1"
4244
}
4345
}

tslint.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@
77
"interface-name": false,
88
"no-console": false,
99
"object-literal-sort-keys": false,
10-
"ordered-imports": false,
1110
"no-var-requires": false
1211
},
12+
"jsRules": {
13+
"no-console": false,
14+
"object-literal-sort-keys": false
15+
},
1316
"linterOptions": {
1417
"exclude": [
1518
"dist/**/*.js",

yarn.lock

Lines changed: 8 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,6 @@
7171
version "0.12.1"
7272
resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.1.tgz#9794c69c8385d0192acc471a540d1f8e0d16218a"
7373

74-
"@types/commander@^2.11.0":
75-
version "2.12.2"
76-
resolved "https://registry.yarnpkg.com/@types/commander/-/commander-2.12.2.tgz#183041a23842d4281478fa5d23c5ca78e6fd08ae"
77-
dependencies:
78-
commander "*"
79-
8074
"@types/connect@*":
8175
version "3.4.32"
8276
resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.32.tgz#aa0e9616b9435ccad02bc52b5b454ffc2c70ba28"
@@ -176,10 +170,6 @@
176170
"@types/node" "*"
177171
"@types/tough-cookie" "*"
178172

179-
"@types/semver@^5.4.0":
180-
version "5.5.0"
181-
resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
182-
183173
"@types/serve-static@*":
184174
version "1.13.2"
185175
resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.2.tgz#f5ac4d7a6420a99a6a45af4719f4dcd8cd907a48"
@@ -889,17 +879,13 @@ [email protected], combined-stream@~1.0.5, combined-stream@~1.0.6:
889879
dependencies:
890880
delayed-stream "~1.0.0"
891881

892-
commander@*, commander@^2.11.0, commander@^2.12.1, commander@^2.12.2:
893-
version "2.17.1"
894-
resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
895-
896882
897883
version "2.15.1"
898884
resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
899885

900-
commandpost@^1.0.0:
901-
version "1.3.0"
902-
resolved "https://registry.yarnpkg.com/commandpost/-/commandpost-1.3.0.tgz#e0654e4933abf58406c7d3b77ce747083da178c4"
886+
commander@^2.12.1, commander@^2.12.2:
887+
version "2.17.1"
888+
resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
903889

904890
compare-versions@^3.1.0:
905891
version "3.3.1"
@@ -1124,17 +1110,6 @@ ecc-jsbn@~0.1.1:
11241110
jsbn "~0.1.0"
11251111
safer-buffer "^2.1.0"
11261112

1127-
editorconfig@^0.15.0:
1128-
version "0.15.0"
1129-
resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.0.tgz#b6dd4a0b6b9e76ce48e066bdc15381aebb8804fd"
1130-
dependencies:
1131-
"@types/commander" "^2.11.0"
1132-
"@types/semver" "^5.4.0"
1133-
commander "^2.11.0"
1134-
lru-cache "^4.1.1"
1135-
semver "^5.4.1"
1136-
sigmund "^1.0.1"
1137-
11381113
11391114
version "1.1.1"
11401115
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -2623,7 +2598,7 @@ loose-envify@^1.0.0:
26232598
dependencies:
26242599
js-tokens "^3.0.0 || ^4.0.0"
26252600

2626-
lru-cache@^4.0.1, lru-cache@^4.1.1:
2601+
lru-cache@^4.0.1:
26272602
version "4.1.3"
26282603
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
26292604
dependencies:
@@ -3260,6 +3235,10 @@ preserve@^0.2.0:
32603235
version "0.2.0"
32613236
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
32623237

3238+
3239+
version "1.14.2"
3240+
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.14.2.tgz#0ac1c6e1a90baa22a62925f41963c841983282f9"
3241+
32633242
pretty-format@^23.5.0:
32643243
version "23.5.0"
32653244
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.5.0.tgz#0f9601ad9da70fe690a269cd3efca732c210687c"
@@ -3708,10 +3687,6 @@ shimmer@^1.0.0, shimmer@^1.1.0, shimmer@^1.2.0:
37083687
version "1.2.0"
37093688
resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.0.tgz#f966f7555789763e74d8841193685a5e78736665"
37103689

3711-
sigmund@^1.0.1:
3712-
version "1.0.1"
3713-
resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
3714-
37153690
[email protected], signal-exit@^3.0.0, signal-exit@^3.0.2:
37163691
version "3.0.2"
37173692
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
@@ -4156,13 +4131,6 @@ type-is@~1.6.15, type-is@~1.6.16:
41564131
media-typer "0.3.0"
41574132
mime-types "~2.1.18"
41584133

4159-
typescript-formatter@^7.2.2:
4160-
version "7.2.2"
4161-
resolved "https://registry.yarnpkg.com/typescript-formatter/-/typescript-formatter-7.2.2.tgz#a147181839b7bb09c2377b072f20f6336547c00a"
4162-
dependencies:
4163-
commandpost "^1.0.0"
4164-
editorconfig "^0.15.0"
4165-
41664134
typescript@^3.0.1:
41674135
version "3.0.1"
41684136
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.1.tgz#43738f29585d3a87575520a4b93ab6026ef11fdb"

0 commit comments

Comments
 (0)