Skip to content

Commit 2e27a8a

Browse files
slorberslorber
committed
upgrade and fix Rsdoctor?
1 parent cbddd79 commit 2e27a8a

File tree

3 files changed

+90
-75
lines changed

3 files changed

+90
-75
lines changed

‎website/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@
8484
"devDependencies": {
8585
"@docusaurus/eslint-plugin": "3.5.2",
8686
"@docusaurus/tsconfig": "3.5.2",
87-
"@rsdoctor/webpack-plugin": "^0.3.11",
88-
"@rsdoctor/rspack-plugin": "^0.3.11",
87+
"@rsdoctor/webpack-plugin": "^0.4.1",
88+
"@rsdoctor/rspack-plugin": "^0.4.1",
8989
"@types/color": "^3.0.4",
9090
"@types/jest": "^29.5.3",
9191
"cross-env": "^7.0.3",

‎website/src/plugins/rsdoctor/RsdoctorPlugin.ts

+6-3
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@
88
import {RsdoctorRspackMultiplePlugin} from '@rsdoctor/rspack-plugin';
99
import type {PluginConfig} from '@docusaurus/types';
1010

11-
async function createRsdoctorBundlerPlugin() {
11+
function createRsdoctorBundlerPlugin({isServer}: {isServer: boolean}) {
1212
// TODO Shitty workaround to bypass lib typechecking
1313
// package does not work will with skipLibCheck false
1414
// // eslint-disable-next-line
1515
// const {RsdoctorWebpackMultiplePlugin} = require('@rsdoctor/webpack-plugin');
1616

1717
// return new RsdoctorWebpackMultiplePlugin({
1818
return new RsdoctorRspackMultiplePlugin({
19+
name: isServer ? 'server' : 'client',
1920
disableTOSUpload: true,
2021
supports: {
2122
// https://rsdoctor.dev/config/options/options#generatetilegraph
@@ -33,11 +34,13 @@ export default (async function RsdoctorPlugin() {
3334
if (!process.env.RSDOCTOR) {
3435
return null;
3536
}
36-
const plugin = await createRsdoctorBundlerPlugin();
37+
const pluginClient = await createRsdoctorBundlerPlugin({isServer: false});
38+
const pluginServer = await createRsdoctorBundlerPlugin({isServer: true});
3739
console.log('Rsdoctor plugin enabled');
3840
return {
3941
name: 'rsdoctor-plugin',
40-
configureWebpack: () => {
42+
configureWebpack: (__config, isServer) => {
43+
const plugin = isServer ? pluginServer : pluginClient;
4144
return {
4245
plugins: [plugin],
4346
};

‎yarn.lock

+82-70
Original file line numberDiff line numberDiff line change
@@ -2702,20 +2702,20 @@
27022702
estree-walker "^1.0.1"
27032703
picomatch "^2.2.2"
27042704

2705-
"@rsdoctor/client@0.3.11":
2706-
version "0.3.11"
2707-
resolved "https://registry.yarnpkg.com/@rsdoctor/client/-/client-0.3.11.tgz#010fe58c0872f05e2d327f8c83053ab43fc40c23"
2708-
integrity sha512-mqbatlzgBMlz2C40fXCH7+oHFzDLzOD7yCvvLpolQ6AGwDADJK16fXVtvpBPLP3kzRgw+G4mDwy+UiAmAaCGaQ==
2709-
2710-
"@rsdoctor/core@0.3.11":
2711-
version "0.3.11"
2712-
resolved "https://registry.yarnpkg.com/@rsdoctor/core/-/core-0.3.11.tgz#85730315425b9ececea6f64145ae04140c5bfdcd"
2713-
integrity sha512-+l9Kpjge+xpBKovc6aP7gtBPM6vGJRi475DOC6We5/AbnpI60Jt3wiJ0arEfgCZ7p8qNvTLsBYSY6CYJm4dDLw==
2714-
dependencies:
2715-
"@rsdoctor/graph" "0.3.11"
2716-
"@rsdoctor/sdk" "0.3.11"
2717-
"@rsdoctor/types" "0.3.11"
2718-
"@rsdoctor/utils" "0.3.11"
2705+
"@rsdoctor/client@0.4.1":
2706+
version "0.4.1"
2707+
resolved "https://registry.yarnpkg.com/@rsdoctor/client/-/client-0.4.1.tgz#d71dc24d7dd58e60d595bc8aa48945090e8bf8d7"
2708+
integrity sha512-vExZ30sw+zHMyURdu4/devBuGa7927WRhIfYZ+jDNiBGs57YoNkvPB2gqN9BuoD/AC/YzJQtBPOfjd3HU2EqKw==
2709+
2710+
"@rsdoctor/core@0.4.1":
2711+
version "0.4.1"
2712+
resolved "https://registry.yarnpkg.com/@rsdoctor/core/-/core-0.4.1.tgz#d566cc116fba64fed5f572d3519e6d1f527b0420"
2713+
integrity sha512-b+0EBXPH/qgVNlDxoKwytO3X06ZRatIq0sUEdesjPJZOHhk4X/qafK/nL4296QZoqNw4RZzM/cFNBHpbRHxF1A==
2714+
dependencies:
2715+
"@rsdoctor/graph" "0.4.1"
2716+
"@rsdoctor/sdk" "0.4.1"
2717+
"@rsdoctor/types" "0.4.1"
2718+
"@rsdoctor/utils" "0.4.1"
27192719
axios "^1.7.2"
27202720
enhanced-resolve "5.12.0"
27212721
filesize "^10.1.4"
@@ -2728,67 +2728,68 @@
27282728
webpack-bundle-analyzer "^4.10.2"
27292729
webpack-sources "^3.2.3"
27302730

2731-
"@rsdoctor/graph@0.3.11":
2732-
version "0.3.11"
2733-
resolved "https://registry.yarnpkg.com/@rsdoctor/graph/-/graph-0.3.11.tgz#b8d1a6452545e36b508285fc98b5776d074479f4"
2734-
integrity sha512-1WDLgwA0TWUS8NIPsV1eTbXH0UMNbLoYDLGSiaUVrwnl90cQsajaEUkwMcKu9VU3YVC4ayjwG6/RCrPlRqE4bw==
2731+
"@rsdoctor/graph@0.4.1":
2732+
version "0.4.1"
2733+
resolved "https://registry.yarnpkg.com/@rsdoctor/graph/-/graph-0.4.1.tgz#6ec9a7d17f93145b40eb308da433cae9b54663f2"
2734+
integrity sha512-YehL+vys0XCvlxlLLulbcBz2+/o3iPKWY1DiB5Cri56kTLdHGyqW9Ue23gynVLN5HOp+lRztdAiEqn+2IBhEAQ==
27352735
dependencies:
2736-
"@rsdoctor/types" "0.3.11"
2737-
"@rsdoctor/utils" "0.3.11"
2736+
"@rsdoctor/types" "0.4.1"
2737+
"@rsdoctor/utils" "0.4.1"
27382738
lodash "^4.17.21"
27392739
socket.io "4.7.2"
27402740
source-map "^0.7.4"
27412741

2742-
"@rsdoctor/rspack-plugin@^0.3.11":
2743-
version "0.3.11"
2744-
resolved "https://registry.yarnpkg.com/@rsdoctor/rspack-plugin/-/rspack-plugin-0.3.11.tgz#4fe790731318370ffabe3d9081d14e2189130717"
2745-
integrity sha512-ZBgeNk4P7/tLvUlx4JW8T9LQk4L8eHYi0vQwBHDWbBnGwmTDunYjqcf36mZph/lP4AtCNE4I+zFQbXxkmMKsSQ==
2746-
dependencies:
2747-
"@rsdoctor/core" "0.3.11"
2748-
"@rsdoctor/graph" "0.3.11"
2749-
"@rsdoctor/sdk" "0.3.11"
2750-
"@rsdoctor/types" "0.3.11"
2751-
"@rsdoctor/utils" "0.3.11"
2742+
"@rsdoctor/rspack-plugin@^0.4.1":
2743+
version "0.4.1"
2744+
resolved "https://registry.yarnpkg.com/@rsdoctor/rspack-plugin/-/rspack-plugin-0.4.1.tgz#0d3c63fddd3503dd7bc72c70daaaee42ff0cae89"
2745+
integrity sha512-JOEe5APl9nZRwE13bLOMcqq0SFGMb0wVSFJLdquo8mIU46Fx8b19WES0hBygQZFf5oyzbuGBXhJd0r34WTQf6Q==
2746+
dependencies:
2747+
"@rsdoctor/core" "0.4.1"
2748+
"@rsdoctor/graph" "0.4.1"
2749+
"@rsdoctor/sdk" "0.4.1"
2750+
"@rsdoctor/types" "0.4.1"
2751+
"@rsdoctor/utils" "0.4.1"
27522752
loader-utils "^2.0.4"
27532753
lodash "^4.17.21"
27542754

2755-
"@rsdoctor/[email protected]":
2756-
version "0.3.11"
2757-
resolved "https://registry.yarnpkg.com/@rsdoctor/sdk/-/sdk-0.3.11.tgz#58bb83b077ed167b5f29b6835ead9e78fbd718c3"
2758-
integrity sha512-ys9lTasYm9ecvj0oUbQuSpnULqImYq9QET1LUtoVBa5QIpQBbxOOegWnBmSsDlH7LlFQYhqLl5DR9FdJ7yTmcw==
2759-
dependencies:
2760-
"@rsdoctor/client" "0.3.11"
2761-
"@rsdoctor/graph" "0.3.11"
2762-
"@rsdoctor/types" "0.3.11"
2763-
"@rsdoctor/utils" "0.3.11"
2755+
"@rsdoctor/[email protected]":
2756+
version "0.4.1"
2757+
resolved "https://registry.yarnpkg.com/@rsdoctor/sdk/-/sdk-0.4.1.tgz#64d15fe6baa41093a0ea48b8b1626db184613f0f"
2758+
integrity sha512-cQb90xaHlaV30f01v3bDtHn150elbdqQ3E5lq6FvRrcuQPd9a3ZDMJ0RZSHpLoqjNQo2LUNbSW3wSvEya1nCRQ==
2759+
dependencies:
2760+
"@rsdoctor/client" "0.4.1"
2761+
"@rsdoctor/graph" "0.4.1"
2762+
"@rsdoctor/types" "0.4.1"
2763+
"@rsdoctor/utils" "0.4.1"
2764+
"@types/fs-extra" "^11.0.4"
27642765
body-parser "1.20.2"
27652766
cors "2.8.5"
2766-
dayjs "1.11.12"
2767+
dayjs "1.11.13"
2768+
fs-extra "^11.1.1"
27672769
lodash "^4.17.21"
27682770
open "^8.4.2"
27692771
serve-static "1.15.0"
27702772
socket.io "4.7.2"
27712773
source-map "^0.7.4"
27722774
tapable "2.2.1"
27732775

2774-
"@rsdoctor/types@0.3.11":
2775-
version "0.3.11"
2776-
resolved "https://registry.yarnpkg.com/@rsdoctor/types/-/types-0.3.11.tgz#d2a37650476bbf7a9d63d951bc0499c8a9b72ac4"
2777-
integrity sha512-BH+P5RekIQy3VqFswsTkSB5yeZBYTbMNIlVq1chHhIQcF0Hpd9fuUjFG59NJgBILZoL2vknUhBfhmiv2WEOYig==
2776+
"@rsdoctor/types@0.4.1":
2777+
version "0.4.1"
2778+
resolved "https://registry.yarnpkg.com/@rsdoctor/types/-/types-0.4.1.tgz#e560ddd426ef03bb81a55c5cb8862b6f78aaf95f"
2779+
integrity sha512-HJ0YCv4WAgsQb/9lvpiV+Syac7de0pPXQrtP5Al4wsC0ELKz4DN5NAAv5o8KzF7pPpEYrL3zcnNFsT014CK1aw==
27782780
dependencies:
27792781
"@types/connect" "3.4.38"
27802782
"@types/estree" "1.0.5"
27812783
"@types/tapable" "2.2.7"
2782-
"@types/webpack" "5.28.5"
27832784
source-map "^0.7.4"
27842785

2785-
"@rsdoctor/utils@0.3.11":
2786-
version "0.3.11"
2787-
resolved "https://registry.yarnpkg.com/@rsdoctor/utils/-/utils-0.3.11.tgz#650b2b8cf2c4d38a0f35d05f13625965c467d185"
2788-
integrity sha512-S1h/rG3wPFjHE9AffGjBGxPhP1j8X23KZKiyYnYHiOTCHxnYTyBqRJXUA0OvGewFY9zi7ucz800y+s0G1ujGyg==
2786+
"@rsdoctor/utils@0.4.1":
2787+
version "0.4.1"
2788+
resolved "https://registry.yarnpkg.com/@rsdoctor/utils/-/utils-0.4.1.tgz#f97b8273afce7a0f8cc248aabe98b2f44197c16f"
2789+
integrity sha512-R0hdKWmPdOUWlYl7Xg5Mfa3N5TDEtHGCVyM2tGS6lf7H1RsO8rnA9ksHSCbpCnTN7P2yTUcCtII7F9dQfBIjgw==
27892790
dependencies:
27902791
"@babel/code-frame" "7.24.7"
2791-
"@rsdoctor/types" "0.3.11"
2792+
"@rsdoctor/types" "0.4.1"
27922793
"@types/estree" "1.0.5"
27932794
acorn "^8.10.0"
27942795
acorn-import-assertions "1.9.0"
@@ -2806,16 +2807,16 @@
28062807
rslog "^1.2.2"
28072808
strip-ansi "^6.0.1"
28082809

2809-
"@rsdoctor/webpack-plugin@^0.3.11":
2810-
version "0.3.11"
2811-
resolved "https://registry.yarnpkg.com/@rsdoctor/webpack-plugin/-/webpack-plugin-0.3.11.tgz#b5f43b7c3c8c365e379dbd5a51bfae284aee61b4"
2812-
integrity sha512-Gqr5GMOhHkJl9rtsbnCZV5mXuvsfpRtg735cRie9eT1E/dMpHerIGZFRGRIMPNkLAd/lfe0KwrGRZknWX9M/zQ==
2813-
dependencies:
2814-
"@rsdoctor/core" "0.3.11"
2815-
"@rsdoctor/graph" "0.3.11"
2816-
"@rsdoctor/sdk" "0.3.11"
2817-
"@rsdoctor/types" "0.3.11"
2818-
"@rsdoctor/utils" "0.3.11"
2810+
"@rsdoctor/webpack-plugin@^0.4.1":
2811+
version "0.4.1"
2812+
resolved "https://registry.yarnpkg.com/@rsdoctor/webpack-plugin/-/webpack-plugin-0.4.1.tgz#89e1f701cf268fdf1dde15df93d611303eae4cec"
2813+
integrity sha512-kdRfQSq1jYqOecM22CHGYe/4XZY5DigMNFxrfZdbYFXU0N4ABy3jXnGw73mzmb3x1rf7qBI7NibUL1IsAMPYuQ==
2814+
dependencies:
2815+
"@rsdoctor/core" "0.4.1"
2816+
"@rsdoctor/graph" "0.4.1"
2817+
"@rsdoctor/sdk" "0.4.1"
2818+
"@rsdoctor/types" "0.4.1"
2819+
"@rsdoctor/utils" "0.4.1"
28192820
fs-extra "^11.1.1"
28202821
lodash "^4.17.21"
28212822

@@ -3433,6 +3434,14 @@
34333434
dependencies:
34343435
"@types/webpack" "^4"
34353436

3437+
"@types/fs-extra@^11.0.4":
3438+
version "11.0.4"
3439+
resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-11.0.4.tgz#e16a863bb8843fba8c5004362b5a73e17becca45"
3440+
integrity sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==
3441+
dependencies:
3442+
"@types/jsonfile" "*"
3443+
"@types/node" "*"
3444+
34363445
"@types/fs-extra@^9.0.13":
34373446
version "9.0.13"
34383447
resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45"
@@ -3568,6 +3577,13 @@
35683577
resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
35693578
integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
35703579

3580+
"@types/jsonfile@*":
3581+
version "6.1.4"
3582+
resolved "https://registry.yarnpkg.com/@types/jsonfile/-/jsonfile-6.1.4.tgz#614afec1a1164e7d670b4a7ad64df3e7beb7b702"
3583+
integrity sha512-D5qGUYwjvnNNextdU59/+fI+spnwtTFmyQP0h+PfIOSkNfpU6AOICUOkm4i0OnSk+NyjdPJrxCDro0sJsWlRpQ==
3584+
dependencies:
3585+
"@types/node" "*"
3586+
35713587
"@types/katex@^0.16.0":
35723588
version "0.16.1"
35733589
resolved "https://registry.yarnpkg.com/@types/katex/-/katex-0.16.1.tgz#e1faa29f131c241a7669e65bdf8ce470c9c4e3a9"
@@ -3947,15 +3963,6 @@
39473963
"@types/source-list-map" "*"
39483964
source-map "^0.7.3"
39493965

3950-
"@types/[email protected]":
3951-
version "5.28.5"
3952-
resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-5.28.5.tgz#0e9d9a15efa09bbda2cef41356ca4ac2031ea9a2"
3953-
integrity sha512-wR87cgvxj3p6D0Crt1r5avwqffqPXUkNlnQ1mjU93G7gCuFjufZR4I6j8cz5g1F1tTYpfOOFvly+cmIQwL9wvw==
3954-
dependencies:
3955-
"@types/node" "*"
3956-
tapable "^2.2.0"
3957-
webpack "^5"
3958-
39593966
"@types/webpack@^4":
39603967
version "4.41.33"
39613968
resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.33.tgz#16164845a5be6a306bcbe554a8e67f9cac215ffc"
@@ -6701,7 +6708,12 @@ dateformat@^3.0.0:
67016708
resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
67026709
integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
67036710

6704-
[email protected], dayjs@^1.11.7:
6711+
[email protected]:
6712+
version "1.11.13"
6713+
resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.13.tgz#92430b0139055c3ebb60150aa13e860a4b5a366c"
6714+
integrity sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==
6715+
6716+
dayjs@^1.11.7:
67056717
version "1.11.12"
67066718
resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.12.tgz#5245226cc7f40a15bf52e0b99fd2a04669ccac1d"
67076719
integrity sha512-Rt2g+nTbLlDWZTwwrIXjy9MeiZmSDI375FvZs72ngxx8PDC6YXOeR3q5LAuPzjZQxhiWdRKac7RKV+YyQYfYIg==

0 commit comments

Comments
 (0)