Merge pull request #9 from ivan/master

Re-resolve path if require fails; don't break on corrupt JSON
bahmutov · May 2, 2016 · a06004f · a06004f
2 parents cf0324e + 8675417
commit a06004f
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -7,7 +7,12 @@ var SAVE_FILENAME =
   process.env.CACHE_REQUIRE_PATHS_FILE ?
   process.env.CACHE_REQUIRE_PATHS_FILE :
   './.cache-require-paths.json';
-var nameCache = exists(SAVE_FILENAME) ? JSON.parse(fs.readFileSync(SAVE_FILENAME, 'utf-8')) : {};
+var nameCache;
+try {
+  nameCache = exists(SAVE_FILENAME) ? JSON.parse(fs.readFileSync(SAVE_FILENAME, 'utf-8')) : {};
+} catch (err) {
+  nameCache = {};
+}
 
 var currentModuleCache;
 var pathToLoad;
@@ -30,7 +35,14 @@ Module.prototype.require = function cachePathsRequire(name) {
     currentModuleCache[name] = pathToLoad;
   }
 
-  return _require.call(this, pathToLoad);
+  try {
+    return _require.call(this, pathToLoad);
+  } catch (err) {
+    // Cache may be outdated; resolve and try again
+    pathToLoad = Module._resolveFilename(name, this);
+    currentModuleCache[name] = pathToLoad;
+    return _require.call(this, pathToLoad);
+  }
 };
 
 function printCache() {