Merge branch 'master' of https://github.com/duplicates/brackets into issue-13099

Author: SimonEngage

.eslintignore

@@ -0,0 +1 @@
+/src/extensions/default/brackets-eslint

.eslintrc.js

@@ -24,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

.gitignore

@@ -3,6 +3,9 @@ Thumbs.db
 # ignore jenkins build info
 /build.prop
 
+# package-lock.json
+package-lock.json
+
 # ignore node_modules created by grunt, but not more deeply-nested node_modules
 /node_modules
 /npm-debug.log
@@ -13,6 +16,12 @@ Thumbs.db
 # ignore files copied from node_modules to src/thirdparty
 /src/thirdparty/CodeMirror
 /src/thirdparty/less.min.js
+/src/thirdparty/preact
+/src/thirdparty/preact-compat
+/src/thirdparty/preact-test-utils
+/src/thirdparty/simulate-event
+/src/thirdparty/xtend
+/src/thirdparty/acorn
 
 # ignore compiled files
 /dist
@@ -24,6 +33,7 @@ Thumbs.db
 # (so that the directory is non-empty and can be in git)
 /src/extensions/dev/*
 !/src/extensions/dev/README.*
+/src/extensions/default/brackets-eslint
 
 /src/extensions/disabled
 

.npmrc

@@ -0,0 +1 @@
+package-lock=false

Gruntfile.js

@@ -81,6 +81,7 @@ module.exports = function (grunt) {
                         cwd: 'src/',
                         src: [
                             'extensibility/node/**',
+                            'JSUtils/node/**',
                             '!extensibility/node/spec/**',
                             '!extensibility/node/node_modules/**/{test,tst}/**/*',
                             '!extensibility/node/node_modules/**/examples/**/*',
@@ -140,6 +141,42 @@ module.exports = function (grunt) {
                         src: [
                             'less/dist/less.min.js'
                         ]
+                    },
+                    {
+                        expand: true,
+                        flatten: true,
+                        dest: 'src/thirdparty/preact-compat',
+                        cwd: 'src/node_modules/preact-compat',
+                        src: [
+                            'dist/preact-compat.min.js'
+                        ]
+                    },
+                    {
+                        expand: true,
+                        flatten: true,
+                        dest: 'src/thirdparty/simulate-event',
+                        cwd: 'src/node_modules/simulate-event',
+                        src: [
+                            'simulate-event.js'
+                        ]
+                    },
+                    {
+                        expand: true,
+                        flatten: true,
+                        dest: 'src/thirdparty/xtend',
+                        cwd: 'src/node_modules/xtend',
+                        src: [
+                            'mutable.js',
+                            'immutable.js'
+                        ]
+                    },
+                    {
+                        expand: true,
+                        dest: 'src/thirdparty/acorn',
+                        cwd: 'src/node_modules/acorn',
+                        src: [
+                            'dist/{,*/}*'
+                          ]
                     }
                 ]
             }
@@ -268,21 +305,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 */
@@ -341,7 +377,13 @@ module.exports = function (grunt) {
     });
 
     // task: install
-    grunt.registerTask('install', ['write-config:dev', 'less', 'npm-install-source', 'pack-web-dependencies']);
+    grunt.registerTask('install', [
+        'write-config:dev',
+        'less',
+        'npm-download-default-extensions',
+        'npm-install-source',
+        'pack-web-dependencies'
+    ]);
 
     // task: test
     grunt.registerTask('test', ['eslint', 'jasmine', 'nls-check']);

README.md

@@ -30,13 +30,6 @@ How to install and run Brackets
 
 Installers for the latest stable build for Mac, Windows and Linux (Debian/Ubuntu) can be [downloaded here](http://brackets.io/).
 
-The Linux version has most of the features of the Mac and Windows versions, but
-is still missing a few things. See the [Linux wiki page](https://github.com/adobe/brackets/wiki/Linux-Version)
-for a list of known issues and to find out how you can help.
-
-Additionally, for a list of common Linux installation issues and workarounds you can [visit this guide](https://github.com/adobe/brackets/wiki/Brackets-Linux-Guide).
-
-
 #### Usage
 
 By default, Brackets opens a folder containing some simple "Getting Started" content.
@@ -50,7 +43,7 @@ for a list of new features and known issues in each build.
 
 In addition to the core features built into Brackets, there is a large and growing
 community of developers building extensions that add all sorts of useful functionality.
-See the [Brackets Extension Registry](https://brackets-registry.aboutweb.com/)
+See the [Brackets Extension Registry](https://registry.brackets.io/)
 for a list of available extensions. For installation instructions,
 see the [extensions wiki page](https://github.com/adobe/brackets/wiki/Brackets-Extensions).
 

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.11-prerelease-2",
+    "title" : "Brackets 1.11 2nd Pre-release for community testing",
+    "description" : "This is Brackets 1.11 2nd pre-release build. In this release, CEF has been upgraded for Linux which resolved the much reported libgcrypt dependency, basic es6 support has been added by providing eslint out of the box and making required changes to list Classes/methods/arrow function expressions/generator functions/async functions/class getter-setter methods and much more. ",
     "prerelease": true
 }