Merge pull request #11693 from ficristo/eslint

Eslint
adobe · Dec 8, 2015 · 79f3e2c · 79f3e2c
2 parents 44487b7 + c037d87
commit 79f3e2c
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 87 deletions.
diff --git a/.brackets.json b/.brackets.json
@@ -10,7 +10,7 @@
     "defaultExtension": "js",
     "language": {
         "javascript": {
-            "linting.prefer": ["JSLint", "JSHint"],
+            "linting.prefer": ["ESLint"],
             "linting.usePreferredOnly": true
         }
     },

diff --git a/.eslintrc b/.eslintrc
@@ -0,0 +1,71 @@
+{
+    "env": {
+        "node": true
+    },
+    "rules": {
+        "no-bitwise": 0,
+        "curly": 2,
+        "eqeqeq": 2,
+        "guard-for-in": 0,
+        "wrap-iife": [2, "outside"],
+        "no-use-before-define": 0,
+        "new-cap": [0, {
+            "capIsNewExceptions": [
+                "$.Deferred",
+                "$.Event",
+                "CodeMirror.Pos",
+                "Immutable.Map",
+                "Immutable.List",
+                "JSLINT"
+            ]}],
+        "no-caller": 2,
+        "no-empty": 0,
+        "no-new": 2,
+        "no-invalid-regexp": 2,
+        "no-control-regex": 2,
+        "no-regex-spaces": 2,
+        "no-undef": 2,
+        "strict": 0,
+        "no-unused-vars": [0, {"vars": "all", "args": "none"}],
+        "semi": 2,
+
+        "no-iterator": 2,
+        "no-loop-func": 2,
+        "no-multi-str": 2,
+        "no-fallthrough": 2,
+        "no-proto": 2,
+        "no-script-url": 2,
+        "no-shadow": 0,
+        "no-shadow-restricted-names": 2,
+        "no-new-func": 2,
+        "no-new-wrappers": 2,
+        "no-new-require": 2,
+        "new-parens": 2,
+        "no-new-object": 2,
+        "no-invalid-this": 0,
+        indent: [0, 4],
+
+        "valid-jsdoc": 0,
+        "valid-typeof": 2,
+
+        "no-trailing-spaces": 0,
+        "eol-last": 0
+    },
+    "globals": {
+        "brackets": false,
+
+        "window": false,
+        // Resemble a browser environment.
+        "alert": false,
+        "document": false,
+        "localStorage": false,
+        "navigator": false,
+        "setTimeout": false,
+
+        "require": false,
+        "define": false,
+        "$": false,
+        "PathUtils": false,
+        "Mustache": false
+    }
+}
diff --git a/.jshintrc b/.jshintrc
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -25,7 +25,7 @@ module.exports = function (grunt) {
     'use strict';
 
     // load dependencies
-    require('load-grunt-tasks')(grunt, {pattern: ['grunt-contrib-*', 'grunt-targethtml', 'grunt-usemin', 'grunt-cleanempty']});
+    require('load-grunt-tasks')(grunt, {pattern: ['grunt-contrib-*', 'grunt-targethtml', 'grunt-usemin', 'grunt-cleanempty', 'grunt-eslint']});
     grunt.loadTasks('tasks');
 
     // Project configuration.
@@ -241,19 +241,19 @@ module.exports = function (grunt) {
         watch: {
             all : {
                 files: ['**/*', '!**/node_modules/**'],
-                tasks: ['jshint']
+                tasks: ['eslint']
             },
             grunt : {
                 files: ['<%= meta.grunt %>', 'tasks/**/*'],
-                tasks: ['jshint:grunt']
+                tasks: ['eslint:grunt']
             },
             src : {
                 files: ['<%= meta.src %>', 'src/**/*'],
-                tasks: ['jshint:src']
+                tasks: ['eslint:src']
             },
             test : {
                 files: ['<%= meta.test %>', 'test/**/*'],
-                tasks: ['jshint:test']
+                tasks: ['eslint:test']
             }
         },
         /* FIXME (jasonsanjose): how to handle extension tests */
@@ -299,13 +299,12 @@ module.exports = function (grunt) {
         'jasmine_node': {
             projectRoot: 'src/extensibility/node/spec/'
         },
-        jshint: {
+        eslint: {
             grunt:  '<%= meta.grunt %>',
             src:    '<%= meta.src %>',
             test:   '<%= meta.test %>',
-            /* use strict options to mimic JSLINT until we migrate to JSHINT in Brackets */
             options: {
-                jshintrc: '.jshintrc'
+                configFile: '.eslintrc'
             }
         },
         shell: {
@@ -320,16 +319,16 @@ module.exports = function (grunt) {
     grunt.registerTask('install', ['write-config', 'less']);
 
     // task: test
-    grunt.registerTask('test', ['jshint', 'jasmine', 'nls-check']);
-//    grunt.registerTask('test', ['jshint', 'jasmine', 'jasmine_node']);
+    grunt.registerTask('test', ['eslint', 'jasmine', 'nls-check']);
+//    grunt.registerTask('test', ['eslint', 'jasmine', 'jasmine_node', 'nls-check']);
 
     // task: set-release
     // Update version number in package.json and rewrite src/config.json
     grunt.registerTask('set-release', ['update-release-number', 'write-config']);
 
     // task: build
     grunt.registerTask('build', [
-        'jshint:src',
+        'eslint:src',
         'jasmine',
         'clean',
         'less',

diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
         "grunt-cli": "0.1.9",
         "phantomjs": "1.9.18",
         "grunt-lib-phantomjs": "0.3.0",
-        "grunt-contrib-jshint": "0.6.0",
+        "grunt-eslint": "17.1.0",
         "grunt-contrib-watch": "0.4.3",
         "grunt-contrib-jasmine": "0.4.2",
         "grunt-template-jasmine-requirejs": "0.1.0",
@@ -36,7 +36,6 @@
         "load-grunt-tasks": "0.2.0",
         "q": "0.9.2",
         "semver": "^4.1.0",
-        "jshint": "2.1.4",
         "xmldoc": "^0.1.2",
         "grunt-cleanempty": "1.0.3"
     },

diff --git a/src/config.json b/src/config.json
@@ -20,7 +20,7 @@
         "extension_url": "https://s3.amazonaws.com/extend.brackets/{0}/{0}-{1}.zip",
         "linting.enabled_by_default": true,
         "build_timestamp": "",
-        "healthDataServerURL" : "https://healthdev.brackets.io/healthDataLog"
+        "healthDataServerURL": "https://healthdev.brackets.io/healthDataLog"
     },
     "name": "Brackets",
     "version": "1.6.0-0",
@@ -42,7 +42,7 @@
         "grunt-cli": "0.1.9",
         "phantomjs": "1.9.18",
         "grunt-lib-phantomjs": "0.3.0",
-        "grunt-contrib-jshint": "0.6.0",
+        "grunt-eslint": "17.1.0",
         "grunt-contrib-watch": "0.4.3",
         "grunt-contrib-jasmine": "0.4.2",
         "grunt-template-jasmine-requirejs": "0.1.0",
@@ -59,7 +59,6 @@
         "load-grunt-tasks": "0.2.0",
         "q": "0.9.2",
         "semver": "^4.1.0",
-        "jshint": "2.1.4",
         "xmldoc": "^0.1.2",
         "grunt-cleanempty": "1.0.3"
     },