Skip to content

Commit

Permalink
feat: upgrade opensumi (#203)
Browse files Browse the repository at this point in the history 
* feat: upgrade opensumi

* chore: enable asyncWebAssembly

* feat: upgrade opensumi
  • Loading branch information
@bytemain
bytemain authored Oct 24, 2024
1 parent 28a961f commit e2f05e2
Show file tree
Hide file tree
Showing 9 changed files with 470 additions and 462 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.4.4-next-1728882643.0"
"opensumi": "3.4.5-next-1729601182.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.4.4-next-1728882643.0",
"opensumi": "3.4.5-next-1729601182.0",
"node": ">=18.0.0"
},
"dependencies": {
"@codeblitzjs/ide-common": "workspace:*",
"@opensumi/extension-installer": "^0.0.1",
"@opensumi/ide-extension": "3.4.4-next-1728882643.0",
"@opensumi/ide-extension": "3.4.5-next-1729601182.0",
"commander": "^7.2.0",
"fs-extra": "^9.0.1",
"lodash.pick": "^4.4.0",
Expand Down
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.4.4-next-1728882643.0",
"@opensumi/ide-ai-native": "3.4.4-next-1728882643.0",
"@opensumi/ide-comments": "3.4.4-next-1728882643.0",
"@opensumi/ide-core-browser": "3.4.4-next-1728882643.0",
"@opensumi/ide-core-common": "3.4.4-next-1728882643.0",
"@opensumi/ide-debug": "3.4.4-next-1728882643.0",
"@opensumi/ide-decoration": "3.4.4-next-1728882643.0",
"@opensumi/ide-design": "3.4.4-next-1728882643.0",
"@opensumi/ide-editor": "3.4.4-next-1728882643.0",
"@opensumi/ide-explorer": "3.4.4-next-1728882643.0",
"@opensumi/ide-express-file-server": "3.4.4-next-1728882643.0",
"@opensumi/ide-extension": "3.4.4-next-1728882643.0",
"@opensumi/ide-extension-storage": "3.4.4-next-1728882643.0",
"@opensumi/ide-file-scheme": "3.4.4-next-1728882643.0",
"@opensumi/ide-file-service": "3.4.4-next-1728882643.0",
"@opensumi/ide-file-tree-next": "3.4.4-next-1728882643.0",
"@opensumi/ide-i18n": "3.4.4-next-1728882643.0",
"@opensumi/ide-keymaps": "3.4.4-next-1728882643.0",
"@opensumi/ide-logs": "3.4.4-next-1728882643.0",
"@opensumi/ide-main-layout": "3.4.4-next-1728882643.0",
"@opensumi/ide-markdown": "3.4.4-next-1728882643.0",
"@opensumi/ide-markers": "3.4.4-next-1728882643.0",
"@opensumi/ide-menu-bar": "3.4.4-next-1728882643.0",
"@opensumi/ide-monaco": "3.4.4-next-1728882643.0",
"@opensumi/ide-monaco-enhance": "3.4.4-next-1728882643.0",
"@opensumi/ide-opened-editor": "3.4.4-next-1728882643.0",
"@opensumi/ide-outline": "3.4.4-next-1728882643.0",
"@opensumi/ide-output": "3.4.4-next-1728882643.0",
"@opensumi/ide-overlay": "3.4.4-next-1728882643.0",
"@opensumi/ide-preferences": "3.4.4-next-1728882643.0",
"@opensumi/ide-quick-open": "3.4.4-next-1728882643.0",
"@opensumi/ide-scm": "3.4.4-next-1728882643.0",
"@opensumi/ide-search": "3.4.4-next-1728882643.0",
"@opensumi/ide-status-bar": "3.4.4-next-1728882643.0",
"@opensumi/ide-storage": "3.4.4-next-1728882643.0",
"@opensumi/ide-testing": "3.4.4-next-1728882643.0",
"@opensumi/ide-theme": "3.4.4-next-1728882643.0",
"@opensumi/ide-toolbar": "3.4.4-next-1728882643.0",
"@opensumi/ide-variable": "3.4.4-next-1728882643.0",
"@opensumi/ide-webview": "3.4.4-next-1728882643.0",
"@opensumi/ide-workspace": "3.4.4-next-1728882643.0",
"@opensumi/ide-workspace-edit": "3.4.4-next-1728882643.0",
"@opensumi/ide-addons": "3.4.5-next-1729601182.0",
"@opensumi/ide-ai-native": "3.4.5-next-1729601182.0",
"@opensumi/ide-comments": "3.4.5-next-1729601182.0",
"@opensumi/ide-core-browser": "3.4.5-next-1729601182.0",
"@opensumi/ide-core-common": "3.4.5-next-1729601182.0",
"@opensumi/ide-debug": "3.4.5-next-1729601182.0",
"@opensumi/ide-decoration": "3.4.5-next-1729601182.0",
"@opensumi/ide-design": "3.4.5-next-1729601182.0",
"@opensumi/ide-editor": "3.4.5-next-1729601182.0",
"@opensumi/ide-explorer": "3.4.5-next-1729601182.0",
"@opensumi/ide-express-file-server": "3.4.5-next-1729601182.0",
"@opensumi/ide-extension": "3.4.5-next-1729601182.0",
"@opensumi/ide-extension-storage": "3.4.5-next-1729601182.0",
"@opensumi/ide-file-scheme": "3.4.5-next-1729601182.0",
"@opensumi/ide-file-service": "3.4.5-next-1729601182.0",
"@opensumi/ide-file-tree-next": "3.4.5-next-1729601182.0",
"@opensumi/ide-i18n": "3.4.5-next-1729601182.0",
"@opensumi/ide-keymaps": "3.4.5-next-1729601182.0",
"@opensumi/ide-logs": "3.4.5-next-1729601182.0",
"@opensumi/ide-main-layout": "3.4.5-next-1729601182.0",
"@opensumi/ide-markdown": "3.4.5-next-1729601182.0",
"@opensumi/ide-markers": "3.4.5-next-1729601182.0",
"@opensumi/ide-menu-bar": "3.4.5-next-1729601182.0",
"@opensumi/ide-monaco": "3.4.5-next-1729601182.0",
"@opensumi/ide-monaco-enhance": "3.4.5-next-1729601182.0",
"@opensumi/ide-opened-editor": "3.4.5-next-1729601182.0",
"@opensumi/ide-outline": "3.4.5-next-1729601182.0",
"@opensumi/ide-output": "3.4.5-next-1729601182.0",
"@opensumi/ide-overlay": "3.4.5-next-1729601182.0",
"@opensumi/ide-preferences": "3.4.5-next-1729601182.0",
"@opensumi/ide-quick-open": "3.4.5-next-1729601182.0",
"@opensumi/ide-scm": "3.4.5-next-1729601182.0",
"@opensumi/ide-search": "3.4.5-next-1729601182.0",
"@opensumi/ide-status-bar": "3.4.5-next-1729601182.0",
"@opensumi/ide-storage": "3.4.5-next-1729601182.0",
"@opensumi/ide-testing": "3.4.5-next-1729601182.0",
"@opensumi/ide-theme": "3.4.5-next-1729601182.0",
"@opensumi/ide-toolbar": "3.4.5-next-1729601182.0",
"@opensumi/ide-variable": "3.4.5-next-1729601182.0",
"@opensumi/ide-webview": "3.4.5-next-1729601182.0",
"@opensumi/ide-workspace": "3.4.5-next-1729601182.0",
"@opensumi/ide-workspace-edit": "3.4.5-next-1729601182.0",
"@opensumi/textmate-languages": "^2.7.0",
"tslib": "^2.2.0"
},
Expand Down
1 change: 1 addition & 0 deletions packages/core/src/core/diff-viewer/internal/base.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ export class DiffViewerContribution implements ClientAppContribution, MenuContri
Selection.fromRange(fullRange, SelectionDirection.LTR),
{
disposeWhenEditorClosed: false,
renderRemovedWidgetImmediately: true,
},
) as LiveInlineDiffPreviewer;
const whenReady = Event.toPromise(previewer.getNode()!.onDidEditChange);
Expand Down
16 changes: 8 additions & 8 deletions packages/sumi-core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
"@codeblitzjs/ide-common": "workspace:*",
"@codeblitzjs/ide-registry": "workspace:*",
"@opensumi/di": "^1.0.0",
"@opensumi/ide-ai-native": "3.4.4-next-1728882643.0",
"@opensumi/ide-core-browser": "3.4.4-next-1728882643.0",
"@opensumi/ide-core-common": "3.4.4-next-1728882643.0",
"@opensumi/ide-debug": "3.4.4-next-1728882643.0",
"@opensumi/ide-extension": "3.4.4-next-1728882643.0",
"@opensumi/ide-file-scheme": "3.4.4-next-1728882643.0",
"@opensumi/ide-file-service": "3.4.4-next-1728882643.0",
"@opensumi/ide-logs": "3.4.4-next-1728882643.0",
"@opensumi/ide-ai-native": "3.4.5-next-1729601182.0",
"@opensumi/ide-core-browser": "3.4.5-next-1729601182.0",
"@opensumi/ide-core-common": "3.4.5-next-1729601182.0",
"@opensumi/ide-debug": "3.4.5-next-1729601182.0",
"@opensumi/ide-extension": "3.4.5-next-1729601182.0",
"@opensumi/ide-file-scheme": "3.4.5-next-1729601182.0",
"@opensumi/ide-file-service": "3.4.5-next-1729601182.0",
"@opensumi/ide-logs": "3.4.5-next-1729601182.0",
"assert": "^2.0.0",
"fs-extra-factory": "^0.2.1",
"iconv-lite-umd": "^0.6.8",
Expand Down
5 changes: 1 addition & 4 deletions packages/toolkit/define.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"__OPENSUMI_VERSION__": "3.4.4-next-1728882643.0",
"__WORKER_HOST__": "https://gw.alipayobjects.com/os/cloud-ide/codeblitz/worker-host.d80be369.js",
"__WEBVIEW_ENDPOINT__": "https://gw.alipayobjects.com/os/cloud-ide/codeblitz/webview.25aac54e",
"__WEBVIEW_SCRIPT__": "https://gw.alipayobjects.com/os/cloud-ide/codeblitz/webview.9ae5c833.js"
"__OPENSUMI_VERSION__": "3.4.5-next-1729601182.0"
}
3 changes: 3 additions & 0 deletions packages/toolkit/webpack/config.integration.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,9 @@ module.exports = (option) => {
},
},
},
experiments: {
asyncWebAssembly: true
}
};

return merge(baseConfig, option.webpackConfig);
Expand Down
11 changes: 10 additions & 1 deletion scripts/build-assets.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
const path = require('path');
const fs = require('fs');
const signale = require('signale');
const { invoke, exec } = require('./utils/utils');
const pkg = require('../package.json');

invoke(async () => {
signale.pending(`开始编译 worker-host 和 webview`);
Expand All @@ -11,7 +13,14 @@ invoke(async () => {

const distDir = path.resolve(__dirname, '../packages/sumi-core/resources');
const manifest = require(path.join(distDir, 'manifest.json'));
console.log('manifest', manifest);
signale.log('manifest', manifest);

const config = { __OPENSUMI_VERSION__: pkg.engines.opensumi };

fs.writeFileSync(
path.resolve(__dirname, '../packages/toolkit/define.json'),
JSON.stringify(config, null, 2)
);

signale.success('构建资源成功');
});
Loading

0 comments on commit e2f05e2

Please sign in to comment.