From 9bce75925eb972f7a49c25250e636b7b76734475 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Sun, 15 Jan 2017 19:30:14 +0100 Subject: [PATCH] Client: fix lint --- client/config/webpack.dev.js | 1 - client/config/webpack.prod.js | 6 +----- client/package.json | 6 +++--- client/tslint.json | 17 +++++++---------- 4 files changed, 11 insertions(+), 19 deletions(-) diff --git a/client/config/webpack.dev.js b/client/config/webpack.dev.js index cea9d0306..054757748 100644 --- a/client/config/webpack.dev.js +++ b/client/config/webpack.dev.js @@ -1,7 +1,6 @@ const helpers = require('./helpers') const webpackMerge = require('webpack-merge') // used to merge webpack configs const commonConfig = require('./webpack.common.js') // the settings that are common to prod and dev -const path = require('path') /** * Webpack Plugins diff --git a/client/config/webpack.prod.js b/client/config/webpack.prod.js index 64d776f24..51b8a8855 100644 --- a/client/config/webpack.prod.js +++ b/client/config/webpack.prod.js @@ -10,14 +10,10 @@ const commonConfig = require('./webpack.common.js') // the settings that are com * Webpack Plugins */ const DefinePlugin = require('webpack/lib/DefinePlugin') -const ExtractTextPlugin = require('extract-text-webpack-plugin') -const IgnorePlugin = require('webpack/lib/IgnorePlugin') const LoaderOptionsPlugin = require('webpack/lib/LoaderOptionsPlugin') const NormalModuleReplacementPlugin = require('webpack/lib/NormalModuleReplacementPlugin') -const ProvidePlugin = require('webpack/lib/ProvidePlugin') const UglifyJsPlugin = require('webpack/lib/optimize/UglifyJsPlugin') const WebpackMd5Hash = require('webpack-md5-hash') -const V8LazyParseWebpackPlugin = require('v8-lazy-parse-webpack-plugin') /** * Webpack Constants @@ -274,7 +270,7 @@ module.exports = function (env) { [/\*/, /(?:)/], [/\[?\(?/, /(?:)/] ], - customAttrAssign: [/\)?\]?=/] + customAttrAssign: [/\)?]?=/] }, // FIXME: Remove diff --git a/client/package.json b/client/package.json index d03a1f8a2..3a28d5853 100644 --- a/client/package.json +++ b/client/package.json @@ -70,8 +70,8 @@ "string-replace-loader": "^1.0.3", "style-loader": "^0.13.1", "ts-helpers": "^1.1.1", - "tslint": "3.15.1", - "tslint-loader": "^2.1.4", + "tslint": "~4.3.1", + "tslint-loader": "^3.3.0", "typescript": "~2.1.0", "url-loader": "^0.5.7", "v8-lazy-parse-webpack-plugin": "^0.3.0", @@ -85,7 +85,7 @@ "zone.js": "~0.7.2" }, "devDependencies": { - "codelyzer": "0.0.28", + "codelyzer": "2.0.0-beta.4", "standard": "^8.0.0" } } diff --git a/client/tslint.json b/client/tslint.json index 0cffea582..5b2c1c505 100644 --- a/client/tslint.json +++ b/client/tslint.json @@ -14,14 +14,11 @@ ], "no-arg": true, "no-construct": true, - "no-duplicate-key": true, "no-duplicate-variable": true, "no-empty": true, "no-eval": true, "no-trailing-whitespace": true, "no-unused-expression": true, - "no-unused-variable": true, - "no-unreachable": true, "no-use-before-declare": true, "one-line": [true, "check-open-brace", @@ -35,24 +32,24 @@ "triple-equals": true, "variable-name": false, - "directive-selector-name": [true, "camelCase"], - "component-selector-name": [true, "kebab-case"], - "directive-selector-type": [true, "attribute"], - "component-selector-type": [true, "element"], - "directive-selector-prefix": [true, "my"], - "component-selector-prefix": [true, "my"], + "directive-selector": [true, "attribute", "my", "camelCase"], + "component-selector": [true, "element", "my", "kebab-case"], "use-input-property-decorator": true, "use-output-property-decorator": true, "use-host-property-decorator": true, "no-attribute-parameter-decorator": true, "no-input-rename": true, "no-output-rename": true, - "no-forward-ref" :true, + "no-forward-ref": true, "use-life-cycle-interface": true, "use-pipe-transform-interface": true, "pipe-naming": [true, "camelCase", "my"], "component-class-suffix": true, "directive-class-suffix": true, + "import-destructuring-spacing": true, + "templates-use-public": true, + "no-access-missing-member": true, + "invoke-injectable": true, "typedef-whitespace": [ true, { -- 2.25.1