Unverified Commit a7511f53 authored by Jiwon Choi's avatar Jiwon Choi Committed by GitHub

[dev-overlay] add false option to disable dev indicator (#76079)

### Why?

Since the dev indicator is visible by default, there could be a case where a user might want to disable it.
However, the indicator needs to be brought back if there is an error since it's tied to the error overlay.

### What?

Added an option `devIndicators: false` to disable the dev indicator.

### Success Criteria

- [x] Does it hide the indicator when there is no error?
- [x] Does it show the indicator when there is an error?
- [x] Does it show the error overlay when there is an error?

Closes NDX-840
parent 21ce3ab2
...@@ -212,12 +212,21 @@ pub enum BuildActivityPositions { ...@@ -212,12 +212,21 @@ pub enum BuildActivityPositions {
OperationValue, OperationValue,
)] )]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct DevIndicatorsConfig { pub struct DevIndicatorsOptions {
pub build_activity: Option<bool>, pub build_activity: Option<bool>,
pub build_activity_position: Option<BuildActivityPositions>, pub build_activity_position: Option<BuildActivityPositions>,
pub position: Option<BuildActivityPositions>, pub position: Option<BuildActivityPositions>,
} }
#[derive(
Clone, Debug, PartialEq, Serialize, Deserialize, TraceRawVcs, NonLocalValue, OperationValue,
)]
#[serde(untagged)]
pub enum DevIndicatorsConfig {
WithOptions(DevIndicatorsOptions),
Boolean(bool),
}
#[derive( #[derive(
Clone, Clone,
Debug, Debug,
......
...@@ -2130,8 +2130,14 @@ export default async function getBaseWebpackConfig( ...@@ -2130,8 +2130,14 @@ export default async function getBaseWebpackConfig(
crossOrigin: config.crossOrigin, crossOrigin: config.crossOrigin,
pageExtensions: pageExtensions, pageExtensions: pageExtensions,
trailingSlash: config.trailingSlash, trailingSlash: config.trailingSlash,
buildActivity: config.devIndicators.buildActivity, buildActivity:
buildActivityPosition: config.devIndicators.position, config.devIndicators === false
? false
: config.devIndicators.buildActivity,
buildActivityPosition:
config.devIndicators === false
? undefined
: config.devIndicators.position,
productionBrowserSourceMaps: !!config.productionBrowserSourceMaps, productionBrowserSourceMaps: !!config.productionBrowserSourceMaps,
reactStrictMode: config.reactStrictMode, reactStrictMode: config.reactStrictMode,
optimizeCss: config.experimental.optimizeCss, optimizeCss: config.experimental.optimizeCss,
......
...@@ -186,7 +186,7 @@ export function getDefineEnv({ ...@@ -186,7 +186,7 @@ export function getDefineEnv({
config.experimental.appNavFailHandling config.experimental.appNavFailHandling
), ),
'process.env.__NEXT_APP_ISR_INDICATOR': Boolean( 'process.env.__NEXT_APP_ISR_INDICATOR': Boolean(
config.devIndicators.appIsrStatus config.devIndicators === false ? false : config.devIndicators.appIsrStatus
), ),
'process.env.__NEXT_PPR': isPPREnabled, 'process.env.__NEXT_PPR': isPPREnabled,
'process.env.__NEXT_DYNAMIC_IO': isDynamicIOEnabled, 'process.env.__NEXT_DYNAMIC_IO': isDynamicIOEnabled,
...@@ -238,9 +238,14 @@ export function getDefineEnv({ ...@@ -238,9 +238,14 @@ export function getDefineEnv({
: {}), : {}),
'process.env.__NEXT_TRAILING_SLASH': config.trailingSlash, 'process.env.__NEXT_TRAILING_SLASH': config.trailingSlash,
'process.env.__NEXT_BUILD_INDICATOR': 'process.env.__NEXT_BUILD_INDICATOR':
config.devIndicators.buildActivity ?? true, config.devIndicators === false
? false
: config.devIndicators.buildActivity ?? true,
'process.env.__NEXT_DEV_INDICATOR': config.devIndicators !== false,
'process.env.__NEXT_DEV_INDICATOR_POSITION': 'process.env.__NEXT_DEV_INDICATOR_POSITION':
config.devIndicators.position ?? 'bottom-left', config.devIndicators === false
? 'bottom-left' // This will not be used as the indicator is disabled.
: config.devIndicators.position ?? 'bottom-left',
'process.env.__NEXT_STRICT_MODE': 'process.env.__NEXT_STRICT_MODE':
config.reactStrictMode === null ? false : config.reactStrictMode, config.reactStrictMode === null ? false : config.reactStrictMode,
'process.env.__NEXT_STRICT_MODE_APP': 'process.env.__NEXT_STRICT_MODE_APP':
......
...@@ -109,7 +109,18 @@ const RenderRuntimeError = ({ children, state, isAppDir }: Props) => { ...@@ -109,7 +109,18 @@ const RenderRuntimeError = ({ children, state, isAppDir }: Props) => {
} }
}, [nextError, isAppDir]) }, [nextError, isAppDir])
return children({ readyErrors, totalErrorCount: readyErrors.length }) // Stringify since __NEXT_DEV_INDICATOR can be set to boolean false.
const hasDisabledDevIndicator =
process.env.__NEXT_DEV_INDICATOR?.toString() === 'false'
const totalErrorCount = readyErrors.length
// Even if the dev indicator is disabled, we should show it
// along with the error overlay when there are errors.
if (hasDisabledDevIndicator && !totalErrorCount) {
return null
}
return children({ readyErrors, totalErrorCount })
} }
const RenderBuildError = ({ children }: Props) => { const RenderBuildError = ({ children }: Props) => {
......
...@@ -228,7 +228,8 @@ export const configSchema: zod.ZodType<NextConfig> = z.lazy(() => ...@@ -228,7 +228,8 @@ export const configSchema: zod.ZodType<NextConfig> = z.lazy(() =>
.optional(), .optional(),
deploymentId: z.string().optional(), deploymentId: z.string().optional(),
devIndicators: z devIndicators: z
.object({ .union([
z.object({
appIsrStatus: z.boolean().optional(), appIsrStatus: z.boolean().optional(),
buildActivity: z.boolean().optional(), buildActivity: z.boolean().optional(),
buildActivityPosition: z buildActivityPosition: z
...@@ -247,7 +248,9 @@ export const configSchema: zod.ZodType<NextConfig> = z.lazy(() => ...@@ -247,7 +248,9 @@ export const configSchema: zod.ZodType<NextConfig> = z.lazy(() =>
z.literal('top-right'), z.literal('top-right'),
]) ])
.optional(), .optional(),
}) }),
z.literal(false),
])
.optional(), .optional(),
distDir: z.string().min(1).optional(), distDir: z.string().min(1).optional(),
env: z.record(z.string(), z.union([z.string(), z.undefined()])).optional(), env: z.record(z.string(), z.union([z.string(), z.undefined()])).optional(),
......
...@@ -836,7 +836,9 @@ export interface NextConfig extends Record<string, any> { ...@@ -836,7 +836,9 @@ export interface NextConfig extends Record<string, any> {
images?: ImageConfig images?: ImageConfig
/** Configure indicators in development environment */ /** Configure indicators in development environment */
devIndicators?: { devIndicators?:
| false
| {
/** /**
* @deprecated The dev tools indicator has it enabled by default. * @deprecated The dev tools indicator has it enabled by default.
* */ * */
......
...@@ -488,6 +488,7 @@ function assignDefaults( ...@@ -488,6 +488,7 @@ function assignDefaults(
) )
if ( if (
hasWarnedBuildActivityPosition && hasWarnedBuildActivityPosition &&
result.devIndicators !== false &&
result.devIndicators?.buildActivityPosition && result.devIndicators?.buildActivityPosition &&
result.devIndicators.buildActivityPosition !== result.devIndicators.position result.devIndicators.buildActivityPosition !== result.devIndicators.position
) { ) {
...@@ -835,7 +836,7 @@ function assignDefaults( ...@@ -835,7 +836,7 @@ function assignDefaults(
} }
} }
if (result.devIndicators?.position) { if (result.devIndicators !== false && result.devIndicators?.position) {
const { position } = result.devIndicators const { position } = result.devIndicators
const allowedValues = [ const allowedValues = [
'top-left', 'top-left',
...@@ -962,8 +963,14 @@ function assignDefaults( ...@@ -962,8 +963,14 @@ function assignDefaults(
if (result.experimental.newDevOverlay !== true) { if (result.experimental.newDevOverlay !== true) {
result.devIndicators = { result.devIndicators = {
...result.devIndicators, ...result.devIndicators,
appIsrStatus: result.devIndicators?.appIsrStatus ?? true, appIsrStatus:
buildActivity: result.devIndicators?.buildActivity ?? true, result.devIndicators === false
? false
: result.devIndicators?.appIsrStatus ?? true,
buildActivity:
result.devIndicators === false
? false
: result.devIndicators?.buildActivity ?? true,
} }
// If the user didn't explicitly set `position` or `buildActivityPosition` option, // If the user didn't explicitly set `position` or `buildActivityPosition` option,
......
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