feat: make all ESM module locked as dynamic import

fi3ework · fi3ework · commit 0a608b371e7f · 2025-09-03T14:40:10.000+08:00
diff --git a/biome.json b/biome.json
@@ -9,7 +9,13 @@
   },
   "files": {
     "ignoreUnknown": true,
-    "includes": ["**", "!**/*.vue", "!**/dist", "!**/dist-types"]
+    "includes": [
+      "**",
+      "!**/*.vue",
+      "!**/dist/**",
+      "!**/dist-types/**",
+      "!tests/mock/tests/mockHoist.test.ts"
+    ]
   },
   "formatter": {
     "indentStyle": "space"
diff --git a/e2e/__mocks__/is-url.js b/e2e/__mocks__/is-url.js
@@ -0,0 +1,4 @@
+const { rs } = require('@rstest/core');
+
+module.exports = () => 'is-url mock';
+module.exports.fn = rs.fn();
diff --git a/e2e/__mocks__/redux-cjs.ts b/e2e/__mocks__/redux-cjs.ts
@@ -0,0 +1,6 @@
+const { rs } = require('@rstest/core');
+
+module.exports = {
+  isAction: rs.fn(),
+  mocked: 'redux_yes',
+};
diff --git a/e2e/lifecycle/timeout.test.ts b/e2e/lifecycle/timeout.test.ts
@@ -34,7 +34,7 @@ describe('test timeout', () => {
       ),
     ).toBeTruthy();
     expect(
-      logs.find((log) => log.includes('timeout.test.ts:4:10')),
+      logs.find((log) => log.includes('timeout.test.ts:4:1')),
     ).toBeTruthy();
     expect(
       logs.find((log) => log.includes('Test Files 1 failed')),
diff --git a/e2e/mock/fixtures/unmock/rstest.setup.ts b/e2e/mock/fixtures/unmock/rstest.setup.ts
@@ -1,4 +1,4 @@
-import { rs } from '@rstest/core';
+// import { rs } from '@rstest/core';
 
 process.env.NODE_ENV = 'rstest:production';
 
diff --git a/e2e/mock/src/bar.ts b/e2e/mock/src/bar.ts
@@ -0,0 +1 @@
+export const bar = 'bar';
diff --git a/e2e/mock/src/foo.ts b/e2e/mock/src/foo.ts
@@ -0,0 +1 @@
+export const foo = 'foo'
diff --git a/e2e/mock/src/readSomeFile.ts b/e2e/mock/src/readSomeFile.ts
@@ -1,5 +1,5 @@
-import { readFileSync } from 'node:fs';
+import * as fs from 'node:fs';
 
 export function readSomeFile(path: string) {
-  return readFileSync(path, 'utf-8');
+  return fs?.readFileSync?.(path, 'utf-8');
 }
diff --git a/e2e/mock/src/sum.ts b/e2e/mock/src/sum.ts
@@ -0,0 +1,3 @@
+import * as fooMod from './foo.js';
+
+export const sum = fooMod?.foo + '1';
diff --git a/e2e/mock/tests/barrel.test.ts b/e2e/mock/tests/barrel.test.ts
@@ -0,0 +1,11 @@
+import { expect, it, rs } from '@rstest/core';
+import * as barMod from '../src/bar';
+import { sum } from '../src/sum';
+
+rs.mock('../src/foo', async () => {
+  return { foo: barMod.bar };
+});
+
+it('sum', () => {
+  expect(sum).toBe('bar1');
+});
diff --git a/e2e/mock/tests/doMock.test.ts b/e2e/mock/tests/doMock.test.ts
@@ -9,6 +9,8 @@ test('doMock works', async () => {
     increment: (num: number) => num + 10,
   }));
 
+  rs.requireActual('../src/increment'); // Ensure the module is re-evaluated
+
   const { increment: incrementWith10 } = await import('../src/increment');
   expect(incrementWith10(1)).toBe(11);
 });
diff --git a/e2e/mock/tests/doMockRequire.test.ts b/e2e/mock/tests/doMockRequire.test.ts
@@ -1,19 +1,20 @@
 import { expect, rs, test } from '@rstest/core';
 
-test('doMockRequire works', () => {
+test('doMockRequire works', async () => {
   const { increment: incrementWith1 } = require('../src/increment');
   expect(incrementWith1(1)).toBe(2);
 
   rs.doMockRequire('../src/increment', () => ({
     increment: (num: number) => num + 10,
   }));
 
-  const { increment: incrementWith10 } = require('../src/increment');
+  rs.requireActual('../src/increment'); // Ensure the module is re-evaluated
 
+  const { increment: incrementWith10 } = require('../src/increment');
   expect(incrementWith10(1)).toBe(11);
 });
 
-test('the second doMockRequire can override the first doMockRequire', () => {
+test('the second doMockRequire can override the first doMockRequire', async () => {
   rs.doMockRequire('../src/increment', () => ({
     increment: (num: number) => num + 10,
   }));
@@ -30,3 +31,25 @@ test('the second doMockRequire can override the first doMockRequire', () => {
 
   expect(incrementWith20(1)).toBe(21);
 });
+
+test('the third doMockRequire can override the second doMockRequire', async () => {
+  rs.doMockRequire('../src/increment', () => {
+    return {
+      increment: (num: number) => num + 100,
+    };
+  });
+
+  const { increment: incrementWith1 } = require('../src/increment');
+
+  expect(incrementWith1(1)).toBe(101);
+
+  rs.doMockRequire('../src/increment', () => {
+    return {
+      increment: (num: number) => num + 200,
+    };
+  });
+
+  const { increment: incrementWith20 } = require('../src/increment');
+
+  expect(incrementWith20(1)).toBe(201);
+});
diff --git a/e2e/mock/tests/importMock.test.ts b/e2e/mock/tests/importMock.test.ts
@@ -0,0 +1,12 @@
+import { expect, rs, test } from '@rstest/core';
+import * as redux from 'redux';
+
+test('importMock works', async () => {
+  const { default: redux } = await rs.importMock<any>('redux');
+  await redux.isAction('string');
+  expect(redux.isAction).toHaveBeenCalledWith('string');
+});
+
+test('actual redux is not mocked (ESM)', async () => {
+  expect(rs.isMockFunction(redux.isAction)).toBe(false);
+});
diff --git a/e2e/mock/tests/loadMock.test.ts b/e2e/mock/tests/loadMock.test.ts
diff --git a/e2e/mock/tests/mockHoist.test.ts b/e2e/mock/tests/mockHoist.test.ts
@@ -1,17 +1,16 @@
 import { expect, it, rs } from '@rstest/core';
-import { c } from '../src/c';
 import { d } from '../src/d';
+import { c, dd } from '../src/c';
 
 rs.mock('../src/c', () => {
   return {
     c: rs.fn(),
-    d,
+    dd: d,
   };
 });
 
 it('mocked c', async () => {
-  // @ts-expect-error: It has been mocked.
   c('c');
   expect(c).toHaveBeenCalledWith('c');
-  expect(d).toBe(4);
+  expect(dd).toBe(4);
 });
diff --git a/e2e/mock/tests/mockRequire.test.ts b/e2e/mock/tests/mockRequire.test.ts
@@ -1,10 +1,10 @@
 import { expect, it, rs } from '@rstest/core';
 
-rs.mockRequire('redux');
+rs.mockRequire('is-url');
 
-it('mocked redux', () => {
-  const redux = require('redux').default;
-  redux.isAction('string');
-  expect(redux.isAction).toHaveBeenCalledWith('string');
-  expect(redux.mocked).toBe('redux_yes');
+it('mocked is-url', () => {
+  const isUrl = require('is-url');
+  isUrl.fn('string');
+  expect(isUrl.fn).toHaveBeenCalledWith('string');
+  expect(isUrl()).toBe('is-url mock');
 });
diff --git a/e2e/mock/tests/reduxMocked.test.ts b/e2e/mock/tests/reduxMocked.test.ts
@@ -17,12 +17,8 @@ it('importActual works', async () => {
 });
 
 it('requireActual and importActual works together', async () => {
-  // const rxEsm = await rs.importActual<typeof redux>('redux');
   const rxCjs = rs.requireActual<typeof redux>('redux');
   expect(rs.isMockFunction(rxCjs.isAction)).toBe(false);
   expect(typeof rxCjs.applyMiddleware).toBe('function');
-
-  // TODO: https://github.com/web-infra-dev/rspack/pull/11111 breaks resolved module in external function,
-  // which will be fixed in the near future.
-  // expect(rxEsm.compose).not.toBe(rxCjs.compose);
+  expect(redux.compose).not.toBe(rxCjs.compose);
 });
diff --git a/e2e/mock/tests/requireActual.test.ts b/e2e/mock/tests/requireActual.test.ts
diff --git a/e2e/mock/tests/requireMock.test.ts b/e2e/mock/tests/requireMock.test.ts
@@ -0,0 +1,12 @@
+import { expect, rs, test } from '@rstest/core';
+
+test('requireMock works', async () => {
+  const redux = rs.requireMock<any>('redux-cjs');
+  await redux.isAction('string');
+  expect(redux.isAction).toHaveBeenCalledWith('string');
+});
+
+test('actual redux is not mocked (CJS)', async () => {
+  const redux = require('redux');
+  expect(rs.isMockFunction(redux.isAction)).toBe(false);
+});
diff --git a/e2e/package.json b/e2e/package.json
@@ -13,6 +13,8 @@
     "@rstest/tsconfig": "workspace:*",
     "@types/jest-image-snapshot": "^6.4.0",
     "axios": "^1.11.0",
+    "is-url": "^1.2.4",
+    "@types/is-url": "^1.2.32",
     "jest-image-snapshot": "^6.5.1",
     "memfs": "^4.38.2",
     "pathe": "^2.0.3",
@@ -21,5 +23,8 @@
     "strip-ansi": "^7.1.0",
     "tinyexec": "^1.0.1",
     "typescript": "^5.9.2"
+  },
+  "dependencies": {
+    "@types/is-url": "^1.2.32"
   }
 }
diff --git a/e2e/rstest.config.ts b/e2e/rstest.config.ts
@@ -3,6 +3,7 @@ import { defineConfig } from '@rstest/core';
 export default defineConfig({
   setupFiles: ['../scripts/rstest.setup.ts'],
   testTimeout: process.env.CI ? 10_000 : 5_000,
+  globals: true,
   slowTestThreshold: 2_000,
   output: {
     externals: {
diff --git a/e2e/test-api/fixtures/moduleNotFound.test.ts b/e2e/test-api/fixtures/moduleNotFound.test.ts
@@ -21,6 +21,6 @@ it('test expectNotFound error', async () => {
 
 it('test expectNotFound error', async () => {
   await expect(unexpectNotFound()).rejects.toThrowError(
-    /Cannot find module 'aaa'/,
+    '[Rstest] Cannot find module "aaa"',
   );
 });
diff --git a/e2e/test-api/timeout.test.ts b/e2e/test-api/timeout.test.ts
@@ -21,13 +21,13 @@ describe('Test timeout', () => {
       logs.find((log) => log.includes('Error: test timed out in 50ms')),
     ).toBeTruthy();
     expect(
-      logs.find((log) => log.includes('timeout.test.ts:5:5')),
+      logs.find((log) => log.includes('timeout.test.ts:5:3')),
     ).toBeTruthy();
     expect(
       logs.find((log) => log.includes('Error: test timed out in 5000ms')),
     ).toBeTruthy();
     expect(
-      logs.find((log) => log.includes('timeout.test.ts:10:5')),
+      logs.find((log) => log.includes('timeout.test.ts:10:3')),
     ).toBeTruthy();
     expect(logs.find((log) => log.includes('Tests 2 failed'))).toBeTruthy();
   }, 10000);
diff --git a/e2e/test-api/timeoutConfig.test.ts b/e2e/test-api/timeoutConfig.test.ts
@@ -22,7 +22,7 @@ describe('Test timeout configuration', () => {
       logs.find((log) => log.includes('Error: test timed out in 50ms')),
     ).toBeTruthy();
     expect(
-      logs.find((log) => log.includes('timeout.test.ts:5:5')),
+      logs.find((log) => log.includes('timeout.test.ts:5:3')),
     ).toBeTruthy();
 
     expect(
diff --git a/e2e/watch/index.test.ts b/e2e/watch/index.test.ts
@@ -44,7 +44,10 @@ describe('watch', () => {
 
     await cli.waitForStdout('Duration');
     expect(cli.stdout).toMatch('Tests 2 passed');
-    expect(cli.stdout).toMatch(/Test files to re-run.*:\n.*bar\.test\.ts\n\n/);
+    // Updated as the shared module `src/index.ts` is extracted into another chunk.
+    expect(cli.stdout).toMatch(
+      /Test files to re-run.*:\n.*bar\.test\.ts\n.*index\.test\.ts\n\n/,
+    );
 
     // update
     cli.resetStd();
@@ -61,8 +64,11 @@ describe('watch', () => {
     cli.resetStd();
     fs.delete('./fixtures-test-0/bar.test.ts');
     await cli.waitForStdout('Duration');
-    expect(cli.stdout).toMatch('No test files need re-run.');
     expect(cli.stdout).toMatch('Test Files 1 passed');
+    // Updated as extracting the shared module `src/index.ts` is into another chunk in reverted.
+    expect(cli.stdout).toMatch(
+      /Test files to re-run.*:\n.*index\.test\.ts\n\n/,
+    );
 
     cli.exec.kill();
   });
diff --git a/examples/react/src/App.tsx b/examples/react/src/App.tsx
@@ -1,9 +1,11 @@
 import './App.css';
+import { h2Title } from './module';
 
 const App = () => {
   return (
     <div className="content">
       <h1>Rsbuild with React</h1>
+      <h2>{h2Title()}</h2>
       <p>Start building amazing things with Rsbuild.</p>
     </div>
   );
diff --git a/examples/react/src/module.ts b/examples/react/src/module.ts
@@ -0,0 +1 @@
+export const h2Title = () => 'example';
diff --git a/examples/react/test/App.test.tsx b/examples/react/test/App.test.tsx
@@ -1,12 +1,19 @@
-import { expect, test } from '@rstest/core';
+import { expect, rs, test } from '@rstest/core';
 import { render, screen } from '@testing-library/react';
 import App from '../src/App';
 
+rs.mock('../src/module', async () => ({
+  h2Title: () => 'mocked',
+}));
+
 test('should render App correctly', async () => {
   render(<App />);
 
-  const element = screen.getByText('Rsbuild with React');
+  const h1 = screen.getByText('Rsbuild with React');
+  expect(h1.tagName).toBe('H1');
+  expect(h1).toBeInTheDocument();
 
-  expect(element.tagName).toBe('H1');
-  expect(element).toBeInTheDocument();
+  const h2 = screen.getByText('mocked');
+  expect(h2.tagName).toBe('H2');
+  expect(h2).toBeInTheDocument();
 });
diff --git a/package.json b/package.json
@@ -56,6 +56,11 @@
     "pnpm": ">=10.12.4"
   },
   "pnpm": {
+    "overrides": {
+      "@rspack/core": "link:../rspack/packages/rspack",
+      "@rslib/core>@rsbuild/core": "1.4.8",
+      "@rsbuild/core@1.4.8>@rspack/core": "1.4.8"
+    },
     "ignoredBuiltDependencies": [
       "@biomejs/biome",
       "nx",
diff --git a/packages/core/LICENSE.md b/packages/core/LICENSE.md
diff --git a/packages/core/package.json b/packages/core/package.json
diff --git a/packages/core/rslib.config.ts b/packages/core/rslib.config.ts
diff --git a/packages/core/src/core/plugins/external.ts b/packages/core/src/core/plugins/external.ts
diff --git a/packages/core/src/core/plugins/mockLoader.mjs b/packages/core/src/core/plugins/mockLoader.mjs
diff --git a/packages/core/src/core/plugins/mockRuntime.ts b/packages/core/src/core/plugins/mockRuntime.ts
diff --git a/packages/core/src/core/plugins/mockRuntimeCode.js b/packages/core/src/core/plugins/mockRuntimeCode.js
diff --git a/packages/core/src/core/rsbuild.ts b/packages/core/src/core/rsbuild.ts
diff --git a/packages/core/tests/core/mockLoader.test.ts b/packages/core/tests/core/mockLoader.test.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { rs } from '@rstest/core';`
	`1`	`+// import { rs } from '@rstest/core';`
`2`	`2`
`3`	`3`	`process.env.NODE_ENV = 'rstest:production';`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-import { readFileSync } from 'node:fs';`
	`1`	`+import * as fs from 'node:fs';`
`2`	`2`
`3`	`3`	`export function readSomeFile(path: string) {`
`4`		`- return readFileSync(path, 'utf-8');`
	`4`	`+ return fs?.readFileSync?.(path, 'utf-8');`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import * as fooMod from './foo.js';`
	`2`	`+`
	`3`	`+export const sum = fooMod?.foo + '1';`