up

Author: fi3ework

packages/core/src/config.ts

@@ -35,7 +35,6 @@ import type {
   LibConfig,
   PkgJson,
   Redirect,
-  ResolvedShims,
   RsbuildConfigOutputTarget,
   RslibConfig,
   RslibConfigAsyncFn,
@@ -542,8 +541,8 @@ const composeFormatConfig = (format: Format): RsbuildConfig => {
   }
 };
 
-const resolveShims = (shims?: Shims): ResolvedShims => {
-  return {
+const composeShimsConfig = (format: Format, shims: Shims): RsbuildConfig => {
+  const resolvedShims = {
     cjs: {
       'import.meta.url': shims?.cjs?.['import.meta.url'] ?? true,
     },
@@ -553,12 +552,7 @@ const resolveShims = (shims?: Shims): ResolvedShims => {
       require: shims?.esm?.require ?? false,
     },
   };
-};
 
-const composeShimsConfig = (
-  format: Format,
-  resolvedShims: ResolvedShims,
-): RsbuildConfig => {
   switch (format) {
     case 'esm':
       return {
@@ -962,15 +956,15 @@ async function composeLibRsbuildConfig(config: LibConfig, configPath: string) {
 
   const {
     format,
+    shims,
     banner = {},
     footer = {},
     autoExtension = true,
     autoExternal = true,
     externalHelpers = false,
     redirect = {},
   } = config;
-  const resolvedShims = resolveShims(config.shims);
-  const shimsConfig = composeShimsConfig(format!, resolvedShims);
+  const shimsConfig = composeShimsConfig(format!, shims);
   const formatConfig = composeFormatConfig(format!);
   const externalHelpersConfig = composeExternalHelpersConfig(
     externalHelpers,

packages/core/src/plugins/shims.ts

@@ -12,7 +12,7 @@ const importMetaUrlShim = `/*#__PURE__*/ (function () {
 // - Inject `importMetaUrl` to the end of the module (can't inject at the beginning because of `"use strict";`).
 // This is a short-term solution, and we hope to provide built-in polyfills like `node.__filename` on Rspack side.
 export const pluginCjsImportMetaUrlShim = (): RsbuildPlugin => ({
-  name: 'rsbuild-plugin-cjs-import-meta-url-shim',
+  name: 'rsbuild:cjs-import-meta-url-shim',
   setup(api) {
     api.modifyEnvironmentConfig((config) => {
       config.source.define = {
@@ -29,7 +29,7 @@ const require = /*#__PURE__*/ __rslib_shim_module__.createRequire(import.meta.ur
 `;
 
 export const pluginEsmRequireShim = (): RsbuildPlugin => ({
-  name: 'rsbuild-plugin-esm-require-shim',
+  name: 'rsbuild:esm-require-shim',
   setup(api) {
     api.modifyRspackConfig((config) => {
       config.plugins ??= [];

packages/core/src/types/config/index.ts

@@ -59,11 +59,6 @@ export type Shims = {
   };
 };
 
-export type ResolvedShims = {
-  cjs: Required<NonNullable<Exclude<Shims['cjs'], boolean>>>;
-  esm: Required<NonNullable<Exclude<Shims['esm'], boolean>>>;
-};
-
 export type Redirect = {
   // TODO: support other redirects
   // alias?: boolean;

packages/core/tests/__snapshots__/config.test.ts.snap

@@ -201,7 +201,7 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config 1
       },
       "plugins": [
         {
-          "name": "rsbuild-plugin-cjs-import-meta-url-shim",
+          "name": "rsbuild:cjs-import-meta-url-shim",
           "setup": [Function],
         },
       ],