From fa03f0b9ccc9ce9fbba64908e4f31374da8fd005 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Mon, 5 Feb 2018 18:40:09 +0100
Subject: [PATCH] Require files directly instead of resolving them (#3683)

---
 server/render.js  | 16 +++++++++++-----
 server/require.js |  6 ------
 2 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 server/require.js

diff --git a/server/render.js b/server/render.js
index 8684c1fa9f1b..109caa7df403 100644
--- 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
deleted file mode 100644
index 3ca13f32fb76..000000000000
--- a/server/require.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import resolve from './resolve'
-
-export default async function requireModule (path) {
-  const f = await resolve(path)
-  return require(f)
-}