Use node's require instead of internal require

benchmark/benchmark-helper.coffee

@@ -1,6 +1,6 @@
 nakedLoad 'jasmine-jquery'
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 Keymap = require 'keymap'
 Point = require 'point'
 Config = require 'config'

benchmark/benchmark-suite.coffee

@@ -1,7 +1,7 @@
 require 'benchmark-helper'
-fs = require 'fs'
+fs = require 'fs-utils'
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 TokenizedBuffer = require 'tokenized-buffer'
 
 describe "editor.", ->

benchmark/fixtures/medium.coffee

@@ -145,7 +145,7 @@ generate_html = (source, sections) ->
 
 # Require our external dependencies, including **Showdown.js**
 # (the JavaScript implementation of Markdown).
-fs       = require 'fs'
+fs       = require 'fs-utils'
 path     = require 'path'
 showdown = require('./../vendor/showdown').Showdown
 {spawn, exec} = require 'child_process'

native/atom_window_controller.mm

@@ -56,8 +56,11 @@
 
   NSArray *paths = [NSArray arrayWithObjects:@"spec", @"benchmark",
                     @"src/stdlib", @"src/app", @"src/packages", @"src",
-                    @"vendor/packages", @"vendor", @"static", @"themes", nil];
+                    @"vendor/packages", @"vendor", @"static", @"themes",
+                    @"node_modules", nil];
   NSMutableArray *resourcePaths = [[NSMutableArray alloc] init];
+  NSString *userPackagesDirectory = [@"~/.atom/packages" stringByStandardizingPath];
+  [resourcePaths addObject:userPackagesDirectory];
   for (int i = 0; i < paths.count; i++) {
     NSString *fullPath = [NSString stringWithFormat:@"%@/%@", _resourcePath, [paths objectAtIndex:i]];
     [resourcePaths addObject:fullPath];

spec/app/atom-package-spec.coffee

@@ -1,6 +1,6 @@
 RootView = require 'root-view'
 AtomPackage = require 'atom-package'
-fs = require 'fs'
+fs = require 'fs-utils'
 
 describe "AtomPackage", ->
   describe ".load()", ->

spec/app/config-spec.coffee

@@ -1,4 +1,4 @@
-fs = require 'fs'
+fs = require 'fs-utils'
 
 describe "Config", ->
   describe ".get(keyPath) and .set(keyPath, value)", ->
@@ -49,7 +49,7 @@ describe "Config", ->
         config.save()
 
         expect(fs.write.argsForCall[0][0]).toBe(fs.join(config.configDirPath, "config.cson"))
-        CoffeeScript = nodeRequire 'coffee-script'
+        CoffeeScript = require 'coffee-script'
         writtenConfig = CoffeeScript.eval(fs.write.argsForCall[0][1], bare: true)
         expect(writtenConfig).toEqual config.settings
 

spec/app/directory-spec.coffee

@@ -1,5 +1,5 @@
 Directory = require 'directory'
-fs = require 'fs'
+fs = require 'fs-utils'
 
 describe "Directory", ->
   directory = null

spec/app/display-buffer-spec.coffee

@@ -1,6 +1,6 @@
 DisplayBuffer = require 'display-buffer'
-Buffer = require 'buffer'
-_ = nodeRequire 'underscore'
+Buffer = require 'text-buffer'
+_ = require 'underscore'
 
 describe "DisplayBuffer", ->
   [editSession, displayBuffer, buffer, changeHandler, tabLength] = []

spec/app/edit-session-spec.coffee

@@ -1,5 +1,5 @@
 Project = require 'project'
-Buffer = require 'buffer'
+Buffer = require 'text-buffer'
 EditSession = require 'edit-session'
 
 describe "EditSession", ->

spec/app/editor-spec.coffee

@@ -1,12 +1,12 @@
 EditSession = require 'edit-session'
-Buffer = require 'buffer'
+Buffer = require 'text-buffer'
 Editor = require 'editor'
 Range = require 'range'
 Project = require 'project'
 $ = require 'jquery'
 {$$} = require 'space-pen'
-_ = nodeRequire 'underscore'
-fs = require 'fs'
+_ = require 'underscore'
+fs = require 'fs-utils'
 
 describe "Editor", ->
   [buffer, editor, editSession, cachedLineHeight, cachedCharWidth] = []

spec/app/event-emitter-spec.coffee

@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 EventEmitter = require 'event-emitter'
 
 describe "EventEmitter mixin", ->

spec/app/file-spec.coffee

@@ -1,5 +1,5 @@
 File = require 'file'
-fs = require 'fs'
+fs = require 'fs-utils'
 
 describe 'File', ->
   [path, file] = []

spec/app/git-spec.coffee

@@ -1,5 +1,5 @@
 Git = require 'git'
-fs = require 'fs'
+fs = require 'fs-utils'
 Task = require 'task'
 
 describe "Git", ->

spec/app/grammar-view-spec.coffee

@@ -1,6 +1,6 @@
 RootView = require 'root-view'
 GrammarView = require 'grammar-view'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 describe "GrammarView", ->
   [editor, textGrammar, jsGrammar] =  []

spec/app/language-mode-spec.coffee

@@ -1,5 +1,5 @@
 Project = require 'project'
-Buffer = require 'buffer'
+Buffer = require 'text-buffer'
 EditSession = require 'edit-session'
 
 describe "LanguageMode", ->

spec/app/pane-container-spec.coffee

@@ -1,7 +1,7 @@
 PaneContainer = require 'pane-container'
 Pane = require 'pane'
 {View, $$} = require 'space-pen'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 $ = require 'jquery'
 
 describe "PaneContainer", ->

spec/app/project-spec.coffee

@@ -1,6 +1,6 @@
 Project = require 'project'
-fs = require 'fs'
-_ = nodeRequire 'underscore'
+fs = require 'fs-utils'
+_ = require 'underscore'
 BufferedProcess = require 'buffered-process'
 
 describe "Project", ->

spec/app/root-view-spec.coffee

@@ -1,8 +1,8 @@
 $ = require 'jquery'
-fs = require 'fs'
+fs = require 'fs-utils'
 Project = require 'project'
 RootView = require 'root-view'
-Buffer = require 'buffer'
+Buffer = require 'text-buffer'
 Editor = require 'editor'
 Pane = require 'pane'
 {View, $$} = require 'space-pen'

spec/app/selection-spec.coffee

@@ -1,4 +1,4 @@
-Buffer = require 'buffer'
+Buffer = require 'text-buffer'
 EditSession = require 'edit-session'
 Range = require 'range'
 

spec/app/syntax-spec.coffee

@@ -1,4 +1,4 @@
-fs = require 'fs'
+fs = require 'fs-utils'
 
 describe "the `syntax` global", ->
   describe ".grammarForFilePath(filePath)", ->

spec/app/tex-buffer-spec.coffee

@@ -1,7 +1,7 @@
 Project = require 'project'
-Buffer = require 'buffer'
-fs = require 'fs'
-_ = nodeRequire 'underscore'
+Buffer = require 'text-buffer'
+fs = require 'fs-utils'
+_ = require 'underscore'
 
 describe 'Buffer', ->
   [filePath, fileContents, buffer] = []

spec/app/text-mate-grammar-spec.coffee

@@ -1,8 +1,8 @@
 TextMateGrammar = require 'text-mate-grammar'
 TextMatePackage = require 'text-mate-package'
 plist = require 'plist'
-fs = require 'fs'
-_ = nodeRequire 'underscore'
+fs = require 'fs-utils'
+_ = require 'underscore'
 
 describe "TextMateGrammar", ->
   grammar = null

spec/app/text-mate-theme-spec.coffee

@@ -1,4 +1,4 @@
-fs = require 'fs'
+fs = require 'fs-utils'
 plist = require 'plist'
 TextMateTheme = require 'text-mate-theme'
 Theme = require 'theme'

spec/app/theme-spec.coffee

@@ -1,5 +1,5 @@
 $ = require 'jquery'
-fs = require 'fs'
+fs = require 'fs-utils'
 Theme = require 'theme'
 
 describe "@load(name)", ->

spec/app/tokenized-buffer-spec.coffee

@@ -1,8 +1,8 @@
 TokenizedBuffer = require 'tokenized-buffer'
 LanguageMode = require 'language-mode'
-Buffer = require 'buffer'
+Buffer = require 'text-buffer'
 Range = require 'range'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 describe "TokenizedBuffer", ->
   [editSession, tokenizedBuffer, buffer, changeHandler] = []

spec/app/undo-manager-spec.coffee

@@ -1,5 +1,5 @@
 UndoManager = require 'undo-manager'
-Buffer = require 'buffer'
+Buffer = require 'text-buffer'
 Range = require 'range'
 
 describe "UndoManager", ->

spec/app/window-spec.coffee

@@ -1,5 +1,5 @@
 $ = require 'jquery'
-fs = require 'fs'
+fs = require 'fs-utils'
 
 describe "Window", ->
   projectPath = null

spec/atom-reporter.coffee

@@ -1,6 +1,6 @@
 $ = require 'jquery'
 {View, $$} = require 'space-pen'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class AtomReporter extends View

spec/spec-helper.coffee

@@ -3,7 +3,7 @@ window.setUpEnvironment()
 
 nakedLoad 'jasmine-jquery'
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 Keymap = require 'keymap'
 Config = require 'config'
 Point = require 'point'
@@ -12,11 +12,11 @@ Directory = require 'directory'
 File = require 'file'
 Editor = require 'editor'
 TokenizedBuffer = require 'tokenized-buffer'
-fs = require 'fs'
+fs = require 'fs-utils'
 RootView = require 'root-view'
 Git = require 'git'
 requireStylesheet "jasmine.css"
-fixturePackagesPath = require.resolve('fixtures/packages')
+fixturePackagesPath = fs.resolveOnLoadPath('fixtures/packages')
 require.paths.unshift(fixturePackagesPath)
 keymap.loadBundledKeymaps()
 [bindingSetsToRestore, bindingSetsByFirstKeystrokeToRestore] = []

spec/spec-suite.coffee

@@ -1,4 +1,4 @@
-fs = require 'fs'
+fs = require 'fs-utils'
 require 'spec-helper'
 
 

spec/stdlib/cson-spec.coffee

@@ -85,6 +85,6 @@ describe "CSON", ->
           singleTrailingNewline: true
 
       cson = CSON.stringify(object)
-      CoffeeScript = nodeRequire 'coffee-script'
+      CoffeeScript = require 'coffee-script'
       evaledObject = CoffeeScript.eval(cson, bare: true)
       expect(evaledObject).toEqual object

spec/stdlib/fs-utils-spec.coffee

@@ -1,4 +1,4 @@
-fs = require 'fs'
+fs = require 'fs-utils'
 
 describe "fs", ->
   describe ".read(path)", ->

spec/stdlib/onig-reg-exp-spec.coffee

@@ -1,4 +1,4 @@
-{OnigRegExp} = nodeRequire 'oniguruma'
+{OnigRegExp} = require 'oniguruma'
 
 describe "OnigRegExp", ->
   describe ".search(string, index)", ->

spec/stdlib/underscore-extensions-spec.coffee

@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 describe "underscore extensions", ->
   describe "_.adviseBefore", ->

spec/time-reporter.coffee

@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class TimeReporter  extends jasmine.Reporter

src/app/atom-package.coffee

@@ -1,6 +1,6 @@
 Package = require 'package'
-fs = require 'fs'
-_ = nodeRequire 'underscore'
+fs = require 'fs-utils'
+_ = require 'underscore'
 $ = require 'jquery'
 CSON = require 'cson'
 

src/app/atom-theme.coffee

@@ -1,4 +1,4 @@
-fs = require 'fs'
+fs = require 'fs-utils'
 Theme = require 'theme'
 CSON = require 'cson'
 

src/app/atom.coffee

@@ -1,5 +1,5 @@
-fs = require 'fs'
-_ = nodeRequire 'underscore'
+fs = require 'fs-utils'
+_ = require 'underscore'
 Package = require 'package'
 TextMatePackage = require 'text-mate-package'
 Theme = require 'theme'

src/app/binding-set.coffee

@@ -1,6 +1,6 @@
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
-fs = require 'fs'
+_ = require 'underscore'
+fs = require 'fs-utils'
 
 Specificity = require 'specificity'
 PEG = require 'pegjs'

src/app/buffer-change-operation.coffee

@@ -1,5 +1,5 @@
 Range = require 'range'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class BufferChangeOperation

src/app/buffer-marker.coffee

@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 Point = require 'point'
 Range = require 'range'
 EventEmitter = require 'event-emitter'

src/app/config.coffee

@@ -1,5 +1,5 @@
-fs = require 'fs'
-_ = nodeRequire 'underscore'
+fs = require 'fs-utils'
+_ = require 'underscore'
 EventEmitter = require 'event-emitter'
 CSON = require 'cson'
 
@@ -11,8 +11,6 @@ vendoredThemesDirPath = fs.join(resourcePath, "vendor/themes")
 userThemesDirPath = fs.join(configDirPath, "themes")
 userPackagesDirPath = fs.join(configDirPath, "packages")
 
-require.paths.unshift userPackagesDirPath
-
 module.exports =
 class Config
   configDirPath: configDirPath

src/app/cursor-view.coffee

@@ -1,7 +1,7 @@
 {View} = require 'space-pen'
 Point = require 'point'
 Range = require 'range'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class CursorView extends View

src/app/cursor.coffee

@@ -1,7 +1,7 @@
 Point = require 'point'
 Range = require 'range'
 EventEmitter = require 'event-emitter'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class Cursor

src/app/directory.coffee

@@ -1,5 +1,5 @@
-_ = nodeRequire 'underscore'
-fs = require 'fs'
+_ = require 'underscore'
+fs = require 'fs-utils'
 File = require 'file'
 EventEmitter = require 'event-emitter'
 

src/app/display-buffer-marker.coffee

@@ -1,5 +1,5 @@
 Range = require 'range'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 EventEmitter = require 'event-emitter'
 
 module.exports =

src/app/display-buffer.coffee

@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 TokenizedBuffer = require 'tokenized-buffer'
 LineMap = require 'line-map'
 Point = require 'point'

src/app/edit-session.coffee

@@ -1,5 +1,5 @@
 Point = require 'point'
-Buffer = require 'buffer'
+Buffer = require 'text-buffer'
 LanguageMode = require 'language-mode'
 DisplayBuffer = require 'display-buffer'
 Cursor = require 'cursor'
@@ -7,8 +7,8 @@ Selection = require 'selection'
 EventEmitter = require 'event-emitter'
 Subscriber = require 'subscriber'
 Range = require 'range'
-_ = nodeRequire 'underscore'
-fs = require 'fs'
+_ = require 'underscore'
+fs = require 'fs-utils'
 
 module.exports =
 class EditSession

src/app/editor.coffee

@@ -1,14 +1,14 @@
 {View, $$} = require 'space-pen'
-Buffer = require 'buffer'
+Buffer = require 'text-buffer'
 Gutter = require 'gutter'
 Point = require 'point'
 Range = require 'range'
 EditSession = require 'edit-session'
 CursorView = require 'cursor-view'
 SelectionView = require 'selection-view'
-fs = require 'fs'
+fs = require 'fs-utils'
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class Editor extends View

src/app/event-emitter.coffee

@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
   on: (eventName, handler) ->

src/app/file.coffee

@@ -1,7 +1,7 @@
 EventEmitter = require 'event-emitter'
 
-fs = require 'fs'
-_ = nodeRequire 'underscore'
+fs = require 'fs-utils'
+_ = require 'underscore'
 
 module.exports =
 class File

src/app/git.coffee

@@ -1,9 +1,9 @@
-_ = nodeRequire 'underscore'
-fs = require 'fs'
+_ = require 'underscore'
+fs = require 'fs-utils'
 Subscriber = require 'subscriber'
 EventEmitter = require 'event-emitter'
 RepositoryStatusTask = require 'repository-status-task'
-GitUtils = nodeRequire 'git-utils'
+GitUtils = require 'git-utils'
 
 module.exports =
 class Git

src/app/keymap.coffee

@@ -1,6 +1,6 @@
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
-fs = require 'fs'
+_ = require 'underscore'
+fs = require 'fs-utils'
 CSON = require 'cson'
 
 BindingSet = require 'binding-set'
@@ -31,7 +31,7 @@ class Keymap
     $(document).command 'open-dev', => atom.openDev()
 
   loadBundledKeymaps: ->
-    @loadDirectory(require.resolve('keymaps'))
+    @loadDirectory(fs.resolveOnLoadPath('keymaps'))
 
   loadUserKeymaps: ->
     @loadDirectory(fs.join(config.configDirPath, 'keymaps'))

src/app/language-mode.coffee

@@ -1,7 +1,7 @@
 Range = require 'range'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 require 'underscore-extensions'
-{OnigRegExp} = nodeRequire 'oniguruma'
+{OnigRegExp} = require 'oniguruma'
 
 module.exports =
 class LanguageMode

src/app/package.coffee

@@ -1,4 +1,4 @@
-fs = require 'fs'
+fs = require 'fs-utils'
 
 module.exports =
 class Package

src/app/pane-column.coffee

@@ -1,5 +1,5 @@
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 PaneAxis = require 'pane-axis'
 
 module.exports =

src/app/pane-row.coffee

@@ -1,5 +1,5 @@
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 PaneAxis = require 'pane-axis'
 
 module.exports =

src/app/pane.coffee

@@ -1,6 +1,6 @@
 {View} = require 'space-pen'
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 PaneRow = require 'pane-row'
 PaneColumn = require 'pane-column'
 

src/app/pasteboard.coffee

@@ -1,4 +1,4 @@
-crypto = nodeRequire 'crypto'
+crypto = require 'crypto'
 
 module.exports =
 class Pasteboard

src/app/project.coffee

@@ -1,8 +1,8 @@
-fs = require 'fs'
-_ = nodeRequire 'underscore'
+fs = require 'fs-utils'
+_ = require 'underscore'
 $ = require 'jquery'
 Range = require 'range'
-Buffer = require 'buffer'
+Buffer = require 'text-buffer'
 EditSession = require 'edit-session'
 EventEmitter = require 'event-emitter'
 Directory = require 'directory'

src/app/range.coffee

@@ -1,5 +1,5 @@
 Point = require 'point'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class Range

src/app/repository-status-handler.coffee

@@ -1,5 +1,5 @@
-Git = nodeRequire 'git-utils'
-fs = require 'fs'
+Git = require 'git-utils'
+fs = require 'fs-utils'
 
 module.exports =
   loadStatuses: (path) ->

src/app/repository-status-task.coffee

@@ -1,5 +1,5 @@
 Task = require 'task'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class RepositoryStatusTask extends Task

src/app/root-view.coffee

@@ -1,10 +1,10 @@
 $ = require 'jquery'
 {$$} = require 'space-pen'
-fs = require 'fs'
-_ = nodeRequire 'underscore'
+fs = require 'fs-utils'
+_ = require 'underscore'
 
 {View} = require 'space-pen'
-Buffer = require 'buffer'
+Buffer = require 'text-buffer'
 Editor = require 'editor'
 Project = require 'project'
 Pane = require 'pane'

src/app/screen-line.coffee

@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class ScreenLine

src/app/selection.coffee

@@ -1,6 +1,6 @@
 Range = require 'range'
 EventEmitter = require 'event-emitter'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class Selection

src/app/syntax.coffee

@@ -1,8 +1,8 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 jQuery = require 'jquery'
 Specificity = require 'specificity'
 {$$} = require 'space-pen'
-fs = require 'fs'
+fs = require 'fs-utils'
 EventEmitter = require 'event-emitter'
 
 module.exports =

src/app/text-buffer.coffee

@@ -1,5 +1,5 @@
-_ = nodeRequire 'underscore'
-fs = require 'fs'
+_ = require 'underscore'
+fs = require 'fs-utils'
 File = require 'file'
 Point = require 'point'
 Range = require 'range'

src/app/text-mate-grammar.coffee

@@ -1,9 +1,9 @@
-_ = nodeRequire 'underscore'
-fs = require 'fs'
+_ = require 'underscore'
+fs = require 'fs-utils'
 plist = require 'plist'
 Token = require 'token'
 CSON = require 'cson'
-{OnigRegExp, OnigScanner} = nodeRequire 'oniguruma'
+{OnigRegExp, OnigScanner} = require 'oniguruma'
 
 module.exports =
 class TextMateGrammar

src/app/text-mate-package.coffee

@@ -1,7 +1,7 @@
 Package = require 'package'
-fs = require 'fs'
+fs = require 'fs-utils'
 plist = require 'plist'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 TextMateGrammar = require 'text-mate-grammar'
 CSON = require 'cson'
 

src/app/text-mate-theme.coffee

@@ -1,5 +1,5 @@
-_ = nodeRequire 'underscore'
-fs = require 'fs'
+_ = require 'underscore'
+fs = require 'fs-utils'
 plist = require 'plist'
 Theme = require 'theme'
 

src/app/theme.coffee

@@ -1,4 +1,4 @@
-fs = require 'fs'
+fs = require 'fs-utils'
 
 module.exports =
 class Theme

src/app/token.coffee

@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class Token

src/app/tokenized-buffer.coffee

@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 ScreenLine = require 'screen-line'
 EventEmitter = require 'event-emitter'
 Token = require 'token'

src/app/undo-manager.coffee

@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 

src/app/window.coffee

@@ -1,6 +1,6 @@
-fs = require 'fs'
+fs = require 'fs-utils'
 $ = require 'jquery'
-ChildProcess = nodeRequire 'child_process'
+ChildProcess = require 'child_process'
 require 'jquery-extensions'
 require 'underscore-extensions'
 require 'space-pen-extensions'

src/packages/autocomplete/spec/autocomplete-spec.coffee

@@ -1,7 +1,7 @@
 $ = require 'jquery'
 AutocompleteView = require 'autocomplete/lib/autocomplete-view'
 Autocomplete = require 'autocomplete/lib/autocomplete'
-Buffer = require 'buffer'
+Buffer = require 'text-buffer'
 Editor = require 'editor'
 RootView = require 'root-view'
 

src/packages/bracket-matcher/lib/bracket-matcher.coffee

@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 {$$} = require 'space-pen'
 Range = require 'range'
 

src/packages/command-logger/lib/command-logger-view.coffee

@@ -1,6 +1,6 @@
 {$$$} = require 'space-pen'
 ScrollView = require 'scroll-view'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class CommandLoggerView extends ScrollView
@@ -96,7 +96,7 @@ class CommandLoggerView extends ScrollView
     w = @treeMap.width()
     h = @treeMap.height()
 
-    d3 = nodeRequire 'd3'
+    d3 = require 'd3'
 
     x = d3.scale.linear().range([0, w])
     y = d3.scale.linear().range([0, h])

src/packages/command-palette/lib/command-palette-view.coffee

@@ -1,7 +1,7 @@
 {$$} = require 'space-pen'
 SelectList = require 'select-list'
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class CommandPaletteView extends SelectList

src/packages/command-palette/spec/command-palette-spec.coffee

@@ -1,7 +1,7 @@
 RootView = require 'root-view'
 CommandPalette = require 'command-palette/lib/command-palette-view'
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 describe "CommandPalette", ->
   [palette] = []

src/packages/command-panel/lib/command-interpreter.coffee

@@ -1,4 +1,4 @@
-fs = require 'fs'
+fs = require 'fs-utils'
 PEG = require 'pegjs'
 
 module.exports =

src/packages/command-panel/lib/command-panel-view.coffee

@@ -5,7 +5,7 @@ CompositeCommand = require './commands/composite-command'
 PreviewList = require './preview-list'
 Editor = require 'editor'
 {SyntaxError} = require('pegjs').parser
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class CommandPanelView extends View

src/packages/command-panel/lib/commands/composite-command.coffee

@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 $ = require 'jquery'
 
 module.exports =

src/packages/command-panel/lib/path-view.coffee

@@ -1,5 +1,5 @@
 {View} = require 'space-pen'
-fs = require 'fs'
+fs = require 'fs-utils'
 OperationView = require './operation-view'
 $ = require 'jquery'
 

src/packages/command-panel/lib/preview-list.coffee

@@ -1,7 +1,7 @@
 $ = require 'jquery'
 ScrollView = require 'scroll-view'
-_ = nodeRequire 'underscore'
-fs = require 'fs'
+_ = require 'underscore'
+fs = require 'fs-utils'
 PathView = require './path-view'
 OperationView = require './operation-view'
 

src/packages/command-panel/spec/command-interpreter-spec.coffee

@@ -1,9 +1,9 @@
 CommandInterpreter = require 'command-panel/lib/command-interpreter'
 Project = require 'project'
-Buffer = require 'buffer'
+Buffer = require 'text-buffer'
 EditSession = require 'edit-session'
 
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 describe "CommandInterpreter", ->
   [interpreter, editSession, buffer] = []

src/packages/command-panel/spec/command-panel-spec.coffee

@@ -1,6 +1,6 @@
 RootView = require 'root-view'
 CommandPanelView = require 'command-panel/lib/command-panel-view'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 describe "CommandPanel", ->
   [editSession, buffer, commandPanel] = []

src/packages/editor-stats/lib/editor-stats-view.coffee

@@ -1,6 +1,6 @@
 ScrollView = require 'scroll-view'
-d3 = nodeRequire 'd3'
-_ = nodeRequire 'underscore'
+d3 = require 'd3'
+_ = require 'underscore'
 $ = require 'jquery'
 
 module.exports =

src/packages/editor-stats/spec/editor-stats-spec.coffee

@@ -1,5 +1,5 @@
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 RootView = require 'root-view'
 EditorStats = require 'editor-stats/lib/editor-stats-view'
 

src/packages/fuzzy-finder/lib/fuzzy-finder-view.coffee

@@ -1,8 +1,8 @@
 {View, $$} = require 'space-pen'
 SelectList = require 'select-list'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 $ = require 'jquery'
-fs = require 'fs'
+fs = require 'fs-utils'
 LoadPathsTask = require './load-paths-task'
 
 module.exports =

src/packages/fuzzy-finder/lib/fuzzy-finder.coffee

@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
   projectPaths: null

src/packages/fuzzy-finder/lib/load-paths-handler.coffee

@@ -1,5 +1,5 @@
-fs = require 'fs'
-_ = nodeRequire 'underscore'
+fs = require 'fs-utils'
+_ = require 'underscore'
 
 module.exports =
   loadPaths: (rootPath, ignoredNames, excludeGitIgnoredPaths) ->

src/packages/fuzzy-finder/spec/fuzzy-finder-spec.coffee

@@ -1,10 +1,10 @@
 RootView = require 'root-view'
 FuzzyFinder = require 'fuzzy-finder/lib/fuzzy-finder-view'
 LoadPathsTask = require 'fuzzy-finder/lib/load-paths-task'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 $ = require 'jquery'
 {$$} = require 'space-pen'
-fs = require 'fs'
+fs = require 'fs-utils'
 
 describe 'FuzzyFinder', ->
   [finderView] = []

src/packages/markdown-preview/lib/markdown-preview-view.coffee

@@ -1,5 +1,5 @@
 ScrollView = require 'scroll-view'
-fs = require 'fs'
+fs = require 'fs-utils'
 $ = require 'jquery'
 {$$$} = require 'space-pen'
 

src/packages/markdown-preview/spec/markdown-preview-spec.coffee

@@ -1,7 +1,7 @@
 $ = require 'jquery'
 RootView = require 'root-view'
 MarkdownPreview = require 'markdown-preview/lib/markdown-preview-view'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 describe "MarkdownPreview", ->
   beforeEach ->

src/packages/package-generator/lib/package-generator-view.coffee

@@ -1,8 +1,8 @@
 {View} = require 'space-pen'
 Editor = require 'editor'
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
-fs = require 'fs'
+_ = require 'underscore'
+fs = require 'fs-utils'
 
 module.exports =
 class PackageGeneratorView extends View

src/packages/package-generator/spec/package-generator-spec.coffee

@@ -1,5 +1,5 @@
 RootView = require 'root-view'
-fs = require 'fs'
+fs = require 'fs-utils'
 
 describe 'Package Generator', ->
   [packageGenerator] = []

src/packages/snippets/lib/load-snippets-handler.coffee

@@ -1,4 +1,4 @@
-fs = require 'fs'
+fs = require 'fs-utils'
 TextMatePackage = require 'text-mate-package'
 SnippetBodyParser = require './snippet-body-parser'
 CSON = require 'cson'

src/packages/snippets/lib/snippet-body-parser.coffee

@@ -1,4 +1,4 @@
 PEG = require 'pegjs'
-fs = require 'fs'
+fs = require 'fs-utils'
 grammarSrc = fs.read(require.resolve('./snippet-body.pegjs'))
 module.exports = PEG.buildParser(grammarSrc, trackLineAndColumn: true)