From cacb973326b6b1b2b6dd0b015f7fb6f43e4b77cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Lorber?= Date: Fri, 3 Jan 2025 14:23:26 +0100 Subject: [PATCH] feat(core): Turn Rspack incremental on by default (again) (#10800) --- packages/docusaurus-faster/package.json | 2 +- packages/docusaurus/src/webpack/base.ts | 10 +- project-words.txt | 2 + yarn.lock | 187 +++++++++++++----------- 4 files changed, 108 insertions(+), 93 deletions(-) diff --git a/packages/docusaurus-faster/package.json b/packages/docusaurus-faster/package.json index 05059cdf6c12..75ebca5ad8c4 100644 --- a/packages/docusaurus-faster/package.json +++ b/packages/docusaurus-faster/package.json @@ -19,7 +19,7 @@ "license": "MIT", "dependencies": { "@docusaurus/types": "3.6.3", - "@rspack/core": "^1.1.1", + "@rspack/core": "1.2.0-alpha.0", "@swc/core": "^1.7.39", "@swc/html": "^1.7.39", "browserslist": "^4.24.2", diff --git a/packages/docusaurus/src/webpack/base.ts b/packages/docusaurus/src/webpack/base.ts index 4dce834d9075..9f6c2ae08572 100644 --- a/packages/docusaurus/src/webpack/base.ts +++ b/packages/docusaurus/src/webpack/base.ts @@ -146,11 +146,11 @@ export async function createBaseConfig({ // See https://rspack.dev/config/experiments#experimentsincremental // Produces warnings in production builds // See https://github.com/web-infra-dev/rspack/pull/8311#issuecomment-2476014664 - // @ts-expect-error: Rspack-only - // incremental: !isProd, - // TODO restore incremental mode in dev + opt-in/opt-out flag? - // temporarily disabled due to https://github.com/facebook/docusaurus/issues/10646#issuecomment-2490675451 - incremental: undefined, + // We use the same integration as Rspress, with ability to disable + // See https://github.com/web-infra-dev/rspress/pull/1631 + // See https://github.com/facebook/docusaurus/issues/10646 + // @ts-expect-error: Rspack-only, not available in Webpack typedefs + incremental: !isProd && !process.env.DISABLE_RSPACK_INCREMENTAL, }; } return undefined; diff --git a/project-words.txt b/project-words.txt index 654d92dfc661..5008aa3790f0 100644 --- a/project-words.txt +++ b/project-words.txt @@ -279,6 +279,8 @@ Rsdoctor RSDOCTOR rspack Rspack +RSPACK +Rspress rtcts saurus Scaleway diff --git a/yarn.lock b/yarn.lock index f0bf31f99372..71f2c3d1cc6b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2526,33 +2526,41 @@ dependencies: langium "3.0.0" -"@module-federation/runtime-tools@0.5.1": - version "0.5.1" - resolved "https://registry.yarnpkg.com/@module-federation/runtime-tools/-/runtime-tools-0.5.1.tgz#1b1f93837159a6bf0c0ba78730d589a5a8f74aa3" - integrity sha512-nfBedkoZ3/SWyO0hnmaxuz0R0iGPSikHZOAZ0N/dVSQaIzlffUo35B5nlC2wgWIc0JdMZfkwkjZRrnuuDIJbzg== +"@module-federation/error-codes@0.8.4": + version "0.8.4" + resolved "https://registry.yarnpkg.com/@module-federation/error-codes/-/error-codes-0.8.4.tgz#c66ead0da86bc010fa53187462c704b3e0d5a256" + integrity sha512-55LYmrDdKb4jt+qr8qE8U3al62ZANp3FhfVaNPOaAmdTh0jHdD8M3yf5HKFlr5xVkVO4eV/F/J2NCfpbh+pEXQ== + +"@module-federation/runtime-tools@0.8.4": + version "0.8.4" + resolved "https://registry.yarnpkg.com/@module-federation/runtime-tools/-/runtime-tools-0.8.4.tgz#ddf8461fe9b5d5e962511f4e5b622008ee46bde8" + integrity sha512-fjVOsItJ1u5YY6E9FnS56UDwZgqEQUrWFnouRiPtK123LUuqUI9FH4redZoKWlE1PB0ir1Z3tnqy8eFYzPO38Q== dependencies: - "@module-federation/runtime" "0.5.1" - "@module-federation/webpack-bundler-runtime" "0.5.1" + "@module-federation/runtime" "0.8.4" + "@module-federation/webpack-bundler-runtime" "0.8.4" -"@module-federation/runtime@0.5.1": - version "0.5.1" - resolved "https://registry.yarnpkg.com/@module-federation/runtime/-/runtime-0.5.1.tgz#b548a75e2068952ff66ad717cbf73fc921edd5d7" - integrity sha512-xgiMUWwGLWDrvZc9JibuEbXIbhXg6z2oUkemogSvQ4LKvrl/n0kbqP1Blk669mXzyWbqtSp6PpvNdwaE1aN5xQ== +"@module-federation/runtime@0.8.4": + version "0.8.4" + resolved "https://registry.yarnpkg.com/@module-federation/runtime/-/runtime-0.8.4.tgz#7fc63e1b7dda0506bb2a70c1a52aa73513c5b508" + integrity sha512-yZeZ7z2Rx4gv/0E97oLTF3V6N25vglmwXGgoeju/W2YjsFvWzVtCDI7zRRb0mJhU6+jmSM8jP1DeQGbea/AiZQ== dependencies: - "@module-federation/sdk" "0.5.1" + "@module-federation/error-codes" "0.8.4" + "@module-federation/sdk" "0.8.4" -"@module-federation/sdk@0.5.1": - version "0.5.1" - resolved "https://registry.yarnpkg.com/@module-federation/sdk/-/sdk-0.5.1.tgz#6c0a4053c23fa84db7aae7e4736496c541de7191" - integrity sha512-exvchtjNURJJkpqjQ3/opdbfeT2wPKvrbnGnyRkrwW5o3FH1LaST1tkiNviT6OXTexGaVc2DahbdniQHVtQ7pA== +"@module-federation/sdk@0.8.4": + version "0.8.4" + resolved "https://registry.yarnpkg.com/@module-federation/sdk/-/sdk-0.8.4.tgz#956e178e104d640482e5afe93c7e3a095a589807" + integrity sha512-waABomIjg/5m1rPDBWYG4KUhS5r7OUUY7S+avpaVIY/tkPWB3ibRDKy2dNLLAMaLKq0u+B1qIdEp4NIWkqhqpg== + dependencies: + isomorphic-rslog "0.0.6" -"@module-federation/webpack-bundler-runtime@0.5.1": - version "0.5.1" - resolved "https://registry.yarnpkg.com/@module-federation/webpack-bundler-runtime/-/webpack-bundler-runtime-0.5.1.tgz#ef626af0d57e3568c474d66d7d3797366e09cafd" - integrity sha512-mMhRFH0k2VjwHt3Jol9JkUsmI/4XlrAoBG3E0o7HoyoPYv1UFOWyqAflfANcUPgbYpvqmyLzDcO+3IT36LXnrA== +"@module-federation/webpack-bundler-runtime@0.8.4": + version "0.8.4" + resolved "https://registry.yarnpkg.com/@module-federation/webpack-bundler-runtime/-/webpack-bundler-runtime-0.8.4.tgz#c01f5a5c5d61664c21ac6c479ebe9d8bf09d22d6" + integrity sha512-HggROJhvHPUX7uqBD/XlajGygMNM1DG0+4OAkk8MBQe4a18QzrRNzZt6XQbRTSG4OaEoyRWhQHvYD3Yps405tQ== dependencies: - "@module-federation/runtime" "0.5.1" - "@module-federation/sdk" "0.5.1" + "@module-federation/runtime" "0.8.4" + "@module-federation/sdk" "0.8.4" "@netlify/functions@^1.6.0": version "1.6.0" @@ -3208,73 +3216,73 @@ fs-extra "^11.1.1" lodash "^4.17.21" -"@rspack/binding-darwin-arm64@1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@rspack/binding-darwin-arm64/-/binding-darwin-arm64-1.1.1.tgz#e03df97bebab2ef6ccbbef940c8ef092b37c8336" - integrity sha512-BnvGPWObGZ2ZVnxe4K3NKwAWxYubOJvfwporXWD3NgkzeV5xJqGBFWRDnr/nfsFpgCTI8goxK5db/wb7NVzLqg== - -"@rspack/binding-darwin-x64@1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@rspack/binding-darwin-x64/-/binding-darwin-x64-1.1.1.tgz#ce3893eee19e4f43b27e56b0fd2737b97efd69c0" - integrity sha512-aiwJRkPGAg99vCrG/C9I87Fh9TShOAkzpf2yeJEZL4gwTj9A8wrc/xlrCFn1BDkbPnGYz62oCR7z6JLIDgYLuA== - -"@rspack/binding-linux-arm64-gnu@1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@rspack/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.1.1.tgz#b9ba4d0cfc39fec5c2db9d3f75327c3b8a383e96" - integrity sha512-2Z8YxH4+V0MiNhVQ2IFELDIFtykIdKgmOmGr/PuRQMHMxSn8AKo5uqBD30sZqe0+gryplZwK3hyrBETHOmSltQ== - -"@rspack/binding-linux-arm64-musl@1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@rspack/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.1.1.tgz#bb98d98d703c6a0c69489975821a3d3236fa91cf" - integrity sha512-l+cJd3wAxBt523Min7qN+G5s3SU0rif9Yq2AFWWl+R6IvmnMlMq6sAAyiyogUidFmJ5XIKSJJBTBnvLF3g4ezg== - -"@rspack/binding-linux-x64-gnu@1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@rspack/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.1.1.tgz#17d7ceac270ffc5980a16e31badef68136b31d51" - integrity sha512-goaDDrXNulR7FcvUfj8AjhF3g7IXUttjQ4QsfY2xz7s20tDETlq5HpcM2A8GEI6lqkPAv/ITU0AynLK7bfyr4A== - -"@rspack/binding-linux-x64-musl@1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@rspack/binding-linux-x64-musl/-/binding-linux-x64-musl-1.1.1.tgz#bfc6363ae73ffd04e7af00f134d640ec0407a730" - integrity sha512-T4RRn9ycxUHAfZJpfNRy+DdfevTXIZqox+NNg/N3d+Pqj5QS3zqpHBfPLC2mIIN1dw55BoshRIP2C1hUG0Fk6g== - -"@rspack/binding-win32-arm64-msvc@1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@rspack/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.1.1.tgz#efbd8c90d0097907104da2f5d75416655cfb0f60" - integrity sha512-FHIPpueFc/+vWdZeVWRYWW0Z0IsDIHy+WhWxITeLjOVGsUN4rhaztYOausD7WsOlOhmR0SddeOYtRs/BR35wig== - -"@rspack/binding-win32-ia32-msvc@1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@rspack/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-1.1.1.tgz#73f7c78bb4398e009708e6523e20222967ec9568" - integrity sha512-pgXE45ATK/Iil/oXlqaGoWZ0x3SoQk4dAjJGK7TzQuek6UEoJbLQL+W1ufe/iUxz67ICAmUvq5NH2ftOhEE2SA== - -"@rspack/binding-win32-x64-msvc@1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@rspack/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.1.1.tgz#5b65e210d9a0dc042059399469ca5beeea54b1ee" - integrity sha512-z/kdbB+uhMi+H4podjTE7bfUpahACUuPOZPUtAAA6PMgRyiigBTK5UFYN35D30MONwZP4yNiLvPjurwiLw7EpA== - -"@rspack/binding@1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@rspack/binding/-/binding-1.1.1.tgz#e37e0c34e723655775d33a72ba663c84a1310c0f" - integrity sha512-BRFliHbErqWrUo9X9bdik9WTRi6EgrJSQbbUiVeIYgW4gzYdfHUohgTkWo2Byu36LZolKrEjq/Uq2A8q/tc0YA== +"@rspack/binding-darwin-arm64@1.2.0-alpha.0": + version "1.2.0-alpha.0" + resolved "https://registry.yarnpkg.com/@rspack/binding-darwin-arm64/-/binding-darwin-arm64-1.2.0-alpha.0.tgz#234a0c42f6e89a2589f53ad8c44b2e85638bc77b" + integrity sha512-EPprIe6BrkJ9XuWL5HBXJFaH4vvt5C2kBTvyu+t5E3wacyH9A0gIDaMOEmH30Kt3zl4B07OCBC1nCiJ1sTtimw== + +"@rspack/binding-darwin-x64@1.2.0-alpha.0": + version "1.2.0-alpha.0" + resolved "https://registry.yarnpkg.com/@rspack/binding-darwin-x64/-/binding-darwin-x64-1.2.0-alpha.0.tgz#b40778afa61292e543c812d9790e852c52145aef" + integrity sha512-ACwdgWg0V9j0o3gs1wvhqRJ4xui82L+Fii9Fa74az7P974iWO0ZHw4QIUaO5r434+v9OWMqpyBRN1M7cBrx3GA== + +"@rspack/binding-linux-arm64-gnu@1.2.0-alpha.0": + version "1.2.0-alpha.0" + resolved "https://registry.yarnpkg.com/@rspack/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.2.0-alpha.0.tgz#d9bdbc5835a7c69afc646c221a58ff7a0f0671fa" + integrity sha512-Ex9SviDikz9E36R4I5si/626FsYOJ35l1Lb+DCRUijjjsvoq4k8Shi8csyBfubR+JZ1M0uOXjJftu1Gm5z8Q0Q== + +"@rspack/binding-linux-arm64-musl@1.2.0-alpha.0": + version "1.2.0-alpha.0" + resolved "https://registry.yarnpkg.com/@rspack/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.2.0-alpha.0.tgz#e774394097e711a2791e29842d21a2e65730a335" + integrity sha512-U320xZmTcTwQ0BR8yIzE1L4olMCqzYkT3VFjXPR6iok/Mj0xjfk/SiKhLoZml473qQrHSGaFJ321cp02zgTFJg== + +"@rspack/binding-linux-x64-gnu@1.2.0-alpha.0": + version "1.2.0-alpha.0" + resolved "https://registry.yarnpkg.com/@rspack/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.2.0-alpha.0.tgz#8393f4c423403fe2d1958ed8a916f189676a6e47" + integrity sha512-GNur7VXJ29NtJhY8PYgv3Fv1Zxbx0XZhDUj/+7Wp40CAXRFsLgXScZIRh2U30TECYaihboZ7BD+xugv8MQPDoA== + +"@rspack/binding-linux-x64-musl@1.2.0-alpha.0": + version "1.2.0-alpha.0" + resolved "https://registry.yarnpkg.com/@rspack/binding-linux-x64-musl/-/binding-linux-x64-musl-1.2.0-alpha.0.tgz#5685699b5679dcbba47722ed8b278896247da777" + integrity sha512-0IdswzpG9+sgxvGu7KTwSeqfV0hvciaHMoZvGklfZa2txpcUqAg4ASp7uxrNaUo+G2a1fTUMOtP9351Cnl8DBg== + +"@rspack/binding-win32-arm64-msvc@1.2.0-alpha.0": + version "1.2.0-alpha.0" + resolved "https://registry.yarnpkg.com/@rspack/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.2.0-alpha.0.tgz#4af6243595e394ba6f5349c6ae7f7f6575256d55" + integrity sha512-FcFgoWGjSrCfJwDZY5bDA2aO02l5BP7qdyW6ehjwBiMxNZyeSbGvKz3jXl5TtTHR1IgdLzi9kEJkTPYLLMiE1A== + +"@rspack/binding-win32-ia32-msvc@1.2.0-alpha.0": + version "1.2.0-alpha.0" + resolved "https://registry.yarnpkg.com/@rspack/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-1.2.0-alpha.0.tgz#7761f5aa4eb7a7ff4e0874a3481ba38dcd8b1759" + integrity sha512-cZYFJw6DKCaPPz9VDJPndZ9KSp+/eedgt11Mv8OTpq+MJTUjB2HjtcjqJh8xxVcp3IuwvSMndTkC69WWt/4feA== + +"@rspack/binding-win32-x64-msvc@1.2.0-alpha.0": + version "1.2.0-alpha.0" + resolved "https://registry.yarnpkg.com/@rspack/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.2.0-alpha.0.tgz#c3ba42ed10bb6156b6cca59a6fb1512acad6f0fa" + integrity sha512-gfOqb/rq5716NV+Vbk5MteBhV4VhJeSoh2+dRQjdy4EN1wPZ+Uebs9ORVrT9uRjY3JrPn/5PkAHJXtgaOA9Uyg== + +"@rspack/binding@1.2.0-alpha.0": + version "1.2.0-alpha.0" + resolved "https://registry.yarnpkg.com/@rspack/binding/-/binding-1.2.0-alpha.0.tgz#24f2239b02cff6876edac382588d42ec2f980121" + integrity sha512-rtmDScjtGUxv1zA1m3jXecuX2LsgNp4aWaAjOowHasoO1YqfHK0fMyprCiPowTjoHtpZ7Xt/tnMhii0GlGIITQ== optionalDependencies: - "@rspack/binding-darwin-arm64" "1.1.1" - "@rspack/binding-darwin-x64" "1.1.1" - "@rspack/binding-linux-arm64-gnu" "1.1.1" - "@rspack/binding-linux-arm64-musl" "1.1.1" - "@rspack/binding-linux-x64-gnu" "1.1.1" - "@rspack/binding-linux-x64-musl" "1.1.1" - "@rspack/binding-win32-arm64-msvc" "1.1.1" - "@rspack/binding-win32-ia32-msvc" "1.1.1" - "@rspack/binding-win32-x64-msvc" "1.1.1" - -"@rspack/core@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@rspack/core/-/core-1.1.1.tgz#69f795225e31f51dff6b0ccfcebcc07accdac4c8" - integrity sha512-khYNAho2evyc7N5mYk4K6B587ou/dN1CDCqWrSDeZZNFFQHtuEp5T3kL1ntsKY7agObQhI60osCYaxFUPs0yww== - dependencies: - "@module-federation/runtime-tools" "0.5.1" - "@rspack/binding" "1.1.1" + "@rspack/binding-darwin-arm64" "1.2.0-alpha.0" + "@rspack/binding-darwin-x64" "1.2.0-alpha.0" + "@rspack/binding-linux-arm64-gnu" "1.2.0-alpha.0" + "@rspack/binding-linux-arm64-musl" "1.2.0-alpha.0" + "@rspack/binding-linux-x64-gnu" "1.2.0-alpha.0" + "@rspack/binding-linux-x64-musl" "1.2.0-alpha.0" + "@rspack/binding-win32-arm64-msvc" "1.2.0-alpha.0" + "@rspack/binding-win32-ia32-msvc" "1.2.0-alpha.0" + "@rspack/binding-win32-x64-msvc" "1.2.0-alpha.0" + +"@rspack/core@1.2.0-alpha.0": + version "1.2.0-alpha.0" + resolved "https://registry.yarnpkg.com/@rspack/core/-/core-1.2.0-alpha.0.tgz#942fd797b923215c6b8826a1573c0db09504a0e3" + integrity sha512-YiD0vFDj+PfHs3ZqJwPNhTYyVTb4xR6FpOI5WJ4jJHV4lgdErS+RChTCPhf1xeqxfuTSSnFA7UeqosLhBuNSqQ== + dependencies: + "@module-federation/runtime-tools" "0.8.4" + "@rspack/binding" "1.2.0-alpha.0" "@rspack/lite-tapable" "1.0.1" caniuse-lite "^1.0.30001616" @@ -10511,6 +10519,11 @@ isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== +isomorphic-rslog@0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/isomorphic-rslog/-/isomorphic-rslog-0.0.6.tgz#abf13c77b545b03e5ab3bc376e6de720e07eb190" + integrity sha512-HM0q6XqQ93psDlqvuViNs/Ea3hAyGDkIdVAHlrEocjjAwGrs1fZ+EdQjS9eUPacnYB7Y8SoDdSY3H8p3ce205A== + istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"