From f2659ae0b0bae6c1b2ee4dcf331a42e440274c02 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 21 Sep 2018 09:26:02 +0200
Subject: [PATCH] Upgrade tslint rules
---
client/package.json | 2 +-
client/tslint.json | 2 +-
client/yarn.lock | 6 +++---
package.json | 2 +-
scripts/travis.sh | 6 +++---
yarn.lock | 6 +++---
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/client/package.json b/client/package.json
index e050b8d48a..23ce8ce810 100644
--- a/client/package.json
+++ b/client/package.json
@@ -148,7 +148,7 @@
"terser-webpack-plugin": "^1.1.0",
"ts-jest": "^23.1.4",
"tslint": "^5.7.0",
- "tslint-config-standard": "^7.0.0",
+ "tslint-config-standard": "^8.0.1",
"typescript": "2.9",
"video.js": "^7",
"videojs-contextmenu-ui": "^5.0.0",
diff --git a/client/tslint.json b/client/tslint.json
index db852d9f8d..e997088fda 100644
--- a/client/tslint.json
+++ b/client/tslint.json
@@ -31,7 +31,7 @@
"contextual-life-cycle": true,
"trackBy-function": false,
"use-pipe-transform-interface": true,
- "pipe-naming": [true, "camelCase", "my"],
+ "pipe-prefix": [true, "my"],
"component-class-suffix": true,
"directive-class-suffix": true,
"pipe-impure": true
diff --git a/client/yarn.lock b/client/yarn.lock
index d868c71af4..cbd06d57fe 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:
version "1.9.3"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
-tslint-config-standard@^7.0.0:
- version "7.1.0"
- resolved "https://registry.yarnpkg.com/tslint-config-standard/-/tslint-config-standard-7.1.0.tgz#6bcc435a179478e365f6cc62312a561221985760"
+tslint-config-standard@^8.0.1:
+ version "8.0.1"
+ resolved "https://registry.yarnpkg.com/tslint-config-standard/-/tslint-config-standard-8.0.1.tgz#e4dd3128e84b0e34b51990b68715a641f2b417e4"
dependencies:
tslint-eslint-rules "^5.3.1"
diff --git a/package.json b/package.json
index 2d5258fa0d..0212dfeed8 100644
--- a/package.json
+++ b/package.json
@@ -197,7 +197,7 @@
"supertest": "^3.0.0",
"ts-node": "7.0.1",
"tslint": "^5.7.0",
- "tslint-config-standard": "^7.0.0",
+ "tslint-config-standard": "^8.0.1",
"typescript": "^2.5.2",
"xliff": "^4.0.0"
},
diff --git a/scripts/travis.sh b/scripts/travis.sh
index 1d7ebf3403..f9fd195125 100755
--- a/scripts/travis.sh
+++ b/scripts/travis.sh
@@ -29,13 +29,13 @@ elif [ "$1" = "api-3" ]; then
npm run build:server
mocha --timeout 5000 --exit --require ts-node/register/type-check --bail server/tests/api/index-3.ts
elif [ "$1" = "lint" ]; then
+ npm run tslint -- --project ./tsconfig.json -c ./tslint.json server.ts "server/**/*.ts" "shared/**/*.ts"
+
( cd client
npm run lint
)
-elif [ "$1" = "jest" ]; then
+elif [ "$1" = "jest" ]; then
( cd client
npm run test
)
-
- npm run tslint -- --project ./tsconfig.json -c ./tslint.json server.ts "server/**/*.ts" "shared/**/*.ts"
fi
diff --git a/yarn.lock b/yarn.lock
index b63d76c325..5a67caf257 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8416,9 +8416,9 @@ tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
version "1.9.3"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
-tslint-config-standard@^7.0.0:
- version "7.1.0"
- resolved "https://registry.yarnpkg.com/tslint-config-standard/-/tslint-config-standard-7.1.0.tgz#6bcc435a179478e365f6cc62312a561221985760"
+tslint-config-standard@^8.0.1:
+ version "8.0.1"
+ resolved "https://registry.yarnpkg.com/tslint-config-standard/-/tslint-config-standard-8.0.1.tgz#e4dd3128e84b0e34b51990b68715a641f2b417e4"
dependencies:
tslint-eslint-rules "^5.3.1"
--
GitLab