chore: 升级 opensumi 2.18.3

Author: hacke2

package.json

@@ -8,7 +8,7 @@
   "description": "Ant Codespaces for browser",
   "main": "index.js",
   "engines": {
-    "kaitian": "2.17.0"
+    "kaitian": "2.18.3"
   },
   "scripts": {
     "type-check": "tsc --skipLibCheck --noEmit",

packages/acr/src/antcode-cr.tsx

@@ -1,9 +1,7 @@
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { Injector } from '@opensumi/di';
-import { URI } from '@opensumi/ide-core-common';
-import { join } from '@opensumi/ide-core-common/lib/path';
-import { equals } from '@opensumi/ide-core-common/lib/arrays';
+import { URI, path, arrays } from '@opensumi/ide-core-common';
 // internal patched
 import { disposeMode, disposableCollection } from '@alipay/alex/lib/core/patch';
 
@@ -27,6 +25,9 @@ import { Portals } from './portal';
 import { reportUserAccess } from './utils/monitor';
 import { CommentsZoneWidgetPatch, CommentsZoneWidget } from './overrides/comments-zone.view';
 
+const { equals } = arrays;
+const { join } = path;
+
 const { version } = require('../package.json');
 
 const AntcodeCR: React.FC<IAntcodeCRProps> = (props) => {

packages/acr/src/modules/antcode-service/index.ts

@@ -1,7 +1,6 @@
 import { Injectable, Optional } from '@opensumi/di';
 import { action, observable, computed } from 'mobx';
-import { Event, Emitter } from '@opensumi/ide-core-common';
-import { Path } from '@opensumi/ide-core-common/lib/path';
+import { Event, Emitter, path } from '@opensumi/ide-core-common';
 import { URI } from '@opensumi/ide-core-browser';
 import differenceBy from 'lodash/differenceBy';
 
@@ -25,6 +24,8 @@ import { User } from './interfaces/user';
 import { setUserWorkId } from '../../utils/monitor';
 import { sortPathList } from '../../utils/change-file-sorter';
 
+const { Path } = path;
+
 // antcode 所需要的 encoding 选项 key/value
 export const antcodeEncodingOpts = [
   {

packages/acr/src/modules/change-file.quick-open.ts

@@ -8,16 +8,18 @@ import {
   QuickOpenMode,
   URI,
   formatLocalize,
+  path,
 } from '@opensumi/ide-core-browser';
 import { LabelService } from '@opensumi/ide-core-browser/lib/services';
 import { QuickOpenHandler } from '@opensumi/ide-quick-open/lib/browser/prefix-quick-open.service';
 import { QuickOpenModel } from '@opensumi/ide-quick-open';
-import { basename } from '@opensumi/ide-core-common/lib/path';
 import { OpenChangeFilesService } from './open-change-files';
 
 import { IAntcodeService } from './antcode-service/base';
 import type { IPullRequestChangeDiff } from './antcode-service/base';
 
+const { basename } = path;
+
 @Injectable({ multiple: true })
 export class ChangeFileQuickOpenItem extends QuickOpenItem {
   constructor(

packages/acr/src/modules/git-scheme/resource-provider/git.ts

@@ -1,12 +1,13 @@
 import { IResourceProvider, IResource } from '@opensumi/ide-editor/lib/browser';
-import { URI, localize } from '@opensumi/ide-core-common';
+import { URI, localize, path } from '@opensumi/ide-core-common';
 import { Injectable, Autowired } from '@opensumi/di';
 import { LabelService } from '@opensumi/ide-core-browser/lib/services';
-import { Path } from '@opensumi/ide-core-common/lib/path';
 
 import { getMinimalDiffPath } from '../../../utils';
 import { fromSCMUri } from '../../../utils/scm-uri';
 
+const { Path } = path;
+
 @Injectable()
 export class GitResourceProvider implements IResourceProvider {
   readonly scheme = 'git';

packages/acr/src/modules/kt-ext-provider/fs-provider/index.ts

@@ -1,13 +1,12 @@
 import { Injectable } from '@opensumi/di';
-import { Uri, Event } from '@opensumi/ide-core-browser';
+import { Uri, Event, BinaryBuffer } from '@opensumi/ide-core-browser';
 import {
   FileSystemProvider,
   FileStat,
   FileType,
   FileChangeEvent,
   FileSystemProviderCapabilities,
 } from '@opensumi/ide-file-service';
-import { BinaryBuffer } from '@opensumi/ide-core-common/lib/utils/buffer';
 
 /**
  * 解析 kt-ext:// 文件，解决前端插件加载问题

packages/acr/src/modules/merge-request/changes-tree/changes-tree-model.service.ts

@@ -19,10 +19,9 @@ import {
   OnEvent,
 } from '@opensumi/ide-core-browser';
 import { LabelService } from '@opensumi/ide-core-browser/lib/services';
-import { Path } from '@opensumi/ide-core-common/lib/path';
 import pSeries from 'p-series';
 import { IProgressService } from '@opensumi/ide-core-browser/lib/progress';
-import { debounce } from '@opensumi/ide-core-common';
+import { debounce, path } from '@opensumi/ide-core-common';
 
 import { ChangesTreeDecorationService } from './changes-tree-decoration.service';
 import { ChangeDirectory, ChangeFile } from './changes-tree-node';
@@ -35,6 +34,8 @@ import { OpenChangeFilesService } from '../../../modules/open-change-files';
 import { OpenDiffEditorEvent } from '../../../common/events';
 import { IAntcodeService } from '../../antcode-service/base';
 
+const { Path } = path;
+
 export interface IEditorTreeHandle extends IRecycleTreeHandle {
   hasDirectFocus: () => boolean;
 }

packages/acr/src/modules/merge-request/changes-tree/changes-tree.api.ts

@@ -1,9 +1,11 @@
 import { Autowired, Injectable } from '@opensumi/di';
-import { Path } from '@opensumi/ide-core-common/lib/path';
+import { path } from '@opensumi/ide-core-common';
 
 import { IAntcodeService, IPullRequestChangeDiff } from '../../antcode-service/base';
 import { IPullRequestChangeItem } from '../../../common';
 
+const { Path } = path;
+
 const PathSeparator = Path.separator;
 
 export enum ChangeTreeMode {

packages/acr/src/modules/merge-request/changes-tree/changes-tree.service.ts

@@ -1,7 +1,6 @@
 import { Autowired, Injectable } from '@opensumi/di';
-import { IDisposable, URI } from '@opensumi/ide-core-common';
+import { IDisposable, URI, path as paths } from '@opensumi/ide-core-common';
 import { ITreeNodeOrCompositeTreeNode, Tree, TreeNodeType } from '@opensumi/ide-components';
-import * as paths from '@opensumi/ide-core-common/lib/path';
 import { IContextKey, IContextKeyService, Emitter, Event } from '@opensumi/ide-core-browser';
 
 import { ChangeFileRoot, ChangeDirectory, ChangeFile } from './changes-tree-node';

packages/acr/src/modules/merge-request/changes-tree/util.ts

@@ -1,7 +1,9 @@
-import { URI, removeUndefined } from '@opensumi/ide-core-common';
+import { URI, objects } from '@opensumi/ide-core-common';
 import { localize } from '@opensumi/ide-core-browser';
 import { IPullRequestChangeDiff } from '../../antcode-service/base';
 
+const { removeUndefined } = objects;
+
 /**
  * 通过 uri 获取 commit id
  */