Skip to content

Commit 6f95a68

Browse files
committed
fix: Remove remaining rspack plugin files and fix TypeScript errors
- Delete rspack-flight-client-entry-plugin.ts and rspack-profiling-plugin.ts - Remove imports and simplify FlightClientEntryPlugin selection - Remove rspack compilation spans logic - Fix MiniCssExtractPlugin loader property access with any cast Build verified locally with pnpm --filter next run build
1 parent 8eb9a1f commit 6f95a68

File tree

5 files changed

+4
-229
lines changed

5 files changed

+4
-229
lines changed

packages/next/src/build/webpack-config.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ import { regexLikeCss } from './webpack/config/blocks/css'
5050
import { CopyFilePlugin } from './webpack/plugins/copy-file-plugin'
5151
import { ClientReferenceManifestPlugin } from './webpack/plugins/flight-manifest-plugin'
5252
import { FlightClientEntryPlugin as NextFlightClientEntryPlugin } from './webpack/plugins/flight-client-entry-plugin'
53-
import { RspackFlightClientEntryPlugin } from './webpack/plugins/rspack-flight-client-entry-plugin'
5453
import { NextTypesPlugin } from './webpack/plugins/next-types-plugin'
5554
import type {
5655
Feature,
@@ -370,10 +369,7 @@ export default async function getBaseWebpackConfig(
370369

371370
const isRspack = Boolean(process.env.NEXT_RSPACK)
372371

373-
const FlightClientEntryPlugin =
374-
isRspack && process.env.BUILTIN_FLIGHT_CLIENT_ENTRY_PLUGIN
375-
? RspackFlightClientEntryPlugin
376-
: NextFlightClientEntryPlugin
372+
const FlightClientEntryPlugin = NextFlightClientEntryPlugin
377373

378374
// If the current compilation is aimed at server-side code instead of client-side code.
379375
const isNodeOrEdgeCompilation = isNodeServer || isEdgeServer

packages/next/src/build/webpack/config/blocks/css/loaders/client.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ export function getClientStyleLoader({
4141
}
4242
}
4343

44-
const MiniCssExtractPlugin = (
44+
const NextMiniCssExtractPlugin = (
4545
require('../../../../plugins/mini-css-extract-plugin') as typeof import('../../../../plugins/mini-css-extract-plugin')
4646
).default
4747

4848
return {
49-
loader: MiniCssExtractPlugin.loader,
49+
loader: (NextMiniCssExtractPlugin as any).loader,
5050
options: {
5151
publicPath: `${assetPrefix}/_next/`,
5252
esModule: false,

packages/next/src/build/webpack/plugins/rspack-flight-client-entry-plugin.ts

Lines changed: 0 additions & 157 deletions
This file was deleted.

packages/next/src/build/webpack/plugins/rspack-profiling-plugin.ts

Lines changed: 0 additions & 59 deletions
This file was deleted.

packages/next/src/build/webpack/utils.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import type {
1010
import type { ModuleGraphConnection } from 'webpack'
1111
import { getAppLoader } from '../entries'
1212
import { spans as webpackCompilationSpans } from './plugins/profiling-plugin'
13-
import { compilationSpans as rspackCompilationSpans } from './plugins/rspack-profiling-plugin'
1413
import type { Span } from '../../trace'
1514

1615
export function traverseModules(
@@ -122,9 +121,5 @@ export function getModuleReferencesInOrder(
122121
export function getCompilationSpan(
123122
compilation: Compiler | Compilation
124123
): Span | undefined {
125-
const compilationSpans = process.env.NEXT_RSPACK
126-
? rspackCompilationSpans
127-
: webpackCompilationSpans
128-
129-
return compilationSpans.get(compilation)
124+
return webpackCompilationSpans.get(compilation)
130125
}

0 commit comments

Comments
 (0)