Merge pull request #98 from tschaub/unmodified-extensions

Only add .coffee to extensions if it was present before
jhnns · Jul 1, 2016 · c0694e4 · c0694e4
2 parents f126dcb + 5561b8e
commit c0694e4
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/lib/moduleEnv.js b/lib/moduleEnv.js
@@ -47,12 +47,17 @@ function requireProxy(path) {
 }
 
 function registerExtensions() {
-    originalExtensions.coffee = require.extensions[".coffee"];
+    var originalCoffeeExtension = require.extensions[".coffee"];
+    if (originalCoffeeExtension) {
+        originalExtensions.coffee = originalCoffeeExtension;
+    }
     require.extensions[".coffee"] = coffeeExtension;
 }
 
 function restoreExtensions() {
-    require.extensions[".coffee"] = originalExtensions.coffee;
+    if ("coffee" in originalExtensions) {
+        require.extensions[".coffee"] = originalExtensions.coffee;
+    }
 }
 
 function coffeeExtension(module, filename) {