From b638b9e55233fd12eb24a91396220a166104186b Mon Sep 17 00:00:00 2001 From: Shu Ding Date: Wed, 23 Nov 2022 14:50:08 +0100 Subject: [PATCH] remove unused code --- packages/next/build/output/index.ts | 16 ------------- packages/next/server/dev/hot-reloader.ts | 25 ++++++++------------- packages/next/server/dev/next-dev-server.ts | 2 +- 3 files changed, 10 insertions(+), 33 deletions(-) diff --git a/packages/next/build/output/index.ts b/packages/next/build/output/index.ts index 0161b35086f1..08d8d95a06ea 100644 --- a/packages/next/build/output/index.ts +++ b/packages/next/build/output/index.ts @@ -11,10 +11,6 @@ export function startedDevelopmentServer(appUrl: string, bindAddr: string) { consoleStore.setState({ appUrl, bindAddr }) } -let previousClient: webpack.Compiler | null = null -let previousServer: webpack.Compiler | null = null -let previousEdgeServer: webpack.Compiler | null = null - type CompilerDiagnostics = { modules: number errors: string[] | null @@ -223,14 +219,6 @@ export function watchCompilers( server: webpack.Compiler, edgeServer: webpack.Compiler ) { - if ( - previousClient === client && - previousServer === server && - previousEdgeServer === edgeServer - ) { - return - } - buildStore.setState({ client: { loading: true }, server: { loading: true }, @@ -317,10 +305,6 @@ export function watchCompilers( }) } }) - - previousClient = client - previousServer = server - previousEdgeServer = edgeServer } export function reportTrigger(trigger: string) { diff --git a/packages/next/server/dev/hot-reloader.ts b/packages/next/server/dev/hot-reloader.ts index dbebbd71c8e7..baa09430552b 100644 --- a/packages/next/server/dev/hot-reloader.ts +++ b/packages/next/server/dev/hot-reloader.ts @@ -537,20 +537,19 @@ export default class HotReloader { }) } - public async start(initial?: boolean): Promise { + public async start(): Promise { const startSpan = this.hotReloaderSpan.traceChild('start') startSpan.stop() // Stop immediately to create an artificial parent span - if (initial) { - await this.clean(startSpan) - // Ensure distDir exists before writing package.json - await fs.mkdir(this.distDir, { recursive: true }) + await this.clean(startSpan) + // Ensure distDir exists before writing package.json + await fs.mkdir(this.distDir, { recursive: true }) + + const distPackageJsonPath = join(this.distDir, 'package.json') + // Ensure commonjs handling is used for files in the distDir (generally .next) + // Files outside of the distDir can be "type": "module" + await fs.writeFile(distPackageJsonPath, '{"type": "commonjs"}') - const distPackageJsonPath = join(this.distDir, 'package.json') - // Ensure commonjs handling is used for files in the distDir (generally .next) - // Files outside of the distDir can be "type": "module" - await fs.writeFile(distPackageJsonPath, '{"type": "commonjs"}') - } this.activeConfigs = await this.getWebpackConfig(startSpan) for (const config of this.activeConfigs) { @@ -1024,12 +1023,6 @@ export default class HotReloader { edgeServerStats: () => this.edgeServerStats, }), ] - - // trigger invalidation to ensure any previous callbacks - // are handled in the on-demand-entry-handler - if (!initial) { - this.invalidate() - } } public invalidate() { diff --git a/packages/next/server/dev/next-dev-server.ts b/packages/next/server/dev/next-dev-server.ts index a372f49a336e..9279bdf6bc4e 100644 --- a/packages/next/server/dev/next-dev-server.ts +++ b/packages/next/server/dev/next-dev-server.ts @@ -713,7 +713,7 @@ export default class DevServer extends Server { }) await super.prepare() await this.addExportPathMapRoutes() - await this.hotReloader.start(true) + await this.hotReloader.start() await this.startWatcher() this.setDevReady!()