Skip to content

Commit 2fb3c2f

Browse files
yifancongyifancong
authored
Merge branch 'main' into feat/rule-mixed-chunk-type-module
2 parents d6a2df3 + 027607a commit 2fb3c2f

12 files changed

Lines changed: 519 additions & 651 deletions

File tree

‎e2e/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
},
1010
"devDependencies": {
1111
"@actions/core": "^1.11.1",
12-
"@lynx-js/react": "^0.115.4",
13-
"@lynx-js/rspeedy": "^0.13.0",
12+
"@lynx-js/react": "^0.116.1",
13+
"@lynx-js/rspeedy": "^0.13.2",
1414
"@playwright/test": "1.55.1",
1515
"@rsbuild/plugin-less": "1.5.1",
1616
"@rsdoctor/cli": "workspace:*",
@@ -20,7 +20,7 @@
2020
"@rsdoctor/types": "workspace:*",
2121
"@rsdoctor/utils": "workspace:*",
2222
"@rsdoctor/webpack-plugin": "workspace:*",
23-
"@rspack/core": "1.7.2",
23+
"@rspack/core": "1.7.4",
2424
"@types/node": "^22.8.1",
2525
"@types/react": "^18.3.27",
2626
"loader-utils": "^2.0.4",

‎package.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"@changesets/cli": "^2.29.8",
4141
"@rsdoctor/tsconfig": "workspace:*",
4242
"@rslib/core": "^0.18.5",
43-
"@rstest/core": "0.7.9",
43+
"@rstest/core": "0.8.1",
4444
"@scripts/test-helper": "workspace:*",
4545
"cross-env": "^7.0.3",
4646
"cspell-ban-words": "^0.0.4",
@@ -49,10 +49,11 @@
4949
"nano-staged": "^0.8.0",
5050
"nx": "^20.8.4",
5151
"prettier": "^3.6.2",
52-
"rsbuild-plugin-publint": "^0.3.3"
52+
"rsbuild-plugin-publint": "^0.3.4"
5353
},
5454
"pnpm": {
5555
"overrides": {
56+
"@remix-run/router": "1.23.2",
5657
"call-bind-apply-helpers": "1.0.2",
5758
"es-object-atoms": "1.1.1",
5859
"get-intrinsic": "1.3.0",
@@ -62,7 +63,7 @@
6263
"rc-tree": "5.7.2",
6364
"react-dom": "18.3.1",
6465
"sirv": "3.0.2",
65-
"tar": "7.5.4",
66+
"tar": "7.5.7",
6667
"tslib": "2.8.1"
6768
}
6869
},

‎packages/ai/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
"client": "npm run build && node dist/mcp/index.js"
2525
},
2626
"devDependencies": {
27-
"@modelcontextprotocol/sdk": "1.25.2",
27+
"@modelcontextprotocol/sdk": "1.25.3",
2828
"@rsdoctor/types": "workspace:*",
2929
"@rsdoctor/utils": "workspace:*",
30-
"@rstest/core": "0.7.9",
30+
"@rstest/core": "0.8.1",
3131
"@types/node": "^22.8.1",
3232
"prebundle": "1.4.2",
3333
"socket.io-client": "4.8.1",
34-
"axios": "^1.13.2",
34+
"axios": "^1.13.4",
3535
"typescript": "^5.9.2",
3636
"zod": "^3.25.76"
3737
},

‎packages/cli/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"@rsdoctor/client": "workspace:*",
4343
"cac": "^6.7.14",
4444
"typescript": "^5.9.2",
45-
"axios": "^1.13.2",
45+
"axios": "^1.13.4",
4646
"picocolors": "^1.1.1"
4747
},
4848
"peerDependencies": {

‎packages/components/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@
6464
"@rsdoctor/utils": "workspace:*",
6565
"ansi-to-react": "6.1.6",
6666
"antd": "5.19.1",
67-
"axios": "^1.13.2",
67+
"axios": "^1.13.4",
6868
"clsx": "^2.1.1",
6969
"dayjs": "1.11.19",
7070
"echarts": "^5.6.0",
71-
"echarts-for-react": "^3.0.5",
71+
"echarts-for-react": "^3.0.6",
7272
"es-toolkit": "^1.43.0",
7373
"i18next": "22.0.4",
7474
"monaco-editor": "0.49.0",

‎packages/core/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@
8282
"source-map": "^0.7.6"
8383
},
8484
"devDependencies": {
85-
"axios": "^1.13.2",
86-
"@rspack/core": "1.7.2",
85+
"axios": "^1.13.4",
86+
"@rspack/core": "1.7.4",
8787
"@scripts/test-helper": "workspace:*",
8888
"@types/fs-extra": "^11.0.4",
8989
"@types/node": "^22.8.1",

‎packages/rspack-plugin/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"@rsdoctor/utils": "workspace:*"
3535
},
3636
"devDependencies": {
37-
"@rspack/core": "1.7.2",
37+
"@rspack/core": "1.7.4",
3838
"@types/node": "^22.8.1",
3939
"@types/tapable": "2.2.7",
4040
"tslib": "2.8.1",

‎packages/sdk/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"@types/fs-extra": "^11.0.4",
4646
"@types/node": "^22.8.1",
4747
"body-parser": "2.2.2",
48-
"cors": "2.8.5",
48+
"cors": "2.8.6",
4949
"dayjs": "1.11.19",
5050
"fs-extra": "^11.1.1",
5151
"open": "^10.2.0",

‎packages/types/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"source-map": "^0.7.6"
2525
},
2626
"devDependencies": {
27-
"@rspack/core": "1.7.2",
27+
"@rspack/core": "1.7.4",
2828
"@types/node": "^22.8.1",
2929
"@types/react": "^18.3.27",
3030
"tslib": "2.8.1",

‎packages/utils/src/error/transform.ts‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@ import stripAnsi from 'strip-ansi';
33
import { Esbuild, Babel, Err, Linter } from '@rsdoctor/types';
44
import { DevToolError } from './error';
55

6+
const MAX_ERROR_MESSAGE_LENGTH = 1000;
7+
8+
function truncateMessage(
9+
input: unknown,
10+
maxLen = MAX_ERROR_MESSAGE_LENGTH,
11+
): string {
12+
const str = typeof input === 'string' ? input : String(input ?? '');
13+
return str.length > maxLen ? str.slice(0, maxLen) : str;
14+
}
15+
616
function isEsbuildError(err: any): err is Esbuild.Error {
717
return 'pluginName' in err && 'text' in err && 'location' in err;
818
}
@@ -16,7 +26,7 @@ function isDiagnosticError(err: any): err is Linter.Diagnostic {
1626
}
1727

1828
function parseBabelErrorMessage(input: string) {
19-
const lines = stripAnsi(input).split('\n');
29+
const lines = stripAnsi(truncateMessage(input)).split('\n');
2030
const filePath = lines[0].replace(/^([^:]+):.*/, '$1');
2131
const message = lines[0].replace(/.*: (.*) \(\d+:\d+\)*/, '$1');
2232
const lineText =
@@ -30,7 +40,7 @@ function parseBabelErrorMessage(input: string) {
3040
}
3141

3242
function clearMessage(str: string) {
33-
return stripAnsi(str).replace(/.*: (.*)\n\n[\s\S]*/g, '$1');
43+
return stripAnsi(truncateMessage(str)).replace(/.*: (.*)\n\n[\s\S]*/g, '$1');
3444
}
3545

3646
function clearStack(str: string) {
@@ -74,11 +84,15 @@ function transformBabelError(err: any, opt?: Err.DevToolErrorParams) {
7484
const errorCode = opt?.code ?? err.code ?? 'BABEL';
7585
const title = err.reasonCode;
7686
const errorParsed = parseBabelErrorMessage(err.message);
77-
const speedyError = new DevToolError(title, errorParsed.message, {
78-
...opt,
79-
code: errorCode,
80-
stack: err.stack && clearStack(err.stack),
81-
});
87+
const speedyError = new DevToolError(
88+
title,
89+
truncateMessage(errorParsed.message),
90+
{
91+
...opt,
92+
code: errorCode,
93+
stack: err.stack && clearStack(err.stack),
94+
},
95+
);
8296

8397
if (err.loc) {
8498
speedyError.setCodeFrame({
@@ -113,9 +127,10 @@ function transformErrorLike(err: any, opt?: Err.DevToolErrorParams) {
113127
// const stacks = stackParse(err); // TODO: add doctor stack-trace
114128
const stacks = [] as any[];
115129
const filePath = stacks?.[0]?.getFileName?.();
130+
const message = truncateMessage(err.message);
116131
return new DevToolError(
117132
err.name || 'UNKNOWN_ERROR',
118-
clearMessage(err.message),
133+
clearMessage(message),
119134
{
120135
...opt,
121136
codeFrame: filePath ? { filePath } : undefined,
@@ -127,7 +142,7 @@ function transformErrorLike(err: any, opt?: Err.DevToolErrorParams) {
127142

128143
function transformDiagnostic(err: any, opt?: Err.DevToolErrorParams) {
129144
if (isDiagnosticError(err)) {
130-
return new DevToolError(err.title, err.message, {
145+
return new DevToolError(err.title, truncateMessage(err.message), {
131146
...err,
132147
...opt,
133148
hint: err.suggestions?.description,

0 commit comments

Comments
 (0)