Merge pull request #592 from adobe/master

Merge master into release for 1.8 release

.brackets.json

@@ -0,0 +1,23 @@
+{
+    "jslint.options": {
+        "vars": true,
+        "plusplus": true,
+        "node": true,
+        "browser": false,
+        "devel": true,
+        "nomen": true,
+        "indent": 4,
+        "maxerr": 50,
+        "regexp": true,
+        "es5": true
+    },
+    "defaultExtension": "js",
+    "language": {
+        "javascript": {
+            "linting.prefer": ["ESLint", "JSLint"],
+            "linting.usePreferredOnly": true
+        }
+    },
+    "spaceUnits": 4,
+    "useTabChar": false
+}

.eslintignore

@@ -0,0 +1,2 @@
+# Third party modules
+**/thirdparty/**

.eslintrc.json

@@ -0,0 +1,46 @@
+{
+    "env": {
+        "node": true
+    },
+    "rules": {
+        "no-bitwise": 2,
+        "curly": 2,
+        "eqeqeq": 2,
+        "guard-for-in": 2,
+        "wrap-iife": [2, "outside"],
+        "no-use-before-define": 2,
+        "new-cap": 2,
+        "no-caller": 2,
+        "no-empty": 2,
+        "no-new": 2,
+        "no-invalid-regexp": 2,
+        "no-control-regex": 2,
+        "no-regex-spaces": 2,
+        "no-undef": 2,
+        "strict": 2,
+        "no-unused-vars": [2, {"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": 2,
+        "indent": [2, 4],
+
+        "valid-jsdoc": 0,
+        "valid-typeof": 2,
+
+        "no-trailing-spaces": [2, { "skipBlankLines": true }],
+        "eol-last": 2
+    }
+}

.gitignore

@@ -6,10 +6,15 @@ xcodebuild/*
 /npm-debug.log
 /downloads
 
-appshell.xcodeproj
-Brackets.vcxproj
-appshell.sln
-libcef_dll_wrapper.vcxproj
+*.xcodeproj
+*.VC.db
+*.VC.VC.opendb
+.vs/
+.vscode/
+*.vcxproj
+*.vcxproj.filters
+*.vcxproj.user
+*.sln
 
 *.pbxuser
 *.perspective
@@ -24,18 +29,17 @@ libcef_dll_wrapper.vcxproj
 *.sdf
 *.opensdf
 *.suo
-*.vcxproj.filters
-*.vcxproj.user
 *.log
 *.dmg
 
-Debug
-Release
-Resources
-deps
-include
+/Debug
+/Release
+/Resources
+/deps
+/include
 ipch
-libcef_dll
+/libcef_dll
+/out
 tools
 
 /installer/mac/staging/
@@ -51,8 +55,7 @@ fr-fr.mst
 appshell_extensions_js.o
 Makefile
 appshell.Makefile
-Brackets.target.mk
-libcef_dll_wrapper.target.mk
+*.target.mk
 appshell/gtk
 appshell/gtk/*
 

Gruntfile.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Adobe Systems Incorporated. All rights reserved.
+ * Copyright (c) 2013 - present Adobe Systems Incorporated. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,13 +20,11 @@
  * DEALINGS IN THE SOFTWARE.
  *
  */
-/*jslint regexp:true*/
-/*global module, require, process*/
-module.exports = function (grunt) {
-    "use strict";
 
+"use strict";
+
+module.exports = function (grunt) {
     var common  = require("./tasks/common")(grunt),
-        resolve = common.resolve,
         platform = common.platform(),
         staging;
 
@@ -71,7 +69,7 @@ module.exports = function (grunt) {
             },
             "node-mac": {
                 "dest"      : "<%= downloads %>",
-                "src"       : "http://nodejs.org/dist/v<%= node.version %>/node-v<%= node.version %>-darwin-x86.tar.gz"
+                "src"       : "http://nodejs.org/dist/v<%= node.version %>/node-v<%= node.version %>-darwin-x64.tar.gz"
             },
             /* win */
             "cef-win": {
@@ -84,8 +82,9 @@ module.exports = function (grunt) {
             },
             "node-win": {
                 "dest"      : "<%= downloads %>",
-                "src"       : ["http://nodejs.org/dist/v<%= node.version %>/node.exe",
-                               "http://nodejs.org/dist/npm/npm-<%= npm.version %>.zip"]
+                "src"       : process.arch === "x64" ?
+                                "http://nodejs.org/dist/v<%= node.version %>/win-x64/node.exe" :
+                                "http://nodejs.org/dist/v<%= node.version %>/win-x86/node.exe"
             }
         },
         "clean": {
@@ -160,7 +159,10 @@ module.exports = function (grunt) {
                             "Brackets",
                             "Brackets-node",
                             "cef.pak",
-                            "devtools_resources.pak"
+                            "cef_100_percent.pak",
+                            "cef_200_percent.pak",
+                            "devtools_resources.pak",
+                            "icudtl.dat",
                         ],
                         "dest"      : "<%= build.staging %>"
                     },
@@ -204,10 +206,14 @@ module.exports = function (grunt) {
                 "dest"      : "deps/cef"
             }
         },
-        "jshint": {
-            "all"           : ["Gruntfile.js", "tasks/**/*.js"],
+        "eslint": {
+            "all"           : [
+                "Gruntfile.js",
+                "tasks/**/*.js",
+                "appshell/node-core/*.js"
+            ],
             "options": {
-                "jshintrc"  : ".jshintrc"
+                "quiet"     : true
             }
         },
         "build": {
@@ -229,15 +235,12 @@ module.exports = function (grunt) {
             "version"       : "3.2623.1397"
         },
         "node": {
-            "version"       : "0.10.24"
-        },
-        "npm": {
-            "version"       : "1.2.11"
+            "version"       : "6.3.1"
         }
     });
 
     grunt.loadTasks("tasks");
-    grunt.loadNpmTasks("grunt-contrib-jshint");
+    grunt.loadNpmTasks("grunt-eslint");
     grunt.loadNpmTasks("grunt-contrib-copy");
     grunt.loadNpmTasks("grunt-contrib-clean");
     grunt.loadNpmTasks("grunt-curl");

LICENSE

@@ -1,19 +1,19 @@
 Copyright (c) 2012 - present Adobe Systems Incorporated. All rights reserved.
- 
+
 Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"), 
-to deal in the Software without restriction, including without limitation 
-the rights to use, copy, modify, merge, publish, distribute, sublicense, 
-and/or sell copies of the Software, and to permit persons to whom the 
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
 Software is furnished to do so, subject to the following conditions:
- 
+
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
- 
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.