Unverified Commit 8b72b9e2 authored by Joe Haddad's avatar Joe Haddad Committed by GitHub

[Experimental] Do not type check twice (#13419)

The experimental modern mode runs the type checking plugin twice, which **occasionally** suffers from a race condition that hangs the build.

This PR fixes type checking to only be run once.

While this test cannot 100% reproduce/capture the race condition, I don't feel strongly about the test case:

- We're planning on eliminating this type checking plugin ASAP (for a faster alternative)
- Modern mode implementation as-is will probably go away with webpack 5
parent d94e8db5
...@@ -988,6 +988,7 @@ export default async function getBaseWebpackConfig( ...@@ -988,6 +988,7 @@ export default async function getBaseWebpackConfig(
!isServer && !isServer &&
!dev && !dev &&
new NextEsmPlugin({ new NextEsmPlugin({
excludedPlugins: ['ForkTsCheckerWebpackPlugin'],
filename: (getFileName: Function | string) => (...args: any[]) => { filename: (getFileName: Function | string) => (...args: any[]) => {
const name = const name =
typeof getFileName === 'function' typeof getFileName === 'function'
......
...@@ -74,10 +74,7 @@ export default class NextEsmPlugin implements Plugin { ...@@ -74,10 +74,7 @@ export default class NextEsmPlugin implements Plugin {
additionalPlugins?: any additionalPlugins?: any
}) { }) {
this.options = Object.assign( this.options = Object.assign(
{ { excludedPlugins: [], additionalPlugins: [] },
excludedPlugins: [PLUGIN_NAME],
additionalPlugins: [],
},
options options
) )
} }
...@@ -284,7 +281,11 @@ export default class NextEsmPlugin implements Plugin { ...@@ -284,7 +281,11 @@ export default class NextEsmPlugin implements Plugin {
} }
let plugins = (compiler.options.plugins || []).filter( let plugins = (compiler.options.plugins || []).filter(
(c) => !this.options.excludedPlugins.includes(c.constructor.name) (c) =>
!(
this.options.excludedPlugins.includes(c.constructor.name) ||
c.constructor.name === PLUGIN_NAME
)
) )
// Add the additionalPlugins // Add the additionalPlugins
......
module.exports = {} module.exports = {
experimental: { modern: true },
}
...@@ -23,9 +23,10 @@ describe('TypeScript with error handling options', () => { ...@@ -23,9 +23,10 @@ describe('TypeScript with error handling options', () => {
describe(`ignoreDevErrors: ${ignoreDevErrors}, ignoreBuildErrors: ${ignoreBuildErrors}`, () => { describe(`ignoreDevErrors: ${ignoreDevErrors}, ignoreBuildErrors: ${ignoreBuildErrors}`, () => {
beforeAll(() => { beforeAll(() => {
const nextConfig = { const nextConfig = {
experimental: { modern: true },
typescript: { ignoreDevErrors, ignoreBuildErrors }, typescript: { ignoreDevErrors, ignoreBuildErrors },
} }
nextConfigFile.replace('{}', JSON.stringify(nextConfig)) nextConfigFile.write('module.exports = ' + JSON.stringify(nextConfig))
}) })
afterAll(() => { afterAll(() => {
nextConfigFile.restore() nextConfigFile.restore()
......
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