aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-09-21 09:26:02 +0200
committerChocobozzz <me@florianbigard.com>2018-09-21 09:26:53 +0200
commitf2659ae0b0bae6c1b2ee4dcf331a42e440274c02 (patch)
tree034b9cfbde81e1d955bb48fcb77b147e6c8bc096
parentae04a0ce1298ca4db8b2d0d69df36845213e5fcb (diff)
downloadPeerTube-f2659ae0b0bae6c1b2ee4dcf331a42e440274c02.tar.gz
PeerTube-f2659ae0b0bae6c1b2ee4dcf331a42e440274c02.tar.zst
PeerTube-f2659ae0b0bae6c1b2ee4dcf331a42e440274c02.zip
Upgrade tslint rules
-rw-r--r--client/package.json2
-rw-r--r--client/tslint.json2
-rw-r--r--client/yarn.lock6
-rw-r--r--package.json2
-rwxr-xr-xscripts/travis.sh6
-rw-r--r--yarn.lock6
6 files changed, 12 insertions, 12 deletions
diff --git a/client/package.json b/client/package.json
index e050b8d48..23ce8ce81 100644
--- a/client/package.json
+++ b/client/package.json
@@ -148,7 +148,7 @@
148 "terser-webpack-plugin": "^1.1.0", 148 "terser-webpack-plugin": "^1.1.0",
149 "ts-jest": "^23.1.4", 149 "ts-jest": "^23.1.4",
150 "tslint": "^5.7.0", 150 "tslint": "^5.7.0",
151 "tslint-config-standard": "^7.0.0", 151 "tslint-config-standard": "^8.0.1",
152 "typescript": "2.9", 152 "typescript": "2.9",
153 "video.js": "^7", 153 "video.js": "^7",
154 "videojs-contextmenu-ui": "^5.0.0", 154 "videojs-contextmenu-ui": "^5.0.0",
diff --git a/client/tslint.json b/client/tslint.json
index db852d9f8..e997088fd 100644
--- a/client/tslint.json
+++ b/client/tslint.json
@@ -31,7 +31,7 @@
31 "contextual-life-cycle": true, 31 "contextual-life-cycle": true,
32 "trackBy-function": false, 32 "trackBy-function": false,
33 "use-pipe-transform-interface": true, 33 "use-pipe-transform-interface": true,
34 "pipe-naming": [true, "camelCase", "my"], 34 "pipe-prefix": [true, "my"],
35 "component-class-suffix": true, 35 "component-class-suffix": true,
36 "directive-class-suffix": true, 36 "directive-class-suffix": true,
37 "pipe-impure": true 37 "pipe-impure": true
diff --git a/client/yarn.lock b/client/yarn.lock
index d868c71af..cbd06d57f 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -8236,9 +8236,9 @@ tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@~1.9.0:
8236 version "1.9.3" 8236 version "1.9.3"
8237 resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" 8237 resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
8238 8238
8239tslint-config-standard@^7.0.0: 8239tslint-config-standard@^8.0.1:
8240 version "7.1.0" 8240 version "8.0.1"
8241 resolved "https://registry.yarnpkg.com/tslint-config-standard/-/tslint-config-standard-7.1.0.tgz#6bcc435a179478e365f6cc62312a561221985760" 8241 resolved "https://registry.yarnpkg.com/tslint-config-standard/-/tslint-config-standard-8.0.1.tgz#e4dd3128e84b0e34b51990b68715a641f2b417e4"
8242 dependencies: 8242 dependencies:
8243 tslint-eslint-rules "^5.3.1" 8243 tslint-eslint-rules "^5.3.1"
8244 8244
diff --git a/package.json b/package.json
index 2d5258fa0..0212dfeed 100644
--- a/package.json
+++ b/package.json
@@ -197,7 +197,7 @@
197 "supertest": "^3.0.0", 197 "supertest": "^3.0.0",
198 "ts-node": "7.0.1", 198 "ts-node": "7.0.1",
199 "tslint": "^5.7.0", 199 "tslint": "^5.7.0",
200 "tslint-config-standard": "^7.0.0", 200 "tslint-config-standard": "^8.0.1",
201 "typescript": "^2.5.2", 201 "typescript": "^2.5.2",
202 "xliff": "^4.0.0" 202 "xliff": "^4.0.0"
203 }, 203 },
diff --git a/scripts/travis.sh b/scripts/travis.sh
index 1d7ebf340..f9fd19512 100755
--- a/scripts/travis.sh
+++ b/scripts/travis.sh
@@ -29,13 +29,13 @@ elif [ "$1" = "api-3" ]; then
29 npm run build:server 29 npm run build:server
30 mocha --timeout 5000 --exit --require ts-node/register/type-check --bail server/tests/api/index-3.ts 30 mocha --timeout 5000 --exit --require ts-node/register/type-check --bail server/tests/api/index-3.ts
31elif [ "$1" = "lint" ]; then 31elif [ "$1" = "lint" ]; then
32 npm run tslint -- --project ./tsconfig.json -c ./tslint.json server.ts "server/**/*.ts" "shared/**/*.ts"
33
32 ( cd client 34 ( cd client
33 npm run lint 35 npm run lint
34 ) 36 )
35elif [ "$1" = "jest" ]; then 37elif [ "$1" = "jest" ]; then
36 ( cd client 38 ( cd client
37 npm run test 39 npm run test
38 ) 40 )
39
40 npm run tslint -- --project ./tsconfig.json -c ./tslint.json server.ts "server/**/*.ts" "shared/**/*.ts"
41fi 41fi
diff --git a/yarn.lock b/yarn.lock
index b63d76c32..5a67caf25 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8416,9 +8416,9 @@ tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
8416 version "1.9.3" 8416 version "1.9.3"
8417 resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" 8417 resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
8418 8418
8419tslint-config-standard@^7.0.0: 8419tslint-config-standard@^8.0.1:
8420 version "7.1.0" 8420 version "8.0.1"
8421 resolved "https://registry.yarnpkg.com/tslint-config-standard/-/tslint-config-standard-7.1.0.tgz#6bcc435a179478e365f6cc62312a561221985760" 8421 resolved "https://registry.yarnpkg.com/tslint-config-standard/-/tslint-config-standard-8.0.1.tgz#e4dd3128e84b0e34b51990b68715a641f2b417e4"
8422 dependencies: 8422 dependencies:
8423 tslint-eslint-rules "^5.3.1" 8423 tslint-eslint-rules "^5.3.1"
8424 8424