fix: dont resolve require() for react-loadable.json. fixes #48

combine · Feb 23, 2018 · 6db764f · 6db764f
1 parent 1c8d327
commit 6db764f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -34,7 +34,8 @@
  "node": true
  },
  "globals": {
- "expect": true
+ "expect": true,
+ "__non_webpack_require__": true
  },
  "extends": [
  "eslint:recommended",

diff --git a/server/renderer/handler.js b/server/renderer/handler.js
@@ -14,8 +14,14 @@ import config from '../../config';
 
 let stats = null;
 
+// This is a small 'hack' to tell webpack to avoid resolving the below file
+// during compilation, since react-loadable.json may or may not exist.
+const requireFunc = typeof __webpack_require__ === 'function'
+ ? __non_webpack_require__
+ : require;
+
 if (config.enableDynamicImports) {
- stats = require('../../react-loadable.json');
+ stats = requireFunc('../../react-loadable.json');
 }
 
 export default function handleRender(req, res) {