Merge branch 'master' into ns-mb-detangle-editor

build/Gruntfile.coffee

@@ -84,7 +84,6 @@ module.exports = (grunt) ->
         'src/**/*.coffee'
         'spec/*.coffee'
         '!spec/*-spec.coffee'
-        'exports/**/*.coffee'
         'static/**/*.coffee'
       ]
       dest: appDir
@@ -145,6 +144,13 @@ module.exports = (grunt) ->
         dest: path.join(appDir, jsFile)
       })
 
+  for jsFile in glob.sync("exports/**/*.js")
+    if usesBabel(jsFile)
+      babelConfig.dist.files.push({
+        src: [jsFile]
+        dest: path.join(appDir, jsFile)
+      })
+
   for child in fs.readdirSync('node_modules') when child isnt '.bin'
     directory = path.join('node_modules', child)
     metadataPath = path.join(directory, 'package.json')
@@ -204,7 +210,6 @@ module.exports = (grunt) ->
         configFile: 'coffeelint.json'
       src: [
         'dot-atom/**/*.coffee'
-        'exports/**/*.coffee'
         'src/**/*.coffee'
       ]
       build: [
@@ -217,6 +222,7 @@ module.exports = (grunt) ->
 
     standard:
       src: [
+        'exports/**/*.js'
         'src/**/*.js'
         'static/*.js'
       ]

src/config-schema.coffee

@@ -112,7 +112,16 @@ module.exports =
         description: 'Allow items to be previewed without adding them to a pane permanently, such as when single clicking files in the tree view.'
         type: 'boolean'
         default: true
-
+      telemetryConsent:
+        description: 'Allow usage statistics and exception reports to be sent to the Atom team to help improve the product.'
+        title: 'Send Telemetry to the Atom Team'
+        type: 'string'
+        default: 'undecided'
+        enum: [
+          {value: 'limited', description: 'Allow limited anonymous usage stats, exception and crash reporting'}
+          {value: 'no', description: 'Do not send any telemetry data'}
+          {value: 'undecided', description: 'Undecided (Atom will ask again next time it is launched)'}
+        ]
   editor:
     type: 'object'
     properties: