Skip to content

Commit 9c0b433

Browse files
erha19erha19
committed
Merge 'v2.20.3' into 'main'
2 parents 568b04a + 3e7056a commit 9c0b433

181 files changed

Lines changed: 2245 additions & 1262 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎lerna.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "2.20.2",
2+
"version": "2.20.3",
33
"npmClient": "npm",
44
"packages": ["packages/*", "tools/dev-tool", "tools/playwright"],
55
"command": {

‎package.json‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
"lerna": "^4.0.0",
7070
"lint-staged": "^12.1.2",
7171
"lodash": "^4.17.15",
72+
"mri": "^1.2.0",
7273
"node-gyp": "^9.0.0"
7374
},
7475
"lint-staged": {
@@ -104,12 +105,12 @@
104105
"@types/socket.io-client": "^1.4.32",
105106
"@types/temp": "^0.9.1",
106107
"@types/ws": "^6.0.1",
107-
"@types/yargs": "^17.0.10",
108108
"@typescript-eslint/eslint-plugin": "^5.12.1",
109109
"@typescript-eslint/parser": "^5.12.1",
110110
"async-retry": "^1.3.1",
111111
"await-event": "^2.1.0",
112112
"chalk": "^4.1.2",
113+
"compressing": "^1.6.2",
113114
"cross-env": "^7.0.3",
114115
"debug": "^4.3.2",
115116
"depcheck": "^1.4.2",
@@ -139,8 +140,6 @@
139140
"ts-node": "^10.0.0",
140141
"tslib": "^2.4.0",
141142
"typescript": "4.6.4",
142-
"webpack": "^4.39.3",
143-
"yargs": "^17.5.0",
144-
"compressing": "^1.6.2"
143+
"webpack": "^4.39.3"
145144
}
146145
}

‎packages/addons/package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opensumi/ide-addons",
3-
"version": "2.20.2",
3+
"version": "2.20.3",
44
"files": [
55
"lib"
66
],
@@ -16,19 +16,19 @@
1616
"url": "git@github.com:opensumi/core.git"
1717
},
1818
"dependencies": {
19-
"@opensumi/ide-core-common": "2.20.2",
20-
"@opensumi/ide-core-node": "2.20.2"
19+
"@opensumi/ide-core-common": "2.20.3",
20+
"@opensumi/ide-core-node": "2.20.3"
2121
},
2222
"devDependencies": {
23-
"@opensumi/ide-components": "2.20.2",
24-
"@opensumi/ide-core-browser": "2.20.2",
23+
"@opensumi/ide-components": "2.20.3",
24+
"@opensumi/ide-core-browser": "2.20.3",
2525
"@opensumi/ide-dev-tool": "^1.3.1",
26-
"@opensumi/ide-editor": "2.20.2",
27-
"@opensumi/ide-file-search": "2.20.2",
28-
"@opensumi/ide-file-service": "2.20.2",
29-
"@opensumi/ide-overlay": "2.20.2",
30-
"@opensumi/ide-quick-open": "2.20.2",
31-
"@opensumi/ide-workspace": "2.20.2",
32-
"@opensumi/ide-workspace-edit": "2.20.2"
26+
"@opensumi/ide-editor": "2.20.3",
27+
"@opensumi/ide-file-search": "2.20.3",
28+
"@opensumi/ide-file-service": "2.20.3",
29+
"@opensumi/ide-overlay": "2.20.3",
30+
"@opensumi/ide-quick-open": "2.20.3",
31+
"@opensumi/ide-workspace": "2.20.3",
32+
"@opensumi/ide-workspace-edit": "2.20.3"
3333
}
3434
}

‎packages/addons/src/browser/toolbar-customize/toolbar-customize.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ export const ToolbarCustomizeComponent = () => {
9090
}}
9191
defaultChecked={visible}
9292
id={id}
93-
label={action.description}
93+
label={action.description ?? action.id}
9494
/>
9595
</div>,
9696
);

‎packages/collaboration/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opensumi/ide-collaboration",
3-
"version": "2.20.2",
3+
"version": "2.20.3",
44
"files": [
55
"lib"
66
],

‎packages/comments/package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opensumi/ide-comments",
3-
"version": "2.20.2",
3+
"version": "2.20.3",
44
"files": [
55
"lib"
66
],
@@ -16,16 +16,16 @@
1616
"url": "git@github.com:opensumi/core.git"
1717
},
1818
"dependencies": {
19-
"@opensumi/ide-core-common": "2.20.2",
19+
"@opensumi/ide-core-common": "2.20.3",
2020
"react-mentions": "^3.3.1"
2121
},
2222
"devDependencies": {
23-
"@opensumi/ide-components": "2.20.2",
24-
"@opensumi/ide-core-browser": "2.20.2",
23+
"@opensumi/ide-components": "2.20.3",
24+
"@opensumi/ide-core-browser": "2.20.3",
2525
"@opensumi/ide-dev-tool": "^1.3.1",
26-
"@opensumi/ide-editor": "2.20.2",
27-
"@opensumi/ide-main-layout": "2.20.2",
28-
"@opensumi/ide-monaco-enhance": "2.20.2",
29-
"@opensumi/ide-theme": "2.20.2"
26+
"@opensumi/ide-editor": "2.20.3",
27+
"@opensumi/ide-main-layout": "2.20.3",
28+
"@opensumi/ide-monaco-enhance": "2.20.3",
29+
"@opensumi/ide-theme": "2.20.3"
3030
}
3131
}

‎packages/comments/src/browser/comments-body.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ export const CommentsBody: React.FC<{
4343
gfm: true,
4444
breaks: false,
4545
pedantic: false,
46-
sanitize: true,
4746
smartLists: true,
4847
smartypants: false,
4948
renderer,

‎packages/components/package.json‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opensumi/ide-components",
3-
"version": "2.20.2",
3+
"version": "2.20.3",
44
"description": "@opensumi/ide-components",
55
"license": "MIT",
66
"main": "lib/index.js",
@@ -16,7 +16,7 @@
1616
},
1717
"dependencies": {
1818
"@ant-design/icons": "^4.6.4",
19-
"@opensumi/ide-utils": "2.20.2",
19+
"@opensumi/ide-utils": "2.20.3",
2020
"@types/react-window": "^1.8.5",
2121
"fuzzy": "^0.1.3",
2222
"lodash": "^4.17.15",
@@ -30,10 +30,12 @@
3030
"react-ctxmenu-trigger": "^1.0.0",
3131
"react-custom-scrollbars": "^4.2.1",
3232
"react-lifecycles-compat": "^3.0.4",
33-
"react-virtualized-auto-sizer": "^1.0.2",
33+
"react-virtualized-auto-sizer": "^1.0.7",
34+
"react-virtuoso": "2.19.0",
3435
"react-window": "^1.8.5"
3536
},
3637
"devDependencies": {
37-
"@opensumi/ide-dev-tool": "^1.3.1"
38+
"@opensumi/ide-dev-tool": "^1.3.1",
39+
"@types/marked": "^4.0.7"
3840
}
3941
}

‎packages/components/src/button/style.less‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
.@{prefix}-clickable-icon {
44
&:hover {
5-
transform: scale(1.2);
5+
transform: scale(1.1);
66
}
77

88
&:active {
9-
transform: scale(1.2);
9+
transform: scale(1.1);
1010
}
1111
}
1212

@@ -36,7 +36,6 @@
3636
border-radius: 2px;
3737
color: var(--button-foreground);
3838
background-color: var(--button-background);
39-
transition: all 0.15s;
4039
white-space: nowrap;
4140

4241
&.block-button {
@@ -49,16 +48,6 @@
4948
}
5049
}
5150

52-
.ghost-button {
53-
border-style: solid;
54-
border-width: 1px;
55-
56-
&:disabled {
57-
border-color: transparent;
58-
border: none;
59-
}
60-
}
61-
6251
@keyframes loadingCircle {
6352
100% {
6453
transform: rotate(360deg);
@@ -86,6 +75,7 @@
8675
.primary-button {
8776
color: var(--kt-primaryButton-foreground);
8877
background-color: var(--kt-primaryButton-background);
78+
border: 1px solid var(--kt-primaryButton-border);
8979

9080
&:hover {
9181
background-color: var(--kt-primaryButton-hoverBackground);
@@ -116,6 +106,16 @@
116106
}
117107
}
118108

109+
.ghost-button {
110+
border-style: solid;
111+
border-width: 1px;
112+
113+
&:disabled {
114+
border-color: transparent;
115+
border: none;
116+
}
117+
}
118+
119119
.ghost-secondary-button {
120120
color: var(--kt-whiteGhostButton-foreground);
121121
background-color: var(--kt-whiteGhostButton-background);

‎packages/components/src/checkbox/style.less‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
cursor: pointer;
88

99
&-lump {
10-
margin-right: 4px;
10+
margin-right: 6px;
1111
position: relative;
1212
display: inline-flex;
1313
align-items: center;

0 commit comments

Comments
 (0)