From aed01a16d54f646bccf690b5c8a893317dedbf2a Mon Sep 17 00:00:00 2001 From: sebastien Date: Thu, 26 Dec 2024 16:55:54 +0100 Subject: [PATCH] Turn Rspack incremental on by default (again) --- packages/docusaurus-faster/package.json | 2 +- packages/docusaurus/src/webpack/base.ts | 10 +-- yarn.lock | 110 ++++++++++++------------ 3 files changed, 61 insertions(+), 61 deletions(-) diff --git a/packages/docusaurus-faster/package.json b/packages/docusaurus-faster/package.json index 05059cdf6c12..62062b73eabc 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.1.8", "@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/yarn.lock b/yarn.lock index f0bf31f99372..60f9faf25c9b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3208,73 +3208,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-arm64@1.1.8": + version "1.1.8" + resolved "https://registry.yarnpkg.com/@rspack/binding-darwin-arm64/-/binding-darwin-arm64-1.1.8.tgz#aedce2a27148a2454c0a931030467415c0df042d" + integrity sha512-I7avr471ghQ3LAqKm2fuXuJPLgQ9gffn5Q4nHi8rsukuZUtiLDPfYzK1QuupEp2JXRWM1gG5lIbSUOht3cD6Ug== -"@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-darwin-x64@1.1.8": + version "1.1.8" + resolved "https://registry.yarnpkg.com/@rspack/binding-darwin-x64/-/binding-darwin-x64-1.1.8.tgz#42bc8578bdfa00105487186ae8f45b3f7872820b" + integrity sha512-vfqf/c+mcx8rr1M8LnqKmzDdnrgguflZnjGerBLjNerAc+dcUp3lCvNxRIvZ2TkSZZBW8BpCMgjj3n70CZ4VLQ== -"@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-gnu@1.1.8": + version "1.1.8" + resolved "https://registry.yarnpkg.com/@rspack/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.1.8.tgz#1012dccfb20653c977d3ead4666357937d068f9d" + integrity sha512-lZlO/rAJSeozi+qtVLkGSXfe+riPawCwM4FsrflELfNlvvEXpANwtrdJ+LsaNVXcgvhh50ZX2KicTdmx9G2b6Q== -"@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-arm64-musl@1.1.8": + version "1.1.8" + resolved "https://registry.yarnpkg.com/@rspack/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.1.8.tgz#ff8a1cbe532bbf9a4ae8cf73bd949e773f16a9a9" + integrity sha512-bX7exULSZwy8xtDh6Z65b6sRC4uSxGuyvSLCEKyhmG6AnJkg0gQMxk3hoO0hWnyGEZgdJEn+jEhk0fjl+6ZRAQ== -"@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-gnu@1.1.8": + version "1.1.8" + resolved "https://registry.yarnpkg.com/@rspack/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.1.8.tgz#bdec8ba27e764a926a7f27b90d2da6507558bc68" + integrity sha512-2Prw2USgTJ3aLdLExfik8pAwAHbX4MZrACBGEmR7Vbb56kLjC+++fXkciRc50pUDK4JFr1VQ7eNZrJuDR6GG6Q== -"@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-linux-x64-musl@1.1.8": + version "1.1.8" + resolved "https://registry.yarnpkg.com/@rspack/binding-linux-x64-musl/-/binding-linux-x64-musl-1.1.8.tgz#3abaf3e513ed7e3481225293d235f41f4ab0ae8d" + integrity sha512-bnVGB/mQBKEdzOU/CPmcOE3qEXxGOGGW7/i6iLl2MamVOykJq8fYjL9j86yi6L0r009ja16OgWckykQGc4UqGw== -"@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-arm64-msvc@1.1.8": + version "1.1.8" + resolved "https://registry.yarnpkg.com/@rspack/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.1.8.tgz#5c63ffb726ac2d5ea87c36da11f30fd42c7601bc" + integrity sha512-u+na3gxhzeksm4xZyAzn1+XWo5a5j7hgWA/KcFPDQ8qQNkRknx4jnQMxVtcZ9pLskAYV4AcOV/AIximx7zvv8A== -"@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-ia32-msvc@1.1.8": + version "1.1.8" + resolved "https://registry.yarnpkg.com/@rspack/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-1.1.8.tgz#25d41f41a68c84c74f8cd862c53c3110b2c034f3" + integrity sha512-FijUxym1INd5fFHwVCLuVP8XEAb4Sk1sMwEEQUlugiDra9ZsLaPw4OgPGxbxkD6SB0DeUz9Zq46Xbcf6d3OgfA== -"@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-win32-x64-msvc@1.1.8": + version "1.1.8" + resolved "https://registry.yarnpkg.com/@rspack/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.1.8.tgz#a5881beeedb1058ec39559dc1f4bcfea731ea232" + integrity sha512-SBzIcND4qpDt71jlu1MCDxt335tqInT3YID9V4DoQ4t8wgM/uad7EgKOWKTK6vc2RRaOIShfS2XzqjNUxPXh4w== -"@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@1.1.8": + version "1.1.8" + resolved "https://registry.yarnpkg.com/@rspack/binding/-/binding-1.1.8.tgz#4f99f2add813210d58f3d8142ed98bbf60e51078" + integrity sha512-+/JzXx1HctfgPj+XtsCTbRkxiaOfAXGZZLEvs7jgp04WgWRSZ5u97WRCePNPvy+sCfOEH/2zw2ZK36Z7oQRGhQ== 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== + "@rspack/binding-darwin-arm64" "1.1.8" + "@rspack/binding-darwin-x64" "1.1.8" + "@rspack/binding-linux-arm64-gnu" "1.1.8" + "@rspack/binding-linux-arm64-musl" "1.1.8" + "@rspack/binding-linux-x64-gnu" "1.1.8" + "@rspack/binding-linux-x64-musl" "1.1.8" + "@rspack/binding-win32-arm64-msvc" "1.1.8" + "@rspack/binding-win32-ia32-msvc" "1.1.8" + "@rspack/binding-win32-x64-msvc" "1.1.8" + +"@rspack/core@^1.1.8": + version "1.1.8" + resolved "https://registry.yarnpkg.com/@rspack/core/-/core-1.1.8.tgz#46079db6cb01b8e0028ffd2ac54c7a9678674e74" + integrity sha512-pcZtcj5iXLCuw9oElTYC47bp/RQADm/MMEb3djHdwJuSlFWfWPQi5QFgJ/lJAxIW9UNHnTFrYtytycfjpuoEcA== dependencies: "@module-federation/runtime-tools" "0.5.1" - "@rspack/binding" "1.1.1" + "@rspack/binding" "1.1.8" "@rspack/lite-tapable" "1.0.1" caniuse-lite "^1.0.30001616"