@unpackjs/core 1.6.0 → 1.6.2

package/compiled/postcss-loader/index.js

@@ -93151,7 +93151,7 @@
       const errorEx = __nccwpck_require__(7861);
       const fallback = __nccwpck_require__(3984);
       const { default: LinesAndColumns } = __nccwpck_require__(7151);
-      const { codeFrameColumns } = __nccwpck_require__(5634);
+      const { codeFrameColumns } = __nccwpck_require__(5780);
       const JSONError = errorEx("JSONError", {
         fileName: errorEx.append("in %s"),
         codeFrame: errorEx.append("\n\n%s\n"),
@@ -94204,12 +94204,12 @@
       "use strict";
       module.exports = require("vm");
     },
-    5634: (__unused_webpack_module, exports, __nccwpck_require__) => {
+    5780: (__unused_webpack_module, exports, __nccwpck_require__) => {
       "use strict";
       Object.defineProperty(exports, "__esModule", { value: true });
       exports.codeFrameColumns = codeFrameColumns;
       exports["default"] = _default;
-      var _highlight = __nccwpck_require__(8635);
+      var _highlight = __nccwpck_require__(3154);
       var _picocolors = _interopRequireWildcard(
         __nccwpck_require__(5209),
         true,
@@ -94231,7 +94231,7 @@
         var n = { __proto__: null },
           a = Object.defineProperty && Object.getOwnPropertyDescriptor;
         for (var u in e)
-          if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) {
+          if ("default" !== u && {}.hasOwnProperty.call(e, u)) {
             var i = a ? Object.getOwnPropertyDescriptor(e, u) : null;
             i && (i.get || i.set)
               ? Object.defineProperty(n, u, i)
@@ -94395,16 +94395,16 @@
         return codeFrameColumns(rawLines, location, opts);
       }
     },
-    3118: (__unused_webpack_module, exports) => {
+    3287: (__unused_webpack_module, exports) => {
       "use strict";
       Object.defineProperty(exports, "__esModule", { value: true });
       exports.isIdentifierChar = isIdentifierChar;
       exports.isIdentifierName = isIdentifierName;
       exports.isIdentifierStart = isIdentifierStart;
       let nonASCIIidentifierStartChars =
-        "ªµºÀ-ÖØ-öø-ˁˆ-ˑˠ-ˤˬˮͰ-ʹͶͷͺ-ͽͿΆΈ-ΊΌΎ-ΡΣ-ϵϷ-ҁҊ-ԯԱ-Ֆՙՠ-ֈא-תׯ-ײؠ-يٮٯٱ-ۓەۥۦۮۯۺ-ۼۿܐܒ-ܯݍ-ޥޱߊ-ߪߴߵߺࠀ-ࠕࠚࠤࠨࡀ-ࡘࡠ-ࡪࡰ-ࢇࢉ-ࢎࢠ-ࣉऄ-हऽॐक़-ॡॱ-ঀঅ-ঌএঐও-নপ-রলশ-হঽৎড়ঢ়য়-ৡৰৱৼਅ-ਊਏਐਓ-ਨਪ-ਰਲਲ਼ਵਸ਼ਸਹਖ਼-ੜਫ਼ੲ-ੴઅ-ઍએ-ઑઓ-નપ-રલળવ-હઽૐૠૡૹଅ-ଌଏଐଓ-ନପ-ରଲଳଵ-ହଽଡ଼ଢ଼ୟ-ୡୱஃஅ-ஊஎ-ஐஒ-கஙசஜஞடணதந-பம-ஹௐఅ-ఌఎ-ఐఒ-నప-హఽౘ-ౚౝౠౡಀಅ-ಌಎ-ಐಒ-ನಪ-ಳವ-ಹಽೝೞೠೡೱೲഄ-ഌഎ-ഐഒ-ഺഽൎൔ-ൖൟ-ൡൺ-ൿඅ-ඖක-නඳ-රලව-ෆก-ะาำเ-ๆກຂຄຆ-ຊຌ-ຣລວ-ະາຳຽເ-ໄໆໜ-ໟༀཀ-ཇཉ-ཬྈ-ྌက-ဪဿၐ-ၕၚ-ၝၡၥၦၮ-ၰၵ-ႁႎႠ-ჅჇჍა-ჺჼ-ቈቊ-ቍቐ-ቖቘቚ-ቝበ-ኈኊ-ኍነ-ኰኲ-ኵኸ-ኾዀዂ-ዅወ-ዖዘ-ጐጒ-ጕጘ-ፚᎀ-ᎏᎠ-Ᏽᏸ-ᏽᐁ-ᙬᙯ-ᙿᚁ-ᚚᚠ-ᛪᛮ-ᛸᜀ-ᜑᜟ-ᜱᝀ-ᝑᝠ-ᝬᝮ-ᝰក-ឳៗៜᠠ-ᡸᢀ-ᢨᢪᢰ-ᣵᤀ-ᤞᥐ-ᥭᥰ-ᥴᦀ-ᦫᦰ-ᧉᨀ-ᨖᨠ-ᩔᪧᬅ-ᬳᭅ-ᭌᮃ-ᮠᮮᮯᮺ-ᯥᰀ-ᰣᱍ-ᱏᱚ-ᱽᲀ-ᲈᲐ-ᲺᲽ-Ჿᳩ-ᳬᳮ-ᳳᳵᳶᳺᴀ-ᶿḀ-ἕἘ-Ἕἠ-ὅὈ-Ὅὐ-ὗὙὛὝὟ-ώᾀ-ᾴᾶ-ᾼιῂ-ῄῆ-ῌῐ-ΐῖ-Ίῠ-Ῥῲ-ῴῶ-ῼⁱⁿₐ-ₜℂℇℊ-ℓℕ℘-ℝℤΩℨK-ℹℼ-ℿⅅ-ⅉⅎⅠ-ↈⰀ-ⳤⳫ-ⳮⳲⳳⴀ-ⴥⴧⴭⴰ-ⵧⵯⶀ-ⶖⶠ-ⶦⶨ-ⶮⶰ-ⶶⶸ-ⶾⷀ-ⷆⷈ-ⷎⷐ-ⷖⷘ-ⷞ々-〇〡-〩〱-〵〸-〼ぁ-ゖ゛-ゟァ-ヺー-ヿㄅ-ㄯㄱ-ㆎㆠ-ㆿㇰ-ㇿ㐀-䶿一-ꒌꓐ-ꓽꔀ-ꘌꘐ-ꘟꘪꘫꙀ-ꙮꙿ-ꚝꚠ-ꛯꜗ-ꜟꜢ-ꞈꞋ-ꟊꟐꟑꟓꟕ-ꟙꟲ-ꠁꠃ-ꠅꠇ-ꠊꠌ-ꠢꡀ-ꡳꢂ-ꢳꣲ-ꣷꣻꣽꣾꤊ-ꤥꤰ-ꥆꥠ-ꥼꦄ-ꦲꧏꧠ-ꧤꧦ-ꧯꧺ-ꧾꨀ-ꨨꩀ-ꩂꩄ-ꩋꩠ-ꩶꩺꩾ-ꪯꪱꪵꪶꪹ-ꪽꫀꫂꫛ-ꫝꫠ-ꫪꫲ-ꫴꬁ-ꬆꬉ-ꬎꬑ-ꬖꬠ-ꬦꬨ-ꬮꬰ-ꭚꭜ-ꭩꭰ-ꯢ가-힣ힰ-ퟆퟋ-ퟻ豈-舘並-龎ff-stﬓ-ﬗיִײַ-ﬨשׁ-זּטּ-לּמּנּסּףּפּצּ-ﮱﯓ-ﴽﵐ-ﶏﶒ-ﷇﷰ-ﷻﹰ-ﹴﹶ-ﻼＡ-Ｚａ-ｚｦ-ﾾￂ-ￇￊ-ￏￒ-ￗￚ-ￜ";
+        "ªµºÀ-ÖØ-öø-ˁˆ-ˑˠ-ˤˬˮͰ-ʹͶͷͺ-ͽͿΆΈ-ΊΌΎ-ΡΣ-ϵϷ-ҁҊ-ԯԱ-Ֆՙՠ-ֈא-תׯ-ײؠ-يٮٯٱ-ۓەۥۦۮۯۺ-ۼۿܐܒ-ܯݍ-ޥޱߊ-ߪߴߵߺࠀ-ࠕࠚࠤࠨࡀ-ࡘࡠ-ࡪࡰ-ࢇࢉ-ࢎࢠ-ࣉऄ-हऽॐक़-ॡॱ-ঀঅ-ঌএঐও-নপ-রলশ-হঽৎড়ঢ়য়-ৡৰৱৼਅ-ਊਏਐਓ-ਨਪ-ਰਲਲ਼ਵਸ਼ਸਹਖ਼-ੜਫ਼ੲ-ੴઅ-ઍએ-ઑઓ-નપ-રલળવ-હઽૐૠૡૹଅ-ଌଏଐଓ-ନପ-ରଲଳଵ-ହଽଡ଼ଢ଼ୟ-ୡୱஃஅ-ஊஎ-ஐஒ-கஙசஜஞடணதந-பம-ஹௐఅ-ఌఎ-ఐఒ-నప-హఽౘ-ౚౝౠౡಀಅ-ಌಎ-ಐಒ-ನಪ-ಳವ-ಹಽೝೞೠೡೱೲഄ-ഌഎ-ഐഒ-ഺഽൎൔ-ൖൟ-ൡൺ-ൿඅ-ඖක-නඳ-රලව-ෆก-ะาำเ-ๆກຂຄຆ-ຊຌ-ຣລວ-ະາຳຽເ-ໄໆໜ-ໟༀཀ-ཇཉ-ཬྈ-ྌက-ဪဿၐ-ၕၚ-ၝၡၥၦၮ-ၰၵ-ႁႎႠ-ჅჇჍა-ჺჼ-ቈቊ-ቍቐ-ቖቘቚ-ቝበ-ኈኊ-ኍነ-ኰኲ-ኵኸ-ኾዀዂ-ዅወ-ዖዘ-ጐጒ-ጕጘ-ፚᎀ-ᎏᎠ-Ᏽᏸ-ᏽᐁ-ᙬᙯ-ᙿᚁ-ᚚᚠ-ᛪᛮ-ᛸᜀ-ᜑᜟ-ᜱᝀ-ᝑᝠ-ᝬᝮ-ᝰក-ឳៗៜᠠ-ᡸᢀ-ᢨᢪᢰ-ᣵᤀ-ᤞᥐ-ᥭᥰ-ᥴᦀ-ᦫᦰ-ᧉᨀ-ᨖᨠ-ᩔᪧᬅ-ᬳᭅ-ᭌᮃ-ᮠᮮᮯᮺ-ᯥᰀ-ᰣᱍ-ᱏᱚ-ᱽᲀ-ᲊᲐ-ᲺᲽ-Ჿᳩ-ᳬᳮ-ᳳᳵᳶᳺᴀ-ᶿḀ-ἕἘ-Ἕἠ-ὅὈ-Ὅὐ-ὗὙὛὝὟ-ώᾀ-ᾴᾶ-ᾼιῂ-ῄῆ-ῌῐ-ΐῖ-Ίῠ-Ῥῲ-ῴῶ-ῼⁱⁿₐ-ₜℂℇℊ-ℓℕ℘-ℝℤΩℨK-ℹℼ-ℿⅅ-ⅉⅎⅠ-ↈⰀ-ⳤⳫ-ⳮⳲⳳⴀ-ⴥⴧⴭⴰ-ⵧⵯⶀ-ⶖⶠ-ⶦⶨ-ⶮⶰ-ⶶⶸ-ⶾⷀ-ⷆⷈ-ⷎⷐ-ⷖⷘ-ⷞ々-〇〡-〩〱-〵〸-〼ぁ-ゖ゛-ゟァ-ヺー-ヿㄅ-ㄯㄱ-ㆎㆠ-ㆿㇰ-ㇿ㐀-䶿一-ꒌꓐ-ꓽꔀ-ꘌꘐ-ꘟꘪꘫꙀ-ꙮꙿ-ꚝꚠ-ꛯꜗ-ꜟꜢ-ꞈꞋ-ꟍꟐꟑꟓꟕ-Ƛꟲ-ꠁꠃ-ꠅꠇ-ꠊꠌ-ꠢꡀ-ꡳꢂ-ꢳꣲ-ꣷꣻꣽꣾꤊ-ꤥꤰ-ꥆꥠ-ꥼꦄ-ꦲꧏꧠ-ꧤꧦ-ꧯꧺ-ꧾꨀ-ꨨꩀ-ꩂꩄ-ꩋꩠ-ꩶꩺꩾ-ꪯꪱꪵꪶꪹ-ꪽꫀꫂꫛ-ꫝꫠ-ꫪꫲ-ꫴꬁ-ꬆꬉ-ꬎꬑ-ꬖꬠ-ꬦꬨ-ꬮꬰ-ꭚꭜ-ꭩꭰ-ꯢ가-힣ힰ-ퟆퟋ-ퟻ豈-舘並-龎ff-stﬓ-ﬗיִײַ-ﬨשׁ-זּטּ-לּמּנּסּףּפּצּ-ﮱﯓ-ﴽﵐ-ﶏﶒ-ﷇﷰ-ﷻﹰ-ﹴﹶ-ﻼＡ-Ｚａ-ｚｦ-ﾾￂ-ￇￊ-ￏￒ-ￗￚ-ￜ";
       let nonASCIIidentifierChars =
-        "‌‍·̀-ͯ·҃-֑҇-ׇֽֿׁׂׅׄؐ-ًؚ-٩ٰۖ-ۜ۟-۪ۤۧۨ-ۭ۰-۹ܑܰ-݊ަ-ް߀-߉߫-߽߳ࠖ-࠙ࠛ-ࠣࠥ-ࠧࠩ-࡙࠭-࡛࢘-࢟࣊-ࣣ࣡-ःऺ-़ा-ॏ॑-ॗॢॣ०-९ঁ-ঃ়া-ৄেৈো-্ৗৢৣ০-৯৾ਁ-ਃ਼ਾ-ੂੇੈੋ-੍ੑ੦-ੱੵઁ-ઃ઼ા-ૅે-ૉો-્ૢૣ૦-૯ૺ-૿ଁ-ଃ଼ା-ୄେୈୋ-୍୕-ୗୢୣ୦-୯ஂா-ூெ-ைொ-்ௗ௦-௯ఀ-ఄ఼ా-ౄె-ైొ-్ౕౖౢౣ౦-౯ಁ-ಃ಼ಾ-ೄೆ-ೈೊ-್ೕೖೢೣ೦-೯ೳഀ-ഃ഻഼ാ-ൄെ-ൈൊ-്ൗൢൣ൦-൯ඁ-ඃ්ා-ුූෘ-ෟ෦-෯ෲෳัิ-ฺ็-๎๐-๙ັິ-ຼ່-໎໐-໙༘༙༠-༩༹༵༷༾༿ཱ-྄྆྇ྍ-ྗྙ-ྼ࿆ါ-ှ၀-၉ၖ-ၙၞ-ၠၢ-ၤၧ-ၭၱ-ၴႂ-ႍႏ-ႝ፝-፟፩-፱ᜒ-᜕ᜲ-᜴ᝒᝓᝲᝳ឴-៓៝០-៩᠋-᠍᠏-᠙ᢩᤠ-ᤫᤰ-᤻᥆-᥏᧐-᧚ᨗ-ᨛᩕ-ᩞ᩠-᩿᩼-᪉᪐-᪙᪰-᪽ᪿ-ᫎᬀ-ᬄ᬴-᭄᭐-᭙᭫-᭳ᮀ-ᮂᮡ-ᮭ᮰-᮹᯦-᯳ᰤ-᰷᱀-᱉᱐-᱙᳐-᳔᳒-᳨᳭᳴᳷-᳹᷀-᷿‌‍‿⁀⁔⃐-⃥⃜⃡-⃰⳯-⵿⳱ⷠ-〪ⷿ-゙゚〯・꘠-꘩꙯ꙴ-꙽ꚞꚟ꛰꛱ꠂ꠆ꠋꠣ-ꠧ꠬ꢀꢁꢴ-ꣅ꣐-꣙꣠-꣱ꣿ-꤉ꤦ-꤭ꥇ-꥓ꦀ-ꦃ꦳-꧀꧐-꧙ꧥ꧰-꧹ꨩ-ꨶꩃꩌꩍ꩐-꩙ꩻ-ꩽꪰꪲ-ꪴꪷꪸꪾ꪿꫁ꫫ-ꫯꫵ꫶ꯣ-ꯪ꯬꯭꯰-꯹ﬞ︀-️︠-︯︳︴﹍-﹏０-９＿･";
+        "·̀-ͯ·҃-֑҇-ׇֽֿׁׂׅׄؐ-ًؚ-٩ٰۖ-ۜ۟-۪ۤۧۨ-ۭ۰-۹ܑܰ-݊ަ-ް߀-߉߫-߽߳ࠖ-࠙ࠛ-ࠣࠥ-ࠧࠩ-࡙࠭-࡛ࢗ-࢟࣊-ࣣ࣡-ःऺ-़ा-ॏ॑-ॗॢॣ०-९ঁ-ঃ়া-ৄেৈো-্ৗৢৣ০-৯৾ਁ-ਃ਼ਾ-ੂੇੈੋ-੍ੑ੦-ੱੵઁ-ઃ઼ા-ૅે-ૉો-્ૢૣ૦-૯ૺ-૿ଁ-ଃ଼ା-ୄେୈୋ-୍୕-ୗୢୣ୦-୯ஂா-ூெ-ைொ-்ௗ௦-௯ఀ-ఄ఼ా-ౄె-ైొ-్ౕౖౢౣ౦-౯ಁ-ಃ಼ಾ-ೄೆ-ೈೊ-್ೕೖೢೣ೦-೯ೳഀ-ഃ഻഼ാ-ൄെ-ൈൊ-്ൗൢൣ൦-൯ඁ-ඃ්ා-ුූෘ-ෟ෦-෯ෲෳัิ-ฺ็-๎๐-๙ັິ-ຼ່-໎໐-໙༘༙༠-༩༹༵༷༾༿ཱ-྄྆྇ྍ-ྗྙ-ྼ࿆ါ-ှ၀-၉ၖ-ၙၞ-ၠၢ-ၤၧ-ၭၱ-ၴႂ-ႍႏ-ႝ፝-፟፩-፱ᜒ-᜕ᜲ-᜴ᝒᝓᝲᝳ឴-៓៝០-៩᠋-᠍᠏-᠙ᢩᤠ-ᤫᤰ-᤻᥆-᥏᧐-᧚ᨗ-ᨛᩕ-ᩞ᩠-᩿᩼-᪉᪐-᪙᪰-᪽ᪿ-ᫎᬀ-ᬄ᬴-᭄᭐-᭙᭫-᭳ᮀ-ᮂᮡ-ᮭ᮰-᮹᯦-᯳ᰤ-᰷᱀-᱉᱐-᱙᳐-᳔᳒-᳨᳭᳴᳷-᳹᷀-᷿‌‍‿⁀⁔⃐-⃥⃜⃡-⃰⳯-⵿⳱ⷠ-〪ⷿ-゙゚〯・꘠-꘩꙯ꙴ-꙽ꚞꚟ꛰꛱ꠂ꠆ꠋꠣ-ꠧ꠬ꢀꢁꢴ-ꣅ꣐-꣙꣠-꣱ꣿ-꤉ꤦ-꤭ꥇ-꥓ꦀ-ꦃ꦳-꧀꧐-꧙ꧥ꧰-꧹ꨩ-ꨶꩃꩌꩍ꩐-꩙ꩻ-ꩽꪰꪲ-ꪴꪷꪸꪾ꪿꫁ꫫ-ꫯꫵ꫶ꯣ-ꯪ꯬꯭꯰-꯹ﬞ︀-️︠-︯︳︴﹍-﹏０-９＿･";
       const nonASCIIidentifierStart = new RegExp(
         "[" + nonASCIIidentifierStartChars + "]",
       );
@@ -94416,49 +94416,52 @@
         0, 11, 2, 25, 2, 18, 2, 1, 2, 14, 3, 13, 35, 122, 70, 52, 268, 28, 4,
         48, 48, 31, 14, 29, 6, 37, 11, 29, 3, 35, 5, 7, 2, 4, 43, 157, 19, 35,
         5, 35, 5, 39, 9, 51, 13, 10, 2, 14, 2, 6, 2, 1, 2, 10, 2, 14, 2, 6, 2,
-        1, 68, 310, 10, 21, 11, 7, 25, 5, 2, 41, 2, 8, 70, 5, 3, 0, 2, 43, 2, 1,
-        4, 0, 3, 22, 11, 22, 10, 30, 66, 18, 2, 1, 11, 21, 11, 25, 71, 55, 7, 1,
-        65, 0, 16, 3, 2, 2, 2, 28, 43, 28, 4, 28, 36, 7, 2, 27, 28, 53, 11, 21,
-        11, 18, 14, 17, 111, 72, 56, 50, 14, 50, 14, 35, 349, 41, 7, 1, 79, 28,
-        11, 0, 9, 21, 43, 17, 47, 20, 28, 22, 13, 52, 58, 1, 3, 0, 14, 44, 33,
-        24, 27, 35, 30, 0, 3, 0, 9, 34, 4, 0, 13, 47, 15, 3, 22, 0, 2, 0, 36,
-        17, 2, 24, 20, 1, 64, 6, 2, 0, 2, 3, 2, 14, 2, 9, 8, 46, 39, 7, 3, 1, 3,
-        21, 2, 6, 2, 1, 2, 4, 4, 0, 19, 0, 13, 4, 159, 52, 19, 3, 21, 2, 31, 47,
-        21, 1, 2, 0, 185, 46, 42, 3, 37, 47, 21, 0, 60, 42, 14, 0, 72, 26, 38,
-        6, 186, 43, 117, 63, 32, 7, 3, 0, 3, 7, 2, 1, 2, 23, 16, 0, 2, 0, 95, 7,
-        3, 38, 17, 0, 2, 0, 29, 0, 11, 39, 8, 0, 22, 0, 12, 45, 20, 0, 19, 72,
-        264, 8, 2, 36, 18, 0, 50, 29, 113, 6, 2, 1, 2, 37, 22, 0, 26, 5, 2, 1,
-        2, 31, 15, 0, 328, 18, 16, 0, 2, 12, 2, 33, 125, 0, 80, 921, 103, 110,
-        18, 195, 2637, 96, 16, 1071, 18, 5, 4026, 582, 8634, 568, 8, 30, 18, 78,
-        18, 29, 19, 47, 17, 3, 32, 20, 6, 18, 689, 63, 129, 74, 6, 0, 67, 12,
-        65, 1, 2, 0, 29, 6135, 9, 1237, 43, 8, 8936, 3, 2, 6, 2, 1, 2, 290, 16,
-        0, 30, 2, 3, 0, 15, 3, 9, 395, 2309, 106, 6, 12, 4, 8, 8, 9, 5991, 84,
-        2, 70, 2, 1, 3, 0, 3, 1, 3, 3, 2, 11, 2, 0, 2, 6, 2, 64, 2, 3, 3, 7, 2,
-        6, 2, 27, 2, 3, 2, 4, 2, 0, 4, 6, 2, 339, 3, 24, 2, 24, 2, 30, 2, 24, 2,
-        30, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 7, 1845, 30, 7, 5, 262, 61,
-        147, 44, 11, 6, 17, 0, 322, 29, 19, 43, 485, 27, 757, 6, 2, 3, 2, 1, 2,
-        14, 2, 196, 60, 67, 8, 0, 1205, 3, 2, 26, 2, 1, 2, 0, 3, 0, 2, 9, 2, 3,
-        2, 0, 2, 0, 7, 0, 5, 0, 2, 0, 2, 0, 2, 2, 2, 1, 2, 0, 3, 0, 2, 0, 2, 0,
-        2, 0, 2, 0, 2, 1, 2, 0, 3, 3, 2, 6, 2, 3, 2, 3, 2, 0, 2, 9, 2, 16, 6, 2,
-        2, 4, 2, 16, 4421, 42719, 33, 4153, 7, 221, 3, 5761, 15, 7472, 16, 621,
-        2467, 541, 1507, 4938, 6, 4191,
+        1, 4, 51, 13, 310, 10, 21, 11, 7, 25, 5, 2, 41, 2, 8, 70, 5, 3, 0, 2,
+        43, 2, 1, 4, 0, 3, 22, 11, 22, 10, 30, 66, 18, 2, 1, 11, 21, 11, 25, 71,
+        55, 7, 1, 65, 0, 16, 3, 2, 2, 2, 28, 43, 28, 4, 28, 36, 7, 2, 27, 28,
+        53, 11, 21, 11, 18, 14, 17, 111, 72, 56, 50, 14, 50, 14, 35, 39, 27, 10,
+        22, 251, 41, 7, 1, 17, 2, 60, 28, 11, 0, 9, 21, 43, 17, 47, 20, 28, 22,
+        13, 52, 58, 1, 3, 0, 14, 44, 33, 24, 27, 35, 30, 0, 3, 0, 9, 34, 4, 0,
+        13, 47, 15, 3, 22, 0, 2, 0, 36, 17, 2, 24, 20, 1, 64, 6, 2, 0, 2, 3, 2,
+        14, 2, 9, 8, 46, 39, 7, 3, 1, 3, 21, 2, 6, 2, 1, 2, 4, 4, 0, 19, 0, 13,
+        4, 31, 9, 2, 0, 3, 0, 2, 37, 2, 0, 26, 0, 2, 0, 45, 52, 19, 3, 21, 2,
+        31, 47, 21, 1, 2, 0, 185, 46, 42, 3, 37, 47, 21, 0, 60, 42, 14, 0, 72,
+        26, 38, 6, 186, 43, 117, 63, 32, 7, 3, 0, 3, 7, 2, 1, 2, 23, 16, 0, 2,
+        0, 95, 7, 3, 38, 17, 0, 2, 0, 29, 0, 11, 39, 8, 0, 22, 0, 12, 45, 20, 0,
+        19, 72, 200, 32, 32, 8, 2, 36, 18, 0, 50, 29, 113, 6, 2, 1, 2, 37, 22,
+        0, 26, 5, 2, 1, 2, 31, 15, 0, 328, 18, 16, 0, 2, 12, 2, 33, 125, 0, 80,
+        921, 103, 110, 18, 195, 2637, 96, 16, 1071, 18, 5, 26, 3994, 6, 582,
+        6842, 29, 1763, 568, 8, 30, 18, 78, 18, 29, 19, 47, 17, 3, 32, 20, 6,
+        18, 433, 44, 212, 63, 129, 74, 6, 0, 67, 12, 65, 1, 2, 0, 29, 6135, 9,
+        1237, 42, 9, 8936, 3, 2, 6, 2, 1, 2, 290, 16, 0, 30, 2, 3, 0, 15, 3, 9,
+        395, 2309, 106, 6, 12, 4, 8, 8, 9, 5991, 84, 2, 70, 2, 1, 3, 0, 3, 1, 3,
+        3, 2, 11, 2, 0, 2, 6, 2, 64, 2, 3, 3, 7, 2, 6, 2, 27, 2, 3, 2, 4, 2, 0,
+        4, 6, 2, 339, 3, 24, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2,
+        30, 2, 24, 2, 7, 1845, 30, 7, 5, 262, 61, 147, 44, 11, 6, 17, 0, 322,
+        29, 19, 43, 485, 27, 229, 29, 3, 0, 496, 6, 2, 3, 2, 1, 2, 14, 2, 196,
+        60, 67, 8, 0, 1205, 3, 2, 26, 2, 1, 2, 0, 3, 0, 2, 9, 2, 3, 2, 0, 2, 0,
+        7, 0, 5, 0, 2, 0, 2, 0, 2, 2, 2, 1, 2, 0, 3, 0, 2, 0, 2, 0, 2, 0, 2, 0,
+        2, 1, 2, 0, 3, 3, 2, 6, 2, 3, 2, 3, 2, 0, 2, 9, 2, 16, 6, 2, 2, 4, 2,
+        16, 4421, 42719, 33, 4153, 7, 221, 3, 5761, 15, 7472, 16, 621, 2467,
+        541, 1507, 4938, 6, 4191,
       ];
       const astralIdentifierCodes = [
         509, 0, 227, 0, 150, 4, 294, 9, 1368, 2, 2, 1, 6, 3, 41, 2, 5, 0, 166,
-        1, 574, 3, 9, 9, 370, 1, 81, 2, 71, 10, 50, 3, 123, 2, 54, 14, 32, 10,
-        3, 1, 11, 3, 46, 10, 8, 0, 46, 9, 7, 2, 37, 13, 2, 9, 6, 1, 45, 0, 13,
-        2, 49, 13, 9, 3, 2, 11, 83, 11, 7, 0, 3, 0, 158, 11, 6, 9, 7, 3, 56, 1,
-        2, 6, 3, 1, 3, 2, 10, 0, 11, 1, 3, 6, 4, 4, 193, 17, 10, 9, 5, 0, 82,
-        19, 13, 9, 214, 6, 3, 8, 28, 1, 83, 16, 16, 9, 82, 12, 9, 9, 84, 14, 5,
-        9, 243, 14, 166, 9, 71, 5, 2, 1, 3, 3, 2, 0, 2, 1, 13, 9, 120, 6, 3, 6,
-        4, 0, 29, 9, 41, 6, 2, 3, 9, 0, 10, 10, 47, 15, 406, 7, 2, 7, 17, 9, 57,
-        21, 2, 13, 123, 5, 4, 0, 2, 1, 2, 6, 2, 0, 9, 9, 49, 4, 2, 1, 2, 4, 9,
-        9, 330, 3, 10, 1, 2, 0, 49, 6, 4, 4, 14, 9, 5351, 0, 7, 14, 13835, 9,
-        87, 9, 39, 4, 60, 6, 26, 9, 1014, 0, 2, 54, 8, 3, 82, 0, 12, 1, 19628,
-        1, 4706, 45, 3, 22, 543, 4, 4, 5, 9, 7, 3, 6, 31, 3, 149, 2, 1418, 49,
-        513, 54, 5, 49, 9, 0, 15, 0, 23, 4, 2, 14, 1361, 6, 2, 16, 3, 6, 2, 1,
-        2, 4, 101, 0, 161, 6, 10, 9, 357, 0, 62, 13, 499, 13, 983, 6, 110, 6, 6,
-        9, 4759, 9, 787719, 239,
+        1, 574, 3, 9, 9, 7, 9, 32, 4, 318, 1, 80, 3, 71, 10, 50, 3, 123, 2, 54,
+        14, 32, 10, 3, 1, 11, 3, 46, 10, 8, 0, 46, 9, 7, 2, 37, 13, 2, 9, 6, 1,
+        45, 0, 13, 2, 49, 13, 9, 3, 2, 11, 83, 11, 7, 0, 3, 0, 158, 11, 6, 9, 7,
+        3, 56, 1, 2, 6, 3, 1, 3, 2, 10, 0, 11, 1, 3, 6, 4, 4, 68, 8, 2, 0, 3, 0,
+        2, 3, 2, 4, 2, 0, 15, 1, 83, 17, 10, 9, 5, 0, 82, 19, 13, 9, 214, 6, 3,
+        8, 28, 1, 83, 16, 16, 9, 82, 12, 9, 9, 7, 19, 58, 14, 5, 9, 243, 14,
+        166, 9, 71, 5, 2, 1, 3, 3, 2, 0, 2, 1, 13, 9, 120, 6, 3, 6, 4, 0, 29, 9,
+        41, 6, 2, 3, 9, 0, 10, 10, 47, 15, 343, 9, 54, 7, 2, 7, 17, 9, 57, 21,
+        2, 13, 123, 5, 4, 0, 2, 1, 2, 6, 2, 0, 9, 9, 49, 4, 2, 1, 2, 4, 9, 9,
+        330, 3, 10, 1, 2, 0, 49, 6, 4, 4, 14, 10, 5350, 0, 7, 14, 11465, 27,
+        2343, 9, 87, 9, 39, 4, 60, 6, 26, 9, 535, 9, 470, 0, 2, 54, 8, 3, 82, 0,
+        12, 1, 19628, 1, 4178, 9, 519, 45, 3, 22, 543, 4, 4, 5, 9, 7, 3, 6, 31,
+        3, 149, 2, 1418, 49, 513, 54, 5, 49, 9, 0, 15, 0, 23, 4, 2, 14, 1361, 6,
+        2, 16, 3, 6, 2, 1, 2, 4, 101, 0, 161, 6, 10, 9, 357, 0, 62, 13, 499, 13,
+        245, 1, 2, 9, 726, 6, 110, 6, 6, 9, 4759, 9, 787719, 239,
       ];
       function isInAstralSet(code, set) {
         let pos = 65536;
@@ -94522,7 +94525,7 @@
         return !isFirst;
       }
     },
-    8394: (__unused_webpack_module, exports, __nccwpck_require__) => {
+    6877: (__unused_webpack_module, exports, __nccwpck_require__) => {
       "use strict";
       Object.defineProperty(exports, "__esModule", { value: true });
       Object.defineProperty(exports, "isIdentifierChar", {
@@ -94573,10 +94576,10 @@
           return _keyword.isStrictReservedWord;
         },
       });
-      var _identifier = __nccwpck_require__(3118);
-      var _keyword = __nccwpck_require__(4654);
+      var _identifier = __nccwpck_require__(3287);
+      var _keyword = __nccwpck_require__(7058);
     },
-    4654: (__unused_webpack_module, exports) => {
+    7058: (__unused_webpack_module, exports) => {
       "use strict";
       Object.defineProperty(exports, "__esModule", { value: true });
       exports.isKeyword = isKeyword;
@@ -94659,13 +94662,13 @@
         return keywords.has(word);
       }
     },
-    8635: (__unused_webpack_module, exports, __nccwpck_require__) => {
+    3154: (__unused_webpack_module, exports, __nccwpck_require__) => {
       "use strict";
       Object.defineProperty(exports, "__esModule", { value: true });
       exports["default"] = highlight;
       exports.shouldHighlight = shouldHighlight;
       var _jsTokens = __nccwpck_require__(1192);
-      var _helperValidatorIdentifier = __nccwpck_require__(8394);
+      var _helperValidatorIdentifier = __nccwpck_require__(6877);
       var _picocolors = _interopRequireWildcard(
         __nccwpck_require__(5209),
         true,
@@ -94687,7 +94690,7 @@
         var n = { __proto__: null },
           a = Object.defineProperty && Object.getOwnPropertyDescriptor;
         for (var u in e)
-          if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) {
+          if ("default" !== u && {}.hasOwnProperty.call(e, u)) {
             var i = a ? Object.getOwnPropertyDescriptor(e, u) : null;
             i && (i.get || i.set)
               ? Object.defineProperty(n, u, i)
@@ -94742,7 +94745,7 @@
             if (
               JSX_TAG.test(token.value) &&
               (text[offset - 1] === "<" ||
-                text.slice(offset - 2, offset) == "</")
+                text.slice(offset - 2, offset) === "</")
             ) {
               return "jsxIdentifier";
             }

package/dist/bundler-config/css.cjs

@@ -36,12 +36,11 @@ var import_mini_css_extract_plugin = __toESM(require("mini-css-extract-plugin"))
 var import_constants = require("../constants.cjs");
 var import_utils = require("../utils.cjs");
 var import_helper = require("./helper.cjs");
-const { merge } = require("../../compiled/webpack-merge/index.js");
 function addCssSupport({
   config,
   unpackConfig
 }) {
-  const MiniCssExtractPlugin = unpackConfig.bundler === "webpack" ? import_mini_css_extract_plugin.default : import_core.rspack.CssExtractRspackPlugin;
+  const MiniCssExtractPlugin = unpackConfig.bundler === "rspack" ? import_core.rspack.CssExtractRspackPlugin : import_mini_css_extract_plugin.default;
   let modules = unpackConfig.css?.modules;
   if (!(0, import_utils.isPlainObject)(modules) && modules !== false)
     modules = {};
@@ -109,7 +108,7 @@ function addCssSupport({
       {
         loader: (0, import_utils.getCompiledPkgPath)("less-loader"),
         options: {
-          lessOptions: merge(
+          lessOptions: (0, import_utils.mergeConfig)(
             {
               javascriptEnabled: true
             },
@@ -124,7 +123,7 @@ function addCssSupport({
   const getLightningcssLoader = () => {
     return {
       loader: import_node_path.default.resolve(__dirname, "../lightningcss/loader.cjs"),
-      options: merge(unpackConfig.css?.lightningcss || {}, {
+      options: (0, import_utils.mergeConfig)(unpackConfig.css?.lightningcss || {}, {
         sourceMap: unpackConfig.css?.sourceMap
       })
     };

package/dist/bundler-config/css.js

@@ -24,15 +24,15 @@ import {
   isDevServer,
   isFunction,
   isPlainObject,
-  isRegExp
+  isRegExp,
+  mergeConfig
 } from "../utils.js";
 import { getOutputFilename } from "./helper.js";
-const { merge } = require("../../compiled/webpack-merge/index.js");
 function addCssSupport({
   config,
   unpackConfig
 }) {
-  const MiniCssExtractPlugin = unpackConfig.bundler === "webpack" ? WebpackMiniCssExtractPlugin : rspack.CssExtractRspackPlugin;
+  const MiniCssExtractPlugin = unpackConfig.bundler === "rspack" ? rspack.CssExtractRspackPlugin : WebpackMiniCssExtractPlugin;
   let modules = unpackConfig.css?.modules;
   if (!isPlainObject(modules) && modules !== false)
     modules = {};
@@ -100,7 +100,7 @@ function addCssSupport({
       {
         loader: getCompiledPkgPath("less-loader"),
         options: {
-          lessOptions: merge(
+          lessOptions: mergeConfig(
             {
               javascriptEnabled: true
             },
@@ -115,7 +115,7 @@ function addCssSupport({
   const getLightningcssLoader = () => {
     return {
       loader: path2.resolve(__dirname, "../lightningcss/loader.cjs"),
-      options: merge(unpackConfig.css?.lightningcss || {}, {
+      options: mergeConfig(unpackConfig.css?.lightningcss || {}, {
         sourceMap: unpackConfig.css?.sourceMap
       })
     };

package/dist/bundler-config/experimentCss.cjs

@@ -35,7 +35,6 @@ var import_constants = require("../constants.cjs");
 var import_typed_css_modules = require("../typed-css-modules/index.cjs");
 var import_utils = require("../utils.cjs");
 var import_helper = require("./helper.cjs");
-const { merge } = require("../../compiled/webpack-merge/index.js");
 function addExperimentCssSupport({
   config,
   unpackConfig
@@ -86,7 +85,7 @@ function addExperimentCssSupport({
     return {
       loader: (0, import_utils.getCompiledPkgPath)("less-loader"),
       options: {
-        lessOptions: merge(
+        lessOptions: (0, import_utils.mergeConfig)(
           {
             javascriptEnabled: true
           },
@@ -110,7 +109,7 @@ function addExperimentCssSupport({
   const getLightningcssLoader = () => {
     return {
       loader: import_node_path.default.resolve(__dirname, "../lightningcss/loader.cjs"),
-      options: merge(unpackConfig.css?.lightningcss || {}, {
+      options: (0, import_utils.mergeConfig)(unpackConfig.css?.lightningcss || {}, {
         sourceMap: unpackConfig.css?.sourceMap
       })
     };

package/dist/bundler-config/experimentCss.js

@@ -23,10 +23,10 @@ import {
   isFunction,
   isPlainObject,
   isRegExp,
+  mergeConfig,
   setValueByPath
 } from "../utils.js";
 import { getOutputFilename } from "./helper.js";
-const { merge } = require("../../compiled/webpack-merge/index.js");
 function addExperimentCssSupport({
   config,
   unpackConfig
@@ -77,7 +77,7 @@ function addExperimentCssSupport({
     return {
       loader: getCompiledPkgPath("less-loader"),
       options: {
-        lessOptions: merge(
+        lessOptions: mergeConfig(
           {
             javascriptEnabled: true
           },
@@ -101,7 +101,7 @@ function addExperimentCssSupport({
   const getLightningcssLoader = () => {
     return {
       loader: path2.resolve(__dirname, "../lightningcss/loader.cjs"),
-      options: merge(unpackConfig.css?.lightningcss || {}, {
+      options: mergeConfig(unpackConfig.css?.lightningcss || {}, {
         sourceMap: unpackConfig.css?.sourceMap
       })
     };

package/dist/bundler-config/helper.cjs

@@ -38,13 +38,15 @@ var import_constants = require("../constants.cjs");
 var import_logger = require("../logger.cjs");
 const glob = require("../../compiled/fast-glob/index.js");
 async function getEntry(root, customEntry) {
-  let entry = customEntry;
-  if (!entry) {
+  let entry = void 0;
+  if (!customEntry) {
     const files = await glob("(index|Index).{js,ts,jsx,tsx}", {
       cwd: import_node_path.default.join(root, "src"),
       absolute: true
     });
     entry = files[0];
+  } else {
+    entry = import_node_path.default.resolve(root, customEntry);
   }
   if (!import_node_fs.default.existsSync(entry)) {
     import_logger.logger.error(new Error("Could not find entry file"));

package/dist/bundler-config/helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../../src/bundler-config/helper.ts"],"names":[],"mappings":"AAOA,wBAAsB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAcjF;AAED,KAAK,cAAc,GAAG;IACpB,IAAI,EAAE,IAAI,GAAG,KAAK,CAAA;IAClB,IAAI,EAAE,OAAO,CAAA;CACd,CAAA;AACD,eAAO,MAAM,iBAAiB,mBAAoB,cAAc,WAqB/D,CAAA"}
+{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../../src/bundler-config/helper.ts"],"names":[],"mappings":"AAOA,wBAAsB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAgBjF;AAED,KAAK,cAAc,GAAG;IACpB,IAAI,EAAE,IAAI,GAAG,KAAK,CAAA;IAClB,IAAI,EAAE,OAAO,CAAA;CACd,CAAA;AACD,eAAO,MAAM,iBAAiB,mBAAoB,cAAc,WAqB/D,CAAA"}

package/dist/bundler-config/helper.js

@@ -14,13 +14,15 @@ import { isDev } from "../utils.js";
 import { DEV_DEFAULT_FILENAME, PROD_DEFAULT_FILENAME } from "../constants.js";
 import { logger } from "../logger.js";
 async function getEntry(root, customEntry) {
-  let entry = customEntry;
-  if (!entry) {
+  let entry = void 0;
+  if (!customEntry) {
     const files = await glob("(index|Index).{js,ts,jsx,tsx}", {
       cwd: path2.join(root, "src"),
       absolute: true
     });
     entry = files[0];
+  } else {
+    entry = path2.resolve(root, customEntry);
   }
   if (!fs.existsSync(entry)) {
     logger.error(new Error("Could not find entry file"));

package/dist/bundler-config/index.cjs

@@ -52,28 +52,26 @@ var import_helper = require("./helper.cjs");
 const ForkTsCheckerWebpackPlugin = require("fork-ts-checker-webpack-plugin");
 const BundleAnalyzerPlugin = require("../../compiled/webpack-bundle-analyzer/index.js").BundleAnalyzerPlugin;
 const CopyWebpackPlugin = require("copy-webpack-plugin");
-const { merge } = require("../../compiled/webpack-merge/index.js");
 async function getBundlerConfig(unpackConfig) {
-  const definePlugin = (define) => {
-    if (unpackConfig.bundler === "rspack") {
-      return new import_core.rspack.DefinePlugin(define);
-    }
-    return new import_esbuild_loader.EsbuildPlugin({ define, implementation: import_esbuild.default });
-  };
+  const isRspack = unpackConfig.bundler === "rspack";
+  const definePlugin = (define) => isRspack ? new import_core.rspack.DefinePlugin(define) : new import_esbuild_loader.EsbuildPlugin({ define, implementation: import_esbuild.default });
   const JS_FILENAME = (0, import_helper.getOutputFilename)({ type: "js", hash: unpackConfig.build?.filenameHash });
-  const IgnorePlugin = unpackConfig.bundler === "rspack" ? import_core.rspack.IgnorePlugin : import_webpack2.default.IgnorePlugin;
-  const CopyPlugin = unpackConfig.bundler === "rspack" ? import_core.rspack.CopyRspackPlugin : CopyWebpackPlugin;
+  const IgnorePlugin = isRspack ? import_core.rspack.IgnorePlugin : import_webpack2.default.IgnorePlugin;
+  const CopyPlugin = isRspack ? import_core.rspack.CopyRspackPlugin : CopyWebpackPlugin;
+  const tsconfigPath = import_node_path.default.resolve(unpackConfig.root, "tsconfig.json");
+  const isTs = import_node_fs.default.existsSync(tsconfigPath);
   const getAliasFromTsconfig = () => {
-    const paths = import_json5.default.parse(
-      import_node_fs.default.readFileSync(import_node_path.default.resolve(unpackConfig.root, "tsconfig.json"), "utf-8")
-    )?.compilerOptions?.paths;
+    const paths = import_json5.default.parse(import_node_fs.default.readFileSync(tsconfigPath, "utf-8"))?.compilerOptions?.paths;
     return paths ? Object.keys(paths).reduce((acc, key) => {
-      acc[key.replace(/\/\*$/, "")] = (0, import_utils.getValidPath)(paths[key][0].replace(/\/\*$/, ""));
+      acc[key.replace(/\/\*$/, "")] = import_node_path.default.resolve(
+        unpackConfig.root,
+        paths[key][0].replace(/\/\*$/, "")
+      );
       return acc;
     }, {}) : {};
   };
   const minifyOptions = (0, import_utils.isPlainObject)(unpackConfig.build?.minify) ? unpackConfig.build?.minify : {};
-  const PluginProgress = unpackConfig.bundler === "rspack" ? import_rspack.RspackPluginProgress : import_webpack.WebpackPluginProgress;
+  const PluginProgress = isRspack ? import_rspack.RspackPluginProgress : import_webpack.WebpackPluginProgress;
   let config = {
     context: unpackConfig.root,
     mode: (0, import_utils.isDev)() ? "development" : "production",
@@ -126,14 +124,14 @@ async function getBundlerConfig(unpackConfig) {
         contextRegExp: /moment$/
       }),
       unpackConfig.build?.copy && new CopyPlugin({ patterns: unpackConfig.build.copy }),
-      (0, import_utils.isDev)() && (0, import_utils.isTs)() && new ForkTsCheckerWebpackPlugin({
+      (0, import_utils.isDev)() && isTs && new ForkTsCheckerWebpackPlugin({
         typescript: {
           // set 'readonly' to avoid emitting tsbuildinfo, as the generated tsbuildinfo will break fork-ts-checker
           mode: "readonly",
           // avoid OOM issue
           memoryLimit: 8192,
           // use tsconfig of user project
-          configFile: import_node_path.default.resolve(unpackConfig.root, "tsconfig.json"),
+          configFile: tsconfigPath,
           // use typescript of user project
           typescriptPath: require.resolve("typescript", {
             paths: [unpackConfig.root]
@@ -156,7 +154,7 @@ async function getBundlerConfig(unpackConfig) {
     resolve: {
       alias: {
         "@": import_node_path.default.resolve(unpackConfig.root, "src"),
-        ...(0, import_utils.isTs)() ? getAliasFromTsconfig() : {},
+        ...isTs ? getAliasFromTsconfig() : {},
         ...unpackConfig.resolve?.alias
       },
       extensions: [".tsx", ".ts", ".jsx", ".js", ...unpackConfig.resolve?.extensions || []]
@@ -184,7 +182,7 @@ async function getBundlerConfig(unpackConfig) {
   for (const plugin of (0, import_plugin.getNormalizedPluginsByHook)("bundlerConfig", unpackConfig.plugins)) {
     config = await plugin.bundlerConfig(config, {
       unpackConfig,
-      mergeConfig: merge,
+      mergeConfig: import_utils.mergeConfig,
       bundler: import_webpack2.default
     });
   }
@@ -192,10 +190,10 @@ async function getBundlerConfig(unpackConfig) {
     if ((0, import_utils.isFunction)(unpackConfig.bundlerConfig)) {
       config = await unpackConfig.bundlerConfig(config, {
         bundler: unpackConfig.bundler,
-        mergeConfig: merge
+        mergeConfig: import_utils.mergeConfig
       });
     } else {
-      config = merge(config, unpackConfig.bundlerConfig);
+      config = (0, import_utils.mergeConfig)(config, unpackConfig.bundlerConfig);
     }
   }
   return config;

package/dist/bundler-config/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/bundler-config/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AA8BzE,wBAAsB,gBAAgB,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAmKhG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/bundler-config/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAqBzE,wBAAsB,gBAAgB,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAmKhG"}

package/dist/bundler-config/index.js

@@ -11,15 +11,7 @@ import fs from "node:fs";
 import path2 from "node:path";
 import { rspack } from "@rspack/core";
 import HtmlWebpackPlugin from "html-webpack-plugin";
-import {
-  getValidPath,
-  isDev,
-  isDevServer,
-  isFunction,
-  isPlainObject,
-  isProd,
-  isTs
-} from "../utils.js";
+import { isDev, isDevServer, isFunction, isPlainObject, isProd, mergeConfig } from "../utils.js";
 const ForkTsCheckerWebpackPlugin = require("fork-ts-checker-webpack-plugin");
 const BundleAnalyzerPlugin = require("../../compiled/webpack-bundle-analyzer/index.js").BundleAnalyzerPlugin;
 const CopyWebpackPlugin = require("copy-webpack-plugin");
@@ -37,28 +29,26 @@ import { addChunkSplitSupport } from "./chunkSplit.js";
 import { addCssSupport } from "./css.js";
 import { addExperimentCssSupport } from "./experimentCss.js";
 import { getEntry, getOutputFilename } from "./helper.js";
-const { merge } = require("../../compiled/webpack-merge/index.js");
 async function getBundlerConfig(unpackConfig) {
-  const definePlugin = (define) => {
-    if (unpackConfig.bundler === "rspack") {
-      return new rspack.DefinePlugin(define);
-    }
-    return new EsbuildPlugin({ define, implementation: esbuild });
-  };
+  const isRspack = unpackConfig.bundler === "rspack";
+  const definePlugin = (define) => isRspack ? new rspack.DefinePlugin(define) : new EsbuildPlugin({ define, implementation: esbuild });
   const JS_FILENAME = getOutputFilename({ type: "js", hash: unpackConfig.build?.filenameHash });
-  const IgnorePlugin = unpackConfig.bundler === "rspack" ? rspack.IgnorePlugin : webpack.IgnorePlugin;
-  const CopyPlugin = unpackConfig.bundler === "rspack" ? rspack.CopyRspackPlugin : CopyWebpackPlugin;
+  const IgnorePlugin = isRspack ? rspack.IgnorePlugin : webpack.IgnorePlugin;
+  const CopyPlugin = isRspack ? rspack.CopyRspackPlugin : CopyWebpackPlugin;
+  const tsconfigPath = path2.resolve(unpackConfig.root, "tsconfig.json");
+  const isTs = fs.existsSync(tsconfigPath);
   const getAliasFromTsconfig = () => {
-    const paths = json5.parse(
-      fs.readFileSync(path2.resolve(unpackConfig.root, "tsconfig.json"), "utf-8")
-    )?.compilerOptions?.paths;
+    const paths = json5.parse(fs.readFileSync(tsconfigPath, "utf-8"))?.compilerOptions?.paths;
     return paths ? Object.keys(paths).reduce((acc, key) => {
-      acc[key.replace(/\/\*$/, "")] = getValidPath(paths[key][0].replace(/\/\*$/, ""));
+      acc[key.replace(/\/\*$/, "")] = path2.resolve(
+        unpackConfig.root,
+        paths[key][0].replace(/\/\*$/, "")
+      );
       return acc;
     }, {}) : {};
   };
   const minifyOptions = isPlainObject(unpackConfig.build?.minify) ? unpackConfig.build?.minify : {};
-  const PluginProgress = unpackConfig.bundler === "rspack" ? RspackPluginProgress : WebpackPluginProgress;
+  const PluginProgress = isRspack ? RspackPluginProgress : WebpackPluginProgress;
   let config = {
     context: unpackConfig.root,
     mode: isDev() ? "development" : "production",
@@ -111,14 +101,14 @@ async function getBundlerConfig(unpackConfig) {
         contextRegExp: /moment$/
       }),
       unpackConfig.build?.copy && new CopyPlugin({ patterns: unpackConfig.build.copy }),
-      isDev() && isTs() && new ForkTsCheckerWebpackPlugin({
+      isDev() && isTs && new ForkTsCheckerWebpackPlugin({
         typescript: {
           // set 'readonly' to avoid emitting tsbuildinfo, as the generated tsbuildinfo will break fork-ts-checker
           mode: "readonly",
           // avoid OOM issue
           memoryLimit: 8192,
           // use tsconfig of user project
-          configFile: path2.resolve(unpackConfig.root, "tsconfig.json"),
+          configFile: tsconfigPath,
           // use typescript of user project
           typescriptPath: require.resolve("typescript", {
             paths: [unpackConfig.root]
@@ -141,7 +131,7 @@ async function getBundlerConfig(unpackConfig) {
     resolve: {
       alias: {
         "@": path2.resolve(unpackConfig.root, "src"),
-        ...isTs() ? getAliasFromTsconfig() : {},
+        ...isTs ? getAliasFromTsconfig() : {},
         ...unpackConfig.resolve?.alias
       },
       extensions: [".tsx", ".ts", ".jsx", ".js", ...unpackConfig.resolve?.extensions || []]
@@ -169,7 +159,7 @@ async function getBundlerConfig(unpackConfig) {
   for (const plugin of getNormalizedPluginsByHook("bundlerConfig", unpackConfig.plugins)) {
     config = await plugin.bundlerConfig(config, {
       unpackConfig,
-      mergeConfig: merge,
+      mergeConfig,
       bundler: webpack
     });
   }
@@ -177,10 +167,10 @@ async function getBundlerConfig(unpackConfig) {
     if (isFunction(unpackConfig.bundlerConfig)) {
       config = await unpackConfig.bundlerConfig(config, {
         bundler: unpackConfig.bundler,
-        mergeConfig: merge
+        mergeConfig
       });
     } else {
-      config = merge(config, unpackConfig.bundlerConfig);
+      config = mergeConfig(config, unpackConfig.bundlerConfig);
     }
   }
   return config;