From dfee9614586716e403f1ebd75974d39f7ce94254 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Fri, 23 Feb 2018 16:56:27 +0200 Subject: [PATCH] feature(package) rm jscs, jshint --- .eslintrc | 2 +- .eslintrc.server | 10 +--------- .jscsrc | 20 -------------------- .jshintrc | 24 ------------------------ .travis.yml | 5 +++-- common/util.js | 6 ++---- package.json | 19 +++++++------------ 7 files changed, 14 insertions(+), 72 deletions(-) delete mode 100644 .jscsrc delete mode 100644 .jshintrc diff --git a/.eslintrc b/.eslintrc index 51a63cc0..bbba244c 100644 --- a/.eslintrc +++ b/.eslintrc @@ -2,7 +2,6 @@ "env": { "es6": true, "node": true, - "browser": true }, "parserOptions": { "ecmaVersion": 6, @@ -11,6 +10,7 @@ "rules": { "indent": ["error", 4], "semi": "error", + "no-console": 0, "no-use-before-define": ["error", "nofunc"] }, "extends": [ diff --git a/.eslintrc.server b/.eslintrc.server index ab1bec31..af573922 100644 --- a/.eslintrc.server +++ b/.eslintrc.server @@ -1,20 +1,12 @@ { "env": { - "es6": true, "node": true }, - "parserOptions": { - "ecmaVersion": 6, - "sourceType": "module" - }, "rules": { - "indent": ["error", 4], - "semi": "error", - "no-use-before-define": ["error", "nofunc"], 'no-process-exit': 0 }, "extends": [ - "eslint:recommended", + ".eslintrc", "plugin:node/recommended" ], "plugins": [ diff --git a/.jscsrc b/.jscsrc deleted file mode 100644 index 917a1a86..00000000 --- a/.jscsrc +++ /dev/null @@ -1,20 +0,0 @@ -{ - "preset": "crockford", - "requireSpaceAfterKeywords": false, - "requireCapitalizedConstructors": false, - "requireMultipleVarDecl": false, - "disallowTrailingWhitespace": "ignoreEmptyLines", - "disallowTrailingComma": false, - "disallowDanglingUnderscores": false, - "validateIndentation": false, - "requireCurlyBraces": false, - "requireVarDeclFirst": false, - "requireSpacesInAnonymousFunctionExpression": { - "beforeOpeningCurlyBrace": true - }, - "excludeFiles": [ - "node_modules/**", - "modules/**", - "bower_components/**" - ] -} diff --git a/.jshintrc b/.jshintrc deleted file mode 100644 index 34199ac1..00000000 --- a/.jshintrc +++ /dev/null @@ -1,24 +0,0 @@ -{ - "esversion": 6, - "unused" : true, - "bitwise" : false, - "browser" : true, - "devel" : true, - "eqeqeq" : true, - "jquery" : false, - "newcap" : false, - "noarg" : true, - "node" : true, - "noempty" : true, - "nonew" : true, - "strict" : true, - "undef" : true, - "evil" : true, - "expr" : true, - "quotmark": "single", - "validthis": true, - "-W024": true, - "-W120": true, - "-W079": true, - "-W138": true -} diff --git a/.travis.yml b/.travis.yml index 44940f10..bc041c15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,10 @@ node_js: - 6 script: - - npm run codestyle + - npm run lint - npm run build - - npm run coverage && npm run report + - npm run coverage + - npm run report notifications: email: diff --git a/common/util.js b/common/util.js index 8f0f50b9..3580b685 100644 --- a/common/util.js +++ b/common/util.js @@ -2,8 +2,6 @@ const exec = require('execon'); -const Scope = typeof window !== 'undefined' ? window : global; - module.exports.getStrBigFirst = getStrBigFirst; module.exports.kebabToCamelCase = kebabToCamelCase; @@ -97,7 +95,7 @@ module.exports.findObjByNameInArr = (array, name) => { * @param name */ module.exports.time = (name) => { - exec.ifExist(Scope.console, 'time', [name]); + exec.ifExist(console, 'time', [name]); }; /** @@ -105,7 +103,7 @@ module.exports.time = (name) => { * @param name */ module.exports.timeEnd = (name) => { - exec.ifExist(Scope.console, 'timeEnd', [name]); + exec.ifExist(console, 'timeEnd', [name]); }; function getStrBigFirst(str) { diff --git a/package.json b/package.json index a742695d..c96a8141 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ }, "config": { "dirs": "bin/cloudcmd.js common server", - "dirs_dev": "test bin/release.js webpack.config.js" + "dirs_test": "test bin/release.js webpack.config.js" }, "scripts": { "start": "node bin/cloudcmd.js", @@ -48,21 +48,18 @@ "build:start": "redrun build:client start", "build:start:dev": "redrun build:client:dev start:dev", "security": "nsp check", - "codestyle": "redrun lint spell", "lint": "redrun lint:*", + "lintjs": "redrun lint:client lint:server lint:test", + "lint:server": "eslint -c .eslintrc.server $npm_package_config_dirs", + "lint:test": "eslint $npm_package_config_dirs_test", + "lint:client": "eslint --env browser client", "lint:css": "stylelint css/*.css", - "lint:js": "redrun lint:js:*", - "lint:server": "eslint --rule 'no-console:0' -c .eslintrc.server $npm_package_config_dirs", - "lint:dev": "eslint --rule 'no-console:0' $npm_package_config_dirs_dev", - "lint:js:jshint": "jshint bin client server", - "lint:js:jscs": "jscs --esnext $npm_package_config_dirs", - "lint:client": "eslint --rule 'no-console:0' --env browser client", + "lint:md": "yaspeller .", "fix:lint:client": "redrun lint:client -- --fix", - "fix:lint:dev": "redrun lint:dev -- --fix", + "fix:lint:test": "redrun lint:test -- --fix", "fix:lint:server": "redrun lint:server -- --fix", "test": "tape 'test/**/*.js'", "test:client": "tape 'test/client/**/*.js'", - "spell": "yaspeller .", "wisdom": "redrun build", "wisdom:type": "bin/release.js", "docker:pull:node": "docker pull node", @@ -178,8 +175,6 @@ "html-looks-like": "^1.0.2", "html-webpack-exclude-assets-plugin": "^0.0.5", "html-webpack-plugin": "^2.29.0", - "jscs": "^3.0.1", - "jshint": "^2.8.0", "limier": "^1.0.1", "minor": "^1.2.2", "mkdirp": "^0.5.1",