Use node's require instead of internal require

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)

src/packages/snippets/lib/snippet-expansion.coffee

@@ -1,5 +1,5 @@
 Subscriber = require 'subscriber'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class SnippetExpansion

src/packages/snippets/lib/snippet.coffee

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

src/packages/snippets/lib/snippets.coffee

@@ -1,6 +1,6 @@
 AtomPackage = require 'atom-package'
-fs = require 'fs'
-_ = nodeRequire 'underscore'
+fs = require 'fs-utils'
+_ = require 'underscore'
 SnippetExpansion = require './snippet-expansion'
 Snippet = require './snippet'
 LoadSnippetsTask = require './load-snippets-task'

src/packages/snippets/spec/snippets-spec.coffee

@@ -1,10 +1,10 @@
 Snippet = require 'snippets/lib/snippet'
 LoadSnippetsTask = require 'snippets/lib/load-snippets-task'
 RootView = require 'root-view'
-Buffer = require 'buffer'
+Buffer = require 'text-buffer'
 Editor = require 'editor'
-_ = nodeRequire 'underscore'
-fs = require 'fs'
+_ = require 'underscore'
+fs = require 'fs-utils'
 Package = require 'package'
 
 describe "Snippets extension", ->

src/packages/spell-check/lib/spell-check-view.coffee

@@ -1,5 +1,5 @@
 {View} = require 'space-pen'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 SpellCheckTask = require './spell-check-task'
 MisspellingView = require './misspelling-view'
 

src/packages/status-bar/lib/status-bar-view.coffee

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

src/packages/status-bar/spec/status-bar-spec.coffee

@@ -1,8 +1,8 @@
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 RootView = require 'root-view'
 StatusBar = require 'status-bar/lib/status-bar-view'
-fs = require 'fs'
+fs = require 'fs-utils'
 
 describe "StatusBar", ->
   [editor, statusBar, buffer] = []

src/packages/strip-trailing-whitespace/spec/strip-trailing-whitespace-spec.coffee

@@ -1,5 +1,5 @@
 RootView = require 'root-view'
-fs = require 'fs'
+fs = require 'fs-utils'
 
 describe "StripTrailingWhitespace", ->
   [editor, path] = []

src/packages/symbols-view/lib/load-tags-handler.coffee

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

src/packages/symbols-view/lib/symbols-view.coffee

@@ -3,7 +3,7 @@ SelectList = require 'select-list'
 TagGenerator = require './tag-generator'
 TagReader = require './tag-reader'
 Point = require 'point'
-fs = require 'fs'
+fs = require 'fs-utils'
 $ = require 'jquery'
 
 module.exports =

src/packages/symbols-view/lib/tag-reader.coffee

@@ -1,7 +1,7 @@
-fs = require 'fs'
+fs = require 'fs-utils'
 $ = require 'jquery'
 LoadTagsTask = require './load-tags-task'
-ctags = nodeRequire 'ctags'
+ctags = require 'ctags'
 
 module.exports =
 

src/packages/symbols-view/spec/symbols-view-spec.coffee

@@ -1,7 +1,7 @@
 RootView = require 'root-view'
 SymbolsView = require 'symbols-view/lib/symbols-view'
 TagGenerator = require 'symbols-view/lib/tag-generator'
-fs = require 'fs'
+fs = require 'fs-utils'
 
 describe "SymbolsView", ->
   [symbolsView, setArraySpy] = []

src/packages/tabs/lib/tab-bar-view.coffee

@@ -1,5 +1,5 @@
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 SortableList = require 'sortable-list'
 TabView = require './tab-view'
 

src/packages/tabs/lib/tab-view.coffee

@@ -1,6 +1,6 @@
 $ = require 'jquery'
 {View} = require 'space-pen'
-fs = require 'fs'
+fs = require 'fs-utils'
 
 module.exports =
 class TabView extends View

src/packages/tabs/spec/tabs-spec.coffee

@@ -1,10 +1,10 @@
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 RootView = require 'root-view'
 Pane = require 'pane'
 PaneContainer = require 'pane-container'
 TabBarView = require 'tabs/lib/tab-bar-view'
-fs = require 'fs'
+fs = require 'fs-utils'
 {View} = require 'space-pen'
 
 describe "Tabs package main", ->

src/packages/tree-view/lib/dialog.coffee

@@ -1,6 +1,6 @@
 {View} = require 'space-pen'
 Editor = require 'editor'
-fs = require 'fs'
+fs = require 'fs-utils'
 $ = require 'jquery'
 
 module.exports =

src/packages/tree-view/lib/file-view.coffee

@@ -1,7 +1,7 @@
 {View} = require 'space-pen'
 $ = require 'jquery'
 Git = require 'git'
-fs = require 'fs'
+fs = require 'fs-utils'
 
 module.exports =
 class FileView extends View

src/packages/tree-view/lib/tree-view.coffee

@@ -4,9 +4,9 @@ Directory = require 'directory'
 DirectoryView = require './directory-view'
 FileView = require './file-view'
 Dialog = require './dialog'
-fs = require 'fs'
+fs = require 'fs-utils'
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class TreeView extends ScrollView

src/packages/tree-view/spec/tree-view-spec.coffee

@@ -1,9 +1,9 @@
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 TreeView = require 'tree-view/lib/tree-view'
 RootView = require 'root-view'
 Directory = require 'directory'
-fs = require 'fs'
+fs = require 'fs-utils'
 
 describe "TreeView", ->
   [treeView, sampleJs, sampleTxt] = []

src/packages/wrap-guide/lib/wrap-guide-view.coffee

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

src/stdlib/buffered-process.coffee

@@ -1,4 +1,4 @@
-ChildProcess = nodeRequire 'child_process'
+ChildProcess = require 'child_process'
 
 module.exports =
 class BufferedProcess

src/stdlib/cson.coffee

@@ -1,5 +1,5 @@
-_ = nodeRequire 'underscore'
-fs = require 'fs'
+_ = require 'underscore'
+fs = require 'fs-utils'
 
 module.exports =
   isObjectPath: (path) ->
@@ -9,7 +9,7 @@ module.exports =
   readObject: (path) ->
     contents = fs.read(path)
     if fs.extension(path) is '.cson'
-      CoffeeScript = nodeRequire 'coffee-script'
+      CoffeeScript = require 'coffee-script'
       CoffeeScript.eval(contents, bare: true)
     else
       JSON.parse(contents)

src/stdlib/event.coffee

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

src/stdlib/fs-utils.coffee

@@ -1,9 +1,10 @@
 # commonjs fs module
 # http://ringojs.org/api/v0.8/fs/
 
-_ = nodeRequire 'underscore'
-nodeFs = nodeRequire 'fs'
-mkdirp = nodeRequire 'mkdirp'
+_ = require 'underscore'
+fs = require 'fs'
+mkdirp = require 'mkdirp'
+Module = require 'module'
 
 module.exports =
   # Make the given path absolute by resolving it against the
@@ -28,7 +29,7 @@ module.exports =
 
   # Returns true if the file specified by path exists
   exists: (path) ->
-    path? and nodeFs.existsSync(path)
+    path? and fs.existsSync(path)
 
   # Returns the extension of a file. The extension of a file is the
   # last dot (excluding any number of initial dots) followed by one or
@@ -50,12 +51,12 @@ module.exports =
   # Returns true if the file specified by path exists and is a
   # directory.
   isDirectory: (path) ->
-    @exists(path) and nodeFs.statSync(path).isDirectory()
+    @exists(path) and fs.statSync(path).isDirectory()
 
   # Returns true if the file specified by path exists and is a
   # regular file.
   isFile: (path) ->
-    @exists(path) and nodeFs.statSync(path).isFile()
+    @exists(path) and fs.statSync(path).isFile()
 
   # Returns an array with all the names of files contained
   # in the directory path.
@@ -81,28 +82,28 @@ module.exports =
     paths
 
   move: (source, target) ->
-    nodeFs.renameSync(source, target)
+    fs.renameSync(source, target)
 
   # Remove a file at the given path. Throws an error if path is not a
   # file or a symbolic link to a file.
   remove: (path) ->
     if @isFile(path)
-      nodeFs.unlinkSync(path)
+      fs.unlinkSync(path)
     else if @isDirectory(path)
       removeDirectory = (path) =>
-        for entry in nodeFs.readdirSync(path)
+        for entry in fs.readdirSync(path)
           entryPath = @join(path, entry)
-          stats = nodeFs.statSync(entryPath)
+          stats = fs.statSync(entryPath)
           if stats.isDirectory()
             removeDirectory(entryPath)
           else if stats.isFile()
-            nodeFs.unlinkSync(entryPath)
-        nodeFs.rmdirSync(path)
+            fs.unlinkSync(entryPath)
+        fs.rmdirSync(path)
       removeDirectory(path)
 
   # Open, read, and close a file, returning the file's contents.
   read: (path) ->
-    String nodeFs.readFileSync(path)
+    String fs.readFileSync(path)
 
   # Returns an array of path components. If the path is absolute, the first
   # component will be an indicator of the root of the file system; for file
@@ -116,10 +117,10 @@ module.exports =
   # Open, write, flush, and close a file, writing the given content.
   write: (path, content) ->
     mkdirp.sync(@directory(path))
-    nodeFs.writeFileSync(path, content)
+    fs.writeFileSync(path, content)
 
   makeDirectory: (path) ->
-    nodeFs.mkdirSync(path)
+    fs.mkdirSync(path)
 
   # Creates the directory specified by "path" including any missing parent
   # directories.
@@ -134,10 +135,10 @@ module.exports =
 
     traverse = (rootPath, prefix, onFile, onDirectory) =>
       prefix  = "#{prefix}/" if prefix
-      for file in nodeFs.readdirSync(rootPath)
+      for file in fs.readdirSync(rootPath)
         relativePath = "#{prefix}#{file}"
         absolutePath = @join(rootPath, file)
-        stats = nodeFs.statSync(absolutePath)
+        stats = fs.statSync(absolutePath)
         if stats.isDirectory()
           traverse(absolutePath, relativePath, onFile, onDirectory) if onDirectory(relativePath)
         else if stats.isFile()
@@ -146,8 +147,8 @@ module.exports =
     traverse(rootPath, '', onFile, onDirectory)
 
   md5ForPath: (path) ->
-    contents = nodeFs.readFileSync(path)
-    nodeRequire('crypto').createHash('md5').update(contents).digest('hex')
+    contents = fs.readFileSync(path)
+    require('crypto').createHash('md5').update(contents).digest('hex')
 
   resolve: (args...) ->
     extensions = args.pop() if _.isArray(_.last(args))
@@ -163,6 +164,10 @@ module.exports =
         return candidatePath if @exists(candidatePath)
     undefined
 
+  resolveOnLoadPath: (args...) ->
+    loadPaths = Module.globalPaths.concat(module.paths)
+    @resolve(loadPaths..., args...)
+
   resolveExtension: (path, extensions) ->
     for extension in extensions
       if extension == ""

src/stdlib/jquery-extensions.coffee

@@ -1,5 +1,5 @@
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 $.fn.scrollBottom = (newValue) ->
   if newValue?

src/stdlib/path.coffee

@@ -1,7 +1,7 @@
 # node.js path module
 # http://nodejs.org/docs/v0.6.0/api/path.html
 
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
   # Return the last portion of a path. Similar to the Unix basename command.

src/stdlib/require.coffee

@@ -1,4 +1,4 @@
-fs = nodeRequire 'fs'
+fs = require 'fs-utils'
 
 paths = [
   "#{window.resourcePath}/spec"
@@ -61,7 +61,7 @@ exts =
       compiled = __read(cacheFilePath)
       writeToCache = false
     else
-      CoffeeScript = nodeRequire 'coffee-script'
+      CoffeeScript = require 'coffee-script'
       compiled = CoffeeScript.compile(__read(file), filename: file)
       writeToCache = true
 
@@ -76,7 +76,7 @@ getPath = (path) ->
 
   cacheFilePath = getCacheFilePath(path)
   unless __exists(cacheFilePath)
-    CoffeeScript = nodeRequire 'coffee-script'
+    CoffeeScript = require 'coffee-script'
     compiled = CoffeeScript.compile(__read(path), filename: path)
     createCacheDirectory()
     fs.writeFileSync(cacheFilePath, compiled)

src/stdlib/settings.coffee

@@ -1,4 +1,4 @@
-fs = require 'fs'
+fs = require 'fs-utils'
 CoffeeScript = require 'coffee-script'
 
 # Settings file looks like:

src/stdlib/space-pen-extensions.coffee

@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 {View} = require 'space-pen'
 jQuery = require 'jquery'
 ConfigObserver = require 'config-observer'

src/stdlib/task-shell.coffee

@@ -13,9 +13,6 @@ console =
   error: -> callTaskMethod 'error', arguments...
 self.__defineGetter__ 'console', -> console
 
-self.nodeRequire = self.require
-self.require = undefined
-
 window.document =
   createElement: ->
     setAttribute: ->
@@ -36,12 +33,11 @@ self.callTaskMethod = (method, args...) ->
 
 # The worker's initial handler replaces itself when `start` is invoked
 self.handler =
-  start: ({resourcePath, globals, requirePath, handlerPath}) ->
+  start: ({globals, handlerPath}) ->
     for key, value of globals
       self[key] = value
       window[key] = value
-    importScripts(requirePath)
-    require 'config'
+    require 'coffee-script'
     self.handler = require(handlerPath)
     callTaskMethod 'started'
 

src/stdlib/task.coffee

@@ -1,5 +1,6 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 EventEmitter = require 'event-emitter'
+fs = require 'fs-utils'
 
 module.exports =
 class Task
@@ -10,7 +11,13 @@ class Task
   start: ->
     throw new Error("Task already started") if @worker?
 
-    @worker = new Worker(require.getPath('task-shell'))
+    taskShellPath = fs.resolveOnLoadPath('task-shell', ['js', 'coffee'])
+    contents = fs.read(taskShellPath)
+    if fs.extension(taskShellPath) is '.coffee'
+      CoffeeScript = require 'coffee-script'
+      contents = CoffeeScript.compile(contents, filename: taskShellPath)
+    blob = new Blob([contents], type: 'text/javascript')
+    @worker = new Worker(URL.createObjectURL(blob))
     @worker.onmessage = ({data}) =>
       if @aborted
         @done()
@@ -29,10 +36,8 @@ class Task
   startWorker: ->
     @callWorkerMethod 'start',
       globals:
-        resourcePath: window.resourcePath
         navigator:
           userAgent: navigator.userAgent
-      requirePath: require.getPath('require')
       handlerPath: @path
 
   started: ->

src/stdlib/underscore-extensions.coffee

@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 _.mixin
   remove: (array, element) ->