next-server
Advanced tools
Comparing version 8.0.2-canary.4 to 8.0.2-canary.5
@@ -30,2 +30,11 @@ "use strict"; | ||
}; | ||
function assignDefaults(userConfig) { | ||
Object.keys(userConfig).forEach(key => { | ||
const maybeObject = userConfig[key]; | ||
if ((!!maybeObject) && (maybeObject.constructor === Object)) { | ||
userConfig[key] = Object.assign({}, (defaultConfig[key] || {}), userConfig[key]); | ||
} | ||
}); | ||
return Object.assign({}, defaultConfig, userConfig); | ||
} | ||
function normalizeConfig(phase, config) { | ||
@@ -39,3 +48,3 @@ if (typeof config === 'function') { | ||
if (customConfig) { | ||
return Object.assign({}, defaultConfig, { configOrigin: 'server' }, customConfig); | ||
return assignDefaults(Object.assign({ configOrigin: 'server' }, customConfig)); | ||
} | ||
@@ -52,9 +61,3 @@ const path = find_up_1.default.sync(constants_1.CONFIG_FILE, { | ||
} | ||
if (userConfig.experimental) { | ||
userConfig.experimental = Object.assign({}, defaultConfig.experimental, userConfig.experimental); | ||
} | ||
if (userConfig.onDemandEntries) { | ||
userConfig.onDemandEntries = Object.assign({}, defaultConfig.onDemandEntries, userConfig.onDemandEntries); | ||
} | ||
return Object.assign({}, defaultConfig, { configOrigin: constants_1.CONFIG_FILE }, userConfig); | ||
return assignDefaults(Object.assign({ configOrigin: constants_1.CONFIG_FILE }, userConfig)); | ||
} | ||
@@ -61,0 +64,0 @@ return defaultConfig; |
@@ -198,3 +198,3 @@ "use strict"; | ||
if (this.nextConfig.poweredByHeader) { | ||
res.setHeader('X-Powered-By', 'Next.js ' + "8.0.2-canary.4"); | ||
res.setHeader('X-Powered-By', 'Next.js ' + "8.0.2-canary.5"); | ||
} | ||
@@ -201,0 +201,0 @@ return this.sendHTML(req, res, html); |
{ | ||
"name": "next-server", | ||
"version": "8.0.2-canary.4", | ||
"version": "8.0.2-canary.5", | ||
"main": "./index.js", | ||
@@ -55,3 +55,3 @@ "license": "MIT", | ||
}, | ||
"gitHead": "b0a9b99b7f0e38a269640e3d87a21a9e506295fa" | ||
"gitHead": "0bf5041ef41f2e28d01e51e2838d615482ada8c1" | ||
} |
76345
1876