From cfde9954f201e158e547798801d466baed2695fc Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 10 Feb 2015 16:35:39 -0800
Subject: [PATCH 01/40] Add grunt task to print duplicate modules

---
 build/tasks/output-module-counts.coffee | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 build/tasks/output-module-counts.coffee

diff --git a/build/tasks/output-module-counts.coffee b/build/tasks/output-module-counts.coffee
new file mode 100644
index 000000000..4813cb336
--- /dev/null
+++ b/build/tasks/output-module-counts.coffee
@@ -0,0 +1,22 @@
+path = require 'path'
+
+module.exports = (grunt) ->
+  grunt.registerTask 'output-module-counts', 'Log modules where more than one copy exists in node_modules', ->
+    nodeModulesDir = path.resolve(__dirname, '..', '..', 'node_modules')
+
+    modules = {}
+    grunt.file.recurse nodeModulesDir, (absolutePath, rootPath, relativePath, fileName) ->
+      return if fileName isnt 'package.json'
+
+      {name} = grunt.file.readJSON(absolutePath)
+      modules[name] ?= 0
+      modules[name]++
+
+    sortedNames = Object.keys(modules).sort (name1, name2) ->
+      diff = modules[name2] - modules[name1]
+      diff = name1.localeCompare(name2) if diff is 0
+      diff
+
+    sortedNames.forEach (name) ->
+      count = modules[name]
+      grunt.log.error "#{name}: #{count}" if count > 1

From d4526bb4db8def5724fde11165262716f9480af3 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 10 Feb 2015 16:45:55 -0800
Subject: [PATCH 02/40] :arrow_up: text-buffer@4.1.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 39ae80c47..75b73c915 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "space-pen": "3.8.2",
     "stacktrace-parser": "0.1.1",
     "temp": "0.7.0",
-    "text-buffer": "^4.1.1",
+    "text-buffer": "^4.1.2",
     "theorist": "^1.0.2",
     "underscore-plus": "^1.6.6",
     "vm-compatibility-layer": "0.1.0"

From ba5859044d9236b214c20ed8a2635c8343567cef Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 10 Feb 2015 16:51:51 -0800
Subject: [PATCH 03/40] :arrow_up: exception-reporting@0.22

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 75b73c915..aa0f9765c 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
     "deprecation-cop": "0.36.0",
     "dev-live-reload": "0.41.0",
     "encoding-selector": "0.18.0",
-    "exception-reporting": "0.21.0",
+    "exception-reporting": "0.22.0",
     "find-and-replace": "0.156.0",
     "fuzzy-finder": "0.65.0",
     "git-diff": "0.51.0",

From c6a64637313c60222e05b7bb02ddb24ea57dbf72 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 10 Feb 2015 16:53:34 -0800
Subject: [PATCH 04/40] :arrow_up: grim@1.1.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index aa0f9765c..a2da5ac6a 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "fstream": "0.1.24",
     "fuzzaldrin": "^2.1",
     "git-utils": "^3.0.0",
-    "grim": "1.1.0",
+    "grim": "1.1.1",
     "guid": "0.0.10",
     "jasmine-json": "~0.0",
     "jasmine-tagged": "^1.1.2",

From e139e5b0faf3823b18d224d4c8372e418b7f773b Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 10 Feb 2015 16:57:29 -0800
Subject: [PATCH 05/40] :arrow_up: text-buffer@4.1.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a2da5ac6a..c33eeea8e 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "space-pen": "3.8.2",
     "stacktrace-parser": "0.1.1",
     "temp": "0.7.0",
-    "text-buffer": "^4.1.2",
+    "text-buffer": "^4.1.3",
     "theorist": "^1.0.2",
     "underscore-plus": "^1.6.6",
     "vm-compatibility-layer": "0.1.0"

From fc507816238fe0174e2129dd6839532b208d141c Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 10 Feb 2015 17:00:24 -0800
Subject: [PATCH 06/40] :arrow_up: service-hub@0.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c33eeea8e..1dcf72d24 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
     "season": "^5.1.2",
     "semver": "2.2.1",
     "serializable": "^1",
-    "service-hub": "^0.2.0",
+    "service-hub": "^0.3.0",
     "space-pen": "3.8.2",
     "stacktrace-parser": "0.1.1",
     "temp": "0.7.0",

From 35c94936405278d0f9f1a17ac96ef404b681a020 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 10 Feb 2015 17:03:45 -0800
Subject: [PATCH 07/40] :arrow_up: atom-keymap@3.1.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1dcf72d24..cc45b0fdd 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
   "dependencies": {
     "6to5-core": "^3.0.14",
     "async": "0.2.6",
-    "atom-keymap": "^3.1.0",
+    "atom-keymap": "^3.1.1",
     "bootstrap": "git+https://github.com/atom/bootstrap.git#6af81906189f1747fd6c93479e3d998ebe041372",
     "clear-cut": "0.4.0",
     "coffee-script": "1.8.0",

From e0654d62e8e3fb571a9538c0573557de32629443 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 10 Feb 2015 17:22:59 -0800
Subject: [PATCH 08/40] Dedupe semver

---
 package.json     | 4 ++--
 script/bootstrap | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index cc45b0fdd..5cc5153f3 100644
--- a/package.json
+++ b/package.json
@@ -58,9 +58,9 @@
     "scoped-property-store": "^0.16.2",
     "scrollbar-style": "^2.0.0",
     "season": "^5.1.2",
-    "semver": "2.2.1",
+    "semver": "~4.2",
     "serializable": "^1",
-    "service-hub": "^0.3.0",
+    "service-hub": "^0.4.0",
     "space-pen": "3.8.2",
     "stacktrace-parser": "0.1.1",
     "temp": "0.7.0",
diff --git a/script/bootstrap b/script/bootstrap
index 4dd60e227..be7b5ff02 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -37,7 +37,7 @@ function bootstrap() {
   var initialNpmCommand = fs.existsSync(npmPath) ? npmPath : 'npm';
   var npmFlags = ' --userconfig=' + path.resolve('.npmrc') + ' ';
 
-  var packagesToDedupe = ['fs-plus', 'humanize-plus', 'oniguruma', 'roaster', 'season', 'grim', 'q'];
+  var packagesToDedupe = ['fs-plus', 'humanize-plus', 'oniguruma', 'roaster', 'season', 'grim', 'q', 'semver'];
 
   var buildInstallCommand = initialNpmCommand + npmFlags + 'install';
   var buildInstallOptions = {cwd: path.resolve(__dirname, '..', 'build')};

From c60e4345ed9386cb96cbbe6c37c1022747793d25 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 10 Feb 2015 17:34:43 -0800
Subject: [PATCH 09/40] Add versions to output

---
 build/tasks/output-module-counts.coffee | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/build/tasks/output-module-counts.coffee b/build/tasks/output-module-counts.coffee
index 4813cb336..df4263a62 100644
--- a/build/tasks/output-module-counts.coffee
+++ b/build/tasks/output-module-counts.coffee
@@ -8,15 +8,16 @@ module.exports = (grunt) ->
     grunt.file.recurse nodeModulesDir, (absolutePath, rootPath, relativePath, fileName) ->
       return if fileName isnt 'package.json'
 
-      {name} = grunt.file.readJSON(absolutePath)
-      modules[name] ?= 0
-      modules[name]++
+      {name, version} = grunt.file.readJSON(absolutePath)
+      modules[name] ?= {versions: {}, count: 0}
+      modules[name].count++
+      modules[name].versions[version] = true
 
     sortedNames = Object.keys(modules).sort (name1, name2) ->
-      diff = modules[name2] - modules[name1]
+      diff = modules[name2].count - modules[name1].count
       diff = name1.localeCompare(name2) if diff is 0
       diff
 
     sortedNames.forEach (name) ->
-      count = modules[name]
-      grunt.log.error "#{name}: #{count}" if count > 1
+      {count, versions} = modules[name]
+      grunt.log.error "#{name}: #{count} (#{Object.keys(versions).join(', ')})" if count > 1

From f6742ac45abbb87310072fa0c055cfd9a3fd9763 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 10 Feb 2015 17:37:24 -0800
Subject: [PATCH 10/40] Dedupe atom-space-pen-views

---
 script/bootstrap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/bootstrap b/script/bootstrap
index be7b5ff02..4f574f3d2 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -37,7 +37,7 @@ function bootstrap() {
   var initialNpmCommand = fs.existsSync(npmPath) ? npmPath : 'npm';
   var npmFlags = ' --userconfig=' + path.resolve('.npmrc') + ' ';
 
-  var packagesToDedupe = ['fs-plus', 'humanize-plus', 'oniguruma', 'roaster', 'season', 'grim', 'q', 'semver'];
+  var packagesToDedupe = ['fs-plus', 'humanize-plus', 'oniguruma', 'roaster', 'season', 'grim', 'q', 'semver', 'atom-space-pen-views'];
 
   var buildInstallCommand = initialNpmCommand + npmFlags + 'install';
   var buildInstallOptions = {cwd: path.resolve(__dirname, '..', 'build')};

From 1087d184402f2f929539d08d6b6ed0aa26edf1ee Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 10 Feb 2015 17:41:30 -0800
Subject: [PATCH 11/40] :arrow_up: archive-view@0.48

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5cc5153f3..3244d2fb6 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,7 @@
     "one-light-ui": "0.3.0",
     "solarized-dark-syntax": "0.32.0",
     "solarized-light-syntax": "0.19.0",
-    "archive-view": "0.47.0",
+    "archive-view": "0.48.0",
     "autocomplete": "0.44.0",
     "autoflow": "0.22.0",
     "autosave": "0.20.0",

From 950bcf9a9fc70e6de946c5df7775e123cb1f75e4 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 10 Feb 2015 17:42:50 -0800
Subject: [PATCH 12/40] :arrow_up: find-and-replace@0.157

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3244d2fb6..408ecd8cb 100644
--- a/package.json
+++ b/package.json
@@ -94,7 +94,7 @@
     "dev-live-reload": "0.41.0",
     "encoding-selector": "0.18.0",
     "exception-reporting": "0.22.0",
-    "find-and-replace": "0.156.0",
+    "find-and-replace": "0.157.0",
     "fuzzy-finder": "0.65.0",
     "git-diff": "0.51.0",
     "go-to-line": "0.30.0",

From 01f2e8f0ed3caf82d3b4fc0713bb14b419bbc320 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 10 Feb 2015 17:43:57 -0800
Subject: [PATCH 13/40] :arrow_up: fuzzy-finder@0.66

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 408ecd8cb..d0a9c7845 100644
--- a/package.json
+++ b/package.json
@@ -95,7 +95,7 @@
     "encoding-selector": "0.18.0",
     "exception-reporting": "0.22.0",
     "find-and-replace": "0.157.0",
-    "fuzzy-finder": "0.65.0",
+    "fuzzy-finder": "0.66.0",
     "git-diff": "0.51.0",
     "go-to-line": "0.30.0",
     "grammar-selector": "0.45.0",

From 40b879d624582dd5bfd5e22302475e1241a39a0a Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 10 Feb 2015 17:51:55 -0800
Subject: [PATCH 14/40] :arrow_up: git-diff@0.52

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d0a9c7845..3b5ef41bd 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
     "exception-reporting": "0.22.0",
     "find-and-replace": "0.157.0",
     "fuzzy-finder": "0.66.0",
-    "git-diff": "0.51.0",
+    "git-diff": "0.52.0",
     "go-to-line": "0.30.0",
     "grammar-selector": "0.45.0",
     "image-view": "0.49.0",

From cb1568dd649acb04b0134093bfcd33a86d1b1a94 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 10 Feb 2015 17:54:02 -0800
Subject: [PATCH 15/40] :arrow_up: markdown-preview@0.135

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3b5ef41bd..11c30df31 100644
--- a/package.json
+++ b/package.json
@@ -103,7 +103,7 @@
     "incompatible-packages": "0.22.0",
     "keybinding-resolver": "0.27.0",
     "link": "0.30.0",
-    "markdown-preview": "0.134.0",
+    "markdown-preview": "0.135.0",
     "metrics": "0.43.0",
     "notifications": "0.27.0",
     "open-on-github": "0.32.0",

From 38a58c5c60e705a3b9c8019d01877e91e377d897 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 10 Feb 2015 17:56:15 -0800
Subject: [PATCH 16/40] :arrow_up: package-generator@0.38

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 11c30df31..9ceafbd49 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
     "metrics": "0.43.0",
     "notifications": "0.27.0",
     "open-on-github": "0.32.0",
-    "package-generator": "0.37.0",
+    "package-generator": "0.38.0",
     "release-notes": "0.48.0",
     "settings-view": "0.178.0",
     "snippets": "0.72.0",

From 4230913e9c962b5f1e5c4eeefdaf71927164d659 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 10 Feb 2015 17:58:32 -0800
Subject: [PATCH 17/40] :arrow_up: symbols-view@0.83

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9ceafbd49..05dd0f00f 100644
--- a/package.json
+++ b/package.json
@@ -114,7 +114,7 @@
     "spell-check": "0.54.0",
     "status-bar": "0.59.0",
     "styleguide": "0.44.0",
-    "symbols-view": "0.82.0",
+    "symbols-view": "0.83.0",
     "tabs": "0.65.0",
     "timecop": "0.29.0",
     "tree-view": "0.154.0",

From 490f9e322756c69ea9a3c1f16c2ecaff02a785a0 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 10 Feb 2015 18:01:13 -0800
Subject: [PATCH 18/40] :arrow_up: whitespace@0.29

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 05dd0f00f..f20597ab0 100644
--- a/package.json
+++ b/package.json
@@ -120,7 +120,7 @@
     "tree-view": "0.154.0",
     "update-package-dependencies": "0.8.0",
     "welcome": "0.21.0",
-    "whitespace": "0.28.0",
+    "whitespace": "0.29.0",
     "wrap-guide": "0.31.0",
     "language-c": "0.38.0",
     "language-clojure": "0.12.0",

From 0d9e250a242c69d2696caf7a8e261dbf0c27c721 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 10 Feb 2015 18:01:35 -0800
Subject: [PATCH 19/40] :arrow_up: temp@0.8.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f20597ab0..ec9773bdb 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
     "service-hub": "^0.4.0",
     "space-pen": "3.8.2",
     "stacktrace-parser": "0.1.1",
-    "temp": "0.7.0",
+    "temp": "0.8.1",
     "text-buffer": "^4.1.3",
     "theorist": "^1.0.2",
     "underscore-plus": "^1.6.6",

From b09a9c5f95b0ddd24647dd35882eeadfd7bf7318 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 10 Feb 2015 18:03:05 -0800
Subject: [PATCH 20/40] Dedupe temp

---
 script/bootstrap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/bootstrap b/script/bootstrap
index 4f574f3d2..25fe54af4 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -37,7 +37,7 @@ function bootstrap() {
   var initialNpmCommand = fs.existsSync(npmPath) ? npmPath : 'npm';
   var npmFlags = ' --userconfig=' + path.resolve('.npmrc') + ' ';
 
-  var packagesToDedupe = ['fs-plus', 'humanize-plus', 'oniguruma', 'roaster', 'season', 'grim', 'q', 'semver', 'atom-space-pen-views'];
+  var packagesToDedupe = ['fs-plus', 'humanize-plus', 'oniguruma', 'roaster', 'season', 'grim', 'q', 'semver', 'atom-space-pen-views', 'temp'];
 
   var buildInstallCommand = initialNpmCommand + npmFlags + 'install';
   var buildInstallOptions = {cwd: path.resolve(__dirname, '..', 'build')};

From 0d91b92bd10d563bd819968f4c8d696154ec5f92 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 10 Feb 2015 18:03:51 -0800
Subject: [PATCH 21/40] :art:

---
 script/bootstrap | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/script/bootstrap b/script/bootstrap
index 25fe54af4..d6160c28f 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -37,7 +37,18 @@ function bootstrap() {
   var initialNpmCommand = fs.existsSync(npmPath) ? npmPath : 'npm';
   var npmFlags = ' --userconfig=' + path.resolve('.npmrc') + ' ';
 
-  var packagesToDedupe = ['fs-plus', 'humanize-plus', 'oniguruma', 'roaster', 'season', 'grim', 'q', 'semver', 'atom-space-pen-views', 'temp'];
+  var packagesToDedupe = [
+    'atom-space-pen-views',
+    'fs-plus',
+    'grim',
+    'humanize-plus',
+    'oniguruma',
+    'roaster',
+    'season',
+    'semver',
+    'q',
+    'temp'
+  ];
 
   var buildInstallCommand = initialNpmCommand + npmFlags + 'install';
   var buildInstallOptions = {cwd: path.resolve(__dirname, '..', 'build')};

From b7a1ee9262b7f6934b71214a174b04fc32e4316a Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 10 Feb 2015 18:31:43 -0800
Subject: [PATCH 22/40] :arrow_up: exception-reporting@0.23

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ec9773bdb..286211f40 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
     "deprecation-cop": "0.36.0",
     "dev-live-reload": "0.41.0",
     "encoding-selector": "0.18.0",
-    "exception-reporting": "0.22.0",
+    "exception-reporting": "0.23.0",
     "find-and-replace": "0.157.0",
     "fuzzy-finder": "0.66.0",
     "git-diff": "0.52.0",

From f3a08c56e3d732a19cff61180b8b277c5fc02ea3 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 10 Feb 2015 18:44:09 -0800
Subject: [PATCH 23/40] Dedupe request

---
 script/bootstrap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/script/bootstrap b/script/bootstrap
index d6160c28f..c9ebede48 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -43,6 +43,7 @@ function bootstrap() {
     'grim',
     'humanize-plus',
     'oniguruma',
+    'request',
     'roaster',
     'season',
     'semver',

From 637c53dbb4f5b55726d04da362583da72b02e8cd Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 10 Feb 2015 18:54:13 -0800
Subject: [PATCH 24/40] Log total module count

---
 build/tasks/output-module-counts.coffee | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/tasks/output-module-counts.coffee b/build/tasks/output-module-counts.coffee
index df4263a62..266656720 100644
--- a/build/tasks/output-module-counts.coffee
+++ b/build/tasks/output-module-counts.coffee
@@ -18,6 +18,7 @@ module.exports = (grunt) ->
       diff = name1.localeCompare(name2) if diff is 0
       diff
 
+    console.log "Total Modules: #{sortedNames.length}"
     sortedNames.forEach (name) ->
       {count, versions} = modules[name]
       grunt.log.error "#{name}: #{count} (#{Object.keys(versions).join(', ')})" if count > 1

From 3d15810b1b89b11148e31fd1441d647c5fbc0812 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 10 Feb 2015 18:54:29 -0800
Subject: [PATCH 25/40] Ignore invalid modules

---
 build/tasks/output-module-counts.coffee | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build/tasks/output-module-counts.coffee b/build/tasks/output-module-counts.coffee
index 266656720..be195a337 100644
--- a/build/tasks/output-module-counts.coffee
+++ b/build/tasks/output-module-counts.coffee
@@ -9,6 +9,8 @@ module.exports = (grunt) ->
       return if fileName isnt 'package.json'
 
       {name, version} = grunt.file.readJSON(absolutePath)
+      return unless name and version
+
       modules[name] ?= {versions: {}, count: 0}
       modules[name].count++
       modules[name].versions[version] = true

From fab65c2385708c3a133affddbd62d94d2f995a39 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 10 Feb 2015 18:57:00 -0800
Subject: [PATCH 26/40] :arrow_up: archive-view@0.49

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 286211f40..cffce720d 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,7 @@
     "one-light-ui": "0.3.0",
     "solarized-dark-syntax": "0.32.0",
     "solarized-light-syntax": "0.19.0",
-    "archive-view": "0.48.0",
+    "archive-view": "0.49.0",
     "autocomplete": "0.44.0",
     "autoflow": "0.22.0",
     "autosave": "0.20.0",

From f9451049ff35f6a1e75caf15c47396fcc2f1cbb4 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 10 Feb 2015 18:58:17 -0800
Subject: [PATCH 27/40] :arrow_up: snippets@0.73

---
 package.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package.json b/package.json
index cffce720d..e3efde831 100644
--- a/package.json
+++ b/package.json
@@ -109,8 +109,7 @@
     "open-on-github": "0.32.0",
     "package-generator": "0.38.0",
     "release-notes": "0.48.0",
-    "settings-view": "0.178.0",
-    "snippets": "0.72.0",
+    "snippets": "0.73.0",
     "spell-check": "0.54.0",
     "status-bar": "0.59.0",
     "styleguide": "0.44.0",

From a194b365ab4ff4d9747f149183173d3cae2df045 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 10 Feb 2015 18:58:45 -0800
Subject: [PATCH 28/40] Dedupe loophole

---
 script/bootstrap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/script/bootstrap b/script/bootstrap
index c9ebede48..6302335ac 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -42,6 +42,7 @@ function bootstrap() {
     'fs-plus',
     'grim',
     'humanize-plus',
+    'loophole',
     'oniguruma',
     'request',
     'roaster',

From fd969e9f9a068201e9bc7f82411fbaf866fa07fe Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 10 Feb 2015 19:10:23 -0800
Subject: [PATCH 29/40] Group modules into categories

---
 build/tasks/output-module-counts.coffee | 41 +++++++++++++++++++------
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/build/tasks/output-module-counts.coffee b/build/tasks/output-module-counts.coffee
index be195a337..42a655b97 100644
--- a/build/tasks/output-module-counts.coffee
+++ b/build/tasks/output-module-counts.coffee
@@ -4,23 +4,46 @@ module.exports = (grunt) ->
   grunt.registerTask 'output-module-counts', 'Log modules where more than one copy exists in node_modules', ->
     nodeModulesDir = path.resolve(__dirname, '..', '..', 'node_modules')
 
-    modules = {}
+    otherModules = {}
+    atomModules = {}
+
+    sortModuleNames = (modules) ->
+      Object.keys(modules).sort (name1, name2) ->
+        diff = modules[name2].count - modules[name1].count
+        diff = name1.localeCompare(name2) if diff is 0
+        diff
+
+    getAtomTotal = ->
+      Object.keys(atomModules).length
+
+    getOtherTotal = ->
+      Object.keys(otherModules).length
+
     grunt.file.recurse nodeModulesDir, (absolutePath, rootPath, relativePath, fileName) ->
       return if fileName isnt 'package.json'
 
-      {name, version} = grunt.file.readJSON(absolutePath)
+      {name, version, repository} = grunt.file.readJSON(absolutePath)
       return unless name and version
 
+      repository = repository.url if repository?.url
+
+      if /.+\/atom\/.+/.test(repository)
+        modules = atomModules
+      else
+        modules = otherModules
+
       modules[name] ?= {versions: {}, count: 0}
       modules[name].count++
       modules[name].versions[version] = true
 
-    sortedNames = Object.keys(modules).sort (name1, name2) ->
-      diff = modules[name2].count - modules[name1].count
-      diff = name1.localeCompare(name2) if diff is 0
-      diff
+    if getAtomTotal() > 0
+      console.log "Atom Modules: #{getAtomTotal()}"
+      sortModuleNames(atomModules).forEach (name) ->
+        {count, versions, atom} = atomModules[name]
+        grunt.log.error "#{name}: #{count} (#{Object.keys(versions).join(', ')})" if count > 1
+      console.log()
 
-    console.log "Total Modules: #{sortedNames.length}"
-    sortedNames.forEach (name) ->
-      {count, versions} = modules[name]
+    console.log "Other Modules: #{getOtherTotal()}"
+    sortModuleNames(otherModules).forEach (name) ->
+      {count, versions, atom} = otherModules[name]
       grunt.log.error "#{name}: #{count} (#{Object.keys(versions).join(', ')})" if count > 1

From 5d5ec18e08c50b58011fd70ea172f93991e4725d Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 11 Feb 2015 13:41:23 -0800
Subject: [PATCH 30/40] :arrow_up: keybinding-resolver@0.28

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e3efde831..af5b70d0c 100644
--- a/package.json
+++ b/package.json
@@ -101,7 +101,7 @@
     "grammar-selector": "0.45.0",
     "image-view": "0.49.0",
     "incompatible-packages": "0.22.0",
-    "keybinding-resolver": "0.27.0",
+    "keybinding-resolver": "0.28.0",
     "link": "0.30.0",
     "markdown-preview": "0.135.0",
     "metrics": "0.43.0",

From e8229eaad8aed1f34fa55df4f6ee0875f391be44 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 11 Feb 2015 13:53:33 -0800
Subject: [PATCH 31/40] :arrow_up: release-notes@0.49

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index af5b70d0c..ed7383d1d 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,7 @@
     "notifications": "0.27.0",
     "open-on-github": "0.32.0",
     "package-generator": "0.38.0",
-    "release-notes": "0.48.0",
+    "release-notes": "0.49.0",
     "snippets": "0.73.0",
     "spell-check": "0.54.0",
     "status-bar": "0.59.0",

From b004f3d70eef2c45931cee815455925cdd61bb62 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 11 Feb 2015 14:03:36 -0800
Subject: [PATCH 32/40] :arrow_up: status-bar@0.60

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ed7383d1d..f72137a77 100644
--- a/package.json
+++ b/package.json
@@ -111,7 +111,7 @@
     "release-notes": "0.49.0",
     "snippets": "0.73.0",
     "spell-check": "0.54.0",
-    "status-bar": "0.59.0",
+    "status-bar": "0.60.0",
     "styleguide": "0.44.0",
     "symbols-view": "0.83.0",
     "tabs": "0.65.0",

From f6652df9e2a370dcb262c83c8fa4be5ec4dc0bae Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 11 Feb 2015 14:08:04 -0800
Subject: [PATCH 33/40] :arrow_up: tabs@0.67

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f72137a77..7f5a3bd27 100644
--- a/package.json
+++ b/package.json
@@ -114,7 +114,7 @@
     "status-bar": "0.60.0",
     "styleguide": "0.44.0",
     "symbols-view": "0.83.0",
-    "tabs": "0.65.0",
+    "tabs": "0.67.0",
     "timecop": "0.29.0",
     "tree-view": "0.154.0",
     "update-package-dependencies": "0.8.0",

From 6de3e3dbbe5e3fc2a1f8a6678173b3c32b887043 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 11 Feb 2015 14:12:07 -0800
Subject: [PATCH 34/40] Dedupe highlights

---
 script/bootstrap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/script/bootstrap b/script/bootstrap
index 6302335ac..adc1d4386 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -41,6 +41,7 @@ function bootstrap() {
     'atom-space-pen-views',
     'fs-plus',
     'grim',
+    'highlights',
     'humanize-plus',
     'loophole',
     'oniguruma',

From 59dea26351333804862bd6a6f6b250123d967df0 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 11 Feb 2015 14:42:57 -0800
Subject: [PATCH 35/40] Dedupe more core modules

---
 script/bootstrap | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/script/bootstrap b/script/bootstrap
index adc1d4386..4f8cb022b 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -38,18 +38,24 @@ function bootstrap() {
   var npmFlags = ' --userconfig=' + path.resolve('.npmrc') + ' ';
 
   var packagesToDedupe = [
+    'abbrev',
+    'amdefine',
     'atom-space-pen-views',
     'fs-plus',
     'grim',
     'highlights',
     'humanize-plus',
+    'inherits',
     'loophole',
     'oniguruma',
+    'q',
     'request',
+    'rimraf',
     'roaster',
     'season',
+    'sigmund',
     'semver',
-    'q',
+    'through',
     'temp'
   ];
 

From b05cf21125a7653dff6bf63536fe29b15ab8f1ee Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 11 Feb 2015 14:51:28 -0800
Subject: [PATCH 36/40] :arrow_up: jasmine-tagged@1.1.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7f5a3bd27..b02a33d52 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "grim": "1.1.1",
     "guid": "0.0.10",
     "jasmine-json": "~0.0",
-    "jasmine-tagged": "^1.1.2",
+    "jasmine-tagged": "^1.1.3",
     "jquery": "^2.1.1",
     "less-cache": "0.21",
     "marked": "^0.3",

From e4ab3851657850408db393d50c331168f5c1c247 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 11 Feb 2015 14:54:09 -0800
Subject: [PATCH 37/40] Dedupe cheerio and domelementtype

---
 script/bootstrap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/script/bootstrap b/script/bootstrap
index 4f8cb022b..d90694d44 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -41,6 +41,8 @@ function bootstrap() {
     'abbrev',
     'amdefine',
     'atom-space-pen-views',
+    'cheerio',
+    'domelementtype',
     'fs-plus',
     'grim',
     'highlights',

From bd2585a6c1d0d07ec0bad5d1d5b53f04cb944c34 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 11 Feb 2015 14:55:27 -0800
Subject: [PATCH 38/40] :arrow_up: tree-view@0.155

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b02a33d52..06cdab139 100644
--- a/package.json
+++ b/package.json
@@ -116,7 +116,7 @@
     "symbols-view": "0.83.0",
     "tabs": "0.67.0",
     "timecop": "0.29.0",
-    "tree-view": "0.154.0",
+    "tree-view": "0.155.0",
     "update-package-dependencies": "0.8.0",
     "welcome": "0.21.0",
     "whitespace": "0.29.0",

From 5310b7dd328940397b0bdb03346c63179ffd47ef Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 11 Feb 2015 15:19:00 -0800
Subject: [PATCH 39/40] Dedupe iconv-lite

---
 script/bootstrap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/script/bootstrap b/script/bootstrap
index d90694d44..0843730f8 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -47,6 +47,7 @@ function bootstrap() {
     'grim',
     'highlights',
     'humanize-plus',
+    'iconv-lite',
     'inherits',
     'loophole',
     'oniguruma',

From c52d3593ff8c387ad4786b5d97de22bc124c9395 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 11 Feb 2015 15:19:29 -0800
Subject: [PATCH 40/40] Handle broken symlinks when walking

---
 build/tasks/output-module-counts.coffee | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/build/tasks/output-module-counts.coffee b/build/tasks/output-module-counts.coffee
index 42a655b97..643929ff8 100644
--- a/build/tasks/output-module-counts.coffee
+++ b/build/tasks/output-module-counts.coffee
@@ -1,3 +1,4 @@
+fs = require 'fs'
 path = require 'path'
 
 module.exports = (grunt) ->
@@ -19,7 +20,7 @@ module.exports = (grunt) ->
     getOtherTotal = ->
       Object.keys(otherModules).length
 
-    grunt.file.recurse nodeModulesDir, (absolutePath, rootPath, relativePath, fileName) ->
+    recurseHandler = (absolutePath, rootPath, relativePath, fileName) ->
       return if fileName isnt 'package.json'
 
       {name, version, repository} = grunt.file.readJSON(absolutePath)
@@ -36,6 +37,22 @@ module.exports = (grunt) ->
       modules[name].count++
       modules[name].versions[version] = true
 
+    walkNodeModuleDir = ->
+      grunt.file.recurse(nodeModulesDir, recurseHandler)
+
+    # Handle broken symlinks that grunt.file.recurse fails to handle
+    loop
+      try
+        walkNodeModuleDir()
+        break
+      catch error
+        if error.code is 'ENOENT'
+          fs.unlinkSync(error.path)
+          otherModules = {}
+          atomModules = {}
+        else
+          break
+
     if getAtomTotal() > 0
       console.log "Atom Modules: #{getAtomTotal()}"
       sortModuleNames(atomModules).forEach (name) ->