v2.19.11

opensumi · Sep 1, 2022 · 15ec330 · 15ec330
1 parent 7213eb8
commit 15ec330
Show file tree

Hide file tree

Showing 62 changed files with 482 additions and 464 deletions.
diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.19.10",
+  "version": "2.19.9",
   "npmClient": "npm",
   "packages": ["packages/*", "tools/dev-tool", "tools/playwright"],
   "command": {

diff --git a/packages/addons/package.json b/packages/addons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-addons",
-  "version": "2.19.10",
+  "version": "2.19.11",
   "files": [
     "lib"
   ],
@@ -16,19 +16,19 @@
     "url": "[email protected]:opensumi/core.git"
   },
   "dependencies": {
-    "@opensumi/ide-core-common": "2.19.10",
-    "@opensumi/ide-core-node": "2.19.10"
+    "@opensumi/ide-core-common": "2.19.11",
+    "@opensumi/ide-core-node": "2.19.11"
   },
   "devDependencies": {
-    "@opensumi/ide-components": "2.19.10",
-    "@opensumi/ide-core-browser": "2.19.10",
+    "@opensumi/ide-components": "2.19.11",
+    "@opensumi/ide-core-browser": "2.19.11",
     "@opensumi/ide-dev-tool": "^1.3.1",
-    "@opensumi/ide-editor": "2.19.10",
-    "@opensumi/ide-file-search": "2.19.10",
-    "@opensumi/ide-file-service": "2.19.10",
-    "@opensumi/ide-overlay": "2.19.10",
-    "@opensumi/ide-quick-open": "2.19.10",
-    "@opensumi/ide-workspace": "2.19.10",
-    "@opensumi/ide-workspace-edit": "2.19.10"
+    "@opensumi/ide-editor": "2.19.11",
+    "@opensumi/ide-file-search": "2.19.11",
+    "@opensumi/ide-file-service": "2.19.11",
+    "@opensumi/ide-overlay": "2.19.11",
+    "@opensumi/ide-quick-open": "2.19.11",
+    "@opensumi/ide-workspace": "2.19.11",
+    "@opensumi/ide-workspace-edit": "2.19.11"
   }
 }
diff --git a/packages/comments/package.json b/packages/comments/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-comments",
-  "version": "2.19.10",
+  "version": "2.19.11",
   "files": [
     "lib"
   ],
@@ -16,18 +16,18 @@
     "url": "[email protected]:opensumi/core.git"
   },
   "dependencies": {
-    "@opensumi/ide-core-common": "2.19.10",
+    "@opensumi/ide-core-common": "2.19.11",
     "marked": "4.0.10",
     "react-mentions": "^3.3.1"
   },
   "devDependencies": {
-    "@opensumi/ide-components": "2.19.10",
-    "@opensumi/ide-core-browser": "2.19.10",
+    "@opensumi/ide-components": "2.19.11",
+    "@opensumi/ide-core-browser": "2.19.11",
     "@opensumi/ide-dev-tool": "^1.3.1",
-    "@opensumi/ide-editor": "2.19.10",
-    "@opensumi/ide-main-layout": "2.19.10",
-    "@opensumi/ide-monaco-enhance": "2.19.10",
-    "@opensumi/ide-theme": "2.19.10",
+    "@opensumi/ide-editor": "2.19.11",
+    "@opensumi/ide-main-layout": "2.19.11",
+    "@opensumi/ide-monaco-enhance": "2.19.11",
+    "@opensumi/ide-theme": "2.19.11",
     "@types/marked": "4.0.1"
   }
 }
diff --git a/packages/components/package.json b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-components",
-  "version": "2.19.10",
+  "version": "2.19.11",
   "description": "@opensumi/ide-components",
   "license": "MIT",
   "main": "lib/index.js",
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.6.4",
-    "@opensumi/ide-utils": "2.19.10",
+    "@opensumi/ide-utils": "2.19.11",
     "@types/react-window": "^1.8.5",
     "fuzzy": "^0.1.3",
     "lodash": "^4.17.15",

diff --git a/packages/connection/package.json b/packages/connection/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-connection",
-  "version": "2.19.10",
+  "version": "2.19.11",
   "files": [
     "lib"
   ],
@@ -16,13 +16,13 @@
     "url": "[email protected]:opensumi/core.git"
   },
   "dependencies": {
-    "@opensumi/ide-core-common": "2.19.10",
+    "@opensumi/ide-core-common": "2.19.11",
     "@opensumi/vscode-jsonrpc": "^8.0.0-next.2",
     "path-match": "^1.2.4",
     "ws": "^7.2.0"
   },
   "devDependencies": {
-    "@opensumi/ide-components": "2.19.10",
+    "@opensumi/ide-components": "2.19.11",
     "@opensumi/ide-dev-tool": "^1.3.1",
     "mock-socket": "^9.0.2"
   }

diff --git a/packages/core-browser/package.json b/packages/core-browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-core-browser",
-  "version": "2.19.10",
+  "version": "2.19.11",
   "description": "@opensumi/ide-core-browser",
   "files": [
     "lib"
@@ -17,9 +17,9 @@
     "build": "tsc --build ../../configs/ts/references/tsconfig.core-browser.json"
   },
   "dependencies": {
-    "@opensumi/ide-components": "2.19.10",
-    "@opensumi/ide-connection": "2.19.10",
-    "@opensumi/ide-core-common": "2.19.10",
+    "@opensumi/ide-components": "2.19.11",
+    "@opensumi/ide-connection": "2.19.11",
+    "@opensumi/ide-core-common": "2.19.11",
     "@opensumi/vscode-debugprotocol": "1.49.0-beta.1",
     "@vscode/codicons": "0.0.27",
     "ajv": "^6.10.0",

diff --git a/packages/core-browser/src/react-providers/config-provider.tsx b/packages/core-browser/src/react-providers/config-provider.tsx
@@ -137,6 +137,11 @@ export interface AppConfig {
    * 但这会导致 workerHost 的 origin 为 null，使某些请求失败
    */
   useIframeWrapWorkerHost?: boolean;
+
+  /**
+   * 忽略 Worker Host 可能出现的跨域问题
+   */
+  ignoreWorkerHostCors?: boolean;
   /**
    * 自定义客户端 id，是 websocket 服务的唯一标识
    * 也是传给声明了 backServices 的后端 Service 的唯一标识

diff --git a/packages/core-common/package.json b/packages/core-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-core-common",
-  "version": "2.19.10",
+  "version": "2.19.11",
   "description": "@opensumi/ide-core-common",
   "files": [
     "lib"
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "@opensumi/di": "^1.4.0",
-    "@opensumi/ide-utils": "2.19.10",
+    "@opensumi/ide-utils": "2.19.11",
     "jschardet": "3.0.0"
   },
   "devDependencies": {

diff --git a/packages/core-electron-main/package.json b/packages/core-electron-main/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-core-electron-main",
-  "version": "2.19.10",
+  "version": "2.19.11",
   "files": [
     "lib",
     "browser-preload"
@@ -17,7 +17,7 @@
     "url": "[email protected]:opensumi/core.git"
   },
   "dependencies": {
-    "@opensumi/ide-core-common": "2.19.10",
+    "@opensumi/ide-core-common": "2.19.11",
     "tree-kill": "^1.2.2"
   },
   "peerDependencies": {

diff --git a/packages/core-node/package.json b/packages/core-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-core-node",
-  "version": "2.19.10",
+  "version": "2.19.11",
   "description": "@opensumi/ide-core-node",
   "files": [
     "lib"
@@ -17,8 +17,8 @@
     "url": "[email protected]:opensumi/core.git"
   },
   "dependencies": {
-    "@opensumi/ide-connection": "2.19.10",
-    "@opensumi/ide-core-common": "2.19.10",
+    "@opensumi/ide-connection": "2.19.11",
+    "@opensumi/ide-core-common": "2.19.11",
     "keytar": "^7.7.0"
   },
   "devDependencies": {

diff --git a/packages/debug/package.json b/packages/debug/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-debug",
-  "version": "2.19.10",
+  "version": "2.19.11",
   "files": [
     "lib"
   ],
@@ -16,32 +16,32 @@
     "url": "[email protected]:opensumi/core.git"
   },
   "dependencies": {
-    "@opensumi/ide-connection": "2.19.10",
-    "@opensumi/ide-core-common": "2.19.10",
-    "@opensumi/ide-core-node": "2.19.10",
-    "@opensumi/ide-file-service": "2.19.10",
-    "@opensumi/ide-task": "2.19.10",
-    "@opensumi/ide-terminal-next": "2.19.10",
+    "@opensumi/ide-connection": "2.19.11",
+    "@opensumi/ide-core-common": "2.19.11",
+    "@opensumi/ide-core-node": "2.19.11",
+    "@opensumi/ide-file-service": "2.19.11",
+    "@opensumi/ide-task": "2.19.11",
+    "@opensumi/ide-terminal-next": "2.19.11",
     "anser": "^1.4.9",
     "btoa": "^1.2.1"
   },
   "devDependencies": {
-    "@opensumi/ide-components": "2.19.10",
-    "@opensumi/ide-core-browser": "2.19.10",
+    "@opensumi/ide-components": "2.19.11",
+    "@opensumi/ide-core-browser": "2.19.11",
     "@opensumi/ide-dev-tool": "^1.3.1",
-    "@opensumi/ide-editor": "2.19.10",
-    "@opensumi/ide-main-layout": "2.19.10",
-    "@opensumi/ide-monaco": "2.19.10",
-    "@opensumi/ide-monaco-enhance": "2.19.10",
-    "@opensumi/ide-output": "2.19.10",
-    "@opensumi/ide-overlay": "2.19.10",
-    "@opensumi/ide-preferences": "2.19.10",
-    "@opensumi/ide-quick-open": "2.19.10",
-    "@opensumi/ide-storage": "2.19.10",
-    "@opensumi/ide-theme": "2.19.10",
-    "@opensumi/ide-variable": "2.19.10",
-    "@opensumi/ide-workspace": "2.19.10",
-    "@opensumi/ide-workspace-edit": "2.19.10",
+    "@opensumi/ide-editor": "2.19.11",
+    "@opensumi/ide-main-layout": "2.19.11",
+    "@opensumi/ide-monaco": "2.19.11",
+    "@opensumi/ide-monaco-enhance": "2.19.11",
+    "@opensumi/ide-output": "2.19.11",
+    "@opensumi/ide-overlay": "2.19.11",
+    "@opensumi/ide-preferences": "2.19.11",
+    "@opensumi/ide-quick-open": "2.19.11",
+    "@opensumi/ide-storage": "2.19.11",
+    "@opensumi/ide-theme": "2.19.11",
+    "@opensumi/ide-variable": "2.19.11",
+    "@opensumi/ide-workspace": "2.19.11",
+    "@opensumi/ide-workspace-edit": "2.19.11",
     "@types/btoa": "^1.2.3"
   }
 }
diff --git a/packages/decoration/package.json b/packages/decoration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-decoration",
-  "version": "2.19.10",
+  "version": "2.19.9",
   "files": [
     "lib"
   ],
@@ -16,11 +16,11 @@
     "url": "[email protected]:opensumi/core.git"
   },
   "dependencies": {
-    "@opensumi/ide-core-common": "2.19.10",
-    "@opensumi/ide-core-node": "2.19.10"
+    "@opensumi/ide-core-common": "2.19.9",
+    "@opensumi/ide-core-node": "2.19.9"
   },
   "devDependencies": {
-    "@opensumi/ide-core-browser": "2.19.10",
+    "@opensumi/ide-core-browser": "2.19.9",
     "@opensumi/ide-dev-tool": "^1.3.1"
   }
 }
diff --git a/packages/editor/package.json b/packages/editor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-editor",
-  "version": "2.19.10",
+  "version": "2.19.11",
   "files": [
     "lib"
   ],
@@ -16,19 +16,19 @@
     "url": "[email protected]:opensumi/core.git"
   },
   "dependencies": {
-    "@opensumi/ide-core-common": "2.19.10",
-    "@opensumi/ide-core-node": "2.19.10",
-    "@opensumi/ide-file-service": "2.19.10",
-    "@opensumi/ide-monaco": "2.19.10",
+    "@opensumi/ide-core-common": "2.19.11",
+    "@opensumi/ide-core-node": "2.19.11",
+    "@opensumi/ide-file-service": "2.19.11",
+    "@opensumi/ide-monaco": "2.19.11",
     "vscode-oniguruma": "1.5.1"
   },
   "devDependencies": {
-    "@opensumi/ide-components": "2.19.10",
-    "@opensumi/ide-core-browser": "2.19.10",
+    "@opensumi/ide-components": "2.19.11",
+    "@opensumi/ide-core-browser": "2.19.11",
     "@opensumi/ide-dev-tool": "^1.3.1",
-    "@opensumi/ide-overlay": "2.19.10",
-    "@opensumi/ide-quick-open": "2.19.10",
-    "@opensumi/ide-theme": "2.19.10",
-    "@opensumi/ide-workspace": "2.19.10"
+    "@opensumi/ide-overlay": "2.19.11",
+    "@opensumi/ide-quick-open": "2.19.11",
+    "@opensumi/ide-theme": "2.19.11",
+    "@opensumi/ide-workspace": "2.19.11"
   }
 }
diff --git a/packages/editor/src/browser/tab.view.tsx b/packages/editor/src/browser/tab.view.tsx
@@ -410,15 +410,24 @@ export type IEditorActionsProps = IEditorActionsBaseProps & React.HTMLAttributes
 export const EditorActions = forwardRef<HTMLDivElement, IEditorActionsProps>(
   (props: IEditorActionsProps, ref: React.Ref<typeof EditorActions>) => {
     const { group, className } = props;
+
+    const acquireArgs = useCallback(
+      () =>
+        (group.currentResource
+          ? [
+              group.currentResource.uri,
+              group,
+              group.currentOrPreviousFocusedEditor?.currentUri || group.currentEditor?.currentUri,
+            ]
+          : undefined) as [URI, IEditorGroup, MaybeNull<URI>] | undefined,
+      [group],
+    );
+
     const editorActionRegistry = useInjectable<IEditorActionRegistry>(IEditorActionRegistry);
     const editorService: WorkbenchEditorServiceImpl = useInjectable(WorkbenchEditorService);
     const menu = editorActionRegistry.getMenu(group);
     const [hasFocus, setHasFocus] = useState<boolean>(editorService.currentEditorGroup === group);
-    const [args, setArgs] = useState<[URI, IEditorGroup, MaybeNull<URI>] | undefined>(
-      group.currentResource
-        ? [group.currentResource.uri, group, group.currentOrPreviousFocusedEditor?.currentUri]
-        : undefined,
-    );
+    const [args, setArgs] = useState<[URI, IEditorGroup, MaybeNull<URI>] | undefined>(acquireArgs());
 
     useEffect(() => {
       const disposableCollection = new DisposableCollection();
@@ -429,17 +438,18 @@ export const EditorActions = forwardRef<HTMLDivElement, IEditorActionsProps>(
       );
       disposableCollection.push(
         editorService.onActiveResourceChange(() => {
-          setArgs(
-            group.currentResource
-              ? [group.currentResource.uri, group, group.currentOrPreviousFocusedEditor?.currentUri]
-              : undefined,
-          );
+          setArgs(acquireArgs());
+        }),
+      );
+      disposableCollection.push(
+        group.onDidEditorGroupTabChanged(() => {
+          setArgs(acquireArgs());
         }),
       );
       return () => {
         disposableCollection.dispose();
       };
-    }, []);
+    }, [group]);
 
     // 第三个参数是当前编辑器的URI（如果有）
     return (