Skip to content

Commit 49718af

Browse files
committed
chore: 调整项目结构,去掉不确定的部分
1 parent b252b3b commit 49718af

Some content is hidden

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

80 files changed

+326
-941
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,4 @@ dist
8282
lib
8383
.vscode/*
8484
!.vscode/launch.json
85+
package-lock.json
File renamed without changes.

tool/tsconfig/tsconfig.core.json config/ts/tsconfig.build.json

+2
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,7 @@
33
{ "path": "./references/tsconfig.core.json" },
44
{ "path": "./references/tsconfig.core-browser.json" },
55
{ "path": "./references/tsconfig.core-node.json" },
6+
{ "path": "./references/tsconfig.file-tree.json" },
7+
{ "path": "./references/tsconfig.main-layout.json" }
68
]
79
}

lerna.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"npmClient": "tnpm",
44
"packages": [
55
"packages/*",
6-
"tool/packages/*"
6+
"tool/*"
77
]
88
}

packages/core-browser/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
"@ali/ide-core": "^0.0.9",
2020
"react": "^16.8.6",
2121
"rxjs": "^6.5.1",
22-
"socket.io-client": "^2.2.0"
23-
},
24-
"devDependencies": {
25-
"@types/socket.io-client": "^1.4.32",
26-
"npm-run-all": "^4.1.5"
22+
"socket.io-client": "^2.2.0",
23+
"mobx": "^5.9.4",
24+
"mobx-react-lite": "^1.3.1",
25+
"@phosphor/default-theme": "^0.1.0",
26+
"@phosphor/widgets": "^1.6.0"
2727
}
2828
}

packages/core-browser/src/app.tsx

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,26 @@
11
import * as React from 'react';
22
import { ConfigProvider, RenderNameEnum, SlotRenderer } from './react-providers';
33
import { Injector, Provider } from '@ali/common-di';
4-
import { Requester, createRequesterProvider } from '@ali/ide-core';
54
import { BrowserModule, SlotMap } from './browser-module';
65

76
interface AppProps {
87
modules: BrowserModule[];
9-
requester: Requester;
108
slotMap: SlotMap;
119
}
1210

1311
export function App(props: AppProps) {
14-
const providers: Provider[] = [
15-
createRequesterProvider(props.requester),
16-
];
12+
const providers: Provider[] = [];
13+
const slotMap = props.slotMap;
1714

1815
for (const item of props.modules) {
1916
if (item.providers) {
2017
providers.push(...item.providers);
2118
}
2219

2320
for (const [key, value] of item.slotMap.entries()) {
24-
props.slotMap.set(key, value);
21+
if (!slotMap.has(key)) {
22+
slotMap.set(key, value);
23+
}
2524
}
2625
}
2726

packages/core-browser/src/browser-module.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ import { FunctionComponent } from 'react';
33

44
export type SlotMap = Map<string | symbol, FunctionComponent>;
55

6-
export interface BrowserModule extends BasicModule {
7-
slotMap: SlotMap;
6+
export abstract class BrowserModule extends BasicModule {
7+
abstract slotMap: SlotMap;
88
}

packages/core-browser/src/decorators/index.ts

-7
This file was deleted.

packages/core-browser/src/index.ts

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
export * from './decorators';
21
export * from './react-hooks';
32
export * from './react-providers';
43
export * from './browser-module';
54
export * from './app';
6-
export * from './requester';

packages/core-browser/src/react-providers/slot.tsx

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/**
2+
* 前端提供一套 Slot 的注册和渲染的机制
3+
*/
4+
15
import * as React from 'react';
26
import { ConfigContext } from './config-provider';
37

@@ -11,7 +15,6 @@ export enum RenderNameEnum {
1115
panel = 'core.panel',
1216
statusBar = 'core.statusBar',
1317
commandBar = 'core.commandBar',
14-
1518
}
1619

1720
export function SlotRenderer({ name }: { name: string }) {

packages/core-browser/src/requester/client-api.ts

-39
This file was deleted.

packages/core-browser/src/requester/electron-requester.ts

-3
This file was deleted.

packages/core-browser/src/requester/index.ts

-3
This file was deleted.

packages/core-browser/src/requester/web-requester.ts

-49
This file was deleted.

packages/core-node/src/index.ts

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
export * from './module-loader';
2-
export * from './request-handler';
3-
export * from './server-module';
1+
import { BasicModule } from '@ali/ide-core';
2+
3+
export abstract class NodeModule extends BasicModule {
4+
// TODO
5+
}

packages/core-node/src/module-loader.ts

-35
This file was deleted.

packages/core-node/src/request-handler.ts

-25
This file was deleted.

packages/core-node/src/server-module.ts

-9
This file was deleted.

packages/core/package.json

-3
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,5 @@
1818
"dependencies": {
1919
"@ali/common-di": "^2.2.1",
2020
"tslib": "^1.9.3"
21-
},
22-
"devDependencies": {
23-
"npm-run-all": "^4.1.5"
2421
}
2522
}

packages/core/src/declare.ts

+2-10
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,2 @@
1-
export type ConstructorOf<T, K extends any[] = any[]> = new (...args: K) => T;
2-
3-
export class Disposable {
4-
protected disposations = new Set<() => void>();
5-
6-
dispose() {
7-
const arr = Array.from(this.disposations);
8-
arr.forEach((fn) => fn());
9-
}
10-
}
1+
export type ConstructorOf<T, K extends any[] = any[]> =
2+
new (...args: K) => T;

packages/core/src/decorators.ts

-39
This file was deleted.

packages/core/src/disposable.ts

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/**
2+
* 可销毁对象相关的接口定义和基本 class 定义
3+
*/
4+
5+
export interface IDisposable {
6+
disposations: Set<() => void>;
7+
dispose: () => void;
8+
}
9+
10+
export class Disposable implements IDisposable {
11+
disposations = new Set<() => void>();
12+
13+
dispose() {
14+
const arr = Array.from(this.disposations);
15+
arr.forEach((fn) => fn());
16+
}
17+
}

packages/core/src/event-manager.ts

-27
This file was deleted.

0 commit comments

Comments
 (0)