Skip to content

Commit 0af7a38

Browse files
authored
feat: upgrade opensumi (#96)
1 parent be26466 commit 0af7a38

8 files changed

Lines changed: 497 additions & 449 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"description": "codeblitzjs",
99
"main": "index.js",
1010
"engines": {
11-
"opensumi": "3.1.2-next-1718354423.0"
11+
"opensumi": "3.1.4-next-1719380894.0"
1212
},
1313
"scripts": {
1414
"prepare": "husky install",

packages/cli/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
"opensumi codeblitzjs"
1111
],
1212
"engines": {
13-
"opensumi": "3.1.2-next-1718354423.0",
13+
"opensumi": "3.1.4-next-1719380894.0",
1414
"node": ">=10.0.0"
1515
},
1616
"dependencies": {
1717
"@codeblitzjs/ide-common": "1.0.4",
18-
"@opensumi/ide-extension": "3.1.2-next-1718354423.0",
18+
"@opensumi/ide-extension": "3.1.4-next-1719380894.0",
1919
"async-retry": "^1.3.1",
2020
"await-event": "^2.1.0",
2121
"commander": "^7.2.0",

packages/core/package.json

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -33,48 +33,48 @@
3333
"@codeblitzjs/ide-plugin": "1.0.4",
3434
"@codeblitzjs/ide-registry": "1.0.4",
3535
"@codeblitzjs/ide-sumi-core": "1.0.4",
36-
"@opensumi/ide-addons": "3.1.2-next-1718354423.0",
37-
"@opensumi/ide-ai-native": "3.1.2-next-1718354423.0",
38-
"@opensumi/ide-comments": "3.1.2-next-1718354423.0",
39-
"@opensumi/ide-core-browser": "3.1.2-next-1718354423.0",
40-
"@opensumi/ide-core-common": "3.1.2-next-1718354423.0",
41-
"@opensumi/ide-debug": "3.1.2-next-1718354423.0",
42-
"@opensumi/ide-decoration": "3.1.2-next-1718354423.0",
43-
"@opensumi/ide-design": "3.1.2-next-1718354423.0",
44-
"@opensumi/ide-editor": "3.1.2-next-1718354423.0",
45-
"@opensumi/ide-explorer": "3.1.2-next-1718354423.0",
46-
"@opensumi/ide-express-file-server": "3.1.2-next-1718354423.0",
47-
"@opensumi/ide-extension": "3.1.2-next-1718354423.0",
48-
"@opensumi/ide-extension-storage": "3.1.2-next-1718354423.0",
49-
"@opensumi/ide-file-scheme": "3.1.2-next-1718354423.0",
50-
"@opensumi/ide-file-service": "3.1.2-next-1718354423.0",
51-
"@opensumi/ide-file-tree-next": "3.1.2-next-1718354423.0",
52-
"@opensumi/ide-i18n": "3.1.2-next-1718354423.0",
53-
"@opensumi/ide-keymaps": "3.1.2-next-1718354423.0",
54-
"@opensumi/ide-logs": "3.1.2-next-1718354423.0",
55-
"@opensumi/ide-main-layout": "3.1.2-next-1718354423.0",
56-
"@opensumi/ide-markdown": "3.1.2-next-1718354423.0",
57-
"@opensumi/ide-markers": "3.1.2-next-1718354423.0",
58-
"@opensumi/ide-menu-bar": "3.1.2-next-1718354423.0",
59-
"@opensumi/ide-monaco": "3.1.2-next-1718354423.0",
60-
"@opensumi/ide-monaco-enhance": "3.1.2-next-1718354423.0",
61-
"@opensumi/ide-opened-editor": "3.1.2-next-1718354423.0",
62-
"@opensumi/ide-outline": "3.1.2-next-1718354423.0",
63-
"@opensumi/ide-output": "3.1.2-next-1718354423.0",
64-
"@opensumi/ide-overlay": "3.1.2-next-1718354423.0",
65-
"@opensumi/ide-preferences": "3.1.2-next-1718354423.0",
66-
"@opensumi/ide-quick-open": "3.1.2-next-1718354423.0",
67-
"@opensumi/ide-scm": "3.1.2-next-1718354423.0",
68-
"@opensumi/ide-search": "3.1.2-next-1718354423.0",
69-
"@opensumi/ide-status-bar": "3.1.2-next-1718354423.0",
70-
"@opensumi/ide-storage": "3.1.2-next-1718354423.0",
71-
"@opensumi/ide-testing": "3.1.2-next-1718354423.0",
72-
"@opensumi/ide-theme": "3.1.2-next-1718354423.0",
73-
"@opensumi/ide-toolbar": "3.1.2-next-1718354423.0",
74-
"@opensumi/ide-variable": "3.1.2-next-1718354423.0",
75-
"@opensumi/ide-webview": "3.1.2-next-1718354423.0",
76-
"@opensumi/ide-workspace": "3.1.2-next-1718354423.0",
77-
"@opensumi/ide-workspace-edit": "3.1.2-next-1718354423.0",
36+
"@opensumi/ide-addons": "3.1.4-next-1719380894.0",
37+
"@opensumi/ide-ai-native": "3.1.4-next-1719380894.0",
38+
"@opensumi/ide-comments": "3.1.4-next-1719380894.0",
39+
"@opensumi/ide-core-browser": "3.1.4-next-1719380894.0",
40+
"@opensumi/ide-core-common": "3.1.4-next-1719380894.0",
41+
"@opensumi/ide-debug": "3.1.4-next-1719380894.0",
42+
"@opensumi/ide-decoration": "3.1.4-next-1719380894.0",
43+
"@opensumi/ide-design": "3.1.4-next-1719380894.0",
44+
"@opensumi/ide-editor": "3.1.4-next-1719380894.0",
45+
"@opensumi/ide-explorer": "3.1.4-next-1719380894.0",
46+
"@opensumi/ide-express-file-server": "3.1.4-next-1719380894.0",
47+
"@opensumi/ide-extension": "3.1.4-next-1719380894.0",
48+
"@opensumi/ide-extension-storage": "3.1.4-next-1719380894.0",
49+
"@opensumi/ide-file-scheme": "3.1.4-next-1719380894.0",
50+
"@opensumi/ide-file-service": "3.1.4-next-1719380894.0",
51+
"@opensumi/ide-file-tree-next": "3.1.4-next-1719380894.0",
52+
"@opensumi/ide-i18n": "3.1.4-next-1719380894.0",
53+
"@opensumi/ide-keymaps": "3.1.4-next-1719380894.0",
54+
"@opensumi/ide-logs": "3.1.4-next-1719380894.0",
55+
"@opensumi/ide-main-layout": "3.1.4-next-1719380894.0",
56+
"@opensumi/ide-markdown": "3.1.4-next-1719380894.0",
57+
"@opensumi/ide-markers": "3.1.4-next-1719380894.0",
58+
"@opensumi/ide-menu-bar": "3.1.4-next-1719380894.0",
59+
"@opensumi/ide-monaco": "3.1.4-next-1719380894.0",
60+
"@opensumi/ide-monaco-enhance": "3.1.4-next-1719380894.0",
61+
"@opensumi/ide-opened-editor": "3.1.4-next-1719380894.0",
62+
"@opensumi/ide-outline": "3.1.4-next-1719380894.0",
63+
"@opensumi/ide-output": "3.1.4-next-1719380894.0",
64+
"@opensumi/ide-overlay": "3.1.4-next-1719380894.0",
65+
"@opensumi/ide-preferences": "3.1.4-next-1719380894.0",
66+
"@opensumi/ide-quick-open": "3.1.4-next-1719380894.0",
67+
"@opensumi/ide-scm": "3.1.4-next-1719380894.0",
68+
"@opensumi/ide-search": "3.1.4-next-1719380894.0",
69+
"@opensumi/ide-status-bar": "3.1.4-next-1719380894.0",
70+
"@opensumi/ide-storage": "3.1.4-next-1719380894.0",
71+
"@opensumi/ide-testing": "3.1.4-next-1719380894.0",
72+
"@opensumi/ide-theme": "3.1.4-next-1719380894.0",
73+
"@opensumi/ide-toolbar": "3.1.4-next-1719380894.0",
74+
"@opensumi/ide-variable": "3.1.4-next-1719380894.0",
75+
"@opensumi/ide-webview": "3.1.4-next-1719380894.0",
76+
"@opensumi/ide-workspace": "3.1.4-next-1719380894.0",
77+
"@opensumi/ide-workspace-edit": "3.1.4-next-1719380894.0",
7878
"@opensumi/textmate-languages": "^2.7.0",
7979
"tslib": "^2.2.0"
8080
},

packages/sumi-core/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
"@codeblitzjs/ide-common": "1.0.4",
1616
"@codeblitzjs/ide-registry": "1.0.4",
1717
"@opensumi/di": "^1.0.0",
18-
"@opensumi/ide-ai-native": "3.1.2-next-1718354423.0",
19-
"@opensumi/ide-core-browser": "3.1.2-next-1718354423.0",
20-
"@opensumi/ide-core-common": "3.1.2-next-1718354423.0",
21-
"@opensumi/ide-debug": "3.1.2-next-1718354423.0",
22-
"@opensumi/ide-extension": "3.1.2-next-1718354423.0",
23-
"@opensumi/ide-file-scheme": "3.1.2-next-1718354423.0",
24-
"@opensumi/ide-file-service": "3.1.2-next-1718354423.0",
25-
"@opensumi/ide-logs": "3.1.2-next-1718354423.0",
18+
"@opensumi/ide-ai-native": "3.1.4-next-1719380894.0",
19+
"@opensumi/ide-core-browser": "3.1.4-next-1719380894.0",
20+
"@opensumi/ide-core-common": "3.1.4-next-1719380894.0",
21+
"@opensumi/ide-debug": "3.1.4-next-1719380894.0",
22+
"@opensumi/ide-extension": "3.1.4-next-1719380894.0",
23+
"@opensumi/ide-file-scheme": "3.1.4-next-1719380894.0",
24+
"@opensumi/ide-file-service": "3.1.4-next-1719380894.0",
25+
"@opensumi/ide-logs": "3.1.4-next-1719380894.0",
2626
"assert": "^2.0.0",
2727
"fs-extra-factory": "^0.2.1",
2828
"iconv-lite-umd": "^0.6.8",

packages/sumi-core/src/server/logs-core/log.service.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
import { Injectable, Autowired } from '@opensumi/di';
1+
import { Autowired, Injectable } from '@opensumi/di';
22
import {
3+
BaseLogServiceOptions,
4+
DebugLog,
5+
format,
6+
IBaseLogService,
37
ILogService,
48
ILogServiceOptions,
5-
BaseLogServiceOptions,
69
LogLevel,
710
SupportLogNamespace,
8-
format,
9-
DebugLog,
10-
IBaseLogService,
1111
} from '@opensumi/ide-logs/lib/common';
1212
import * as path from 'path';
1313

14-
import { ILogServiceForClient } from './base';
15-
import { ILogServiceManager } from '../core/base';
16-
import { RPCService } from '../../connection';
1714
import { HOME_ROOT } from '../../common';
15+
import { RPCService } from '../../connection';
16+
import { ILogServiceManager } from '../core/base';
17+
import { ILogServiceForClient } from './base';
1818

1919
export const DEFAULT_LOG_FOLDER = path.join(HOME_ROOT, `.opensumi/logs/`);
2020

@@ -206,16 +206,16 @@ export class LogServiceForClient extends RPCService implements ILogServiceForCli
206206
this.getLogger(namespace).dispose();
207207
}
208208

209-
setGlobalLogLevel(level: LogLevel) {
209+
async setGlobalLogLevel(level: LogLevel) {
210210
this.loggerManager.setGlobalLogLevel(level);
211211
}
212212

213-
getGlobalLogLevel() {
214-
this.loggerManager.getGlobalLogLevel();
213+
async getGlobalLogLevel() {
214+
return this.loggerManager.getGlobalLogLevel();
215215
}
216216

217217
disposeAll() {
218-
this.loggerManager.dispose();
218+
return this.loggerManager.dispose();
219219
}
220220

221221
async getLogFolder() {

packages/toolkit/define.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"__OPENSUMI_VERSION__": "3.0.4-next-1716974737.0",
3-
"__WORKER_HOST__": "https://gw.alipayobjects.com/os/cloud-ide/codeblitz/worker-host.a3545716.js",
2+
"__OPENSUMI_VERSION__": "3.1.4-next-1719380894.0",
3+
"__WORKER_HOST__": "https://gw.alipayobjects.com/os/cloud-ide/codeblitz/worker-host.aa55de91.js",
44
"__WEBVIEW_ENDPOINT__": "https://gw.alipayobjects.com/os/cloud-ide/codeblitz/webview.805ab470",
55
"__WEBVIEW_SCRIPT__": "https://gw.alipayobjects.com/os/cloud-ide/codeblitz/webview.66e57793.js"
66
}

scripts/upgrade-opensumi.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ invoke(async () => {
2929
await Promise.all(pkgPathList.map((pkgPath) => upgradeOpenSumiDeps(pkgPath, version, packages)));
3030
signale.await(`yarn 重装依赖`);
3131
await exec('yarn --network-timeout 100000');
32+
await exec('node scripts/build-assets')
3233
});
3334

3435
async function getOrCheckVersion(version) {

0 commit comments

Comments
 (0)