Skip to content

Commit af15f53

Browse files
authored
refactor!: remove @modern-js/rsbuild-plugin-esbuild (#7334)
1 parent b3bd0f3 commit af15f53

File tree

42 files changed

+12
-1130
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+12
-1130
lines changed

packages/cli/plugin-swc/src/index.ts

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,9 @@ export function factory(
2222
}
2323

2424
const config = api.useResolvedConfigContext();
25-
const { esbuild, swc = {} } = config.tools;
25+
const { swc = {} } = config.tools;
2626
const swcOptions = modifySwcOptions(swc);
27-
const finalConfig = applyBuilderSwcConfig(
28-
swcOptions,
29-
esbuild,
30-
isSSR(config),
31-
);
27+
const finalConfig = applyBuilderSwcConfig(swcOptions, isSSR(config));
3228

3329
context.builder.addPlugins([
3430
pluginSwc(
@@ -45,7 +41,6 @@ export function factory(
4541

4642
export function applyBuilderSwcConfig(
4743
swc: PluginSwcOptions,
48-
esbuild: ToolsUserConfig['esbuild'] | undefined,
4944
isSSR: boolean,
5045
): PluginSwcOptions {
5146
// common configuration
@@ -57,20 +52,7 @@ export function applyBuilderSwcConfig(
5752
});
5853
}
5954

60-
return applyConfig(swcConfig, config => {
61-
if (esbuild) {
62-
if (config.jsMinify !== false && esbuild.minimize !== false) {
63-
logger.warn(
64-
'You have enabled both esbuild minimizer and SWC minimizer, which will cause conflicts. Please remove `tools.esbuild` config and only use SWC to minimize your code.',
65-
);
66-
}
67-
if (esbuild.loader !== false) {
68-
logger.warn(
69-
'You have enabled both esbuild loader and SWC loader, which will cause conflicts. Please remove `tools.esbuild` config and only use SWC to transform your code.',
70-
);
71-
}
72-
}
73-
});
55+
return applyConfig(swcConfig, () => {});
7456
}
7557

7658
const PLUGIN_NAME = '@modern-js/plugin-swc';

packages/cli/plugin-swc/tests/index.test.ts

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,15 @@ import { applyBuilderSwcConfig } from '../src';
88
describe('plugin config', () => {
99
it('should enable loadableComponents', () => {
1010
{
11-
const config = applyBuilderSwcConfig(
12-
{},
13-
undefined,
14-
true,
15-
) as ObjPluginSwcOptions;
11+
const config = applyBuilderSwcConfig({}, true) as ObjPluginSwcOptions;
1612

1713
expect(config.extensions!.loadableComponents).toBeTruthy();
1814
}
1915

2016
{
21-
const config = applyBuilderSwcConfig(
22-
config => {
23-
expect(config.extensions!.loadableComponents).toBeTruthy();
24-
},
25-
undefined,
26-
true,
27-
) as FnPluginSwcOptions;
17+
const config = applyBuilderSwcConfig(config => {
18+
expect(config.extensions!.loadableComponents).toBeTruthy();
19+
}, true) as FnPluginSwcOptions;
2820

2921
config({}, null as any);
3022
}
@@ -37,11 +29,10 @@ describe('plugin config', () => {
3729
count++;
3830
};
3931

40-
applyBuilderSwcConfig({}, { minimize: {} }, true) as ObjPluginSwcOptions;
32+
applyBuilderSwcConfig({}, true) as ObjPluginSwcOptions;
4133

4234
const config = applyBuilderSwcConfig(
4335
_config => _config,
44-
undefined,
4536
true,
4637
) as FnPluginSwcOptions;
4738

@@ -51,14 +42,10 @@ describe('plugin config', () => {
5142
});
5243

5344
it('should not override user extensions config', () => {
54-
const config = applyBuilderSwcConfig(
55-
config => {
56-
config.extensions ??= {};
57-
config.extensions.emotion = true;
58-
},
59-
undefined,
60-
true,
61-
) as FnPluginSwcOptions;
45+
const config = applyBuilderSwcConfig(config => {
46+
config.extensions ??= {};
47+
config.extensions.emotion = true;
48+
}, true) as FnPluginSwcOptions;
6249

6350
const finalConfig = config(
6451
{

packages/cli/rsbuild-plugin-esbuild/CHANGELOG.md

Lines changed: 0 additions & 63 deletions
This file was deleted.

packages/cli/rsbuild-plugin-esbuild/LICENSE

Lines changed: 0 additions & 21 deletions
This file was deleted.

packages/cli/rsbuild-plugin-esbuild/README.md

Lines changed: 0 additions & 26 deletions
This file was deleted.

packages/cli/rsbuild-plugin-esbuild/compiled/esbuild-loader/index.d.ts

Lines changed: 0 additions & 6 deletions
This file was deleted.

packages/cli/rsbuild-plugin-esbuild/compiled/esbuild-loader/index.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

packages/cli/rsbuild-plugin-esbuild/compiled/esbuild-loader/interfaces.d.ts

Lines changed: 0 additions & 20 deletions
This file was deleted.

packages/cli/rsbuild-plugin-esbuild/compiled/esbuild-loader/license

Lines changed: 0 additions & 21 deletions
This file was deleted.

packages/cli/rsbuild-plugin-esbuild/compiled/esbuild-loader/loader.d.ts

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)