Unverified Commit ba09c594 authored by Joe Haddad's avatar Joe Haddad Committed by GitHub

Set buildId to a fixed value during debug build (#6886)

* Set buildId to a fixed value during debug build

* __debug => debug
parent 2b7fb7ce
...@@ -63,11 +63,17 @@ export default async function build( ...@@ -63,11 +63,17 @@ export default async function build(
) )
} }
const debug =
process.env.__NEXT_BUILDER_EXPERIMENTAL_DEBUG === 'true' ||
process.env.__NEXT_BUILDER_EXPERIMENTAL_DEBUG === '1'
console.log('Creating an optimized production build ...') console.log('Creating an optimized production build ...')
console.log() console.log()
const config = loadConfig(PHASE_PRODUCTION_BUILD, dir, conf) const config = loadConfig(PHASE_PRODUCTION_BUILD, dir, conf)
const buildId = await generateBuildId(config.generateBuildId, nanoid) const buildId = debug
? 'unoptimized-build'
: await generateBuildId(config.generateBuildId, nanoid)
const distDir = path.join(dir, config.distDir) const distDir = path.join(dir, config.distDir)
const pagesDir = path.join(dir, 'pages') const pagesDir = path.join(dir, 'pages')
...@@ -123,9 +129,7 @@ export default async function build( ...@@ -123,9 +129,7 @@ export default async function build(
) )
const configs = await Promise.all([ const configs = await Promise.all([
getBaseWebpackConfig(dir, { getBaseWebpackConfig(dir, {
__debug: debug,
process.env.__NEXT_BUILDER_EXPERIMENTAL_DEBUG === 'true' ||
process.env.__NEXT_BUILDER_EXPERIMENTAL_DEBUG === '1',
buildId, buildId,
isServer: false, isServer: false,
config, config,
...@@ -134,9 +138,7 @@ export default async function build( ...@@ -134,9 +138,7 @@ export default async function build(
__selectivePageBuilding: pages && Boolean(pages.length), __selectivePageBuilding: pages && Boolean(pages.length),
}), }),
getBaseWebpackConfig(dir, { getBaseWebpackConfig(dir, {
__debug: debug,
process.env.__NEXT_BUILDER_EXPERIMENTAL_DEBUG === 'true' ||
process.env.__NEXT_BUILDER_EXPERIMENTAL_DEBUG === '1',
buildId, buildId,
isServer: true, isServer: true,
config, config,
......
...@@ -18,7 +18,7 @@ import { ChunkGraphPlugin } from './webpack/plugins/chunk-graph-plugin' ...@@ -18,7 +18,7 @@ import { ChunkGraphPlugin } from './webpack/plugins/chunk-graph-plugin'
import { WebpackEntrypoints } from './entries' import { WebpackEntrypoints } from './entries'
type ExcludesFalse = <T>(x: T | false) => x is T type ExcludesFalse = <T>(x: T | false) => x is T
export default function getBaseWebpackConfig (dir: string, {dev = false, __debug = false, isServer = false, buildId, config, target = 'server', entrypoints, __selectivePageBuilding = false}: {dev?: boolean, __debug?: boolean, isServer?: boolean, buildId: string, config: any, target?: string, entrypoints: WebpackEntrypoints, __selectivePageBuilding?: boolean}): webpack.Configuration { export default function getBaseWebpackConfig (dir: string, {dev = false, debug = false, isServer = false, buildId, config, target = 'server', entrypoints, __selectivePageBuilding = false}: {dev?: boolean, debug?: boolean, isServer?: boolean, buildId: string, config: any, target?: string, entrypoints: WebpackEntrypoints, __selectivePageBuilding?: boolean}): webpack.Configuration {
const defaultLoaders = { const defaultLoaders = {
babel: { babel: {
loader: 'next-babel-loader', loader: 'next-babel-loader',
...@@ -77,7 +77,7 @@ export default function getBaseWebpackConfig (dir: string, {dev = false, __debug ...@@ -77,7 +77,7 @@ export default function getBaseWebpackConfig (dir: string, {dev = false, __debug
let webpackConfig: webpack.Configuration = { let webpackConfig: webpack.Configuration = {
mode: webpackMode, mode: webpackMode,
devtool: (dev || __debug) ? 'cheap-module-source-map' : false, devtool: (dev || debug) ? 'cheap-module-source-map' : false,
name: isServer ? 'server' : 'client', name: isServer ? 'server' : 'client',
target: isServer ? 'node' : 'web', target: isServer ? 'node' : 'web',
externals: isServer && target !== 'serverless' ? [ externals: isServer && target !== 'serverless' ? [
...@@ -178,8 +178,8 @@ export default function getBaseWebpackConfig (dir: string, {dev = false, __debug ...@@ -178,8 +178,8 @@ export default function getBaseWebpackConfig (dir: string, {dev = false, __debug
} }
} }
}, },
minimize: !(dev || __debug), minimize: !(dev || debug),
minimizer: !(dev || __debug) ? [ minimizer: !(dev || debug) ? [
new TerserPlugin({...terserPluginConfig, new TerserPlugin({...terserPluginConfig,
terserOptions: { terserOptions: {
safari10: true safari10: true
......
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