feat: rename module git to code-service

Author: winjo

package.json

@@ -15,9 +15,9 @@
     "init": "npm run clean && npm run build && npm run ext",
     "start": "npm run dev",
     "ext": "alex ext",
-    "sdk": "INTEGRATION=sdk npm run dev",
     "inspect": "INTEGRATION=inspect npm run dev",
     "build": "node scripts/build",
+    "bundle": "node scripts/bundle",
     "create": "node scripts/create",
     "format": "prettier --write --parser typescript \"packages/**/*.ts?(x)\"",
     "dev": "webpack serve --config packages/toolkit/webpack/config.dev.js",

packages/alex/package.json

@@ -67,10 +67,8 @@
     "@alipay/alex-cli": "0.2.9",
     "@alipay/alex-core": "0.2.9",
     "@alipay/alex-shared": "0.2.9",
-    "@alipay/alex-git": "0.2.9",
-    "@alipay/alex-i18n": "0.2.9",
-    "iconv-lite-umd": "^0.6.8",
-    "jschardet": "^2.2.1"
+    "@alipay/alex-code-service": "0.2.9",
+    "@alipay/alex-i18n": "0.2.9"
   },
   "tnpm": {
     "mode": "yarn",
@@ -81,7 +79,6 @@
     "@types/react-dom": "^16.9.9",
     "antd": "^3.20.3",
     "react": "^16.14.0",
-    "react-dom": "^16.14.0",
-    "vscode-languageserver-types": "~3.14"
+    "react-dom": "^16.14.0"
   }
 }

packages/alex/src/api/createApp.tsx

@@ -103,7 +103,7 @@ export function createApp({ appConfig, runtimeConfig }: IConfig): IAppInstance {
     (app.injector.get(IThemeService) as IThemeService).onThemeChange((e) => {
       themeStorage.set(e.type);
     });
-    // IDE 销毁时，组件会触发 handleTreeBlur，但是 FileContextKey 实例会获取，此时在 dispose 阶段，injector.get(FileContextKey) 会抛出错误
+    // IDE 销毁时，组件会触发 handleTreeBlur，但是 FileContextKey 实例尚未初始化，此时在 dispose 阶段，injector.get(FileContextKey) 会抛出错误
     app.injector.get(FileTreeModelService).handleTreeBlur();
   };
 

packages/alex/src/api/renderApp.tsx

@@ -1,6 +1,7 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import ReactDOM from 'react-dom';
 import { IReporterService, localize, getDebugLogger } from '@ali/ide-core-common';
+import { REPORT_NAME } from '@alipay/alex-core';
 import { createApp } from './createApp';
 import { Root } from '../core/Root';
 import { RootProps, LandingProps } from '../core/types';
@@ -40,9 +41,9 @@ export const renderApp = (domElement: HTMLElement, props: IRenderProps) => {
         domElement
       );
 
-      (app.injector.get(IReporterService) as IReporterService).point('alex:error', 'startApp', {
-        error: err,
-      });
+      (app.injector.get(
+        IReporterService
+      ) as IReporterService).point(REPORT_NAME.ALEX_APP_START_ERROR, err?.message, { error: err });
       getDebugLogger().error(err);
       setTimeout(() => {
         throw err;
@@ -57,7 +58,7 @@ export const renderApp = (domElement: HTMLElement, props: IRenderProps) => {
 export const AppRenderer: React.FC<IRenderProps> = ({ onLoad, Landing, ...opts }) => {
   const app = useConstant(() => createApp(opts));
   const themeType = useConstant(() => themeStorage.get());
-  const [appElement, setAppElement] = useState<React.ReactElement | null>(null);
+  const appElementRef = useRef<React.ReactElement | null>(null);
 
   const [state, setState] = useState<{
     status: RootProps['status'];
@@ -67,17 +68,19 @@ export const AppRenderer: React.FC<IRenderProps> = ({ onLoad, Landing, ...opts }
   useEffect(() => {
     app
       .start((appElement) => {
-        setAppElement(appElement);
+        appElementRef.current = appElement;
+        setState({ status: 'success' });
         return Promise.resolve();
       })
       .then(() => {
-        setState({ status: 'success' });
         onLoad?.(app);
       })
       .catch((err: Error) => {
         setState({ error: err?.message || localize('error.unknown'), status: 'error' });
 
-        (app.injector.get(IReporterService) as IReporterService).point('alex:error', 'startApp', {
+        (app.injector.get(
+          IReporterService
+        ) as IReporterService).point(REPORT_NAME.ALEX_APP_START_ERROR, err?.message, {
           error: err,
         });
         getDebugLogger().error(err);
@@ -93,7 +96,7 @@ export const AppRenderer: React.FC<IRenderProps> = ({ onLoad, Landing, ...opts }
 
   return (
     <Root {...state} theme={themeType} Landing={Landing}>
-      {appElement}
+      {appElementRef.current}
     </Root>
   );
 };

packages/alex/src/core/style.module.less

@@ -7,6 +7,7 @@ alex-root {
 
 .landing {
   position: absolute;
+  z-index: 10;
   left: 0;
   right: 0;
   top: 0;

packages/alex/src/integration/startup/index.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { GitFileSchemeModule } from '@alipay/alex-git';
+import { GitFileSchemeModule } from '@alipay/alex-code-service';
 import { IAppInstance, AppRenderer } from '../..';
 import * as Alex from '../..';
 import { StartupModule } from './startup.module';
@@ -36,7 +36,7 @@ ReactDOM.render(
       workspaceDir: project,
     }}
     runtimeConfig={{
-      git: {
+      codeService: {
         platform: 'antcode',
         baseURL: '/code-service',
         project,

packages/code-service/README.md

@@ -0,0 +1,5 @@
+# code-service
+
+这个模块封装了 antcode 的请求，按理应该在写在集成侧，但又考虑到如果 antcode 项目中也可能使用，可能会重复
+
+先作为单独模块使用，再看优化方法

packages/git/__tests__/index.test.ts …ges/code-service/__tests__/index.test.tspackages/git/__tests__/index.test.ts renamed to packages/code-service/__tests__/index.test.ts packages/git/__tests__/index.test.ts renamed to packages/code-service/__tests__/index.test.ts

@@ -1,4 +1,4 @@
-describe('git', () => {
+describe('code-service', () => {
   it('example', () => {
     expect(1 + 1).toBe(2);
   });

packages/git/package.json packages/code-service/package.jsonpackages/git/package.json renamed to packages/code-service/package.json

@@ -1,7 +1,7 @@
 {
-  "name": "@alipay/alex-git",
+  "name": "@alipay/alex-code-service",
   "version": "0.2.9",
-  "description": "@alipay/alex-git",
+  "description": "@alipay/alex-code-service",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

packages/git/src/git-api.service.ts …ges/code-service/src/code-api.service.tspackages/git/src/git-api.service.ts renamed to packages/code-service/src/code-api.service.ts packages/git/src/git-api.service.ts renamed to packages/code-service/src/code-api.service.ts

@@ -1,12 +1,12 @@
 import { Injectable, Autowired } from '@ali/common-di';
-import { GitModelService } from './git-model.service';
+import { CodeModelService } from './code-model.service';
 import { request, API } from './request';
-import { IGitAPIService } from './types';
+import { ICodeAPIService } from './types';
 
 @Injectable()
-export class GitAPIService implements IGitAPIService {
+export class CodeAPIService implements ICodeAPIService {
   @Autowired()
-  gitModel: GitModelService;
+  gitModel: CodeModelService;
 
   getProjectInfo() {
     return request<API.ResponseGetProjectById>(