diff --git a/package.json b/package.json index bde6fe4..8d8172d 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "devDependencies": { "@release-it/conventional-changelog": "10.0.5", "@rollup/plugin-virtual": "3.0.2", - "@rspack/core": "1.7.7", + "@rspack/core": "2.0.2", "@types/node": "24.12.2", "@types/webpack-hot-middleware": "2.25.12", "husky": "9.1.7", @@ -51,7 +51,7 @@ "prepare": "husky" }, "peerDependencies": { - "@rspack/core": ">=1.0.0", + "@rspack/core": ">=2.0.0", "react-cosmos": "^7.1.0" }, "lint-staged": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9462a37..17fc925 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -27,8 +27,8 @@ importers: specifier: 3.0.2 version: 3.0.2 '@rspack/core': - specifier: 1.7.7 - version: 1.7.7 + specifier: 2.0.2 + version: 2.0.2 '@types/node': specifier: 24.12.2 version: 24.12.2 @@ -104,15 +104,24 @@ packages: conventional-commits-parser: optional: true + '@emnapi/core@1.10.0': + resolution: {integrity: sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==} + '@emnapi/core@1.8.1': resolution: {integrity: sha512-AvT9QFpxK0Zd8J0jopedNm+w/2fIzvtPKPjqyw9jwvBaReTTqPBk9Hixaz7KbjimP+QNz605/XnjFcDAL2pqBg==} + '@emnapi/runtime@1.10.0': + resolution: {integrity: sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==} + '@emnapi/runtime@1.8.1': resolution: {integrity: sha512-mehfKSMWjjNol8659Z8KxEMrdSJDDot5SXMq00dM8BN4o+CLNXQ0xH2V7EchNHV4RmbZLmmPdEaXZc5H2FXmDg==} '@emnapi/wasi-threads@1.1.0': resolution: {integrity: sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ==} + '@emnapi/wasi-threads@1.2.1': + resolution: {integrity: sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==} + '@inquirer/ansi@1.0.2': resolution: {integrity: sha512-S8qNSZiYzFd0wAcyG5AXCvUHC5Sr7xpZ9wZ2py9XR88jUz8wooStVx5M6dRzczbBWjic9NP7+rY0Xi7qqK/aMQ==} engines: {node: '>=18'} @@ -303,30 +312,15 @@ packages: peerDependencies: tslib: '2' - '@module-federation/error-codes@0.22.0': - resolution: {integrity: sha512-xF9SjnEy7vTdx+xekjPCV5cIHOGCkdn3pIxo9vU7gEZMIw0SvAEdsy6Uh17xaCpm8V0FWvR0SZoK9Ik6jGOaug==} - - '@module-federation/runtime-core@0.22.0': - resolution: {integrity: sha512-GR1TcD6/s7zqItfhC87zAp30PqzvceoeDGYTgF3Vx2TXvsfDrhP6Qw9T4vudDQL3uJRne6t7CzdT29YyVxlgIA==} - - '@module-federation/runtime-tools@0.22.0': - resolution: {integrity: sha512-4ScUJ/aUfEernb+4PbLdhM/c60VHl698Gn1gY21m9vyC1Ucn69fPCA1y2EwcCB7IItseRMoNhdcWQnzt/OPCNA==} - - '@module-federation/runtime@0.22.0': - resolution: {integrity: sha512-38g5iPju2tPC3KHMPxRKmy4k4onNp6ypFPS1eKGsNLUkXgHsPMBFqAjDw96iEcjri91BrahG4XcdyKi97xZzlA==} - - '@module-federation/sdk@0.22.0': - resolution: {integrity: sha512-x4aFNBKn2KVQRuNVC5A7SnrSCSqyfIWmm1DvubjbO9iKFe7ith5niw8dqSFBekYBg2Fwy+eMg4sEFNVvCAdo6g==} - - '@module-federation/webpack-bundler-runtime@0.22.0': - resolution: {integrity: sha512-aM8gCqXu+/4wBmJtVeMeeMN5guw3chf+2i6HajKtQv7SJfxV/f4IyNQJUeUQu9HfiAZHjqtMV5Lvq/Lvh8LdyA==} - - '@napi-rs/wasm-runtime@1.0.7': - resolution: {integrity: sha512-SeDnOO0Tk7Okiq6DbXmmBODgOAb9dp9gjlphokTUxmt8U3liIP1ZsozBahH69j/RJv+Rfs6IwUKHTgQYJ/HBAw==} - '@napi-rs/wasm-runtime@1.1.1': resolution: {integrity: sha512-p64ah1M1ld8xjWv3qbvFwHiFVWrq1yFvV4f7w+mzaqiR4IlSgkqhcRdHwsGgomwzBH51sRY4NEowLxnaBjcW/A==} + '@napi-rs/wasm-runtime@1.1.4': + resolution: {integrity: sha512-3NQNNgA1YSlJb/kMH1ildASP9HW7/7kYnRI2szWJaofaS1hWmbGI4H+d3+22aGzXXN9IJ+n+GiFVcGipJP18ow==} + peerDependencies: + '@emnapi/core': ^1.7.1 + '@emnapi/runtime': ^1.7.1 + '@nodelib/fs.scandir@2.1.5': resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} engines: {node: '>= 8'} @@ -629,74 +623,74 @@ packages: rollup: optional: true - '@rspack/binding-darwin-arm64@1.7.7': - resolution: {integrity: sha512-eL14fHy2JqfQ0YA5YMN2hktXhbafDSZt5kthvlBCbpQZLnYB7RP7TjHManIW/xFpnzrabvxkrLUOHhuIbWixIw==} + '@rspack/binding-darwin-arm64@2.0.2': + resolution: {integrity: sha512-0o7lbgBBsDlICWdjIH0q3e0BsSco4GRiImHWVfZSVEG+q2+ykZJvSvYCVhPM1Co375Z0S3VMPa/8SjcY1FHwlw==} cpu: [arm64] os: [darwin] - '@rspack/binding-darwin-x64@1.7.7': - resolution: {integrity: sha512-Zt+whHag/cTw1pZfRwkv11tu5LaAHy2VkvRVCsHClwrfp81PRcNJ2oRMurOUmRt1YL0mRdpRbZTh7XjGSc6gGw==} + '@rspack/binding-darwin-x64@2.0.2': + resolution: {integrity: sha512-tOwxZpoPlTlRs/w6UyUinXJ4TYRVHMlR7+eQxO1R3muKpixvhXQjtvoaY16HuFyTVky5F0IfOoWr3x9FEsgdLg==} cpu: [x64] os: [darwin] - '@rspack/binding-linux-arm64-gnu@1.7.7': - resolution: {integrity: sha512-uSq4qkvmAzSDUTKE2v4yUgHIBdTily1k3BcK5wBCGFm9OPODj5lQZpAdOHHIwu+Jxyjoa7Mb64tghhj9hZcXcA==} + '@rspack/binding-linux-arm64-gnu@2.0.2': + resolution: {integrity: sha512-1ZD4YFhG1rmgqj+W8hfwHyKV8xDxGsc/3KgU0FwmiVEX7JfzhCkgBO/xlCG79kRKSrzuVzt4icO/G3cCKn0pag==} cpu: [arm64] os: [linux] libc: [glibc] - '@rspack/binding-linux-arm64-musl@1.7.7': - resolution: {integrity: sha512-NhWCBfiu6plpmLRP6c6D5lBUaVrBr1nvjSEc7VyQF8TGh8URo2btH0wngEiX0nWvidsSlERt1l6Y5QPGuiCl1g==} + '@rspack/binding-linux-arm64-musl@2.0.2': + resolution: {integrity: sha512-/PtTkM/DsDLjeuXTmeJeRfbjCDbcL9jvoVgZrgxYFZ28y2cdLvbChbW9uigOzs5dQEs1CIBQXMTTj7KhdBTuQg==} cpu: [arm64] os: [linux] libc: [musl] - '@rspack/binding-linux-x64-gnu@1.7.7': - resolution: {integrity: sha512-aRvf8gCI7jDeEN9i4u9fY5coa3ZAyHzGVA4ZhTJCgZ5wWA5A9SQewMSq7khS1WAAFE1USlk1tUuPujnrGoYrGg==} + '@rspack/binding-linux-x64-gnu@2.0.2': + resolution: {integrity: sha512-bBjsZxMHRaPo6X9SokApm6ucs+UhXtAJFyJJyuk2BH4XJsLeCU9Dz1vMwioeohFbJUUeTASVPm6/BL+RhSaunw==} cpu: [x64] os: [linux] libc: [glibc] - '@rspack/binding-linux-x64-musl@1.7.7': - resolution: {integrity: sha512-ALPto4OT7snzXbYDyqkLfh1BvwDTTH1hPYXGUXBzQ0wEV7sXeyvxCC4yjH6B5MhR7W3tFuF4IfDy5Z4BxmOoGQ==} + '@rspack/binding-linux-x64-musl@2.0.2': + resolution: {integrity: sha512-HjlpInqzabDNkhVsUJpsHPqa9QYVWBViJoyWNjzXCAW0vKMDvwaphyUvokSinX8FGTlZi/sr5UEaHJo6XtQ35g==} cpu: [x64] os: [linux] libc: [musl] - '@rspack/binding-wasm32-wasi@1.7.7': - resolution: {integrity: sha512-7DZvUp0v75n451qfZw1ppbPakL6NAc2gjb5e9AJcOb7KUMBHNyOxqpPo/jRYKxH7isPpLfpoId79WQGGNTTMAw==} + '@rspack/binding-wasm32-wasi@2.0.2': + resolution: {integrity: sha512-YaRYNFLJRpkGfYjSWR7n9f+nQKtrlmrrffpAn/blc2geHcRvXoBc5SCs1idPtsLhj7H9qWWhs7ucjyHy4csWFg==} cpu: [wasm32] - '@rspack/binding-win32-arm64-msvc@1.7.7': - resolution: {integrity: sha512-oI08KqyVDKhq1Qi/YPMdrSLDOib0DQes9Cg67NJLZISe5UXwzvgBj7zyyKpaj8TLWnIlKSq4ITr3haRnd4lOfA==} + '@rspack/binding-win32-arm64-msvc@2.0.2': + resolution: {integrity: sha512-d/3kTEKq+asLjRFPO96t+wfWiM7DLN76VQEPDD9bc1kdsZXlVJBuvyXfsgK8bbEvKplWXYcSsokhmEnuXrLOpg==} cpu: [arm64] os: [win32] - '@rspack/binding-win32-ia32-msvc@1.7.7': - resolution: {integrity: sha512-nZ/t7XpO/+tRjK6m85an27j8FwJqpYXVSBGReZbB6dVHZiS7l6psjWkIf6A3E2umn/RjA7qvHaPH9czWkH+Fhw==} + '@rspack/binding-win32-ia32-msvc@2.0.2': + resolution: {integrity: sha512-161cWineq3RW+Jdm1FAfSpXeUtYWvhB3kAbm46vNT9h/YYz+spwsFMvveAZ1nsVSVL0IC5lDBGUte7yUAY8K2g==} cpu: [ia32] os: [win32] - '@rspack/binding-win32-x64-msvc@1.7.7': - resolution: {integrity: sha512-+XnPOC1MoeF5Qa24Z8+DCsytQP0Q9Ifdkh+XzTWgvjpFQmGAkDynHUVfscmJL/8k/nd1l/6TyXCL1EGoqa0huQ==} + '@rspack/binding-win32-x64-msvc@2.0.2': + resolution: {integrity: sha512-y7Q0S1FE+OlkL5GMqLG0PwxrPw6E1r892KhGrGKE1Vdufe5YTEx6xTPxzZ+b7N2KPD7s9G1/iJmWHQxb1+Bjkg==} cpu: [x64] os: [win32] - '@rspack/binding@1.7.7': - resolution: {integrity: sha512-9FqHG2Bl70Bd4gUmwA+3xUx4pYphdLO9ToIm9iMWbBINyArME0XboZg4FoEdU13LqndkWqaamkE613BR0lRF3g==} + '@rspack/binding@2.0.2': + resolution: {integrity: sha512-0kZPplW9GWx8mfC6DfsaRY3QBIYPuUs42JfmSM6aSb8tMHZAXQeLeMB8M+h8i4SeI+aFtCgO6UuYGtyWf7+L+A==} - '@rspack/core@1.7.7': - resolution: {integrity: sha512-efwVXxAA9eYgLtYX53zcuuex6Wr8DnOXeIw3JFoA8EuyN7TINGqnvkuGDuE+F9XQxQ3KBzVueiYdMK42sVTyUw==} - engines: {node: '>=18.12.0'} + '@rspack/core@2.0.2': + resolution: {integrity: sha512-VM3UHOo26uC+4QSqY5tU1ybI7KuXY5rTof8nhFOaBY9SYau0Smvr+hMSAPmrmHwknB6dXT8yaNVxrj7I+qxE1Q==} + engines: {node: ^20.19.0 || >=22.12.0} peerDependencies: + '@module-federation/runtime-tools': ^0.24.1 || ^2.0.0 '@swc/helpers': '>=0.5.1' peerDependenciesMeta: + '@module-federation/runtime-tools': + optional: true '@swc/helpers': optional: true - '@rspack/lite-tapable@1.1.0': - resolution: {integrity: sha512-E2B0JhYFmVAwdDiG14+DW0Di4Ze4Jg10Pc4/lILUrd5DRCaklduz2OvJ5HYQ6G+hd+WTzqQb3QnDNfK4yvAFYw==} - '@simple-libs/child-process-utils@1.0.2': resolution: {integrity: sha512-/4R8QKnd/8agJynkNdJmNw2MBxuFTRcNFnE5Sg/G+jkSsV8/UBgULMzhizWWW42p8L5H7flImV2ATi79Ove2Tw==} engines: {node: '>=18'} @@ -2683,12 +2677,23 @@ snapshots: conventional-commits-filter: 5.0.0 conventional-commits-parser: 6.3.0 + '@emnapi/core@1.10.0': + dependencies: + '@emnapi/wasi-threads': 1.2.1 + tslib: 2.6.3 + optional: true + '@emnapi/core@1.8.1': dependencies: '@emnapi/wasi-threads': 1.1.0 tslib: 2.6.3 optional: true + '@emnapi/runtime@1.10.0': + dependencies: + tslib: 2.6.3 + optional: true + '@emnapi/runtime@1.8.1': dependencies: tslib: 2.6.3 @@ -2699,6 +2704,11 @@ snapshots: tslib: 2.6.3 optional: true + '@emnapi/wasi-threads@1.2.1': + dependencies: + tslib: 2.6.3 + optional: true + '@inquirer/ansi@1.0.2': {} '@inquirer/checkbox@4.3.2(@types/node@24.12.2)': @@ -2887,42 +2897,17 @@ snapshots: '@jsonjoy.com/codegen': 1.0.0(tslib@2.6.3) tslib: 2.6.3 - '@module-federation/error-codes@0.22.0': {} - - '@module-federation/runtime-core@0.22.0': - dependencies: - '@module-federation/error-codes': 0.22.0 - '@module-federation/sdk': 0.22.0 - - '@module-federation/runtime-tools@0.22.0': - dependencies: - '@module-federation/runtime': 0.22.0 - '@module-federation/webpack-bundler-runtime': 0.22.0 - - '@module-federation/runtime@0.22.0': - dependencies: - '@module-federation/error-codes': 0.22.0 - '@module-federation/runtime-core': 0.22.0 - '@module-federation/sdk': 0.22.0 - - '@module-federation/sdk@0.22.0': {} - - '@module-federation/webpack-bundler-runtime@0.22.0': - dependencies: - '@module-federation/runtime': 0.22.0 - '@module-federation/sdk': 0.22.0 - - '@napi-rs/wasm-runtime@1.0.7': + '@napi-rs/wasm-runtime@1.1.1': dependencies: '@emnapi/core': 1.8.1 '@emnapi/runtime': 1.8.1 '@tybys/wasm-util': 0.10.1 optional: true - '@napi-rs/wasm-runtime@1.1.1': + '@napi-rs/wasm-runtime@1.1.4(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)': dependencies: - '@emnapi/core': 1.8.1 - '@emnapi/runtime': 1.8.1 + '@emnapi/core': 1.10.0 + '@emnapi/runtime': 1.10.0 '@tybys/wasm-util': 0.10.1 optional: true @@ -3143,58 +3128,56 @@ snapshots: '@rollup/plugin-virtual@3.0.2': {} - '@rspack/binding-darwin-arm64@1.7.7': + '@rspack/binding-darwin-arm64@2.0.2': optional: true - '@rspack/binding-darwin-x64@1.7.7': + '@rspack/binding-darwin-x64@2.0.2': optional: true - '@rspack/binding-linux-arm64-gnu@1.7.7': + '@rspack/binding-linux-arm64-gnu@2.0.2': optional: true - '@rspack/binding-linux-arm64-musl@1.7.7': + '@rspack/binding-linux-arm64-musl@2.0.2': optional: true - '@rspack/binding-linux-x64-gnu@1.7.7': + '@rspack/binding-linux-x64-gnu@2.0.2': optional: true - '@rspack/binding-linux-x64-musl@1.7.7': + '@rspack/binding-linux-x64-musl@2.0.2': optional: true - '@rspack/binding-wasm32-wasi@1.7.7': + '@rspack/binding-wasm32-wasi@2.0.2': dependencies: - '@napi-rs/wasm-runtime': 1.0.7 + '@emnapi/core': 1.10.0 + '@emnapi/runtime': 1.10.0 + '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0) optional: true - '@rspack/binding-win32-arm64-msvc@1.7.7': + '@rspack/binding-win32-arm64-msvc@2.0.2': optional: true - '@rspack/binding-win32-ia32-msvc@1.7.7': + '@rspack/binding-win32-ia32-msvc@2.0.2': optional: true - '@rspack/binding-win32-x64-msvc@1.7.7': + '@rspack/binding-win32-x64-msvc@2.0.2': optional: true - '@rspack/binding@1.7.7': + '@rspack/binding@2.0.2': optionalDependencies: - '@rspack/binding-darwin-arm64': 1.7.7 - '@rspack/binding-darwin-x64': 1.7.7 - '@rspack/binding-linux-arm64-gnu': 1.7.7 - '@rspack/binding-linux-arm64-musl': 1.7.7 - '@rspack/binding-linux-x64-gnu': 1.7.7 - '@rspack/binding-linux-x64-musl': 1.7.7 - '@rspack/binding-wasm32-wasi': 1.7.7 - '@rspack/binding-win32-arm64-msvc': 1.7.7 - '@rspack/binding-win32-ia32-msvc': 1.7.7 - '@rspack/binding-win32-x64-msvc': 1.7.7 - - '@rspack/core@1.7.7': - dependencies: - '@module-federation/runtime-tools': 0.22.0 - '@rspack/binding': 1.7.7 - '@rspack/lite-tapable': 1.1.0 - - '@rspack/lite-tapable@1.1.0': {} + '@rspack/binding-darwin-arm64': 2.0.2 + '@rspack/binding-darwin-x64': 2.0.2 + '@rspack/binding-linux-arm64-gnu': 2.0.2 + '@rspack/binding-linux-arm64-musl': 2.0.2 + '@rspack/binding-linux-x64-gnu': 2.0.2 + '@rspack/binding-linux-x64-musl': 2.0.2 + '@rspack/binding-wasm32-wasi': 2.0.2 + '@rspack/binding-win32-arm64-msvc': 2.0.2 + '@rspack/binding-win32-ia32-msvc': 2.0.2 + '@rspack/binding-win32-x64-msvc': 2.0.2 + + '@rspack/core@2.0.2': + dependencies: + '@rspack/binding': 2.0.2 '@simple-libs/child-process-utils@1.0.2': dependencies: diff --git a/src/server/rspackConfig/getDefaultRspackConfig.ts b/src/server/rspackConfig/getDefaultRspackConfig.ts index 05830fe..86754f8 100644 --- a/src/server/rspackConfig/getDefaultRspackConfig.ts +++ b/src/server/rspackConfig/getDefaultRspackConfig.ts @@ -91,9 +91,6 @@ export function getDefaultRspackConfig(rootDir: string): Configuration { builtAt: true, }, infrastructureLogging: { level: 'warn' }, - experiments: { - topLevelAwait: true, - }, }; return { diff --git a/src/server/rspackConfig/getDevRspackConfig.ts b/src/server/rspackConfig/getDevRspackConfig.ts index 2bd2718..0b15b1a 100644 --- a/src/server/rspackConfig/getDevRspackConfig.ts +++ b/src/server/rspackConfig/getDevRspackConfig.ts @@ -14,7 +14,6 @@ import { ignoreEmptyRspackPlugins, } from './plugins.js'; import { resolveRspackClientPath } from './resolveRspackClientPath.js'; -import { ensureRspackConfigTopLevelAwait } from './rspackConfigTopLevelAwait.js'; export async function getDevRspackConfig( config: CosmosConfig, @@ -29,7 +28,6 @@ export async function getDevRspackConfig( module: getRspackConfigModule(config, baseRspackConfig, 'dev'), resolve: getRspackConfigResolve(config, baseRspackConfig), plugins: getPlugins(config, baseRspackConfig, userRspack), - experiments: getExperiments(baseRspackConfig), }; // The following comment is from react-cosmos-plugin-webpack and likely @@ -99,7 +97,3 @@ function getHotMiddlewareEntry(reloadOnFail: boolean) { const clientPath = resolve('webpack-hot-middleware/client'); return `${clientPath}?reload=${reloadOnFail}&overlay=false`; } - -function getExperiments(baseWebpackConfig: Configuration) { - return ensureRspackConfigTopLevelAwait(baseWebpackConfig); -} diff --git a/src/server/rspackConfig/getExportRspackConfig.ts b/src/server/rspackConfig/getExportRspackConfig.ts index 8a491a9..7a485d0 100644 --- a/src/server/rspackConfig/getExportRspackConfig.ts +++ b/src/server/rspackConfig/getExportRspackConfig.ts @@ -9,7 +9,6 @@ import { getRspackConfigResolve } from './getRspackConfigResolve.js'; import { ensureHtmlPlugin } from './htmlPlugin.js'; import { getGlobalsPlugin, ignoreEmptyRspackPlugins } from './plugins.js'; import { resolveRspackClientPath } from './resolveRspackClientPath.js'; -import { ensureRspackConfigTopLevelAwait } from './rspackConfigTopLevelAwait.js'; export async function getExportRspackConfig( config: CosmosConfig, @@ -23,7 +22,6 @@ export async function getExportRspackConfig( module: getRspackConfigModule(config, baseRspackConfig, 'export'), resolve: getRspackConfigResolve(config, baseRspackConfig), plugins: getPlugins(config, baseRspackConfig, userRspack), - experiments: getExperiments(baseRspackConfig), }; } @@ -63,7 +61,3 @@ function getPlugins( noEmitErrorsPlugin, ]); } - -function getExperiments(baseWebpackConfig: Configuration) { - return ensureRspackConfigTopLevelAwait(baseWebpackConfig); -} diff --git a/src/server/rspackConfig/plugins.ts b/src/server/rspackConfig/plugins.ts index 3990e17..d6f37d0 100644 --- a/src/server/rspackConfig/plugins.ts +++ b/src/server/rspackConfig/plugins.ts @@ -1,5 +1,10 @@ import type { CosmosConfig } from 'react-cosmos'; -import type rspack from '@rspack/core'; +import type { + Configuration, + rspack, + RspackPluginFunction, + RspackPluginInstance, +} from '@rspack/core'; import { getRspackNodeEnv } from './getRspackNodeEnv.js'; @@ -18,7 +23,7 @@ export function getGlobalsPlugin( } export function hasPlugin( - plugins: void | rspack.RspackPluginInstance[], + plugins: void | RspackPluginInstance[], pluginName: string ) { return ( @@ -28,17 +33,17 @@ export function hasPlugin( } export function isInstanceOfRspackPlugin( - plugin: rspack.RspackPluginInstance, + plugin: RspackPluginInstance, constructorName: string ) { return plugin.constructor && plugin.constructor.name === constructorName; } export function ignoreEmptyRspackPlugins( - plugins: rspack.Configuration['plugins'] = [] + plugins: Configuration['plugins'] = [] ) { return plugins.filter(Boolean) as Array< - rspack.RspackPluginInstance | rspack.RspackPluginFunction + RspackPluginInstance | RspackPluginFunction >; } diff --git a/src/server/rspackConfig/rspackConfigTopLevelAwait.ts b/src/server/rspackConfig/rspackConfigTopLevelAwait.ts deleted file mode 100644 index 1f88867..0000000 --- a/src/server/rspackConfig/rspackConfigTopLevelAwait.ts +++ /dev/null @@ -1,12 +0,0 @@ -import type { Configuration } from '@rspack/core'; - -export function ensureRspackConfigTopLevelAwait( - baseWebpackConfig: Configuration -): Configuration['experiments'] { - const experiments = baseWebpackConfig.experiments || {}; - if (!experiments.topLevelAwait) { - experiments.topLevelAwait = true; - } - - return experiments; -}