Merge remote-tracking branch 'origin/master' into mkt-use-apm-with-npm3-and-node-4

build/tasks/build-task.coffee

@@ -59,12 +59,6 @@ module.exports = (grunt) ->
       path.join('ohnogit', 'node_modules', 'nodegit', 'node_modules', '.bin')
       path.join('oniguruma', 'deps')
       path.join('less', 'dist')
-      path.join('bootstrap', 'docs')
-      path.join('bootstrap', 'dist')
-      path.join('bootstrap', 'fonts')
-      path.join('bootstrap', '_config.yml')
-      path.join('bootstrap', '_includes')
-      path.join('bootstrap', '_layouts')
       path.join('npm', 'doc')
       path.join('npm', 'html')
       path.join('npm', 'man')
@@ -141,7 +135,7 @@ module.exports = (grunt) ->
     ignoredPaths.push "#{_.escapeRegExp(path.sep)}linker\\.lock$"
     ignoredPaths.push "#{_.escapeRegExp(path.join('build', 'Release') + path.sep)}.+\\.node\\.dSYM"
 
-    # Hunspell dictionaries are only not needed on OS X.
+    # Hunspell dictionaries are only not needed on macOS.
     if process.platform is 'darwin'
       ignoredPaths.push path.join('spellchecker', 'vendor', 'hunspell_dictionaries')
     ignoredPaths = ignoredPaths.map (ignoredPath) -> "(#{ignoredPath})"

build/tasks/codesign-task.coffee

@@ -5,7 +5,7 @@ request = require 'request'
 module.exports = (grunt) ->
   {spawn} = require('./task-helpers')(grunt)
 
-  # Mac OS X code signing
+  # macOS code signing
 
   grunt.registerTask 'codesign:app', 'CodeSign Atom.app', ->
     done = @async()

build/tasks/prebuild-less-task.coffee

@@ -8,24 +8,6 @@ module.exports = (grunt) ->
   cacheMisses = 0
   cacheHits = 0
 
-  compileBootstrap = ->
-    appDir = grunt.config.get('atom.appDir')
-    bootstrapLessPath = path.join(appDir, 'static', 'bootstrap.less')
-    bootstrapCssPath = path.join(appDir, 'static', 'bootstrap.css')
-
-    lessCache = new LessCache
-      cacheDir: temp.mkdirSync('atom-less-cache')
-      fallbackDir: grunt.config.get('prebuild-less.options.cachePath')
-      syncCaches: true
-      resourcePath: path.resolve('.')
-
-    bootstrapCss = lessCache.readFileSync(bootstrapLessPath)
-    grunt.file.write(bootstrapCssPath, bootstrapCss)
-    rm(bootstrapLessPath)
-    rm(path.join(appDir, 'node_modules', 'bootstrap', 'less'))
-    cacheMisses += lessCache.stats.misses
-    cacheHits += lessCache.stats.hits
-
   importFallbackVariables = (lessFilePath) ->
     if lessFilePath.indexOf('static') is 0
       false
@@ -33,8 +15,6 @@ module.exports = (grunt) ->
       true
 
   grunt.registerMultiTask 'prebuild-less', 'Prebuild cached of compiled Less files', ->
-    compileBootstrap()
-
     uiThemes = [
       'atom-dark-ui'
       'atom-light-ui'