Merge remote-tracking branch 'origin/main' into build/update-lock

opensumi · erha19 · Jan 3, 2023 · Nov 24, 2022 · Nov 24, 2022 · Nov 24, 2022
commit 3a1d1b3773c27311377ff1919130d31f77fb3a47
diff --git a/.github/workflows/issue-labeled.yml b/.github/workflows/issue-labeled.yml
@@ -36,4 +36,3 @@ jobs:
             Hello, @${{ github.event.issue.user.login }}, the information you provided is not enough for us to troubleshoot the problem. Please explain the reproduction steps in detail. Thanks so much for your cooperation! The issue will be closed without any replay within 15 days.
 
             你好 @${{ github.event.issue.user.login }}，你所提供的信息不足于我们排查问题, 请提供一个可以复现的案例，可以通过我们的起步项目 [ide-startup](https://github.com/opensumi/ide-startup) 进行尝试复现你的问题, 谢谢! 15 天内未回复 issue 自动关闭。
-
diff --git a/package.json b/package.json
@@ -134,9 +134,9 @@
     "semver": "^6.3.0",
     "simple-git": "^3.3.0",
     "temp": "^0.9.4",
-    "ts-jest": "^28.0.0",
+    "ts-jest": "^29.0.3",
     "ts-loader": "^6.0.1",
-    "ts-node": "^10.0.0",
+    "ts-node": "^10.9.1",
     "tslib": "^2.4.0",
     "typescript": "4.9.3",
     "webpack": "^4.39.3"

diff --git a/packages/collaboration/package.json b/packages/collaboration/package.json
@@ -17,20 +17,14 @@
     "url": "git@github.com:opensumi/core.git"
   },
   "dependencies": {
-    "@opensumi/ide-core-common": "workspace:*",
-    "@opensumi/ide-core-node": "workspace:*",
-    "@opensumi/ide-file-service": "workspace:*",
-    "lib0": "^0.2.51",
-    "ws": "^8.9.0",
-    "y-websocket": "^1.3.9",
-    "yjs": "13.5.39"
-  },
-  "devDependencies": {
     "@opensumi/ide-core-browser": "workspace:*",
+    "@opensumi/ide-core-node": "workspace:*",
     "@opensumi/ide-dev-tool": "workspace:*",
     "@opensumi/ide-editor": "workspace:*",
+    "@opensumi/ide-file-service": "workspace:*",
     "@opensumi/ide-monaco": "workspace:*",
     "@opensumi/ide-theme": "workspace:*",
+    "lib0": "^0.2.51",
     "y-protocols": "^1.0.2"
   }
 }
diff --git a/packages/components/package.json b/packages/components/package.json
@@ -36,6 +36,7 @@
   },
   "devDependencies": {
     "@opensumi/ide-dev-tool": "workspace:*",
-    "@types/marked": "^4.0.7"
+    "@types/marked": "^4.0.7",
+    "prop-types": "^15.8.1"
   }
 }
diff --git a/packages/core-common/package.json b/packages/core-common/package.json
@@ -19,7 +19,8 @@
   },
   "dependencies": {
     "@opensumi/di": "^1.4.0",
-    "@opensumi/ide-utils": "workspace:*"
+    "@opensumi/ide-utils": "workspace:*",
+    "jschardet": "3.0.0"
   },
   "devDependencies": {
     "@opensumi/ide-dev-tool": "workspace:*"

diff --git a/packages/logs-core/package.json b/packages/logs-core/package.json
@@ -25,6 +25,7 @@
   },
   "devDependencies": {
     "@opensumi/ide-core-browser": "workspace:*",
-    "@opensumi/ide-dev-tool": "workspace:*"
+    "@opensumi/ide-dev-tool": "workspace:*",
+    "@types/debug": "^4.1.5"
   }
 }
diff --git a/packages/monaco/package.json b/packages/monaco/package.json
@@ -15,7 +15,7 @@
   "dependencies": {
     "@opensumi/ide-core-browser": "workspace:*",
     "@opensumi/ide-core-common": "workspace:*",
-    "@opensumi/monaco-editor-core": "0.35.0-patch.0"
+    "@opensumi/monaco-editor-core": "0.35.0-patch.3"
   },
   "devDependencies": {
     "@opensumi/ide-dev-tool": "workspace:*",

diff --git a/packages/monaco/src/browser/contrib/merge-editor/view/grid.tsx b/packages/monaco/src/browser/contrib/merge-editor/view/grid.tsx
@@ -14,7 +14,6 @@ import { EditorViewType } from '../types';
 import styles from './merge-editor.module.less';
 import { WithViewStickinessConnectComponent } from './stickiness-connect-manager';
 
-
 const TitleHead: React.FC<{ contrastType: EditorViewType }> = ({ contrastType }) => {
   const mergeEditorService = useInjectable<MergeEditorService>(MergeEditorService);
   const [head, setHead] = useState<IMergeEditorInputData>();