Skip to content

Commit c0abf25

Browse files
committed
use prettier instead of typescript-formatter
1 parent dc58420 commit c0abf25

File tree

5 files changed

+34
-93
lines changed

5 files changed

+34
-93
lines changed

.prettierrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"printWidth": 80,
3+
"tabWidth": 4,
4+
"useTabs": false,
5+
"semi": true,
6+
"singleQuote": false,
7+
"trailingComma": "none",
8+
"bracketSpacing": true
9+
}

package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"scripts": {
88
"test": "karma start --single-run",
99
"mocha": "mocha test/**/*.test.ts --require ts-node/register",
10-
"autoformat": "tsfmt -r --useTsconfig tsconfig.test.json",
10+
"autoformat": "prettier --config .prettierrc --write {src,test}/**/*.ts",
11+
"tslint-check": "tslint-config-prettier-check ./tslint.json",
1112
"clean-up": "rm -rf coverage && rm -rf lib",
1213
"prepublish": "tsc -d && publish-please guard",
1314
"publish-please": "npm run autoformat && npm run clean-up && publish-please"
@@ -68,6 +69,7 @@
6869
"karma-sourcemap-writer": "^0.1.2",
6970
"karma-webpack": "^2.0.4",
7071
"mocha": "^3.5.3",
72+
"prettier": "^1.7.0",
7173
"publish-please": "^2.3.1",
7274
"reflect-metadata": "^0.1.10",
7375
"remap-istanbul": "^0.9.5",
@@ -77,8 +79,8 @@
7779
"ts-loader": "^2.3.7",
7880
"ts-node": "^3.3.0",
7981
"tslint": "^5.7.0",
82+
"tslint-config-prettier": "^1.5.0",
8083
"typescript": "^2.5.2",
81-
"typescript-formatter": "^6.0.0",
8284
"webpack": "^3.6.0",
8385
"webpack-dev-server": "^2.8.2"
8486
},

tsfmt.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

tslint.json

Lines changed: 11 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
11
{
2+
"extends": [
3+
"tslint:latest",
4+
"tslint-config-prettier"
5+
],
26
"rules": {
7+
"ban-types": [ false ],
38
"class-name": true,
49
"comment-format": [
510
true,
611
"check-space"
712
],
813
"curly": true,
9-
"eofline": true,
1014
"forin": true,
11-
"indent": [
12-
true,
13-
"spaces"
14-
],
1515
"label-position": true,
16-
"max-line-length": [
17-
true,
18-
140
19-
],
2016
"member-access": true,
2117
"member-ordering": [
2218
true, {
@@ -30,6 +26,7 @@
3026
]
3127
}
3228
],
29+
"no-angle-bracket-type-assertion": false,
3330
"no-arg": true,
3431
"no-bitwise": true,
3532
"no-console": [
@@ -49,54 +46,24 @@
4946
"no-shadowed-variable": true,
5047
"no-string-literal": true,
5148
"no-switch-case-fall-through": false,
52-
"no-trailing-whitespace": true,
49+
"no-this-assignment": false,
5350
"no-unused-expression": true,
5451
"no-unused-variable": true,
5552
"no-unreachable": true,
5653
"no-use-before-declare": true,
5754
"no-var-keyword": true,
5855
"object-literal-sort-keys": true,
59-
"one-line": [
60-
true,
61-
"check-open-brace",
62-
"check-catch",
63-
"check-else",
64-
"check-whitespace"
65-
],
66-
"quotemark": [
67-
true,
68-
"double",
69-
"avoid-escape"
70-
],
56+
"ordered-imports": false,
57+
"only-arrow-functions": [ false ],
58+
"prefer-const": false,
7159
"radix":true,
72-
"semicolon": [
73-
true,
74-
"always"
75-
],
7660
"trailing-comma": [
7761
false
7862
],
7963
"triple-equals": [
8064
true,
8165
"allow-null-check"
8266
],
83-
"typedef-whitespace": [
84-
true, {
85-
"call-signature":"nospace",
86-
"index-signature":"nospace",
87-
"parameter":"nospace",
88-
"property-declaration":"nospace",
89-
"variable-declaration":"nospace"
90-
}
91-
],
92-
"variable-name": false,
93-
"whitespace": [
94-
true,
95-
"check-branch",
96-
"check-decl",
97-
"check-operator",
98-
"check-separator",
99-
"check-type"
100-
]
67+
"variable-name": false
10168
}
10269
}

yarn.lock

Lines changed: 10 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ [email protected]:
460460
version "3.4.7"
461461
resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3"
462462

463-
bluebird@^3.0.5, bluebird@^3.3.0, bluebird@^3.5.0:
463+
bluebird@^3.3.0, bluebird@^3.5.0:
464464
version "3.5.0"
465465
resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c"
466466

@@ -849,10 +849,6 @@ commander@~2.1.0:
849849
version "2.1.0"
850850
resolved "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz#d121bbae860d9992a3d517ba96f56588e47c6781"
851851

852-
commandpost@^1.0.0:
853-
version "1.2.1"
854-
resolved "https://registry.npmjs.org/commandpost/-/commandpost-1.2.1.tgz#2e9c4c7508b9dc704afefaa91cab92ee6054cc68"
855-
856852
857853
version "1.0.0"
858854
resolved "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
@@ -1284,16 +1280,6 @@ ecc-jsbn@~0.1.1:
12841280
dependencies:
12851281
jsbn "~0.1.0"
12861282

1287-
editorconfig@^0.13.2:
1288-
version "0.13.3"
1289-
resolved "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.3.tgz#e5219e587951d60958fd94ea9a9a008cdeff1b34"
1290-
dependencies:
1291-
bluebird "^3.0.5"
1292-
commander "^2.9.0"
1293-
lru-cache "^3.2.0"
1294-
semver "^5.1.0"
1295-
sigmund "^1.0.1"
1296-
12971283
12981284
version "1.1.1"
12991285
resolved "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -3266,12 +3252,6 @@ [email protected]:
32663252
version "2.2.4"
32673253
resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz#6c658619becf14031d0d0b594b16042ce4dc063d"
32683254

3269-
lru-cache@^3.2.0:
3270-
version "3.2.0"
3271-
resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz#71789b3b7f5399bec8565dda38aa30d2a097efee"
3272-
dependencies:
3273-
pseudomap "^1.0.1"
3274-
32753255
lru-cache@^4.0.0, lru-cache@^4.0.1:
32763256
version "4.1.1"
32773257
resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
@@ -3994,6 +3974,10 @@ preserve@^0.2.0:
39943974
version "0.2.0"
39953975
resolved "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
39963976

3977+
prettier@^1.7.0:
3978+
version "1.7.0"
3979+
resolved "https://registry.npmjs.org/prettier/-/prettier-1.7.0.tgz#47481588f41f7c90f63938feb202ac82554e7150"
3980+
39973981
process-nextick-args@~1.0.6:
39983982
version "1.0.7"
39993983
resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
@@ -4023,7 +4007,7 @@ prr@~0.0.0:
40234007
version "0.0.0"
40244008
resolved "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
40254009

4026-
pseudomap@^1.0.1, pseudomap@^1.0.2:
4010+
pseudomap@^1.0.2:
40274011
version "1.0.2"
40284012
resolved "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
40294013

@@ -4548,10 +4532,6 @@ shell-quote@^1.4.3:
45484532
array-reduce "~0.0.0"
45494533
jsonify "~0.0.0"
45504534

4551-
sigmund@^1.0.1:
4552-
version "1.0.1"
4553-
resolved "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
4554-
45554535
signal-exit@^3.0.0:
45564536
version "3.0.2"
45574537
resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
@@ -5064,6 +5044,10 @@ tslib@^1.7.1:
50645044
version "1.7.1"
50655045
resolved "https://registry.npmjs.org/tslib/-/tslib-1.7.1.tgz#bc8004164691923a79fe8378bbeb3da2017538ec"
50665046

5047+
tslint-config-prettier@^1.5.0:
5048+
version "1.5.0"
5049+
resolved "https://registry.npmjs.org/tslint-config-prettier/-/tslint-config-prettier-1.5.0.tgz#76645425edcc34d9b6835ba58266eaf90fdbfeda"
5050+
50675051
tslint@^5.7.0:
50685052
version "5.7.0"
50695053
resolved "https://registry.npmjs.org/tslint/-/tslint-5.7.0.tgz#c25e0d0c92fa1201c2bc30e844e08e682b4f3552"
@@ -5120,13 +5104,6 @@ typedarray@^0.0.6:
51205104
version "0.0.6"
51215105
resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
51225106

5123-
typescript-formatter@^6.0.0:
5124-
version "6.0.0"
5125-
resolved "https://registry.npmjs.org/typescript-formatter/-/typescript-formatter-6.0.0.tgz#b90b6f391c54e2c75ab224ace2718d04387b6a02"
5126-
dependencies:
5127-
commandpost "^1.0.0"
5128-
editorconfig "^0.13.2"
5129-
51305107
typescript@^2.5.2:
51315108
version "2.5.2"
51325109
resolved "https://registry.npmjs.org/typescript/-/typescript-2.5.2.tgz#038a95f7d9bbb420b1bf35ba31d4c5c1dd3ffe34"

0 commit comments

Comments
 (0)