load only meta information of tsconfig for validation

vercel · Apr 16, 2021 · 5e267c8 · 5e267c8
1 parent 9da7eba
commit 5e267c8
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
@@ -329,7 +329,7 @@ export default async function getBaseWebpackConfig(
   // jsconfig is a subset of tsconfig
   if (useTypeScript) {
     const ts = (await import(typeScriptPath!)) as typeof import('typescript')
-    const tsConfig = await getTypeScriptConfiguration(ts, tsConfigPath)
+    const tsConfig = await getTypeScriptConfiguration(ts, tsConfigPath, true)
     jsConfig = { compilerOptions: tsConfig.options }
   }
 
@@ -1480,7 +1480,7 @@ export default async function getBaseWebpackConfig(
       )
     }
   } else if (!config.future.strictPostcssConfiguration) {
-    await __overrideCssConfiguration(dir, !dev, webpackConfig)
+    __overrideCssConfiguration(dir, !dev, webpackConfig)
   }
 
   // Inject missing React Refresh loaders so that development mode is fast:

diff --git a/packages/next/lib/typescript/getTypeScriptConfiguration.ts b/packages/next/lib/typescript/getTypeScriptConfiguration.ts
@@ -5,7 +5,8 @@ import { FatalTypeScriptError } from './FatalTypeScriptError'
 
 export async function getTypeScriptConfiguration(
   ts: typeof import('typescript'),
-  tsConfigPath: string
+  tsConfigPath: string,
+  metaOnly?: boolean
 ): Promise<import('typescript').ParsedCommandLine> {
   try {
     const formatDiagnosticsHost: import('typescript').FormatDiagnosticsHost = {
@@ -21,8 +22,18 @@ export async function getTypeScriptConfiguration(
       )
     }
 
+    let configToParse: any = config
+    if (metaOnly) {
+      configToParse = {
+        ...configToParse,
+        include: [],
+        exclude: [],
+        files: undefined,
+      }
+    }
+
     const result = ts.parseJsonConfigFileContent(
-      config,
+      configToParse,
       ts.sys,
       path.dirname(tsConfigPath)
     )
@@ -41,6 +52,10 @@ export async function getTypeScriptConfiguration(
       )
     }
 
+    if (metaOnly) {
+      result.raw = config
+    }
+
     return result
   } catch (err) {
     if (err?.name === 'SyntaxError') {

diff --git a/packages/next/lib/typescript/writeConfigurationDefaults.ts b/packages/next/lib/typescript/writeConfigurationDefaults.ts
@@ -98,7 +98,7 @@ export async function writeConfigurationDefaults(
   const {
     options: tsOptions,
     raw: rawConfig,
-  } = await getTypeScriptConfiguration(ts, tsConfigPath)
+  } = await getTypeScriptConfiguration(ts, tsConfigPath, true)
 
   const userTsConfigContent = await fs.readFile(tsConfigPath, {
     encoding: 'utf8',