Merge pull request #834 from SimenB/parent-require

Fallback to regular require if `module.parent.require` is unavailable
marko-js · Sep 19, 2017 · 2afc986 · 2afc986
2 parents 582e699 + 686037f
commit 2afc986
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/express.js b/express.js
@@ -1,8 +1,9 @@
 var isDebug = require('./env').isDebug;
 var parentModule = module.parent;
+var parentRequire = parentModule && parentModule.require || require;
 
 if (isDebug) {
-    module.exports = parentModule.require('marko/src/express');
+    module.exports = parentRequire('marko/src/express');
 } else {
-    module.exports = parentModule.require('marko/dist/express');
+    module.exports = parentRequire('marko/dist/express');
 }
diff --git a/src/express.js b/src/express.js
@@ -1,7 +1,12 @@
 require('./');
 
 var assign = require('object-assign');
-var express = module.parent.require('express');
+
+var parentModule = module.parent;
+var parentRequire = parentModule && parentModule.require || require;
+
+var express = parentRequire('express');
+
 patchResponse(express.response);
 delete require.cache[__filename];