Unverified Commit 87fc1b9d authored by Sebastian "Sebbie" Silbermann's avatar Sebastian "Sebbie" Silbermann Committed by GitHub

Fix duplicate .next/types `include` on Windows (#85400)

parent 8cdd4ead
import { readFileSync, writeFileSync } from 'fs' import { readFileSync, writeFileSync } from 'fs'
import * as path from 'path'
import { bold, cyan, white } from '../picocolors' import { bold, cyan, white } from '../picocolors'
import * as CommentJson from 'next/dist/compiled/comment-json' import * as CommentJson from 'next/dist/compiled/comment-json'
import semver from 'next/dist/compiled/semver' import semver from 'next/dist/compiled/semver'
...@@ -267,7 +268,11 @@ export async function writeConfigurationDefaults( ...@@ -267,7 +268,11 @@ export async function writeConfigurationDefaults(
} }
} }
const nextAppTypes: string[] = [`${distDir}/types/**/*.ts`] const distDirPosix =
path.win32.sep === path.sep
? distDir.replaceAll(path.win32.sep, path.posix.sep)
: distDir
const nextAppTypes: string[] = [`${distDirPosix}/types/**/*.ts`]
// When isolatedDevBuild is enabled, Next.js uses different distDir paths: // When isolatedDevBuild is enabled, Next.js uses different distDir paths:
// - Development: "{distDir}/dev" // - Development: "{distDir}/dev"
...@@ -279,10 +284,10 @@ export async function writeConfigurationDefaults( ...@@ -279,10 +284,10 @@ export async function writeConfigurationDefaults(
process.env.NODE_ENV === 'development' process.env.NODE_ENV === 'development'
? // In dev, distDir is "{distDir}/dev", which is already in the array above, but we also need "{distDir}/types". ? // In dev, distDir is "{distDir}/dev", which is already in the array above, but we also need "{distDir}/types".
// Here we remove "/dev" at the end of distDir for consistency. // Here we remove "/dev" at the end of distDir for consistency.
`${distDir.replace(/\/dev$/, '')}/types/**/*.ts` `${distDirPosix.replace(/\/dev$/, '')}/types/**/*.ts`
: // In build, distDir is "{distDir}", which is already in the array above, but we also need "{distDir}/dev/types". : // In build, distDir is "{distDir}", which is already in the array above, but we also need "{distDir}/dev/types".
// Here we add "/dev" at the end of distDir for consistency. // Here we add "/dev" at the end of distDir for consistency.
`${distDir}/dev/types/**/*.ts` `${distDirPosix}/dev/types/**/*.ts`
) )
// Sort the array to ensure consistent order. // Sort the array to ensure consistent order.
nextAppTypes.sort((a, b) => a.length - b.length) nextAppTypes.sort((a, b) => a.length - b.length)
......
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