chore: remove rspack-chain temporary code (#4460)

packages/compat/webpack/src/webpackConfig.ts

@@ -123,7 +123,7 @@ export async function generateWebpackConfig({
 
   const chain = await modifyWebpackChain(context, chainUtils, bundlerChain);
 
-  let webpackConfig = helpers.chainToConfig(chain) as WebpackConfig;
+  let webpackConfig = chain.toConfig() as WebpackConfig;
 
   const configUtils = (await helpers.getConfigUtils(
     webpackConfig as Rspack.Configuration,

packages/core/package.json

@@ -88,7 +88,7 @@
     "reduce-configs": "^1.1.0",
     "rsbuild-dev-middleware": "0.1.2",
     "rslog": "^1.2.3",
-    "rspack-chain": "^1.2.0",
+    "rspack-chain": "^1.2.1",
     "rspack-manifest-plugin": "5.0.3",
     "sirv": "^3.0.0",
     "style-loader": "3.3.4",

packages/core/src/configChain.ts

@@ -1,12 +1,7 @@
 import RspackChain from '../compiled/rspack-chain/index.js';
-import { castArray, isPlainObject } from './helpers';
+import { castArray } from './helpers';
 import { logger } from './logger';
-import type {
-  InternalContext,
-  ModifyBundlerChainUtils,
-  RsbuildEntry,
-  Rspack,
-} from './types';
+import type { InternalContext, ModifyBundlerChainUtils } from './types';
 
 export function getBundlerChain(): RspackChain {
   const bundlerChain = new RspackChain();
@@ -39,55 +34,6 @@ export async function modifyBundlerChain(
   return modifiedBundlerChain;
 }
 
-export function chainToConfig(chain: RspackChain): Rspack.Configuration {
-  const config = chain.toConfig();
-  const { entry } = config;
-
-  if (!isPlainObject(entry)) {
-    return config as Rspack.Configuration;
-  }
-
-  const formattedEntry: RsbuildEntry = {};
-
-  /**
-   * rspack-chain can not handle entry description object correctly,
-   * so we need to format the entry object and correct the entry description object.
-   */
-  for (const [entryName, entryValue] of Object.entries(entry)) {
-    const entryImport: string[] = [];
-    let entryDescription: Rspack.EntryDescription | null = null;
-
-    for (const item of castArray(entryValue)) {
-      if (typeof item === 'string') {
-        entryImport.push(item);
-        continue;
-      }
-
-      if (item.import) {
-        entryImport.push(...castArray(item.import));
-      }
-
-      if (entryDescription) {
-        // merge entry description object
-        Object.assign(entryDescription, item);
-      } else {
-        entryDescription = item;
-      }
-    }
-
-    formattedEntry[entryName] = entryDescription
-      ? {
-          ...entryDescription,
-          import: entryImport,
-        }
-      : entryImport;
-  }
-
-  config.entry = formattedEntry;
-
-  return config as Rspack.Configuration;
-}
-
 export const CHAIN_ID = {
   /** Predefined rules */
   RULE: {

packages/core/src/provider/helpers.ts

@@ -13,5 +13,5 @@ export { getHTMLPlugin } from '../pluginHelper';
 export { formatStats, getStatsOptions, prettyTime } from '../helpers';
 export { registerBuildHook, registerDevHook } from '../hooks';
 export { getChainUtils, getConfigUtils } from './rspackConfig';
-export { chainToConfig, modifyBundlerChain } from '../configChain';
+export { modifyBundlerChain } from '../configChain';
 export { createDevServer } from '../server/devServer';

packages/core/src/provider/rspackConfig.ts

@@ -1,6 +1,6 @@
 import { rspack } from '@rspack/core';
 import { reduceConfigsAsyncWithContext } from 'reduce-configs';
-import { CHAIN_ID, chainToConfig, modifyBundlerChain } from '../configChain';
+import { CHAIN_ID, modifyBundlerChain } from '../configChain';
 import { castArray, color, getNodeEnv } from '../helpers';
 import { logger } from '../logger';
 import { getHTMLPlugin } from '../pluginHelper';
@@ -179,7 +179,7 @@ export async function generateRspackConfig({
     },
   });
 
-  let rspackConfig = chainToConfig(chain);
+  let rspackConfig = chain.toConfig();
 
   rspackConfig = await modifyRspackConfig(
     context,