Require files directly instead of resolving them (#3683)

vercel · Feb 5, 2018 · fa03f0b · fa03f0b
1 parent ed12293
commit fa03f0b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/server/render.js b/server/render.js
@@ -4,7 +4,6 @@ import { renderToString, renderToStaticMarkup } from 'react-dom/server'
 import send from 'send'
 import generateETag from 'etag'
 import fresh from 'fresh'
-import requireModule from './require'
 import getConfig from './config'
 import { Router } from '../lib/router'
 import { loadGetInitialProps, isResSent } from '../lib/utils'
@@ -55,10 +54,17 @@ async function doRender (req, res, pathname, query, {
   const pagePath = join(dir, dist, 'dist', 'bundles', 'pages', page)
   const documentPath = join(dir, dist, 'dist', 'bundles', 'pages', '_document')
 
-  let [Component, Document] = await Promise.all([
-    requireModule(pagePath),
-    requireModule(documentPath)
-  ])
+  let Component
+  let Document
+  try {
+    Component = require(pagePath)
+    Document = require(documentPath)
+  } catch (err) {
+    const err = new Error(`Cannot find module`)
+    err.code = 'ENOENT'
+    throw err
+  }
+
   Component = Component.default || Component
   Document = Document.default || Document
   const asPath = req.url

diff --git a/server/require.js b/server/require.js