Unverified Commit 1b105f44 authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Make NextConfigComplete typing more accurate (#96700)

These properties were previously typed as always set in
`NextConfigComplete`. But in reality, they can be optional.
```
    | 'expireTime'
    | 'output'
    | 'modularizeImports'
    | 'allowedDevOrigins'
    | 'adapterPath'
```
I couldn't find a better way to fix this than listing them out
explicitly
parent 6324fdba
...@@ -304,7 +304,7 @@ export function getDefineEnv({ ...@@ -304,7 +304,7 @@ export function getDefineEnv({
...getImageConfig(config, dev), ...getImageConfig(config, dev),
'process.env.__NEXT_ROUTER_BASEPATH': config.basePath, 'process.env.__NEXT_ROUTER_BASEPATH': config.basePath,
'process.env.__NEXT_HAS_REWRITES': hasRewrites, 'process.env.__NEXT_HAS_REWRITES': hasRewrites,
'process.env.__NEXT_CONFIG_OUTPUT': config.output, 'process.env.__NEXT_CONFIG_OUTPUT': config.output || '',
'process.env.__NEXT_I18N_SUPPORT': !!config.i18n, 'process.env.__NEXT_I18N_SUPPORT': !!config.i18n,
'process.env.__NEXT_I18N_DOMAINS': config.i18n?.domains ?? false, 'process.env.__NEXT_I18N_DOMAINS': config.i18n?.domains ?? false,
'process.env.__NEXT_I18N_CONFIG': config.i18n || '', 'process.env.__NEXT_I18N_CONFIG': config.i18n || '',
......
...@@ -38,8 +38,27 @@ export type PrefetchInliningConfig = ...@@ -38,8 +38,27 @@ export type PrefetchInliningConfig =
| { maxSize: number; maxBundleSize: number } | { maxSize: number; maxBundleSize: number }
export type NextConfigComplete = Required< export type NextConfigComplete = Required<
Omit<NextConfig, 'configFile' | 'cacheLife'> Omit<
> & { NextConfig,
| 'configFile'
| 'cacheLife'
| 'expireTime'
| 'output'
| 'modularizeImports'
| 'allowedDevOrigins'
| 'adapterPath'
>
> &
// Don't apply `Required<>` for these properties. They really can be undefined in the finalized config.
Pick<
NextConfig,
| 'cacheLife'
| 'expireTime'
| 'output'
| 'modularizeImports'
| 'allowedDevOrigins'
| 'adapterPath'
> & {
images: Required<ImageConfigComplete> images: Required<ImageConfigComplete>
typescript: TypeScriptConfig typescript: TypeScriptConfig
configFile: string | undefined configFile: string | undefined
...@@ -67,7 +86,7 @@ export type NextConfigComplete = Required< ...@@ -67,7 +86,7 @@ export type NextConfigComplete = Required<
distDirRoot: string distDirRoot: string
// The repository root, regardless of overwritten outputFileTracingRoot or turbopack.root. // The repository root, regardless of overwritten outputFileTracingRoot or turbopack.root.
repoRoot: string repoRoot: string
} }
export type I18NDomains = readonly DomainLocale[] export type I18NDomains = readonly DomainLocale[]
...@@ -2294,14 +2313,14 @@ export interface NextConfigRuntime { ...@@ -2294,14 +2313,14 @@ export interface NextConfigRuntime {
agentRules: NextConfigComplete['agentRules'] agentRules: NextConfigComplete['agentRules']
htmlLimitedBots: NextConfigComplete['htmlLimitedBots'] htmlLimitedBots: NextConfigComplete['htmlLimitedBots']
assetPrefix: NextConfigComplete['assetPrefix'] assetPrefix: NextConfigComplete['assetPrefix']
output: NextConfigComplete['output'] output?: NextConfigComplete['output']
crossOrigin: NextConfigComplete['crossOrigin'] crossOrigin: NextConfigComplete['crossOrigin']
trailingSlash: NextConfigComplete['trailingSlash'] trailingSlash: NextConfigComplete['trailingSlash']
images: NextConfigComplete['images'] images: NextConfigComplete['images']
reactMaxHeadersLength: NextConfigComplete['reactMaxHeadersLength'] reactMaxHeadersLength: NextConfigComplete['reactMaxHeadersLength']
cacheLife: NextConfigComplete['cacheLife'] cacheLife: NextConfigComplete['cacheLife']
basePath: NextConfigComplete['basePath'] basePath: NextConfigComplete['basePath']
expireTime: NextConfigComplete['expireTime'] expireTime?: NextConfigComplete['expireTime']
generateEtags: NextConfigComplete['generateEtags'] generateEtags: NextConfigComplete['generateEtags']
poweredByHeader: NextConfigComplete['poweredByHeader'] poweredByHeader: NextConfigComplete['poweredByHeader']
cacheHandler: NextConfigComplete['cacheHandler'] cacheHandler: NextConfigComplete['cacheHandler']
......
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