From 330de39e02ed12cf0c3c5e448668cbca9c78c1ec Mon Sep 17 00:00:00 2001 From: Cong-Cong Date: Fri, 1 Aug 2025 10:25:07 +0800 Subject: [PATCH 1/2] fix: change @rspack-canary/core to @rspack/core --- pnpm-lock.yaml | 349 ++++++++++-------- rspack/collect-typescript-info/package.json | 4 +- .../collect-typescript-info/rspack.config.mjs | 7 +- .../monaco-editor-ts-react/rspack.config.js | 6 +- 4 files changed, 196 insertions(+), 170 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0a8cee1ec..767676aed 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1202,12 +1202,12 @@ importers: rspack/collect-typescript-info: devDependencies: - '@rspack-canary/cli': - specifier: 1.4.0-canary-f9e682fa-20250625081434 - version: 1.4.0-canary-f9e682fa-20250625081434(@rspack/core@1.4.10(@swc/helpers@0.5.17)) - '@rspack-canary/core': - specifier: 1.4.0-canary-f9e682fa-20250625081434 - version: 1.4.0-canary-f9e682fa-20250625081434(@swc/helpers@0.5.17) + '@rspack/cli': + specifier: 1.4.0 + version: 1.4.0(@rspack/core@1.4.0(@swc/helpers@0.5.17)) + '@rspack/core': + specifier: 1.4.0 + version: 1.4.0(@swc/helpers@0.5.17) rspack/common-libs/lib1: {} @@ -1538,7 +1538,7 @@ importers: version: 8.1.0(typescript@5.8.3) autoprefixer: specifier: 10.4.21 - version: 10.4.21(postcss@8.5.6) + version: 10.4.21(postcss@8.4.49) babel-loader: specifier: 10.0.0 version: 10.0.0(@babel/core@7.26.7)(webpack@5.100.2(esbuild@0.24.2)) @@ -1559,7 +1559,7 @@ importers: version: 2.1.0(webpack@5.100.2(esbuild@0.24.2)) postcss-loader: specifier: 8.1.1 - version: 8.1.1(@rspack/core@1.4.10(@swc/helpers@0.5.17))(postcss@8.5.6)(typescript@5.8.3)(webpack@5.100.2(esbuild@0.24.2)) + version: 8.1.1(@rspack/core@1.4.10(@swc/helpers@0.5.17))(postcss@8.4.49)(typescript@5.8.3)(webpack@5.100.2(esbuild@0.24.2)) raw-loader: specifier: 4.0.2 version: 4.0.2(webpack@5.100.2(esbuild@0.24.2)) @@ -6038,75 +6038,13 @@ packages: '@rsdoctor/utils@1.1.10': resolution: {integrity: sha512-VdKGPOHVvQZZ06lhQG4Xru8gqlCcDb2tzUGrZNuXCnzyAjed3H3zWF0+R0ZYX1xXFdhwdV+cr8/rJU/xFMWkxA==} - '@rspack-canary/binding-darwin-arm64@1.4.0-canary-f9e682fa-20250625081434': - resolution: {integrity: sha512-GwxSl6dTegdbsg0EofjN2N9ZiXLzTE5yqipM4sHW1qx1yKhkOdyXj1RY5OX0bXypCdZmOfUyvvUGJLOENkVziA==} + '@rspack/binding-darwin-arm64@1.3.12': + resolution: {integrity: sha512-8hKjVTBeWPqkMzFPNWIh72oU9O3vFy3e88wRjMPImDCXBiEYrKqGTTLd/J0SO+efdL3SBD1rX1IvdJpxCv6Yrw==} cpu: [arm64] os: [darwin] - '@rspack-canary/binding-darwin-x64@1.4.0-canary-f9e682fa-20250625081434': - resolution: {integrity: sha512-mScIdDYsWkPqCSkl2eWP4ftdHkymMDyafccSuMUF9gBF3/TKRjyQdyuDgKEFyglouMWmtIIwoWVolumv8wkx8g==} - cpu: [x64] - os: [darwin] - - '@rspack-canary/binding-linux-arm64-gnu@1.4.0-canary-f9e682fa-20250625081434': - resolution: {integrity: sha512-MD6XDuXWA7XuvLxv06tdwcOxw26qVC0CM7Ht1tqdPprAIX40ntZQBVZYuR069E+1ciIsxfmp000Xxb/7PgbKMA==} - cpu: [arm64] - os: [linux] - - '@rspack-canary/binding-linux-arm64-musl@1.4.0-canary-f9e682fa-20250625081434': - resolution: {integrity: sha512-dZ/aulf0CSW4aIyVZoElHgYKNjKwyA3ewFbZZcYAvKsAtLSOnnZXSUhfa0q/PrQYKSiPzEV125m7aALNFnQ/8Q==} - cpu: [arm64] - os: [linux] - - '@rspack-canary/binding-linux-x64-gnu@1.4.0-canary-f9e682fa-20250625081434': - resolution: {integrity: sha512-lqAOgFicIQdQYdDSF84iHlifnwTzlaYrWT8WvinQ9gPk9Vw+6/bNE5ht9UkPFgFV12IPTBzH6McX2AaJwwhoYQ==} - cpu: [x64] - os: [linux] - - '@rspack-canary/binding-linux-x64-musl@1.4.0-canary-f9e682fa-20250625081434': - resolution: {integrity: sha512-33GQWwYLwVD00JV1FCSLkVmyhkvNFUEPj/P2UoszzkXD/FFvUMfwrs+JLfDeUyzZ7g5YYH2K4GRc7c3HNLFtSQ==} - cpu: [x64] - os: [linux] - - '@rspack-canary/binding-wasm32-wasi@1.4.0-canary-f9e682fa-20250625081434': - resolution: {integrity: sha512-+4IuyQadWFMnG5U2rKU5Z7y7EbjNJ86dKLdFIpdM6eqyPT8grFkSMjb0kEBMNWLpWuoWgOV66JpXen2JO+NZHg==} - cpu: [wasm32] - - '@rspack-canary/binding-win32-arm64-msvc@1.4.0-canary-f9e682fa-20250625081434': - resolution: {integrity: sha512-uIyiLgWwgZsrBQS7uTyfg71L/mqwtiozUuLOLdrVccmdBRe4srzeKWnLeOluDMYmJhyk+FJebxy/cqsxmL2lQw==} - cpu: [arm64] - os: [win32] - - '@rspack-canary/binding-win32-ia32-msvc@1.4.0-canary-f9e682fa-20250625081434': - resolution: {integrity: sha512-Nwfq4r6nmIefC4WjGYppAPrkYNkWVFALMQMTbJyyBL45lFBBLVAT0dFS4mgFmsB/7MVWPzkNiDAKJ6LG0gvFxA==} - cpu: [ia32] - os: [win32] - - '@rspack-canary/binding-win32-x64-msvc@1.4.0-canary-f9e682fa-20250625081434': - resolution: {integrity: sha512-Ro48v9pMOexYwKNLuKgeWNhiil9f3YycG4+qMP9+BwyWUH4F+B9ca11I+fRKXTl/+acrA5B1O7EjSfN2QxMuiA==} - cpu: [x64] - os: [win32] - - '@rspack-canary/binding@1.4.0-canary-f9e682fa-20250625081434': - resolution: {integrity: sha512-8Nh2rmAgSNeE0J3s5yotAUjMO/+YFmEwa68nvKSoD3YulhFv53cCMpOzE0ddJ1o8cS1HLteWyWI+DBIj04etpg==} - - '@rspack-canary/cli@1.4.0-canary-f9e682fa-20250625081434': - resolution: {integrity: sha512-3suOMux04Zwathy6X4lUXe/LR8fwKgkTQhEx8f68Zp0uNujMr2p7UQsW5gJlfb0OdYKKRlUwwojKH2gWt+d0oQ==} - hasBin: true - peerDependencies: - '@rspack/core': ^1.0.0-alpha || ^1.x - - '@rspack-canary/core@1.4.0-canary-f9e682fa-20250625081434': - resolution: {integrity: sha512-DGptWrJpNybGWIv1ehIHbCzirRKugetv6K7xPX4/w6MV3LNfl/odoBS9DrBA6AIQiWNd/4poKDeP17xWzFwc7Q==} - engines: {node: '>=16.0.0'} - peerDependencies: - '@swc/helpers': '>=0.5.1' - peerDependenciesMeta: - '@swc/helpers': - optional: true - - '@rspack/binding-darwin-arm64@1.3.12': - resolution: {integrity: sha512-8hKjVTBeWPqkMzFPNWIh72oU9O3vFy3e88wRjMPImDCXBiEYrKqGTTLd/J0SO+efdL3SBD1rX1IvdJpxCv6Yrw==} + '@rspack/binding-darwin-arm64@1.4.0': + resolution: {integrity: sha512-fOvbe71PAu9mM4f9KYssielLlTaQ0RcaS6fARkOuQRS3HfmZnAcMJA9kDkMAWBdsHQSW2RPHLji0Ng7lumAFvg==} cpu: [arm64] os: [darwin] @@ -6130,6 +6068,11 @@ packages: cpu: [x64] os: [darwin] + '@rspack/binding-darwin-x64@1.4.0': + resolution: {integrity: sha512-1U7u5LdB+FwC90i3U9WDNeQoD8xoCfQBZPI0M6nB8pBCLW3HIP6Lzd60hTSKPuWOW6ZuXroUGoRG0z/ba8QlNg==} + cpu: [x64] + os: [darwin] + '@rspack/binding-darwin-x64@1.4.10': resolution: {integrity: sha512-rWTSJ08TE0uqUjqAHkTmWqJu+FLSJ70A199Fk9k/FLZTS8UtHjuzZW7rv4qIN2nwJJLherxFUnP6y69cHuaGNw==} cpu: [x64] @@ -6150,6 +6093,11 @@ packages: cpu: [arm64] os: [linux] + '@rspack/binding-linux-arm64-gnu@1.4.0': + resolution: {integrity: sha512-XYOfmHDYo88jruqAtyjklTqrNeixigP2QjsiZDiB0YvRQyaoLTw3hZ7RvhJbVruxFibwF75yiMlMD9LJgDTxrg==} + cpu: [arm64] + os: [linux] + '@rspack/binding-linux-arm64-gnu@1.4.10': resolution: {integrity: sha512-cs6yu250FzRU1hl+02VLoJRdzbAveTOqvREeHgqL5AiTc6q1dQo1IZ16/Qt4+g0DMjnvM66pELRIO2nphXL8aA==} cpu: [arm64] @@ -6170,6 +6118,11 @@ packages: cpu: [arm64] os: [linux] + '@rspack/binding-linux-arm64-musl@1.4.0': + resolution: {integrity: sha512-IvQNw3wN5Dro1CeT4f95W7R/ZAKREcsf9s0Kqk4NtBhaPxcEf+nV72mMDBzPUakEI/g32e5Evb91w3y0EFWhIg==} + cpu: [arm64] + os: [linux] + '@rspack/binding-linux-arm64-musl@1.4.10': resolution: {integrity: sha512-NnOAoWkpZvOa+xM7NAJg25O+tSKt6xCXoga+gOw5XPni1NxHDc3PNh5bU6fAmc2Z29YLLdxeVqPmIDfdk1EkDg==} cpu: [arm64] @@ -6190,6 +6143,11 @@ packages: cpu: [x64] os: [linux] + '@rspack/binding-linux-x64-gnu@1.4.0': + resolution: {integrity: sha512-b71w0Iflh/7gvwrpdfJYC4FsCb84mQen3YDYtiBF7VWdXKTN5OzWoibX/3i68l3HBncCf0vmWRr9XFrdejEZEg==} + cpu: [x64] + os: [linux] + '@rspack/binding-linux-x64-gnu@1.4.10': resolution: {integrity: sha512-FcaBqMclADWiqX+Mez15kggwaVYZkoEqDiQwYRpYDbBMsiJEtfp41GnNRstTWxYxFbcmuWoZl2cYy+LepR21ag==} cpu: [x64] @@ -6210,6 +6168,11 @@ packages: cpu: [x64] os: [linux] + '@rspack/binding-linux-x64-musl@1.4.0': + resolution: {integrity: sha512-aGanEWtYRBiuS6RdI3rOwcV/tetq5duyYRmm/i1RoGAyfGp7vtoPpKVl7PP/hODWp3lZ9PVn3FhxsEaV7LY36Q==} + cpu: [x64] + os: [linux] + '@rspack/binding-linux-x64-musl@1.4.10': resolution: {integrity: sha512-vgRQhCw+C/Nxv6MZVNUkPzSXs6kIWHIrGKUvOM1ceeAkT+jNFEQdukkQ5LsYgEqEwP9ezWubxN3IGrMxyimlPw==} cpu: [x64] @@ -6225,6 +6188,10 @@ packages: cpu: [x64] os: [linux] + '@rspack/binding-wasm32-wasi@1.4.0': + resolution: {integrity: sha512-3LMP/bs/qCQw7Os/Y9HXVZ15TyXhngM1EQtX0ULJLPdOaX5yO/znXwdzRCI03T8i3MIZxno9EdgHlg1FNt4Puw==} + cpu: [wasm32] + '@rspack/binding-wasm32-wasi@1.4.10': resolution: {integrity: sha512-lk647+Ob3yvVS2FgW0vCfo/gz9h0Q7v9HGBFcsD1uW0/tSqXMa2s9ZvIn+B7S9tRgIoosXEAuq8NeCXKGWVj5Q==} cpu: [wasm32] @@ -6242,6 +6209,11 @@ packages: cpu: [arm64] os: [win32] + '@rspack/binding-win32-arm64-msvc@1.4.0': + resolution: {integrity: sha512-cduBQqs8bGMFui7gpq+NlMOq1lr78jCvfUNEvZ59hU9xIx3Xewq1yQRNKuCikx24HJCtKRgzYdSMKMpUwnNNMg==} + cpu: [arm64] + os: [win32] + '@rspack/binding-win32-arm64-msvc@1.4.10': resolution: {integrity: sha512-9mB3kh4pKaY4wFosZwuxb5EUtt7vv/uKW3OF4TJDC35bH7r54s+YYpHyXROT304r6URl4b6HNHlysL2m7BLihg==} cpu: [arm64] @@ -6262,6 +6234,11 @@ packages: cpu: [ia32] os: [win32] + '@rspack/binding-win32-ia32-msvc@1.4.0': + resolution: {integrity: sha512-ZNWutTwz4iL/9QD0rYk+JKpes5Nx+bQys5aBVM2z/BefvWInw+3beeIRV6SgY8UiO5jc5GEwmdwdv8duzUrhbg==} + cpu: [ia32] + os: [win32] + '@rspack/binding-win32-ia32-msvc@1.4.10': resolution: {integrity: sha512-DPlyLZDUWkNcFI7zp1BQVVnihd4j/hCIbxqvIKvUt7whIVYMP52i8lCsa52uNGBSj7BcbcKAFElXC9dHVvoQGA==} cpu: [ia32] @@ -6282,6 +6259,11 @@ packages: cpu: [x64] os: [win32] + '@rspack/binding-win32-x64-msvc@1.4.0': + resolution: {integrity: sha512-pNwpjFCVYQpmA156GgjEqnHly3UZqNXYCJPkouAnUvVE9m0Xoo9May7v7ovKUH4ayySTryL42Ii8tL4iStyJuA==} + cpu: [x64] + os: [win32] + '@rspack/binding-win32-x64-msvc@1.4.10': resolution: {integrity: sha512-FEE6OM0Wh7nj90+1ARXojT0Dnqox9UlIUIj7MQmX09yeMtckR+HITeq75F8y0l7HUvKOl2zQovmenk1KgyJV8Q==} cpu: [x64] @@ -6300,6 +6282,9 @@ packages: '@rspack/binding@1.3.12': resolution: {integrity: sha512-4Ic8lV0+LCBfTlH5aIOujIRWZOtgmG223zC4L3o8WY/+ESAgpdnK6lSSMfcYgRanYLAy3HOmFIp20jwskMpbAg==} + '@rspack/binding@1.4.0': + resolution: {integrity: sha512-Kex9H6w44oTYzaQK/goV/BhUJoeWL8rPI1symDjRRvSK4ca/P4OceHvlQzfU0WGg2VKnhTAxH3+KMlpYQFabOQ==} + '@rspack/binding@1.4.10': resolution: {integrity: sha512-awiXN7qTTTLWFThbJFL+M4k1if4sb17xKA5TaHbbxs0qKSlpe3adwNrNHaNU2WOQz+PbuF++OMyd+4gUusKuVg==} @@ -6309,6 +6294,12 @@ packages: '@rspack/binding@1.4.9': resolution: {integrity: sha512-9EY8OMCNZrwCupQMZccMgrTxWGUQvZGFrLFw/rxfTt+uT4fS4CAbNwHVFxsnROaRd+EE6EXfUpUYu66j6vd4qA==} + '@rspack/cli@1.4.0': + resolution: {integrity: sha512-hsulcvzusSKvJlRhtmSrlXsbUrRfGlBMdJ0u2OTjc+ZwXhNP4mak3kxtHthLr/tshC3m3kUQcnXIxUQX2F2v6g==} + hasBin: true + peerDependencies: + '@rspack/core': ^1.0.0-alpha || ^1.x + '@rspack/cli@1.4.10': resolution: {integrity: sha512-qWnBEN1pthP8wlgR6qOw+L8wXXUo3/B9EgD+XDavK6bKxwWlUvc02u2ERKvyaVyBctus708/M4dj9uxNH5xUDg==} hasBin: true @@ -6324,6 +6315,15 @@ packages: '@swc/helpers': optional: true + '@rspack/core@1.4.0': + resolution: {integrity: sha512-eIzbMYdrpJLjfkelKFLpxUObuv2gAmAuebUJmXeyf2OlFT/DGgoWRDGOVX4MpIHgcE1XCi27sqvOdRU4HA7Zgw==} + engines: {node: '>=16.0.0'} + peerDependencies: + '@swc/helpers': '>=0.5.1' + peerDependenciesMeta: + '@swc/helpers': + optional: true + '@rspack/core@1.4.10': resolution: {integrity: sha512-eK3H328pihiM1323OlaClKJ9WlqgGBZpcR5AqFoWsG0KD01tKCJOeZEgtCY6paRLrsQrEJwBrLntkG0fE7WNGg==} engines: {node: '>=16.0.0'} @@ -7525,9 +7525,6 @@ packages: '@vue/shared@3.5.13': resolution: {integrity: sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==} - '@vue/shared@3.5.16': - resolution: {integrity: sha512-c/0fWy3Jw6Z8L9FmTyYfkpM5zklnqqa9+a6dz3DvONRKW2NEbh46BP0FHuLFSWi2TnQEtp91Z6zOWNrU6QiyPg==} - '@vue/shared@3.5.18': resolution: {integrity: sha512-cZy8Dq+uuIXbxCZpuLd2GJdeSO/lIzIspC2WtkqIpje5QyFbvLaI5wZtdUjLHjGZrlVX6GilejatWwVYYRc8tA==} @@ -18882,80 +18879,10 @@ snapshots: - supports-color - webpack - '@rspack-canary/binding-darwin-arm64@1.4.0-canary-f9e682fa-20250625081434': - optional: true - - '@rspack-canary/binding-darwin-x64@1.4.0-canary-f9e682fa-20250625081434': - optional: true - - '@rspack-canary/binding-linux-arm64-gnu@1.4.0-canary-f9e682fa-20250625081434': - optional: true - - '@rspack-canary/binding-linux-arm64-musl@1.4.0-canary-f9e682fa-20250625081434': - optional: true - - '@rspack-canary/binding-linux-x64-gnu@1.4.0-canary-f9e682fa-20250625081434': - optional: true - - '@rspack-canary/binding-linux-x64-musl@1.4.0-canary-f9e682fa-20250625081434': - optional: true - - '@rspack-canary/binding-wasm32-wasi@1.4.0-canary-f9e682fa-20250625081434': - dependencies: - '@napi-rs/wasm-runtime': 0.2.11 - optional: true - - '@rspack-canary/binding-win32-arm64-msvc@1.4.0-canary-f9e682fa-20250625081434': - optional: true - - '@rspack-canary/binding-win32-ia32-msvc@1.4.0-canary-f9e682fa-20250625081434': - optional: true - - '@rspack-canary/binding-win32-x64-msvc@1.4.0-canary-f9e682fa-20250625081434': + '@rspack/binding-darwin-arm64@1.3.12': optional: true - '@rspack-canary/binding@1.4.0-canary-f9e682fa-20250625081434': - optionalDependencies: - '@rspack/binding-darwin-arm64': '@rspack-canary/binding-darwin-arm64@1.4.0-canary-f9e682fa-20250625081434' - '@rspack/binding-darwin-x64': '@rspack-canary/binding-darwin-x64@1.4.0-canary-f9e682fa-20250625081434' - '@rspack/binding-linux-arm64-gnu': '@rspack-canary/binding-linux-arm64-gnu@1.4.0-canary-f9e682fa-20250625081434' - '@rspack/binding-linux-arm64-musl': '@rspack-canary/binding-linux-arm64-musl@1.4.0-canary-f9e682fa-20250625081434' - '@rspack/binding-linux-x64-gnu': '@rspack-canary/binding-linux-x64-gnu@1.4.0-canary-f9e682fa-20250625081434' - '@rspack/binding-linux-x64-musl': '@rspack-canary/binding-linux-x64-musl@1.4.0-canary-f9e682fa-20250625081434' - '@rspack/binding-wasm32-wasi': '@rspack-canary/binding-wasm32-wasi@1.4.0-canary-f9e682fa-20250625081434' - '@rspack/binding-win32-arm64-msvc': '@rspack-canary/binding-win32-arm64-msvc@1.4.0-canary-f9e682fa-20250625081434' - '@rspack/binding-win32-ia32-msvc': '@rspack-canary/binding-win32-ia32-msvc@1.4.0-canary-f9e682fa-20250625081434' - '@rspack/binding-win32-x64-msvc': '@rspack-canary/binding-win32-x64-msvc@1.4.0-canary-f9e682fa-20250625081434' - - '@rspack-canary/cli@1.4.0-canary-f9e682fa-20250625081434(@rspack/core@1.4.10(@swc/helpers@0.5.17))': - dependencies: - '@discoveryjs/json-ext': 0.5.7 - '@rspack/core': 1.4.10(@swc/helpers@0.5.17) - '@rspack/dev-server': 1.1.3(@rspack/core@1.4.10(@swc/helpers@0.5.17)) - colorette: 2.0.20 - exit-hook: 4.0.0 - interpret: 3.1.1 - rechoir: 0.8.0 - webpack-bundle-analyzer: 4.10.2 - yargs: 17.7.2 - transitivePeerDependencies: - - '@types/express' - - bufferutil - - debug - - supports-color - - utf-8-validate - - webpack - - webpack-cli - - '@rspack-canary/core@1.4.0-canary-f9e682fa-20250625081434(@swc/helpers@0.5.17)': - dependencies: - '@module-federation/runtime-tools': 0.15.0 - '@rspack/binding': '@rspack-canary/binding@1.4.0-canary-f9e682fa-20250625081434' - '@rspack/lite-tapable': 1.0.1 - optionalDependencies: - '@swc/helpers': 0.5.17 - - '@rspack/binding-darwin-arm64@1.3.12': + '@rspack/binding-darwin-arm64@1.4.0': optional: true '@rspack/binding-darwin-arm64@1.4.10': @@ -18970,6 +18897,9 @@ snapshots: '@rspack/binding-darwin-x64@1.3.12': optional: true + '@rspack/binding-darwin-x64@1.4.0': + optional: true + '@rspack/binding-darwin-x64@1.4.10': optional: true @@ -18982,6 +18912,9 @@ snapshots: '@rspack/binding-linux-arm64-gnu@1.3.12': optional: true + '@rspack/binding-linux-arm64-gnu@1.4.0': + optional: true + '@rspack/binding-linux-arm64-gnu@1.4.10': optional: true @@ -18994,6 +18927,9 @@ snapshots: '@rspack/binding-linux-arm64-musl@1.3.12': optional: true + '@rspack/binding-linux-arm64-musl@1.4.0': + optional: true + '@rspack/binding-linux-arm64-musl@1.4.10': optional: true @@ -19006,6 +18942,9 @@ snapshots: '@rspack/binding-linux-x64-gnu@1.3.12': optional: true + '@rspack/binding-linux-x64-gnu@1.4.0': + optional: true + '@rspack/binding-linux-x64-gnu@1.4.10': optional: true @@ -19018,6 +18957,9 @@ snapshots: '@rspack/binding-linux-x64-musl@1.3.12': optional: true + '@rspack/binding-linux-x64-musl@1.4.0': + optional: true + '@rspack/binding-linux-x64-musl@1.4.10': optional: true @@ -19027,6 +18969,11 @@ snapshots: '@rspack/binding-linux-x64-musl@1.4.9': optional: true + '@rspack/binding-wasm32-wasi@1.4.0': + dependencies: + '@napi-rs/wasm-runtime': 0.2.11 + optional: true + '@rspack/binding-wasm32-wasi@1.4.10': dependencies: '@napi-rs/wasm-runtime': 1.0.1 @@ -19045,6 +18992,9 @@ snapshots: '@rspack/binding-win32-arm64-msvc@1.3.12': optional: true + '@rspack/binding-win32-arm64-msvc@1.4.0': + optional: true + '@rspack/binding-win32-arm64-msvc@1.4.10': optional: true @@ -19057,6 +19007,9 @@ snapshots: '@rspack/binding-win32-ia32-msvc@1.3.12': optional: true + '@rspack/binding-win32-ia32-msvc@1.4.0': + optional: true + '@rspack/binding-win32-ia32-msvc@1.4.10': optional: true @@ -19069,6 +19022,9 @@ snapshots: '@rspack/binding-win32-x64-msvc@1.3.12': optional: true + '@rspack/binding-win32-x64-msvc@1.4.0': + optional: true + '@rspack/binding-win32-x64-msvc@1.4.10': optional: true @@ -19090,6 +19046,19 @@ snapshots: '@rspack/binding-win32-ia32-msvc': 1.3.12 '@rspack/binding-win32-x64-msvc': 1.3.12 + '@rspack/binding@1.4.0': + optionalDependencies: + '@rspack/binding-darwin-arm64': 1.4.0 + '@rspack/binding-darwin-x64': 1.4.0 + '@rspack/binding-linux-arm64-gnu': 1.4.0 + '@rspack/binding-linux-arm64-musl': 1.4.0 + '@rspack/binding-linux-x64-gnu': 1.4.0 + '@rspack/binding-linux-x64-musl': 1.4.0 + '@rspack/binding-wasm32-wasi': 1.4.0 + '@rspack/binding-win32-arm64-msvc': 1.4.0 + '@rspack/binding-win32-ia32-msvc': 1.4.0 + '@rspack/binding-win32-x64-msvc': 1.4.0 + '@rspack/binding@1.4.10': optionalDependencies: '@rspack/binding-darwin-arm64': 1.4.10 @@ -19129,6 +19098,26 @@ snapshots: '@rspack/binding-win32-ia32-msvc': 1.4.9 '@rspack/binding-win32-x64-msvc': 1.4.9 + '@rspack/cli@1.4.0(@rspack/core@1.4.0(@swc/helpers@0.5.17))': + dependencies: + '@discoveryjs/json-ext': 0.5.7 + '@rspack/core': 1.4.0(@swc/helpers@0.5.17) + '@rspack/dev-server': 1.1.3(@rspack/core@1.4.0(@swc/helpers@0.5.17)) + colorette: 2.0.20 + exit-hook: 4.0.0 + interpret: 3.1.1 + rechoir: 0.8.0 + webpack-bundle-analyzer: 4.10.2 + yargs: 17.7.2 + transitivePeerDependencies: + - '@types/express' + - bufferutil + - debug + - supports-color + - utf-8-validate + - webpack + - webpack-cli + '@rspack/cli@1.4.10(@rspack/core@1.4.10(@swc/helpers@0.5.17))': dependencies: '@discoveryjs/json-ext': 0.5.7 @@ -19218,6 +19207,14 @@ snapshots: optionalDependencies: '@swc/helpers': 0.5.17 + '@rspack/core@1.4.0(@swc/helpers@0.5.17)': + dependencies: + '@module-federation/runtime-tools': 0.15.0 + '@rspack/binding': 1.4.0 + '@rspack/lite-tapable': 1.0.1 + optionalDependencies: + '@swc/helpers': 0.5.17 + '@rspack/core@1.4.10(@swc/helpers@0.5.17)': dependencies: '@module-federation/runtime-tools': 0.17.0 @@ -19242,6 +19239,23 @@ snapshots: optionalDependencies: '@swc/helpers': 0.5.17 + '@rspack/dev-server@1.1.3(@rspack/core@1.4.0(@swc/helpers@0.5.17))': + dependencies: + '@rspack/core': 1.4.0(@swc/helpers@0.5.17) + chokidar: 3.6.0 + http-proxy-middleware: 2.0.9(@types/express@4.17.21) + p-retry: 6.2.0 + webpack-dev-server: 5.2.2(webpack@5.100.2(esbuild@0.24.2)) + ws: 8.18.0 + transitivePeerDependencies: + - '@types/express' + - bufferutil + - debug + - supports-color + - utf-8-validate + - webpack + - webpack-cli + '@rspack/dev-server@1.1.3(@rspack/core@1.4.10(@swc/helpers@0.5.17))': dependencies: '@rspack/core': 1.4.10(@swc/helpers@0.5.17) @@ -20838,7 +20852,7 @@ snapshots: '@volar/language-core': 1.11.1 '@volar/source-map': 1.11.1 '@vue/compiler-dom': 3.5.13 - '@vue/shared': 3.5.16 + '@vue/shared': 3.5.18 computeds: 0.0.1 minimatch: 9.0.5 muggle-string: 0.3.1 @@ -20934,9 +20948,6 @@ snapshots: '@vue/shared@3.5.13': {} - '@vue/shared@3.5.16': - optional: true - '@vue/shared@3.5.18': {} '@vue/shared@3.5.8': {} @@ -21297,6 +21308,16 @@ snapshots: atomic-sleep@1.0.0: {} + autoprefixer@10.4.21(postcss@8.4.49): + dependencies: + browserslist: 4.24.4 + caniuse-lite: 1.0.30001703 + fraction.js: 4.3.7 + normalize-range: 0.1.2 + picocolors: 1.1.1 + postcss: 8.4.49 + postcss-value-parser: 4.2.0 + autoprefixer@10.4.21(postcss@8.5.6): dependencies: browserslist: 4.24.4 @@ -23337,10 +23358,6 @@ snapshots: optionalDependencies: picomatch: 4.0.3 - fdir@6.4.6(picomatch@4.0.2): - optionalDependencies: - picomatch: 4.0.2 - fdir@6.4.6(picomatch@4.0.3): optionalDependencies: picomatch: 4.0.3 @@ -26692,6 +26709,18 @@ snapshots: tsx: 4.19.2 yaml: 2.8.0 + postcss-loader@8.1.1(@rspack/core@1.4.10(@swc/helpers@0.5.17))(postcss@8.4.49)(typescript@5.8.3)(webpack@5.100.2(esbuild@0.24.2)): + dependencies: + cosmiconfig: 9.0.0(typescript@5.8.3) + jiti: 1.21.6 + postcss: 8.4.49 + semver: 7.7.1 + optionalDependencies: + '@rspack/core': 1.4.10(@swc/helpers@0.5.17) + webpack: 5.100.2(esbuild@0.24.2) + transitivePeerDependencies: + - typescript + postcss-loader@8.1.1(@rspack/core@1.4.10(@swc/helpers@0.5.17))(postcss@8.5.6)(typescript@5.8.3)(webpack@5.100.2(@swc/core@1.13.2(@swc/helpers@0.5.17))(esbuild@0.24.2)): dependencies: cosmiconfig: 9.0.0(typescript@5.8.3) @@ -28714,8 +28743,8 @@ snapshots: tinyglobby@0.2.14: dependencies: - fdir: 6.4.6(picomatch@4.0.2) - picomatch: 4.0.2 + fdir: 6.4.6(picomatch@4.0.3) + picomatch: 4.0.3 tinypool@1.1.1: {} @@ -29353,7 +29382,7 @@ snapshots: expect-type: 1.2.2 magic-string: 0.30.17 pathe: 2.0.3 - picomatch: 4.0.2 + picomatch: 4.0.3 std-env: 3.9.0 tinybench: 2.9.0 tinyexec: 0.3.2 diff --git a/rspack/collect-typescript-info/package.json b/rspack/collect-typescript-info/package.json index 9d6fcdeaf..1b11549a7 100644 --- a/rspack/collect-typescript-info/package.json +++ b/rspack/collect-typescript-info/package.json @@ -8,7 +8,7 @@ "build": "rspack build" }, "devDependencies": { - "@rspack-canary/cli": "1.4.0-canary-f9e682fa-20250625081434", - "@rspack-canary/core": "1.4.0-canary-f9e682fa-20250625081434" + "@rspack/cli": "1.4.0", + "@rspack/core": "1.4.0" } } diff --git a/rspack/collect-typescript-info/rspack.config.mjs b/rspack/collect-typescript-info/rspack.config.mjs index b610da82e..8501dacc1 100644 --- a/rspack/collect-typescript-info/rspack.config.mjs +++ b/rspack/collect-typescript-info/rspack.config.mjs @@ -1,14 +1,13 @@ // @ts-check -/** @type {import("@rspack-canary/core").Configuration} */ +/** @type {import("@rspack/core").Configuration} */ export default { entry: { main: "./src/index.ts", }, experiments: { css: true, - inlineEnum: true, - typeReexportsPresence: true, + typeReexportsPresence: "no-tolerant", }, mode: "production", optimization: { @@ -29,7 +28,7 @@ export default { test: /\.ts$/, use: { loader: "builtin:swc-loader", - /** @type {import("@rspack-canary/core").SwcLoaderOptions} */ + /** @type {import("@rspack/core").SwcLoaderOptions} */ options: { jsc: { parser: { diff --git a/rspack/monaco-editor-ts-react/rspack.config.js b/rspack/monaco-editor-ts-react/rspack.config.js index 662a46b3d..6841b781c 100644 --- a/rspack/monaco-editor-ts-react/rspack.config.js +++ b/rspack/monaco-editor-ts-react/rspack.config.js @@ -9,7 +9,7 @@ module.exports = { hot: true, }, resolve: { - extensions: ['*', '.js', '.jsx', '.tsx', '.ts'], + extensions: ['.js', '.jsx', '.tsx', '.ts'], tsConfig: path.resolve(__dirname, 'tsconfig.json'), }, output: { @@ -31,7 +31,6 @@ module.exports = { use: { loader: 'builtin:swc-loader', options: { - sourceMap: true, jsc: { parser: { syntax: 'typescript', @@ -56,7 +55,6 @@ module.exports = { use: { loader: 'builtin:swc-loader', options: { - sourceMap: true, jsc: { parser: { syntax: 'typescript', @@ -74,5 +72,5 @@ module.exports = { new rspack.HtmlRspackPlugin({ template: './src/index.html', }), - ], + ] }; From f1c8c1cf1ef8e9ceec785c8b97eefbed91df26ad Mon Sep 17 00:00:00 2001 From: Cong-Cong Date: Fri, 1 Aug 2025 10:34:25 +0800 Subject: [PATCH 2/2] fix: ts-checker-rspack-plugin --- rspack/ts-checker-rspack-plugin/rspack.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/rspack/ts-checker-rspack-plugin/rspack.config.js b/rspack/ts-checker-rspack-plugin/rspack.config.js index 1a53b548a..62a047441 100644 --- a/rspack/ts-checker-rspack-plugin/rspack.config.js +++ b/rspack/ts-checker-rspack-plugin/rspack.config.js @@ -2,6 +2,7 @@ const { defineConfig } = require('@rspack/cli'); const { TsCheckerRspackPlugin } = require('ts-checker-rspack-plugin'); module.exports = defineConfig({ + entry: "./src/index.ts", plugins: [new TsCheckerRspackPlugin()], module: { rules: [