Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/288298
Change subject: TEST: DO NOT MERGE
......................................................................
TEST: DO NOT MERGE
This switches our code style sniffer from jscs to eslint
Change-Id: I07e6d51e2f6ade783be8c7240f80073cc0186bcb
---
A .eslintrc
D .jscsrc
M Gruntfile.js
M package.json
4 files changed, 191 insertions(+), 42 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/98/288298/1
diff --git a/.eslintrc b/.eslintrc
new file mode 100644
index 0000000..2c2b8a0
--- /dev/null
+++ b/.eslintrc
@@ -0,0 +1,184 @@
+{
+ "extends": "eslint:recommended",
+ "rules": {
+ "accessor-pairs": "error",
+ "array-bracket-spacing": "off",
+ "array-callback-return": "off",
+ "arrow-body-style": "error",
+ "arrow-parens": "error",
+ "arrow-spacing": "error",
+ "block-scoped-var": "off",
+ "block-spacing": "off",
+ "brace-style": "off",
+ "callback-return": "off",
+ "camelcase": "off",
+ "comma-spacing": "off",
+ "comma-style": [
+ "error",
+ "last"
+ ],
+ "complexity": "off",
+ "computed-property-spacing": "off",
+ "consistent-return": "off",
+ "consistent-this": "off",
+ "curly": "off",
+ "default-case": "off",
+ "dot-location": "off",
+ "dot-notation": "off",
+ "eol-last": "off",
+ "eqeqeq": "off",
+ "func-names": "off",
+ "func-style": "off",
+ "generator-star-spacing": "error",
+ "global-require": "off",
+ "guard-for-in": "off",
+ "handle-callback-err": "error",
+ "id-blacklist": "error",
+ "id-length": "off",
+ "id-match": "error",
+ "indent": "off",
+ "init-declarations": "off",
+ "jsx-quotes": "error",
+ "key-spacing": "off",
+ "keyword-spacing": "off",
+ "linebreak-style": [
+ "error",
+ "windows"
+ ],
+ "lines-around-comment": "off",
+ "max-depth": "off",
+ "max-len": "off",
+ "max-nested-callbacks": "error",
+ "max-params": "off",
+ "max-statements": "off",
+ "max-statements-per-line": "off",
+ "new-parens": "error",
+ "newline-after-var": "off",
+ "newline-before-return": "off",
+ "newline-per-chained-call": "off",
+ "no-alert": "off",
+ "no-array-constructor": "off",
+ "no-bitwise": "off",
+ "no-caller": "off",
+ "no-catch-shadow": "off",
+ "no-confusing-arrow": "error",
+ "no-continue": "off",
+ "no-div-regex": "off",
+ "no-duplicate-imports": "error",
+ "no-else-return": "off",
+ "no-empty-function": "off",
+ "no-eq-null": "off",
+ "no-eval": "off",
+ "no-extend-native": "off",
+ "no-extra-bind": "off",
+ "no-extra-label": "error",
+ "no-extra-parens": "off",
+ "no-floating-decimal": "off",
+ "no-implicit-coercion": [
+ "error",
+ {
+ "boolean": false,
+ "number": false,
+ "string": false
+ }
+ ],
+ "no-implicit-globals": "off",
+ "no-implied-eval": "error",
+ "no-inline-comments": "off",
+ "no-invalid-this": "off",
+ "no-iterator": "error",
+ "no-label-var": "error",
+ "no-lone-blocks": "error",
+ "no-lonely-if": "off",
+ "no-loop-func": "off",
+ "no-magic-numbers": "off",
+ "no-mixed-requires": "error",
+ "no-multi-spaces": "off",
+ "no-multi-str": "error",
+ "no-multiple-empty-lines": "off",
+ "no-native-reassign": "off",
+ "no-negated-condition": "off",
+ "no-nested-ternary": "off",
+ "no-new": "error",
+ "no-new-func": "off",
+ "no-new-object": "error",
+ "no-new-require": "error",
+ "no-new-wrappers": "error",
+ "no-octal-escape": "error",
+ "no-param-reassign": "off",
+ "no-path-concat": "error",
+ "no-plusplus": "off",
+ "no-process-env": "error",
+ "no-process-exit": "error",
+ "no-proto": "off",
+ "no-restricted-globals": "error",
+ "no-restricted-imports": "error",
+ "no-restricted-modules": "error",
+ "no-restricted-syntax": "error",
+ "no-return-assign": "off",
+ "no-script-url": "off",
+ "no-self-compare": "off",
+ "no-sequences": "off",
+ "no-shadow": "off",
+ "no-shadow-restricted-names": "off",
+ "no-spaced-func": "error",
+ "no-sync": "off",
+ "no-ternary": "off",
+ "no-throw-literal": "off",
+ "no-trailing-spaces": "off",
+ "no-undef-init": "error",
+ "no-undefined": "off",
+ "no-underscore-dangle": "off",
+ "no-unmodified-loop-condition": "off",
+ "no-unneeded-ternary": "off",
+ "no-unsafe-finally": "error",
+ "no-unused-expressions": "off",
+ "no-use-before-define": "off",
+ "no-useless-call": "off",
+ "no-useless-computed-key": "error",
+ "no-useless-concat": "off",
+ "no-useless-constructor": "error",
+ "no-useless-escape": "off",
+ "no-var": "off",
+ "no-void": "off",
+ "no-warning-comments": "off",
+ "no-whitespace-before-property": "off",
+ "no-with": "error",
+ "object-curly-spacing": "off",
+ "object-shorthand": "off",
+ "one-var": "off",
+ "one-var-declaration-per-line": "off",
+ "operator-assignment": "off",
+ "operator-linebreak": "off",
+ "padded-blocks": "off",
+ "prefer-arrow-callback": "off",
+ "prefer-const": "error",
+ "prefer-reflect": "off",
+ "prefer-rest-params": "off",
+ "prefer-spread": "off",
+ "prefer-template": "off",
+ "quote-props": "off",
+ "quotes": "off",
+ "radix": "off",
+ "require-jsdoc": "off",
+ "require-yield": "error",
+ "semi": "off",
+ "semi-spacing": "off",
+ "sort-imports": "error",
+ "sort-vars": "off",
+ "space-before-blocks": "off",
+ "space-before-function-paren": "off",
+ "space-in-parens": "off",
+ "space-infix-ops": "off",
+ "space-unary-ops": "off",
+ "spaced-comment": "off",
+ "strict": "off",
+ "template-curly-spacing": "error",
+ "valid-jsdoc": "off",
+ "vars-on-top": "off",
+ "wrap-iife": "off",
+ "wrap-regex": "off",
+ "yield-star-spacing": "error",
+ "yoda": "off"
+ }
+}
\ No newline at end of file
diff --git a/.jscsrc b/.jscsrc
deleted file mode 100644
index f3db218..0000000
--- a/.jscsrc
+++ /dev/null
@@ -1,37 +0,0 @@
-{
- "preset": "wikimedia",
- "es3": true,
-
- "requireVarDeclFirst": null,
-
- "requireDotNotation": { "allExcept": [ "keywords" ] },
- "jsDoc": {
- "checkAnnotations": {
- "preset": "jsduck5",
- "extra": {
- "context": "some",
- "source": "some",
- "see": "some"
- }
- },
- "checkParamNames": true,
- "checkRedundantAccess": true,
- "checkRedundantReturns": true,
- "checkTypes": "strictNativeCase",
- "requireNewlineAfterDescription": true,
- "requireParamTypes": true,
- "requireReturnTypes": true
- },
-
- "excludeFiles": [
- "docs/**",
- "extensions/**",
- "node_modules/**",
- "resources/lib/**",
- "resources/src/jquery.tipsy/**",
- "resources/src/jquery/jquery.farbtastic.js",
- "resources/src/mediawiki.libs/**",
- "skins/**",
- "vendor/**"
- ]
-}
diff --git a/Gruntfile.js b/Gruntfile.js
index 354f048..3da9965 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -4,7 +4,7 @@
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-contrib-watch' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
- grunt.loadNpmTasks( 'grunt-jscs' );
+ grunt.loadNpmTasks( 'grunt-eslint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-karma' );
@@ -21,8 +21,10 @@
},
all: '.'
},
- jscs: {
- all: '.'
+ eslint: {
+ target: [
+ '.'
+ ]
},
jsonlint: {
all: [
@@ -96,7 +98,7 @@
return !!( process.env.MW_SERVER && process.env.MW_SCRIPT_PATH
);
} );
- grunt.registerTask( 'lint', [ 'jshint', 'jscs', 'jsonlint', 'banana' ]
);
+ grunt.registerTask( 'lint', [ 'jshint', 'eslint', 'jsonlint', 'banana'
] );
grunt.registerTask( 'qunit', [ 'assert-mw-env', 'karma:main' ] );
grunt.registerTask( 'test', [ 'lint' ] );
diff --git a/package.json b/package.json
index 394f36e..8536651 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
"grunt-contrib-copy": "1.0.0",
"grunt-contrib-jshint": "1.0.0",
"grunt-contrib-watch": "1.0.0",
- "grunt-jscs": "2.8.0",
+ "grunt-eslint": "18.1.0",
"grunt-jsonlint": "1.0.7",
"grunt-karma": "0.12.2",
"karma": "0.13.22",
--
To view, visit https://gerrit.wikimedia.org/r/288298
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I07e6d51e2f6ade783be8c7240f80073cc0186bcb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
