Merge pull request #13184 from adobe/master

Merge master to release for 1.9 release
adobe · Mar 16, 2017 · 83a5fee · 83a5fee
2 parents 3af64fa + 5041da6
commit 83a5fee
Show file tree

Hide file tree

Showing 931 changed files with 8,391 additions and 110,283 deletions.
diff --git a/.eslintrc.json → .eslintrc.js b/.eslintrc.json → .eslintrc.js
@@ -1,11 +1,53 @@
-{
+module.exports = {
     "rules": {
-        "no-bitwise": 2,
+        // the rules below should be sorted in a same way they are sorted on http://eslint.org/docs/rules page
+        // http://eslint.org/docs/rules/#possible-errors
+        "no-caller": 2,
+        "no-control-regex": 2,
+        "no-empty": 1,
+        "no-invalid-regexp": 2,
+        "no-regex-spaces": 2,
+        "valid-jsdoc": 0,
+        "valid-typeof": 2,
+        // http://eslint.org/docs/rules/#best-practices
         "curly": 2,
-        "eqeqeq": 2,
+        "eqeqeq": [2, "smart"],
         "guard-for-in": 0,
+        "no-else-return": 1,
+        "no-fallthrough": 2,
+        "no-invalid-this": 1,
+        "no-iterator": 2,
+        "no-loop-func": 2,
+        "no-multi-str": 2,
+        "no-new-func": 2,
+        "no-new-wrappers": 2,
+        "no-new": 2,
+        "no-proto": 2,
+        "no-script-url": 2,
         "wrap-iife": [2, "outside"],
+        // http://eslint.org/docs/rules/#strict-mode
+        "strict": 2,
+        // http://eslint.org/docs/rules/#variables
+        "no-shadow-restricted-names": 2,
+        "no-shadow": 1,
+        "no-undef": 2,
+        "no-unused-vars": [1, {"vars": "all", "args": "none"}],
         "no-use-before-define": 0,
+        // http://eslint.org/docs/rules/#nodejs-and-commonjs
+        "no-new-require": 2,
+        // http://eslint.org/docs/rules/#stylistic-issues
+        "block-spacing": 1,
+        "brace-style": [1, "1tbs", { allowSingleLine: true }],
+        "camelcase": 1,
+        "comma-dangle": 2,
+        "comma-spacing": 1,
+        "comma-style": [1, "last"],
+        "computed-property-spacing": 1,
+        "eol-last": 1,
+        "func-call-spacing": 1,
+        "indent": [1, 4],
+        "key-spacing": [1, { beforeColon: false, afterColon: true }],
+        "max-len": [1, 120],
         "new-cap": [0, {
             "capIsNewExceptions": [
                 "$.Deferred",
@@ -14,56 +56,27 @@
                 "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": 2,
-        "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-bitwise": 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,
-        "max-len": [1, 120]
+        "no-trailing-spaces": 1,
+        "semi-spacing": 1,
+        "semi": 2
     },
     "globals": {
-        "brackets": false,
-
-        "require": false,
-        "define": false,
         "$": false,
-
-        "window": false,
+        "brackets": false,
+        "clearTimeout": false,
         "console": false,
+        "define": false,
+        "require": false,
         "setTimeout": false,
-        "clearTimeout": false,
-
+        "window": false,
         "ArrayBuffer": false,
-        "XMLHttpRequest": false,
         "Uint32Array": false,
-        "WebSocket": false
+        "WebSocket": false,
+        "XMLHttpRequest": false
     }
-}
+};
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,13 @@ Thumbs.db
 /node_modules
 /npm-debug.log
 
+# ignore node_modules inside src
+/src/node_modules
+
+# ignore files copied from node_modules to src/thirdparty
+/src/thirdparty/CodeMirror
+/src/thirdparty/less.min.js
+
 # ignore compiled files
 /dist
 /src/.index.html
@@ -16,13 +23,16 @@ Thumbs.db
 # ignore everything in the dev extension directory EXCEPT the README
 # (so that the directory is non-empty and can be in git)
 /src/extensions/dev/*
-!/src/extensions/dev/README
+!/src/extensions/dev/README.*
 
 /src/extensions/disabled
 
 # ignore .disabled file for default extensions
 /src/extensions/default/*/.disabled
 
+# generate through grunt
+/src/config.json
+
 #OSX .DS_Store files
 .DS_Store
 
@@ -39,3 +49,5 @@ Thumbs.db
 # Files that can be automatically downloaded that we don't want to ship with our builds
 /src/extensibility/node/node_modules/request/tests/
 
+# Files build by scripts
+/src/thirdparty/semver.browser.js
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "src/thirdparty/CodeMirror"]
-	path = src/thirdparty/CodeMirror
-	url = https://github.com/adobe/CodeMirror2.git
 [submodule "src/thirdparty/path-utils"]
 	path = src/thirdparty/path-utils
 	url = https://github.com/jblas/path-utils.git

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -0,0 +1,74 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at [admin@brackets.io](mailto:admin@brackets.io). All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -69,6 +69,7 @@ module.exports = function (grunt) {
                             'dependencies.js',
                             'thirdparty/requirejs/require.js',
                             'LiveDevelopment/launch.html',
+                            'LiveDevelopment/transports/**',
                             'LiveDevelopment/MultiBrowserImpl/transports/**',
                             'LiveDevelopment/MultiBrowserImpl/launchers/**'
                         ]
@@ -103,13 +104,7 @@ module.exports = function (grunt) {
                             '!extensions/default/*/thirdparty/**/*.htm{,l}',
                             'extensions/dev/*',
                             'extensions/samples/**/*',
-                            'thirdparty/CodeMirror/addon/{,*/}*',
-                            'thirdparty/CodeMirror/keymap/{,*/}*',
-                            'thirdparty/CodeMirror/lib/{,*/}*',
-                            'thirdparty/CodeMirror/mode/{,*/}*',
-                            '!thirdparty/CodeMirror/mode/**/*.html',
-                            '!thirdparty/CodeMirror/**/*test.js',
-                            'thirdparty/CodeMirror/theme/{,*/}*',
+                            'thirdparty/CodeMirror/**',
                             'thirdparty/i18n/*.js',
                             'thirdparty/text/*.js'
                         ]
@@ -122,14 +117,39 @@ module.exports = function (grunt) {
                         src: ['jsTreeTheme.css', 'fonts/{,*/}*.*', 'images/*', 'brackets.min.css*']
                     }
                 ]
+            },
+            thirdparty: {
+                files: [
+                    {
+                        expand: true,
+                        dest: 'src/thirdparty/CodeMirror',
+                        cwd: 'src/node_modules/codemirror',
+                        src: [
+                            'addon/{,*/}*',
+                            'keymap/{,*/}*',
+                            'lib/{,*/}*',
+                            'mode/{,*/}*',
+                            'theme/{,*/}*'
+                        ]
+                    },
+                    {
+                        expand: true,
+                        flatten: true,
+                        dest: 'src/thirdparty',
+                        cwd: 'src/node_modules',
+                        src: [
+                            'less/dist/less.min.js'
+                        ]
+                    }
+                ]
             }
         },
         cleanempty: {
             options: {
                 force: true,
                 files: false
             },
-            src: ['dist/**/*'],
+            src: ['dist/**/*']
         },
         less: {
             dist: {
@@ -276,14 +296,12 @@ module.exports = function (grunt) {
                 specs : '<%= meta.specs %>',
                 /* Keep in sync with test/SpecRunner.html dependencies */
                 vendor : [
-                    'test/polyfills.js', /* For reference to why this polyfill is needed see Issue #7951. The need for this should go away once the version of phantomjs gets upgraded to 2.0 */
+                    // For reference to why this polyfill is needed see Issue #7951.
+                    // The need for this should go away once the version of phantomjs gets upgraded to 2.0
+                    'test/polyfills.js',
+
                     'src/thirdparty/jquery-2.1.3.min.js',
-                    'src/thirdparty/CodeMirror/lib/codemirror.js',
-                    'src/thirdparty/CodeMirror/lib/util/dialog.js',
-                    'src/thirdparty/CodeMirror/lib/util/searchcursor.js',
-                    'src/thirdparty/CodeMirror/addon/edit/closetag.js',
-                    'src/thirdparty/CodeMirror/addon/selection/active-line.js',
-                    'src/thirdparty/less-2.5.1.min.js'
+                    'src/thirdparty/less.min.js'
                 ],
                 helpers : [
                     'test/spec/PhantomHelper.js'
@@ -323,18 +341,19 @@ module.exports = function (grunt) {
     });
 
     // task: install
-    grunt.registerTask('install', ['write-config', 'less', 'npm-install-extensions']);
+    grunt.registerTask('install', ['write-config:dev', 'less', 'npm-install-source', 'pack-web-dependencies']);
 
     // task: test
     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']);
+    grunt.registerTask('set-release', ['update-release-number', 'write-config:dev']);
 
     // task: build
     grunt.registerTask('build', [
+        'write-config:dist',
         'eslint:src',
         'jasmine',
         'clean',
@@ -346,7 +365,7 @@ module.exports = function (grunt) {
         'concat',
         /*'cssmin',*/
         /*'uglify',*/
-        'copy',
+        'copy:dist',
         'npm-install',
         'cleanempty',
         'usemin',

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
@@ -1,6 +1,6 @@
 ### Prerequisites
 
-* [ ] Can you reproduce the problem with `Debug \ Reload Without Extensions`?
+* [ ] Can you reproduce the problem with `Debug -> Reload Without Extensions`?
 * [ ] Did you perform a cursory search to see if your bug or enhancement is already reported?
 * [ ] Did you read the [Troubleshooting guide](https://github.com/adobe/brackets/wiki/Troubleshooting)?
 
@@ -24,4 +24,4 @@ For more information on how to contribute read [here](https://github.com/adobe/b
 ### Versions
 
 Please include the OS and what version of the OS you're running.
-Please include the version of Brackets. You can find it under `Help \ About Brackets`
+Please include the version of Brackets. You can find it under `Help -> About Brackets` (Windows and Linux) or `Brackets -> About Brackets` (macOS)