@@ -5,69 +5,76 @@ const esmSuffixes = ['modern.mjs', 'browser.mjs', 'legacy-esm.js']
55const cjsSuffixes = [ 'development.cjs' , 'production.min.cjs' ]
66
77function 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 / @ r e d u x j s \/ t o o l k i t \/ q u e r y \/ r e a c t / ,
15- require . resolve ( '. /query/react') ,
21+ join ( __dirname , 'dist /query/react/rtk-query-react.modern.mjs ') ,
1622 ) ,
1723 new webpack . NormalModuleReplacementPlugin (
1824 / @ r e d u x j s \/ t o o l k i t \/ q u e r y / ,
19- require . resolve ( '. /query') ,
25+ join ( __dirname , 'dist /query/rtk-query.modern.mjs ') ,
2026 ) ,
2127 new webpack . NormalModuleReplacementPlugin (
2228 / @ r e d u x j s \/ t o o l k i t \/ r e a c t / ,
23- require . resolve ( '. /react') ,
29+ join ( __dirname , 'dist /react/redux-toolkit-react.modern.mjs ') ,
2430 ) ,
2531 new webpack . NormalModuleReplacementPlugin (
2632 / @ r e d u x j s \/ t o o l k i t / ,
27- require . resolve ( '. ') ,
33+ join ( __dirname , 'dist/redux-toolkit.modern.mjs ') ,
2834 ) ,
2935 new webpack . NormalModuleReplacementPlugin (
30- / r t k - q u e r y - r e a c t .m o d e r n .j s / ,
36+ / r t k - q u e r y - r e a c t .m o d e r n .m j s / ,
3137 ( r ) => {
3238 const old = r . request
3339 r . request = r . request . replace (
34- / r t k - q u e r y - r e a c t .m o d e r n .j s $ / ,
35- ` ${ cjs ? 'cjs/' : '' } rtk-query-react. ${ suffix } ` ,
40+ / r t k - q u e r y - r e a c t .m o d e r n .m j s $ / ,
41+ alias ( ' rtk-query-react' ) ,
3642 )
37- // console.log(old, '=>', r.request)
43+ //console.log(old, '=>', r.request)
3844 } ,
3945 ) ,
40- new webpack . NormalModuleReplacementPlugin ( / r t k - q u e r y .m o d e r n .j s / , ( r ) => {
46+ new webpack . NormalModuleReplacementPlugin ( / r t k - q u e r y .m o d e r n .m j s / , ( r ) => {
4147 const old = r . request
4248 r . request = r . request . replace (
43- / r t k - q u e r y .m o d e r n .j s $ / ,
44- ` ${ cjs ? 'cjs/' : '' } rtk-query. ${ suffix } ` ,
49+ / r t k - q u e r y .m o d e r n .m j s $ / ,
50+ alias ( ' rtk-query' ) ,
4551 )
46- // console.log(old, '=>', r.request)
52+ //console.log(old, '=>', r.request)
4753 } ) ,
4854 new webpack . NormalModuleReplacementPlugin (
49- / r e d u x - t o o l k i t - r e a c t .m o d e r n .j s $ / ,
55+ / r e d u x - t o o l k i t - r e a c t .m o d e r n .m j s $ / ,
5056 ( r ) => {
5157 const old = r . request
5258 r . request = r . request . replace (
53- / r e d u x - t o o l k i t - r e a c t .m o d e r n .j s $ / ,
54- ` ${ cjs ? 'cjs/' : '' } redux-toolkit-react. ${ suffix } ` ,
59+ / r e d u x - t o o l k i t - r e a c t .m o d e r n .m j s $ / ,
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- / r e d u x - t o o l k i t .m o d e r n .j s $ / ,
66+ / r e d u x - t o o l k i t .m o d e r n .m j s $ / ,
6167 ( r ) => {
6268 const old = r . request
6369 r . request = r . request . replace (
64- / r e d u x - t o o l k i t .m o d e r n .j s $ / ,
65- ` ${ cjs ? 'cjs/' : '' } redux-toolkit. ${ suffix } ` ,
70+ / r e d u x - t o o l k i t .m o d e r n .m j s $ / ,
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