Skip to content

Commit 378e3e0

Browse files
committed
fix entry resolution
1 parent 69a2acd commit 378e3e0

File tree

1 file changed

+28
-21
lines changed

1 file changed

+28
-21
lines changed

packages/toolkit/.size-limit.cjs

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,69 +5,76 @@ const esmSuffixes = ['modern.mjs', 'browser.mjs', 'legacy-esm.js']
55
const cjsSuffixes = ['development.cjs', 'production.min.cjs']
66

77
function withRtkPath(suffix, cjs = false) {
8+
/**
9+
* @param {string} name
10+
*/
11+
function alias(name) {
12+
return `${cjs ? 'cjs/' : ''}${name}.${suffix}`
13+
}
814
/**
915
* @param {webpack.Configuration} config
1016
*/
1117
return (config) => {
1218
config.plugins.push(
1319
new webpack.NormalModuleReplacementPlugin(
1420
/@reduxjs\/toolkit\/query\/react/,
15-
require.resolve('./query/react'),
21+
join(__dirname, 'dist/query/react/rtk-query-react.modern.mjs'),
1622
),
1723
new webpack.NormalModuleReplacementPlugin(
1824
/@reduxjs\/toolkit\/query/,
19-
require.resolve('./query'),
25+
join(__dirname, 'dist/query/rtk-query.modern.mjs'),
2026
),
2127
new webpack.NormalModuleReplacementPlugin(
2228
/@reduxjs\/toolkit\/react/,
23-
require.resolve('./react'),
29+
join(__dirname, 'dist/react/redux-toolkit-react.modern.mjs'),
2430
),
2531
new webpack.NormalModuleReplacementPlugin(
2632
/@reduxjs\/toolkit/,
27-
require.resolve('.'),
33+
join(__dirname, 'dist/redux-toolkit.modern.mjs'),
2834
),
2935
new webpack.NormalModuleReplacementPlugin(
30-
/rtk-query-react.modern.js/,
36+
/rtk-query-react.modern.mjs/,
3137
(r) => {
3238
const old = r.request
3339
r.request = r.request.replace(
34-
/rtk-query-react.modern.js$/,
35-
`${cjs ? 'cjs/' : ''}rtk-query-react.${suffix}`,
40+
/rtk-query-react.modern.mjs$/,
41+
alias('rtk-query-react'),
3642
)
37-
// console.log(old, '=>', r.request)
43+
//console.log(old, '=>', r.request)
3844
},
3945
),
40-
new webpack.NormalModuleReplacementPlugin(/rtk-query.modern.js/, (r) => {
46+
new webpack.NormalModuleReplacementPlugin(/rtk-query.modern.mjs/, (r) => {
4147
const old = r.request
4248
r.request = r.request.replace(
43-
/rtk-query.modern.js$/,
44-
`${cjs ? 'cjs/' : ''}rtk-query.${suffix}`,
49+
/rtk-query.modern.mjs$/,
50+
alias('rtk-query'),
4551
)
46-
// console.log(old, '=>', r.request)
52+
//console.log(old, '=>', r.request)
4753
}),
4854
new webpack.NormalModuleReplacementPlugin(
49-
/redux-toolkit-react.modern.js$/,
55+
/redux-toolkit-react.modern.mjs$/,
5056
(r) => {
5157
const old = r.request
5258
r.request = r.request.replace(
53-
/redux-toolkit-react.modern.js$/,
54-
`${cjs ? 'cjs/' : ''}redux-toolkit-react.${suffix}`,
59+
/redux-toolkit-react.modern.mjs$/,
60+
alias('redux-toolkit-react'),
5561
)
56-
// console.log(old, '=>', r.request)
62+
//console.log(old, '=>', r.request)
5763
},
5864
),
5965
new webpack.NormalModuleReplacementPlugin(
60-
/redux-toolkit.modern.js$/,
66+
/redux-toolkit.modern.mjs$/,
6167
(r) => {
6268
const old = r.request
6369
r.request = r.request.replace(
64-
/redux-toolkit.modern.js$/,
65-
`${cjs ? 'cjs/' : ''}redux-toolkit.${suffix}`,
70+
/redux-toolkit.modern.mjs$/,
71+
alias('redux-toolkit'),
6672
)
67-
// console.log(old, '=>', r.request)
73+
//console.log(old, '=>', r.request)
6874
},
6975
),
7076
)
77+
7178
if (suffix === 'production.min.cjs') {
7279
;(config.resolve ??= {}).mainFields = ['main', 'module']
7380
}
@@ -178,6 +185,6 @@ module.exports = entryPoints
178185
].map((e) => ({
179186
...e,
180187
name: e.name + ` (.modern.mjs)`,
181-
modifyWebpackConfig: withRtkPath('.modern.mjs'),
188+
modifyWebpackConfig: withRtkPath('modern.mjs'),
182189
})),
183190
)

0 commit comments

Comments
 (0)