Skip to content

Commit dfea969

Browse files
slorberslorber
authored
fix(faster): Upgrade to Rspack 1.1.1, fix build progress bar display (#10648)
1 parent 0c86355 commit dfea969

File tree

5 files changed

+85
-67
lines changed

5 files changed

+85
-67
lines changed

‎packages/docusaurus-bundler/src/currentBundler.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ export async function getProgressBarPlugin({
9595
super({
9696
prefix: name,
9797
template: `● {prefix:.bold} {bar:50.${color}/white.dim} ({percent}%) {wide_msg:.dim}`,
98-
progressChars: '■■',
98+
progressChars: '██',
9999
});
100100
}
101101
}

‎packages/docusaurus-faster/package.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"license": "MIT",
2020
"dependencies": {
2121
"@docusaurus/types": "3.6.1",
22-
"@rspack/core": "^1.0.14",
22+
"@rspack/core": "^1.1.1",
2323
"@swc/core": "^1.7.39",
2424
"@swc/html": "^1.7.39",
2525
"browserslist": "^4.24.2",
@@ -30,5 +30,8 @@
3030
},
3131
"engines": {
3232
"node": ">=18.0"
33+
},
34+
"peerDependencies": {
35+
"@docusaurus/types": "*"
3336
}
3437
}

‎packages/docusaurus-faster/src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export const getSwcLoaderOptions = ({
3636
};
3737
};
3838

39-
export const rspack = Rspack;
39+
export const rspack: typeof Rspack = Rspack;
4040

4141
export function getSwcHtmlMinifier(): typeof swcHtmlMinifier {
4242
return swcHtmlMinifier;

‎packages/docusaurus/src/webpack/base.ts

+15
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,25 @@ export async function createBaseConfig({
134134
};
135135
}
136136

137+
function getExperiments(): Configuration['experiments'] {
138+
if (props.currentBundler.name === 'rspack') {
139+
return {
140+
// This is mostly useful in dev
141+
// See https://rspack.dev/config/experiments#experimentsincremental
142+
// Produces warnings in production builds
143+
// See https://github.com/web-infra-dev/rspack/pull/8311#issuecomment-2476014664
144+
// @ts-expect-error: Rspack-only
145+
incremental: !isProd,
146+
};
147+
}
148+
return undefined;
149+
}
150+
137151
return {
138152
mode,
139153
name,
140154
cache: getCache(),
155+
experiments: getExperiments(),
141156
output: {
142157
pathinfo: false,
143158
path: outDir,

‎yarn.lock

+64-64
Original file line numberDiff line numberDiff line change
@@ -2891,73 +2891,73 @@
28912891
fs-extra "^11.1.1"
28922892
lodash "^4.17.21"
28932893

2894-
"@rspack/binding-darwin-arm64@1.0.14":
2895-
version "1.0.14"
2896-
resolved "https://registry.yarnpkg.com/@rspack/binding-darwin-arm64/-/binding-darwin-arm64-1.0.14.tgz#b9d99fb71e047f5300a851614f89cb9d7168db3e"
2897-
integrity sha512-dHvlF6T6ctThGDIdvkSdacroA1xlCxfteuppBj8BX/UxzLPr4xsaEtNilfJmFfd2/J02UQyTQauN/9EBuA+YkA==
2898-
2899-
"@rspack/binding-darwin-x64@1.0.14":
2900-
version "1.0.14"
2901-
resolved "https://registry.yarnpkg.com/@rspack/binding-darwin-x64/-/binding-darwin-x64-1.0.14.tgz#ddc40886f9a0321349e6be2e9469645ae87bbe36"
2902-
integrity sha512-q4Da1Bn/4xTLhhnOkT+fjP2STsSCfp4z03/J/h8tCVG/UYz56Ud3q1UEOK33c5Fxw1C4GlhEh5yYOlSAdxFQLQ==
2903-
2904-
"@rspack/binding-linux-arm64-gnu@1.0.14":
2905-
version "1.0.14"
2906-
resolved "https://registry.yarnpkg.com/@rspack/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.0.14.tgz#2600e00adf5d1e09d7f0f476b3a01671e20731a7"
2907-
integrity sha512-JogYtL3VQS9wJ3p3FNhDqinm7avrMsdwz4erP7YCjD7idob93GYAE7dPrHUzSNVnCBYXRaHJYZHDQs7lKVcYZw==
2908-
2909-
"@rspack/binding-linux-arm64-musl@1.0.14":
2910-
version "1.0.14"
2911-
resolved "https://registry.yarnpkg.com/@rspack/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.0.14.tgz#8c2624c1426ecc51c9bd4c74c8dcc8d7b0bdbc35"
2912-
integrity sha512-qgybhxI/nnoa8CUz7zKTC0Oh37NZt9uRxsSV7+ZYrfxqbrVCoNVuutPpY724uUHy1M6W34kVEm1uT1N4Ka5cZg==
2913-
2914-
"@rspack/binding-linux-x64-gnu@1.0.14":
2915-
version "1.0.14"
2916-
resolved "https://registry.yarnpkg.com/@rspack/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.0.14.tgz#6636bf658304d246d617f01ae12f4cbe29097a62"
2917-
integrity sha512-5vzaDRw3/sGKo3ax/1cU3/cxqNjajwlt2LU288vXNe1/n8oe/pcDfYcTugpOe/A1DqzadanudJszLpFcKsaFtQ==
2918-
2919-
"@rspack/binding-linux-x64-musl@1.0.14":
2920-
version "1.0.14"
2921-
resolved "https://registry.yarnpkg.com/@rspack/binding-linux-x64-musl/-/binding-linux-x64-musl-1.0.14.tgz#887c7f26876495f45842ebab874198db394dfd6f"
2922-
integrity sha512-4U6QD9xVS1eGme52DuJr6Fg/KdcUfJ+iKwH49Up460dZ/fLvGylnVGA+V0mzPlKi8gfy7NwFuYXZdu3Pwi1YYg==
2923-
2924-
"@rspack/binding-win32-arm64-msvc@1.0.14":
2925-
version "1.0.14"
2926-
resolved "https://registry.yarnpkg.com/@rspack/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.0.14.tgz#cfde74d44a866ed42501d107349a56b7b0122042"
2927-
integrity sha512-SjeYw7qqRHYZ5RPClu+ffKZsShQdU3amA1OwC3M0AS6dbfEcji8482St3Y8Z+QSzYRapCEZij9LMM/9ypEhISg==
2928-
2929-
"@rspack/binding-win32-ia32-msvc@1.0.14":
2930-
version "1.0.14"
2931-
resolved "https://registry.yarnpkg.com/@rspack/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-1.0.14.tgz#59532613cea22aa78928fb92b1a35347d780aaab"
2932-
integrity sha512-m1gUiVyz3Z3VYIK/Ayo5CVHBjnEeRk9a+KIpKSsq1yhZItnMgjtr4bKabU9vjxalO4UoaSmVzODJI8lJBlnn5Q==
2933-
2934-
"@rspack/binding-win32-x64-msvc@1.0.14":
2935-
version "1.0.14"
2936-
resolved "https://registry.yarnpkg.com/@rspack/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.0.14.tgz#5bf023ba319dc748e54f8c23bcecab79703dc163"
2937-
integrity sha512-Gbeg+bayMF9VP9xmlxySL/TC2XrS6/LZM/pqcNOTLHx6LMG/VXCcmKB0rOZo8MzLXEt8D/lQmQ/B6g7pSaAw0g==
2938-
2939-
"@rspack/binding@1.0.14":
2940-
version "1.0.14"
2941-
resolved "https://registry.yarnpkg.com/@rspack/binding/-/binding-1.0.14.tgz#60a04aca4369f7c4ca646e69cbeee75636a418ef"
2942-
integrity sha512-0wWqFvr9hkF4LgNPgWfkTU0hhkZAMvOytoCs2p+wDX1Up1E/SgJ1U1JAsCxsl1XtUKm7mRvdWHzJmHbza3y89Q==
2894+
"@rspack/binding-darwin-arm64@1.1.1":
2895+
version "1.1.1"
2896+
resolved "https://registry.yarnpkg.com/@rspack/binding-darwin-arm64/-/binding-darwin-arm64-1.1.1.tgz#e03df97bebab2ef6ccbbef940c8ef092b37c8336"
2897+
integrity sha512-BnvGPWObGZ2ZVnxe4K3NKwAWxYubOJvfwporXWD3NgkzeV5xJqGBFWRDnr/nfsFpgCTI8goxK5db/wb7NVzLqg==
2898+
2899+
"@rspack/binding-darwin-x64@1.1.1":
2900+
version "1.1.1"
2901+
resolved "https://registry.yarnpkg.com/@rspack/binding-darwin-x64/-/binding-darwin-x64-1.1.1.tgz#ce3893eee19e4f43b27e56b0fd2737b97efd69c0"
2902+
integrity sha512-aiwJRkPGAg99vCrG/C9I87Fh9TShOAkzpf2yeJEZL4gwTj9A8wrc/xlrCFn1BDkbPnGYz62oCR7z6JLIDgYLuA==
2903+
2904+
"@rspack/binding-linux-arm64-gnu@1.1.1":
2905+
version "1.1.1"
2906+
resolved "https://registry.yarnpkg.com/@rspack/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.1.1.tgz#b9ba4d0cfc39fec5c2db9d3f75327c3b8a383e96"
2907+
integrity sha512-2Z8YxH4+V0MiNhVQ2IFELDIFtykIdKgmOmGr/PuRQMHMxSn8AKo5uqBD30sZqe0+gryplZwK3hyrBETHOmSltQ==
2908+
2909+
"@rspack/binding-linux-arm64-musl@1.1.1":
2910+
version "1.1.1"
2911+
resolved "https://registry.yarnpkg.com/@rspack/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.1.1.tgz#bb98d98d703c6a0c69489975821a3d3236fa91cf"
2912+
integrity sha512-l+cJd3wAxBt523Min7qN+G5s3SU0rif9Yq2AFWWl+R6IvmnMlMq6sAAyiyogUidFmJ5XIKSJJBTBnvLF3g4ezg==
2913+
2914+
"@rspack/binding-linux-x64-gnu@1.1.1":
2915+
version "1.1.1"
2916+
resolved "https://registry.yarnpkg.com/@rspack/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.1.1.tgz#17d7ceac270ffc5980a16e31badef68136b31d51"
2917+
integrity sha512-goaDDrXNulR7FcvUfj8AjhF3g7IXUttjQ4QsfY2xz7s20tDETlq5HpcM2A8GEI6lqkPAv/ITU0AynLK7bfyr4A==
2918+
2919+
"@rspack/binding-linux-x64-musl@1.1.1":
2920+
version "1.1.1"
2921+
resolved "https://registry.yarnpkg.com/@rspack/binding-linux-x64-musl/-/binding-linux-x64-musl-1.1.1.tgz#bfc6363ae73ffd04e7af00f134d640ec0407a730"
2922+
integrity sha512-T4RRn9ycxUHAfZJpfNRy+DdfevTXIZqox+NNg/N3d+Pqj5QS3zqpHBfPLC2mIIN1dw55BoshRIP2C1hUG0Fk6g==
2923+
2924+
"@rspack/binding-win32-arm64-msvc@1.1.1":
2925+
version "1.1.1"
2926+
resolved "https://registry.yarnpkg.com/@rspack/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.1.1.tgz#efbd8c90d0097907104da2f5d75416655cfb0f60"
2927+
integrity sha512-FHIPpueFc/+vWdZeVWRYWW0Z0IsDIHy+WhWxITeLjOVGsUN4rhaztYOausD7WsOlOhmR0SddeOYtRs/BR35wig==
2928+
2929+
"@rspack/binding-win32-ia32-msvc@1.1.1":
2930+
version "1.1.1"
2931+
resolved "https://registry.yarnpkg.com/@rspack/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-1.1.1.tgz#73f7c78bb4398e009708e6523e20222967ec9568"
2932+
integrity sha512-pgXE45ATK/Iil/oXlqaGoWZ0x3SoQk4dAjJGK7TzQuek6UEoJbLQL+W1ufe/iUxz67ICAmUvq5NH2ftOhEE2SA==
2933+
2934+
"@rspack/binding-win32-x64-msvc@1.1.1":
2935+
version "1.1.1"
2936+
resolved "https://registry.yarnpkg.com/@rspack/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.1.1.tgz#5b65e210d9a0dc042059399469ca5beeea54b1ee"
2937+
integrity sha512-z/kdbB+uhMi+H4podjTE7bfUpahACUuPOZPUtAAA6PMgRyiigBTK5UFYN35D30MONwZP4yNiLvPjurwiLw7EpA==
2938+
2939+
"@rspack/binding@1.1.1":
2940+
version "1.1.1"
2941+
resolved "https://registry.yarnpkg.com/@rspack/binding/-/binding-1.1.1.tgz#e37e0c34e723655775d33a72ba663c84a1310c0f"
2942+
integrity sha512-BRFliHbErqWrUo9X9bdik9WTRi6EgrJSQbbUiVeIYgW4gzYdfHUohgTkWo2Byu36LZolKrEjq/Uq2A8q/tc0YA==
29432943
optionalDependencies:
2944-
"@rspack/binding-darwin-arm64" "1.0.14"
2945-
"@rspack/binding-darwin-x64" "1.0.14"
2946-
"@rspack/binding-linux-arm64-gnu" "1.0.14"
2947-
"@rspack/binding-linux-arm64-musl" "1.0.14"
2948-
"@rspack/binding-linux-x64-gnu" "1.0.14"
2949-
"@rspack/binding-linux-x64-musl" "1.0.14"
2950-
"@rspack/binding-win32-arm64-msvc" "1.0.14"
2951-
"@rspack/binding-win32-ia32-msvc" "1.0.14"
2952-
"@rspack/binding-win32-x64-msvc" "1.0.14"
2953-
2954-
"@rspack/core@^1.0.14":
2955-
version "1.0.14"
2956-
resolved "https://registry.yarnpkg.com/@rspack/core/-/core-1.0.14.tgz#7b7305391a488b5ac5dc28a82e9fb02b7ec3e8de"
2957-
integrity sha512-xHl23lxJZNjItGc5YuE9alz3yjb56y7EgJmAcBMPHMqgjtUt8rBu4xd/cSUjbr9/lLF9N4hdyoJiPJOFs9LEjw==
2944+
"@rspack/binding-darwin-arm64" "1.1.1"
2945+
"@rspack/binding-darwin-x64" "1.1.1"
2946+
"@rspack/binding-linux-arm64-gnu" "1.1.1"
2947+
"@rspack/binding-linux-arm64-musl" "1.1.1"
2948+
"@rspack/binding-linux-x64-gnu" "1.1.1"
2949+
"@rspack/binding-linux-x64-musl" "1.1.1"
2950+
"@rspack/binding-win32-arm64-msvc" "1.1.1"
2951+
"@rspack/binding-win32-ia32-msvc" "1.1.1"
2952+
"@rspack/binding-win32-x64-msvc" "1.1.1"
2953+
2954+
"@rspack/core@^1.1.1":
2955+
version "1.1.1"
2956+
resolved "https://registry.yarnpkg.com/@rspack/core/-/core-1.1.1.tgz#69f795225e31f51dff6b0ccfcebcc07accdac4c8"
2957+
integrity sha512-khYNAho2evyc7N5mYk4K6B587ou/dN1CDCqWrSDeZZNFFQHtuEp5T3kL1ntsKY7agObQhI60osCYaxFUPs0yww==
29582958
dependencies:
29592959
"@module-federation/runtime-tools" "0.5.1"
2960-
"@rspack/binding" "1.0.14"
2960+
"@rspack/binding" "1.1.1"
29612961
"@rspack/lite-tapable" "1.0.1"
29622962
caniuse-lite "^1.0.30001616"
29632963

0 commit comments

Comments
 (0)