From 9b75493988888e97e0530c61b5862ab861c9d9dd Mon Sep 17 00:00:00 2001 From: Colin Eberhardt Date: Mon, 5 Oct 2015 08:08:57 +0100 Subject: [PATCH] auto-configured eslint and fixed gruntfile linting failures --- .eslintrc | 153 ++++++++++++++++++++++++++++++++++++++++++++++++++- Gruntfile.js | 22 ++++---- 2 files changed, 163 insertions(+), 12 deletions(-) diff --git a/.eslintrc b/.eslintrc index 728f775e..dfb1bd26 100644 --- a/.eslintrc +++ b/.eslintrc @@ -19,6 +19,157 @@ "define": true }, "rules": { - "quotes": [2, "single"] + "comma-dangle": 2, + "no-cond-assign": 2, + "no-console": 0, + "no-constant-condition": 2, + "no-control-regex": 2, + "no-debugger": 2, + "no-dupe-args": 2, + "no-dupe-keys": 2, + "no-duplicate-case": 2, + "no-empty-class": 0, + "no-empty": 2, + "no-ex-assign": 2, + "no-extra-boolean-cast": 2, + "no-extra-parens": 0, + "no-extra-semi": 2, + "no-func-assign": 2, + "no-inner-declarations": 2, + "no-invalid-regexp": 2, + "no-irregular-whitespace": 2, + "no-negated-in-lhs": 2, + "no-obj-calls": 2, + "no-regex-spaces": 2, + "no-reserved-keys": 0, + "no-sparse-arrays": 2, + "no-unreachable": 2, + "use-isnan": 2, + "valid-jsdoc": 2, + "valid-typeof": 2, + "block-scoped-var": 0, + "complexity": 2, + "consistent-return": 2, + "curly": 2, + "default-case": 0, + "dot-notation": 2, + "dot-location": 0, + "eqeqeq": 0, + "guard-for-in": 0, + "no-alert": 2, + "no-caller": 2, + "no-div-regex": 2, + "no-else-return": 0, + "no-empty-label": 2, + "no-eq-null": 0, + "no-eval": 2, + "no-extend-native": 2, + "no-extra-bind": 2, + "no-fallthrough": 2, + "no-floating-decimal": 2, + "no-implied-eval": 2, + "no-iterator": 2, + "no-labels": 2, + "no-lone-blocks": 2, + "no-loop-func": 2, + "no-multi-spaces": 0, + "no-multi-str": 2, + "no-native-reassign": 2, + "no-new-func": 2, + "no-new-wrappers": 2, + "no-new": 2, + "no-octal-escape": 2, + "no-octal": 2, + "no-param-reassign": 0, + "no-process-env": 2, + "no-proto": 2, + "no-redeclare": 0, + "no-return-assign": 2, + "no-script-url": 2, + "no-self-compare": 0, + "no-sequences": 2, + "no-throw-literal": 2, + "no-unused-expressions": 2, + "no-void": 2, + "no-warning-comments": 0, + "no-with": 2, + "radix": 2, + "vars-on-top": 0, + "wrap-iife": 0, + "yoda": 2, + "strict": 0, + "no-catch-shadow": 2, + "no-delete-var": 2, + "no-label-var": 2, + "no-shadow-restricted-names": 2, + "no-shadow": 0, + "no-undef-init": 2, + "no-undef": 0, + "no-undefined": 0, + "no-unused-vars": 0, + "no-use-before-define": 0, + "handle-callback-err": 2, + "no-mixed-requires": 2, + "no-new-require": 2, + "no-path-concat": 0, + "no-process-exit": 2, + "no-restricted-modules": 2, + "no-sync": 0, + "brace-style": 0, + "camelcase": 2, + "comma-spacing": 2, + "comma-style": 2, + "consistent-this": 2, + "eol-last": 2, + "func-names": 0, + "func-style": 0, + "indent": 0, + "key-spacing": 2, + "linebreak-style": 2, + "new-cap": 2, + "new-parens": 2, + "newline-after-var": 0, + "no-array-constructor": 2, + "no-continue": 0, + "no-inline-comments": 0, + "no-lonely-if": 2, + "no-mixed-spaces-and-tabs": 2, + "no-multiple-empty-lines": 2, + "no-nested-ternary": 2, + "no-new-object": 2, + "no-spaced-func": 2, + "no-ternary": 0, + "no-trailing-spaces": 0, + "no-underscore-dangle": 0, + "no-unneeded-ternary": 2, + "no-wrap-func": 0, + "one-var": 0, + "operator-assignment": 2, + "operator-linebreak": 0, + "padded-blocks": 0, + "quote-props": 0, + "quotes": 0, + "semi-spacing": 2, + "semi": 0, + "sort-vars": 0, + "space-after-keywords": 2, + "space-before-blocks": 2, + "space-before-function-paren": 0, + "space-in-brackets": 0, + "space-in-parens": 0, + "space-infix-ops": 2, + "space-return-throw-case": 2, + "space-unary-ops": 2, + "spaced-line-comment": 0, + "wrap-regex": 2, + "generator-star-spacing": 2, + "no-var": 0, + "object-shorthand": 0, + "max-depth": 2, + "max-len": 0, + "max-params": 0, + "max-statements": 0, + "no-bitwise": 2, + "no-plusplus": 0 } } diff --git a/Gruntfile.js b/Gruntfile.js index 00aafa56..0858aff3 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -3,7 +3,7 @@ module.exports = function(grunt) { var fs = require('fs'); var path = require('path'); - var isWindows = /^win/.test(process.platform); + var isWindows = (/^win/).test(process.platform); require('load-grunt-tasks')(grunt); @@ -25,7 +25,7 @@ module.exports = function(grunt) { config.cTestOutput = 'c_test.exe'; config.cTestCompile = 'cl -nologo -Zi -Tpsrc/__tests__/Layout-test.c -Tpsrc/Layout.c -Tpsrc/Layout-test-utils.c -link -incremental:no -out:"<%= config.cTestOutput %>"'; config.cTestExecute = '<%= config.cTestOutput %>'; - config.cTestClean = ['<%= config.cTestOutput %>','*.obj','*.pdb']; + config.cTestClean = ['<%= config.cTestOutput %>', '*.obj', '*.pdb']; } else { // GCC build (OSX, Linux, ...), assumes gcc is in the path. @@ -42,8 +42,8 @@ module.exports = function(grunt) { dist: { options: { create: ['<%= config.distFolder %>'] - }, - }, + } + } }, clean: { @@ -56,12 +56,12 @@ module.exports = function(grunt) { options: { configFile: '.eslintrc' }, - target: ['<%= config.srcFolder %>/Layout.js'] + target: ['<%= config.srcFolder %>/*.js'] }, includereplace: { options: { - prefix: '// @@', + prefix: '// @@' }, main: { src: '<%= config.srcFolder %>/<%= config.libName %>.js', @@ -125,12 +125,12 @@ module.exports = function(grunt) { else { return src; } - }, + } }, dist: { src: ['<%= config.srcFolder %>/Layout.h', '<%= config.srcFolder %>/Layout.c'], - dest: '<%= config.distFolder %>/css-layout.h', - }, + dest: '<%= config.distFolder %>/css-layout.h' + } }, shell: { @@ -153,8 +153,8 @@ module.exports = function(grunt) { watch: { files: ['src/Layout.js'], - tasks: ['ci'], - }, + tasks: ['ci'] + } }); // Compiles and runs the Java tests