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

Resolve the next.config.js up the tree to avoid it not being loaded when a source dir was specified via the CLI - solves #3379 (#3380)

Browse source
This commit is contained in:
Tyll Weiß 2017-12-14 03:49:26 +01:00 committed by Arunoda Susiripala
parent 9c88ea8c58
commit 702dd5d3f4
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -70,6 +70,7 @@
"cross-spawn": "5.1.0", "cross-spawn": "5.1.0",
"del": "3.0.0", "del": "3.0.0",
"etag": "1.8.1", "etag": "1.8.1",
"find-up": "2.1.0",
"fresh": "0.5.2", "fresh": "0.5.2",
"friendly-errors-webpack-plugin": "1.6.1", "friendly-errors-webpack-plugin": "1.6.1",
"glob": "7.1.2", "glob": "7.1.2",

10
server/config.js
View file

@ -1,5 +1,4 @@
import { join } from 'path' import findUp from 'find-up'
import { existsSync } from 'fs'
const cache = new Map() const cache = new Map()
@ -26,12 +25,13 @@ function loadConfig (dir, customConfig) {
customConfig.configOrigin = 'server' customConfig.configOrigin = 'server'
return withDefaults(customConfig) return withDefaults(customConfig)
} }
const path = join(dir, 'next.config.js') const path = findUp.sync('next.config.js', {
cwd: dir
})
let userConfig = {} let userConfig = {}
const userHasConfig = existsSync(path) if (path && path.length) {
if (userHasConfig) {
const userConfigModule = require(path) const userConfigModule = require(path)
userConfig = userConfigModule.default || userConfigModule userConfig = userConfigModule.default || userConfigModule
userConfig.configOrigin = 'next.config.js' userConfig.configOrigin = 'next.config.js'