terribleplan/next.js
1
0
Fork 0
mirror of https://github.com/terribleplan/next.js.git synced 2024-01-19 02:48:18 +00:00
Code Issues Releases Wiki Activity

Revert "Require files directly instead of resolving them (#3683)" (#3684)

Browse source 
This reverts commit fa03f0b9cc.
This commit is contained in:
Arunoda Susiripala 2018-02-05 23:16:36 +05:30 committed by GitHub
parent fa03f0b9cc
commit 8308a33c11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
server/render.js
View file

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

6
server/require.js Normal file
View file

@ -0,0 +1,6 @@
import resolve from './resolve'
export default async function requireModule (path) {
const f = await resolve(path)
return require(f)
}