Commit 30da9e07 authored by JJ Kasper's avatar JJ Kasper Committed by Tim Neutkens

Update to always require next/config when setting config (#7822)

parent 432eec2a
...@@ -15,7 +15,6 @@ import { getPageChunks } from './webpack/plugins/chunk-graph-plugin' ...@@ -15,7 +15,6 @@ import { getPageChunks } from './webpack/plugins/chunk-graph-plugin'
const fsStat = promisify(fs.stat) const fsStat = promisify(fs.stat)
const fsExists = promisify(fs.exists) const fsExists = promisify(fs.exists)
const fsReadFile = promisify(fs.readFile) const fsReadFile = promisify(fs.readFile)
const nextEnvConfig = require('next-server/config')
export function collectPages( export function collectPages(
directory: string, directory: string,
...@@ -268,7 +267,7 @@ export function isPageStatic( ...@@ -268,7 +267,7 @@ export function isPageStatic(
runtimeEnvConfig: any runtimeEnvConfig: any
): { static?: boolean; prerender?: boolean } { ): { static?: boolean; prerender?: boolean } {
try { try {
nextEnvConfig.setConfig(runtimeEnvConfig) require('next-server/config').setConfig(runtimeEnvConfig)
const mod = require(serverBundle) const mod = require(serverBundle)
const Comp = mod.default const Comp = mod.default
...@@ -290,7 +289,7 @@ export function hasCustomAppGetInitialProps( ...@@ -290,7 +289,7 @@ export function hasCustomAppGetInitialProps(
_appBundle: string, _appBundle: string,
runtimeEnvConfig: any runtimeEnvConfig: any
): boolean { ): boolean {
nextEnvConfig.setConfig(runtimeEnvConfig) require('next-server/config').setConfig(runtimeEnvConfig)
let mod = require(_appBundle) let mod = require(_appBundle)
if (_appBundle.endsWith('_app.js')) { if (_appBundle.endsWith('_app.js')) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment