From d3a2fe473f9ac4cd5c9022306299da1b2d1277d7 Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Mon, 6 Aug 2018 18:15:18 +0800 Subject: [PATCH] Fix lint errors --- package-lock.json | 65 +++++++++++++++++++++++++++++++++++++++++++++++ package.json | 3 ++- src/animation.ts | 4 +-- 3 files changed, 68 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9e0c420..8ee42a7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1475,6 +1475,15 @@ } } }, + "code-excerpt": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/code-excerpt/-/code-excerpt-2.1.1.tgz", + "integrity": "sha512-tJLhH3EpFm/1x7heIW0hemXJTUU5EWl2V0EIX558jp05Mt1U6DVryCgkp3l37cxqs+DNbNgxG43SkwJXpQ14Jw==", + "dev": true, + "requires": { + "convert-to-spaces": "1.0.2" + } + }, "collection-visit": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", @@ -1712,6 +1721,12 @@ "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", "dev": true }, + "convert-to-spaces": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/convert-to-spaces/-/convert-to-spaces-1.0.2.tgz", + "integrity": "sha1-fj5Iu+bZl7FBfdyihoIEtNPYVxU=", + "dev": true + }, "cookie": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", @@ -9435,6 +9450,56 @@ } } }, + "tslint-formatter-beauty": { + "version": "3.0.0-beta.2", + "resolved": "https://registry.npmjs.org/tslint-formatter-beauty/-/tslint-formatter-beauty-3.0.0-beta.2.tgz", + "integrity": "sha1-bpLynLpaAdtZ4zERnWYTUg7MZxk=", + "dev": true, + "requires": { + "@babel/highlight": "7.0.0-beta.52", + "ansi-styles": "3.2.1", + "chalk": "2.4.1", + "code-excerpt": "2.1.1", + "log-symbols": "2.2.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.4.0" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "supports-color": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + } + } + }, "tsscmp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz", diff --git a/package.json b/package.json index a05127d..d6f1e65 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "main": "dist/skinview3d.js", "scripts": { "build": "rollup -c", - "lint": "tslint -c tslint.json src/**.ts", + "lint": "tslint --formatters-dir ./node_modules/tslint-formatter-beauty -t beauty -p .", "dev": "npm-run-all --parallel watch serve", "watch": "rollup -w -c", "test": "karma start && npm run lint", @@ -56,6 +56,7 @@ "rollup-plugin-uglify": "^4.0.0", "ts-loader": "^4.4.2", "tslint": "^5.10.0", + "tslint-formatter-beauty": "^3.0.0-beta.2", "typescript": "^2.8.3", "uglify-es": "^3.3.10", "url-loader": "^1.0.1", diff --git a/src/animation.ts b/src/animation.ts index 76c6a7e..6c2ecc6 100644 --- a/src/animation.ts +++ b/src/animation.ts @@ -14,9 +14,7 @@ export interface IAnimation { play(player: PlayerObject, time: number): void; } -export interface AnimationFn { - (player: PlayerObject, time: number): void -} +export type AnimationFn = (player: PlayerObject, time: number) => void; export type Animation = AnimationFn | IAnimation; export class AnimationHandle implements IAnimation {