chore: sync code

Author: nyqykk

.changeset/proud-sheep-end.md

@@ -1,3 +1,3 @@
 registry = 'https://registry.npmjs.org/'
 strict-peer-dependencies=false
-hoist-patterns[]=[]
+hoist-patterns[]=[]

.npmrc

@@ -21,8 +21,8 @@
     "test": "pnpm run test:unit && pnpm run test:integration && pnpm run test:e2e",
     "test:benchmark": "cd ./tests && pnpm run test:benchmark",
     "test:e2e": "pnpm run build:examples && cd tests && pnpm run test:e2e",
-    "test:integration": "vitest run --project integration",
-    "test:integration:watch": "vitest --project integration",
+    "test:integration": "cross-env NODE_OPTIONS='--experimental-vm-modules' vitest run --project integration",
+    "test:integration:watch": "cross-env NODE_OPTIONS='--experimental-vm-modules' vitest --project integration",
     "test:unit": "vitest run --project unit*",
     "test:unit:watch": "vitest --project unit*",
     "testu": "pnpm run test:unit -u && pnpm run test:integration -u",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rslib/core",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "The Rspack-based library build tool.",
   "homepage": "https://lib.rsbuild.dev",
   "bugs": {

packages/core/package.json

@@ -24,7 +24,10 @@ import {
   cssExternalHandler,
   isCssGlobalFile,
 } from './css/cssConfig';
-import { pluginCjsShim } from './plugins/cjsShim';
+import {
+  pluginCjsImportMetaUrlShim,
+  pluginEsmRequireShim,
+} from './plugins/shims';
 import type {
   AutoExternal,
   BannerAndFooter,
@@ -37,6 +40,7 @@ import type {
   RslibConfigAsyncFn,
   RslibConfigExport,
   RslibConfigSyncFn,
+  Shims,
   Syntax,
 } from './types';
 import { getDefaultExtension } from './utils/extension';
@@ -451,12 +455,16 @@ const composeFormatConfig = (
   pkgJson: PkgJson,
 ): RsbuildConfig => {
   const jsParserOptions = {
-    importMeta: false,
-    requireResolve: false,
-    requireDynamic: false,
-    requireAsExpression: false,
-    importDynamic: false,
-  };
+    cjs: {
+      requireResolve: false,
+      requireDynamic: false,
+      requireAsExpression: false,
+    },
+    esm: {
+      importMeta: false,
+      importDynamic: false,
+    },
+  } as const;
 
   switch (format) {
     case 'esm':
@@ -465,7 +473,10 @@ const composeFormatConfig = (
           rspack: {
             module: {
               parser: {
-                javascript: jsParserOptions,
+                javascript: {
+                  ...jsParserOptions.esm,
+                  ...jsParserOptions.cjs,
+                },
               },
             },
             optimization: {
@@ -490,12 +501,11 @@ const composeFormatConfig = (
       };
     case 'cjs':
       return {
-        plugins: [pluginCjsShim()],
         tools: {
           rspack: {
             module: {
               parser: {
-                javascript: jsParserOptions,
+                javascript: { ...jsParserOptions.esm, ...jsParserOptions.cjs },
               },
             },
             output: {
@@ -545,6 +555,47 @@ const composeFormatConfig = (
   }
 };
 
+const composeShimsConfig = (format: Format, shims?: Shims): RsbuildConfig => {
+  const resolvedShims = {
+    cjs: {
+      'import.meta.url': shims?.cjs?.['import.meta.url'] ?? true,
+    },
+    esm: {
+      __filename: shims?.esm?.__filename ?? false,
+      __dirname: shims?.esm?.__dirname ?? false,
+      require: shims?.esm?.require ?? false,
+    },
+  };
+
+  switch (format) {
+    case 'esm':
+      return {
+        tools: {
+          rspack: {
+            node: {
+              // "__dirname" and "__filename" shims will automatically be enabled when `output.module` is `true`
+              __dirname: resolvedShims.esm.__dirname ? 'node-module' : false,
+              __filename: resolvedShims.esm.__filename ? 'node-module' : false,
+            },
+          },
+        },
+        plugins: [resolvedShims.esm.require && pluginEsmRequireShim()].filter(
+          Boolean,
+        ),
+      };
+    case 'cjs':
+      return {
+        plugins: [
+          resolvedShims.cjs['import.meta.url'] && pluginCjsImportMetaUrlShim(),
+        ].filter(Boolean),
+      };
+    case 'umd':
+      return {};
+    default:
+      throw new Error(`Unsupported format: ${format}`);
+  }
+};
+
 export const composeModuleImportWarn = (request: string): string => {
   return `The externalized commonjs request ${color.green(`"${request}"`)} will use ${color.blue('"module"')} external type in ESM format. If you want to specify other external type, considering set the request and type with ${color.blue('"output.externals"')}.`;
 };
@@ -854,9 +905,6 @@ const composeTargetConfig = (
         tools: {
           rspack: {
             target: ['node'],
-            // "__dirname" and "__filename" shims will automatically be enabled when `output.module` is `true`,
-            // and leave them as-is in the rest of the cases. Leave the comments here to explain the behavior.
-            // { node: { __dirname: ..., __filename: ... } }
           },
         },
         output: {
@@ -931,13 +979,15 @@ async function composeLibRsbuildConfig(config: LibConfig, configPath: string) {
 
   const {
     format,
+    shims,
     banner = {},
     footer = {},
     autoExtension = true,
     autoExternal = true,
     externalHelpers = false,
     redirect = {},
   } = config;
+  const shimsConfig = composeShimsConfig(format!, shims);
   const formatConfig = composeFormatConfig(format!, pkgJson!);
   const externalHelpersConfig = composeExternalHelpersConfig(
     externalHelpers,
@@ -990,6 +1040,7 @@ async function composeLibRsbuildConfig(config: LibConfig, configPath: string) {
 
   return mergeRsbuildConfig(
     formatConfig,
+    shimsConfig,
     externalHelpersConfig,
     // externalsWarnConfig should before other externals config
     externalsWarnConfig,
@@ -1069,6 +1120,7 @@ export async function composeCreateRsbuildConfig(
           'banner',
           'footer',
           'dts',
+          'shims',
         ]),
       ),
     };

packages/core/src/config.ts

@@ -1,4 +1,4 @@
-import type { RsbuildPlugin } from '@rsbuild/core';
+import { type RsbuildPlugin, rspack } from '@rsbuild/core';
 
 const importMetaUrlShim = `/*#__PURE__*/ (function () {
   return typeof document === 'undefined'
@@ -11,9 +11,8 @@ const importMetaUrlShim = `/*#__PURE__*/ (function () {
 // - Replace `import.meta.url` with `importMetaUrl`.
 // - 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 pluginCjsShim = (): RsbuildPlugin => ({
-  name: 'rsbuild-plugin-cjs-shim',
-
+export const pluginCjsImportMetaUrlShim = (): RsbuildPlugin => ({
+  name: 'rsbuild:cjs-import-meta-url-shim',
   setup(api) {
     api.modifyEnvironmentConfig((config) => {
       config.source.define = {
@@ -23,3 +22,26 @@ export const pluginCjsShim = (): RsbuildPlugin => ({
     });
   },
 });
+
+const requireShim = `// Rslib ESM shims
+import __rslib_shim_module__ from 'module';
+const require = /*#__PURE__*/ __rslib_shim_module__.createRequire(import.meta.url);
+`;
+
+export const pluginEsmRequireShim = (): RsbuildPlugin => ({
+  name: 'rsbuild:esm-require-shim',
+  setup(api) {
+    api.modifyRspackConfig((config) => {
+      config.plugins ??= [];
+      config.plugins.push(
+        new rspack.BannerPlugin({
+          banner: requireShim,
+          // Just before minify stage, to perform tree shaking.
+          stage: rspack.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE - 1,
+          raw: true,
+          include: /\.(js|cjs)$/,
+        }),
+      );
+    });
+  },
+});

packages/core/src/plugins/cjsShim.ts renamed to packages/core/src/plugins/shims.ts

@@ -48,6 +48,17 @@ export type BannerAndFooter = {
   dts?: string;
 };
 
+export type Shims = {
+  cjs?: {
+    'import.meta.url'?: boolean;
+  };
+  esm?: {
+    __filename?: boolean;
+    __dirname?: boolean;
+    require?: boolean;
+  };
+};
+
 export type Redirect = {
   // TODO: support other redirects
   // alias?: boolean;
@@ -67,6 +78,7 @@ export interface LibConfig extends RsbuildConfig {
   externalHelpers?: boolean;
   banner?: BannerAndFooter;
   footer?: BannerAndFooter;
+  shims?: Shims;
   dts?: Dts;
 }
 

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

@@ -48,6 +48,7 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config 1
           "not dead",
         ],
       },
+      "plugins": [],
       "source": {
         "alias": {
           "bar": "bar",
@@ -110,6 +111,10 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config 1
                 },
               },
             },
+            "node": {
+              "__dirname": false,
+              "__filename": false,
+            },
             "optimization": {
               "concatenateModules": true,
               "sideEffects": "flag",
@@ -196,7 +201,7 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config 1
       },
       "plugins": [
         {
-          "name": "rsbuild-plugin-cjs-shim",
+          "name": "rsbuild:cjs-import-meta-url-shim",
           "setup": [Function],
         },
       ],

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

@@ -1,6 +1,6 @@
 {
   "name": "create-rslib",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "Create a new Rslib project",
   "homepage": "https://lib.rsbuild.dev",
   "repository": {

packages/create-rslib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsbuild-plugin-dts",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "Dts plugin for Rsbuild",
   "homepage": "https://lib.rsbuild.dev",
   "bugs": {