build: adjust the exports from main package

mortalYoung · mortalYoung · commit fd563600d3a5 · 2022-04-29T17:05:26.000+08:00
diff --git a/packages/ide/src/molecule.api.ts b/packages/ide/src/molecule.api.ts
@@ -2,6 +2,7 @@ import 'reflect-metadata';
 import { container } from 'tsyringe';
 
 export * as monaco from 'mo/monaco/api';
+export * as monacoApi from 'mo/monaco';
 
 export * from 'mo/i18n';
 export * from 'mo/workbench';
diff --git a/packages/molecule/molecule.d.ts b/packages/molecule/molecule.d.ts
diff --git a/packages/molecule/monaco.d.ts b/packages/molecule/monaco.d.ts
diff --git a/packages/molecule/monaco.js b/packages/molecule/monaco.js
diff --git a/packages/molecule/package.json b/packages/molecule/package.json
@@ -2,9 +2,16 @@
     "name": "@dtinsight/molecule",
     "version": "0.9.0-beta.4.2",
     "description": "A Web IDE UI Framework built with React.js, inspired by VSCode.",
-    "module": "./molecule.d.ts",
-    "typings": "./molecule.d.ts",
-    "scripts": {},
+    "module": "./esm/index.js",
+    "typings": "./esm/index.d.ts",
+    "scripts": {
+        "build": "tsc"
+    },
+    "files": [
+        "esm",
+        "README.md",
+        "mo.css"
+    ],
     "keywords": [
         "react.js",
         "vscode",
diff --git a/packages/molecule/src/index.ts b/packages/molecule/src/index.ts
@@ -0,0 +1,8 @@
+import * as molecule from './molecule';
+
+export { MoleculeProvider } from '@dtinsight/molecule-ide';
+export type { IMoleculeProps } from '@dtinsight/molecule-ide';
+export { Workbench } from '@dtinsight/molecule-ide';
+export { molecule };
+
+export default molecule;
diff --git a/packages/molecule/src/molecule.ts b/packages/molecule/src/molecule.ts
@@ -0,0 +1,5 @@
+export * from '@dtinsight/molecule-ide/esm/molecule.api';
+
+export * as component from '@dtinsight/molecule-ui';
+export * as gule from '@dtinsight/molecule-glue';
+export * as common from '@dtinsight/molecule-common';
diff --git a/packages/molecule/tsconfig.json b/packages/molecule/tsconfig.json
@@ -6,9 +6,9 @@
         "declaration": true,
         "preserveConstEnums": true,
         "sourceMap": false,
-        "outDir": "./",
-        "rootDir": "./",
+        "outDir": "./esm",
+        "rootDir": "./src",
         "baseUrl": "./"
     },
-    "include": ["./"]
+    "include": ["./src"]
 }
diff --git a/packages/molecule/ui.d.ts b/packages/molecule/ui.d.ts
diff --git a/packages/molecule/ui.js b/packages/molecule/ui.js
diff --git a/stories/components/10-Menu.stories.tsx b/stories/components/10-Menu.stories.tsx
@@ -2,17 +2,13 @@ import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { withKnobs } from '@storybook/addon-knobs';
 import { propsTable } from '../common/propsTable';
+import molecule from '@dtinsight/molecule';
 
-import {
-    Menu,
-    MenuMode,
-    MenuItem,
-    SubMenu,
-    IMenuItemProps,
-} from '@dtinsight/molecule/ui';
 const stories = storiesOf('Menu', module);
 stories.addDecorator(withKnobs);
 
+const { Menu, MenuMode, MenuItem, SubMenu } = molecule.component;
+
 const propDefinitions = [
     {
         property: 'render',
@@ -131,7 +127,10 @@ stories.add(
             },
         ];
 
-        const handleClick = (e: React.MouseEvent, item?: IMenuItemProps) => {
+        const handleClick = (
+            e: React.MouseEvent,
+            item?: molecule.component.IMenuItemProps
+        ) => {
             console.log('click Menu', e, item);
         };
 
diff --git a/stories/components/11-DownDown.stories.tsx b/stories/components/11-DownDown.stories.tsx
@@ -3,9 +3,10 @@ import { storiesOf } from '@storybook/react';
 import { withKnobs } from '@storybook/addon-knobs';
 import { propsTable } from '../common/propsTable';
 
-import { Menu, Icon, DropDown } from '@dtinsight/molecule/ui';
+import molecule from '@dtinsight/molecule';
 import { useState } from 'react';
-import { PlacementType } from '@dtinsight/molecule';
+
+const { Menu, Icon, DropDown } = molecule.component;
 
 const stories = storiesOf('DropDown', module);
 stories.addDecorator(withKnobs);
@@ -128,7 +129,8 @@ stories.add(
             },
         ];
 
-        const [placement, setPlacement] = useState<PlacementType>('right');
+        const [placement, setPlacement] =
+            useState<molecule.common.PlacementType>('right');
 
         const onSelectPlacement = (e) => {
             const value = e.target.value;
diff --git a/stories/components/12-Button.stories.tsx b/stories/components/12-Button.stories.tsx
@@ -2,8 +2,9 @@ import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { withKnobs } from '@storybook/addon-knobs';
 import { propsTable } from '../common/propsTable';
+import molecule from '@dtinsight/molecule';
 
-import { Button, Icon } from '@dtinsight/molecule/ui';
+const { Button, Icon } = molecule.component;
 
 const stories = storiesOf('Button', module);
 stories.addDecorator(withKnobs);
diff --git a/stories/components/13-Icon.stories.tsx b/stories/components/13-Icon.stories.tsx
@@ -2,8 +2,9 @@ import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { withKnobs } from '@storybook/addon-knobs';
 import { propsTable } from '../common/propsTable';
+import molecule from '@dtinsight/molecule';
 
-import { Icon, Button } from '@dtinsight/molecule/ui';
+const { Icon, Button } = molecule.component;
 
 const stories = storiesOf('Icon', module);
 stories.addDecorator(withKnobs);
diff --git a/stories/components/14-Scrollable.stories.tsx b/stories/components/14-Scrollable.stories.tsx
@@ -2,8 +2,9 @@ import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { withKnobs } from '@storybook/addon-knobs';
 import { propsTable } from '../common/propsTable';
+import molecule from '@dtinsight/molecule';
 
-import { Menu, MenuItem, Scrollable } from '@dtinsight/molecule/ui';
+const { Menu, MenuItem, Scrollable } = molecule.component;
 
 const stories = storiesOf('Scrollable', module);
 stories.addDecorator(withKnobs);
diff --git a/stories/components/15-Input.stories.tsx b/stories/components/15-Input.stories.tsx
@@ -3,9 +3,10 @@ import { useCallback, useState } from 'react';
 import { storiesOf } from '@storybook/react';
 import { withKnobs } from '@storybook/addon-knobs';
 
-import { Input } from '@dtinsight/molecule/ui';
 import { propsTable } from '../common/propsTable';
+import molecule from '@dtinsight/molecule';
 
+const { Input } = molecule.component;
 const TextArea = Input.TextArea;
 const stories = storiesOf('Input', module);
 stories.addDecorator(withKnobs);
diff --git a/stories/components/15-Select.stories.tsx b/stories/components/15-Select.stories.tsx
@@ -2,9 +2,10 @@ import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { withKnobs } from '@storybook/addon-knobs';
 import { propsTable } from '../common/propsTable';
-import { Select, Option } from '@dtinsight/molecule/ui';
 import { useState } from 'react';
+import molecule from '@dtinsight/molecule';
 
+const { Select, Option } = molecule.component;
 const stories = storiesOf('Select', module);
 stories.addDecorator(withKnobs);
 
diff --git a/stories/components/16-Checkbox.stories.tsx b/stories/components/16-Checkbox.stories.tsx
@@ -2,8 +2,9 @@ import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { withKnobs } from '@storybook/addon-knobs';
 import { propsTable } from '../common/propsTable';
-import { Checkbox } from '@dtinsight/molecule/ui';
+import molecule from '@dtinsight/molecule';
 
+const { Checkbox } = molecule.component;
 const stories = storiesOf('Checkbox', module);
 stories.addDecorator(withKnobs);
 
diff --git a/stories/components/17-Dialog.stories.tsx b/stories/components/17-Dialog.stories.tsx
@@ -1,9 +1,10 @@
 import React from 'react';
 import { useState } from 'react';
-import { Modal, Button } from '@dtinsight/molecule/ui';
 import { storiesOf } from '@storybook/react';
 import { withKnobs } from '@storybook/addon-knobs';
+import molecule from '@dtinsight/molecule';
 
+const { Modal, Button } = molecule.component;
 const confirm = Modal.confirm;
 const stories = storiesOf('Dialog', module);
 stories.addDecorator(withKnobs);
diff --git a/stories/components/18-Breadcrumb.stories.tsx b/stories/components/18-Breadcrumb.stories.tsx
@@ -2,8 +2,9 @@ import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { withKnobs } from '@storybook/addon-knobs';
 import { propsTable } from '../common/propsTable';
+import molecule from '@dtinsight/molecule';
 
-import { Breadcrumb, IBreadcrumbItemProps } from '@dtinsight/molecule/ui';
+const { Breadcrumb } = molecule.component;
 
 const stories = storiesOf('Breadcrumb', module);
 stories.addDecorator(withKnobs);
@@ -25,7 +26,7 @@ stories.add(
             console.log('onClick breadcrumb item.', e, item);
         };
 
-        const data: IBreadcrumbItemProps[] = [
+        const data: molecule.component.IBreadcrumbItemProps[] = [
             {
                 id: 'item1',
                 name: 'item1',
diff --git a/stories/components/19-Split.stories.tsx b/stories/components/19-Split.stories.tsx
@@ -1,8 +1,9 @@
 import React, { useState } from 'react';
 
-import { SplitPane, Pane } from '@dtinsight/molecule/ui';
 import { Button } from '@storybook/react/demo';
+import molecule from '@dtinsight/molecule';
 
+const { SplitPane, Pane } = molecule.component;
 export default {
     title: 'Split',
 };
diff --git a/stories/components/2-Collapse.stories.tsx b/stories/components/2-Collapse.stories.tsx
@@ -1,5 +1,7 @@
 import React from 'react';
-import { Collapse } from '@dtinsight/molecule/ui';
+import molecule from '@dtinsight/molecule';
+
+const { Collapse } = molecule.component;
 
 export default {
     title: 'Collapse',
diff --git a/stories/components/3-Tabs.stories.tsx b/stories/components/3-Tabs.stories.tsx
@@ -1,9 +1,10 @@
 import React from 'react';
 import { useState } from 'react';
-import { Tabs } from '@dtinsight/molecule/ui';
+import molecule from '@dtinsight/molecule';
 import { storiesOf } from '@storybook/react';
 import { withKnobs } from '@storybook/addon-knobs';
 const stories = storiesOf('Tab', module);
+const { Tabs } = molecule.component;
 stories.addDecorator(withKnobs);
 
 stories.add('Basic Usage', () => {
diff --git a/stories/components/4-Tree.stories.tsx b/stories/components/4-Tree.stories.tsx
@@ -1,13 +1,14 @@
 import React from 'react';
-import { TreeView as Tree } from '@dtinsight/molecule/ui';
+import molecule from '@dtinsight/molecule';
 import { storiesOf } from '@storybook/react';
 import { withKnobs } from '@storybook/addon-knobs';
-import { FileType, FileTypes } from '@dtinsight/molecule';
 const stories = storiesOf('Tree', module);
 stories.addDecorator(withKnobs);
 
-const folder = FileTypes.Folder as FileType;
-const file = FileTypes.File as FileType;
+const { TreeView: Tree } = molecule.component;
+
+const folder = molecule.model.FileTypes.Folder as molecule.model.FileType;
+const file = molecule.model.FileTypes.File as molecule.model.FileType;
 
 stories.add('Basic Usage', () => {
     const treeData = [
diff --git a/stories/components/6-ActionBar.stories.tsx b/stories/components/6-ActionBar.stories.tsx
@@ -2,8 +2,9 @@ import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { withKnobs } from '@storybook/addon-knobs';
 import { propsTable } from '../common/propsTable';
+import molecule from '@dtinsight/molecule';
 
-import { ActionBar, IActionBarItemProps } from '@dtinsight/molecule/ui';
+const { ActionBar } = molecule.component;
 
 const stories = storiesOf('ActionBar', module);
 stories.addDecorator(withKnobs);
@@ -21,7 +22,7 @@ const propDefinitions = [
 stories.add(
     'Basic Usage',
     () => {
-        const data: IActionBarItemProps<any>[] = [
+        const data: molecule.component.IActionBarItemProps<any>[] = [
             {
                 id: '1',
                 title: 'bar1',
diff --git a/stories/components/7-ContextMenu.stories.tsx b/stories/components/7-ContextMenu.stories.tsx
@@ -1,8 +1,10 @@
 import React from 'react';
-import { useContextMenu } from '@dtinsight/molecule/ui';
+import molecule from '@dtinsight/molecule';
 import { useEffect } from 'react';
 import '../demo.scss';
 
+const { useContextMenu } = molecule.component;
+
 export const ContextMenuDemo = () => {
     useEffect(() => {
         const contextView1 = useContextMenu({
diff --git a/stories/components/8-ContextView.stories.tsx b/stories/components/8-ContextView.stories.tsx
@@ -1,18 +1,12 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { withKnobs } from '@storybook/addon-knobs';
-import {
-    Select,
-    Option,
-    useContextView,
-    Menu,
-    MenuMode,
-    MenuItem,
-    SubMenu,
-} from '@dtinsight/molecule/ui';
-
+import molecule from '@dtinsight/molecule';
 import { propsTable } from '../common/propsTable';
 
+const { Select, Option, useContextView, Menu, MenuMode, MenuItem, SubMenu } =
+    molecule.component;
+
 const stories = storiesOf('ContextView', module);
 stories.addDecorator(withKnobs);
 
diff --git a/stories/components/9-List.stories.tsx b/stories/components/9-List.stories.tsx
@@ -3,9 +3,11 @@ import { storiesOf } from '@storybook/react';
 import { withKnobs } from '@storybook/addon-knobs';
 import { propsTable } from '../common/propsTable';
 
-import { List, Item, Button } from '@dtinsight/molecule/ui';
+import molecule from '@dtinsight/molecule';
 import { useState } from 'react';
 
+const { List, Item, Button } = molecule.component;
+
 const stories = storiesOf('List', module);
 stories.addDecorator(withKnobs);
 
diff --git a/stories/extensions/actions/quickOpen.ts b/stories/extensions/actions/quickOpen.ts
@@ -1,12 +1,9 @@
+import molecule from '@dtinsight/molecule';
 import { IQuickInputService } from 'monaco-editor/esm/vs/platform/quickinput/common/quickInput';
 import { KeyChord } from 'monaco-editor/esm/vs/base/common/keyCodes';
-
 import { debounce } from 'lodash';
-import { KeyCode, KeyMod } from '@dtinsight/molecule/monaco';
-import { Action2 } from '@dtinsight/molecule';
-import { KeybindingWeight } from '@dtinsight/molecule';
 
-export class QuickOpenAction extends Action2 {
+export class QuickOpenAction extends molecule.monaco.Action2 {
     static readonly ID = 'QuickOpenFile';
     static readonly LABEL = 'Search files by name';
 
@@ -19,10 +16,13 @@ export class QuickOpenAction extends Action2 {
             precondition: undefined,
             f1: true, // Whether show the QuickOpenFile in Command Palette
             keybinding: {
-                weight: KeybindingWeight.WorkbenchContrib,
+                weight: molecule.monaco.KeybindingWeight.WorkbenchContrib,
                 when: undefined,
                 // eslint-disable-next-line new-cap
-                primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyP),
+                primary: KeyChord(
+                    molecule.monacoApi.KeyMod.CtrlCmd |
+                        molecule.monacoApi.KeyCode.KeyP
+                ),
             },
         });
     }
diff --git a/stories/extensions/data-sync/index.tsx b/stories/extensions/data-sync/index.tsx
diff --git a/stories/extensions/extend-panel/pane.tsx b/stories/extensions/extend-panel/pane.tsx
diff --git a/stories/extensions/locales-plus/index.tsx b/stories/extensions/locales-plus/index.tsx
diff --git a/stories/extensions/test/index.tsx b/stories/extensions/test/index.tsx
diff --git a/stories/extensions/test/testPane.tsx b/stories/extensions/test/testPane.tsx
