WIP

src/atom-environment.coffee

@@ -131,7 +131,7 @@ class AtomEnvironment extends Model
 
   # Call .loadOrCreate instead
   constructor: (params={}) ->
-    {@blobStore, @applicationDelegate, @window, @document, @clipboard, @configDirPath, @enablePersistence, onlyLoadBaseStyleSheets} = params
+    {@applicationDelegate, @window, @document, @clipboard, @configDirPath, @enablePersistence, onlyLoadBaseStyleSheets} = params
 
     @unloaded = false
     @loadTime = null
@@ -733,7 +733,6 @@ class AtomEnvironment extends Model
 
     @storeWindowBackground()
     @packages.deactivatePackages()
-    @saveBlobStoreSync()
     @unloaded = true
 
   openInitialEmptyEditorIfNecessary: ->
@@ -867,11 +866,6 @@ class AtomEnvironment extends Model
   showSaveDialogSync: (options={}) ->
     @applicationDelegate.showSaveDialog(options)
 
-  saveBlobStoreSync: ->
-    return unless @enablePersistence
-
-    @blobStore.save()
-
   saveState: (options) ->
     new Promise (resolve, reject) =>
       if @enablePersistence and @project

src/initialize-application-window.coffee

@@ -3,6 +3,9 @@ ApplicationDelegate = require './application-delegate'
 Clipboard = require './clipboard'
 TextEditor = require './text-editor'
 TextEditorComponent = require './text-editor-component'
+FileSystemBlobStore = require './file-system-blob-store'
+CompileCache = require './compile-cache'
+ModuleCache = require './module-cache'
 
 require('about')
 require('archive-view')

src/module-cache.coffee

@@ -20,7 +20,7 @@ class Range extends semver.Range
       @unmatchedVersions.add(version)
     matches
 
-nativeModules = process.binding('natives')
+nativeModules = null
 
 cache =
   builtins: {}
@@ -171,6 +171,7 @@ resolveModulePath = (relativePath, parentModule) ->
   return unless relativePath
   return unless parentModule?.filename
 
+  nativeModules ?= process.binding('natives')
   return if nativeModules.hasOwnProperty(relativePath)
   return if relativePath[0] is '.'
   return if isAbsolute(relativePath)
@@ -212,35 +213,6 @@ registerBuiltins = (devMode) ->
   for builtin in rendererBuiltins
     cache.builtins[builtin] = path.join(rendererRoot, "#{builtin}.js")
 
-if cache.debug
-  cache.findPathCount = 0
-  cache.findPathTime = 0
-  cache.loadCount = 0
-  cache.requireTime = 0
-  global.moduleCache = cache
-
-  originalLoad = Module::load
-  Module::load = ->
-    cache.loadCount++
-    originalLoad.apply(this, arguments)
-
-  originalRequire = Module::require
-  Module::require = ->
-    startTime = Date.now()
-    exports = originalRequire.apply(this, arguments)
-    cache.requireTime += Date.now() - startTime
-    exports
-
-  originalFindPath = Module._findPath
-  Module._findPath = (request, paths) ->
-    cacheKey = JSON.stringify({request, paths})
-    cache.findPathCount++ unless Module._pathCache[cacheKey]
-
-    startTime = Date.now()
-    foundPath = originalFindPath.apply(global, arguments)
-    cache.findPathTime += Date.now() - startTime
-    foundPath
-
 exports.create = (modulePath) ->
   fs = require 'fs-plus'
 

src/task.coffee

@@ -71,7 +71,7 @@ class Task
     taskBootstrapRequire = "require('#{require.resolve('./task-bootstrap')}');"
     bootstrap = """
       snapshotResult.setGlobals(global, process, global, {}, require)
-      CompileCache = snapshotResult.customRequire('../src/compile-cache.js')
+      CompileCache = #{compileCacheRequire}
       CompileCache.setCacheDirectory('#{compileCachePath}');
       #{taskBootstrapRequire}
     """