Skip to content

Commit

Permalink
Merge branch 'main' into chore/upgrade-textmate-language-package
Browse files Browse the repository at this point in the history
  • Loading branch information
@hacke2
hacke2 authored Dec 6, 2024
2 parents 64cbf72 + 8259a12 commit 7cf4774
Show file tree
Hide file tree
Showing 9 changed files with 462 additions and 459 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"description": "codeblitzjs",
"main": "index.js",
"engines": {
"opensumi": "3.5.0"
"opensumi": "3.6.0"
},
"scripts": {
"prepare": "husky install",
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
"opensumi codeblitzjs"
],
"engines": {
"opensumi": "3.5.0",
"opensumi": "3.6.0",
"node": ">=18.0.0"
},
"dependencies": {
"@codeblitzjs/ide-common": "workspace:*",
"@opensumi/extension-installer": "^0.0.1",
"@opensumi/ide-extension": "3.5.0",
"@opensumi/ide-extension": "3.6.0",
"commander": "^7.2.0",
"fs-extra": "^9.0.1",
"lodash.pick": "^4.4.0",
Expand Down
1 change: 1 addition & 0 deletions packages/code-api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"dependencies": {
"@codeblitzjs/ide-common": "workspace:*",
"@codeblitzjs/ide-sumi-core": "workspace:*",
"mobx": "^6.12.0",
"tslib": "^2.2.0"
}
}
84 changes: 42 additions & 42 deletions packages/core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,48 +33,48 @@
"@codeblitzjs/ide-plugin": "workspace:*",
"@codeblitzjs/ide-registry": "workspace:*",
"@codeblitzjs/ide-sumi-core": "workspace:*",
"@opensumi/ide-addons": "3.5.0",
"@opensumi/ide-ai-native": "3.5.0",
"@opensumi/ide-comments": "3.5.0",
"@opensumi/ide-core-browser": "3.5.0",
"@opensumi/ide-core-common": "3.5.0",
"@opensumi/ide-debug": "3.5.0",
"@opensumi/ide-decoration": "3.5.0",
"@opensumi/ide-design": "3.5.0",
"@opensumi/ide-editor": "3.5.0",
"@opensumi/ide-explorer": "3.5.0",
"@opensumi/ide-express-file-server": "3.5.0",
"@opensumi/ide-extension": "3.5.0",
"@opensumi/ide-extension-storage": "3.5.0",
"@opensumi/ide-file-scheme": "3.5.0",
"@opensumi/ide-file-service": "3.5.0",
"@opensumi/ide-file-tree-next": "3.5.0",
"@opensumi/ide-i18n": "3.5.0",
"@opensumi/ide-keymaps": "3.5.0",
"@opensumi/ide-logs": "3.5.0",
"@opensumi/ide-main-layout": "3.5.0",
"@opensumi/ide-markdown": "3.5.0",
"@opensumi/ide-markers": "3.5.0",
"@opensumi/ide-menu-bar": "3.5.0",
"@opensumi/ide-monaco": "3.5.0",
"@opensumi/ide-monaco-enhance": "3.5.0",
"@opensumi/ide-opened-editor": "3.5.0",
"@opensumi/ide-outline": "3.5.0",
"@opensumi/ide-output": "3.5.0",
"@opensumi/ide-overlay": "3.5.0",
"@opensumi/ide-preferences": "3.5.0",
"@opensumi/ide-quick-open": "3.5.0",
"@opensumi/ide-scm": "3.5.0",
"@opensumi/ide-search": "3.5.0",
"@opensumi/ide-status-bar": "3.5.0",
"@opensumi/ide-storage": "3.5.0",
"@opensumi/ide-testing": "3.5.0",
"@opensumi/ide-theme": "3.5.0",
"@opensumi/ide-toolbar": "3.5.0",
"@opensumi/ide-variable": "3.5.0",
"@opensumi/ide-webview": "3.5.0",
"@opensumi/ide-workspace": "3.5.0",
"@opensumi/ide-workspace-edit": "3.5.0",
"@opensumi/ide-addons": "3.6.0",
"@opensumi/ide-ai-native": "3.6.0",
"@opensumi/ide-comments": "3.6.0",
"@opensumi/ide-core-browser": "3.6.0",
"@opensumi/ide-core-common": "3.6.0",
"@opensumi/ide-debug": "3.6.0",
"@opensumi/ide-decoration": "3.6.0",
"@opensumi/ide-design": "3.6.0",
"@opensumi/ide-editor": "3.6.0",
"@opensumi/ide-explorer": "3.6.0",
"@opensumi/ide-express-file-server": "3.6.0",
"@opensumi/ide-extension": "3.6.0",
"@opensumi/ide-extension-storage": "3.6.0",
"@opensumi/ide-file-scheme": "3.6.0",
"@opensumi/ide-file-service": "3.6.0",
"@opensumi/ide-file-tree-next": "3.6.0",
"@opensumi/ide-i18n": "3.6.0",
"@opensumi/ide-keymaps": "3.6.0",
"@opensumi/ide-logs": "3.6.0",
"@opensumi/ide-main-layout": "3.6.0",
"@opensumi/ide-markdown": "3.6.0",
"@opensumi/ide-markers": "3.6.0",
"@opensumi/ide-menu-bar": "3.6.0",
"@opensumi/ide-monaco": "3.6.0",
"@opensumi/ide-monaco-enhance": "3.6.0",
"@opensumi/ide-opened-editor": "3.6.0",
"@opensumi/ide-outline": "3.6.0",
"@opensumi/ide-output": "3.6.0",
"@opensumi/ide-overlay": "3.6.0",
"@opensumi/ide-preferences": "3.6.0",
"@opensumi/ide-quick-open": "3.6.0",
"@opensumi/ide-scm": "3.6.0",
"@opensumi/ide-search": "3.6.0",
"@opensumi/ide-status-bar": "3.6.0",
"@opensumi/ide-storage": "3.6.0",
"@opensumi/ide-testing": "3.6.0",
"@opensumi/ide-theme": "3.6.0",
"@opensumi/ide-toolbar": "3.6.0",
"@opensumi/ide-variable": "3.6.0",
"@opensumi/ide-webview": "3.6.0",
"@opensumi/ide-workspace": "3.6.0",
"@opensumi/ide-workspace-edit": "3.6.0",
"@opensumi/textmate-languages": "^2.8.1",
"tslib": "^2.2.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/startup/src/diff-viewer/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ const App = () => {
}}
runtimeConfig={{
aiNative: {
enable: false,
enable: true,
}
}}
onWillApplyTheme={() => {
Expand Down
17 changes: 9 additions & 8 deletions packages/sumi-core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,21 @@
"@codeblitzjs/ide-common": "workspace:*",
"@codeblitzjs/ide-registry": "workspace:*",
"@opensumi/di": "^1.0.0",
"@opensumi/ide-ai-native": "3.5.0",
"@opensumi/ide-core-browser": "3.5.0",
"@opensumi/ide-core-common": "3.5.0",
"@opensumi/ide-debug": "3.5.0",
"@opensumi/ide-extension": "3.5.0",
"@opensumi/ide-file-scheme": "3.5.0",
"@opensumi/ide-file-service": "3.5.0",
"@opensumi/ide-logs": "3.5.0",
"@opensumi/ide-ai-native": "3.6.0",
"@opensumi/ide-core-browser": "3.6.0",
"@opensumi/ide-core-common": "3.6.0",
"@opensumi/ide-debug": "3.6.0",
"@opensumi/ide-extension": "3.6.0",
"@opensumi/ide-file-scheme": "3.6.0",
"@opensumi/ide-file-service": "3.6.0",
"@opensumi/ide-logs": "3.6.0",
"assert": "^2.0.0",
"fs-extra-factory": "^0.2.1",
"iconv-lite-umd": "^0.6.8",
"jschardet": "^2.2.1",
"lodash.debounce": "^4.0.8",
"md5": "^2.3.0",
"mobx": "^6.12.0",
"mobx-react-lite": "^4.0.7",
"tslib": "^2.2.0",
"vscode-languageserver-types": "~3.14.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/sumi-core/src/server/opensumi-extension/extension.service.client.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const { posix } = path;

@Injectable()
export class ExtensionServiceClientImpl implements IExtensionNodeClientService {
getLanguagePack(languageId: string): IExtensionLanguagePack | undefined {
getLanguagePack(languageId: string): Promise<IExtensionLanguagePack | undefined> {
throw new Error('Method not implemented.');
}

Expand Down
2 changes: 1 addition & 1 deletion packages/toolkit/define.json
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"__OPENSUMI_VERSION__": "3.5.0"
"__OPENSUMI_VERSION__": "3.6.0"
}
Loading

0 comments on commit 7cf4774

Please sign in to comment.