diff --git a/packages/bundler-shared-config/src/plugins/EsbuildMinifyFix.ts b/packages/bundler-shared-config/src/plugins/EsbuildMinifyFix.ts index f6a846d..70769a5 100644 --- a/packages/bundler-shared-config/src/plugins/EsbuildMinifyFix.ts +++ b/packages/bundler-shared-config/src/plugins/EsbuildMinifyFix.ts @@ -139,6 +139,8 @@ export class EsbuildMinifyFix { output.source = new SourceMapSource( newCode, name, + // @ts-expect-error: The `mergedMap` type is incompatible with the expected type for `SourceMapSource`. + // This is due to a known issue with the `remapping` library or rspack's type definitions. mergedMap, originCode, map, diff --git a/packages/bundler-shared/package.json b/packages/bundler-shared/package.json index 1620eb6..a5b76aa 100644 --- a/packages/bundler-shared/package.json +++ b/packages/bundler-shared/package.json @@ -130,7 +130,7 @@ }, "dependencies": { "@kmijs/shared": "workspace:*", - "@rspack/core": "1.3.10", + "@rspack/core": "1.4.8", "@swc/helpers": "0.5.15", "es5-imcompatible-versions": "^0.1.78", "esbuild": "0.17.19", diff --git a/packages/preset-bundler/src/features/rspack/rspackProfile.ts b/packages/preset-bundler/src/features/rspack/rspackProfile.ts index 639a3ed..4f91abc 100644 --- a/packages/preset-bundler/src/features/rspack/rspackProfile.ts +++ b/packages/preset-bundler/src/features/rspack/rspackProfile.ts @@ -58,7 +58,11 @@ export default (api: IApi) => { fsExtra.mkdirpSync(profileDir) if (enableProfileTrace) { - rspack.experiments.globalTrace.register('trace', 'chrome', traceFilePath) + rspack.experiments.globalTrace.register( + 'trace', + 'perfetto', + traceFilePath, + ) } if (enableCPUProfile) { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bdfcf9d..ae67a10 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -742,8 +742,8 @@ importers: specifier: workspace:* version: link:../shared '@rspack/core': - specifier: 1.3.10 - version: 1.3.10(@swc/helpers@0.5.15) + specifier: 1.4.8 + version: 1.4.8(@swc/helpers@0.5.15) '@swc/helpers': specifier: 0.5.15 version: 0.5.15 @@ -6388,18 +6388,18 @@ packages: resolution: {integrity: sha512-9b8mPpKrfeGRuhFH5iO1iwCLeIIsV6+H1sRfxbkoGXIyQE2BTsPd9zqSqQJ+pv5sJ/hT5M1zvOFL02MnEezFug==} dev: true - /@module-federation/error-codes@0.13.1: - resolution: {integrity: sha512-azgGDBnFRfqlivHOl96ZjlFUFlukESz2Rnnz/pINiSqoBBNjUE0fcAZP4X6jgrVITuEg90YkruZa7pW9I3m7Uw==} + /@module-federation/error-codes@0.16.0: + resolution: {integrity: sha512-TfmA45b8vvISniGudMg8jjIy1q3tLPon0QN/JdFp5f8AJ8/peICN5b+dkEQnWsAVg2fEusYhk9dO7z3nUeJM8A==} dev: false /@module-federation/error-codes@0.8.12: resolution: {integrity: sha512-K+F4iiV62KY+IpjK6ggn3vI5Yt/T/LUb6xuazY78bhAGwLaHe1DYr7BfSutKMpiB+Dcs6U4dYOBogSMnnl0j4Q==} - /@module-federation/runtime-core@0.13.1: - resolution: {integrity: sha512-TfyKfkSAentKeuvSsAItk8s5tqQSMfIRTPN2e1aoaq/kFhE+7blps719csyWSX5Lg5Es7WXKMsXHy40UgtBtuw==} + /@module-federation/runtime-core@0.16.0: + resolution: {integrity: sha512-5SECQowG4hlUVBRk/y6bnYLfxbsl5NcMmqn043WPe7NDOhGQWbTuYibJ3Bk+ZBv5U4uYLEmXipBGDc1FKsHklQ==} dependencies: - '@module-federation/error-codes': 0.13.1 - '@module-federation/sdk': 0.13.1 + '@module-federation/error-codes': 0.16.0 + '@module-federation/sdk': 0.16.0 dev: false /@module-federation/runtime-core@0.6.20: @@ -6408,19 +6408,19 @@ packages: '@module-federation/error-codes': 0.8.12 '@module-federation/sdk': 0.8.12 - /@module-federation/runtime-tools@0.13.1: - resolution: {integrity: sha512-GEF1pxqLc80osIMZmE8j9UKZSaTm2hX2lql8tgIH/O9yK4wnF06k6LL5Ah+wJt+oJv6Dj55ri/MoxMP4SXoPNA==} + /@module-federation/runtime-tools@0.16.0: + resolution: {integrity: sha512-OzmXNluXBQ2E6znzX4m9CJt1MFHVGmbN8c8MSKcYIDcLzLSKBQAiaz9ZUMhkyWx2YrPgD134glyPEqJrc+fY8A==} dependencies: - '@module-federation/runtime': 0.13.1 - '@module-federation/webpack-bundler-runtime': 0.13.1 + '@module-federation/runtime': 0.16.0 + '@module-federation/webpack-bundler-runtime': 0.16.0 dev: false - /@module-federation/runtime@0.13.1: - resolution: {integrity: sha512-ZHnYvBquDm49LiHfv6fgagMo/cVJneijNJzfPh6S0CJrPS2Tay1bnTXzy8VA5sdIrESagYPaskKMGIj7YfnPug==} + /@module-federation/runtime@0.16.0: + resolution: {integrity: sha512-6o84WI8Qhc9O3HwPLx89kTvOSkyUOHQr73R/zr0I04sYhlMJgw5xTwXeGE7bQAmNgbJclzW9Kh7JTP7+3o3CHg==} dependencies: - '@module-federation/error-codes': 0.13.1 - '@module-federation/runtime-core': 0.13.1 - '@module-federation/sdk': 0.13.1 + '@module-federation/error-codes': 0.16.0 + '@module-federation/runtime-core': 0.16.0 + '@module-federation/sdk': 0.16.0 dev: false /@module-federation/runtime@0.8.12: @@ -6430,8 +6430,8 @@ packages: '@module-federation/runtime-core': 0.6.20 '@module-federation/sdk': 0.8.12 - /@module-federation/sdk@0.13.1: - resolution: {integrity: sha512-bmf2FGQ0ymZuxYnw9bIUfhV3y6zDhaqgydEjbl4msObKMLGXZqhse2pTIIxBFpIxR1oONKX/y2FAolDCTlWKiw==} + /@module-federation/sdk@0.16.0: + resolution: {integrity: sha512-UXJW1WWuDoDmScX0tpISjl4xIRPzAiN62vg9etuBdAEUM+ja9rz/zwNZaByiUPFS2aqlj2RHenCRvIapE8mYEg==} dev: false /@module-federation/sdk@0.8.12: @@ -6439,11 +6439,11 @@ packages: dependencies: isomorphic-rslog: 0.0.7 - /@module-federation/webpack-bundler-runtime@0.13.1: - resolution: {integrity: sha512-QSuSIGa09S8mthbB1L6xERqrz+AzPlHR6D7RwAzssAc+IHf40U6NiTLPzUqp9mmKDhC5Tm0EISU0ZHNeJpnpBQ==} + /@module-federation/webpack-bundler-runtime@0.16.0: + resolution: {integrity: sha512-yqIDQTelJZP0Rxml0OXv4Er8Kbdxy7NFh6PCzPwDFWI1SkiokJ3uXQJBvtlxZ3lOnCDYOzdHstqa8sJG4JP02Q==} dependencies: - '@module-federation/runtime': 0.13.1 - '@module-federation/sdk': 0.13.1 + '@module-federation/runtime': 0.16.0 + '@module-federation/sdk': 0.16.0 dev: false /@module-federation/webpack-bundler-runtime@0.8.12: @@ -6612,6 +6612,16 @@ packages: '@tybys/wasm-util': 0.9.0 optional: true + /@napi-rs/wasm-runtime@0.2.12: + resolution: {integrity: sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ==} + requiresBuild: true + dependencies: + '@emnapi/core': 1.4.3 + '@emnapi/runtime': 1.4.3 + '@tybys/wasm-util': 0.10.0 + dev: false + optional: true + /@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1: resolution: {integrity: sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==} dependencies: @@ -7743,94 +7753,104 @@ packages: dev: true optional: true - /@rspack/binding-darwin-arm64@1.3.10: - resolution: {integrity: sha512-0k/j8OeMSVm5u5Nzckp9Ie7S7hprnvNegebnGr+L6VCyD7sMqm4m+4rLHs99ZklYdH0dZtY2+LrzrtjUZCqfew==} + /@rspack/binding-darwin-arm64@1.4.8: + resolution: {integrity: sha512-PQRNjC3Fc0avpx8Gk+sT5P+HAXxTSzmBA8lU7QLlmbW5GGXO2taVhNstbZ4oxyIX5uDVZpQ2yQ2E0zXirK6/UQ==} cpu: [arm64] os: [darwin] requiresBuild: true dev: false optional: true - /@rspack/binding-darwin-x64@1.3.10: - resolution: {integrity: sha512-jOyqYW/18cgxw60wK5oqJvM194pbD4H99xaif89McNtLkH3npFvBkXBHVWWuOHGoXNX0LhRpHcI89p9b9THQZQ==} + /@rspack/binding-darwin-x64@1.4.8: + resolution: {integrity: sha512-ZnPZbo1dhhbfevxSS99y8w02xuEbxyiV1HaUie/S8jzy9DPmk+4Br+DddufnibPNU85e3BZKjp+HDFMYkdn6cg==} cpu: [x64] os: [darwin] requiresBuild: true dev: false optional: true - /@rspack/binding-linux-arm64-gnu@1.3.10: - resolution: {integrity: sha512-zhF5ZNaT/7pxrm8xD3dWG1b4x+FO3LbVeZZG448CjpSo5T57kPD+SaGUU1GcPpn6mexf795x0SVS49aH7/e3Dg==} + /@rspack/binding-linux-arm64-gnu@1.4.8: + resolution: {integrity: sha512-mJK9diM4Gd8RIGO90AZnl27WwUuAOoRplPQv9G+Vxu2baCt1xE1ccf8PntIJ70/rMgsUdnmkR5qQBaGxhAMJvA==} cpu: [arm64] os: [linux] requiresBuild: true dev: false optional: true - /@rspack/binding-linux-arm64-musl@1.3.10: - resolution: {integrity: sha512-o3x7IrOSCHK6lcRvdZgsSuOG1CHRQR00xiyLW7kkWmNm7t417LC9xdFWKIK62C5fKXGC5YcTbUkDMnQujespkg==} + /@rspack/binding-linux-arm64-musl@1.4.8: + resolution: {integrity: sha512-+n9QxeDDZKwVB4D6cwpNRJzsCeuwNqd/fwwbMQVTctJ+GhIHlUPsE8y5tXN7euU7kDci81wMBBFlt6LtXNcssA==} cpu: [arm64] os: [linux] requiresBuild: true dev: false optional: true - /@rspack/binding-linux-x64-gnu@1.3.10: - resolution: {integrity: sha512-FMSi28VZhXMr15picOHFynULhqZ/FODPxRIS6uNrvPRYcbNuiO1v+VHV6X88mhOMmJ/aVF6OwjUO/o2l1FVa9Q==} + /@rspack/binding-linux-x64-gnu@1.4.8: + resolution: {integrity: sha512-rEypDlbIfv9B/DcZ2vYVWs56wo5VWE5oj/TvM9JT+xuqwvVWsN/A2TPMiU6QBgOKGXat3EM/MEgx8NhNZUpkXg==} cpu: [x64] os: [linux] requiresBuild: true dev: false optional: true - /@rspack/binding-linux-x64-musl@1.3.10: - resolution: {integrity: sha512-e0xbY9SlbRGIFz41v1yc0HfREvmgMnLV1bLmTSPK8wI2suIEJ7iYYqsocHOAOk86qLZcxVrTnL6EjUcNaRTWlg==} + /@rspack/binding-linux-x64-musl@1.4.8: + resolution: {integrity: sha512-o9OsvJ7olH0JPU9exyIaYTNQ+aaR5CNAiinkxr+LkV2i3DMIi/+pDVveDiodYjVhzZjWfsP/z8QPO4c6Z06bEw==} cpu: [x64] os: [linux] requiresBuild: true dev: false optional: true - /@rspack/binding-win32-arm64-msvc@1.3.10: - resolution: {integrity: sha512-YHJPvEujWeWjU6EUF6sDpaec9rsOtKVvy16YCtGaxRpDQXqfuxibnp6Ge0ZTTrY+joRiWehRA9OUI+3McqI+QA==} + /@rspack/binding-wasm32-wasi@1.4.8: + resolution: {integrity: sha512-hF5gqT0aQ66VUclM2A9MSB6zVdEJqzp++TAXaShBK/eVBI0R4vWrMfJ2TOdzEsSbg4gXgeG4swURpHva3PKbcA==} + cpu: [wasm32] + requiresBuild: true + dependencies: + '@napi-rs/wasm-runtime': 0.2.12 + dev: false + optional: true + + /@rspack/binding-win32-arm64-msvc@1.4.8: + resolution: {integrity: sha512-umD0XzesJq4nnStv9/2/VOmzNUWHfLMIjeHmiHYHpc7iVC0SkXgIdc6Ac7c+g2q7/V3/MFxL66Y60oy7lQE3fg==} cpu: [arm64] os: [win32] requiresBuild: true dev: false optional: true - /@rspack/binding-win32-ia32-msvc@1.3.10: - resolution: {integrity: sha512-2iwSBzVBC89ZSk56MYwgirh3bda2WKmL9I3qPajiTEivChXpX7jp83jAtGE6CPqPYcccYz6nrURTHNUZhqXxVw==} + /@rspack/binding-win32-ia32-msvc@1.4.8: + resolution: {integrity: sha512-Uu+F/sxz7GgIMbuCCZVOD1HPjoHQdyrFHi/TE2EmuZzs9Ji9a9mtNJNrKc8+h9YFpaLeade7cbMDjRu4MHxiVA==} cpu: [ia32] os: [win32] requiresBuild: true dev: false optional: true - /@rspack/binding-win32-x64-msvc@1.3.10: - resolution: {integrity: sha512-ehWJ9Y5Zezj/+uJpiWbt29RZaRIM00f91PWuabM6/sKmHJhdCEE21u5iI3B8DeW/EjJsH8zkI69YYAxJWwGn9A==} + /@rspack/binding-win32-x64-msvc@1.4.8: + resolution: {integrity: sha512-BVkOfJDZnexHNpGgc/sWENyGrsle1jUQTeUEdSyNYsu4Elsgk/T9gnGK8xyLRd2c6k20M5FN38t0TumCp4DscQ==} cpu: [x64] os: [win32] requiresBuild: true dev: false optional: true - /@rspack/binding@1.3.10: - resolution: {integrity: sha512-9TjO+Ig5U4VqdYWpBsv01n4d2KsgFfdXGIE7zdHXDDbry0avL0J4109ESqSeP9uC+Bi7ZCF53iaxJRvZDflNVQ==} + /@rspack/binding@1.4.8: + resolution: {integrity: sha512-VKE+2InUdudBUOn3xMZfK9a6KlOwmSifA0Nupjsh7N9/brcBfJtJGSDCnfrIKCq54FF+QAUCgcNAS0DB4/tZmw==} optionalDependencies: - '@rspack/binding-darwin-arm64': 1.3.10 - '@rspack/binding-darwin-x64': 1.3.10 - '@rspack/binding-linux-arm64-gnu': 1.3.10 - '@rspack/binding-linux-arm64-musl': 1.3.10 - '@rspack/binding-linux-x64-gnu': 1.3.10 - '@rspack/binding-linux-x64-musl': 1.3.10 - '@rspack/binding-win32-arm64-msvc': 1.3.10 - '@rspack/binding-win32-ia32-msvc': 1.3.10 - '@rspack/binding-win32-x64-msvc': 1.3.10 + '@rspack/binding-darwin-arm64': 1.4.8 + '@rspack/binding-darwin-x64': 1.4.8 + '@rspack/binding-linux-arm64-gnu': 1.4.8 + '@rspack/binding-linux-arm64-musl': 1.4.8 + '@rspack/binding-linux-x64-gnu': 1.4.8 + '@rspack/binding-linux-x64-musl': 1.4.8 + '@rspack/binding-wasm32-wasi': 1.4.8 + '@rspack/binding-win32-arm64-msvc': 1.4.8 + '@rspack/binding-win32-ia32-msvc': 1.4.8 + '@rspack/binding-win32-x64-msvc': 1.4.8 dev: false - /@rspack/core@1.3.10(@swc/helpers@0.5.15): - resolution: {integrity: sha512-YomvSRGuMUQgCE2rNMdff2q1Z0YpZw/z6m5+PVTMSs9l/q69YKUzpbpSD8YyB5i1DddrRxC2RE34DkrBuwlREQ==} + /@rspack/core@1.4.8(@swc/helpers@0.5.15): + resolution: {integrity: sha512-ARHuZ+gx3P//RIUKSjk/riQUn/D5tCwCWbfgeM5pk/Ti2JsgVnqiP9Sksge8JovVPf7b6Zgw73Cq5FpX4aOXeQ==} engines: {node: '>=16.0.0'} peerDependencies: '@swc/helpers': '>=0.5.1' @@ -7838,11 +7858,10 @@ packages: '@swc/helpers': optional: true dependencies: - '@module-federation/runtime-tools': 0.13.1 - '@rspack/binding': 1.3.10 + '@module-federation/runtime-tools': 0.16.0 + '@rspack/binding': 1.4.8 '@rspack/lite-tapable': 1.0.1 '@swc/helpers': 0.5.15 - caniuse-lite: 1.0.30001718 dev: false /@rspack/lite-tapable@1.0.1: @@ -8513,6 +8532,14 @@ packages: polygon-clipping: 0.15.7 dev: false + /@tybys/wasm-util@0.10.0: + resolution: {integrity: sha512-VyyPYFlOMNylG45GoAe0xDoLwWuowvf92F9kySqzYh8vmYm7D2u4iUJKa1tOUpS70Ku13ASrOkS4ScXFsTaCNQ==} + requiresBuild: true + dependencies: + tslib: 2.8.1 + dev: false + optional: true + /@tybys/wasm-util@0.9.0: resolution: {integrity: sha512-6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw==} requiresBuild: true @@ -13002,6 +13029,7 @@ packages: /caniuse-lite@1.0.30001718: resolution: {integrity: sha512-AflseV1ahcSunK53NfEs9gFWgOEmzr0f+kaMFA4xiLZlr9Hzt7HxcSpIFcnNCUkz6R6dWKa54rUz3HUmI3nVcw==} + dev: true /ccount@2.0.1: resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==}