File tree Expand file tree Collapse file tree 5 files changed +4
-229
lines changed
config/blocks/css/loaders Expand file tree Collapse file tree 5 files changed +4
-229
lines changed Original file line number Diff line number Diff line change @@ -50,7 +50,6 @@ import { regexLikeCss } from './webpack/config/blocks/css'
5050import { CopyFilePlugin } from './webpack/plugins/copy-file-plugin'
5151import { ClientReferenceManifestPlugin } from './webpack/plugins/flight-manifest-plugin'
5252import { FlightClientEntryPlugin as NextFlightClientEntryPlugin } from './webpack/plugins/flight-client-entry-plugin'
53- import { RspackFlightClientEntryPlugin } from './webpack/plugins/rspack-flight-client-entry-plugin'
5453import { NextTypesPlugin } from './webpack/plugins/next-types-plugin'
5554import 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
Original file line number Diff line number Diff 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 ,
Load Diff This file was deleted.
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -10,7 +10,6 @@ import type {
1010import type { ModuleGraphConnection } from 'webpack'
1111import { getAppLoader } from '../entries'
1212import { spans as webpackCompilationSpans } from './plugins/profiling-plugin'
13- import { compilationSpans as rspackCompilationSpans } from './plugins/rspack-profiling-plugin'
1413import type { Span } from '../../trace'
1514
1615export function traverseModules (
@@ -122,9 +121,5 @@ export function getModuleReferencesInOrder(
122121export 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}
You can’t perform that action at this time.
0 commit comments