@opensumi/ide-startup 2.21.4-rc-1668395886.0 → 2.21.4

package/package.json

@@ -1,9 +1,8 @@
 {
   "name": "@opensumi/ide-startup",
-  "version": "2.21.4-rc-1668395886.0",
+  "version": "2.21.4",
   "files": [
-    "lib",
-    "src"
+    "lib"
   ],
   "license": "MIT",
   "main": "lib/index.js",
@@ -59,55 +58,55 @@
     "delay": "2000"
   },
   "dependencies": {
-    "@opensumi/ide-addons": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-collaboration": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-comments": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-core-browser": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-core-common": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-core-node": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-debug": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-decoration": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-editor": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-explorer": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-extension": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-extension-manager": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-extension-storage": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-file-scheme": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-file-search": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-file-service": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-file-tree-next": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-i18n": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-keymaps": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-logs": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-main-layout": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-markdown": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-markers": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-menu-bar": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-monaco": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-monaco-enhance": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-opened-editor": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-outline": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-output": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-overlay": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-preferences": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-process": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-quick-open": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-remote-opener": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-scm": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-search": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-static-resource": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-status-bar": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-storage": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-task": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-terminal-next": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-testing": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-theme": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-toolbar": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-userstorage": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-variable": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-webview": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-workspace": "2.21.4-rc-1668395886.0",
-    "@opensumi/ide-workspace-edit": "2.21.4-rc-1668395886.0",
+    "@opensumi/ide-addons": "2.21.4",
+    "@opensumi/ide-collaboration": "2.21.4",
+    "@opensumi/ide-comments": "2.21.4",
+    "@opensumi/ide-core-browser": "2.21.4",
+    "@opensumi/ide-core-common": "2.21.4",
+    "@opensumi/ide-core-node": "2.21.4",
+    "@opensumi/ide-debug": "2.21.4",
+    "@opensumi/ide-decoration": "2.21.4",
+    "@opensumi/ide-editor": "2.21.4",
+    "@opensumi/ide-explorer": "2.21.4",
+    "@opensumi/ide-extension": "2.21.4",
+    "@opensumi/ide-extension-manager": "2.21.4",
+    "@opensumi/ide-extension-storage": "2.21.4",
+    "@opensumi/ide-file-scheme": "2.21.4",
+    "@opensumi/ide-file-search": "2.21.4",
+    "@opensumi/ide-file-service": "2.21.4",
+    "@opensumi/ide-file-tree-next": "2.21.4",
+    "@opensumi/ide-i18n": "2.21.4",
+    "@opensumi/ide-keymaps": "2.21.4",
+    "@opensumi/ide-logs": "2.21.4",
+    "@opensumi/ide-main-layout": "2.21.4",
+    "@opensumi/ide-markdown": "2.21.4",
+    "@opensumi/ide-markers": "2.21.4",
+    "@opensumi/ide-menu-bar": "2.21.4",
+    "@opensumi/ide-monaco": "2.21.4",
+    "@opensumi/ide-monaco-enhance": "2.21.4",
+    "@opensumi/ide-opened-editor": "2.21.4",
+    "@opensumi/ide-outline": "2.21.4",
+    "@opensumi/ide-output": "2.21.4",
+    "@opensumi/ide-overlay": "2.21.4",
+    "@opensumi/ide-preferences": "2.21.4",
+    "@opensumi/ide-process": "2.21.4",
+    "@opensumi/ide-quick-open": "2.21.4",
+    "@opensumi/ide-remote-opener": "2.21.4",
+    "@opensumi/ide-scm": "2.21.4",
+    "@opensumi/ide-search": "2.21.4",
+    "@opensumi/ide-static-resource": "2.21.4",
+    "@opensumi/ide-status-bar": "2.21.4",
+    "@opensumi/ide-storage": "2.21.4",
+    "@opensumi/ide-task": "2.21.4",
+    "@opensumi/ide-terminal-next": "2.21.4",
+    "@opensumi/ide-testing": "2.21.4",
+    "@opensumi/ide-theme": "2.21.4",
+    "@opensumi/ide-toolbar": "2.21.4",
+    "@opensumi/ide-userstorage": "2.21.4",
+    "@opensumi/ide-variable": "2.21.4",
+    "@opensumi/ide-webview": "2.21.4",
+    "@opensumi/ide-workspace": "2.21.4",
+    "@opensumi/ide-workspace-edit": "2.21.4",
     "@opensumi/textmate-languages": "^2.6.1"
   },
   "devDependencies": {
@@ -145,5 +144,5 @@
     "webpack-cli": "^3.3.1",
     "webpack-dev-server": "3.8.0"
   },
-  "gitHead": "b669ad404fd46fe859c7553a349b85d6d3e633c8"
+  "gitHead": "d6077dd539ffbb19593e695f0adeae87644085c4"
 }

package/src/browser/common-modules.ts

@@ -1,92 +0,0 @@
-import { ClientAddonModule } from '@opensumi/ide-addons/lib/browser';
-import { CommentsModule } from '@opensumi/ide-comments/lib/browser';
-import { ClientCommonModule, BrowserModule, ConstructorOf } from '@opensumi/ide-core-browser';
-import { DebugModule } from '@opensumi/ide-debug/lib/browser';
-import { DecorationModule } from '@opensumi/ide-decoration/lib/browser';
-import { EditorModule } from '@opensumi/ide-editor/lib/browser';
-import { ExplorerModule } from '@opensumi/ide-explorer/lib/browser';
-import { OpenVsxExtensionManagerModule } from '@opensumi/ide-extension-manager/lib/browser';
-import { ExtensionStorageModule } from '@opensumi/ide-extension-storage/lib/browser';
-import { ExtensionModule } from '@opensumi/ide-extension/lib/browser';
-import { FileSchemeModule } from '@opensumi/ide-file-scheme/lib/browser';
-import { FileServiceClientModule } from '@opensumi/ide-file-service/lib/browser';
-import { FileTreeNextModule } from '@opensumi/ide-file-tree-next/lib/browser';
-import { KeymapsModule } from '@opensumi/ide-keymaps/lib/browser';
-import { LogModule } from '@opensumi/ide-logs/lib/browser';
-import { MainLayoutModule } from '@opensumi/ide-main-layout/lib/browser';
-// import { Terminal2Module } from '@opensumi/ide-terminal2/lib/browser';
-import { MarkdownModule } from '@opensumi/ide-markdown';
-import { MarkersModule } from '@opensumi/ide-markers/lib/browser';
-import { MenuBarModule } from '@opensumi/ide-menu-bar/lib/browser';
-import { MonacoEnhanceModule } from '@opensumi/ide-monaco-enhance/lib/browser/module';
-import { MonacoModule } from '@opensumi/ide-monaco/lib/browser';
-import { OpenedEditorModule } from '@opensumi/ide-opened-editor/lib/browser';
-import { OutlineModule } from '@opensumi/ide-outline/lib/browser';
-import { OutputModule } from '@opensumi/ide-output/lib/browser';
-import { OverlayModule } from '@opensumi/ide-overlay/lib/browser';
-import { PreferencesModule } from '@opensumi/ide-preferences/lib/browser';
-import { QuickOpenModule } from '@opensumi/ide-quick-open/lib/browser';
-import { SCMModule } from '@opensumi/ide-scm/lib/browser';
-import { SearchModule } from '@opensumi/ide-search/lib/browser';
-import { StaticResourceModule } from '@opensumi/ide-static-resource/lib/browser';
-import { StatusBarModule } from '@opensumi/ide-status-bar/lib/browser';
-import { StorageModule } from '@opensumi/ide-storage/lib/browser';
-import { TaskModule } from '@opensumi/ide-task/lib/browser';
-import { TerminalNextModule } from '@opensumi/ide-terminal-next/lib/browser';
-import { TestingModule } from '@opensumi/ide-testing/lib/browser';
-import { ThemeModule } from '@opensumi/ide-theme/lib/browser';
-import { ToolbarModule } from '@opensumi/ide-toolbar/lib/browser';
-import { VariableModule } from '@opensumi/ide-variable/lib/browser';
-import { WebviewModule } from '@opensumi/ide-webview';
-import { WorkspaceEditModule } from '@opensumi/ide-workspace-edit/lib/browser';
-import { WorkspaceModule } from '@opensumi/ide-workspace/lib/browser';
-
-export const CommonBrowserModules: ConstructorOf<BrowserModule>[] = [
-  MainLayoutModule,
-  OverlayModule,
-  LogModule,
-  ClientCommonModule,
-  MenuBarModule,
-  MonacoModule,
-  StatusBarModule,
-  EditorModule,
-  ExplorerModule,
-  FileTreeNextModule,
-  FileServiceClientModule,
-  StaticResourceModule,
-  SearchModule,
-  FileSchemeModule,
-  OutputModule,
-  QuickOpenModule,
-  MarkersModule,
-
-  ThemeModule,
-  WorkspaceModule,
-  ExtensionStorageModule,
-  StorageModule,
-  OpenedEditorModule,
-  OutlineModule,
-  PreferencesModule,
-  ToolbarModule,
-  WebviewModule,
-  MarkdownModule,
-  WorkspaceEditModule,
-  SCMModule,
-  DecorationModule,
-  DebugModule,
-  VariableModule,
-  KeymapsModule,
-  TerminalNextModule,
-
-  // Extension Modules
-  ExtensionModule,
-  // FeatureExtensionModule,
-  OpenVsxExtensionManagerModule,
-  MonacoEnhanceModule,
-
-  // addons
-  ClientAddonModule,
-  CommentsModule,
-  TaskModule,
-  TestingModule,
-];

package/src/browser/editor-bottom-example.tsx

@@ -1,14 +0,0 @@
-import React from 'react';
-
-import { ReactEditorComponent } from '@opensumi/ide-editor/lib/browser';
-
-export const ExampleEditorBottomWidget: ReactEditorComponent<any> = ({ resource }) => (
-  <div
-    style={{
-      border: '1px solid var(--foreground)',
-      padding: '5px 10px',
-    }}
-  >
-    Example Bottom Widget for File Uri: {resource.uri.toString()}
-  </div>
-);

package/src/browser/exmaple-popover.tsx

@@ -1,38 +0,0 @@
-import React from 'react';
-
-export const ExamplePopover = () => {
-  const imgUrl = 'https://gw-office.alipayobjects.com/bmw-prod/f81b277b-5227-483d-9c1c-43f105bcf048.png';
-
-  return (
-    <div
-      style={{
-        width: '200px',
-        height: '200px',
-        display: 'flex',
-        justifyContent: 'center',
-        alignItems: 'center',
-      }}
-      onContextMenu={(e) => {
-        e.preventDefault();
-        navigator.clipboard.writeText(imgUrl).then(
-          function () {
-            /* clipboard successfully set */
-            alert('图片地址已复制');
-          },
-          function () {
-            /* clipboard write failed */
-          },
-        );
-      }}
-    >
-      <img
-        style={{
-          width: '150px',
-          height: '150px',
-          display: 'block',
-        }}
-        src={imgUrl}
-      ></img>
-    </div>
-  );
-};

package/src/browser/index.ts

@@ -1,9 +0,0 @@
-import { Provider, Injectable } from '@opensumi/di';
-import { BrowserModule } from '@opensumi/ide-core-browser';
-
-import { StartupContribution } from './startup.contribution';
-
-@Injectable()
-export class StartupModule extends BrowserModule {
-  providers: Provider[] = [StartupContribution];
-}

package/src/browser/startup.contribution.ts

@@ -1,262 +0,0 @@
-/* eslint-disable no-console */
-import { Autowired } from '@opensumi/di';
-import {
-  KeybindingContribution,
-  KeybindingRegistry,
-  Logger,
-  ClientAppContribution,
-  IToolbarRegistry,
-  ToolBarActionContribution,
-  createToolbarActionBtn,
-  createToolbarActionSelect,
-} from '@opensumi/ide-core-browser';
-import { getIcon } from '@opensumi/ide-core-browser';
-import { ComponentContribution, ComponentRegistry } from '@opensumi/ide-core-browser/lib/layout';
-import { MenuContribution, IMenuRegistry, MenuId } from '@opensumi/ide-core-browser/lib/menu/next';
-import { IStatusBarService } from '@opensumi/ide-core-browser/lib/services';
-import { CommandContribution, CommandRegistry, IEventBus, CommandService, Schemes } from '@opensumi/ide-core-common';
-import { Domain } from '@opensumi/ide-core-common/lib/di-helper';
-import { BrowserEditorContribution, EditorComponentRegistry } from '@opensumi/ide-editor/lib/browser';
-import { OutputService } from '@opensumi/ide-output/lib/browser/output.service';
-import { ISCMProvider } from '@opensumi/ide-scm';
-
-import { ExampleEditorBottomWidget } from './editor-bottom-example';
-import { ExamplePopover } from './exmaple-popover';
-
-@Domain(
-  ClientAppContribution,
-  CommandContribution,
-  KeybindingContribution,
-  ComponentContribution,
-  ToolBarActionContribution,
-  MenuContribution,
-  BrowserEditorContribution,
-)
-export class StartupContribution
-  implements
-    CommandContribution,
-    KeybindingContribution,
-    ClientAppContribution,
-    ComponentContribution,
-    ToolBarActionContribution,
-    MenuContribution,
-    BrowserEditorContribution
-{
-  @Autowired(IEventBus)
-  eventBus: IEventBus;
-
-  @Autowired(IStatusBarService)
-  statusBar: IStatusBarService;
-
-  @Autowired(OutputService)
-  outputService: OutputService;
-
-  @Autowired()
-  logger: Logger;
-
-  @Autowired(IToolbarRegistry)
-  toolbarRegistry: IToolbarRegistry;
-
-  @Autowired(CommandService)
-  private readonly commandService: CommandService;
-
-  onStart() {}
-
-  registerEditorComponent(registry: EditorComponentRegistry) {
-    registry.registerEditorSideWidget({
-      id: 'example-bottom',
-      component: ExampleEditorBottomWidget,
-      displaysOnResource: (r) => r.uri.scheme === Schemes.file,
-    });
-  }
-
-  registerComponent(registry: ComponentRegistry) {}
-
-  registerCommands(commands: CommandRegistry): void {
-    commands.registerCommand(
-      {
-        id: 'gitCommitAndPush',
-      },
-      {
-        execute: async (provider: ISCMProvider, commitMsg: string) => {
-          // 强依赖了 git 插件的命令
-          const mergeChanges = provider.groups.elements.filter((n) => n.id === 'merge');
-          if (mergeChanges.length > 0) {
-            // console.log('有冲突尚未解决，请先解决');
-            return;
-          }
-          await this.commandService.executeCommand('git.stageAll', provider);
-          await this.commandService.executeCommand('git.commit', provider);
-          await this.commandService.executeCommand('git.push', provider);
-        },
-      },
-    );
-  }
-
-  registerKeybindings(keybindings: KeybindingRegistry): void {}
-
-  registerToolbarActions(registry: IToolbarRegistry) {
-    registry.addLocation('menu-left');
-    registry.registerToolbarActionGroup({
-      id: 'test-compact',
-      compact: true,
-      preferredLocation: 'menu-right',
-    });
-    for (let i = 0; i < 6; i++) {
-      registry.registerToolbarAction({
-        id: 'test-' + i,
-        description: 'test-' + i + '按钮',
-        component: createToolbarActionBtn({
-          id: 'test-' + i,
-          title: 'test-' + i,
-          iconClass: getIcon('open'),
-          defaultStyle: {
-            btnStyle: i > 3 ? 'button' : 'inline',
-            background: i > 4 ? 'red' : undefined,
-          },
-          popoverComponent: ExamplePopover,
-          popoverStyle: {
-            noContainerStyle: i % 2 === 0,
-          },
-          delegate: (d) => {
-            d?.onClick(() => {
-              console.log('test ' + i + ' clicked');
-              d.showPopOver({
-                horizontalOffset: i * 10,
-              });
-            });
-          },
-        }),
-        neverCollapse: i > 4,
-        preferredPosition: {
-          location: 'menu-right',
-          group: i === 1 || i === 2 || i === 3 ? 'test-compact' : undefined,
-        },
-      });
-    }
-    for (let i = 7; i < 10; i++) {
-      registry.registerToolbarAction({
-        id: 'test-' + i,
-        description: 'test-' + i + '按钮',
-        component: createToolbarActionBtn({
-          id: 'test-' + i,
-          title: 'test-' + i,
-          iconClass: getIcon('open'),
-          defaultStyle: {
-            btnStyle: i > 3 ? 'button' : 'inline',
-          },
-          delegate: (d) => {
-            d?.onClick(() => {
-              console.log('test ' + i + ' clicked');
-            });
-          },
-        }),
-        preferredPosition: {
-          location: 'menu-left',
-        },
-      });
-    }
-    registry.registerToolbarAction({
-      id: 'test-select-1',
-      description: '选项框1',
-      weight: 11,
-      component: createToolbarActionSelect({
-        name: 'test-1',
-        delegate: (d) => {
-          d?.onSelect((value) => {
-            console.log('value ' + value + ' selected');
-          });
-        },
-        options: [
-          {
-            label: '选项a',
-            value: 'a',
-          },
-          {
-            label: '选项b',
-            value: 'b',
-          },
-          {
-            label: '选项c',
-            value: 'c',
-          },
-        ],
-        defaultValue: 'b',
-      }),
-    });
-    registry.registerToolbarAction({
-      id: 'test-select-2',
-      weight: 11,
-      description: '选项框2',
-      component: createToolbarActionSelect({
-        name: 'test-2',
-        delegate: (d) => {
-          d?.onSelect((value) => {
-            console.log('value ' + value + ' selected');
-          });
-        },
-        options: [
-          {
-            groupName: 'TestGroup1',
-            options: [
-              {
-                label: '选项a',
-                value: 'a',
-              },
-              {
-                label: '选项b',
-                value: 'b',
-              },
-              {
-                label: '选项c',
-                value: 'c',
-              },
-            ],
-          },
-          {
-            iconClass: getIcon('open'),
-            groupName: 'TestGroup2',
-            options: [
-              {
-                label: '选项aa',
-                value: 'ab',
-                iconClass: getIcon('open'),
-              },
-              {
-                label: '选项bb',
-                value: 'bb',
-                iconClass: getIcon('open'),
-              },
-              {
-                label: '选项cc',
-                value: 'cc',
-                iconClass: getIcon('open'),
-              },
-            ],
-          },
-        ],
-        defaultValue: 'cc',
-      }),
-    });
-  }
-
-  registerMenus(menuRegistry: IMenuRegistry) {
-    menuRegistry.registerMenuItem(MenuId.SCMInput, {
-      command: {
-        id: 'gitCommitAndPush',
-        label: '提交并推送',
-      },
-      group: 'navigation',
-      type: 'primary',
-    });
-
-    menuRegistry.registerMenuItem(MenuId.SCMInput, {
-      command: {
-        id: 'editor.action.quickCommand',
-        label: '打开 quick open',
-      },
-      group: 'navigation',
-      type: 'primary',
-    });
-  }
-}

package/src/node/common-modules.ts

@@ -1,26 +0,0 @@
-import { AddonsModule } from '@opensumi/ide-addons/lib/node';
-import { NodeModule, ConstructorOf } from '@opensumi/ide-core-node';
-import { ServerCommonModule } from '@opensumi/ide-core-node';
-import { OpenVsxExtensionManagerModule } from '@opensumi/ide-extension-manager/lib/node';
-import { ExtensionModule } from '@opensumi/ide-extension/lib/node';
-import { FileSchemeNodeModule } from '@opensumi/ide-file-scheme/lib/node';
-import { FileSearchModule } from '@opensumi/ide-file-search/lib/node';
-import { FileServiceModule } from '@opensumi/ide-file-service/lib/node';
-import { LogServiceModule } from '@opensumi/ide-logs/lib/node';
-import { ProcessModule } from '@opensumi/ide-process/lib/node';
-import { SearchModule } from '@opensumi/ide-search/lib/node';
-import { TerminalNodePtyModule } from '@opensumi/ide-terminal-next/lib/node';
-
-export const CommonNodeModules: ConstructorOf<NodeModule>[] = [
-  ServerCommonModule,
-  LogServiceModule,
-  FileServiceModule,
-  ProcessModule,
-  FileSearchModule,
-  SearchModule,
-  TerminalNodePtyModule,
-  ExtensionModule,
-  OpenVsxExtensionManagerModule,
-  FileSchemeNodeModule,
-  AddonsModule,
-];