Skip to content

Commit d594eb0

Browse files
authored
fix(webpack): avoid duplicate import core package (#3871)
1 parent 062817f commit d594eb0

File tree

3 files changed

+28
-15
lines changed

3 files changed

+28
-15
lines changed

nx.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"!{projectRoot}/**/*.{md,mdx}",
88
"{projectRoot}/tsconfig.json",
99
"{projectRoot}/package.json",
10+
"{projectRoot}/rslib.config.*",
1011
"{projectRoot}/modern.config.*",
1112
"{projectRoot}/scripts/**/*"
1213
],
Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,32 @@
1-
import path from 'node:path';
2-
import { pureEsmPackage } from '@rsbuild/config/rslib.config.ts';
1+
import {
2+
cjsConfig,
3+
dualPackage,
4+
esmConfig,
5+
} from '@rsbuild/config/rslib.config.ts';
36
import { defineConfig } from '@rslib/core';
47

58
export default defineConfig({
6-
...pureEsmPackage,
7-
output: {
8-
...pureEsmPackage.output,
9-
copy: [
10-
{
11-
from: path.resolve(__dirname, 'src/index.cjs'),
9+
...dualPackage,
10+
lib: [
11+
esmConfig,
12+
{
13+
...cjsConfig,
14+
output: {
15+
target: 'node',
16+
// TODO https://github.com/web-infra-dev/rslib/issues/287
17+
externals: {
18+
webpack: 'import webpack',
19+
'copy-webpack-plugin': 'import copy-webpack-plugin',
20+
'mini-css-extract-plugin': 'import mini-css-extract-plugin',
21+
'tsconfig-paths-webpack-plugin':
22+
'import tsconfig-paths-webpack-plugin',
23+
},
1224
},
13-
],
14-
},
25+
footer: {
26+
// TODO https://github.com/web-infra-dev/rslib/issues/351
27+
js: `// Annotate the CommonJS export names for ESM import in node:
28+
0 && (module.exports = { webpackProvider: exports.webpackProvider });`,
29+
},
30+
},
31+
],
1532
});

scripts/config/rslib.config.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,3 @@ export const dualPackage = defineConfig({
2727
},
2828
},
2929
});
30-
31-
export const pureEsmPackage = defineConfig({
32-
...dualPackage,
33-
lib: [esmConfig],
34-
});

0 commit comments

Comments
 (0)