Merge pull request #13510 from adobe/master

Merge master into release

.eslintrc.js

@@ -7,6 +7,7 @@ module.exports = {
         "no-empty": 1,
         "no-invalid-regexp": 2,
         "no-regex-spaces": 2,
+        "no-unsafe-negation": 1,
         "valid-jsdoc": 0,
         "valid-typeof": 2,
         // http://eslint.org/docs/rules/#best-practices
@@ -23,6 +24,7 @@ module.exports = {
         "no-new-wrappers": 2,
         "no-new": 2,
         "no-proto": 2,
+        "no-redeclare": 1,
         "no-script-url": 2,
         "wrap-iife": [2, "outside"],
         // http://eslint.org/docs/rules/#strict-mode

Gruntfile.js

@@ -268,21 +268,20 @@ module.exports = function (grunt) {
             ]
         },
         watch: {
-            all : {
-                files: ['**/*', '!**/node_modules/**'],
-                tasks: ['eslint']
-            },
-            grunt : {
-                files: ['<%= meta.grunt %>', 'tasks/**/*'],
+            grunt: {
+                files: ['<%= meta.grunt %>'],
                 tasks: ['eslint:grunt']
             },
-            src : {
-                files: ['<%= meta.src %>', 'src/**/*'],
+            src: {
+                files: ['<%= meta.src %>'],
                 tasks: ['eslint:src']
             },
-            test : {
-                files: ['<%= meta.test %>', 'test/**/*'],
+            test: {
+                files: ['<%= meta.test %>'],
                 tasks: ['eslint:test']
+            },
+            options: {
+                spawn: false
             }
         },
         /* FIXME (jasonsanjose): how to handle extension tests */

build.json

@@ -1,6 +1,6 @@
 {
-    "version": "release-1.9-prerelease-2",
-    "title" : "Brackets 1.9 Stable Pre-release for community testing",
-    "description" : "This is a Brackets 1.9 pre-release build.",
+    "version": "release-1.10-prerelease-3",
+    "title" : "Brackets 1.10 Pre-release for community testing",
+    "description" : "This is a Brackets 1.10 3rd pre-release build. This release removes the utf-8 encoding limitation, adds native menus for Linux, provides backward/forward navigation in edit history, Search History with UI, enable/disable default exetensions from extension manager, pseudo selector and AtRules hints in CSS, CSS hints in style attribute value for HTML documents.",
     "prerelease": true
 }