From 3d86a52d5c360b3394428902ba7dfbba922f0482 Mon Sep 17 00:00:00 2001 From: alan Date: Mon, 21 Dec 2020 09:45:53 +0800 Subject: [PATCH 1/4] =?UTF-8?q?build:=20KERNEL-6541=20=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=A7=84=E8=8C=83=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/jest.environment.js | 2 +- index.html | 8 +- package.json | 5 +- src/less/background.less | 2 +- src/less/font.less | 2 +- src/less/index.less | 4 +- src/less/lib/font.less | 2 +- src/modules/components/collapse/collapse.ts | 4 +- src/modules/components/link_button/link.ts | 17 +- .../components/test_status/test_status.ts | 17 +- .../test_status/tip_icon/tip_fail.ts | 4 +- .../test_status/tip_icon/tip_icon.ts | 4 +- .../components/text_checker/text_checker.ts | 12 +- .../components/form_item/form_item.ts | 6 +- src/modules/pages/connection/connection.ts | 11 +- .../connection_jndi/connection_jndi.ts | 4 +- src/modules/pages/connection/list/list.ts | 4 +- .../connection/list/list_item/list_item.ts | 23 +- .../pages/connection_pool/connection_pool.ts | 13 +- .../connection_pool/list_item/list_item.ts | 4 +- .../pages/connection_pool/pool/pool.ts | 43 +- src/modules/pages/database/database.ts | 8 +- .../database/database_type/database_type.ts | 4 +- src/modules/pages/database/filter/filter.ts | 3 +- .../components/form_item/form_item.ts | 4 +- .../maintain/forms/components/form.jdbc.ts | 14 +- .../maintain/forms/components/form.jndi.ts | 6 +- src/modules/pages/maintain/maintain.ts | 7 +- src/ui/fineui.ts | 11 - tsconfig.json | 1 + types/globals.d.ts | 2 +- webpack/webpack.common.js | 2 +- webpack/webpack.dev.js | 5 +- yarn.lock | 2275 +++-------------- 34 files changed, 472 insertions(+), 2061 deletions(-) diff --git a/config/jest.environment.js b/config/jest.environment.js index 2a3541f..85c72e4 100644 --- a/config/jest.environment.js +++ b/config/jest.environment.js @@ -11,7 +11,7 @@ class FineUiEnvironment extends JsdomEnvironment { document.createElement('body'); [ - '../node_modules/fineui/dist/fineui.js', + '../node_modules/@fui/core/dist/fineui.js', '../node_modules/@fui/materials/docs/materials.js', '../config/fineui.prepare.js', './fineui.setup.js', diff --git a/index.html b/index.html index f8c5d5f..672532a 100644 --- a/index.html +++ b/index.html @@ -5,15 +5,15 @@ Fine Report - - + +
- - + + diff --git a/package.json b/package.json index 90f559f..f13d596 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "nprogress": "0.2.0" }, "devDependencies": { + "@fui/babel-preset-fineui": "^1.0.0", "@types/jest": "24.0.11", "@typescript-eslint/eslint-plugin": "1.7.0", "@typescript-eslint/parser": "1.7.0", @@ -51,10 +52,10 @@ "webpack-cli": "3.3.5", "webpack-dev-server": "3.7.2", "webpack-merge": "4.2.1", - "@fui/babel-preset-fineui": "^1.0.0" + "fork-ts-checker-webpack-plugin": "1.4.3" }, "optionalDependencies": { - "fineui": "^2.0.0", + "@fui/core": "^2.0.0", "@fui/materials": "10.0.0-release - 10.0.0-release.99999999999999" }, "scripts": { diff --git a/src/less/background.less b/src/less/background.less index 85a2fb0..269ac21 100644 --- a/src/less/background.less +++ b/src/less/background.less @@ -1,4 +1,4 @@ -@import "../../node_modules/fineui/src/less/image.less"; +@import "../../node_modules/@fui/core/src/less/image.less"; @import "./lib/background.less"; @import "var"; diff --git a/src/less/font.less b/src/less/font.less index c322ad7..587b439 100644 --- a/src/less/font.less +++ b/src/less/font.less @@ -1,4 +1,4 @@ -@import "../../node_modules/fineui/src/less/image.less"; +@import "../../node_modules/@fui/core/src/less/image.less"; @import "./lib/font.less"; .addFontRes(); .font(dcm-link-font, @font-link); diff --git a/src/less/index.less b/src/less/index.less index 75fd279..8cfadcd 100644 --- a/src/less/index.less +++ b/src/less/index.less @@ -1,5 +1,5 @@ -@import "../../node_modules/fineui/src/less/lib/colors.less"; -@import '../../node_modules/fineui/src/less/visual.less'; +@import "../../node_modules/@fui/core/src/less/lib/colors.less"; +@import '../../node_modules/@fui/core/src/less/visual.less'; @import "background.less"; @import "font.less"; @import "var.less"; \ No newline at end of file diff --git a/src/less/lib/font.less b/src/less/lib/font.less index 5d46323..09be516 100644 --- a/src/less/lib/font.less +++ b/src/less/lib/font.less @@ -1,4 +1,4 @@ -@import '../../../node_modules/fineui/src/less/lib/font.less'; +@import '../../../node_modules/@fui/core/src/less/lib/font.less'; @font-link: "e759"; @font-link-test: "e763"; diff --git a/src/modules/components/collapse/collapse.ts b/src/modules/components/collapse/collapse.ts index 7e332d2..675749f 100644 --- a/src/modules/components/collapse/collapse.ts +++ b/src/modules/components/collapse/collapse.ts @@ -1,4 +1,4 @@ -import { IconLabel, Left, Label } from 'ui'; +import { IconLabel, Left } from 'ui'; import { shortcut, store } from '@core/core'; import { CollapseModel, CollapseModelXtype } from './collapse.model'; @@ -52,7 +52,7 @@ export class Collapse extends BI.BasicButton { invisible: this.model.isCollapse, }, { - type: Label, + type: BI.Label.xtype, lgap: 2, text: this.options.name, }, diff --git a/src/modules/components/link_button/link.ts b/src/modules/components/link_button/link.ts index f3e1135..ae01a76 100644 --- a/src/modules/components/link_button/link.ts +++ b/src/modules/components/link_button/link.ts @@ -1,25 +1,36 @@ -import { CenterAdapt, Label } from 'ui'; +import { CenterAdapt } from 'ui'; import { shortcut } from '@core/core'; +import { Label } from '@fui/core'; export const LinkXtype = 'dec.dcm.components.link.button'; const DEFAULT_LINK = '/'; @shortcut(LinkXtype) export class LinkButton extends BI.BasicButton { - props = { + props: { + text: string; + cls: string; + $testId: string; + link?: Function | string; + } = { text: '', cls: 'cursor-pointer', $testId: 'dec-dcm-link-button', } + private text: Label; + render() { return { type: CenterAdapt, cls: 'bi-high-light', items: [ { - type: Label, + type: BI.Label.xtype, cls: 'bi-high-light-border-bottom', text: this.options.text, + ref: (_ref: Label) => { + this.text = _ref; + }, }, ], }; diff --git a/src/modules/components/test_status/test_status.ts b/src/modules/components/test_status/test_status.ts index 226fcfd..b76663b 100644 --- a/src/modules/components/test_status/test_status.ts +++ b/src/modules/components/test_status/test_status.ts @@ -1,9 +1,10 @@ import { shortcut, store } from '@core/core'; import { TestStatusModelXtype, TestStatusModel } from './test_status.model'; -import { CenterAdapt, Tab, Vertical, Label, TextButton, Left } from 'ui'; +import { CenterAdapt, Tab, Vertical, Left } from 'ui'; import { TEST_STATUS } from '@constants/constant'; import { TipIconXtype } from './tip_icon/tip_icon'; import { TipFailXtype, EVENT_CLOSE, EVENT_RELOAD, EVENT_DETAIL } from './tip_icon/tip_fail'; +import { Label } from '@fui/core'; export const TestStatusXtype = 'dec.dcm.components.test_status'; export { EVENT_CLOSE, @@ -26,8 +27,8 @@ export class TestStatus extends BI.Widget { store: TestStatusModel['store']; tab: any; - failMessage: any; - failDriverMessage: any; + failMessage: Label; + failDriverMessage: Label; driverLink: any; detail: any; @@ -118,20 +119,20 @@ export class TestStatus extends BI.Widget { height: 75, items: [ { - type: Label, + type: BI.Label.xtype, whiteSpace: 'normal', width: 400, textAlign: 'left', text: '', - ref: (_ref: any) => { + ref: (_ref: Label) => { this.failMessage = _ref; }, }, { - type: Label, + type: BI.Label.xtype, textAlign: 'left', invisible: true, - ref: (_ref: any) => { + ref: (_ref: Label) => { this.failDriverMessage = _ref; }, }, @@ -140,7 +141,7 @@ export class TestStatus extends BI.Widget { invisible: true, items: [ { - type: TextButton, + type: BI.TextButton.xtype, cls: 'bi-high-light bi-high-light-border-bottom', text: BI.i18nText('Dec-Dcm_Connection_Download_Driver'), handler: () => { diff --git a/src/modules/components/test_status/tip_icon/tip_fail.ts b/src/modules/components/test_status/tip_icon/tip_fail.ts index d5fb9b9..65997be 100644 --- a/src/modules/components/test_status/tip_icon/tip_fail.ts +++ b/src/modules/components/test_status/tip_icon/tip_fail.ts @@ -1,5 +1,5 @@ import { shortcut, store } from '@core/core'; -import { Vertical, HorizotalAuto, CenterAdapt, Label, VerticalAdapt, Button } from 'ui'; +import { Vertical, HorizotalAuto, CenterAdapt, VerticalAdapt, Button } from 'ui'; import { TipFailModel, TipFailModelXtype } from './tip_fail.model'; export const TipFailXtype = 'dec.dcm.components.test_status.tip_fail'; export const EVENT_CLOSE = 'EVENT_CLOSE'; @@ -46,7 +46,7 @@ export class TipFail extends BI.Widget { height: 60, }], }, { - type: Label, + type: BI.Label.xtype, height: 14, bgap: 10, text: tipText, diff --git a/src/modules/components/test_status/tip_icon/tip_icon.ts b/src/modules/components/test_status/tip_icon/tip_icon.ts index 167a894..cd176d6 100644 --- a/src/modules/components/test_status/tip_icon/tip_icon.ts +++ b/src/modules/components/test_status/tip_icon/tip_icon.ts @@ -1,5 +1,5 @@ import { shortcut } from '@core/core'; -import { Vertical, HorizotalAuto, CenterAdapt, Label } from 'ui'; +import { Vertical, HorizotalAuto, CenterAdapt } from 'ui'; export const TipIconXtype = 'dec.dcm.components.test_status.tip_icon'; @shortcut(TipIconXtype) export class TipIcon extends BI.Widget { @@ -26,7 +26,7 @@ export class TipIcon extends BI.Widget { height: 60, }], }, { - type: Label, + type: BI.Label.xtype, height: 14, text: tipText, }, diff --git a/src/modules/components/text_checker/text_checker.ts b/src/modules/components/text_checker/text_checker.ts index 26b45d2..91fc540 100644 --- a/src/modules/components/text_checker/text_checker.ts +++ b/src/modules/components/text_checker/text_checker.ts @@ -1,5 +1,6 @@ import { shortcut } from '@core/core'; -import { TextEditor, Absolute, Label } from 'ui'; +import { Label } from '@fui/core'; +import { TextEditor, Absolute } from 'ui'; export const TextCheckerXtype = 'dec.dcm.components.text_checker'; @shortcut(TextCheckerXtype) export class TextChecker extends BI.Widget { @@ -13,11 +14,12 @@ export class TextChecker extends BI.Widget { checker: (value: string) => boolean; autoFix?: boolean; }[], + $value: '', } textEditor: any; - errorLabel: any; - private isError; + errorLabel: Label; + private isError: boolean; private value: string; private errorChecker: { errorText: string; @@ -73,9 +75,9 @@ export class TextChecker extends BI.Widget { }, }, { el: { - type: Label, + type: BI.Label.xtype, cls: 'bi-error', - ref: (_ref: any) => { + ref: (_ref: Label) => { this.errorLabel = _ref; }, }, diff --git a/src/modules/pages/connection/components/form_item/form_item.ts b/src/modules/pages/connection/components/form_item/form_item.ts index 1b1c743..ee0c0be 100644 --- a/src/modules/pages/connection/components/form_item/form_item.ts +++ b/src/modules/pages/connection/components/form_item/form_item.ts @@ -1,5 +1,5 @@ import { shortcut } from '@core/core'; -import { Label, Htape, Vertical } from 'ui'; +import { Htape, Vertical } from 'ui'; export const FormItemXtype = 'dec.dcm.connection_form_item'; @shortcut(FormItemXtype) export class FormItem extends BI.Widget { @@ -21,7 +21,7 @@ export class FormItem extends BI.Widget { items: [ { el: { - type: Label, + type: BI.Label.xtype, cls: this.options.isBold ? 'bi-font-bold' : '', textAlign: 'left', text: this.options.name, @@ -32,7 +32,7 @@ export class FormItem extends BI.Widget { type: Vertical, items: [ { - type: Label, + type: BI.Label.xtype, text: unit ? `${value} ${unit}` : value, textAlign: 'left', title: value, diff --git a/src/modules/pages/connection/connection.ts b/src/modules/pages/connection/connection.ts index f5aa1e1..1911a1e 100644 --- a/src/modules/pages/connection/connection.ts +++ b/src/modules/pages/connection/connection.ts @@ -1,4 +1,4 @@ -import { Button, Htape, Vtape, Label, VerticalAdapt, ListView, CenterAdapt, Layout } from 'ui'; +import { Button, Htape, Vtape, VerticalAdapt, ListView, CenterAdapt, Layout } from 'ui'; import { shortcut, store } from '@core/core'; import { ConnectionModel, ConnectionModelXtype } from './connection.model'; import { PAGE_INDEX } from '@constants/constant'; @@ -9,6 +9,7 @@ import { ConnectionPluginXtype } from './connection_plugin/connection_plugin'; import { connectionType } from '@constants/env'; import { getAllDatabaseTypes, connectionCanEdit, getJdbcDatabaseType, getTextByDatabaseType } from '../../app.service'; import { ConnectionJDBC } from '../../crud/crud.typings'; +import { Label } from '@fui/core'; export const ConnectionXtype = 'dec.dcm.connection'; @shortcut(ConnectionXtype) @@ -17,7 +18,7 @@ export class Connection extends BI.Widget { store: ConnectionModel['store']; model: ConnectionModel['model']; - connectionTitleWidget: any; + connectionTitleWidget: Label; connectionEditWidget: any; listView: any; title: any; @@ -91,9 +92,9 @@ export class Connection extends BI.Widget { cls: 'bi-border-bottom', items: [ { - type: Label, + type: BI.Label.xtype, textAlign: 'left', - ref: (_ref: any) => { + ref: (_ref: Label) => { this.connectionTitleWidget = _ref; }, }, @@ -174,7 +175,7 @@ export class Connection extends BI.Widget { height: 130, }, { - type: Label, + type: BI.Label.xtype, cls: 'bi-tips', text: BI.i18nText('Dec-Dcm_Connection_Np_Registered'), }, diff --git a/src/modules/pages/connection/connection_jndi/connection_jndi.ts b/src/modules/pages/connection/connection_jndi/connection_jndi.ts index b6ec3a9..3827f6c 100644 --- a/src/modules/pages/connection/connection_jndi/connection_jndi.ts +++ b/src/modules/pages/connection/connection_jndi/connection_jndi.ts @@ -1,5 +1,5 @@ import { shortcut, store } from '@core/core'; -import { Vertical, Htape, Label, Left } from 'ui'; +import { Vertical, Htape, Left } from 'ui'; import { FormItemXtype } from '../components/form_item/form_item'; import { ConnectionJndiModelXtype, ConnectionJndiModel } from './connection_jndi.model'; import { ConnectionJNDI } from 'src/modules/crud/crud.typings'; @@ -40,7 +40,7 @@ export class ConnectionJdbc extends BI.Widget { type: Left, items: [ { - type: Label, + type: BI.Label.xtype, cls: 'bi-font-bold', textAlign: 'left', text: BI.i18nText('Dec-Dcm_Connection_JNDI_Form_Connection'), diff --git a/src/modules/pages/connection/list/list.ts b/src/modules/pages/connection/list/list.ts index efa8dc9..97beb17 100644 --- a/src/modules/pages/connection/list/list.ts +++ b/src/modules/pages/connection/list/list.ts @@ -1,5 +1,5 @@ import { shortcut, store } from '@core/core'; -import { CenterAdapt, Label, Layout, Vtape, Loader, Tab } from 'ui'; +import { CenterAdapt, Layout, Vtape, Loader, Tab } from 'ui'; import { ListItemXtype } from './list_item/list_item'; import { ConnectionListModel, ConnectionListModelXtype } from './list.model'; import { getDatabaseType } from './list.service'; @@ -56,7 +56,7 @@ export class ConnectionList extends BI.LoadingPane { height: 130, }, { - type: Label, + type: BI.Label.xtype, cls: 'bi-tips', text: BI.i18nText('Dec-Dcm_Connection_None'), }, diff --git a/src/modules/pages/connection/list/list_item/list_item.ts b/src/modules/pages/connection/list/list_item/list_item.ts index adab6b2..6c446a0 100644 --- a/src/modules/pages/connection/list/list_item/list_item.ts +++ b/src/modules/pages/connection/list/list_item/list_item.ts @@ -1,11 +1,12 @@ import { shortcut, store } from '@core/core'; -import { Label, IconLabel, IconButton, DownListCombo, SignEditor, Layout, Htape, Vertical } from 'ui'; +import { IconLabel, Layout, Htape, Vertical } from 'ui'; import './list_item.less'; import { ListItemModel, ListItemModelXtype } from './list_item.model'; import { PAGE_INDEX } from '@constants/constant'; import { hasRegistered } from '../list.service'; import { connectionCanEdit, getTextByDatabaseType, getChartLength } from '../../../../app.service'; import { testConnection } from '../../../maintain/forms/form.server'; +import { DownListCombo, Label, SignEditor } from '@fui/core'; export const ListItemXtype = 'dec.dcm.connection.list_item'; @shortcut(ListItemXtype) @@ -24,9 +25,9 @@ export class ListItem extends BI.BasicButton { model: ListItemModel['model']; comboWidget: any; - nameLabel: any; - nameEditor: any; - downListCombo: any; + nameLabel: Label; + nameEditor: SignEditor; + downListCombo: DownListCombo; watch = { isEdit: (isEdit: boolean) => { @@ -55,21 +56,21 @@ export class ListItem extends BI.BasicButton { type: Vertical, items: [ { - type: Label, + type: BI.Label.xtype, text: name, textAlign: 'left', height: 25, title: name, - ref: (_ref: any) => { + ref: (_ref: Label) => { this.nameLabel = _ref; }, }, { - type: SignEditor, + type: BI.SignEditor.xtype, $value: 'connection-name', value: name, invisible: !this.model.isEdit, - ref: (_ref: any) => { + ref: (_ref: SignEditor) => { this.nameEditor = _ref; }, listeners: [{ @@ -104,17 +105,17 @@ export class ListItem extends BI.BasicButton { ], }, { el: databaseType ? { - type: DownListCombo, + type: BI.DownListCombo.xtype, cls: 'link-item-icon', stopPropagation: true, hgap: 8, el: { - type: IconButton, + type: BI.IconButton.xtype, $value: 'other-edit', cls: 'dcm-link-other-font icon-size-16', }, items: this.renderDownList(), - ref: (_ref: any) => { + ref: (_ref: DownListCombo) => { this.downListCombo = _ref; }, listeners: [{ diff --git a/src/modules/pages/connection_pool/connection_pool.ts b/src/modules/pages/connection_pool/connection_pool.ts index 258e61a..af87f09 100644 --- a/src/modules/pages/connection_pool/connection_pool.ts +++ b/src/modules/pages/connection_pool/connection_pool.ts @@ -1,14 +1,15 @@ import { shortcut, store } from '@core/core'; -import { Htape, Vtape, Label, Layout, CenterAdapt, Loader } from 'ui'; +import { Htape, Vtape, Layout, CenterAdapt, Loader } from 'ui'; import { ConnectionPoolModel, ConnectionPoolModelXtype } from './connection_pool.model'; import { ListItemXtype } from './list_item/list_item'; import { PoolXtype } from './pool/pool'; import { PAGE_SIZE } from '@constants/constant'; +import { Label } from '@fui/core'; export const ConnectionPoolXtype = 'dec.dcm.connection_pool'; @shortcut(ConnectionPoolXtype) @store(ConnectionPoolModelXtype) export class ConnectionPool extends BI.Widget { - title: any; + title: Label; model: ConnectionPoolModel['model']; store: ConnectionPoolModel['store']; @@ -39,7 +40,7 @@ export class ConnectionPool extends BI.Widget { items: [ { el: { - type: Label, + type: BI.Label.xtype, cls: 'bi-border-bottom', textAlign: 'left', text: BI.i18nText('Dec-Dcm_Data_Connections'), @@ -69,11 +70,11 @@ export class ConnectionPool extends BI.Widget { items: [ { el: { - type: Label, + type: BI.Label.xtype, cls: 'bi-border-bottom', textAlign: 'left', lgap: 10, - ref: (_ref: any) => { + ref: (_ref: Label) => { this.title = _ref; }, }, @@ -103,7 +104,7 @@ export class ConnectionPool extends BI.Widget { height: 130, }, { - type: Label, + type: BI.Label.xtype, cls: 'bi-tips', text: BI.i18nText('Dec-Dcm_Connection_NO_Connection_Pool'), }, diff --git a/src/modules/pages/connection_pool/list_item/list_item.ts b/src/modules/pages/connection_pool/list_item/list_item.ts index f49289e..c2498a6 100644 --- a/src/modules/pages/connection_pool/list_item/list_item.ts +++ b/src/modules/pages/connection_pool/list_item/list_item.ts @@ -1,5 +1,5 @@ import { shortcut, store } from '@core/core'; -import { VerticalAdapt, Label } from 'ui'; +import { VerticalAdapt } from 'ui'; import { ListItemModel, ListItemModelXtype } from './list_item.model'; export const ListItemXtype = 'dec.dcm.connection_pool.list_item'; @shortcut(ListItemXtype) @@ -20,7 +20,7 @@ export class ListItem extends BI.BasicButton { lgap: 5, items: [ { - type: Label, + type: BI.Label.xtype, text: this.options.name, title: this.options.name, width: 250, diff --git a/src/modules/pages/connection_pool/pool/pool.ts b/src/modules/pages/connection_pool/pool/pool.ts index 508c3ec..21d3fec 100644 --- a/src/modules/pages/connection_pool/pool/pool.ts +++ b/src/modules/pages/connection_pool/pool/pool.ts @@ -1,8 +1,9 @@ import { shortcut, store } from '@core/core'; import { PoolModel, PoolModelXtype } from './pool.model'; -import { FloatCenter, Vertical, CenterAdapt, Label, VerticalAdapt } from 'ui'; +import { FloatCenter, Vertical, CenterAdapt, VerticalAdapt } from 'ui'; import './pool.less'; import { ConnectionPoolType } from '../../../crud/crud.typings'; +import { Label } from '@fui/core'; export const PoolXtype = 'dec.dcm.connection_pool.pool'; @shortcut(PoolXtype) @@ -14,17 +15,17 @@ export class Pool extends BI.Widget { } model: PoolModel['model']; - maxActive: any; - maxIdle: any; - numActive: any; - numIdle: any; + maxActive: Label; + maxIdle: Label; + numActive: Label; + numIdle: Label; watch = { pool: (pool: ConnectionPoolType) => { - this.maxActive.setText(pool.maxActive); - this.maxIdle.setText(pool.maxIdle); - this.numActive.setText(pool.numActive); - this.numIdle.setText(pool.numIdle); + this.maxActive.setText(`${pool.maxActive}`); + this.maxIdle.setText(`${pool.maxIdle}`); + this.numActive.setText(`${pool.numActive}`); + this.numIdle.setText(`${pool.numIdle}`); }, } @@ -54,23 +55,23 @@ export class Pool extends BI.Widget { type: VerticalAdapt, items: [ { - type: Label, + type: BI.Label.xtype, $testId: 'dec-dcm-pool-status-number', $value: 'active', cls: 'bi-high-light card-font-heighlight', - ref: (_ref: any) => { + ref: (_ref: Label) => { this.numActive = _ref; }, }, { - type: Label, + type: BI.Label.xtype, text: '/', }, { - type: Label, + type: BI.Label.xtype, $testId: 'dec-dcm-pool-status-max', $value: 'active', - ref: (_ref: any) => { + ref: (_ref: Label) => { this.maxActive = _ref; }, }, @@ -79,7 +80,7 @@ export class Pool extends BI.Widget { ], }, { - type: Label, + type: BI.Label.xtype, text: BI.i18nText('Dec-Dcm_Active_Connections_Number'), }, ], @@ -102,23 +103,23 @@ export class Pool extends BI.Widget { type: VerticalAdapt, items: [ { - type: Label, + type: BI.Label.xtype, $testId: 'dec-dcm-pool-status-number', $value: 'idle', cls: 'bi-high-light card-font-heighlight', - ref: (_ref: any) => { + ref: (_ref: Label) => { this.numIdle = _ref; }, }, { - type: Label, + type: BI.Label.xtype, text: '/', }, { - type: Label, + type: BI.Label.xtype, $testId: 'dec-dcm-pool-status-max', $value: 'idle', - ref: (_ref: any) => { + ref: (_ref: Label) => { this.maxIdle = _ref; }, }, @@ -127,7 +128,7 @@ export class Pool extends BI.Widget { ], }, { - type: Label, + type: BI.Label.xtype, text: BI.i18nText('Dec-Dcm_Leisure_Connections_Number'), }, ], diff --git a/src/modules/pages/database/database.ts b/src/modules/pages/database/database.ts index 4e9af98..915c48e 100644 --- a/src/modules/pages/database/database.ts +++ b/src/modules/pages/database/database.ts @@ -1,4 +1,4 @@ -import { SearchEditor, Vtape, Right, Htape, Vertical, ButtonGroup, Left, Label, MultiSelectItem, CenterAdapt } from 'ui'; +import { SearchEditor, Vtape, Right, Htape, Vertical, ButtonGroup, Left, MultiSelectItem, CenterAdapt } from 'ui'; import { shortcut, store } from '@core/core'; import { FilterXtype } from './filter/filter'; import { DatebaseModel, DatebaseModelXtype } from './database.model'; @@ -146,7 +146,7 @@ export class Datebase extends BI.Widget { invisible: true, items: [ { - type: Label, + type: BI.Label.xtype, width: 70, textAlign: 'left', text: BI.i18nText('Dec-Dcm_Connection_Type_Filter'), @@ -179,7 +179,7 @@ export class Datebase extends BI.Widget { }, }, { - type: Label, + type: BI.Label.xtype, cls: 'bi-tips', textAlign: 'left', text: BI.i18nText('Dec-Dcm_Connection_Filter_Tip'), @@ -236,7 +236,7 @@ export class Datebase extends BI.Widget { height: '100%', width: '100%', items: [{ - type: Label, + type: BI.Label.xtype, cls: 'bi-tips', text: BI.i18nText('Dec-Dcm_Connection_No_Search_Result'), }], diff --git a/src/modules/pages/database/database_type/database_type.ts b/src/modules/pages/database/database_type/database_type.ts index 68b6f7e..1064673 100644 --- a/src/modules/pages/database/database_type/database_type.ts +++ b/src/modules/pages/database/database_type/database_type.ts @@ -1,5 +1,5 @@ import { shortcut, store } from '@core/core'; -import { Vtape, Label, Absolute, Img } from 'ui'; +import { Vtape, Absolute, Img } from 'ui'; import { DatebaseTypeModel, DatebaseTypeModelXtype } from './database_type.model'; import { ImgPrefix, PluginImgPrefix } from '@constants/env'; import './database_type.less'; @@ -48,7 +48,7 @@ export class DatebaseType extends BI.BasicButton { height: 90, }, { - type: Label, + type: BI.Label.xtype, cls: 'bi-header-background', text, title: text, diff --git a/src/modules/pages/database/filter/filter.ts b/src/modules/pages/database/filter/filter.ts index c0fda51..e5f798b 100644 --- a/src/modules/pages/database/filter/filter.ts +++ b/src/modules/pages/database/filter/filter.ts @@ -1,5 +1,4 @@ import { shortcut, store } from '@core/core'; -import { Label } from 'ui'; import { FilterModel, FilterModelXtype } from './filter.model'; export const FilterXtype = 'dec.dcm.datebase.filter'; @@ -18,7 +17,7 @@ export class Filter extends BI.BasicButton { const { text } = this.options; return { - type: Label, + type: BI.Label.xtype, textAlign: 'left', height: 25, lgap: 10, diff --git a/src/modules/pages/maintain/components/form_item/form_item.ts b/src/modules/pages/maintain/components/form_item/form_item.ts index 47398e0..11e91d6 100644 --- a/src/modules/pages/maintain/components/form_item/form_item.ts +++ b/src/modules/pages/maintain/components/form_item/form_item.ts @@ -1,5 +1,5 @@ import { shortcut } from '@core/core'; -import { Label, Left } from 'ui'; +import { Left } from 'ui'; import { CONNECTION_LAYOUT } from '@constants/constant'; export const FormItemXtype = 'dec.dcm.Maintain_form_item'; @shortcut(FormItemXtype) @@ -17,7 +17,7 @@ export class FormItem extends BI.Widget { type: Left, items: [ { - type: Label, + type: BI.Label.xtype, cls: this.options.isBold ? 'bi-font-bold' : '', width: this.options.nameWidth, textAlign: 'left', diff --git a/src/modules/pages/maintain/forms/components/form.jdbc.ts b/src/modules/pages/maintain/forms/components/form.jdbc.ts index e111ed2..b12a8d2 100644 --- a/src/modules/pages/maintain/forms/components/form.jdbc.ts +++ b/src/modules/pages/maintain/forms/components/form.jdbc.ts @@ -1,5 +1,5 @@ import { shortcut } from '@core/core'; -import { Vertical, TextEditor, TextValueCombo, Label, TextAreaEditor, Editor, EdirotIconCheckCombo, Left, TextButton, Layout } from 'ui'; +import { Vertical, TextEditor, TextValueCombo, TextAreaEditor, Editor, EdirotIconCheckCombo, Left, Layout } from 'ui'; import { CollapseXtype, EVENT_CHANGE } from 'src/modules/components/collapse/collapse'; import { FormItemXtype } from '../../components/form_item/form_item'; import { Connection, ConnectionJDBC, ConnectionPoolJDBC } from 'src/modules/crud/crud.typings'; @@ -308,7 +308,7 @@ export class FormJdbc extends BI.Widget { }], }, { - type: Label, + type: BI.Label.xtype, cls: 'bi-tips', textAlign: 'left', invisible: true, @@ -341,14 +341,14 @@ export class FormJdbc extends BI.Widget { items: [{ type: Left, items: [{ - type: TextButton, + type: BI.TextButton.xtype, cls: 'bi-high-light', text: BI.i18nText('Dec-Dcm_Connection_Click_Connect_Database'), handler: () => { this.fireEvent('EVENT_TEST_CONNECTION'); }, }, { - type: Label, + type: BI.Label.xtype, cls: 'bi-tips', lgap: 3, text: BI.i18nText('Dec-Dcm_Connection_Read_Mode_List'), @@ -521,7 +521,7 @@ export class FormJdbc extends BI.Widget { }, }, { - type: Label, + type: BI.Label.xtype, lgap: 5, height: CONNECTION_LAYOUT.labelHeight, text: BI.i18nText('Dec-Dcm_Millisecond'), @@ -614,7 +614,7 @@ export class FormJdbc extends BI.Widget { }, }, { - type: Label, + type: BI.Label.xtype, lgap: 5, height: CONNECTION_LAYOUT.labelHeight, text: BI.i18nText('Dec-Dcm_Millisecond'), @@ -662,7 +662,7 @@ export class FormJdbc extends BI.Widget { }, }, { - type: Label, + type: BI.Label.xtype, lgap: 5, height: CONNECTION_LAYOUT.labelHeight, text: BI.i18nText('BI-Basic_Seconds'), diff --git a/src/modules/pages/maintain/forms/components/form.jndi.ts b/src/modules/pages/maintain/forms/components/form.jndi.ts index 0161a7e..24b0079 100644 --- a/src/modules/pages/maintain/forms/components/form.jndi.ts +++ b/src/modules/pages/maintain/forms/components/form.jndi.ts @@ -1,5 +1,5 @@ import { shortcut } from '@core/core'; -import { Vertical, TextEditor, Htape, Left, Label, TextValueCombo, EdirotIconCheckCombo } from 'ui'; +import { Vertical, TextEditor, Htape, Left, TextValueCombo, EdirotIconCheckCombo } from 'ui'; import { FormItemXtype } from '../../components/form_item/form_item'; import { ConnectionJNDI, Connection, ContextHashtable } from 'src/modules/crud/crud.typings'; import { CONNECT_CHARSET, CONNECTION_LAYOUT, JNDI_FACTORYS } from '@constants/constant'; @@ -83,7 +83,7 @@ export class FormJndi extends BI.Widget { type: Left, items: [ { - type: Label, + type: BI.Label.xtype, cls: 'bi-font-bold', textAlign: 'left', text: BI.i18nText('Dec-Dcm_Connection_JNDI_Form_Connection'), @@ -176,7 +176,7 @@ export class FormJndi extends BI.Widget { }], }, { - type: Label, + type: BI.Label.xtype, bgap: -15, cls: 'bi-tips', textAlign: 'left', diff --git a/src/modules/pages/maintain/maintain.ts b/src/modules/pages/maintain/maintain.ts index fc33685..b3a558d 100644 --- a/src/modules/pages/maintain/maintain.ts +++ b/src/modules/pages/maintain/maintain.ts @@ -1,4 +1,4 @@ -import { Vtape, Label, VerticalAdapt, ListView, IconButton } from 'ui'; +import { Vtape, VerticalAdapt, ListView } from 'ui'; import { shortcut, store } from '@core/core'; import { MaintainModel, MaintainModelXtype } from './maintain.model'; import { MaintainFormXtype } from './forms/form'; @@ -19,6 +19,7 @@ export class Maintain extends BI.Widget { store: MaintainModel['store']; listView: any; + socketTip: any; render() { const { isEdit, databaseType } = this.getEditConnection(); @@ -35,7 +36,7 @@ export class Maintain extends BI.Widget { hgap: 5, items: [ { - type: IconButton, + type: BI.IconButton.xtype, $value: 'back-databases', cls: 'dcm-back-font', height: 15, @@ -45,7 +46,7 @@ export class Maintain extends BI.Widget { }, }, { - type: Label, + type: BI.Label.xtype, text: titleText, height: 15, }, diff --git a/src/ui/fineui.ts b/src/ui/fineui.ts index 868341f..61846f8 100644 --- a/src/ui/fineui.ts +++ b/src/ui/fineui.ts @@ -1,14 +1,3 @@ -export const Icon = 'bi.icon'; -export const IconTextItem = 'bi.icon_text_item'; -export const IconTextIconItem = 'bi.icon_text_icon_item'; -export const IconButton = 'bi.icon_button'; -export const IconChangeButton = 'bi.icon_change_button'; -export const TextButton = 'bi.text_button'; -export const DownListCombo = 'bi.down_list_combo'; -export const Label = 'bi.label'; -export const SmallTextEditor = 'bi.small_text_editor'; -export const MultiFileEditor = 'bi.multifile_editor'; -export const SignEditor = 'bi.sign_editor'; export const Button = 'bi.button'; export const TextEditor = 'bi.text_editor'; export const MultiSelectInsertCombo = 'bi.multi_select_insert_combo'; diff --git a/tsconfig.json b/tsconfig.json index 7caa784..4e9e3db 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -19,6 +19,7 @@ // "noUnusedParameters": true, // "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, + "skipLibCheck": true, "paths": { "ui": ["./src/ui"], "ReportCst": ["./private/constants"], diff --git a/types/globals.d.ts b/types/globals.d.ts index c1a7afe..09a8987 100644 --- a/types/globals.d.ts +++ b/types/globals.d.ts @@ -2,7 +2,7 @@ interface Obj { [key: string]: any; } -declare let BI: Obj & import('fineui')._BI; +declare let BI: Obj & import('@fui/core').BI & import('@fui/materials').BI; declare const Fix: Obj; declare const DecCst: Obj; declare const Dec: { diff --git a/webpack/webpack.common.js b/webpack/webpack.common.js index ef583b9..6f5c02d 100644 --- a/webpack/webpack.common.js +++ b/webpack/webpack.common.js @@ -49,7 +49,7 @@ module.exports = { options: { plugins: [vars({ variables: { - fontUrl: '../node_modules/fineui/dist/font/', + fontUrl: '../node_modules/@fui/core/dist/font/', imageUrl: '/webroot/decision/resources?path=/com/fr/web/resources/dist/images/1x', image2xUrl: '/webroot/decision/resources?path=/com/fr/web/resources/dist/images/2x', } diff --git a/webpack/webpack.dev.js b/webpack/webpack.dev.js index d93e397..2d280f8 100644 --- a/webpack/webpack.dev.js +++ b/webpack/webpack.dev.js @@ -6,7 +6,7 @@ const HtmlWebpackPlugin = require('html-webpack-plugin'); const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin'); const chokidar = require('chokidar'); const { execSync } = require('child_process'); - +const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin'); const dirs = require('./dirs'); const common = require('./webpack.common.js'); @@ -65,6 +65,9 @@ module.exports = merge(common, { new HtmlWebpackPlugin({ template: path.resolve(__dirname, '../index.html'), }), + new ForkTsCheckerWebpackPlugin({ + watch: ['./src'], + }), new OptimizeCssAssetsPlugin({ assetNameRegExp: /\.css$/g, cssProcessor: require('cssnano'), diff --git a/yarn.lock b/yarn.lock index e41649b..affe74d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9,6 +9,13 @@ dependencies: "@babel/highlight" "^7.0.0" +"@babel/code-frame@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a" + integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg== + dependencies: + "@babel/highlight" "^7.10.4" + "@babel/core@7.4.5": version "7.4.5" resolved "https://registry.npmjs.org/@babel/core/-/core-7.4.5.tgz#081f97e8ffca65a9b4b0fdc7e274e703f000c06a" @@ -49,6 +56,15 @@ semver "^5.4.1" source-map "^0.5.0" +"@babel/generator@^7.12.5": + version "7.12.5" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz#a2c50de5c8b6d708ab95be5e6053936c1884a4de" + integrity sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A== + dependencies: + "@babel/types" "^7.12.5" + jsesc "^2.5.1" + source-map "^0.5.0" + "@babel/generator@^7.4.0", "@babel/generator@^7.4.4", "@babel/generator@^7.5.5": version "7.5.5" resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.5.5.tgz#873a7f936a3c89491b43536d12245b626664e3cf" @@ -96,6 +112,17 @@ "@babel/helper-replace-supers" "^7.5.5" "@babel/helper-split-export-declaration" "^7.4.4" +"@babel/helper-create-class-features-plugin@^7.5.0": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz#3c45998f431edd4a9214c5f1d3ad1448a6137f6e" + integrity sha512-hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w== + dependencies: + "@babel/helper-function-name" "^7.10.4" + "@babel/helper-member-expression-to-functions" "^7.12.1" + "@babel/helper-optimise-call-expression" "^7.10.4" + "@babel/helper-replace-supers" "^7.12.1" + "@babel/helper-split-export-declaration" "^7.10.4" + "@babel/helper-define-map@^7.5.5": version "7.5.5" resolved "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz#3dec32c2046f37e09b28c93eb0b103fd2a25d369" @@ -122,6 +149,15 @@ "@babel/template" "^7.1.0" "@babel/types" "^7.0.0" +"@babel/helper-function-name@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a" + integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ== + dependencies: + "@babel/helper-get-function-arity" "^7.10.4" + "@babel/template" "^7.10.4" + "@babel/types" "^7.10.4" + "@babel/helper-get-function-arity@^7.0.0": version "7.0.0" resolved "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3" @@ -129,6 +165,13 @@ dependencies: "@babel/types" "^7.0.0" +"@babel/helper-get-function-arity@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2" + integrity sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A== + dependencies: + "@babel/types" "^7.10.4" + "@babel/helper-hoist-variables@^7.4.4": version "7.4.4" resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz#0298b5f25c8c09c53102d52ac4a98f773eb2850a" @@ -136,6 +179,13 @@ dependencies: "@babel/types" "^7.4.4" +"@babel/helper-member-expression-to-functions@^7.12.1": + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz#aa77bd0396ec8114e5e30787efa78599d874a855" + integrity sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw== + dependencies: + "@babel/types" "^7.12.7" + "@babel/helper-member-expression-to-functions@^7.5.5": version "7.5.5" resolved "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz#1fb5b8ec4453a93c439ee9fe3aeea4a84b76b590" @@ -169,11 +219,23 @@ dependencies: "@babel/types" "^7.0.0" +"@babel/helper-optimise-call-expression@^7.10.4": + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.7.tgz#7f94ae5e08721a49467346aa04fd22f750033b9c" + integrity sha512-I5xc9oSJ2h59OwyUqjv95HRyzxj53DAubUERgQMrpcCEYQyToeHA+NEcUEsVWB4j53RDeskeBJ0SgRAYHDBckw== + dependencies: + "@babel/types" "^7.12.7" + "@babel/helper-plugin-utils@^7.0.0": version "7.0.0" resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250" integrity sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA== +"@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" + integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg== + "@babel/helper-regex@^7.0.0", "@babel/helper-regex@^7.4.4": version "7.5.5" resolved "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.5.5.tgz#0aa6824f7100a2e0e89c1527c23936c152cab351" @@ -192,6 +254,16 @@ "@babel/traverse" "^7.1.0" "@babel/types" "^7.0.0" +"@babel/helper-replace-supers@^7.12.1": + version "7.12.5" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz#f009a17543bbbbce16b06206ae73b63d3fca68d9" + integrity sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA== + dependencies: + "@babel/helper-member-expression-to-functions" "^7.12.1" + "@babel/helper-optimise-call-expression" "^7.10.4" + "@babel/traverse" "^7.12.5" + "@babel/types" "^7.12.5" + "@babel/helper-replace-supers@^7.5.5": version "7.5.5" resolved "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz#f84ce43df031222d2bad068d2626cb5799c34bc2" @@ -210,6 +282,13 @@ "@babel/template" "^7.1.0" "@babel/types" "^7.0.0" +"@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f" + integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg== + dependencies: + "@babel/types" "^7.11.0" + "@babel/helper-split-export-declaration@^7.4.4": version "7.4.4" resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz#ff94894a340be78f53f06af038b205c49d993677" @@ -217,6 +296,11 @@ dependencies: "@babel/types" "^7.4.4" +"@babel/helper-validator-identifier@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2" + integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw== + "@babel/helper-wrap-function@^7.1.0": version "7.2.0" resolved "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz#c4e0012445769e2815b55296ead43a958549f6fa" @@ -245,11 +329,25 @@ esutils "^2.0.2" js-tokens "^4.0.0" +"@babel/highlight@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143" + integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA== + dependencies: + "@babel/helper-validator-identifier" "^7.10.4" + chalk "^2.0.0" + js-tokens "^4.0.0" + "@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.4.4", "@babel/parser@^7.4.5", "@babel/parser@^7.5.5": version "7.5.5" resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.5.5.tgz#02f077ac8817d3df4a832ef59de67565e71cca4b" integrity sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g== +"@babel/parser@^7.12.7": + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.7.tgz#fee7b39fe809d0e73e5b25eecaf5780ef3d73056" + integrity sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg== + "@babel/plugin-proposal-async-generator-functions@^7.2.0": version "7.2.0" resolved "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz#b289b306669dce4ad20b0252889a15768c9d417e" @@ -259,12 +357,12 @@ "@babel/helper-remap-async-to-generator" "^7.1.0" "@babel/plugin-syntax-async-generators" "^7.2.0" -"@babel/plugin-proposal-class-properties@^7.5.0": - version "7.5.5" - resolved "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz#a974cfae1e37c3110e71f3c6a2e48b8e71958cd4" - integrity sha512-AF79FsnWFxjlaosgdi421vmYG6/jg79bVD0dpD44QdgobzHKuLZ6S3vl8la9qIeSwGi8i1fS0O1mfuDAAdo1/A== +"@babel/plugin-proposal-class-properties@7.5.0": + version "7.5.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.0.tgz#5bc6a0537d286fcb4fd4e89975adbca334987007" + integrity sha512-9L/JfPCT+kShiiTTzcnBJ8cOwdKVmlC1RcCf9F0F9tERVrM4iWtWnXtjWCRqNm2la2BxO1MPArWNsU9zsSJWSQ== dependencies: - "@babel/helper-create-class-features-plugin" "^7.5.5" + "@babel/helper-create-class-features-plugin" "^7.5.0" "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-proposal-decorators@7.4.4": @@ -300,6 +398,14 @@ "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-syntax-optional-catch-binding" "^7.2.0" +"@babel/plugin-proposal-optional-chaining@7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz#31db16b154c39d6b8a645292472b98394c292a58" + integrity sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w== + dependencies: + "@babel/helper-plugin-utils" "^7.8.3" + "@babel/plugin-syntax-optional-chaining" "^7.8.0" + "@babel/plugin-proposal-unicode-property-regex@^7.4.4": version "7.4.4" resolved "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz#501ffd9826c0b91da22690720722ac7cb1ca9c78" @@ -344,6 +450,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" +"@babel/plugin-syntax-optional-chaining@^7.8.0": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" + integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + "@babel/plugin-syntax-typescript@^7.2.0": version "7.3.3" resolved "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.3.3.tgz#a7cc3f66119a9f7ebe2de5383cce193473d65991" @@ -374,7 +487,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-block-scoping@^7.4.4": +"@babel/plugin-transform-block-scoping@7.5.5", "@babel/plugin-transform-block-scoping@^7.4.4": version "7.5.5" resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.5.5.tgz#a35f395e5402822f10d2119f6f8e045e3639a2ce" integrity sha512-82A3CLRRdYubkG85lKwhZB0WZoHxLGsJdux/cOVaJCJpvYFl1LVzAIFyRsa7CvXqW8rBM4Zf3Bfn8PHt5DP0Sg== @@ -382,7 +495,7 @@ "@babel/helper-plugin-utils" "^7.0.0" lodash "^4.17.13" -"@babel/plugin-transform-classes@^7.4.4": +"@babel/plugin-transform-classes@7.5.5", "@babel/plugin-transform-classes@^7.4.4": version "7.5.5" resolved "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz#d094299d9bd680a14a2a0edae38305ad60fb4de9" integrity sha512-U2htCNK/6e9K7jGyJ++1p5XRU+LJjrwtoiVn9SzRlDT2KubcZ11OOwy3s24TjHxPgxNwonCYP7U2K51uVYCMDg== @@ -472,6 +585,16 @@ "@babel/helper-plugin-utils" "^7.0.0" babel-plugin-dynamic-import-node "^2.3.0" +"@babel/plugin-transform-modules-commonjs@7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.6.0.tgz#39dfe957de4420445f1fcf88b68a2e4aa4515486" + integrity sha512-Ma93Ix95PNSEngqomy5LSBMAQvYKVe3dy+JlVJSHEXZR5ASL9lQBedMiCyVtmTLraIDVRE3ZjTZvmXXD2Ozw3g== + dependencies: + "@babel/helper-module-transforms" "^7.4.4" + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/helper-simple-access" "^7.1.0" + babel-plugin-dynamic-import-node "^2.3.0" + "@babel/plugin-transform-modules-commonjs@^7.4.4": version "7.5.0" resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.5.0.tgz#425127e6045231360858eeaa47a71d75eded7a74" @@ -537,6 +660,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" +"@babel/plugin-transform-proto-to-assign@7.5.5": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-proto-to-assign/-/plugin-transform-proto-to-assign-7.5.5.tgz#9ba443be793d4dff1c2898807704b81a51562c20" + integrity sha512-1vlFiFiIfKXBVm2SJtPr65x7NUAv4Sa3qhBbH4TnSXaUTDQnOSf+W8vNq3BNliaI28kwT8aD3rMTTsEryJpDZw== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + lodash "^4.17.13" + "@babel/plugin-transform-regenerator@^7.4.5": version "7.4.5" resolved "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz#629dc82512c55cee01341fb27bdfcb210354680f" @@ -606,14 +737,6 @@ "@babel/helper-regex" "^7.4.4" regexpu-core "^4.5.4" -"@babel/polyfill@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.8.3.tgz#2333fc2144a542a7c07da39502ceeeb3abe4debd" - integrity sha512-0QEgn2zkCzqGIkSWWAEmvxD7e00Nm9asTtQvi7HdlYvMhjy/J38V/1Y9ode0zEJeIuxAI0uftiAzqc7nVeWUGg== - dependencies: - core-js "^2.6.5" - regenerator-runtime "^0.13.2" - "@babel/preset-env@7.4.5": version "7.4.5" resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.4.5.tgz#2fad7f62983d5af563b5f3139242755884998a58" @@ -692,6 +815,15 @@ "@babel/parser" "^7.4.4" "@babel/types" "^7.4.4" +"@babel/template@^7.10.4": + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc" + integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow== + dependencies: + "@babel/code-frame" "^7.10.4" + "@babel/parser" "^7.12.7" + "@babel/types" "^7.12.7" + "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.4", "@babel/traverse@^7.4.5", "@babel/traverse@^7.5.5": version "7.5.5" resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.5.tgz#f664f8f368ed32988cd648da9f72d5ca70f165bb" @@ -707,6 +839,21 @@ globals "^11.1.0" lodash "^4.17.13" +"@babel/traverse@^7.12.5": + version "7.12.9" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.9.tgz#fad26c972eabbc11350e0b695978de6cc8e8596f" + integrity sha512-iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw== + dependencies: + "@babel/code-frame" "^7.10.4" + "@babel/generator" "^7.12.5" + "@babel/helper-function-name" "^7.10.4" + "@babel/helper-split-export-declaration" "^7.11.0" + "@babel/parser" "^7.12.7" + "@babel/types" "^7.12.7" + debug "^4.1.0" + globals "^11.1.0" + lodash "^4.17.19" + "@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.5.5": version "7.5.5" resolved "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz#97b9f728e182785909aa4ab56264f090a028d18a" @@ -716,6 +863,15 @@ lodash "^4.17.13" to-fast-properties "^2.0.0" +"@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.12.5", "@babel/types@^7.12.7": + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.7.tgz#6039ff1e242640a29452c9ae572162ec9a8f5d13" + integrity sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ== + dependencies: + "@babel/helper-validator-identifier" "^7.10.4" + lodash "^4.17.19" + to-fast-properties "^2.0.0" + "@cnakazawa/watch@^1.0.3": version "1.0.3" resolved "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef" @@ -724,6 +880,35 @@ exec-sh "^0.3.2" minimist "^1.2.0" +"@fui/babel-preset-fineui@^1.0.0": + version "1.0.2" + resolved "https://npm.fineres.com/@fui%2fbabel-preset-fineui/-/babel-preset-fineui-1.0.2.tgz#403adc4bc51a13443da9157c96887ebac1477013" + integrity sha512-cOJL8T8DwGNJZeE97wHlTnMWjUi9X3uXYd9MnAyDhcWWti9Sjd+95Sdg0C210d0s/LEOpRFCQJENd251NWcoIA== + dependencies: + "@babel/core" "7.4.5" + "@babel/plugin-proposal-class-properties" "7.5.0" + "@babel/plugin-proposal-decorators" "7.4.4" + "@babel/plugin-proposal-optional-chaining" "7.9.0" + "@babel/plugin-transform-block-scoping" "7.5.5" + "@babel/plugin-transform-classes" "7.5.5" + "@babel/plugin-transform-modules-commonjs" "7.6.0" + "@babel/plugin-transform-proto-to-assign" "7.5.5" + "@babel/preset-env" "7.4.5" + "@babel/preset-typescript" "7.3.3" + +"@fui/core@^2.0.0": + version "2.0.20201218162221" + resolved "https://npm.fineres.com/@fui%2fcore/-/core-2.0.20201218162221.tgz#d68bd3b72790c5e54cc9d2888eebc65f63f70c8b" + integrity sha512-o7OVoTOnxjbzbNsb+lh6mH1oQk+vmjetusalcHObIFFE2FBY50cFtH9c0frOq1GOvG/zbSyDJlwsZvEvC0hiXw== + +"@fui/materials@10.0.0-release - 10.0.0-release.99999999999999": + version "10.0.0-release.20201218163254" + resolved "https://npm.fineres.com/@fui%2fmaterials/-/materials-10.0.0-release.20201218163254.tgz#10bbafc9eacae0568659f479f8b90c2ffaf26260" + integrity sha512-MZkdzzo4wX+Vw2nY1P+aprhmoflgr7h6LH5hxUE3WLPegNRJ3FH2gH61qYxqjCB5MPRZChWm4sJM8wo5fpAJkQ== + dependencies: + "@types/codemirror" "0.0.77" + codemirror "5.42.2" + "@jest/console@^24.7.1": version "24.7.1" resolved "https://registry.npmjs.org/@jest/console/-/console-24.7.1.tgz#32a9e42535a97aedfe037e725bd67e954b459545" @@ -903,6 +1088,18 @@ dependencies: "@babel/types" "^7.3.0" +"@types/codemirror@0.0.77": + version "0.0.77" + resolved "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-0.0.77.tgz#6785a0183b4aea147de650530259ebf2a511bde9" + integrity sha512-nfjRJpAXgkT075jztMp92Ol2b7w7JrDvpfBU70GfVhpfdpWiZi6NqVIO3STGNzWl77/iJkTu2ZSg6hQobrEadg== + dependencies: + "@types/tern" "*" + +"@types/estree@*": + version "0.0.45" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.45.tgz#e9387572998e5ecdac221950dab3e8c3b16af884" + integrity sha512-jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g== + "@types/events@*": version "3.0.0" resolved "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7" @@ -977,6 +1174,13 @@ resolved "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e" integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw== +"@types/tern@*": + version "0.23.3" + resolved "https://registry.yarnpkg.com/@types/tern/-/tern-0.23.3.tgz#4b54538f04a88c9ff79de1f6f94f575a7f339460" + integrity sha512-imDtS4TAoTcXk0g7u4kkWqedB3E4qpjXzCpD2LU5M5NAXHzCDsypyvXSaG7mM8DKYkCRa7tFp4tS/lp/Wo7Q3w== + dependencies: + "@types/estree" "*" + "@types/yargs@^12.0.2", "@types/yargs@^12.0.9": version "12.0.12" resolved "https://registry.npmjs.org/@types/yargs/-/yargs-12.0.12.tgz#45dd1d0638e8c8f153e87d296907659296873916" @@ -1167,11 +1371,6 @@ resolved "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== -abab@^1.0.0: - version "1.0.4" - resolved "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e" - integrity sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4= - abab@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f" @@ -1182,7 +1381,7 @@ abbrev@1: resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== -accepts@^1.3.5, accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: +accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: version "1.3.7" resolved "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== @@ -1195,13 +1394,6 @@ acorn-dynamic-import@^4.0.0: resolved "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948" integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw== -acorn-globals@^1.0.4: - version "1.0.9" - resolved "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz#55bb5e98691507b74579d0513413217c380c54cf" - integrity sha1-VbtemGkVB7dFedBRNBMhfDgMVM8= - dependencies: - acorn "^2.1.0" - acorn-globals@^4.1.0, acorn-globals@^4.3.0: version "4.3.3" resolved "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.3.tgz#a86f75b69680b8780d30edd21eee4e0ea170c05e" @@ -1220,11 +1412,6 @@ acorn-walk@^6.0.1: resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c" integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA== -acorn@^2.1.0, acorn@^2.4.0: - version "2.7.0" - resolved "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz#ab6e7d9d886aaca8b085bc3312b79a198433f0e7" - integrity sha1-q259nYhqrKiwhbwzEreaGYQz8Oc= - acorn@^5.5.3: version "5.7.3" resolved "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" @@ -1265,13 +1452,6 @@ ansi-colors@^3.0.0: resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf" integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA== -ansi-escape-sequences@^4.0.0: - version "4.1.0" - resolved "https://registry.npmjs.org/ansi-escape-sequences/-/ansi-escape-sequences-4.1.0.tgz#2483c8773f50dd9174dd9557e92b1718f1816097" - integrity sha512-dzW9kHxH011uBsidTXd14JXgzye/YLb2LzeKZ4bsgl/Knwx8AtbSFkkGxagdNOoh0DlqHCmfiEjWKBaqjOanVw== - dependencies: - array-back "^3.0.1" - ansi-escapes@^3.0.0, ansi-escapes@^3.2.0: version "3.2.0" resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" @@ -1299,7 +1479,7 @@ ansi-regex@^4.0.0, ansi-regex@^4.1.0: ansi-styles@^2.2.1: version "2.2.1" - resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= ansi-styles@^3.2.0, ansi-styles@^3.2.1: @@ -1309,11 +1489,6 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" -any-promise@^1.0.0, any-promise@^1.1.0: - version "1.3.0" - resolved "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" - integrity sha1-q8av7tzqUugJzcA3au0845Y10X8= - anymatch@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" @@ -1357,25 +1532,6 @@ arr-union@^3.1.0: resolved "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= -array-back@^1.0.2, array-back@^1.0.3, array-back@^1.0.4: - version "1.0.4" - resolved "https://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz#644ba7f095f7ffcf7c43b5f0dc39d3c1f03c063b" - integrity sha1-ZEun8JX3/898Q7Xw3DnTwfA8Bjs= - dependencies: - typical "^2.6.0" - -array-back@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/array-back/-/array-back-2.0.0.tgz#6877471d51ecc9c9bfa6136fb6c7d5fe69748022" - integrity sha512-eJv4pLLufP3g5kcZry0j6WXpIbzYw9GUB4mVJZno9wfwiBxbizTnHCw3VJb07cBihbFX48Y7oSrW9y+gt4glyw== - dependencies: - typical "^2.6.1" - -array-back@^3.0.1: - version "3.1.0" - resolved "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz#b8859d7a508871c9a7b2cf42f99428f65e96bfb0" - integrity sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q== - array-equal@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93" @@ -1530,176 +1686,15 @@ axios@0.18.0: follow-redirects "^1.3.0" is-buffer "^1.1.5" -babel-code-frame@^6.26.0: +babel-code-frame@^6.22.0: version "6.26.0" - resolved "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" + resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s= dependencies: chalk "^1.1.3" esutils "^2.0.2" js-tokens "^3.0.2" -babel-core@^6.26.0: - version "6.26.3" - resolved "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207" - integrity sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA== - dependencies: - babel-code-frame "^6.26.0" - babel-generator "^6.26.0" - babel-helpers "^6.24.1" - babel-messages "^6.23.0" - babel-register "^6.26.0" - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - convert-source-map "^1.5.1" - debug "^2.6.9" - json5 "^0.5.1" - lodash "^4.17.4" - minimatch "^3.0.4" - path-is-absolute "^1.0.1" - private "^0.1.8" - slash "^1.0.0" - source-map "^0.5.7" - -babel-generator@^6.26.0: - version "6.26.1" - resolved "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90" - integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA== - dependencies: - babel-messages "^6.23.0" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - detect-indent "^4.0.0" - jsesc "^1.3.0" - lodash "^4.17.4" - source-map "^0.5.7" - trim-right "^1.0.1" - -babel-helper-builder-binary-assignment-operator-visitor@^6.24.1: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664" - integrity sha1-zORReto1b0IgvK6KAsKzRvmlZmQ= - dependencies: - babel-helper-explode-assignable-expression "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-builder-react-jsx@^6.24.1: - version "6.26.0" - resolved "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz#39ff8313b75c8b65dceff1f31d383e0ff2a408a0" - integrity sha1-Of+DE7dci2Xc7/HzHTg+D/KkCKA= - dependencies: - babel-runtime "^6.26.0" - babel-types "^6.26.0" - esutils "^2.0.2" - -babel-helper-call-delegate@^6.24.1: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d" - integrity sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340= - dependencies: - babel-helper-hoist-variables "^6.24.1" - babel-runtime "^6.22.0" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-define-map@^6.24.1: - version "6.26.0" - resolved "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f" - integrity sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8= - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-helper-explode-assignable-expression@^6.24.1: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa" - integrity sha1-8luCz33BBDPFX3BZLVdGQArCLKo= - dependencies: - babel-runtime "^6.22.0" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-function-name@^6.24.1: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9" - integrity sha1-00dbjAPtmCQqJbSDUasYOZ01gKk= - dependencies: - babel-helper-get-function-arity "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-get-function-arity@^6.24.1: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d" - integrity sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0= - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-hoist-variables@^6.24.1: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76" - integrity sha1-HssnaJydJVE+rbyZFKc/VAi+enY= - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-optimise-call-expression@^6.24.1: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257" - integrity sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc= - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-regex@^6.24.1: - version "6.26.0" - resolved "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72" - integrity sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI= - dependencies: - babel-runtime "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-helper-remap-async-to-generator@^6.24.1: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b" - integrity sha1-XsWBgnrXI/7N04HxySg5BnbkVRs= - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-replace-supers@^6.24.1: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a" - integrity sha1-v22/5Dk40XNpohPKiov3S2qQqxo= - dependencies: - babel-helper-optimise-call-expression "^6.24.1" - babel-messages "^6.23.0" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helpers@^6.24.1: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2" - integrity sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI= - dependencies: - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-jest@^24.8.0: version "24.8.0" resolved "https://registry.npmjs.org/babel-jest/-/babel-jest-24.8.0.tgz#5c15ff2b28e20b0f45df43fe6b7f2aae93dba589" @@ -1723,20 +1718,6 @@ babel-loader@8.0.6: mkdirp "^0.5.1" pify "^4.0.1" -babel-messages@^6.23.0: - version "6.23.0" - resolved "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" - integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-check-es2015-constants@^6.22.0: - version "6.22.0" - resolved "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a" - integrity sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o= - dependencies: - babel-runtime "^6.22.0" - babel-plugin-dynamic-import-node@^2.3.0: version "2.3.0" resolved "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f" @@ -1761,346 +1742,6 @@ babel-plugin-jest-hoist@^24.6.0: dependencies: "@types/babel__traverse" "^7.0.6" -babel-plugin-syntax-async-functions@^6.8.0: - version "6.13.0" - resolved "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95" - integrity sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU= - -babel-plugin-syntax-exponentiation-operator@^6.8.0: - version "6.13.0" - resolved "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de" - integrity sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4= - -babel-plugin-syntax-flow@^6.18.0: - version "6.18.0" - resolved "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d" - integrity sha1-TDqyCiryaqIM0lmVw5jE63AxDI0= - -babel-plugin-syntax-jsx@^6.3.13, babel-plugin-syntax-jsx@^6.8.0: - version "6.18.0" - resolved "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" - integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY= - -babel-plugin-syntax-trailing-function-commas@^6.22.0: - version "6.22.0" - resolved "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3" - integrity sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM= - -babel-plugin-transform-async-to-generator@^6.22.0: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761" - integrity sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E= - dependencies: - babel-helper-remap-async-to-generator "^6.24.1" - babel-plugin-syntax-async-functions "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-arrow-functions@^6.22.0: - version "6.22.0" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221" - integrity sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-block-scoped-functions@^6.22.0: - version "6.22.0" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141" - integrity sha1-u8UbSflk1wy42OC5ToICRs46YUE= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-block-scoping@^6.23.0: - version "6.26.0" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f" - integrity sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8= - dependencies: - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-plugin-transform-es2015-classes@^6.23.0: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db" - integrity sha1-WkxYpQyclGHlZLSyo7+ryXolhNs= - dependencies: - babel-helper-define-map "^6.24.1" - babel-helper-function-name "^6.24.1" - babel-helper-optimise-call-expression "^6.24.1" - babel-helper-replace-supers "^6.24.1" - babel-messages "^6.23.0" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-computed-properties@^6.22.0: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3" - integrity sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM= - dependencies: - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-destructuring@^6.23.0: - version "6.23.0" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d" - integrity sha1-mXux8auWf2gtKwh2/jWNYOdlxW0= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-duplicate-keys@^6.22.0: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e" - integrity sha1-c+s9MQypaePvnskcU3QabxV2Qj4= - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-for-of@^6.23.0: - version "6.23.0" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691" - integrity sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-function-name@^6.22.0: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b" - integrity sha1-g0yJhTvDaxrw86TF26qU/Y6sqos= - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-literals@^6.22.0: - version "6.22.0" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e" - integrity sha1-T1SgLWzWbPkVKAAZox0xklN3yi4= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.1: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154" - integrity sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ= - dependencies: - babel-plugin-transform-es2015-modules-commonjs "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1: - version "6.26.2" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3" - integrity sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q== - dependencies: - babel-plugin-transform-strict-mode "^6.24.1" - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-types "^6.26.0" - -babel-plugin-transform-es2015-modules-systemjs@^6.23.0: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23" - integrity sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM= - dependencies: - babel-helper-hoist-variables "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-modules-umd@^6.23.0: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468" - integrity sha1-rJl+YoXNGO1hdq22B9YCNErThGg= - dependencies: - babel-plugin-transform-es2015-modules-amd "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-object-super@^6.22.0: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d" - integrity sha1-JM72muIcuDp/hgPa0CH1cusnj40= - dependencies: - babel-helper-replace-supers "^6.24.1" - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-parameters@^6.23.0: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b" - integrity sha1-V6w1GrScrxSpfNE7CfZv3wpiXys= - dependencies: - babel-helper-call-delegate "^6.24.1" - babel-helper-get-function-arity "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-shorthand-properties@^6.22.0: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0" - integrity sha1-JPh11nIch2YbvZmkYi5R8U3jiqA= - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-spread@^6.22.0: - version "6.22.0" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1" - integrity sha1-1taKmfia7cRTbIGlQujdnxdG+NE= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-sticky-regex@^6.22.0: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc" - integrity sha1-AMHNsaynERLN8M9hJsLta0V8zbw= - dependencies: - babel-helper-regex "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-template-literals@^6.22.0: - version "6.22.0" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d" - integrity sha1-qEs0UPfp+PH2g51taH2oS7EjbY0= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-typeof-symbol@^6.23.0: - version "6.23.0" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372" - integrity sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-unicode-regex@^6.22.0: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9" - integrity sha1-04sS9C6nMj9yk4fxinxa4frrNek= - dependencies: - babel-helper-regex "^6.24.1" - babel-runtime "^6.22.0" - regexpu-core "^2.0.0" - -babel-plugin-transform-exponentiation-operator@^6.22.0: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e" - integrity sha1-KrDJx/MJj6SJB3cruBP+QejeOg4= - dependencies: - babel-helper-builder-binary-assignment-operator-visitor "^6.24.1" - babel-plugin-syntax-exponentiation-operator "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-flow-strip-types@^6.22.0: - version "6.22.0" - resolved "https://registry.npmjs.org/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz#84cb672935d43714fdc32bce84568d87441cf7cf" - integrity sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988= - dependencies: - babel-plugin-syntax-flow "^6.18.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-react-display-name@^6.23.0: - version "6.25.0" - resolved "https://registry.npmjs.org/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz#67e2bf1f1e9c93ab08db96792e05392bf2cc28d1" - integrity sha1-Z+K/Hx6ck6sI25Z5LgU5K/LMKNE= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-react-jsx-self@^6.22.0: - version "6.22.0" - resolved "https://registry.npmjs.org/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz#df6d80a9da2612a121e6ddd7558bcbecf06e636e" - integrity sha1-322AqdomEqEh5t3XVYvL7PBuY24= - dependencies: - babel-plugin-syntax-jsx "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-react-jsx-source@^6.22.0: - version "6.22.0" - resolved "https://registry.npmjs.org/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz#66ac12153f5cd2d17b3c19268f4bf0197f44ecd6" - integrity sha1-ZqwSFT9c0tF7PBkmj0vwGX9E7NY= - dependencies: - babel-plugin-syntax-jsx "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-react-jsx@^6.24.1: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz#840a028e7df460dfc3a2d29f0c0d91f6376e66a3" - integrity sha1-hAoCjn30YN/DotKfDA2R9jduZqM= - dependencies: - babel-helper-builder-react-jsx "^6.24.1" - babel-plugin-syntax-jsx "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-regenerator@^6.22.0: - version "6.26.0" - resolved "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f" - integrity sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8= - dependencies: - regenerator-transform "^0.10.0" - -babel-plugin-transform-strict-mode@^6.24.1: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758" - integrity sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g= - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-polyfill@^6.26.0: - version "6.26.0" - resolved "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153" - integrity sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM= - dependencies: - babel-runtime "^6.26.0" - core-js "^2.5.0" - regenerator-runtime "^0.10.5" - -babel-preset-env@^1.6.1: - version "1.7.0" - resolved "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz#dea79fa4ebeb883cd35dab07e260c1c9c04df77a" - integrity sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg== - dependencies: - babel-plugin-check-es2015-constants "^6.22.0" - babel-plugin-syntax-trailing-function-commas "^6.22.0" - babel-plugin-transform-async-to-generator "^6.22.0" - babel-plugin-transform-es2015-arrow-functions "^6.22.0" - babel-plugin-transform-es2015-block-scoped-functions "^6.22.0" - babel-plugin-transform-es2015-block-scoping "^6.23.0" - babel-plugin-transform-es2015-classes "^6.23.0" - babel-plugin-transform-es2015-computed-properties "^6.22.0" - babel-plugin-transform-es2015-destructuring "^6.23.0" - babel-plugin-transform-es2015-duplicate-keys "^6.22.0" - babel-plugin-transform-es2015-for-of "^6.23.0" - babel-plugin-transform-es2015-function-name "^6.22.0" - babel-plugin-transform-es2015-literals "^6.22.0" - babel-plugin-transform-es2015-modules-amd "^6.22.0" - babel-plugin-transform-es2015-modules-commonjs "^6.23.0" - babel-plugin-transform-es2015-modules-systemjs "^6.23.0" - babel-plugin-transform-es2015-modules-umd "^6.23.0" - babel-plugin-transform-es2015-object-super "^6.22.0" - babel-plugin-transform-es2015-parameters "^6.23.0" - babel-plugin-transform-es2015-shorthand-properties "^6.22.0" - babel-plugin-transform-es2015-spread "^6.22.0" - babel-plugin-transform-es2015-sticky-regex "^6.22.0" - babel-plugin-transform-es2015-template-literals "^6.22.0" - babel-plugin-transform-es2015-typeof-symbol "^6.23.0" - babel-plugin-transform-es2015-unicode-regex "^6.22.0" - babel-plugin-transform-exponentiation-operator "^6.22.0" - babel-plugin-transform-regenerator "^6.22.0" - browserslist "^3.2.6" - invariant "^2.2.2" - semver "^5.3.0" - -babel-preset-flow@^6.23.0: - version "6.23.0" - resolved "https://registry.npmjs.org/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz#e71218887085ae9a24b5be4169affb599816c49d" - integrity sha1-5xIYiHCFrpoktb5Baa/7WZgWxJ0= - dependencies: - babel-plugin-transform-flow-strip-types "^6.22.0" - babel-preset-jest@^24.6.0: version "24.6.0" resolved "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.6.0.tgz#66f06136eefce87797539c0d63f1769cc3915984" @@ -2109,90 +1750,6 @@ babel-preset-jest@^24.6.0: "@babel/plugin-syntax-object-rest-spread" "^7.0.0" babel-plugin-jest-hoist "^24.6.0" -babel-preset-react@^6.24.1: - version "6.24.1" - resolved "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.24.1.tgz#ba69dfaea45fc3ec639b6a4ecea6e17702c91380" - integrity sha1-umnfrqRfw+xjm2pOzqbhdwLJE4A= - dependencies: - babel-plugin-syntax-jsx "^6.3.13" - babel-plugin-transform-react-display-name "^6.23.0" - babel-plugin-transform-react-jsx "^6.24.1" - babel-plugin-transform-react-jsx-self "^6.22.0" - babel-plugin-transform-react-jsx-source "^6.22.0" - babel-preset-flow "^6.23.0" - -babel-register@^6.26.0: - version "6.26.0" - resolved "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071" - integrity sha1-btAhFz4vy0htestFxgCahW9kcHE= - dependencies: - babel-core "^6.26.0" - babel-runtime "^6.26.0" - core-js "^2.5.0" - home-or-tmp "^2.0.0" - lodash "^4.17.4" - mkdirp "^0.5.1" - source-map-support "^0.4.15" - -babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0: - version "6.26.0" - resolved "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" - integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= - dependencies: - core-js "^2.4.0" - regenerator-runtime "^0.11.0" - -babel-standalone@^6.26.0: - version "6.26.0" - resolved "https://registry.npmjs.org/babel-standalone/-/babel-standalone-6.26.0.tgz#15fb3d35f2c456695815ebf1ed96fe7f015b6886" - integrity sha1-Ffs9NfLEVmlYFevx7Zb+fwFbaIY= - -babel-template@^6.24.1, babel-template@^6.26.0: - version "6.26.0" - resolved "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02" - integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI= - dependencies: - babel-runtime "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - lodash "^4.17.4" - -babel-traverse@^6.24.1, babel-traverse@^6.26.0: - version "6.26.0" - resolved "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee" - integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4= - dependencies: - babel-code-frame "^6.26.0" - babel-messages "^6.23.0" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - debug "^2.6.8" - globals "^9.18.0" - invariant "^2.2.2" - lodash "^4.17.4" - -babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0: - version "6.26.0" - resolved "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" - integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc= - dependencies: - babel-runtime "^6.26.0" - esutils "^2.0.2" - lodash "^4.17.4" - to-fast-properties "^1.0.3" - -babylon@7.0.0-beta.19: - version "7.0.0-beta.19" - resolved "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.19.tgz#e928c7e807e970e0536b078ab3e0c48f9e052503" - integrity sha512-Vg0C9s/REX6/WIXN37UKpv5ZhRi6A4pjHlpkE34+8/a6c2W1Q692n3hmc+SZG5lKRnaExLUbxtJ1SVT+KaCQ/A== - -babylon@^6.18.0: - version "6.18.0" - resolved "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" - integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ== - balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" @@ -2216,11 +1773,6 @@ base@^0.11.1: mixin-deep "^1.2.0" pascalcase "^0.1.1" -bash-color@0.0.4: - version "0.0.4" - resolved "https://registry.npmjs.org/bash-color/-/bash-color-0.0.4.tgz#e9be8ce33540cada4881768c59bd63865736e913" - integrity sha1-6b6M4zVAytpIgXaMWb1jhlc26RM= - batch@0.6.1: version "0.6.1" resolved "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" @@ -2248,7 +1800,7 @@ binary-extensions@^1.0.0: resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65" integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw== -bluebird@^3.5.5, bluebird@~3.5.0: +bluebird@^3.5.5: version "3.5.5" resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f" integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w== @@ -2407,14 +1959,6 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserslist@^3.2.6: - version "3.2.8" - resolved "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz#b0005361d6471f0f5952797a76fc985f1f978fc6" - integrity sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ== - dependencies: - caniuse-lite "^1.0.30000844" - electron-to-chromium "^1.3.47" - browserslist@^4.0.0: version "4.7.0" resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.7.0.tgz#9ee89225ffc07db03409f2fee524dc8227458a17" @@ -2522,23 +2066,6 @@ cache-base@^1.0.1: union-value "^1.0.0" unset-value "^1.0.0" -cache-content-type@^1.0.0: - version "1.0.1" - resolved "https://registry.npmjs.org/cache-content-type/-/cache-content-type-1.0.1.tgz#035cde2b08ee2129f4a8315ea8f00a00dba1453c" - integrity sha512-IKufZ1o4Ut42YUrZSo8+qnMTrFuKkvyoLXUywKz9GJ5BrhOFGhLdkx9sG4KAnVvbY6kEcSFjLQul+DVmBm2bgA== - dependencies: - mime-types "^2.1.18" - ylru "^1.2.0" - -cache-point@^0.4.1: - version "0.4.1" - resolved "https://registry.npmjs.org/cache-point/-/cache-point-0.4.1.tgz#cc8c9cbd99d90d7b0c66910cd33d77a1aab8840e" - integrity sha512-4TgWfe9SF+bUy5cCql8gWHqKNrviufNwSYxLjf2utB0pY4+bdcuFwMmY1hDB+67Gz/L1vmhFNhePAjJTFBtV+Q== - dependencies: - array-back "^2.0.0" - fs-then-native "^2.0.0" - mkdirp2 "^1.0.3" - caller-callsite@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134" @@ -2591,7 +2118,7 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30000984, caniuse-lite@^1.0.30000989: +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30000984, caniuse-lite@^1.0.30000989: version "1.0.30000989" resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz#b9193e293ccf7e4426c5245134b8f2a56c0ac4b9" integrity sha512-vrMcvSuMz16YY6GSVZ0dWDTJP8jqk3iFQ/Aq5iqblPwxSVVZI+zxDyTX0VPqtQsDnfdrBDcsmhgTEOh5R8Lbpw== @@ -2608,13 +2135,6 @@ caseless@~0.12.0: resolved "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= -catharsis@~0.8.9: - version "0.8.11" - resolved "https://registry.npmjs.org/catharsis/-/catharsis-0.8.11.tgz#d0eb3d2b82b7da7a3ce2efb1a7b00becc6643468" - integrity sha512-a+xUyMV7hD1BrDQA/3iPV7oc+6W26BgVJO05PGEoatMyIuPScQKsde6i3YorWX1qs+AZjnJ18NqdKoCtKiNh1g== - dependencies: - lodash "^4.17.14" - chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" @@ -2626,7 +2146,7 @@ chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4. chalk@^1.1.3: version "1.1.3" - resolved "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= dependencies: ansi-styles "^2.2.1" @@ -2640,19 +2160,6 @@ chardet@^0.7.0: resolved "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== -cheerio@^0.20.0: - version "0.20.0" - resolved "https://registry.npmjs.org/cheerio/-/cheerio-0.20.0.tgz#5c710f2bab95653272842ba01c6ea61b3545ec35" - integrity sha1-XHEPK6uVZTJyhCugHG6mGzVF7DU= - dependencies: - css-select "~1.2.0" - dom-serializer "~0.1.0" - entities "~1.1.1" - htmlparser2 "~3.8.1" - lodash "^4.1.0" - optionalDependencies: - jsdom "^7.0.2" - chokidar@2.1.5: version "2.1.5" resolved "https://registry.npmjs.org/chokidar/-/chokidar-2.1.5.tgz#0ae8434d962281a5f56c72869e79cb6d9d86ad4d" @@ -2672,7 +2179,7 @@ chokidar@2.1.5: optionalDependencies: fsevents "^1.2.7" -chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.1.6: +chokidar@^2.0.2, chokidar@^2.1.6: version "2.1.6" resolved "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz#b6cad653a929e244ce8a834244164d241fa954c5" integrity sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g== @@ -2691,6 +2198,25 @@ chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.1.6: optionalDependencies: fsevents "^1.2.7" +chokidar@^2.0.4: + version "2.1.8" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917" + integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg== + dependencies: + anymatch "^2.0.0" + async-each "^1.0.1" + braces "^2.3.2" + glob-parent "^3.1.0" + inherits "^2.0.3" + is-binary-path "^1.0.0" + is-glob "^4.0.0" + normalize-path "^3.0.0" + path-is-absolute "^1.0.0" + readdirp "^2.2.1" + upath "^1.1.1" + optionalDependencies: + fsevents "^1.2.7" + chownr@^1.1.1: version "1.1.2" resolved "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz#a18f1e0b269c8a6a5d3c86eb298beb14c3dd7bf6" @@ -2740,25 +2266,11 @@ cli-cursor@^2.1.0: dependencies: restore-cursor "^2.0.0" -cli-spinners@^1.0.1: - version "1.3.1" - resolved "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.1.tgz#002c1990912d0d59580c93bd36c056de99e4259a" - integrity sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg== - cli-width@^2.0.0: version "2.2.0" resolved "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk= -clipboard@^2.0.0: - version "2.0.4" - resolved "https://registry.npmjs.org/clipboard/-/clipboard-2.0.4.tgz#836dafd66cf0fea5d71ce5d5b0bf6e958009112d" - integrity sha512-Vw26VSLRpJfBofiVaFb/I8PVfdI1OxKcYShe6fm0sP/DtmiWQNCjhM/okTvdCo0G+lMMm1rMYbk4IK4x1X+kgQ== - dependencies: - good-listener "^1.2.2" - select "^1.1.2" - tiny-emitter "^2.0.0" - cliui@^4.0.0: version "4.1.0" resolved "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49" @@ -2801,13 +2313,10 @@ code-point-at@^1.0.0: resolved "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= -collect-all@^1.0.3: - version "1.0.3" - resolved "https://registry.npmjs.org/collect-all/-/collect-all-1.0.3.tgz#1abcc20448b58a1447487fcf34130e9512b0acf8" - integrity sha512-0y0rBgoX8IzIjBAUnO73SEtSb4Mhk3IoceWJq5zZSxb9mWORhWH8xLYo4EDSOE1jRBk1LhmfjqWFFt10h/+MEA== - dependencies: - stream-connect "^1.0.2" - stream-via "^1.0.4" +codemirror@5.42.2: + version "5.42.2" + resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.42.2.tgz#801ab715a7a7e1c7ed4162b78e9d8138b98de8f0" + integrity sha512-Tkv6im39VuhduFMsDA3MlXcC/kKas3Z0PI1/8N88QvFQbtOeiiwnfFJE4juGyC8/a4sb1BSxQlzsil8XLQdxRw== collection-visit@^1.0.0: version "1.0.0" @@ -2857,37 +2366,6 @@ combined-stream@^1.0.6, combined-stream@~1.0.6: dependencies: delayed-stream "~1.0.0" -command-line-args@^5.0.0: - version "5.1.1" - resolved "https://registry.npmjs.org/command-line-args/-/command-line-args-5.1.1.tgz#88e793e5bb3ceb30754a86863f0401ac92fd369a" - integrity sha512-hL/eG8lrll1Qy1ezvkant+trihbGnaKaeEjj6Scyr3DN+RC7iQ5Rz84IeLERfAWDGo0HBSNAakczwgCilDXnWg== - dependencies: - array-back "^3.0.1" - find-replace "^3.0.0" - lodash.camelcase "^4.3.0" - typical "^4.0.0" - -command-line-tool@^0.8.0: - version "0.8.0" - resolved "https://registry.npmjs.org/command-line-tool/-/command-line-tool-0.8.0.tgz#b00290ef1dfc11cc731dd1f43a92cfa5f21e715b" - integrity sha512-Xw18HVx/QzQV3Sc5k1vy3kgtOeGmsKIqwtFFoyjI4bbcpSgnw2CWVULvtakyw4s6fhyAdI6soQQhXc2OzJy62g== - dependencies: - ansi-escape-sequences "^4.0.0" - array-back "^2.0.0" - command-line-args "^5.0.0" - command-line-usage "^4.1.0" - typical "^2.6.1" - -command-line-usage@^4.1.0: - version "4.1.0" - resolved "https://registry.npmjs.org/command-line-usage/-/command-line-usage-4.1.0.tgz#a6b3b2e2703b4dcf8bd46ae19e118a9a52972882" - integrity sha512-MxS8Ad995KpdAC0Jopo/ovGIroV/m0KHwzKfXxKag6FHOkGsH8/lv5yjgablcRxCJJC0oJeUMuO/gmaq+Wq46g== - dependencies: - ansi-escape-sequences "^4.0.0" - array-back "^2.0.0" - table-layout "^0.4.2" - typical "^2.6.1" - commander@2.17.x: version "2.17.1" resolved "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" @@ -2903,11 +2381,6 @@ commander@~2.19.0: resolved "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg== -common-sequence@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/common-sequence/-/common-sequence-1.0.2.tgz#30e07f3f8f6f7f9b3dee854f20b2d39eee086de8" - integrity sha1-MOB/P49vf5s97oVPILLTnu4Ibeg= - commondir@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" @@ -2953,13 +2426,6 @@ concat-stream@^1.5.0: readable-stream "^2.2.2" typedarray "^0.0.6" -config-master@^3.1.0: - version "3.1.0" - resolved "https://registry.npmjs.org/config-master/-/config-master-3.1.0.tgz#667663590505a283bf26a484d68489d74c5485da" - integrity sha1-ZnZjWQUFooO/JqSE1oSJ10xUhdo= - dependencies: - walk-back "^2.0.1" - connect-history-api-fallback@^1.6.0: version "1.6.0" resolved "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" @@ -2987,19 +2453,19 @@ content-disposition@0.5.2: resolved "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4" integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ= -content-disposition@0.5.3, content-disposition@~0.5.2: +content-disposition@0.5.3: version "0.5.3" resolved "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== dependencies: safe-buffer "5.1.2" -content-type@^1.0.4, content-type@~1.0.4: +content-type@~1.0.4: version "1.0.4" resolved "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== -convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.1: +convert-source-map@^1.1.0, convert-source-map@^1.4.0: version "1.6.0" resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20" integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A== @@ -3021,14 +2487,6 @@ cookie@0.4.0: resolved "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== -cookies@~0.7.1: - version "0.7.3" - resolved "https://registry.npmjs.org/cookies/-/cookies-0.7.3.tgz#7912ce21fbf2e8c2da70cf1c3f351aecf59dadfa" - integrity sha512-+gixgxYSgQLTaTIilDHAdlNPZDENDQernEMiIcZpYYP14zgHsCt4Ce1FEjFtcp6GefhozebB6orvhAAWx/IS0A== - dependencies: - depd "~1.1.2" - keygrip "~1.0.3" - copy-concurrently@^1.0.0: version "1.0.5" resolved "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0" @@ -3054,16 +2512,6 @@ core-js-compat@^3.1.1: browserslist "^4.6.6" semver "^6.3.0" -core-js@^2.4.0, core-js@^2.5.0: - version "2.6.9" - resolved "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2" - integrity sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A== - -core-js@^2.6.5: - version "2.6.11" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c" - integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg== - core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" @@ -3129,15 +2577,6 @@ cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^5.0.1: - version "5.1.0" - resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" - integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk= - dependencies: - lru-cache "^4.0.1" - shebang-command "^1.2.0" - which "^1.2.9" - crypto-browserify@^3.11.0: version "3.12.0" resolved "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" @@ -3191,7 +2630,7 @@ css-select-base-adapter@^0.1.1: resolved "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7" integrity sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w== -css-select@^1.1.0, css-select@~1.2.0: +css-select@^1.1.0: version "1.2.0" resolved "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858" integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg= @@ -3322,18 +2761,11 @@ csso@^3.5.1: dependencies: css-tree "1.0.0-alpha.29" -cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0", "cssom@>= 0.3.2 < 0.4.0", cssom@^0.3.4: +cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0", cssom@^0.3.4: version "0.3.8" resolved "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== -"cssstyle@>= 0.2.29 < 0.3.0": - version "0.2.37" - resolved "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54" - integrity sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ= - dependencies: - cssom "0.3.x" - cssstyle@^1.0.0, cssstyle@^1.1.1: version "1.4.0" resolved "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz#9d31328229d3c565c61e586b02041a28fccdccf1" @@ -3372,40 +2804,28 @@ date-now@^0.1.4: resolved "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs= -debug@*, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: - version "4.1.1" - resolved "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" - integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== - dependencies: - ms "^2.1.1" - -debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.3, debug@^2.6.8, debug@^2.6.9: +debug@2.6.9, debug@^2.2.0, debug@^2.3.3: version "2.6.9" resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== dependencies: ms "2.0.0" -debug@^3.1.0, debug@^3.2.5, debug@^3.2.6: +debug@^3.2.5, debug@^3.2.6: version "3.2.6" resolved "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== dependencies: ms "^2.1.1" -debug@~0.7.0: - version "0.7.4" - resolved "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39" - integrity sha1-BuHqgILCyxTjmAbiLi9vdX+Srzk= - -debug@~3.1.0: - version "3.1.0" - resolved "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" - integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== +debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: + version "4.1.1" + resolved "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" + integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== dependencies: - ms "2.0.0" + ms "^2.1.1" -decamelize@^1.1.1, decamelize@^1.2.0: +decamelize@^1.2.0: version "1.2.0" resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= @@ -3415,12 +2835,12 @@ decode-uri-component@^0.2.0: resolved "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= -deep-equal@^1.0.1, deep-equal@~1.0.1: +deep-equal@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5" integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU= -deep-extend@^0.6.0, deep-extend@~0.6.0: +deep-extend@^0.6.0: version "0.6.0" resolved "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== @@ -3485,17 +2905,12 @@ delayed-stream@~1.0.0: resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= -delegate@^3.1.2: - version "3.2.0" - resolved "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166" - integrity sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw== - delegates@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= -depd@^1.1.2, depd@~1.1.2: +depd@~1.1.2: version "1.1.2" resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= @@ -3508,7 +2923,7 @@ des.js@^1.0.0: inherits "^2.0.1" minimalistic-assert "^1.0.0" -destroy@^1.0.4, destroy@~1.0.4: +destroy@~1.0.4: version "1.0.4" resolved "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= @@ -3518,13 +2933,6 @@ detect-file@^1.0.0: resolved "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= -detect-indent@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208" - integrity sha1-920GQ1LN9Docts5hnE7jqUdd4gg= - dependencies: - repeating "^2.0.0" - detect-libc@^1.0.2: version "1.0.3" resolved "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" @@ -3554,24 +2962,6 @@ diffie-hellman@^5.0.0: miller-rabin "^4.0.0" randombytes "^2.0.0" -dmd@^3.0.10: - version "3.0.13" - resolved "https://registry.npmjs.org/dmd/-/dmd-3.0.13.tgz#73294e8fae1a7a1a1c849d86b027adf04fbd5662" - integrity sha512-FV/417bH2c/CYpe8BjFEAHoaHaItcJnPlKELi/qyPZdmUom8joyuC78OhhfPUdyKD/WcouTQ2LxQT4M/RoiJ3w== - dependencies: - array-back "^2.0.0" - cache-point "^0.4.1" - common-sequence "^1.0.2" - file-set "^2.0.0" - handlebars "^4.0.11" - marked "^0.3.16" - object-get "^2.1.0" - reduce-flatten "^1.0.1" - reduce-unique "^1.0.0" - reduce-without "^1.0.1" - test-value "^3.0.0" - walk-back "^3.0.0" - dns-equal@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" @@ -3614,20 +3004,12 @@ dom-serializer@0: domelementtype "^2.0.1" entities "^2.0.0" -dom-serializer@~0.1.0: - version "0.1.1" - resolved "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0" - integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA== - dependencies: - domelementtype "^1.3.0" - entities "^1.1.1" - domain-browser@^1.1.1: version "1.2.0" resolved "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA== -domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1: +domelementtype@1, domelementtype@^1.3.1: version "1.3.1" resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== @@ -3644,13 +3026,6 @@ domexception@^1.0.1: dependencies: webidl-conversions "^4.0.2" -domhandler@2.3: - version "2.3.0" - resolved "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz#2de59a0822d5027fabff6f032c2b25a2a8abe738" - integrity sha1-LeWaCCLVAn+r/28DLCsloqir5zg= - dependencies: - domelementtype "1" - domhandler@^2.3.0: version "2.4.2" resolved "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803" @@ -3658,7 +3033,7 @@ domhandler@^2.3.0: dependencies: domelementtype "1" -domutils@1.5, domutils@1.5.1: +domutils@1.5.1: version "1.5.1" resolved "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf" integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8= @@ -3704,7 +3079,7 @@ ee-first@1.1.1: resolved "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -electron-to-chromium@^1.3.191, electron-to-chromium@^1.3.47: +electron-to-chromium@^1.3.191: version "1.3.221" resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.221.tgz#421a58ac8d1931c8df400d55c7f6fd621710da10" integrity sha512-YbNA7KgCvLq9ZaEa7wpYP7IP4LrJ4+b36oeF1lYBSJ0zVGVN7uo3Ct9qDUm/M3VDOWj03RVgsMFF8PdL8UjhzA== @@ -3758,12 +3133,7 @@ enhanced-resolve@4.1.0, enhanced-resolve@^4.1.0: memory-fs "^0.4.0" tapable "^1.0.0" -entities@1.0: - version "1.0.0" - resolved "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz#b2987aa3821347fcde642b24fdfc9e4fb712bf26" - integrity sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY= - -entities@^1.1.1, entities@~1.1.1: +entities@^1.1.1: version "1.1.2" resolved "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w== @@ -3787,11 +3157,6 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -error-inject@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/error-inject/-/error-inject-1.0.0.tgz#e2b3d91b54aed672f309d950d154850fa11d4f37" - integrity sha1-4rPZG1Su1nLzCdlQ0VSFD6EdTzc= - es-abstract@^1.12.0: version "1.14.2" resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.14.2.tgz#7ce108fad83068c8783c3cdf62e504e084d8c497" @@ -3834,17 +3199,17 @@ es6-promise@4.2.6: resolved "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.6.tgz#b685edd8258886365ea62b57d30de28fadcd974f" integrity sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q== -escape-html@^1.0.3, escape-html@~1.0.3: +escape-html@~1.0.3: version "1.0.3" resolved "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= -escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5, escape-string-regexp@~1.0.5: +escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -escodegen@^1.11.0, escodegen@^1.6.1, escodegen@^1.9.1: +escodegen@^1.11.0, escodegen@^1.9.1: version "1.11.1" resolved "https://registry.npmjs.org/escodegen/-/escodegen-1.11.1.tgz#c485ff8d6b4cdb89e27f4a856e91f118401ca510" integrity sha512-JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw== @@ -4001,19 +3366,6 @@ exec-sh@^0.3.2: resolved "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.2.tgz#6738de2eb7c8e671d0366aea0b0db8c6f7d7391b" integrity sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg== -execa@^0.7.0: - version "0.7.0" - resolved "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" - integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c= - dependencies: - cross-spawn "^5.0.1" - get-stream "^3.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - execa@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" @@ -4223,11 +3575,6 @@ faye-websocket@~0.11.1: dependencies: websocket-driver ">=0.5.1" -faye-websocket@~0.4.3: - version "0.4.4" - resolved "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz#c14c5b3bf14d7417ffbfd990c0a7495cd9f337bc" - integrity sha1-wUxbO/FNdBf/v9mQwKdJXNnzN7w= - fb-watchman@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58" @@ -4254,14 +3601,6 @@ file-entry-cache@^5.0.1: dependencies: flat-cache "^2.0.1" -file-set@^2.0.0: - version "2.0.1" - resolved "https://registry.npmjs.org/file-set/-/file-set-2.0.1.tgz#db9bc4b70a7e5ba81c9d279c20a37f13369c7850" - integrity sha512-XgOUUpgR6FbbfYcniLw0qm1Am7PnNYIAkd+eXxRt42LiYhjaso0WiuQ+VmrNdtwotyM+cLCfZ56AZrySP3QnKA== - dependencies: - array-back "^2.0.0" - glob "^7.1.3" - fill-range@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" @@ -4307,20 +3646,6 @@ find-cache-dir@^2.0.0, find-cache-dir@^2.1.0: make-dir "^2.0.0" pkg-dir "^3.0.0" -find-replace@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz#3e7e23d3b05167a76f770c9fbd5258b0def68c38" - integrity sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ== - dependencies: - array-back "^3.0.1" - -find-up@^2.1.0: - version "2.1.0" - resolved "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" - integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c= - dependencies: - locate-path "^2.0.0" - find-up@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" @@ -4338,14 +3663,6 @@ findup-sync@3.0.0: micromatch "^3.0.4" resolve-dir "^1.0.1" -"fineui-materials@git+ssh://git@cloud.finedevelop.com:7999/fui/fineui-materials.git#release/10.0": - version "1.0.0" - resolved "git+ssh://git@cloud.finedevelop.com:7999/fui/fineui-materials.git#8b2ece8209e84a9ed848fa8658e1b3b8dc05d867" - -"fineui@git+ssh://git@cloud.finedevelop.com:7999/visual/fineui.git": - version "1.1.2" - resolved "git+ssh://git@cloud.finedevelop.com:7999/visual/fineui.git#3e28b67ed0fb06e5754c3cba46b1c14d55df6436" - flat-cache@^2.0.1: version "2.0.1" resolved "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0" @@ -4385,6 +3702,20 @@ forever-agent@~0.6.1: resolved "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= +fork-ts-checker-webpack-plugin@1.4.3: + version "1.4.3" + resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-1.4.3.tgz#2252c1f8ad1b25313e056835d939b423ea240cd6" + integrity sha512-srf43Z3B1hCJNrwCG78DbHmWgKQUqHKsvFbLP182gank28j9s05KJbSZaMKBA0b6Pqi0LBLpAFWeB0JPbc1iLQ== + dependencies: + babel-code-frame "^6.22.0" + chalk "^2.4.1" + chokidar "^2.0.4" + micromatch "^3.1.10" + minimatch "^3.0.4" + semver "^5.6.0" + tapable "^1.0.0" + worker-rpc "^0.1.0" + form-data@~2.3.2: version "2.3.3" resolved "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" @@ -4406,7 +3737,7 @@ fragment-cache@^0.2.1: dependencies: map-cache "^0.2.2" -fresh@0.5.2, fresh@~0.5.2: +fresh@0.5.2: version "0.5.2" resolved "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= @@ -4419,15 +3750,6 @@ from2@^2.1.0: inherits "^2.0.1" readable-stream "^2.0.0" -fs-extra@^5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz#414d0110cdd06705734d055652c5411260c31abd" - integrity sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ== - dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" - fs-minipass@^1.2.5: version "1.2.6" resolved "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz#2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07" @@ -4435,11 +3757,6 @@ fs-minipass@^1.2.5: dependencies: minipass "^2.2.1" -fs-then-native@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/fs-then-native/-/fs-then-native-2.0.0.tgz#19a124d94d90c22c8e045f2e8dd6ebea36d48c67" - integrity sha1-GaEk2U2QwiyOBF8ujdbr6jbUjGc= - fs-write-stream-atomic@^1.0.8: version "1.0.10" resolved "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9" @@ -4502,11 +3819,6 @@ get-stdin@^6.0.0: resolved "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b" integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g== -get-stream@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" - integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ= - get-stream@^4.0.0: version "4.1.0" resolved "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" @@ -4587,11 +3899,6 @@ globals@^11.1.0, globals@^11.7.0: resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== -globals@^9.18.0: - version "9.18.0" - resolved "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" - integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ== - globby@^6.1.0: version "6.1.0" resolved "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c" @@ -4603,33 +3910,11 @@ globby@^6.1.0: pify "^2.0.0" pinkie-promise "^2.0.0" -good-listener@^1.2.2: - version "1.2.2" - resolved "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50" - integrity sha1-1TswzfkxPf+33JoNR3CWqm0UXFA= - dependencies: - delegate "^3.1.2" - -graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9: +graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2: version "4.2.1" resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz#1c1f0c364882c868f5bff6512146328336a11b1d" integrity sha512-b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw== -gray-matter@^3.1.1: - version "3.1.1" - resolved "https://registry.npmjs.org/gray-matter/-/gray-matter-3.1.1.tgz#101f80d9e69eeca6765cdce437705b18f40876ac" - integrity sha512-nZ1qjLmayEv0/wt3sHig7I0s3/sJO0dkAaKYQ5YAOApUtYEOonXSFdWvL1khvnZMTvov4UufkqlFsilPnejEXA== - dependencies: - extend-shallow "^2.0.1" - js-yaml "^3.10.0" - kind-of "^5.0.2" - strip-bom-string "^1.0.0" - -growl@~1.7.0: - version "1.7.0" - resolved "https://registry.npmjs.org/growl/-/growl-1.7.0.tgz#de2d66136d002e112ba70f3f10c31cf7c350b2da" - integrity sha1-3i1mE20ALhErpw8/EMMc98NQsto= - growly@^1.3.0: version "1.3.0" resolved "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" @@ -4640,7 +3925,7 @@ handle-thing@^2.0.0: resolved "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754" integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ== -handlebars@^4.0.11, handlebars@^4.1.2: +handlebars@^4.1.2: version "4.1.2" resolved "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67" integrity sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw== @@ -4666,7 +3951,7 @@ har-validator@~5.1.0: has-ansi@^2.0.0: version "2.0.0" - resolved "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" + resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= dependencies: ansi-regex "^2.0.0" @@ -4740,7 +4025,7 @@ hash.js@^1.0.0, hash.js@^1.0.3: inherits "^2.0.3" minimalistic-assert "^1.0.1" -he@1.2.x, he@^1.1.1: +he@1.2.x: version "1.2.0" resolved "https://registry.npmjs.org/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== @@ -4759,14 +4044,6 @@ hmac-drbg@^1.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.1" -home-or-tmp@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8" - integrity sha1-42w/LSyufXRqhX440Y1fMqeILbg= - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.1" - homedir-polyfill@^1.0.1: version "1.0.3" resolved "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8" @@ -4856,25 +4133,6 @@ htmlparser2@^3.3.0: inherits "^2.0.1" readable-stream "^3.1.1" -htmlparser2@~3.8.1: - version "3.8.3" - resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz#996c28b191516a8be86501a7d79757e5c70c1068" - integrity sha1-mWwosZFRaovoZQGn15dX5ccMEGg= - dependencies: - domelementtype "1" - domhandler "2.3" - domutils "1.5" - entities "1.0" - readable-stream "1.1" - -http-assert@^1.3.0: - version "1.4.1" - resolved "https://registry.npmjs.org/http-assert/-/http-assert-1.4.1.tgz#c5f725d677aa7e873ef736199b89686cceb37878" - integrity sha512-rdw7q6GTlibqVVbXr0CKelfV5iY8G2HqEUkhSk297BMbSpSL8crXC+9rjKoMcZZEsksX30le6f/4ul4E28gegw== - dependencies: - deep-equal "~1.0.1" - http-errors "~1.7.2" - http-deceiver@^1.2.7: version "1.2.7" resolved "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" @@ -4901,7 +4159,7 @@ http-errors@1.7.2: statuses ">= 1.5.0 < 2" toidentifier "1.0.0" -http-errors@^1.6.1, http-errors@^1.6.3, http-errors@~1.7.2: +http-errors@~1.7.2: version "1.7.3" resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== @@ -5141,11 +4399,6 @@ invariant@^2.2.2, invariant@^2.2.4: dependencies: loose-envify "^1.0.0" -invert-kv@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" - integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY= - invert-kv@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02" @@ -5295,13 +4548,6 @@ is-extglob@^2.1.0, is-extglob@^2.1.1: resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= -is-finite@^1.0.0: - version "1.0.2" - resolved "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa" - integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko= - dependencies: - number-is-nan "^1.0.0" - is-fullwidth-code-point@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" @@ -5319,11 +4565,6 @@ is-generator-fn@^2.0.0: resolved "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118" integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ== -is-generator-function@^1.0.7: - version "1.0.7" - resolved "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.7.tgz#d2132e529bb0000a7f80794d4bdf5cd5e5813522" - integrity sha512-YZc5EwyO4f2kWCax7oegfuSr9mFz1ZvieNYBEjmukLxgXfBUbxAWGVF7GZf0zidYtoBl3WvC07YK0wT76a+Rtw== - is-glob@^3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" @@ -5437,11 +4678,6 @@ is-wsl@^1.1.0: resolved "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0= -isarray@0.0.1: - version "0.0.1" - resolved "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" - integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= - isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" @@ -5890,10 +5126,10 @@ js-levenshtein@^1.1.3: js-tokens@^3.0.2: version "3.0.2" - resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= -js-yaml@^3.10.0, js-yaml@^3.13.0, js-yaml@^3.13.1: +js-yaml@^3.13.0, js-yaml@^3.13.1: version "3.13.1" resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw== @@ -5901,76 +5137,11 @@ js-yaml@^3.10.0, js-yaml@^3.13.0, js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" -js2xmlparser@~3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-3.0.0.tgz#3fb60eaa089c5440f9319f51760ccd07e2499733" - integrity sha1-P7YOqgicVED5MZ9RdgzNB+JJlzM= - dependencies: - xmlcreate "^1.0.1" - jsbn@~0.1.0: version "0.1.1" resolved "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= -jsdoc-api@^4.0.1: - version "4.0.3" - resolved "https://registry.npmjs.org/jsdoc-api/-/jsdoc-api-4.0.3.tgz#f87357856349a0be40a03e64711c34c74754ba20" - integrity sha512-dfYq9JgB+XahY0XfSEw93PmXmocjwYcvJ5aMuQUJ/OdDRGWamf2SSOk3W06Bsj8qdjp/UdefzqpP/mpwsvHuvA== - dependencies: - array-back "^2.0.0" - cache-point "^0.4.1" - collect-all "^1.0.3" - file-set "^2.0.0" - fs-then-native "^2.0.0" - jsdoc "~3.5.5" - object-to-spawn-args "^1.1.1" - temp-path "^1.0.0" - walk-back "^3.0.0" - -jsdoc-parse@^3.0.1: - version "3.0.1" - resolved "https://registry.npmjs.org/jsdoc-parse/-/jsdoc-parse-3.0.1.tgz#1194d6a16a2dfbe5fb8cccfeb5058ea808759893" - integrity sha512-btZLp4wYl90vcAfgk4hoGQbO17iBVrhh3LJRMKZNtZgniO3F8H2CjxXld0owBIB1XxN+j3bAcWZnZKMnSj3iMA== - dependencies: - array-back "^2.0.0" - lodash.omit "^4.5.0" - lodash.pick "^4.4.0" - reduce-extract "^1.0.0" - sort-array "^2.0.0" - test-value "^3.0.0" - -jsdoc-to-markdown@^4.0.1: - version "4.0.1" - resolved "https://registry.npmjs.org/jsdoc-to-markdown/-/jsdoc-to-markdown-4.0.1.tgz#247f7d977ecc209428972ec92ca14bd4e610355d" - integrity sha512-LHJRoLoLyDdxNcColgkLoB/rFG5iRP+PNJjMILI0x+95IdEAtyjSt0wJ6ZlKxRpkhBYtQXTQQ119hMqPIUZzTQ== - dependencies: - array-back "^2.0.0" - command-line-tool "^0.8.0" - config-master "^3.1.0" - dmd "^3.0.10" - jsdoc-api "^4.0.1" - jsdoc-parse "^3.0.1" - walk-back "^3.0.0" - -jsdoc@~3.5.5: - version "3.5.5" - resolved "https://registry.npmjs.org/jsdoc/-/jsdoc-3.5.5.tgz#484521b126e81904d632ff83ec9aaa096708fa4d" - integrity sha512-6PxB65TAU4WO0Wzyr/4/YhlGovXl0EVYfpKbpSroSj0qBxT4/xod/l40Opkm38dRHRdQgdeY836M0uVnJQG7kg== - dependencies: - babylon "7.0.0-beta.19" - bluebird "~3.5.0" - catharsis "~0.8.9" - escape-string-regexp "~1.0.5" - js2xmlparser "~3.0.0" - klaw "~2.0.0" - marked "~0.3.6" - mkdirp "~0.5.1" - requizzle "~0.2.1" - strip-json-comments "~2.0.1" - taffydb "2.6.2" - underscore "~1.8.3" - jsdom@15.0.0: version "15.0.0" resolved "https://registry.npmjs.org/jsdom/-/jsdom-15.0.0.tgz#60cf177d79c7fa1a498453c9e2534f57e65d151f" @@ -6035,32 +5206,6 @@ jsdom@^11.5.1: ws "^5.2.0" xml-name-validator "^3.0.0" -jsdom@^7.0.2: - version "7.2.2" - resolved "https://registry.npmjs.org/jsdom/-/jsdom-7.2.2.tgz#40b402770c2bda23469096bee91ab675e3b1fc6e" - integrity sha1-QLQCdwwr2iNGkJa+6Rq2deOx/G4= - dependencies: - abab "^1.0.0" - acorn "^2.4.0" - acorn-globals "^1.0.4" - cssom ">= 0.3.0 < 0.4.0" - cssstyle ">= 0.2.29 < 0.3.0" - escodegen "^1.6.1" - nwmatcher ">= 1.3.7 < 2.0.0" - parse5 "^1.5.1" - request "^2.55.0" - sax "^1.1.4" - symbol-tree ">= 3.1.0 < 4.0.0" - tough-cookie "^2.2.0" - webidl-conversions "^2.0.0" - whatwg-url-compat "~0.6.5" - xml-name-validator ">= 2.0.1 < 3.0.0" - -jsesc@^1.3.0: - version "1.3.0" - resolved "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" - integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s= - jsesc@^2.5.1: version "2.5.2" resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" @@ -6108,7 +5253,7 @@ json5@2.x, json5@^2.1.0: dependencies: minimist "^1.2.0" -json5@^0.5.0, json5@^0.5.1: +json5@^0.5.0: version "0.5.1" resolved "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE= @@ -6132,13 +5277,6 @@ jsonc@1.1.0: strip-bom "^3.0.0" strip-json-comments "^2.0.1" -jsonfile@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" - integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= - optionalDependencies: - graceful-fs "^4.1.6" - jsonify@~0.0.0: version "0.0.0" resolved "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" @@ -6178,11 +5316,6 @@ jss@9.8.7: symbol-observable "^1.1.0" warning "^3.0.0" -keygrip@~1.0.3: - version "1.0.3" - resolved "https://registry.npmjs.org/keygrip/-/keygrip-1.0.3.tgz#399d709f0aed2bab0a059e0cdd3a5023a053e1dc" - integrity sha512-/PpesirAIfaklxUzp4Yb7xBper9MwP6hNRA6BGGUFCgbJ+BM5CKBtsoxinNXkLHAr+GXS1/lSlF2rP7cv5Fl+g== - killable@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892" @@ -6202,7 +5335,7 @@ kind-of@^4.0.0: dependencies: is-buffer "^1.1.5" -kind-of@^5.0.0, kind-of@^5.0.2: +kind-of@^5.0.0: version "5.1.0" resolved "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== @@ -6212,90 +5345,10 @@ kind-of@^6.0.0, kind-of@^6.0.2: resolved "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA== -klaw@~2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/klaw/-/klaw-2.0.0.tgz#59c128e0dc5ce410201151194eeb9cbf858650f6" - integrity sha1-WcEo4Nxc5BAgEVEZTuucv4WGUPY= - dependencies: - graceful-fs "^4.1.9" - -kleur@^3.0.3: - version "3.0.3" - resolved "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" - integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== - -koa-compose@^3.0.0: - version "3.2.1" - resolved "https://registry.npmjs.org/koa-compose/-/koa-compose-3.2.1.tgz#a85ccb40b7d986d8e5a345b3a1ace8eabcf54de7" - integrity sha1-qFzLQLfZhtjlo0Wzoazo6rz1Tec= - dependencies: - any-promise "^1.1.0" - -koa-compose@^4.1.0: - version "4.1.0" - resolved "https://registry.npmjs.org/koa-compose/-/koa-compose-4.1.0.tgz#507306b9371901db41121c812e923d0d67d3e877" - integrity sha512-8ODW8TrDuMYvXRwra/Kh7/rJo9BtOfPc6qO8eAfC80CnCvSjSl0bkRM24X6/XBBEyj0v1nRUQ1LyOy3dbqOWXw== - -koa-convert@^1.2.0: - version "1.2.0" - resolved "https://registry.npmjs.org/koa-convert/-/koa-convert-1.2.0.tgz#da40875df49de0539098d1700b50820cebcd21d0" - integrity sha1-2kCHXfSd4FOQmNFwC1CCDOvNIdA= - dependencies: - co "^4.6.0" - koa-compose "^3.0.0" - -koa-is-json@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/koa-is-json/-/koa-is-json-1.0.0.tgz#273c07edcdcb8df6a2c1ab7d59ee76491451ec14" - integrity sha1-JzwH7c3Ljfaiwat9We52SRRR7BQ= - -koa-send@^4.1.3: - version "4.1.3" - resolved "https://registry.npmjs.org/koa-send/-/koa-send-4.1.3.tgz#0822207bbf5253a414c8f1765ebc29fa41353cb6" - integrity sha512-3UetMBdaXSiw24qM2Mx5mKmxLKw5ZTPRjACjfhK6Haca55RKm9hr/uHDrkrxhSl5/S1CKI/RivZVIopiatZuTA== - dependencies: - debug "^2.6.3" - http-errors "^1.6.1" - mz "^2.6.0" - resolve-path "^1.4.0" - -koa-static@^4.0.2: - version "4.0.3" - resolved "https://registry.npmjs.org/koa-static/-/koa-static-4.0.3.tgz#5f93ad00fb1905db9ce46667c0e8bb7d22abfcd8" - integrity sha512-JGmxTuPWy4bH7bt6gD/OMWkhprawvRmzJSr8TWKmTL4N7+IMv3s0SedeQi5S4ilxM9Bo6ptkCyXj/7wf+VS5tg== - dependencies: - debug "^3.1.0" - koa-send "^4.1.3" - -koa@^2.4.1: - version "2.7.0" - resolved "https://registry.npmjs.org/koa/-/koa-2.7.0.tgz#7e00843506942b9d82c6cc33749f657c6e5e7adf" - integrity sha512-7ojD05s2Q+hFudF8tDLZ1CpCdVZw8JQELWSkcfG9bdtoTDzMmkRF6BQBU7JzIzCCOY3xd3tftiy/loHBUYaY2Q== - dependencies: - accepts "^1.3.5" - cache-content-type "^1.0.0" - content-disposition "~0.5.2" - content-type "^1.0.4" - cookies "~0.7.1" - debug "~3.1.0" - delegates "^1.0.0" - depd "^1.1.2" - destroy "^1.0.4" - error-inject "^1.0.0" - escape-html "^1.0.3" - fresh "~0.5.2" - http-assert "^1.3.0" - http-errors "^1.6.3" - is-generator-function "^1.0.7" - koa-compose "^4.1.0" - koa-convert "^1.2.0" - koa-is-json "^1.0.0" - on-finished "^2.3.0" - only "~0.0.2" - parseurl "^1.3.2" - statuses "^1.5.0" - type-is "^1.6.16" - vary "^1.1.2" +kleur@^3.0.3: + version "3.0.3" + resolved "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" + integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== last-call-webpack-plugin@^3.0.0: version "3.0.0" @@ -6305,13 +5358,6 @@ last-call-webpack-plugin@^3.0.0: lodash "^4.17.5" webpack-sources "^1.1.0" -lcid@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" - integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU= - dependencies: - invert-kv "^1.0.0" - lcid@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf" @@ -6362,13 +5408,6 @@ levn@^0.3.0, levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -linkify-it@^2.0.0: - version "2.2.0" - resolved "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz#e3b54697e78bf915c70a38acd78fd09e0058b1cf" - integrity sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw== - dependencies: - uc.micro "^1.0.1" - load-json-file@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b" @@ -6403,14 +5442,6 @@ loader-utils@^0.2.16: json5 "^0.5.0" object-assign "^4.0.1" -locate-path@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" - integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4= - dependencies: - p-locate "^2.0.0" - path-exists "^3.0.0" - locate-path@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" @@ -6419,31 +5450,11 @@ locate-path@^3.0.0: p-locate "^3.0.0" path-exists "^3.0.0" -lodash.camelcase@^4.3.0: - version "4.3.0" - resolved "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" - integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= - lodash.memoize@^4.1.2: version "4.1.2" resolved "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= -lodash.omit@^4.5.0: - version "4.5.0" - resolved "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60" - integrity sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA= - -lodash.padend@^4.6.1: - version "4.6.1" - resolved "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz#53ccba047d06e158d311f45da625f4e49e6f166e" - integrity sha1-U8y6BH0G4VjTEfRdpiX05J5vFm4= - -lodash.pick@^4.4.0: - version "4.4.0" - resolved "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" - integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM= - lodash.sortby@^4.7.0: version "4.7.0" resolved "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" @@ -6459,24 +5470,22 @@ lodash.uniq@^4.5.0: resolved "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@^4.1.0, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5: +lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.3, lodash@^4.17.5: version "4.17.15" resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== -log-symbols@^2.1.0: - version "2.2.0" - resolved "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a" - integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg== - dependencies: - chalk "^2.0.1" +lodash@^4.17.19: + version "4.17.20" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" + integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== loglevel@^1.6.3: version "1.6.3" resolved "https://registry.npmjs.org/loglevel/-/loglevel-1.6.3.tgz#77f2eb64be55a404c9fd04ad16d57c1d6d6b1280" integrity sha512-LoEDv5pgpvWgPF4kNYuIp0qqSJVWak/dML0RY74xlzMZiT9w77teNAwKYKWBTYjlokMirg+o3jBwp+vlLrcfAA== -loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0: +loose-envify@^1.0.0: version "1.4.0" resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== @@ -6488,14 +5497,6 @@ lower-case@^1.1.1: resolved "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw= -lru-cache@^4.0.1: - version "4.1.5" - resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" - integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== - dependencies: - pseudomap "^1.0.2" - yallist "^2.1.2" - lru-cache@^5.1.1: version "5.1.1" resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" @@ -6547,22 +5548,6 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" -markdown-it@^8.4.0: - version "8.4.2" - resolved "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.2.tgz#386f98998dc15a37722aa7722084f4020bdd9b54" - integrity sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ== - dependencies: - argparse "^1.0.7" - entities "~1.1.1" - linkify-it "^2.0.0" - mdurl "^1.0.1" - uc.micro "^1.0.5" - -marked@^0.3.16, marked@~0.3.6: - version "0.3.19" - resolved "https://registry.npmjs.org/marked/-/marked-0.3.19.tgz#5d47f709c4c9fc3c216b6d46127280f40b39d790" - integrity sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg== - md5.js@^1.3.4: version "1.3.5" resolved "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f" @@ -6582,23 +5567,11 @@ mdn-data@~1.1.0: resolved "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.4.tgz#50b5d4ffc4575276573c4eedb8780812a8419f01" integrity sha512-FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA== -mdurl@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" - integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4= - media-typer@0.3.0: version "0.3.0" resolved "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= -mem@^1.1.0: - version "1.1.0" - resolved "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76" - integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y= - dependencies: - mimic-fn "^1.0.0" - mem@^4.0.0: version "4.3.0" resolved "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178" @@ -6638,6 +5611,11 @@ methods@~1.1.2: resolved "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= +microevent.ts@~0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/microevent.ts/-/microevent.ts-0.1.1.tgz#70b09b83f43df5172d0205a63025bce0f7357fa0" + integrity sha512-jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g== + micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8: version "3.1.10" resolved "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" @@ -6670,7 +5648,7 @@ mime-db@1.40.0, "mime-db@>= 1.40.0 < 2": resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32" integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA== -mime-types@^2.1.12, mime-types@^2.1.18, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: +mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: version "2.1.24" resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81" integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ== @@ -6783,11 +5761,6 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mkdirp2@^1.0.3: - version "1.0.4" - resolved "https://registry.npmjs.org/mkdirp2/-/mkdirp2-1.0.4.tgz#56de1f8f5c93cf2199906362eba0f9f262ee4437" - integrity sha512-Q2PKB4ZR4UPtjLl76JfzlgSCUZhSV1AXQgAZa1qt5RiaALFjP/CDrGvFBrOz7Ck6McPcwMAxTsJvWOUjOU8XMw== - mkdirp@0.5.x, mkdirp@0.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: version "0.5.1" resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" @@ -6840,15 +5813,6 @@ mute-stream@0.0.7: resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s= -mz@^2.6.0: - version "2.7.0" - resolved "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" - integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q== - dependencies: - any-promise "^1.0.0" - object-assign "^4.0.1" - thenify-all "^1.0.0" - nan@^2.12.1: version "2.14.0" resolved "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" @@ -6992,23 +5956,6 @@ node-releases@^1.1.29: dependencies: semver "^5.3.0" -noox@^0.1.2: - version "0.1.3" - resolved "https://registry.npmjs.org/noox/-/noox-0.1.3.tgz#d7f1b8887e7e32783b4fe4c2a4cbbe45587200ca" - integrity sha512-4vrDvgdwLbBEsylUiOKzJAr2UvUqJS/rch9trG3glEt58pDDLRahfW9S7pF4tKv6pZ8jwEW68VGDZr3zn6vgmw== - dependencies: - babel-plugin-transform-react-jsx "^6.24.1" - babel-polyfill "^6.26.0" - babel-preset-env "^1.6.1" - babel-preset-react "^6.24.1" - babel-register "^6.26.0" - babel-standalone "^6.26.0" - bash-color "0.0.4" - gray-matter "^3.1.1" - prop-types "^15.6.0" - react "^16.2.0" - react-dom "^16.2.0" - nopt@^4.0.1: version "4.0.1" resolved "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" @@ -7017,20 +5964,6 @@ nopt@^4.0.1: abbrev "1" osenv "^0.1.4" -nopt@~2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz#ca7416f20a5e3f9c3b86180f96295fa3d0b52e0d" - integrity sha1-ynQW8gpeP5w7hhgPlilfo9C1Lg0= - dependencies: - abbrev "1" - -noptify@latest: - version "0.0.3" - resolved "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz#58f654a73d9753df0c51d9686dc92104a67f4bbb" - integrity sha1-WPZUpz2XU98MUdlobckhBKZ/S7s= - dependencies: - nopt "~2.0.0" - normalize-package-data@^2.3.2: version "2.5.0" resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -7140,11 +6073,6 @@ number-is-nan@^1.0.0: resolved "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= -"nwmatcher@>= 1.3.7 < 2.0.0": - version "1.4.4" - resolved "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.4.tgz#2285631f34a95f0d0395cd900c96ed39b58f346e" - integrity sha512-3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ== - nwsapi@^2.0.7, nwsapi@^2.1.3: version "2.1.4" resolved "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.4.tgz#e006a878db23636f8e8a67d33ca0e4edf61a842f" @@ -7169,11 +6097,6 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-get@^2.1.0: - version "2.1.0" - resolved "https://registry.npmjs.org/object-get/-/object-get-2.1.0.tgz#722bbdb60039efa47cad3c6dc2ce51a85c02c5ae" - integrity sha1-ciu9tgA576R8rTxtws5RqFwCxa4= - object-inspect@^1.6.0: version "1.6.0" resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b" @@ -7184,11 +6107,6 @@ object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1: resolved "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== -object-to-spawn-args@^1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/object-to-spawn-args/-/object-to-spawn-args-1.1.1.tgz#77da8827f073d011c9e1b173f895781470246785" - integrity sha1-d9qIJ/Bz0BHJ4bFz+JV4FHAkZ4U= - object-visit@^1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" @@ -7236,7 +6154,7 @@ obuf@^1.0.0, obuf@^1.1.2: resolved "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== -on-finished@^2.3.0, on-finished@~2.3.0: +on-finished@~2.3.0: version "2.3.0" resolved "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= @@ -7262,11 +6180,6 @@ onetime@^2.0.0: dependencies: mimic-fn "^1.0.0" -only@~0.0.2: - version "0.0.2" - resolved "https://registry.npmjs.org/only/-/only-0.0.2.tgz#2afde84d03e50b9a8edc444e30610a70295edfb4" - integrity sha1-Kv3oTQPlC5qO3EROMGEKcCle37Q= - opn@^5.5.0: version "5.5.0" resolved "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc" @@ -7302,16 +6215,6 @@ optionator@^0.8.1, optionator@^0.8.2: type-check "~0.3.2" wordwrap "~1.0.0" -ora@^1.3.0: - version "1.4.0" - resolved "https://registry.npmjs.org/ora/-/ora-1.4.0.tgz#884458215b3a5d4097592285f93321bb7a79e2e5" - integrity sha512-iMK1DOQxzzh2MBlVsU42G80mnrvUhqsMh74phHtDlrcTZPK0pH6o7l7DRshK+0YsxDyEuaOkziVdvM3T0QTzpw== - dependencies: - chalk "^2.1.0" - cli-cursor "^2.1.0" - cli-spinners "^1.0.1" - log-symbols "^2.1.0" - original@^1.0.0: version "1.0.2" resolved "https://registry.npmjs.org/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f" @@ -7329,15 +6232,6 @@ os-homedir@^1.0.0: resolved "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= -os-locale@^2.0.0: - version "2.1.0" - resolved "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2" - integrity sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA== - dependencies: - execa "^0.7.0" - lcid "^1.0.0" - mem "^1.1.0" - os-locale@^3.0.0, os-locale@^3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a" @@ -7347,7 +6241,7 @@ os-locale@^3.0.0, os-locale@^3.1.0: lcid "^2.0.0" mem "^4.0.0" -os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2: +os-tmpdir@^1.0.0, os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= @@ -7382,13 +6276,6 @@ p-is-promise@^2.0.0: resolved "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e" integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg== -p-limit@^1.1.0: - version "1.3.0" - resolved "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" - integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q== - dependencies: - p-try "^1.0.0" - p-limit@^2.0.0: version "2.2.0" resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz#417c9941e6027a9abcba5092dd2904e255b5fbc2" @@ -7396,13 +6283,6 @@ p-limit@^2.0.0: dependencies: p-try "^2.0.0" -p-locate@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" - integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM= - dependencies: - p-limit "^1.1.0" - p-locate@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" @@ -7427,11 +6307,6 @@ p-retry@^3.0.1: dependencies: retry "^0.12.0" -p-try@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" - integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M= - p-try@^2.0.0: version "2.2.0" resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" @@ -7500,12 +6375,7 @@ parse5@5.1.0: resolved "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2" integrity sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ== -parse5@^1.5.1: - version "1.5.1" - resolved "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94" - integrity sha1-m387DeMr543CQBsXVzzK8Pb1nZQ= - -parseurl@^1.3.2, parseurl@~1.3.2, parseurl@~1.3.3: +parseurl@~1.3.2, parseurl@~1.3.3: version "1.3.3" resolved "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== @@ -7530,7 +6400,7 @@ path-exists@^3.0.0: resolved "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= -path-is-absolute@1.0.1, path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: +path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= @@ -8039,14 +6909,7 @@ pretty-format@^24.8.0: ansi-styles "^3.2.0" react-is "^16.8.4" -prismjs@^1.14.0: - version "1.17.1" - resolved "https://registry.npmjs.org/prismjs/-/prismjs-1.17.1.tgz#e669fcbd4cdd873c35102881c33b14d0d68519be" - integrity sha512-PrEDJAFdUGbOP6xK/UsfkC5ghJsPJviKgnQOoxaDbBjwc8op68Quupwt1DeAFoG8GImPhiKXAvvsH7wDSLsu1Q== - optionalDependencies: - clipboard "^2.0.0" - -private@^0.1.6, private@^0.1.8: +private@^0.1.6: version "0.1.8" resolved "https://registry.npmjs.org/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg== @@ -8086,15 +6949,6 @@ prompts@^2.0.1: kleur "^3.0.3" sisteransi "^1.0.3" -prop-types@^15.6.0, prop-types@^15.6.2: - version "15.7.2" - resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" - integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== - dependencies: - loose-envify "^1.4.0" - object-assign "^4.1.1" - react-is "^16.8.1" - properties-reader@0.0.16: version "0.0.16" resolved "https://registry.npmjs.org/properties-reader/-/properties-reader-0.0.16.tgz#a2cc0db9cdd7b81d977d0a59c1dc10c6d1d6ab98" @@ -8115,11 +6969,6 @@ prr@~1.0.1: resolved "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY= -pseudomap@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" - integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= - psl@^1.1.24, psl@^1.1.28: version "1.3.0" resolved "https://registry.npmjs.org/psl/-/psl-1.3.0.tgz#e1ebf6a3b5564fa8376f3da2275da76d875ca1bd" @@ -8192,11 +7041,6 @@ qs@6.7.0: resolved "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== -qs@~0.5.2: - version "0.5.6" - resolved "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz#31b1ad058567651c526921506b9a8793911a0384" - integrity sha1-MbGtBYVnZRxSaSFQa5qHk5EaA4Q= - query-string@^4.1.0: version "4.3.4" resolved "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb" @@ -8270,30 +7114,11 @@ rc@^1.2.7: minimist "^1.2.0" strip-json-comments "~2.0.1" -react-dom@^16.2.0: - version "16.9.0" - resolved "https://registry.npmjs.org/react-dom/-/react-dom-16.9.0.tgz#5e65527a5e26f22ae3701131bcccaee9fb0d3962" - integrity sha512-YFT2rxO9hM70ewk9jq0y6sQk8cL02xm4+IzYBz75CQGlClQQ1Bxq0nhHF6OtSbit+AIahujJgb/CPRibFkMNJQ== - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.2" - scheduler "^0.15.0" - -react-is@^16.8.1, react-is@^16.8.4: +react-is@^16.8.4: version "16.9.0" resolved "https://registry.npmjs.org/react-is/-/react-is-16.9.0.tgz#21ca9561399aad0ff1a7701c01683e8ca981edcb" integrity sha512-tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw== -react@^16.2.0: - version "16.9.0" - resolved "https://registry.npmjs.org/react/-/react-16.9.0.tgz#40ba2f9af13bc1a38d75dbf2f4359a5185c4f7aa" - integrity sha512-+7LQnFBwkiw+BobzOF6N//BdoNw0ouwmSJTEm9cglOOmsg/TMiFHZLe2sEoN5M7LgJTj9oHH0gxklfnQe66S1w== - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.2" - read-pkg-up@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978" @@ -8333,16 +7158,6 @@ read-pkg@^4.0.1: string_decoder "~1.1.1" util-deprecate "~1.0.1" -readable-stream@1.1: - version "1.1.13" - resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz#f6eef764f514c89e2b9e23146a75ba106756d23e" - integrity sha1-9u73ZPUUyJ4rniMUanW6EGdW0j4= - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - readable-stream@^3.0.6, readable-stream@^3.1.1: version "3.4.0" resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc" @@ -8361,11 +7176,6 @@ readdirp@^2.2.1: micromatch "^3.1.10" readable-stream "^2.0.2" -readline-sync@^1.4.9: - version "1.4.10" - resolved "https://registry.npmjs.org/readline-sync/-/readline-sync-1.4.10.tgz#41df7fbb4b6312d673011594145705bf56d8873b" - integrity sha512-gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw== - realpath-native@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz#2003294fea23fb0672f2476ebe22fcf498a2d65c" @@ -8373,30 +7183,6 @@ realpath-native@^1.1.0: dependencies: util.promisify "^1.0.0" -reduce-extract@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/reduce-extract/-/reduce-extract-1.0.0.tgz#67f2385beda65061b5f5f4312662e8b080ca1525" - integrity sha1-Z/I4W+2mUGG19fQxJmLosIDKFSU= - dependencies: - test-value "^1.0.1" - -reduce-flatten@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-1.0.1.tgz#258c78efd153ddf93cb561237f61184f3696e327" - integrity sha1-JYx479FT3fk8tWEjf2EYTzaW4yc= - -reduce-unique@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/reduce-unique/-/reduce-unique-1.0.0.tgz#7e586bcf87a4e32b6d7abd8277fad6cdec9f4803" - integrity sha1-flhrz4ek4ytter2Cd/rWzeyfSAM= - -reduce-without@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/reduce-without/-/reduce-without-1.0.1.tgz#68ad0ead11855c9a37d4e8256c15bbf87972fc8c" - integrity sha1-aK0OrRGFXJo31OglbBW7+Hly/Iw= - dependencies: - test-value "^2.0.0" - regenerate-unicode-properties@^8.0.2: version "8.1.0" resolved "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz#ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e" @@ -8404,35 +7190,16 @@ regenerate-unicode-properties@^8.0.2: dependencies: regenerate "^1.4.0" -regenerate@^1.2.1, regenerate@^1.4.0: +regenerate@^1.4.0: version "1.4.0" resolved "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11" integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg== -regenerator-runtime@^0.10.5: - version "0.10.5" - resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658" - integrity sha1-M2w+/BIgrc7dosn6tntaeVWjNlg= - -regenerator-runtime@^0.11.0: - version "0.11.1" - resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" - integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== - regenerator-runtime@^0.13.2: version "0.13.3" resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5" integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw== -regenerator-transform@^0.10.0: - version "0.10.1" - resolved "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd" - integrity sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q== - dependencies: - babel-runtime "^6.18.0" - babel-types "^6.19.0" - private "^0.1.6" - regenerator-transform@^0.14.0: version "0.14.1" resolved "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.1.tgz#3b2fce4e1ab7732c08f665dfdb314749c7ddd2fb" @@ -8458,15 +7225,6 @@ regexpp@^2.0.1: resolved "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw== -regexpu-core@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240" - integrity sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA= - dependencies: - regenerate "^1.2.1" - regjsgen "^0.2.0" - regjsparser "^0.1.4" - regexpu-core@^4.5.4: version "4.5.4" resolved "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.4.tgz#080d9d02289aa87fe1667a4f5136bc98a6aebaae" @@ -8479,23 +7237,11 @@ regexpu-core@^4.5.4: unicode-match-property-ecmascript "^1.0.4" unicode-match-property-value-ecmascript "^1.1.0" -regjsgen@^0.2.0: - version "0.2.0" - resolved "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7" - integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc= - regjsgen@^0.5.0: version "0.5.0" resolved "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.0.tgz#a7634dc08f89209c2049adda3525711fb97265dd" integrity sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA== -regjsparser@^0.1.4: - version "0.1.5" - resolved "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c" - integrity sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw= - dependencies: - jsesc "~0.5.0" - regjsparser@^0.6.0: version "0.6.0" resolved "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.0.tgz#f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c" @@ -8534,13 +7280,6 @@ repeat-string@^1.6.1: resolved "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= -repeating@^2.0.0: - version "2.0.1" - resolved "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" - integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo= - dependencies: - is-finite "^1.0.0" - request-promise-core@1.1.2: version "1.1.2" resolved "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.2.tgz#339f6aababcafdb31c799ff158700336301d3346" @@ -8557,7 +7296,7 @@ request-promise-native@^1.0.5: stealthy-require "^1.1.1" tough-cookie "^2.3.3" -request@^2.55.0, request@^2.83.0, request@^2.87.0, request@^2.88.0: +request@^2.83.0, request@^2.87.0, request@^2.88.0: version "2.88.0" resolved "https://registry.npmjs.org/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef" integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg== @@ -8608,13 +7347,6 @@ requires-port@^1.0.0: resolved "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= -requizzle@~0.2.1: - version "0.2.3" - resolved "https://registry.npmjs.org/requizzle/-/requizzle-0.2.3.tgz#4675c90aacafb2c036bd39ba2daa4a1cb777fded" - integrity sha512-YanoyJjykPxGHii0fZP0uUPEXpvqfBDxWV7s6GKAiiOsiqhX6vHNyW3Qzdmqp/iq/ExbhaGbVrjB4ruEVSM4GQ== - dependencies: - lodash "^4.17.14" - resolve-cwd@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a" @@ -8640,14 +7372,6 @@ resolve-from@^4.0.0: resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== -resolve-path@^1.4.0: - version "1.4.0" - resolved "https://registry.npmjs.org/resolve-path/-/resolve-path-1.4.0.tgz#c4bda9f5efb2fce65247873ab36bb4d834fe16f7" - integrity sha1-xL2p9e+y/OZSR4c6s2u02DT+Fvc= - dependencies: - http-errors "~1.6.2" - path-is-absolute "1.0.1" - resolve-url@^0.2.1: version "0.2.1" resolved "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" @@ -8776,7 +7500,7 @@ sane@^4.0.3: minimist "^1.1.1" walker "~1.0.5" -sax@^1.1.4, sax@^1.2.4, sax@~1.2.4: +sax@^1.2.4, sax@~1.2.4: version "1.2.4" resolved "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== @@ -8788,14 +7512,6 @@ saxes@^3.1.9: dependencies: xmlchars "^2.1.1" -scheduler@^0.15.0: - version "0.15.0" - resolved "https://registry.npmjs.org/scheduler/-/scheduler-0.15.0.tgz#6bfcf80ff850b280fed4aeecc6513bc0b4f17f8e" - integrity sha512-xAefmSfN6jqAa7Kuq7LIJY0bwAPG3xlCj0HMEBQk1lxYiDKZscY2xJ5U/61ZTrYbmNQbXa+gc7czPkVo11tnCg== - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - schema-utils@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770" @@ -8810,11 +7526,6 @@ select-hose@^2.0.0: resolved "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= -select@^1.1.2: - version "1.1.2" - resolved "https://registry.npmjs.org/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d" - integrity sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0= - selfsigned@^1.10.4: version "1.10.4" resolved "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.4.tgz#cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd" @@ -9000,11 +7711,6 @@ sisteransi@^1.0.3: resolved "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.3.tgz#98168d62b79e3a5e758e27ae63c4a053d748f4eb" integrity sha512-SbEG75TzH8G7eVXFSN5f9EExILKfly7SUvVY5DhhYLvfhKqhDFY0OzevWa/zwak0RLRfWS5AvfMWpd9gJvr5Yg== -slash@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" - integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU= - slash@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" @@ -9069,15 +7775,6 @@ sockjs@0.3.19: faye-websocket "^0.10.0" uuid "^3.0.1" -sort-array@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/sort-array/-/sort-array-2.0.0.tgz#38a9c6da27fd7d147b42e60554f281187b4df472" - integrity sha1-OKnG2if9fRR7QuYFVPKBGHtN9HI= - dependencies: - array-back "^1.0.4" - object-get "^2.1.0" - typical "^2.6.0" - sort-keys@^1.0.0: version "1.1.2" resolved "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad" @@ -9109,13 +7806,6 @@ source-map-resolve@^0.5.0: source-map-url "^0.4.0" urix "^0.1.0" -source-map-support@^0.4.15: - version "0.4.18" - resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" - integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA== - dependencies: - source-map "^0.5.6" - source-map-support@^0.5.6, source-map-support@~0.5.12: version "0.5.13" resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932" @@ -9129,7 +7819,7 @@ source-map-url@^0.4.0: resolved "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM= -source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7: +source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6: version "0.5.7" resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= @@ -9240,7 +7930,7 @@ static-extend@^0.1.1: define-property "^0.2.5" object-copy "^0.1.0" -"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@^1.5.0, statuses@~1.5.0: +"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" resolved "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= @@ -9263,13 +7953,6 @@ stream-browserify@^2.0.1: inherits "~2.0.1" readable-stream "^2.0.2" -stream-connect@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/stream-connect/-/stream-connect-1.0.2.tgz#18bc81f2edb35b8b5d9a8009200a985314428a97" - integrity sha1-GLyB8u2zW4tdmoAJIAqYUxRCipc= - dependencies: - array-back "^1.0.2" - stream-each@^1.1.0: version "1.2.3" resolved "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae" @@ -9294,11 +7977,6 @@ stream-shift@^1.0.0: resolved "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952" integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI= -stream-via@^1.0.4: - version "1.0.4" - resolved "https://registry.npmjs.org/stream-via/-/stream-via-1.0.4.tgz#8dccbb0ac909328eb8bc8e2a4bd3934afdaf606c" - integrity sha512-DBp0lSvX5G9KGRDTkR/R+a29H+Wk2xItOF+MpZLLNDWbEV9tGPnqLPxHEYjmiz8xGtJHRIqmI+hCjmNzqoA4nQ== - strict-uri-encode@^1.0.0: version "1.1.0" resolved "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" @@ -9370,11 +8048,6 @@ string_decoder@^1.0.0, string_decoder@^1.1.1: dependencies: safe-buffer "~5.2.0" -string_decoder@~0.10.x: - version "0.10.31" - resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" - integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= - string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" @@ -9403,11 +8076,6 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" -strip-bom-string@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92" - integrity sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI= - strip-bom@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" @@ -9449,7 +8117,7 @@ supports-color@6.1.0, supports-color@^6.1.0: supports-color@^2.0.0: version "2.0.0" - resolved "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= supports-color@^5.3.0: @@ -9483,22 +8151,11 @@ symbol-observable@1.2.0, symbol-observable@^1.1.0: resolved "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== -"symbol-tree@>= 3.1.0 < 4.0.0", symbol-tree@^3.2.2: +symbol-tree@^3.2.2: version "3.2.4" resolved "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== -table-layout@^0.4.2: - version "0.4.5" - resolved "https://registry.npmjs.org/table-layout/-/table-layout-0.4.5.tgz#d906de6a25fa09c0c90d1d08ecd833ecedcb7378" - integrity sha512-zTvf0mcggrGeTe/2jJ6ECkJHAQPIYEwDoqsiqBjI24mvRmQbInK5jq33fyypaCBxX08hMkfmdOqj6haT33EqWw== - dependencies: - array-back "^2.0.0" - deep-extend "~0.6.0" - lodash.padend "^4.6.1" - typical "^2.6.1" - wordwrapjs "^3.0.0" - table@^5.2.3: version "5.4.5" resolved "https://registry.npmjs.org/table/-/table-5.4.5.tgz#c8f4ea2d8fee08c0027fac27b0ec0a4fe01dfa42" @@ -9509,11 +8166,6 @@ table@^5.2.3: slice-ansi "^2.1.0" string-width "^3.0.0" -taffydb@2.6.2: - version "2.6.2" - resolved "https://registry.npmjs.org/taffydb/-/taffydb-2.6.2.tgz#7cbcb64b5a141b6a2efc2c5d2c67b4e150b2a268" - integrity sha1-fLy2S1oUG2ou/CxdLGe04VCyomg= - tapable@^1.0.0, tapable@^1.1.0: version "1.1.3" resolved "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" @@ -9532,11 +8184,6 @@ tar@^4: safe-buffer "^5.1.2" yallist "^3.0.3" -temp-path@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/temp-path/-/temp-path-1.0.0.tgz#24b1543973ab442896d9ad367dd9cbdbfafe918b" - integrity sha1-JLFUOXOrRCiW2a02fdnL2/r+kYs= - terser-webpack-plugin@^1.1.0: version "1.4.1" resolved "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz#61b18e40eaee5be97e771cdbb10ed1280888c2b4" @@ -9571,49 +8218,11 @@ test-exclude@^5.2.3: read-pkg-up "^4.0.0" require-main-filename "^2.0.0" -test-value@^1.0.1: - version "1.1.0" - resolved "https://registry.npmjs.org/test-value/-/test-value-1.1.0.tgz#a09136f72ec043d27c893707c2b159bfad7de93f" - integrity sha1-oJE29y7AQ9J8iTcHwrFZv6196T8= - dependencies: - array-back "^1.0.2" - typical "^2.4.2" - -test-value@^2.0.0: - version "2.1.0" - resolved "https://registry.npmjs.org/test-value/-/test-value-2.1.0.tgz#11da6ff670f3471a73b625ca4f3fdcf7bb748291" - integrity sha1-Edpv9nDzRxpztiXKTz/c97t0gpE= - dependencies: - array-back "^1.0.3" - typical "^2.6.0" - -test-value@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/test-value/-/test-value-3.0.0.tgz#9168c062fab11a86b8d444dd968bb4b73851ce92" - integrity sha512-sVACdAWcZkSU9x7AOmJo5TqE+GyNJknHaHsMrR6ZnhjVlVN9Yx6FjHrsKZ3BjIpPCT68zYesPWkakrNupwfOTQ== - dependencies: - array-back "^2.0.0" - typical "^2.6.1" - text-table@^0.2.0: version "0.2.0" resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= -thenify-all@^1.0.0: - version "1.6.0" - resolved "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726" - integrity sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY= - dependencies: - thenify ">= 3.1.0 < 4" - -"thenify@>= 3.1.0 < 4": - version "3.3.0" - resolved "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz#e69e38a1babe969b0108207978b9f62b88604839" - integrity sha1-5p44obq+lpsBCCB5eLn2K4hgSDk= - dependencies: - any-promise "^1.0.0" - throat@^4.0.0: version "4.1.0" resolved "https://registry.npmjs.org/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a" @@ -9649,21 +8258,6 @@ timsort@^0.3.0: resolved "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= -tiny-emitter@^2.0.0: - version "2.1.0" - resolved "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423" - integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q== - -tiny-lr@0.0.5: - version "0.0.5" - resolved "https://registry.npmjs.org/tiny-lr/-/tiny-lr-0.0.5.tgz#d36792261d3eadfc6aed492972b3e1372b7fc829" - integrity sha1-02eSJh0+rfxq7UkpcrPhNyt/yCk= - dependencies: - debug "~0.7.0" - faye-websocket "~0.4.3" - noptify latest - qs "~0.5.2" - tiny-warning@^1.0.2: version "1.0.3" resolved "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" @@ -9686,11 +8280,6 @@ to-arraybuffer@^1.0.0: resolved "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M= -to-fast-properties@^1.0.3: - version "1.0.3" - resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" - integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc= - to-fast-properties@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" @@ -9731,7 +8320,7 @@ toposort@^1.0.0: resolved "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029" integrity sha1-LmhELZ9k7HILjMieZEOsbKqVACk= -tough-cookie@^2.2.0, tough-cookie@^2.3.3, tough-cookie@^2.3.4, tough-cookie@^2.5.0: +tough-cookie@^2.3.3, tough-cookie@^2.3.4, tough-cookie@^2.5.0: version "2.5.0" resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== @@ -9754,11 +8343,6 @@ tr46@^1.0.1: dependencies: punycode "^2.1.0" -tr46@~0.0.1: - version "0.0.3" - resolved "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" - integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= - trim-right@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" @@ -9815,7 +8399,7 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" -type-is@^1.6.16, type-is@~1.6.16, type-is@~1.6.17, type-is@~1.6.18: +type-is@~1.6.16, type-is@~1.6.17, type-is@~1.6.18: version "1.6.18" resolved "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== @@ -9833,21 +8417,6 @@ typescript@3.5.1: resolved "https://registry.npmjs.org/typescript/-/typescript-3.5.1.tgz#ba72a6a600b2158139c5dd8850f700e231464202" integrity sha512-64HkdiRv1yYZsSe4xC1WVgamNigVYjlssIoaH2HcZF0+ijsk5YK2g0G34w9wJkze8+5ow4STd22AynfO6ZYYLw== -typical@^2.4.2, typical@^2.6.0, typical@^2.6.1: - version "2.6.1" - resolved "https://registry.npmjs.org/typical/-/typical-2.6.1.tgz#5c080e5d661cbbe38259d2e70a3c7253e873881d" - integrity sha1-XAgOXWYcu+OCWdLnCjxyU+hziB0= - -typical@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz#cbeaff3b9d7ae1e2bbfaf5a4e6f11eccfde94fc4" - integrity sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw== - -uc.micro@^1.0.1, uc.micro@^1.0.5: - version "1.0.6" - resolved "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac" - integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA== - uglify-js@3.4.x: version "3.4.10" resolved "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz#9ad9563d8eb3acdfb8d38597d2af1d815f6a755f" @@ -9864,16 +8433,6 @@ uglify-js@^3.1.4: commander "~2.20.0" source-map "~0.6.1" -underscore@^1.8.3: - version "1.9.1" - resolved "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961" - integrity sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg== - -underscore@~1.8.3: - version "1.8.3" - resolved "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022" - integrity sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI= - unicode-canonical-property-names-ecmascript@^1.0.4: version "1.0.4" resolved "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818" @@ -9931,11 +8490,6 @@ unique-slug@^2.0.0: dependencies: imurmurhash "^0.1.4" -universalify@^0.1.0: - version "0.1.2" - resolved "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" - integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== - unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" @@ -10052,7 +8606,7 @@ validate-npm-package-license@^3.0.1: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" -vary@^1.1.2, vary@~1.1.2: +vary@~1.1.2: version "1.1.2" resolved "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= @@ -10092,16 +8646,6 @@ w3c-xmlserializer@^1.1.2: webidl-conversions "^4.0.2" xml-name-validator "^3.0.0" -walk-back@^2.0.1: - version "2.0.1" - resolved "https://registry.npmjs.org/walk-back/-/walk-back-2.0.1.tgz#554e2a9d874fac47a8cb006bf44c2f0c4998a0a4" - integrity sha1-VU4qnYdPrEeoywBr9EwvDEmYoKQ= - -walk-back@^3.0.0: - version "3.0.1" - resolved "https://registry.npmjs.org/walk-back/-/walk-back-3.0.1.tgz#0c0012694725604960d6c2f75aaf1a1e7d455d35" - integrity sha512-umiNB2qLO731Sxbp6cfZ9pwURJzTnftxE4Gc7hq8n/ehkuXC//s9F65IEIJA2ZytQZ1ZOsm/Fju4IWx0bivkUQ== - walker@^1.0.7, walker@~1.0.5: version "1.0.7" resolved "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb" @@ -10116,11 +8660,6 @@ warning@^3.0.0: dependencies: loose-envify "^1.0.0" -watch@~0.9.0: - version "0.9.0" - resolved "https://registry.npmjs.org/watch/-/watch-0.9.0.tgz#7e7e5adcd95be44a2bd8bb38677711fa2e41b464" - integrity sha1-fn5a3Nlb5Eor2Ls4Z3cR+i5BtGQ= - watchpack@^1.5.0: version "1.6.0" resolved "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00" @@ -10137,11 +8676,6 @@ wbuf@^1.1.0, wbuf@^1.7.3: dependencies: minimalistic-assert "^1.0.0" -webidl-conversions@^2.0.0: - version "2.0.1" - resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-2.0.1.tgz#3bf8258f7d318c7443c36f2e169402a1a6703506" - integrity sha1-O/glj30xjHRDw28uFpQCoaZwNQY= - webidl-conversions@^4.0.2: version "4.0.2" resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" @@ -10290,13 +8824,6 @@ whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0, whatwg-mimetype@^2.3.0: resolved "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== -whatwg-url-compat@~0.6.5: - version "0.6.5" - resolved "https://registry.npmjs.org/whatwg-url-compat/-/whatwg-url-compat-0.6.5.tgz#00898111af689bb097541cd5a45ca6c8798445bf" - integrity sha1-AImBEa9om7CXVBzVpFymyHmERb8= - dependencies: - tr46 "~0.0.1" - whatwg-url@^6.4.1: version "6.5.0" resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz#f2df02bff176fd65070df74ad5ccbb5a199965a8" @@ -10344,14 +8871,6 @@ wordwrap@~1.0.0: resolved "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= -wordwrapjs@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-3.0.0.tgz#c94c372894cadc6feb1a66bff64e1d9af92c5d1e" - integrity sha512-mO8XtqyPvykVCsrwj5MlOVWvSnCdT+C+QVbm6blradR7JExAhbkZ7hZ9A+9NUtwzSqrlUo9a67ws0EiILrvRpw== - dependencies: - reduce-flatten "^1.0.1" - typical "^2.6.1" - worker-farm@^1.7.0: version "1.7.0" resolved "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8" @@ -10359,6 +8878,13 @@ worker-farm@^1.7.0: dependencies: errno "~0.1.7" +worker-rpc@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/worker-rpc/-/worker-rpc-0.1.1.tgz#cb565bd6d7071a8f16660686051e969ad32f54d5" + integrity sha512-P1WjMrUB3qgJNI9jfmpZ/htmBEjFh//6l/5y8SD9hg1Ef5zTTVVoRjTrTEzPrNBQvmhMxkoTsjOXN10GWU7aCg== + dependencies: + microevent.ts "~0.1.1" + wrap-ansi@^2.0.0: version "2.1.0" resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" @@ -10411,11 +8937,6 @@ ws@^6.1.2: dependencies: async-limiter "~1.0.0" -"xml-name-validator@>= 2.0.1 < 3.0.0": - version "2.0.1" - resolved "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635" - integrity sha1-TYuPHszTQZqjYgYb7O9RXh5VljU= - xml-name-validator@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" @@ -10426,31 +8947,16 @@ xmlchars@^2.1.1: resolved "https://registry.npmjs.org/xmlchars/-/xmlchars-2.1.1.tgz#ef1a81c05bff629c2280007f12daca21bd6f6c93" integrity sha512-7hew1RPJ1iIuje/Y01bGD/mXokXxegAgVS+e+E0wSi2ILHQkYAH1+JXARwTjZSM4Z4Z+c73aKspEcqj+zPPL/w== -xmlcreate@^1.0.1: - version "1.0.2" - resolved "https://registry.npmjs.org/xmlcreate/-/xmlcreate-1.0.2.tgz#fa6bf762a60a413fb3dd8f4b03c5b269238d308f" - integrity sha1-+mv3YqYKQT+z3Y9LA8WyaSONMI8= - xtend@^4.0.0, xtend@~4.0.1: version "4.0.2" resolved "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== -y18n@^3.2.1: - version "3.2.1" - resolved "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" - integrity sha1-bRX7qITAhnnA136I53WegR4H+kE= - "y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== -yallist@^2.1.2: - version "2.1.2" - resolved "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" - integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= - yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: version "3.0.3" resolved "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9" @@ -10479,13 +8985,6 @@ yargs-parser@^13.1.0: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^8.1.0: - version "8.1.0" - resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.1.0.tgz#f1376a33b6629a5d063782944da732631e966950" - integrity sha512-yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ== - dependencies: - camelcase "^4.1.0" - yargs@12.0.5, yargs@^12.0.2: version "12.0.5" resolved "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13" @@ -10520,103 +9019,3 @@ yargs@13.2.4: which-module "^2.0.0" y18n "^4.0.0" yargs-parser "^13.1.0" - -yargs@^10.0.3: - version "10.1.2" - resolved "https://registry.npmjs.org/yargs/-/yargs-10.1.2.tgz#454d074c2b16a51a43e2fb7807e4f9de69ccb5c5" - integrity sha512-ivSoxqBGYOqQVruxD35+EyCFDYNEFL/Uo6FcOnz+9xZdZzK0Zzw4r4KhbrME1Oo2gOggwJod2MnsdamSG7H9ig== - dependencies: - cliui "^4.0.0" - decamelize "^1.1.1" - find-up "^2.1.0" - get-caller-file "^1.0.1" - os-locale "^2.0.0" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^2.0.0" - which-module "^2.0.0" - y18n "^3.2.1" - yargs-parser "^8.1.0" - -ydoc-plugin-copy@0.0.1: - version "0.0.1" - resolved "https://registry.npmjs.org/ydoc-plugin-copy/-/ydoc-plugin-copy-0.0.1.tgz#825be9c1106ecff0a0bcadd82ea7688b75a22d89" - integrity sha512-wmQMLkHmnAj0xL3v+QSO8tB5yfGIOFcrsdWarBASjY7xmwvVJiSGuGSxGvepFgNtgpLJeXSZ226LPzuDd5lVzw== - dependencies: - fs-extra "^5.0.0" - -ydoc-plugin-demo@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/ydoc-plugin-demo/-/ydoc-plugin-demo-1.0.0.tgz#843bbe06d36a1a22bd9c579140eeaedc47e9b5c0" - integrity sha512-5y+MpdhHHBsI4gzW/JceNJvA1rPjqMvzf3U7cwUnpYehBzHzupq8zKQS2EEs/amxCJdlq8KmIK8ztmuJbZV3mQ== - -ydoc-plugin-edit-page@0.0.2: - version "0.0.2" - resolved "https://registry.npmjs.org/ydoc-plugin-edit-page/-/ydoc-plugin-edit-page-0.0.2.tgz#bb55c4ce77ad1964feb27cb53b9a1d5264dab5fe" - integrity sha512-KIq7g+rcUXm58ddfF1I02vVaMp0Ycy1OG5Pf+NvMb6/eNRiRvkMGOZJy/aksIGhA/jez5Qs/sFH9iEMK58qwSQ== - -ydoc-plugin-execution-time@^1.0.0: - version "1.0.1" - resolved "https://registry.npmjs.org/ydoc-plugin-execution-time/-/ydoc-plugin-execution-time-1.0.1.tgz#a211bdcfe47aaca300af6bad2195fe75facd12a7" - integrity sha512-qcJh6H2sm1X8INMHm3YZnr7TPJ35G1M40U8u5N2NlpNYsgH6Q1iquUrAhwC3hIfqR6G22ftjAm2lT51rAOLmOQ== - -ydoc-plugin-img-view@^1.0.1: - version "1.0.3" - resolved "https://registry.npmjs.org/ydoc-plugin-img-view/-/ydoc-plugin-img-view-1.0.3.tgz#34d7b9a71777d43d9a5e9bc4ce93dc5b68d40def" - integrity sha512-f53tE8iPacq3GkMgv0vL56zuWAp6l3KC8jcUZGEm/tBZH/wuzXWpOeN6ncZSsaKLgiSovHVRGgfI3puNELD5xA== - -ydoc-plugin-import-asset@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/ydoc-plugin-import-asset/-/ydoc-plugin-import-asset-1.0.1.tgz#c9291b680dbfeefdbf856308c34546928626e651" - integrity sha512-vXNYI5B/avoL/qBtC+OWn826bAQI+iVY3iPoKYndMmax8z+aCyX29RCcThXTLqWv0YHnr53F/FHZc3qWbi5e+Q== - -ydoc-plugin-jsdoc@0.0.3: - version "0.0.3" - resolved "https://registry.npmjs.org/ydoc-plugin-jsdoc/-/ydoc-plugin-jsdoc-0.0.3.tgz#5702120425ef1e8d630c54c1e2ae38fe248c43aa" - integrity sha512-MkaCXIFGQckrFkDqQOXlEw1E7yGkg+JQLZx2IKujfQ+zrgkwP/1crtPxN2vV/k8iWNZPTaOXtJ/cvFawq7ITbw== - dependencies: - jsdoc-to-markdown "^4.0.1" - -ydoc-plugin-search@^1.1.6: - version "1.1.6" - resolved "https://registry.npmjs.org/ydoc-plugin-search/-/ydoc-plugin-search-1.1.6.tgz#a1ba058d24edbf7e6a4d453f9b5b42713ce30c51" - integrity sha512-kLkKLwBCwB9Iy+V1WOrTgZcEoZSINdYSUIht9kw8pJ8mFA9xanIP/Y71lJF2CK5zldA1IUMawu4nN2ntFjBeWQ== - dependencies: - cheerio "^0.20.0" - -ydoc@4.1.0: - version "4.1.0" - resolved "https://registry.npmjs.org/ydoc/-/ydoc-4.1.0.tgz#18342d11e79be2ff47cef8ab60127df1ec7baa09" - integrity sha512-AbPjGN5jFooKF4rxTt5Q3uedKct3oliIfkSsuBITNh9eYrlfU4QQQqaYrKAzv7tio/nayaVbuKswJAwZsAaLPA== - dependencies: - bash-color "0.0.4" - cheerio "^0.20.0" - chokidar "^2.0.0" - debug "*" - fs-extra "^5.0.0" - growl "~1.7.0" - he "^1.1.1" - koa "^2.4.1" - koa-static "^4.0.2" - markdown-it "^8.4.0" - noox "^0.1.2" - ora "^1.3.0" - prismjs "^1.14.0" - readline-sync "^1.4.9" - tiny-lr "0.0.5" - underscore "^1.8.3" - watch "~0.9.0" - yargs "^10.0.3" - ydoc-plugin-copy "0.0.1" - ydoc-plugin-demo "^1.0.0" - ydoc-plugin-edit-page "0.0.2" - ydoc-plugin-execution-time "^1.0.0" - ydoc-plugin-img-view "^1.0.1" - ydoc-plugin-import-asset "^1.0.1" - ydoc-plugin-search "^1.1.6" - -ylru@^1.2.0: - version "1.2.1" - resolved "https://registry.npmjs.org/ylru/-/ylru-1.2.1.tgz#f576b63341547989c1de7ba288760923b27fe84f" - integrity sha512-faQrqNMzcPCHGVC2aaOINk13K+aaBDUPjGWl0teOXywElLjyVAB6Oe2jj62jHYtwsU49jXhScYbvPENK+6zAvQ== From 59d7cfc451ba1956411256b04b9470e4fd5068bf Mon Sep 17 00:00:00 2001 From: alan Date: Mon, 21 Dec 2020 14:21:25 +0800 Subject: [PATCH 2/4] =?UTF-8?q?KERNEL-6541=20=E7=B1=BB=E5=9E=8B=E5=BC=95?= =?UTF-8?q?=E7=94=A8=E8=A7=84=E8=8C=83=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 +- src/modules/app.ts | 9 +-- src/modules/components/collapse/collapse.ts | 15 ++-- .../components/test_status/test_status.ts | 10 +-- .../test_status/tip_icon/tip_fail.ts | 13 ++-- .../components/text_checker/text_checker.ts | 10 +-- src/modules/pages/connection/connection.ts | 12 ++-- src/modules/pages/connection/list/list.ts | 11 +-- .../connection/list/list_item/list_item.ts | 4 +- .../pages/connection_pool/connection_pool.ts | 4 +- src/modules/pages/database/database.ts | 33 ++++----- .../database/database_type/database_type.ts | 9 +-- .../maintain/forms/components/form.jdbc.ts | 61 ++++++++-------- .../maintain/forms/components/form.jndi.ts | 71 ++++++++++--------- src/modules/title/title.ts | 15 ++-- .../title/title_database/title_datebase.ts | 11 +-- .../title/title_maintain/title_maintain.ts | 8 +-- src/ui/fineui.ts | 43 ----------- yarn.lock | 6 +- 19 files changed, 158 insertions(+), 191 deletions(-) diff --git a/package.json b/package.json index f13d596..8f7d836 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ "eslint": "5.16.0", "eslint-plugin-jest": "22.4.1", "express": "4.16.4", + "fork-ts-checker-webpack-plugin": "1.4.3", "html-webpack-plugin": "3.2.0", "http-proxy": "1.17.0", "husky": "1.3.1", @@ -51,8 +52,7 @@ "webpack": "4.35.2", "webpack-cli": "3.3.5", "webpack-dev-server": "3.7.2", - "webpack-merge": "4.2.1", - "fork-ts-checker-webpack-plugin": "1.4.3" + "webpack-merge": "4.2.1" }, "optionalDependencies": { "@fui/core": "^2.0.0", diff --git a/src/modules/app.ts b/src/modules/app.ts index 3dd69aa..bab0430 100644 --- a/src/modules/app.ts +++ b/src/modules/app.ts @@ -1,17 +1,18 @@ import { shortcut, store } from '@core/core'; -import { Tab, Vtape, Absolute } from 'ui'; +import { Vtape, Absolute } from 'ui'; import { TitleXtype } from './title/title'; import { PAGE_INDEX } from './constants/constant'; import { ConnectionXtype, DatebaseXtype, MaintainXtype, ConnectionPoolXtype } from './pages'; import { AppModel, AppModelXtype } from './app.model'; import './app.provider'; import '../less/index.less'; +import { Tab } from '@fui/core'; export const AppXtype = 'dec.dcm.main'; @store(AppModelXtype) @shortcut(AppXtype) export class App extends BI.Widget { - tab: any; + tab: Tab; store: AppModel['store']; model: AppModel['model']; @@ -38,12 +39,12 @@ export class App extends BI.Widget { cls: 'bi-background', items: [{ el: { - type: Tab, + type: BI.Tab.xtype, cls: 'bi-card', single: true, tgap: 10, showIndex: this.model.pageIndex, - ref: (_ref: any) => { + ref: (_ref: Tab) => { this.tab = _ref; }, cardCreator: (index: string) => { diff --git a/src/modules/components/collapse/collapse.ts b/src/modules/components/collapse/collapse.ts index 675749f..7cbff87 100644 --- a/src/modules/components/collapse/collapse.ts +++ b/src/modules/components/collapse/collapse.ts @@ -1,6 +1,7 @@ -import { IconLabel, Left } from 'ui'; +import { Left } from 'ui'; import { shortcut, store } from '@core/core'; import { CollapseModel, CollapseModelXtype } from './collapse.model'; +import { IconLabel } from '@fui/core'; export const EVENT_CHANGE = 'EVENT_CHANGE'; export const CollapseXtype = 'dec.dcm.components.collapse'; @@ -13,8 +14,8 @@ export class Collapse extends BI.BasicButton { $testId: 'dec-dcm-components-collapse', } - rightFont: any; - downFont: any; + rightFont: IconLabel; + downFont: IconLabel; model: CollapseModel['model']; store: CollapseModel['store']; @@ -34,19 +35,19 @@ export class Collapse extends BI.BasicButton { type: Left, items: [ { - type: IconLabel, + type: BI.IconLabel.xtype, height: 17, cls: 'dcm-triangle-collapse-font icon-size-16', - ref: (_ref: any) => { + ref: (_ref: IconLabel) => { this.rightFont = _ref; }, invisible: !this.model.isCollapse, }, { - type: IconLabel, + type: BI.IconLabel.xtype, height: 17, cls: 'dcm-triangle-expand-font icon-size-16', - ref: (_ref: any) => { + ref: (_ref: IconLabel) => { this.downFont = _ref; }, invisible: this.model.isCollapse, diff --git a/src/modules/components/test_status/test_status.ts b/src/modules/components/test_status/test_status.ts index b76663b..bdb09bb 100644 --- a/src/modules/components/test_status/test_status.ts +++ b/src/modules/components/test_status/test_status.ts @@ -1,10 +1,10 @@ import { shortcut, store } from '@core/core'; import { TestStatusModelXtype, TestStatusModel } from './test_status.model'; -import { CenterAdapt, Tab, Vertical, Left } from 'ui'; +import { CenterAdapt, Vertical, Left } from 'ui'; import { TEST_STATUS } from '@constants/constant'; import { TipIconXtype } from './tip_icon/tip_icon'; import { TipFailXtype, EVENT_CLOSE, EVENT_RELOAD, EVENT_DETAIL } from './tip_icon/tip_fail'; -import { Label } from '@fui/core'; +import { Label, Tab } from '@fui/core'; export const TestStatusXtype = 'dec.dcm.components.test_status'; export { EVENT_CLOSE, @@ -26,7 +26,7 @@ export class TestStatus extends BI.Widget { model: TestStatusModel['model']; store: TestStatusModel['store']; - tab: any; + tab: Tab; failMessage: Label; failDriverMessage: Label; driverLink: any; @@ -49,13 +49,13 @@ export class TestStatus extends BI.Widget { type: Vertical, items: [ { - type: Tab, + type: BI.Tab.xtype, cls: 'bi-card', width: 450, height: 250, single: true, showIndex: this.model.status, - ref: (_ref: any) => { + ref: (_ref: Tab) => { this.tab = _ref; }, cardCreator: (index: string) => { diff --git a/src/modules/components/test_status/tip_icon/tip_fail.ts b/src/modules/components/test_status/tip_icon/tip_fail.ts index 65997be..4ebf523 100644 --- a/src/modules/components/test_status/tip_icon/tip_fail.ts +++ b/src/modules/components/test_status/tip_icon/tip_fail.ts @@ -1,5 +1,6 @@ import { shortcut, store } from '@core/core'; -import { Vertical, HorizotalAuto, CenterAdapt, VerticalAdapt, Button } from 'ui'; +import { Button } from '@fui/core'; +import { Vertical, HorizotalAuto, CenterAdapt, VerticalAdapt } from 'ui'; import { TipFailModel, TipFailModelXtype } from './tip_fail.model'; export const TipFailXtype = 'dec.dcm.components.test_status.tip_fail'; export const EVENT_CLOSE = 'EVENT_CLOSE'; @@ -17,7 +18,7 @@ export class TipFail extends BI.Widget { model: TipFailModel['model']; store: TipFailModel['store']; - detailButton: any; + detailButton: Button; watch = { isCollapse: (isCollapse: boolean) => { @@ -56,10 +57,10 @@ export class TipFail extends BI.Widget { hgap: 5, items: [ { - type: Button, + type: BI.Button.xtype, text: BI.i18nText('Dec-Dcm_Connection_Detailed_Information'), level: 'ignore', - ref: (_ref: any) => { + ref: (_ref: Button) => { this.detailButton = _ref; }, handler: () => { @@ -68,7 +69,7 @@ export class TipFail extends BI.Widget { }, }, { - type: Button, + type: BI.Button.xtype, text: BI.i18nText('Dec-Dcm_Back'), level: 'ignore', handler: () => { @@ -76,7 +77,7 @@ export class TipFail extends BI.Widget { }, }, { - type: Button, + type: BI.Button.xtype, text: retryText, handler: () => { this.fireEvent(EVENT_RELOAD); diff --git a/src/modules/components/text_checker/text_checker.ts b/src/modules/components/text_checker/text_checker.ts index 91fc540..8a95649 100644 --- a/src/modules/components/text_checker/text_checker.ts +++ b/src/modules/components/text_checker/text_checker.ts @@ -1,6 +1,6 @@ import { shortcut } from '@core/core'; -import { Label } from '@fui/core'; -import { TextEditor, Absolute } from 'ui'; +import { Label, TextEditor } from '@fui/core'; +import { Absolute } from 'ui'; export const TextCheckerXtype = 'dec.dcm.components.text_checker'; @shortcut(TextCheckerXtype) export class TextChecker extends BI.Widget { @@ -17,7 +17,7 @@ export class TextChecker extends BI.Widget { $value: '', } - textEditor: any; + textEditor: TextEditor; errorLabel: Label; private isError: boolean; private value: string; @@ -37,13 +37,13 @@ export class TextChecker extends BI.Widget { height: 20, items: [{ el: { - type: TextEditor, + type: BI.TextEditor.xtype, $value, width, allowBlank, value, watermark, - ref: (_ref: any) => { + ref: (_ref: TextEditor) => { this.textEditor = _ref; }, listeners: [{ diff --git a/src/modules/pages/connection/connection.ts b/src/modules/pages/connection/connection.ts index 1911a1e..c00be92 100644 --- a/src/modules/pages/connection/connection.ts +++ b/src/modules/pages/connection/connection.ts @@ -1,4 +1,4 @@ -import { Button, Htape, Vtape, VerticalAdapt, ListView, CenterAdapt, Layout } from 'ui'; +import { Htape, Vtape, VerticalAdapt, ListView, CenterAdapt, Layout } from 'ui'; import { shortcut, store } from '@core/core'; import { ConnectionModel, ConnectionModelXtype } from './connection.model'; import { PAGE_INDEX } from '@constants/constant'; @@ -9,7 +9,7 @@ import { ConnectionPluginXtype } from './connection_plugin/connection_plugin'; import { connectionType } from '@constants/env'; import { getAllDatabaseTypes, connectionCanEdit, getJdbcDatabaseType, getTextByDatabaseType } from '../../app.service'; import { ConnectionJDBC } from '../../crud/crud.typings'; -import { Label } from '@fui/core'; +import { Button, Label } from '@fui/core'; export const ConnectionXtype = 'dec.dcm.connection'; @shortcut(ConnectionXtype) @@ -19,7 +19,7 @@ export class Connection extends BI.Widget { model: ConnectionModel['model']; connectionTitleWidget: Label; - connectionEditWidget: any; + connectionEditWidget: Button; listView: any; title: any; @@ -63,7 +63,7 @@ export class Connection extends BI.Widget { type: VerticalAdapt, cls: 'bi-border-bottom', items: [{ - type: Button, + type: BI.Button.xtype, text: BI.i18nText('Dec-Dcm_Connection_New'), handler: () => { this.store.setPageIndex(PAGE_INDEX.DATEBASE); @@ -102,11 +102,11 @@ export class Connection extends BI.Widget { el: { type: VerticalAdapt, items: [{ - type: Button, + type: BI.Button.xtype, $value: 'connection-edit', invisible: true, text: BI.i18nText('Dec-Dcm_Edit'), - ref: (_ref: any) => { + ref: (_ref: Button) => { this.connectionEditWidget = _ref; }, handler: () => { diff --git a/src/modules/pages/connection/list/list.ts b/src/modules/pages/connection/list/list.ts index 97beb17..21ec40e 100644 --- a/src/modules/pages/connection/list/list.ts +++ b/src/modules/pages/connection/list/list.ts @@ -1,8 +1,9 @@ import { shortcut, store } from '@core/core'; -import { CenterAdapt, Layout, Vtape, Loader, Tab } from 'ui'; +import { CenterAdapt, Layout, Vtape } from 'ui'; import { ListItemXtype } from './list_item/list_item'; import { ConnectionListModel, ConnectionListModelXtype } from './list.model'; import { getDatabaseType } from './list.service'; +import { Tab } from '@fui/core'; export const ConnectionListXtype = 'dec.dcm.connection.list'; @shortcut(ConnectionListXtype) @store(ConnectionListModelXtype) @@ -11,7 +12,7 @@ export class ConnectionList extends BI.LoadingPane { model: ConnectionListModel['model']; groupWidget: any; - tab: any; + tab: Tab; beforeInit(cb: Function) { this.store.setConnections().then(() => { @@ -32,10 +33,10 @@ export class ConnectionList extends BI.LoadingPane { render() { return { - type: Tab, + type: BI.Tab.xtype, single: true, showIndex: this.model.shwoType, - ref: (_ref: any) => { + ref: (_ref: Tab) => { this.tab = _ref; }, cardCreator: (index: 'list' | 'none') => { @@ -67,7 +68,7 @@ export class ConnectionList extends BI.LoadingPane { } return { - type: Loader, + type: BI.Loader.xtype, itemsCreator: (options: {times: number}, populate) => { populate(this.renderList((options.times - 1) * 50, options.times * 50)); }, diff --git a/src/modules/pages/connection/list/list_item/list_item.ts b/src/modules/pages/connection/list/list_item/list_item.ts index 6c446a0..ff75a43 100644 --- a/src/modules/pages/connection/list/list_item/list_item.ts +++ b/src/modules/pages/connection/list/list_item/list_item.ts @@ -1,5 +1,5 @@ import { shortcut, store } from '@core/core'; -import { IconLabel, Layout, Htape, Vertical } from 'ui'; +import { Layout, Htape, Vertical } from 'ui'; import './list_item.less'; import { ListItemModel, ListItemModelXtype } from './list_item.model'; import { PAGE_INDEX } from '@constants/constant'; @@ -47,7 +47,7 @@ export class ListItem extends BI.BasicButton { $scope: name, items: [{ el: { - type: IconLabel, + type: BI.IconLabel.xtype, cls: 'dcm-link-font icon-size-16', title: name, }, diff --git a/src/modules/pages/connection_pool/connection_pool.ts b/src/modules/pages/connection_pool/connection_pool.ts index af87f09..7c0e441 100644 --- a/src/modules/pages/connection_pool/connection_pool.ts +++ b/src/modules/pages/connection_pool/connection_pool.ts @@ -1,5 +1,5 @@ import { shortcut, store } from '@core/core'; -import { Htape, Vtape, Layout, CenterAdapt, Loader } from 'ui'; +import { Htape, Vtape, Layout, CenterAdapt } from 'ui'; import { ConnectionPoolModel, ConnectionPoolModelXtype } from './connection_pool.model'; import { ListItemXtype } from './list_item/list_item'; import { PoolXtype } from './pool/pool'; @@ -49,7 +49,7 @@ export class ConnectionPool extends BI.Widget { height: 40, }, { - type: Loader, + type: BI.Loader.xtype, itemsCreator: (options: {times: number}, populate) => { populate(this.renderList((options.times - 1) * PAGE_SIZE, options.times * PAGE_SIZE)); }, diff --git a/src/modules/pages/database/database.ts b/src/modules/pages/database/database.ts index 915c48e..74e4752 100644 --- a/src/modules/pages/database/database.ts +++ b/src/modules/pages/database/database.ts @@ -1,4 +1,4 @@ -import { SearchEditor, Vtape, Right, Htape, Vertical, ButtonGroup, Left, MultiSelectItem, CenterAdapt } from 'ui'; +import { Vtape, Right, Htape, Vertical, Left, CenterAdapt } from 'ui'; import { shortcut, store } from '@core/core'; import { FilterXtype } from './filter/filter'; import { DatebaseModel, DatebaseModelXtype } from './database.model'; @@ -6,16 +6,17 @@ import { DATEBASE_FILTER_TYPE, OTHER_JDBC } from '@constants/constant'; import { connectionType } from '@constants/env'; import { DatebaseTypeXtype } from './database_type/database_type'; import { getAllDatabaseTypes } from '../../app.service'; +import { ButtonGroup, MultiSelectItem, SearchEditor } from '@fui/core'; export const DatebaseXtype = 'dec.dcm.datebase'; @shortcut(DatebaseXtype) @store(DatebaseModelXtype) export class Datebase extends BI.Widget { - filter: any; - search: any; - datebaseType: any; + filter: ButtonGroup; + search: SearchEditor; + datebaseType: ButtonGroup; typeFilterWidget: any; - internalWidget: any; - pluginWidget: any; + internalWidget: MultiSelectItem; + pluginWidget: MultiSelectItem; allDatabaseTypes = getAllDatabaseTypes(); @@ -80,11 +81,11 @@ export class Datebase extends BI.Widget { type: Right, items: [ { - type: SearchEditor, + type: BI.SearchEditor.xtype, $value: 'database-type', width: 300, watermark: BI.i18nText('BI-Basic_Search'), - ref: (_ref: any) => { + ref: (_ref: SearchEditor) => { this.search = _ref; }, listeners: [ @@ -107,12 +108,12 @@ export class Datebase extends BI.Widget { items: [ { el: { - type: ButtonGroup, + type: BI.ButtonGroup.xtype, cls: 'bi-border-right', layouts: [{ type: Vertical, }], - ref: (_ref: any) => { + ref: (_ref: ButtonGroup) => { this.filter = _ref; }, items: [ @@ -153,12 +154,12 @@ export class Datebase extends BI.Widget { title: BI.i18nText('Dec-Dcm_Connection_Type_Filter'), }, { - type: MultiSelectItem, + type: BI.MultiSelectItem.xtype, width: 80, selected: this.model.isInternal, text: BI.i18nText('Dec-Dcm_Connection_Support_Inner'), title: BI.i18nText('Dec-Dcm_Connection_Support_Inner'), - ref: (_ref: any) => { + ref: (_ref: MultiSelectItem) => { this.internalWidget = _ref; }, handler: () => { @@ -166,12 +167,12 @@ export class Datebase extends BI.Widget { }, }, { - type: MultiSelectItem, + type: BI.MultiSelectItem.xtype, width: 80, selected: this.model.isPlugin, text: BI.i18nText('Dec-Dcm_Connection_Support_Plugin'), title: BI.i18nText('Dec-Dcm_Connection_Support_Plugin'), - ref: (_ref: any) => { + ref: (_ref: MultiSelectItem) => { this.pluginWidget = _ref; }, handler: () => { @@ -193,14 +194,14 @@ export class Datebase extends BI.Widget { height: 24, }, { - type: ButtonGroup, + type: BI.ButtonGroup.xtype, hgap: 15, layouts: [{ type: Left, scrolly: true, }], items: this.renderDatebaseType(), - ref: (_ref: any) => { + ref: (_ref: ButtonGroup) => { this.datebaseType = _ref; }, }, diff --git a/src/modules/pages/database/database_type/database_type.ts b/src/modules/pages/database/database_type/database_type.ts index 1064673..075a800 100644 --- a/src/modules/pages/database/database_type/database_type.ts +++ b/src/modules/pages/database/database_type/database_type.ts @@ -1,9 +1,10 @@ import { shortcut, store } from '@core/core'; -import { Vtape, Absolute, Img } from 'ui'; +import { Vtape, Absolute } from 'ui'; import { DatebaseTypeModel, DatebaseTypeModelXtype } from './database_type.model'; import { ImgPrefix, PluginImgPrefix } from '@constants/env'; import './database_type.less'; import { PAGE_INDEX } from '@constants/constant'; +import { Img } from '@fui/core'; export const DatebaseTypeXtype = 'dec.dcm.datebase.type'; @shortcut(DatebaseTypeXtype) @@ -22,7 +23,7 @@ export class DatebaseType extends BI.BasicButton { $testId: 'dec-dcm-database-type', } - img: any; + img: Img; store: DatebaseTypeModel['store']; @@ -39,9 +40,9 @@ export class DatebaseType extends BI.BasicButton { items: [ { el: { - type: Img, + type: BI.Img.xtype, src: iconUrl ? this.getIconUrl(iconUrl) : `${ImgPrefix}${databaseType}.jpg`, - ref: (_ref: any) => { + ref: (_ref: Img) => { this.img = _ref; }, }, diff --git a/src/modules/pages/maintain/forms/components/form.jdbc.ts b/src/modules/pages/maintain/forms/components/form.jdbc.ts index b12a8d2..f6622d9 100644 --- a/src/modules/pages/maintain/forms/components/form.jdbc.ts +++ b/src/modules/pages/maintain/forms/components/form.jdbc.ts @@ -1,5 +1,5 @@ import { shortcut } from '@core/core'; -import { Vertical, TextEditor, TextValueCombo, TextAreaEditor, Editor, EdirotIconCheckCombo, Left, Layout } from 'ui'; +import { Vertical, Left, Layout } from 'ui'; import { CollapseXtype, EVENT_CHANGE } from 'src/modules/components/collapse/collapse'; import { FormItemXtype } from '../../components/form_item/form_item'; import { Connection, ConnectionJDBC, ConnectionPoolJDBC } from 'src/modules/crud/crud.typings'; @@ -8,6 +8,7 @@ import { CONNECT_CHARSET, CONNECTION_LAYOUT, INT_MAX_VALUE, INT_MIN_VALUE } from import { getAllDatabaseTypes, getJdbcDatabaseType, resolveUrlInfo, splitUrl } from '../../../../app.service'; import { TextCheckerXtype } from '../../../../components/text_checker/text_checker'; import { ApiFactory } from 'src/modules/crud/apiFactory'; +import { Editor, EditorIconCheckCombo, Label, TextAreaEditor, TextEditor, TextValueCombo } from '@fui/core'; const api = new ApiFactory().create(); export const FormJdbcXtype = 'dec.dcm.maintain.form.jdbc'; @@ -95,12 +96,12 @@ export class FormJdbc extends BI.Widget { type: FormItemXtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Driver'), forms: [{ - type: EdirotIconCheckCombo, + type: BI.EditorIconCheckCombo.xtype, $testId: 'dec-editor-icon-check-combo', $value: 'driver', width: 300, value: driver, - ref: (_ref: any) => { + ref: (_ref: EditorIconCheckCombo) => { this.form.driver = _ref; }, items: this.getDrivers(), @@ -124,7 +125,7 @@ export class FormJdbc extends BI.Widget { type: FormItemXtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Name'), forms: [{ - type: TextEditor, + type: BI.TextEditor.xtype, $value: 'database-name', width: 300, allowBlank: true, @@ -145,7 +146,7 @@ export class FormJdbc extends BI.Widget { type: FormItemXtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Host'), forms: [{ - type: TextEditor, + type: BI.TextEditor.xtype, $value: 'database-host', width: 300, allowBlank: true, @@ -193,11 +194,11 @@ export class FormJdbc extends BI.Widget { name: BI.i18nText('Dec-Dcm_Connection_Form_AuthType'), invisible: !databaseType.kerberos, forms: [{ - type: TextValueCombo, + type: BI.TextValueCombo.xtype, $value: 'auth-type', width: 300, value: authType, - ref: (_ref: any) => { + ref: (_ref: TextValueCombo) => { this.form.authType = _ref; }, items: [ @@ -233,13 +234,13 @@ export class FormJdbc extends BI.Widget { this.formUser = _ref; }, forms: [{ - type: TextEditor, + type: BI.TextEditor.xtype, $value: 'username', width: 300, allowBlank: true, value: user, watermark: BI.i18nText('Dec-Dcm_Connection_Form_UserName'), - ref: (_ref: any) => { + ref: (_ref: TextEditor) => { this.form.user = _ref; }, }], @@ -252,7 +253,7 @@ export class FormJdbc extends BI.Widget { this.formPassword = _ref; }, forms: [{ - type: Editor, + type: BI.Editor.xtype, $value: 'password', cls: 'bi-border bi-border-radius', width: 300, @@ -262,7 +263,7 @@ export class FormJdbc extends BI.Widget { inputType: 'password', autocomplete: 'new-password', watermark: BI.i18nText('Dec-Dcm_Connection_Form_Password'), - ref: (_ref: any) => { + ref: (_ref: Editor) => { this.form.password = _ref; }, }], @@ -275,13 +276,13 @@ export class FormJdbc extends BI.Widget { this.formPrincipal = _ref; }, forms: [{ - type: TextEditor, + type: BI.TextEditor.xtype, $value: 'principal', width: 300, allowBlank: true, value: principal, watermark: BI.i18nText('Dec-Dcm_Connection_Form_Principal'), - ref: (_ref: any) => { + ref: (_ref: TextEditor) => { this.form.principal = _ref; }, }], @@ -294,7 +295,7 @@ export class FormJdbc extends BI.Widget { this.formKeyPath = _ref; }, forms: [{ - type: Editor, + type: BI.Editor.xtype, $value: 'key-path', cls: 'bi-border', width: 300, @@ -302,7 +303,7 @@ export class FormJdbc extends BI.Widget { allowBlank: true, value: keyPath, watermark: BI.i18nText('Dec-Dcm_Connection_Form_KeyPath'), - ref: (_ref: any) => { + ref: (_ref: Editor) => { this.form.keyPath = _ref; }, }], @@ -313,7 +314,7 @@ export class FormJdbc extends BI.Widget { textAlign: 'left', invisible: true, text: BI.i18nText('Dec-Dcm_Connection_JDBC_Warning'), - ref: (_ref: any) => { + ref: (_ref: Label) => { this.labelTips = _ref; }, }, @@ -321,12 +322,12 @@ export class FormJdbc extends BI.Widget { type: FormItemXtype, name: BI.i18nText('Dec-Dcm_Connection_Form_OriginalCharsetName'), forms: [{ - type: TextValueCombo, + type: BI.TextValueCombo.xtype, $value: 'original-charset-name', width: 300, value: originalCharsetName ? originalCharsetName : '', items: CONNECT_CHARSET, - ref: (_ref: any) => { + ref: (_ref: TextValueCombo) => { this.form.originalCharsetName = _ref; }, }], @@ -354,14 +355,14 @@ export class FormJdbc extends BI.Widget { text: BI.i18nText('Dec-Dcm_Connection_Read_Mode_List'), }], }, { - type: TextValueCombo, + type: BI.TextValueCombo.xtype, $value: 'schema', width: 300, vgap: 15, disabled: true, value: schema, items: schema ? [{ text: schema, value:schema }] : [], - ref: (_ref: any) => { + ref: (_ref: TextValueCombo) => { this.form.schema = _ref; }, }], @@ -376,13 +377,13 @@ export class FormJdbc extends BI.Widget { type: FormItemXtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_URL'), forms: [{ - type: TextEditor, + type: BI.TextEditor.xtype, $value: 'database-url', width: 300, allowBlank: true, value: url, watermark: BI.i18nText('Dec-Dcm_Connection_Form_Database_URL'), - ref: (_ref: any) => { + ref: (_ref: TextEditor) => { this.form.url = _ref; }, listeners: [{ @@ -532,7 +533,7 @@ export class FormJdbc extends BI.Widget { type: FormItemXtype, name: BI.i18nText('Dec-Dcm_Connection_Form_SQL_Validation_Query'), forms: [{ - type: TextAreaEditor, + type: BI.TextAreaEditor.xtype, $value: 'validation-query', cls: 'bi-border', allowBlank: true, @@ -540,7 +541,7 @@ export class FormJdbc extends BI.Widget { value: validationQuery, width: 300, height: 100, - ref: (_ref: any) => { + ref: (_ref: TextAreaEditor) => { this.form.validationQuery = _ref; }, }], @@ -549,14 +550,14 @@ export class FormJdbc extends BI.Widget { type: FormItemXtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Connection-Check'), forms: [{ - type: TextValueCombo, + type: BI.TextValueCombo.xtype, $value: 'check', width: 300, allowBlank: true, value: testOnBorrow, items: this.getBooleanItem(), watermark: BI.i18nText('Dec-Dcm_Connection_Form_Connection-Check'), - ref: (_ref: any) => { + ref: (_ref: TextValueCombo) => { this.form.testOnBorrow = _ref; }, }], @@ -565,14 +566,14 @@ export class FormJdbc extends BI.Widget { type: FormItemXtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Test_On_Return'), forms: [{ - type: TextValueCombo, + type: BI.TextValueCombo.xtype, $value: 'test-on-return', width: 300, allowBlank: true, value: testOnReturn, items: this.getBooleanItem(), watermark: BI.i18nText('Dec-Dcm_Connection_Form_Database_Test_On_Return'), - ref: (_ref: any) => { + ref: (_ref: TextValueCombo) => { this.form.testOnReturn = _ref; }, }], @@ -581,14 +582,14 @@ export class FormJdbc extends BI.Widget { type: FormItemXtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Test_While_Idle'), forms: [{ - type: TextValueCombo, + type: BI.TextValueCombo.xtype, $value: 'test-while-idle', width: 300, allowBlank: true, value: testWhileIdle, items: this.getBooleanItem(), watermark: BI.i18nText('Dec-Dcm_Connection_Form_Database_Test_While_Idle'), - ref: (_ref: any) => { + ref: (_ref: TextValueCombo) => { this.form.testWhileIdle = _ref; }, }], diff --git a/src/modules/pages/maintain/forms/components/form.jndi.ts b/src/modules/pages/maintain/forms/components/form.jndi.ts index 24b0079..3995c9c 100644 --- a/src/modules/pages/maintain/forms/components/form.jndi.ts +++ b/src/modules/pages/maintain/forms/components/form.jndi.ts @@ -1,11 +1,12 @@ import { shortcut } from '@core/core'; -import { Vertical, TextEditor, Htape, Left, TextValueCombo, EdirotIconCheckCombo } from 'ui'; +import { Vertical, Htape, Left } from 'ui'; import { FormItemXtype } from '../../components/form_item/form_item'; import { ConnectionJNDI, Connection, ContextHashtable } from 'src/modules/crud/crud.typings'; import { CONNECT_CHARSET, CONNECTION_LAYOUT, JNDI_FACTORYS } from '@constants/constant'; import { CollapseXtype, EVENT_CHANGE } from 'src/modules/components/collapse/collapse'; import { connectionType } from '@constants/env'; import { TextCheckerXtype } from '../../../../components/text_checker/text_checker'; +import { EditorIconCheckCombo, TextEditor, TextValueCombo } from '@fui/core'; export const FormJndiXtype = 'dec.dcm.maintain.form.jndi'; @shortcut(FormJndiXtype) export class FormJndi extends BI.Widget { @@ -64,12 +65,12 @@ export class FormJndi extends BI.Widget { name: BI.i18nText('Dec-Dcm_Connection_JNDI_Form_ConnectionName'), nameWidth: 200, forms: [{ - type: TextEditor, + type: BI.TextEditor.xtype, $value: 'jdni-name', width: 300, allowBlank: true, value: jndiName, - ref: (_ref: any) => { + ref: (_ref: TextEditor) => { this.form.jndiName = _ref; }, }], @@ -103,12 +104,12 @@ export class FormJndi extends BI.Widget { nameWidth: 200, isBold: false, forms: [{ - type: EdirotIconCheckCombo, + type: BI.EditorIconCheckCombo.xtype, $testId: 'dec-editor-icon-check-combo', $value: 'initial', width: 300, value: contextHashtable['java.naming.factory.initial'], - ref: (_ref: any) => { + ref: (_ref: EditorIconCheckCombo) => { this.form.initial = _ref; }, items: JNDI_FACTORYS.map(item => { @@ -133,12 +134,12 @@ export class FormJndi extends BI.Widget { isBold: false, nameWidth: 200, forms: [{ - type: TextEditor, + type: BI.TextEditor.xtype, $value: 'provider-url', width: 300, allowBlank: true, value: contextHashtable['java.naming.provider.url'], - ref: (_ref: any) => { + ref: (_ref: TextEditor) => { this.form.providerUrl = _ref; }, }], @@ -149,12 +150,12 @@ export class FormJndi extends BI.Widget { isBold: false, nameWidth: 200, forms: [{ - type: TextEditor, + type: BI.TextEditor.xtype, $value: 'security-principal', width: 300, allowBlank: true, value: contextHashtable['java.naming.security.principal'], - ref: (_ref: any) => { + ref: (_ref: TextEditor) => { this.form.securityPrincipal = _ref; }, }], @@ -165,12 +166,12 @@ export class FormJndi extends BI.Widget { isBold: false, nameWidth: 200, forms: [{ - type: TextEditor, + type: BI.TextEditor.xtype, $value: 'security-credentials', width: 300, allowBlank: true, value: contextHashtable['java.naming.security.credentials'], - ref: (_ref: any) => { + ref: (_ref: TextEditor) => { this.form.securityCredentials = _ref; }, }], @@ -191,12 +192,12 @@ export class FormJndi extends BI.Widget { name: BI.i18nText('Dec-Dcm_Connection_Form_OriginalCharsetName'), nameWidth: 200, forms: [{ - type: TextValueCombo, + type: BI.TextValueCombo.xtype, $value: 'new-charset-name', width: 300, value: newCharsetName ? newCharsetName : '', items: CONNECT_CHARSET, - ref: (_ref: any) => { + ref: (_ref: TextValueCombo) => { this.form.newCharsetName = _ref; }, }], @@ -228,12 +229,12 @@ export class FormJndi extends BI.Widget { name: 'OBJECT_FACTORIES', nameWidth: 200, forms: [{ - type: TextEditor, + type: BI.TextEditor.xtype, $value: 'factory-object', width: 300, allowBlank: true, value: contextHashtable['java.naming.factory.object'], - ref: (_ref: any) => { + ref: (_ref: TextEditor) => { this.form.factoryObject = _ref; }, }], @@ -243,12 +244,12 @@ export class FormJndi extends BI.Widget { name: 'STATE_FACTORIES', nameWidth: 200, forms: [{ - type: TextEditor, + type: BI.TextEditor.xtype, $value: 'factory-state', width: 300, allowBlank: true, value: contextHashtable['java.naming.factory.state'], - ref: (_ref: any) => { + ref: (_ref: TextEditor) => { this.form.factoryState = _ref; }, }], @@ -258,12 +259,12 @@ export class FormJndi extends BI.Widget { name: 'URL_PKG_PREFIXES', nameWidth: 200, forms: [{ - type: TextEditor, + type: BI.TextEditor.xtype, $value: 'factory-url-pkgs', width: 300, allowBlank: true, value: contextHashtable['java.naming.factory.url.pkgs'], - ref: (_ref: any) => { + ref: (_ref: TextEditor) => { this.form.factoryUrlPkgs = _ref; }, }], @@ -273,12 +274,12 @@ export class FormJndi extends BI.Widget { name: 'DNS_URL', nameWidth: 200, forms: [{ - type: TextEditor, + type: BI.TextEditor.xtype, $value: 'dns-url', width: 300, allowBlank: true, value: contextHashtable['java.naming.dns.url'], - ref: (_ref: any) => { + ref: (_ref: TextEditor) => { this.form.dnsUrl = _ref; }, }], @@ -288,12 +289,12 @@ export class FormJndi extends BI.Widget { name: 'AUTHORITATIVE', nameWidth: 200, forms: [{ - type: TextEditor, + type: BI.TextEditor.xtype, $value: 'authoritative', width: 300, allowBlank: true, value: contextHashtable['java.naming.authoritative'], - ref: (_ref: any) => { + ref: (_ref: TextEditor) => { this.form.authoritative = _ref; }, }], @@ -303,12 +304,12 @@ export class FormJndi extends BI.Widget { name: 'BATCHSIZE', nameWidth: 200, forms: [{ - type: TextEditor, + type: BI.TextEditor.xtype, $value: 'batchsize', width: 300, allowBlank: true, value: contextHashtable['java.naming.batchsize'], - ref: (_ref: any) => { + ref: (_ref: TextEditor) => { this.form.batchsize = _ref; }, }], @@ -318,12 +319,12 @@ export class FormJndi extends BI.Widget { name: 'REFERRAL', nameWidth: 200, forms: [{ - type: TextEditor, + type: BI.TextEditor.xtype, $value: 'referral', width: 300, allowBlank: true, value: contextHashtable['java.naming.referral'], - ref: (_ref: any) => { + ref: (_ref: TextEditor) => { this.form.referral = _ref; }, }], @@ -333,12 +334,12 @@ export class FormJndi extends BI.Widget { name: 'SECURITY_PROTOCOL', nameWidth: 200, forms: [{ - type: TextEditor, + type: BI.TextEditor.xtype, $value: 'security-protocol', width: 300, allowBlank: true, value: contextHashtable['java.naming.security.protocol'], - ref: (_ref: any) => { + ref: (_ref: TextEditor) => { this.form.securityProtocol = _ref; }, }], @@ -348,12 +349,12 @@ export class FormJndi extends BI.Widget { name: 'SECURITY_AUTHENTICATION', nameWidth: 200, forms: [{ - type: TextEditor, + type: BI.TextEditor.xtype, $value: 'security-authentication', width: 300, allowBlank: true, value: contextHashtable['java.naming.security.authentication'], - ref: (_ref: any) => { + ref: (_ref: TextEditor) => { this.form.authentication = _ref; }, }], @@ -363,12 +364,12 @@ export class FormJndi extends BI.Widget { name: 'LANGUAGE', nameWidth: 200, forms: [{ - type: TextEditor, + type: BI.TextEditor.xtype, $value: 'language', width: 300, allowBlank: true, value: contextHashtable['java.naming.language'], - ref: (_ref: any) => { + ref: (_ref: TextEditor) => { this.form.language = _ref; }, }], @@ -378,12 +379,12 @@ export class FormJndi extends BI.Widget { name: 'APPLET', nameWidth: 200, forms: [{ - type: TextEditor, + type: BI.TextEditor.xtype, $value: 'applet', width: 300, allowBlank: true, value: contextHashtable['java.naming.applet'], - ref: (_ref: any) => { + ref: (_ref: TextEditor) => { this.form.applet = _ref; }, }], diff --git a/src/modules/title/title.ts b/src/modules/title/title.ts index abb89d5..7195d81 100644 --- a/src/modules/title/title.ts +++ b/src/modules/title/title.ts @@ -1,9 +1,10 @@ -import { LeftRightVerticalAdapt, VerticalAdapt, LinearSegment, Tab } from 'ui'; +import { LeftRightVerticalAdapt, VerticalAdapt } from 'ui'; import { shortcut, store } from '@core/core'; import { TitleModel, TitleModelXtype } from './title.model'; import { PAGE_INDEX } from '@constants/constant'; import { TitleDatabase } from './title_database/title_datebase'; import { TitleMaintain } from './title_maintain/title_maintain'; +import { LinearSegment, Tab } from '@fui/core'; export const TitleXtype = 'dec.dcm.title'; @shortcut(TitleXtype) @@ -12,8 +13,8 @@ export class Title extends BI.Widget { props = { baseCls: 'bi-card', } - tab: any; - linearSegment: any; + tab: Tab; + linearSegment: LinearSegment; model: TitleModel['model']; store: TitleModel['store']; @@ -31,14 +32,14 @@ export class Title extends BI.Widget { items: { left: [ { - type: LinearSegment, + type: BI.LinearSegment.xtype, cls: 'bi-font-bold', height: 40, hgap: 10, layouts: [{ type: VerticalAdapt, }], - ref: (_ref: any) => { + ref: (_ref: LinearSegment) => { this.linearSegment = _ref; }, items: [ @@ -66,10 +67,10 @@ export class Title extends BI.Widget { ], right: [ { - type: Tab, + type: BI.Tab.xtype, height: 40, showIndex: this.model.pageIndex, - ref: (_ref: any) => { + ref: (_ref: Tab) => { this.tab = _ref; }, cardCreator: (index: string) => { diff --git a/src/modules/title/title_database/title_datebase.ts b/src/modules/title/title_database/title_datebase.ts index acda335..61d640b 100644 --- a/src/modules/title/title_database/title_datebase.ts +++ b/src/modules/title/title_database/title_datebase.ts @@ -1,7 +1,8 @@ import { shortcut, store } from '@core/core'; -import { Right, Button, VerticalAdapt } from 'ui'; +import { Right, VerticalAdapt } from 'ui'; import { TitleDatebaseModel, TitleDatebaseModelXtype } from './title_datebase.model'; import { PAGE_INDEX } from '@constants/constant'; +import { Button } from '@fui/core'; export const TitleDatabase = 'dec.dcm.title.datebase'; @@ -11,7 +12,7 @@ export class TitleDatabaseWidget extends BI.Widget { store: TitleDatebaseModel['store']; model: TitleDatebaseModel['model']; - submitButton: any; + submitButton: Button; watch = { datebaseTypeSelected: (datebaseTypeSelected: string) => { @@ -28,7 +29,7 @@ export class TitleDatabaseWidget extends BI.Widget { rgap: 5, items: [ { - type: Button, + type: BI.Button.xtype, $value: 'title-database-cancel', text: BI.i18nText('BI-Basic_Cancel'), level: 'ignore', @@ -37,11 +38,11 @@ export class TitleDatabaseWidget extends BI.Widget { }, }, { - type: Button, + type: BI.Button.xtype, $value: 'title-database-save', text: BI.i18nText('BI-Basic_Save'), disabled: !this.model.datebaseTypeSelected, - ref: (_ref: any) => { + ref: (_ref: Button) => { this.submitButton = _ref; }, handler: () => { diff --git a/src/modules/title/title_maintain/title_maintain.ts b/src/modules/title/title_maintain/title_maintain.ts index d9be407..36b1abc 100644 --- a/src/modules/title/title_maintain/title_maintain.ts +++ b/src/modules/title/title_maintain/title_maintain.ts @@ -1,5 +1,5 @@ import { shortcut, store } from '@core/core'; -import { Right, Button, VerticalAdapt } from 'ui'; +import { Right, VerticalAdapt } from 'ui'; import { TitleMaintainModel, TitleMaintainModelXtype } from './title_maintain.model'; import { PAGE_INDEX } from '@constants/constant'; @@ -18,7 +18,7 @@ export class TitleMaintainWidget extends BI.Widget { rgap: 5, items: [ { - type: Button, + type: BI.Button.xtype, $value: 'title-maintain-cancel', text: BI.i18nText('BI-Basic_Cancel'), level: 'ignore', @@ -29,7 +29,7 @@ export class TitleMaintainWidget extends BI.Widget { }, }, { - type: Button, + type: BI.Button.xtype, $value: 'title-maintain-connection-test', text: BI.i18nText('Dec-Dcm_Connection_Test'), level: 'ignore', @@ -38,7 +38,7 @@ export class TitleMaintainWidget extends BI.Widget { }, }, { - type: Button, + type: BI.Button.xtype, $value: 'title-maintain-save', text: BI.i18nText('BI-Basic_Save'), handler: () => { diff --git a/src/ui/fineui.ts b/src/ui/fineui.ts index 61846f8..6707153 100644 --- a/src/ui/fineui.ts +++ b/src/ui/fineui.ts @@ -1,46 +1,3 @@ -export const Button = 'bi.button'; -export const TextEditor = 'bi.text_editor'; -export const MultiSelectInsertCombo = 'bi.multi_select_insert_combo'; -export const MultiSelectCombo = 'bi.multi_select_combo'; -export const ButtonGroup = 'bi.button_group'; -export const AllValueChooserCombo = 'bi.all_value_chooser_combo'; -export const TextAreaEditor = 'bi.textarea_editor'; -export const MultiSelectItem = 'bi.multi_select_item'; -export const BarPopOver = 'bi.bar_popover'; -export const DynamicDateCombo = 'bi.dynamic_date_combo'; -export const DynamicDateTimeCombo = 'bi.dynamic_date_time_combo'; -export const MultiTreeCombo = 'bi.multi_tree_combo'; -export const RichEditor = 'bi.rich_editor'; -export const NicEditor = 'bi.nic_editor'; -export const Editor = 'bi.editor'; -export const MultiTreePopupView = 'bi.multi_tree_popup_view'; -export const SingleSelectRadioItem = 'bi.single_select_radio_item'; -export const SingleSelectInsertCombo = 'bi.single_select_insert_combo'; -export const SingleSelectCombo = 'bi.single_select_combo'; -export const Tab = 'bi.tab'; -export const DynamicYearMonthCombo = 'bi.dynamic_year_month_combo'; -export const Text = 'bi.text'; -export const Combo = 'bi.combo'; -export const TimeCombo = 'bi.time_combo'; -export const IFrame = 'bi.iframe'; -export const MultiTreeInsertCombo = 'bi.multi_tree_insert_combo'; -export const MultiTreeListCombo = 'bi.multi_tree_list_combo'; -export const MultilayerSingleTreeCombo = 'bi.multilayer_single_tree_combo'; -export const MultilayerSelectTreeCombo = 'bi.multilayer_select_tree_combo'; -export const AsyncTree = 'bi.async_tree'; -export const ListAsyncTree = 'bi.list_async_tree'; -export const MultilayerSingleTreePopup = 'bi.multilayer_single_tree_popup'; -export const MultilayerSelectTreePopup = 'bi.multilayer_select_tree_popup'; -export const IconLabel = 'bi.icon_label'; -export const Radio = 'bi.radio'; -export const LinearSegment = 'bi.linear_segment'; -export const SearchEditor = 'bi.search_editor'; -export const Img = 'bi.img'; -export const BubbleCombo = 'bi.bubble_combo'; -export const TextBubblePopupBarView = 'bi.text_bubble_bar_popup_view'; -export const TextValueCombo = 'bi.text_value_combo'; -export const Loader = 'bi.loader'; -export const EdirotIconCheckCombo = 'bi.editor_icon_check_combo'; // 布局 export const VerticalAdapt = 'bi.vertical_adapt'; export const Vtape = 'bi.vtape'; diff --git a/yarn.lock b/yarn.lock index affe74d..2738bb8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -897,9 +897,9 @@ "@babel/preset-typescript" "7.3.3" "@fui/core@^2.0.0": - version "2.0.20201218162221" - resolved "https://npm.fineres.com/@fui%2fcore/-/core-2.0.20201218162221.tgz#d68bd3b72790c5e54cc9d2888eebc65f63f70c8b" - integrity sha512-o7OVoTOnxjbzbNsb+lh6mH1oQk+vmjetusalcHObIFFE2FBY50cFtH9c0frOq1GOvG/zbSyDJlwsZvEvC0hiXw== + version "2.0.20201221142205" + resolved "https://npm.fineres.com/@fui%2fcore/-/core-2.0.20201221142205.tgz#f3ff66a10df5b38e1955bb4337645a7fef697ef3" + integrity sha512-CaF/s14RnNlNXQi0GD9v4J3TFycTUebZzOIurVpfeR2tqhkKe6G/K7DreQGncVooggbRogrIDMJNVfs+d2nHtA== "@fui/materials@10.0.0-release - 10.0.0-release.99999999999999": version "10.0.0-release.20201218163254" From 529104a32f95969f97e8bb726c273fcbd48db42c Mon Sep 17 00:00:00 2001 From: alan Date: Mon, 21 Dec 2020 16:53:43 +0800 Subject: [PATCH 3/4] =?UTF-8?q?KERNEL-6541=20=E5=BC=95=E7=94=A8=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E8=A7=84=E8=8C=83=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/app.ts | 5 +-- src/modules/components/collapse/collapse.ts | 3 +- src/modules/components/link_button/link.ts | 3 +- .../components/test_status/test_status.ts | 21 +++++------ .../test_status/tip_icon/tip_fail.ts | 9 ++--- .../test_status/tip_icon/tip_icon.ts | 7 ++-- .../components/text_checker/text_checker.ts | 3 +- .../components/form_item/form_item.ts | 5 +-- src/modules/pages/connection/connection.ts | 33 ++++++++--------- .../connection_jdbc/connection_jdbc.ts | 10 ++--- .../connection_jndi/connection_jndi.ts | 16 ++++---- src/modules/pages/connection/list/list.ts | 7 ++-- .../connection/list/list_item/list_item.ts | 8 ++-- .../pages/connection_pool/connection_pool.ts | 13 +++---- .../connection_pool/list_item/list_item.ts | 3 +- .../pages/connection_pool/pool/pool.ts | 21 +++++------ src/modules/pages/database/database.ts | 19 +++++----- .../database/database_type/database_type.ts | 5 +-- .../components/form_item/form_item.ts | 3 +- .../maintain/forms/components/form.jdbc.ts | 37 +++++++++---------- .../maintain/forms/components/form.jndi.ts | 18 ++++----- src/modules/pages/maintain/maintain.ts | 18 ++++----- src/modules/title/title.ts | 5 +-- .../title/title_database/title_datebase.ts | 5 +-- .../title/title_maintain/title_maintain.ts | 5 +-- src/ui/fineui.ts | 20 ---------- src/ui/index.ts | 1 - yarn.lock | 6 +-- 28 files changed, 132 insertions(+), 177 deletions(-) delete mode 100644 src/ui/fineui.ts delete mode 100644 src/ui/index.ts diff --git a/src/modules/app.ts b/src/modules/app.ts index bab0430..759440c 100644 --- a/src/modules/app.ts +++ b/src/modules/app.ts @@ -1,5 +1,4 @@ import { shortcut, store } from '@core/core'; -import { Vtape, Absolute } from 'ui'; import { TitleXtype } from './title/title'; import { PAGE_INDEX } from './constants/constant'; import { ConnectionXtype, DatebaseXtype, MaintainXtype, ConnectionPoolXtype } from './pages'; @@ -25,7 +24,7 @@ export class App extends BI.Widget { render() { return { - type: Vtape, + type: BI.VTapeLayout.xtype, items: [ { el: { @@ -35,7 +34,7 @@ export class App extends BI.Widget { height: 40, }, { - type: Absolute, + type: BI.AbsoluteLayout.xtype, cls: 'bi-background', items: [{ el: { diff --git a/src/modules/components/collapse/collapse.ts b/src/modules/components/collapse/collapse.ts index 7cbff87..45492f3 100644 --- a/src/modules/components/collapse/collapse.ts +++ b/src/modules/components/collapse/collapse.ts @@ -1,4 +1,3 @@ -import { Left } from 'ui'; import { shortcut, store } from '@core/core'; import { CollapseModel, CollapseModelXtype } from './collapse.model'; import { IconLabel } from '@fui/core'; @@ -32,7 +31,7 @@ export class Collapse extends BI.BasicButton { this.store.setCollapse(this.options.isCollapse); return { - type: Left, + type: BI.FloatLeftLayout.xtype, items: [ { type: BI.IconLabel.xtype, diff --git a/src/modules/components/link_button/link.ts b/src/modules/components/link_button/link.ts index ae01a76..b5171af 100644 --- a/src/modules/components/link_button/link.ts +++ b/src/modules/components/link_button/link.ts @@ -1,4 +1,3 @@ -import { CenterAdapt } from 'ui'; import { shortcut } from '@core/core'; import { Label } from '@fui/core'; @@ -21,7 +20,7 @@ export class LinkButton extends BI.BasicButton { render() { return { - type: CenterAdapt, + type: BI.CenterAdaptLayout.xtype, cls: 'bi-high-light', items: [ { diff --git a/src/modules/components/test_status/test_status.ts b/src/modules/components/test_status/test_status.ts index bdb09bb..4d0d94a 100644 --- a/src/modules/components/test_status/test_status.ts +++ b/src/modules/components/test_status/test_status.ts @@ -1,10 +1,9 @@ import { shortcut, store } from '@core/core'; import { TestStatusModelXtype, TestStatusModel } from './test_status.model'; -import { CenterAdapt, Vertical, Left } from 'ui'; import { TEST_STATUS } from '@constants/constant'; import { TipIconXtype } from './tip_icon/tip_icon'; import { TipFailXtype, EVENT_CLOSE, EVENT_RELOAD, EVENT_DETAIL } from './tip_icon/tip_fail'; -import { Label, Tab } from '@fui/core'; +import { FloatLeftLayout, Label, Tab, VerticalLayout } from '@fui/core'; export const TestStatusXtype = 'dec.dcm.components.test_status'; export { EVENT_CLOSE, @@ -29,8 +28,8 @@ export class TestStatus extends BI.Widget { tab: Tab; failMessage: Label; failDriverMessage: Label; - driverLink: any; - detail: any; + driverLink: FloatLeftLayout; + detail: VerticalLayout; watch = { status: (status: string) => { @@ -42,11 +41,11 @@ export class TestStatus extends BI.Widget { const { loadingCls, loadingText, successCls, successText, failCls, failText, retryText } = this.options; return { - type: CenterAdapt, + type: BI.CenterAdaptLayout.xtype, cls: 'bi-z-index-mask', items: [ { - type: Vertical, + type: BI.VerticalLayout.xtype, items: [ { type: BI.Tab.xtype, @@ -105,13 +104,13 @@ export class TestStatus extends BI.Widget { }, }, { - type: Vertical, + type: BI.VerticalLayout.xtype, cls: 'bi-card', invisible: true, bgap: 10, items: [ { - type: Vertical, + type: BI.VerticalLayout.xtype, cls: 'bi-header-background', vgap: 5, hgap: 10, @@ -137,7 +136,7 @@ export class TestStatus extends BI.Widget { }, }, { - type: Left, + type: BI.FloatLeftLayout.xtype, invisible: true, items: [ { @@ -149,14 +148,14 @@ export class TestStatus extends BI.Widget { }, }, ], - ref: (_ref: any) => { + ref: (_ref: FloatLeftLayout) => { this.driverLink = _ref; }, }, ], }, ], - ref: (_ref: any) => { + ref: (_ref: VerticalLayout) => { this.detail = _ref; }, }, diff --git a/src/modules/components/test_status/tip_icon/tip_fail.ts b/src/modules/components/test_status/tip_icon/tip_fail.ts index 4ebf523..26f5dcd 100644 --- a/src/modules/components/test_status/tip_icon/tip_fail.ts +++ b/src/modules/components/test_status/tip_icon/tip_fail.ts @@ -1,6 +1,5 @@ import { shortcut, store } from '@core/core'; import { Button } from '@fui/core'; -import { Vertical, HorizotalAuto, CenterAdapt, VerticalAdapt } from 'ui'; import { TipFailModel, TipFailModelXtype } from './tip_fail.model'; export const TipFailXtype = 'dec.dcm.components.test_status.tip_fail'; export const EVENT_CLOSE = 'EVENT_CLOSE'; @@ -32,13 +31,13 @@ export class TipFail extends BI.Widget { const { tipCls, tipText, retryText } = this.options; return { - type: CenterAdapt, + type: BI.CenterAdaptLayout.xtype, items: [ { - type: Vertical, + type: BI.VerticalLayout.xtype, items: [ { - type: HorizotalAuto, + type: BI.HorizontalAutoLayout.xtype, cls: tipCls, bgap: 20, items: [{ @@ -53,7 +52,7 @@ export class TipFail extends BI.Widget { text: tipText, }, { - type: VerticalAdapt, + type: BI.VerticalAdaptLayout.xtype, hgap: 5, items: [ { diff --git a/src/modules/components/test_status/tip_icon/tip_icon.ts b/src/modules/components/test_status/tip_icon/tip_icon.ts index cd176d6..ea23ed3 100644 --- a/src/modules/components/test_status/tip_icon/tip_icon.ts +++ b/src/modules/components/test_status/tip_icon/tip_icon.ts @@ -1,5 +1,4 @@ import { shortcut } from '@core/core'; -import { Vertical, HorizotalAuto, CenterAdapt } from 'ui'; export const TipIconXtype = 'dec.dcm.components.test_status.tip_icon'; @shortcut(TipIconXtype) export class TipIcon extends BI.Widget { @@ -11,13 +10,13 @@ export class TipIcon extends BI.Widget { const { tipCls, tipText } = this.options; return { - type: CenterAdapt, + type: BI.CenterAdaptLayout.xtype, items: [ { - type: Vertical, + type: BI.VerticalLayout.xtype, items: [ { - type: HorizotalAuto, + type: BI.HorizontalAutoLayout.xtype, cls: tipCls, bgap: 20, items: [{ diff --git a/src/modules/components/text_checker/text_checker.ts b/src/modules/components/text_checker/text_checker.ts index 8a95649..12a2de3 100644 --- a/src/modules/components/text_checker/text_checker.ts +++ b/src/modules/components/text_checker/text_checker.ts @@ -1,6 +1,5 @@ import { shortcut } from '@core/core'; import { Label, TextEditor } from '@fui/core'; -import { Absolute } from 'ui'; export const TextCheckerXtype = 'dec.dcm.components.text_checker'; @shortcut(TextCheckerXtype) export class TextChecker extends BI.Widget { @@ -32,7 +31,7 @@ export class TextChecker extends BI.Widget { this.value = value; return { - type: Absolute, + type: BI.AbsoluteLayout.xtype, width, height: 20, items: [{ diff --git a/src/modules/pages/connection/components/form_item/form_item.ts b/src/modules/pages/connection/components/form_item/form_item.ts index ee0c0be..6effde3 100644 --- a/src/modules/pages/connection/components/form_item/form_item.ts +++ b/src/modules/pages/connection/components/form_item/form_item.ts @@ -1,5 +1,4 @@ import { shortcut } from '@core/core'; -import { Htape, Vertical } from 'ui'; export const FormItemXtype = 'dec.dcm.connection_form_item'; @shortcut(FormItemXtype) export class FormItem extends BI.Widget { @@ -16,7 +15,7 @@ export class FormItem extends BI.Widget { const { nameWidth, unit, value } = this.options; return { - type: Htape, + type: BI.HTapeLayout.xtype, height: 17, items: [ { @@ -29,7 +28,7 @@ export class FormItem extends BI.Widget { width: nameWidth, }, { - type: Vertical, + type: BI.VerticalLayout.xtype, items: [ { type: BI.Label.xtype, diff --git a/src/modules/pages/connection/connection.ts b/src/modules/pages/connection/connection.ts index c00be92..eda7acd 100644 --- a/src/modules/pages/connection/connection.ts +++ b/src/modules/pages/connection/connection.ts @@ -1,4 +1,3 @@ -import { Htape, Vtape, VerticalAdapt, ListView, CenterAdapt, Layout } from 'ui'; import { shortcut, store } from '@core/core'; import { ConnectionModel, ConnectionModelXtype } from './connection.model'; import { PAGE_INDEX } from '@constants/constant'; @@ -9,7 +8,7 @@ import { ConnectionPluginXtype } from './connection_plugin/connection_plugin'; import { connectionType } from '@constants/env'; import { getAllDatabaseTypes, connectionCanEdit, getJdbcDatabaseType, getTextByDatabaseType } from '../../app.service'; import { ConnectionJDBC } from '../../crud/crud.typings'; -import { Button, Label } from '@fui/core'; +import { Button, HTapeLayout, Label, ListView } from '@fui/core'; export const ConnectionXtype = 'dec.dcm.connection'; @shortcut(ConnectionXtype) @@ -20,8 +19,8 @@ export class Connection extends BI.Widget { connectionTitleWidget: Label; connectionEditWidget: Button; - listView: any; - title: any; + listView: ListView; + title: HTapeLayout; watch = { connectionSelected:(name: string) => { @@ -49,18 +48,18 @@ export class Connection extends BI.Widget { this.store.setConnectionSelected(''); return { - type: Htape, + type: BI.HTapeLayout.xtype, hgap: 10, items: [ { el: { - type: Vtape, + type: BI.VTapeLayout.xtype, cls: 'bi-border-right', rgap: 10, items: [ { el: { - type: VerticalAdapt, + type: BI.VerticalAdaptLayout.xtype, cls: 'bi-border-bottom', items: [{ type: BI.Button.xtype, @@ -81,12 +80,12 @@ export class Connection extends BI.Widget { width: 275, }, { - type: Vtape, + type: BI.VTapeLayout.xtype, items: [ { el: { - type: Htape, - ref: (_ref: any) => { + type: BI.HTapeLayout.xtype, + ref: (_ref: HTapeLayout) => { this.title = _ref; }, cls: 'bi-border-bottom', @@ -100,7 +99,7 @@ export class Connection extends BI.Widget { }, { el: { - type: VerticalAdapt, + type: BI.VerticalAdaptLayout.xtype, items: [{ type: BI.Button.xtype, $value: 'connection-edit', @@ -125,8 +124,8 @@ export class Connection extends BI.Widget { height: 40, }, { - type: ListView, - ref: (_ref: any) => { + type: BI.ListView.xtype, + ref: (_ref: ListView) => { this.listView = _ref; }, }, @@ -159,17 +158,17 @@ export class Connection extends BI.Widget { private renderNoRegistered() { return [{ - type: CenterAdapt, + type: BI.CenterAdaptLayout.xtype, height: 500, items: [ { - type: Vtape, + type: BI.VTapeLayout.xtype, width: 300, height: 150, items: [ { el: { - type: Layout, + type: BI.Layout.xtype, cls: 'error-page-background', }, height: 130, @@ -187,7 +186,7 @@ export class Connection extends BI.Widget { private renderEmpty() { return [{ - type: Layout, + type: BI.Layout.xtype, }]; } diff --git a/src/modules/pages/connection/connection_jdbc/connection_jdbc.ts b/src/modules/pages/connection/connection_jdbc/connection_jdbc.ts index 9d5aa8c..c3da8c9 100644 --- a/src/modules/pages/connection/connection_jdbc/connection_jdbc.ts +++ b/src/modules/pages/connection/connection_jdbc/connection_jdbc.ts @@ -1,11 +1,11 @@ import { shortcut, store } from '@core/core'; -import { Vertical, Layout } from 'ui'; import { FormItemXtype } from '../components/form_item/form_item'; import { CollapseXtype, EVENT_CHANGE } from 'src/modules/components/collapse/collapse'; import { ConnectionJdbcModelXtype, ConnectionJdecModel } from './connection_jdbc.model'; import { ConnectionJDBC } from 'src/modules/crud/crud.typings'; import { getAllDatabaseTypes, getJdbcDatabaseType, resolveUrlInfo } from '../../../app.service'; import { CONNECTION_LAYOUT } from '@constants/constant'; +import { VerticalLayout } from '@fui/core'; export const ConnectionJdbcXtype = 'dec.dcm.connection_jdbc'; @shortcut(ConnectionJdbcXtype) @store(ConnectionJdbcModelXtype) @@ -23,7 +23,7 @@ export class ConnectionJdbc extends BI.Widget { const { hgap, vgap } = CONNECTION_LAYOUT; return { - type: Vertical, + type: BI.VerticalLayout.xtype, hgap, vgap, items: [ @@ -53,7 +53,7 @@ export class ConnectionJdbc extends BI.Widget { name: BI.i18nText('Dec-Dcm_Connection_Form_AuthType'), value: authType, } : { - type: Layout, + type: BI.Layout.xtype, }, { type: FormItemXtype, @@ -95,11 +95,11 @@ export class ConnectionJdbc extends BI.Widget { ], }, { - type: Vertical, + type: BI.VerticalLayout.xtype, tgap: -15, vgap, invisible: true, - ref: (_ref: any) => { + ref: (_ref: VerticalLayout) => { this.advancedSet = _ref; }, items: [ diff --git a/src/modules/pages/connection/connection_jndi/connection_jndi.ts b/src/modules/pages/connection/connection_jndi/connection_jndi.ts index 3827f6c..327ea77 100644 --- a/src/modules/pages/connection/connection_jndi/connection_jndi.ts +++ b/src/modules/pages/connection/connection_jndi/connection_jndi.ts @@ -1,10 +1,10 @@ import { shortcut, store } from '@core/core'; -import { Vertical, Htape, Left } from 'ui'; import { FormItemXtype } from '../components/form_item/form_item'; import { ConnectionJndiModelXtype, ConnectionJndiModel } from './connection_jndi.model'; import { ConnectionJNDI } from 'src/modules/crud/crud.typings'; import { CollapseXtype, EVENT_CHANGE } from 'src/modules/components/collapse/collapse'; import { CONNECTION_LAYOUT } from '@constants/constant'; +import { VerticalLayout } from '@fui/core'; export const ConnectionJndiXtype = 'dec.dcm.connection_jndi'; @shortcut(ConnectionJndiXtype) @@ -12,7 +12,7 @@ export const ConnectionJndiXtype = 'dec.dcm.connection_jndi'; export class ConnectionJdbc extends BI.Widget { model: ConnectionJndiModel['model']; - advancedSet: any; + advancedSet: VerticalLayout; render() { const connectionData = this.model.connectionSelectedOne.connectionData as ConnectionJNDI; @@ -20,7 +20,7 @@ export class ConnectionJdbc extends BI.Widget { const { hgap, vgap } = CONNECTION_LAYOUT; return { - type: Vertical, + type: BI.VerticalLayout.xtype, $testId: 'dec-dcm-connection-jndi', hgap, vgap, @@ -32,12 +32,12 @@ export class ConnectionJdbc extends BI.Widget { value: jndiName, }, { - type: Htape, + type: BI.HTapeLayout.xtype, height: 115, items: [ { el: { - type: Left, + type: BI.FloatLeftLayout.xtype, items: [ { type: BI.Label.xtype, @@ -50,7 +50,7 @@ export class ConnectionJdbc extends BI.Widget { width: 200, }, { - type: Vertical, + type: BI.VerticalLayout.xtype, bgap: 15, height: 115, items: [ @@ -107,11 +107,11 @@ export class ConnectionJdbc extends BI.Widget { ], }, { - type: Vertical, + type: BI.VerticalLayout.xtype, vgap, tgap: -15, invisible: true, - ref: (_ref: any) => { + ref: (_ref: VerticalLayout) => { this.advancedSet = _ref; }, items: [ diff --git a/src/modules/pages/connection/list/list.ts b/src/modules/pages/connection/list/list.ts index 21ec40e..2ddfa94 100644 --- a/src/modules/pages/connection/list/list.ts +++ b/src/modules/pages/connection/list/list.ts @@ -1,5 +1,4 @@ import { shortcut, store } from '@core/core'; -import { CenterAdapt, Layout, Vtape } from 'ui'; import { ListItemXtype } from './list_item/list_item'; import { ConnectionListModel, ConnectionListModelXtype } from './list.model'; import { getDatabaseType } from './list.service'; @@ -42,16 +41,16 @@ export class ConnectionList extends BI.LoadingPane { cardCreator: (index: 'list' | 'none') => { if (index === 'none') { return { - type: CenterAdapt, + type: BI.CenterAdaptLayout.xtype, items: [ { - type: Vtape, + type: BI.VTapeLayout.xtype, width: 260, height: 150, items: [ { el: { - type: Layout, + type: BI.Layout.xtype, cls: 'data-connection-background', }, height: 130, diff --git a/src/modules/pages/connection/list/list_item/list_item.ts b/src/modules/pages/connection/list/list_item/list_item.ts index ff75a43..41b06f0 100644 --- a/src/modules/pages/connection/list/list_item/list_item.ts +++ b/src/modules/pages/connection/list/list_item/list_item.ts @@ -1,5 +1,4 @@ import { shortcut, store } from '@core/core'; -import { Layout, Htape, Vertical } from 'ui'; import './list_item.less'; import { ListItemModel, ListItemModelXtype } from './list_item.model'; import { PAGE_INDEX } from '@constants/constant'; @@ -24,7 +23,6 @@ export class ListItem extends BI.BasicButton { store: ListItemModel['store']; model: ListItemModel['model']; - comboWidget: any; nameLabel: Label; nameEditor: SignEditor; downListCombo: DownListCombo; @@ -43,7 +41,7 @@ export class ListItem extends BI.BasicButton { const { name, databaseType } = this.options; return { - type: Htape, + type: BI.HTapeLayout.xtype, $scope: name, items: [{ el: { @@ -53,7 +51,7 @@ export class ListItem extends BI.BasicButton { }, width: 25, }, { - type: Vertical, + type: BI.VerticalLayout.xtype, items: [ { type: BI.Label.xtype, @@ -131,7 +129,7 @@ export class ListItem extends BI.BasicButton { }], } : { - type: Layout, + type: BI.Layout.xtype, }, width: 25, }], diff --git a/src/modules/pages/connection_pool/connection_pool.ts b/src/modules/pages/connection_pool/connection_pool.ts index 7c0e441..0bb76f5 100644 --- a/src/modules/pages/connection_pool/connection_pool.ts +++ b/src/modules/pages/connection_pool/connection_pool.ts @@ -1,5 +1,4 @@ import { shortcut, store } from '@core/core'; -import { Htape, Vtape, Layout, CenterAdapt } from 'ui'; import { ConnectionPoolModel, ConnectionPoolModelXtype } from './connection_pool.model'; import { ListItemXtype } from './list_item/list_item'; import { PoolXtype } from './pool/pool'; @@ -31,11 +30,11 @@ export class ConnectionPool extends BI.Widget { } return { - type: Htape, + type: BI.HTapeLayout.xtype, items: [ { el: { - type: Vtape, + type: BI.VTapeLayout.xtype, cls: 'bi-border-right', items: [ { @@ -66,7 +65,7 @@ export class ConnectionPool extends BI.Widget { private renderPool() { return { - type: Vtape, + type: BI.VTapeLayout.xtype, items: [ { el: { @@ -89,16 +88,16 @@ export class ConnectionPool extends BI.Widget { private renderNoConnection() { return { - type: CenterAdapt, + type: BI.CenterAdaptLayout.xtype, items: [ { - type: Vtape, + type: BI.VTapeLayout.xtype, width: 260, height: 150, items: [ { el: { - type: Layout, + type: BI.Layout.xtype, cls: 'data-connection-background', }, height: 130, diff --git a/src/modules/pages/connection_pool/list_item/list_item.ts b/src/modules/pages/connection_pool/list_item/list_item.ts index c2498a6..fa9c9e0 100644 --- a/src/modules/pages/connection_pool/list_item/list_item.ts +++ b/src/modules/pages/connection_pool/list_item/list_item.ts @@ -1,5 +1,4 @@ import { shortcut, store } from '@core/core'; -import { VerticalAdapt } from 'ui'; import { ListItemModel, ListItemModelXtype } from './list_item.model'; export const ListItemXtype = 'dec.dcm.connection_pool.list_item'; @shortcut(ListItemXtype) @@ -16,7 +15,7 @@ export class ListItem extends BI.BasicButton { render() { return { - type: VerticalAdapt, + type: BI.VerticalAdaptLayout.xtype, lgap: 5, items: [ { diff --git a/src/modules/pages/connection_pool/pool/pool.ts b/src/modules/pages/connection_pool/pool/pool.ts index 21d3fec..018acef 100644 --- a/src/modules/pages/connection_pool/pool/pool.ts +++ b/src/modules/pages/connection_pool/pool/pool.ts @@ -1,6 +1,5 @@ import { shortcut, store } from '@core/core'; import { PoolModel, PoolModelXtype } from './pool.model'; -import { FloatCenter, Vertical, CenterAdapt, VerticalAdapt } from 'ui'; import './pool.less'; import { ConnectionPoolType } from '../../../crud/crud.typings'; import { Label } from '@fui/core'; @@ -31,28 +30,28 @@ export class Pool extends BI.Widget { render() { return { - type: Vertical, + type: BI.VerticalLayout.xtype, items: [ { - type: FloatCenter, + type: BI.FloatCenterLayout.xtype, hgap: 20, vgap: 10, height: 200, items: [ { el: { - type: CenterAdapt, + type: BI.CenterAdaptLayout.xtype, cls: 'bi-background', items: [ { - type: Vertical, + type: BI.VerticalLayout.xtype, cls: 'right-status-board-item', items: [ { - type: CenterAdapt, + type: BI.CenterAdaptLayout.xtype, items: [ { - type: VerticalAdapt, + type: BI.VerticalAdaptLayout.xtype, items: [ { type: BI.Label.xtype, @@ -89,18 +88,18 @@ export class Pool extends BI.Widget { }, }, { - type: CenterAdapt, + type: BI.CenterAdaptLayout.xtype, cls: 'bi-background', items: [ { - type: Vertical, + type: BI.VerticalLayout.xtype, cls: 'right-status-board-item', items: [ { - type: CenterAdapt, + type: BI.CenterAdaptLayout.xtype, items: [ { - type: VerticalAdapt, + type: BI.VerticalAdaptLayout.xtype, items: [ { type: BI.Label.xtype, diff --git a/src/modules/pages/database/database.ts b/src/modules/pages/database/database.ts index 74e4752..2793e5d 100644 --- a/src/modules/pages/database/database.ts +++ b/src/modules/pages/database/database.ts @@ -1,4 +1,3 @@ -import { Vtape, Right, Htape, Vertical, Left, CenterAdapt } from 'ui'; import { shortcut, store } from '@core/core'; import { FilterXtype } from './filter/filter'; import { DatebaseModel, DatebaseModelXtype } from './database.model'; @@ -69,16 +68,16 @@ export class Datebase extends BI.Widget { render() { return { - type: Vtape, + type: BI.VTapeLayout.xtype, vgap: 10, hgap: 10, items: [ { el: { - type: Vertical, + type: BI.VerticalLayout.xtype, items: [ { - type: Right, + type: BI.FloatRightLayout.xtype, items: [ { type: BI.SearchEditor.xtype, @@ -104,14 +103,14 @@ export class Datebase extends BI.Widget { height: 25, }, { - type: Htape, + type: BI.HTapeLayout.xtype, items: [ { el: { type: BI.ButtonGroup.xtype, cls: 'bi-border-right', layouts: [{ - type: Vertical, + type: BI.VerticalLayout.xtype, }], ref: (_ref: ButtonGroup) => { this.filter = _ref; @@ -138,11 +137,11 @@ export class Datebase extends BI.Widget { width: 200, }, { - type: Vtape, + type: BI.VTapeLayout.xtype, items: [ { el: { - type: Htape, + type: BI.HTapeLayout.xtype, hgap: 20, invisible: true, items: [ @@ -197,7 +196,7 @@ export class Datebase extends BI.Widget { type: BI.ButtonGroup.xtype, hgap: 15, layouts: [{ - type: Left, + type: BI.FloatLeftLayout.xtype, scrolly: true, }], items: this.renderDatebaseType(), @@ -233,7 +232,7 @@ export class Datebase extends BI.Widget { private renderNoResult() { return [{ - type: CenterAdapt, + type: BI.CenterAdaptLayout.xtype, height: '100%', width: '100%', items: [{ diff --git a/src/modules/pages/database/database_type/database_type.ts b/src/modules/pages/database/database_type/database_type.ts index 075a800..7a99798 100644 --- a/src/modules/pages/database/database_type/database_type.ts +++ b/src/modules/pages/database/database_type/database_type.ts @@ -1,5 +1,4 @@ import { shortcut, store } from '@core/core'; -import { Vtape, Absolute } from 'ui'; import { DatebaseTypeModel, DatebaseTypeModelXtype } from './database_type.model'; import { ImgPrefix, PluginImgPrefix } from '@constants/env'; import './database_type.less'; @@ -31,11 +30,11 @@ export class DatebaseType extends BI.BasicButton { const { text, keyword, databaseType, iconUrl } = this.options; return { - type: Absolute, + type: BI.AbsoluteLayout.xtype, items: [ { el: { - type: Vtape, + type: BI.VTapeLayout.xtype, cls: 'bi-list-item-active bi-border', items: [ { diff --git a/src/modules/pages/maintain/components/form_item/form_item.ts b/src/modules/pages/maintain/components/form_item/form_item.ts index 11e91d6..d8cedf7 100644 --- a/src/modules/pages/maintain/components/form_item/form_item.ts +++ b/src/modules/pages/maintain/components/form_item/form_item.ts @@ -1,5 +1,4 @@ import { shortcut } from '@core/core'; -import { Left } from 'ui'; import { CONNECTION_LAYOUT } from '@constants/constant'; export const FormItemXtype = 'dec.dcm.Maintain_form_item'; @shortcut(FormItemXtype) @@ -14,7 +13,7 @@ export class FormItem extends BI.Widget { render () { return { - type: Left, + type: BI.FloatLeftLayout.xtype, items: [ { type: BI.Label.xtype, diff --git a/src/modules/pages/maintain/forms/components/form.jdbc.ts b/src/modules/pages/maintain/forms/components/form.jdbc.ts index f6622d9..b9c1f16 100644 --- a/src/modules/pages/maintain/forms/components/form.jdbc.ts +++ b/src/modules/pages/maintain/forms/components/form.jdbc.ts @@ -1,5 +1,4 @@ import { shortcut } from '@core/core'; -import { Vertical, Left, Layout } from 'ui'; import { CollapseXtype, EVENT_CHANGE } from 'src/modules/components/collapse/collapse'; import { FormItemXtype } from '../../components/form_item/form_item'; import { Connection, ConnectionJDBC, ConnectionPoolJDBC } from 'src/modules/crud/crud.typings'; @@ -8,7 +7,8 @@ import { CONNECT_CHARSET, CONNECTION_LAYOUT, INT_MAX_VALUE, INT_MIN_VALUE } from import { getAllDatabaseTypes, getJdbcDatabaseType, resolveUrlInfo, splitUrl } from '../../../../app.service'; import { TextCheckerXtype } from '../../../../components/text_checker/text_checker'; import { ApiFactory } from 'src/modules/crud/apiFactory'; -import { Editor, EditorIconCheckCombo, Label, TextAreaEditor, TextEditor, TextValueCombo } from '@fui/core'; +import { Editor, EditorIconCheckCombo, Label, TextAreaEditor, TextEditor, TextValueCombo, VerticalLayout } from '@fui/core'; +import { FormItem } from '../../../connection/components/form_item/form_item'; const api = new ApiFactory().create(); export const FormJdbcXtype = 'dec.dcm.maintain.form.jdbc'; @@ -21,13 +21,12 @@ export class FormJdbc extends BI.Widget { oldPassword = ''; allDatabaseTypes = getAllDatabaseTypes(); - testStatus: any; - advancedSet: any; - formUser: any; - formPassword: any; - formPrincipal: any; - formKeyPath: any; - labelTips: any; + advancedSet: VerticalLayout; + formUser: FormItem; + formPassword: FormItem; + formPrincipal: FormItem; + formKeyPath: FormItem; + labelTips: Label; form = { connectionName: null, @@ -73,7 +72,7 @@ export class FormJdbc extends BI.Widget { }; return { - type: Vertical, + type: BI.VerticalLayout.xtype, hgap, vgap, items: [ @@ -230,7 +229,7 @@ export class FormJdbc extends BI.Widget { type: FormItemXtype, name: BI.i18nText('Dec-Dcm_Connection_Form_UserName'), invisible: !!authType, - ref: (_ref: any) => { + ref: (_ref: FormItem) => { this.formUser = _ref; }, forms: [{ @@ -249,7 +248,7 @@ export class FormJdbc extends BI.Widget { type: FormItemXtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Password'), invisible: !!authType, - ref: (_ref: any) => { + ref: (_ref: FormItem) => { this.formPassword = _ref; }, forms: [{ @@ -272,7 +271,7 @@ export class FormJdbc extends BI.Widget { type: FormItemXtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Principal'), invisible: !authType, - ref: (_ref: any) => { + ref: (_ref: FormItem) => { this.formPrincipal = _ref; }, forms: [{ @@ -291,7 +290,7 @@ export class FormJdbc extends BI.Widget { type: FormItemXtype, name: BI.i18nText('Dec-Dcm_Connection_Form_KeyPath'), invisible: !authType, - ref: (_ref: any) => { + ref: (_ref: FormItem) => { this.formKeyPath = _ref; }, forms: [{ @@ -338,9 +337,9 @@ export class FormJdbc extends BI.Widget { height: 64, name: BI.i18nText('Dec-Dcm_Connection_Form_Pattern'), forms: [{ - type: Vertical, + type: BI.VerticalLayout.xtype, items: [{ - type: Left, + type: BI.FloatLeftLayout.xtype, items: [{ type: BI.TextButton.xtype, cls: 'bi-high-light', @@ -369,7 +368,7 @@ export class FormJdbc extends BI.Widget { }], }, { - type: Layout, + type: BI.Layout.xtype, cls: 'bi-border-top', bgap: 8, }, @@ -412,11 +411,11 @@ export class FormJdbc extends BI.Widget { ], }, { - type: Vertical, + type: BI.VerticalLayout.xtype, vgap, tgap: -15, invisible: true, - ref: (_ref: any) => { + ref: (_ref: VerticalLayout) => { this.advancedSet = _ref; }, items: [ diff --git a/src/modules/pages/maintain/forms/components/form.jndi.ts b/src/modules/pages/maintain/forms/components/form.jndi.ts index 3995c9c..80b1ea3 100644 --- a/src/modules/pages/maintain/forms/components/form.jndi.ts +++ b/src/modules/pages/maintain/forms/components/form.jndi.ts @@ -1,20 +1,18 @@ import { shortcut } from '@core/core'; -import { Vertical, Htape, Left } from 'ui'; import { FormItemXtype } from '../../components/form_item/form_item'; import { ConnectionJNDI, Connection, ContextHashtable } from 'src/modules/crud/crud.typings'; import { CONNECT_CHARSET, CONNECTION_LAYOUT, JNDI_FACTORYS } from '@constants/constant'; import { CollapseXtype, EVENT_CHANGE } from 'src/modules/components/collapse/collapse'; import { connectionType } from '@constants/env'; import { TextCheckerXtype } from '../../../../components/text_checker/text_checker'; -import { EditorIconCheckCombo, TextEditor, TextValueCombo } from '@fui/core'; +import { EditorIconCheckCombo, TextEditor, TextValueCombo, VerticalLayout } from '@fui/core'; export const FormJndiXtype = 'dec.dcm.maintain.form.jndi'; @shortcut(FormJndiXtype) export class FormJndi extends BI.Widget { props = { formData: {} as Connection, } - advancedSet: any; - testStatus: any; + advancedSet: VerticalLayout; form = { connectionName: null, jndiName: null, @@ -42,7 +40,7 @@ export class FormJndi extends BI.Widget { const { hgap, vgap } = CONNECTION_LAYOUT; return { - type: Vertical, + type: BI.VerticalLayout.xtype, hgap, vgap, items: [ @@ -76,12 +74,12 @@ export class FormJndi extends BI.Widget { }], }, { - type: Htape, + type: BI.HTapeLayout.xtype, height: 175, items: [ { el: { - type: Left, + type: BI.FloatLeftLayout.xtype, items: [ { type: BI.Label.xtype, @@ -94,7 +92,7 @@ export class FormJndi extends BI.Widget { width: 200, }, { - type: Vertical, + type: BI.VerticalLayout.xtype, bgap: 15, height: 175, items: [ @@ -216,11 +214,11 @@ export class FormJndi extends BI.Widget { ], }, { - type: Vertical, + type: BI.VerticalLayout.xtype, vgap, tgap: -15, invisible: true, - ref: (_ref: any) => { + ref: (_ref: VerticalLayout) => { this.advancedSet = _ref; }, items: [ diff --git a/src/modules/pages/maintain/maintain.ts b/src/modules/pages/maintain/maintain.ts index b3a558d..83d25a9 100644 --- a/src/modules/pages/maintain/maintain.ts +++ b/src/modules/pages/maintain/maintain.ts @@ -1,8 +1,7 @@ -import { Vtape, VerticalAdapt, ListView } from 'ui'; import { shortcut, store } from '@core/core'; import { MaintainModel, MaintainModelXtype } from './maintain.model'; import { MaintainFormXtype } from './forms/form'; -import { LinkXtype } from 'src/modules/components/link_button/link'; +import { LinkXtype, LinkButton } from 'src/modules/components/link_button/link'; import { PAGE_INDEX } from '@constants/constant'; import { ApiFactory } from 'src/modules/crud/apiFactory'; const api = new ApiFactory().create(); @@ -10,6 +9,7 @@ import './maintain.less'; import { connectionType } from '@constants/env'; import { getJdbcDatabaseType, getTextByDatabaseType } from '../../app.service'; import { ConnectionJDBC } from 'src/modules/crud/crud.typings'; +import { ListView } from '@fui/core'; export const MaintainXtype = 'dec.dcm.maintain'; @shortcut(MaintainXtype) @@ -18,19 +18,19 @@ export class Maintain extends BI.Widget { model: MaintainModel['model']; store: MaintainModel['store']; - listView: any; - socketTip: any; + listView: ListView; + socketTip: LinkButton; render() { const { isEdit, databaseType } = this.getEditConnection(); const titleText = getTextByDatabaseType(databaseType); return { - type: Vtape, + type: BI.VTapeLayout.xtype, hgap: 5, items: [ { - type: VerticalAdapt, + type: BI.VerticalAdaptLayout.xtype, cls: 'bi-border-bottom', height: 40, hgap: 5, @@ -56,15 +56,15 @@ export class Maintain extends BI.Widget { lgap: 10, text: BI.i18nText('Dec-Dcm_Socket_Unable_Connect_Tip'), link: api.getHyperlink(DecCst.Hyperlink.WEBSOCKET_CONNECT), - ref: (_ref: any) => { + ref: (_ref: LinkButton) => { this.socketTip = _ref; }, }, ], }, { - type: ListView, - ref: (_ref: any) => { + type: BI.ListView.xtype, + ref: (_ref: ListView) => { this.listView = _ref; }, items: this.renderItems(), diff --git a/src/modules/title/title.ts b/src/modules/title/title.ts index 7195d81..32ba5b7 100644 --- a/src/modules/title/title.ts +++ b/src/modules/title/title.ts @@ -1,4 +1,3 @@ -import { LeftRightVerticalAdapt, VerticalAdapt } from 'ui'; import { shortcut, store } from '@core/core'; import { TitleModel, TitleModelXtype } from './title.model'; import { PAGE_INDEX } from '@constants/constant'; @@ -28,7 +27,7 @@ export class Title extends BI.Widget { render() { return { - type: LeftRightVerticalAdapt, + type: BI.LeftRightVerticalAdaptLayout.xtype, items: { left: [ { @@ -37,7 +36,7 @@ export class Title extends BI.Widget { height: 40, hgap: 10, layouts: [{ - type: VerticalAdapt, + type: BI.VerticalAdaptLayout.xtype, }], ref: (_ref: LinearSegment) => { this.linearSegment = _ref; diff --git a/src/modules/title/title_database/title_datebase.ts b/src/modules/title/title_database/title_datebase.ts index 61d640b..c8274c1 100644 --- a/src/modules/title/title_database/title_datebase.ts +++ b/src/modules/title/title_database/title_datebase.ts @@ -1,5 +1,4 @@ import { shortcut, store } from '@core/core'; -import { Right, VerticalAdapt } from 'ui'; import { TitleDatebaseModel, TitleDatebaseModelXtype } from './title_datebase.model'; import { PAGE_INDEX } from '@constants/constant'; import { Button } from '@fui/core'; @@ -22,9 +21,9 @@ export class TitleDatabaseWidget extends BI.Widget { render() { return { - type: Right, + type: BI.FloatRightLayout.xtype, items: [{ - type: VerticalAdapt, + type: BI.VerticalAdaptLayout.xtype, height: 40, rgap: 5, items: [ diff --git a/src/modules/title/title_maintain/title_maintain.ts b/src/modules/title/title_maintain/title_maintain.ts index 36b1abc..c7e9150 100644 --- a/src/modules/title/title_maintain/title_maintain.ts +++ b/src/modules/title/title_maintain/title_maintain.ts @@ -1,5 +1,4 @@ import { shortcut, store } from '@core/core'; -import { Right, VerticalAdapt } from 'ui'; import { TitleMaintainModel, TitleMaintainModelXtype } from './title_maintain.model'; import { PAGE_INDEX } from '@constants/constant'; @@ -11,9 +10,9 @@ export class TitleMaintainWidget extends BI.Widget { model: TitleMaintainModel['model']; render() { return { - type: Right, + type: BI.FloatRightLayout.xtype, items: [{ - type: VerticalAdapt, + type: BI.VerticalAdaptLayout.xtype, height: 40, rgap: 5, items: [ diff --git a/src/ui/fineui.ts b/src/ui/fineui.ts deleted file mode 100644 index 6707153..0000000 --- a/src/ui/fineui.ts +++ /dev/null @@ -1,20 +0,0 @@ -// 布局 -export const VerticalAdapt = 'bi.vertical_adapt'; -export const Vtape = 'bi.vtape'; -export const CenterAdapt = 'bi.center_adapt'; -export const Htape = 'bi.htape'; -export const Layout = 'bi.layout'; -export const Absolute = 'bi.absolute'; -export const Vertical = 'bi.vertical'; -export const Left = 'bi.left'; -export const Right = 'bi.right'; -export const HorizontalAdapt = 'bi.horizontal_adapt'; -export const AbsoluteCenterAdapt = 'bi.absolute_center_adapt'; -export const TableAdapt = 'bi.table_adapt'; -export const RightVerticalAdapt = 'bi.right_vertical_adapt'; -export const LeftRightVerticalAdapt = 'bi.left_right_vertical_adapt'; -export const ListView = 'bi.list_view'; -export const VirtualGroup = 'bi.virtual_group'; -export const HorizotalAuto = 'bi.horizontal_auto'; -export const Horizotal = 'bi.horizontal'; -export const FloatCenter = 'bi.float_center'; diff --git a/src/ui/index.ts b/src/ui/index.ts deleted file mode 100644 index bf6e617..0000000 --- a/src/ui/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './fineui'; diff --git a/yarn.lock b/yarn.lock index 2738bb8..813bbc4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -897,9 +897,9 @@ "@babel/preset-typescript" "7.3.3" "@fui/core@^2.0.0": - version "2.0.20201221142205" - resolved "https://npm.fineres.com/@fui%2fcore/-/core-2.0.20201221142205.tgz#f3ff66a10df5b38e1955bb4337645a7fef697ef3" - integrity sha512-CaF/s14RnNlNXQi0GD9v4J3TFycTUebZzOIurVpfeR2tqhkKe6G/K7DreQGncVooggbRogrIDMJNVfs+d2nHtA== + version "2.0.20201221165218" + resolved "https://npm.fineres.com/@fui%2fcore/-/core-2.0.20201221165218.tgz#e63cb4ae91769b86e17915cc3a967ea9ae73863e" + integrity sha512-36cgFA80I2xOE5euK/KRuXOsZmd/2QpVJhjv4E6vzs4mrTg8UQlPk1oxtx+CU9/eBstBCrJ50/1z7fQLx+oqnA== "@fui/materials@10.0.0-release - 10.0.0-release.99999999999999": version "10.0.0-release.20201218163254" From 9365a41799258eadda10c8da428bf9b735075628 Mon Sep 17 00:00:00 2001 From: alan Date: Wed, 23 Dec 2020 10:31:10 +0800 Subject: [PATCH 4/4] =?UTF-8?q?KERNEL-6541=20=E4=BF=AE=E6=94=B9xtype?= =?UTF-8?q?=E5=86=99=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/index.ts | 4 +- src/modules/app.model.ts | 7 +- src/modules/app.ts | 28 +++-- .../components/collapse/collapse.model.ts | 5 +- src/modules/components/collapse/collapse.ts | 9 +- src/modules/components/link_button/link.ts | 5 +- .../test_status/test_status.model.ts | 5 +- .../components/test_status/test_status.ts | 35 +++--- .../test_status/tip_icon/tip_fail.model.ts | 6 +- .../test_status/tip_icon/tip_fail.ts | 23 ++-- .../test_status/tip_icon/tip_icon.ts | 5 +- .../components/text_checker/text_checker.ts | 6 +- src/modules/core/core.ts | 42 +------ .../components/form_item/form_item.ts | 5 +- .../pages/connection/connection.model.ts | 22 ++-- src/modules/pages/connection/connection.ts | 25 +++-- .../connection_jdbc/connection_jdbc.model.ts | 16 +-- .../connection_jdbc/connection_jdbc.ts | 60 +++++----- .../connection_jndi/connection_jndi.model.ts | 15 +-- .../connection_jndi/connection_jndi.ts | 51 ++++----- .../connection_plugin.model.ts | 17 +-- .../connection_plugin/connection_plugin.ts | 9 +- .../pages/connection/list/list.model.ts | 16 +-- src/modules/pages/connection/list/list.ts | 14 ++- .../list/list_item/list_item.model.ts | 26 +++-- .../connection/list/list_item/list_item.ts | 9 +- .../connection_pool/connection_pool.model.ts | 17 +-- .../pages/connection_pool/connection_pool.ts | 17 +-- .../list_item/list_item.model.ts | 13 ++- .../connection_pool/list_item/list_item.ts | 9 +- .../pages/connection_pool/pool/pool.model.ts | 14 ++- .../pages/connection_pool/pool/pool.ts | 9 +- src/modules/pages/database/database.model.ts | 16 +-- src/modules/pages/database/database.ts | 21 ++-- .../pages/database/database.typings.d.ts | 12 -- .../database_type/database_type.model.ts | 15 +-- .../database/database_type/database_type.ts | 9 +- .../pages/database/filter/filter.model.ts | 13 ++- src/modules/pages/database/filter/filter.ts | 8 +- src/modules/pages/index.ts | 10 -- .../components/form_item/form_item.ts | 6 +- .../maintain/forms/components/form.jdbc.ts | 104 +++++++++--------- .../maintain/forms/components/form.jndi.ts | 54 ++++----- .../maintain/forms/components/form.plugin.ts | 4 +- .../pages/maintain/forms/form.model.ts | 38 ++++--- .../pages/maintain/forms/form.server.ts | 8 +- src/modules/pages/maintain/forms/form.ts | 24 ++-- src/modules/pages/maintain/maintain.model.ts | 23 ++-- src/modules/pages/maintain/maintain.ts | 17 +-- src/modules/title/title.model.ts | 16 +-- src/modules/title/title.ts | 13 ++- .../title_database/title_datebase.model.ts | 16 +-- .../title/title_database/title_datebase.ts | 10 +- .../title_maintain/title_maintain.model.ts | 23 ++-- .../title/title_maintain/title_maintain.ts | 11 +- 55 files changed, 516 insertions(+), 499 deletions(-) delete mode 100644 src/modules/pages/database/database.typings.d.ts delete mode 100644 src/modules/pages/index.ts diff --git a/src/index.ts b/src/index.ts index 7d44dd0..efa6739 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,5 +1,5 @@ -import { AppXtype } from './modules/app'; +import { App } from './modules/app'; BI.createWidget({ - type: AppXtype, + type: App.xtype, element: '#wrapper', }); diff --git a/src/modules/app.model.ts b/src/modules/app.model.ts index a6f5968..8dd78a8 100644 --- a/src/modules/app.model.ts +++ b/src/modules/app.model.ts @@ -2,11 +2,12 @@ import { PAGE_INDEX, DATEBASE_FILTER_TYPE } from './constants/constant'; import { Model, model } from '@core/core'; import { Connection } from 'src/modules/crud/crud.typings'; import { getAllDatabaseTypes } from './app.service'; -export const AppModelXtype = 'dec.dcm.model.main'; -@model(AppModelXtype) +@model() export class AppModel extends Model { - childContext = ['pageIndex', 'datebaseTypeSelected', 'datebaseTypeSelectedOne', 'filter', 'connections', 'connectionSelected', 'connectionSelectedOne', 'saveEvent', 'testEvent', 'isCopy']; + static xtype = 'dec.dcm.model.main'; + + childContext = ['pageIndex', 'datebaseTypeSelected', 'datebaseTypeSelectedOne', 'filter', 'connections', 'connectionSelected', 'connectionSelectedOne', 'saveEvent', 'testEvent', 'isCopy']; state() { return { diff --git a/src/modules/app.ts b/src/modules/app.ts index 759440c..73561fc 100644 --- a/src/modules/app.ts +++ b/src/modules/app.ts @@ -1,16 +1,20 @@ import { shortcut, store } from '@core/core'; -import { TitleXtype } from './title/title'; +import { Title } from './title/title'; import { PAGE_INDEX } from './constants/constant'; -import { ConnectionXtype, DatebaseXtype, MaintainXtype, ConnectionPoolXtype } from './pages'; -import { AppModel, AppModelXtype } from './app.model'; +import { Connection } from './pages/connection/connection'; +import { AppModel } from './app.model'; +import { Tab } from '@fui/core'; +import { Datebase } from './pages/database/database'; +import { Maintain } from './pages/maintain/maintain'; +import { ConnectionPool } from './pages/connection_pool/connection_pool'; import './app.provider'; import '../less/index.less'; -import { Tab } from '@fui/core'; -export const AppXtype = 'dec.dcm.main'; -@store(AppModelXtype) -@shortcut(AppXtype) +@shortcut() +@store(AppModel) export class App extends BI.Widget { + static xtype = 'dec.dcm.main'; + tab: Tab; store: AppModel['store']; @@ -28,7 +32,7 @@ export class App extends BI.Widget { items: [ { el: { - type: TitleXtype, + type: Title.xtype, cls: 'bi-border-bottom', }, height: 40, @@ -50,19 +54,19 @@ export class App extends BI.Widget { switch (index) { case PAGE_INDEX.CONNECTION: return { - type: ConnectionXtype, + type: Connection.xtype, }; case PAGE_INDEX.DATEBASE: return { - type: DatebaseXtype, + type: Datebase.xtype, }; case PAGE_INDEX.MAINTAIN: return { - type: MaintainXtype, + type: Maintain.xtype, }; default: return { - type: ConnectionPoolXtype, + type: ConnectionPool.xtype, }; } }, diff --git a/src/modules/components/collapse/collapse.model.ts b/src/modules/components/collapse/collapse.model.ts index 9ae58a6..1b8f3b1 100644 --- a/src/modules/components/collapse/collapse.model.ts +++ b/src/modules/components/collapse/collapse.model.ts @@ -1,8 +1,9 @@ import { model, Model } from '@core/core'; -export const CollapseModelXtype = 'dec.dcm.model.components.collapse'; -@model(CollapseModelXtype) +@model() export class CollapseModel extends Model { + static xtype = 'dec.dcm.model.components.collapse'; + state() { return { isCollapse: true, diff --git a/src/modules/components/collapse/collapse.ts b/src/modules/components/collapse/collapse.ts index 45492f3..58e8db1 100644 --- a/src/modules/components/collapse/collapse.ts +++ b/src/modules/components/collapse/collapse.ts @@ -1,12 +1,13 @@ import { shortcut, store } from '@core/core'; -import { CollapseModel, CollapseModelXtype } from './collapse.model'; +import { CollapseModel } from './collapse.model'; import { IconLabel } from '@fui/core'; export const EVENT_CHANGE = 'EVENT_CHANGE'; -export const CollapseXtype = 'dec.dcm.components.collapse'; -@shortcut(CollapseXtype) -@store(CollapseModelXtype) +@shortcut() +@store(CollapseModel) export class Collapse extends BI.BasicButton { + static xtype = 'dec.dcm.components.collapse'; + props = { name: '', isCollapse: true, diff --git a/src/modules/components/link_button/link.ts b/src/modules/components/link_button/link.ts index b5171af..dfd0f42 100644 --- a/src/modules/components/link_button/link.ts +++ b/src/modules/components/link_button/link.ts @@ -1,10 +1,11 @@ import { shortcut } from '@core/core'; import { Label } from '@fui/core'; -export const LinkXtype = 'dec.dcm.components.link.button'; const DEFAULT_LINK = '/'; -@shortcut(LinkXtype) +@shortcut() export class LinkButton extends BI.BasicButton { + static xtype = 'dec.dcm.components.link.button'; + props: { text: string; cls: string; diff --git a/src/modules/components/test_status/test_status.model.ts b/src/modules/components/test_status/test_status.model.ts index 8a728f4..a4cc9c7 100644 --- a/src/modules/components/test_status/test_status.model.ts +++ b/src/modules/components/test_status/test_status.model.ts @@ -1,8 +1,9 @@ import { model, Model } from '@core/core'; import { TEST_STATUS } from '@constants/constant'; -export const TestStatusModelXtype = 'dec.dcm.model.components.test_status'; -@model(TestStatusModelXtype) + +@model() export class TestStatusModel extends Model { + static xtype = 'dec.dcm.model.components.test_status'; state() { return { status: TEST_STATUS.LOADING, diff --git a/src/modules/components/test_status/test_status.ts b/src/modules/components/test_status/test_status.ts index 4d0d94a..0cfba82 100644 --- a/src/modules/components/test_status/test_status.ts +++ b/src/modules/components/test_status/test_status.ts @@ -1,17 +1,16 @@ import { shortcut, store } from '@core/core'; -import { TestStatusModelXtype, TestStatusModel } from './test_status.model'; +import { TestStatusModel } from './test_status.model'; import { TEST_STATUS } from '@constants/constant'; -import { TipIconXtype } from './tip_icon/tip_icon'; -import { TipFailXtype, EVENT_CLOSE, EVENT_RELOAD, EVENT_DETAIL } from './tip_icon/tip_fail'; +import { TipIcon } from './tip_icon/tip_icon'; +import { TipFail } from './tip_icon/tip_fail'; import { FloatLeftLayout, Label, Tab, VerticalLayout } from '@fui/core'; -export const TestStatusXtype = 'dec.dcm.components.test_status'; -export { - EVENT_CLOSE, - EVENT_RELOAD, -}; -@shortcut(TestStatusXtype) -@store(TestStatusModelXtype) +@shortcut() +@store(TestStatusModel) export class TestStatus extends BI.Widget { + static xtype = 'dec.dcm.components.test_status'; + static EVENT_CLOSE = 'EVENT_CLOSE'; + static EVENT_RELOAD = 'EVENT_RELOAD'; + props = { loadingCls: '', loadingText: '', @@ -61,32 +60,32 @@ export class TestStatus extends BI.Widget { switch (index) { case TEST_STATUS.SUCCESS: return { - type: TipIconXtype, + type: TipIcon.xtype, tipCls: successCls, tipText: successText, }; case TEST_STATUS.FAIL: return { - type: TipFailXtype, + type: TipFail.xtype, tipCls: failCls, tipText: failText, retryText, listeners: [ { - eventName: EVENT_RELOAD, + eventName: TipFail.EVENT_RELOAD, action: () => { - this.fireEvent(EVENT_RELOAD); + this.fireEvent(TestStatus.EVENT_RELOAD); this.detail.setVisible(false); }, }, { - eventName: EVENT_CLOSE, + eventName: TipFail.EVENT_CLOSE, action: () => { - this.fireEvent(EVENT_CLOSE); + this.fireEvent(TestStatus.EVENT_CLOSE); }, }, { - eventName: EVENT_DETAIL, + eventName: TipFail.EVENT_DETAIL, action: (isCollapse: boolean) => { this.tab.setHeight(isCollapse ? 250 : 200); this.detail.setVisible(!isCollapse); @@ -96,7 +95,7 @@ export class TestStatus extends BI.Widget { }; default: return { - type: TipIconXtype, + type: TipIcon.xtype, tipCls: loadingCls, tipText: loadingText, }; diff --git a/src/modules/components/test_status/tip_icon/tip_fail.model.ts b/src/modules/components/test_status/tip_icon/tip_fail.model.ts index ed0b17d..8c16cb0 100644 --- a/src/modules/components/test_status/tip_icon/tip_fail.model.ts +++ b/src/modules/components/test_status/tip_icon/tip_fail.model.ts @@ -1,7 +1,9 @@ import { model, Model } from '@core/core'; -export const TipFailModelXtype = 'dec.dcm.model.components.test_status.tip_fail'; -@model(TipFailModelXtype) + +@model() export class TipFailModel extends Model { + static xtype = 'dec.dcm.model.components.test_status.tip_fail'; + context: ['isCollapse']; state() { diff --git a/src/modules/components/test_status/tip_icon/tip_fail.ts b/src/modules/components/test_status/tip_icon/tip_fail.ts index 26f5dcd..05ef93f 100644 --- a/src/modules/components/test_status/tip_icon/tip_fail.ts +++ b/src/modules/components/test_status/tip_icon/tip_fail.ts @@ -1,13 +1,16 @@ import { shortcut, store } from '@core/core'; import { Button } from '@fui/core'; -import { TipFailModel, TipFailModelXtype } from './tip_fail.model'; -export const TipFailXtype = 'dec.dcm.components.test_status.tip_fail'; -export const EVENT_CLOSE = 'EVENT_CLOSE'; -export const EVENT_RELOAD = 'EVENT_RELOAD'; -export const EVENT_DETAIL = 'EVENT_DETAIL'; -@shortcut(TipFailXtype) -@store(TipFailModelXtype) +import { TipFailModel } from './tip_fail.model'; + +@shortcut() +@store(TipFailModel) export class TipFail extends BI.Widget { + static xtype = 'dec.dcm.components.test_status.tip_fail'; + + static EVENT_CLOSE = 'EVENT_CLOSE'; + static EVENT_RELOAD = 'EVENT_RELOAD'; + static EVENT_DETAIL = 'EVENT_DETAIL'; + props = { tipCls: '', tipText: '', @@ -64,7 +67,7 @@ export class TipFail extends BI.Widget { }, handler: () => { this.store.setIsCollapse(!this.model.isCollapse); - this.fireEvent(EVENT_DETAIL, !this.model.isCollapse); + this.fireEvent(TipFail.EVENT_DETAIL, !this.model.isCollapse); }, }, { @@ -72,14 +75,14 @@ export class TipFail extends BI.Widget { text: BI.i18nText('Dec-Dcm_Back'), level: 'ignore', handler: () => { - this.fireEvent(EVENT_CLOSE); + this.fireEvent(TipFail.EVENT_CLOSE); }, }, { type: BI.Button.xtype, text: retryText, handler: () => { - this.fireEvent(EVENT_RELOAD); + this.fireEvent(TipFail.EVENT_RELOAD); }, }, ], diff --git a/src/modules/components/test_status/tip_icon/tip_icon.ts b/src/modules/components/test_status/tip_icon/tip_icon.ts index ea23ed3..707a6c7 100644 --- a/src/modules/components/test_status/tip_icon/tip_icon.ts +++ b/src/modules/components/test_status/tip_icon/tip_icon.ts @@ -1,7 +1,8 @@ import { shortcut } from '@core/core'; -export const TipIconXtype = 'dec.dcm.components.test_status.tip_icon'; -@shortcut(TipIconXtype) +@shortcut() export class TipIcon extends BI.Widget { + static xtype = 'dec.dcm.components.test_status.tip_icon'; + props = { tipCls: '', tipText: '', diff --git a/src/modules/components/text_checker/text_checker.ts b/src/modules/components/text_checker/text_checker.ts index 12a2de3..c7984c0 100644 --- a/src/modules/components/text_checker/text_checker.ts +++ b/src/modules/components/text_checker/text_checker.ts @@ -1,8 +1,10 @@ import { shortcut } from '@core/core'; import { Label, TextEditor } from '@fui/core'; -export const TextCheckerXtype = 'dec.dcm.components.text_checker'; -@shortcut(TextCheckerXtype) + +@shortcut() export class TextChecker extends BI.Widget { + static xtype = 'dec.dcm.components.text_checker'; + props = { width: 300, allowBlank: true, diff --git a/src/modules/core/core.ts b/src/modules/core/core.ts index a4c222a..700e40d 100644 --- a/src/modules/core/core.ts +++ b/src/modules/core/core.ts @@ -1,43 +1,3 @@ type Constructor = new(...args: any[]) => T; -export function shortcut(className: string) { - return function decorator(Base: Constructor): void { - BI.shortcut(className, Base); - }; -} - -export function store(modelName: string) { - return function decorator(Base: Constructor): void { - Base.prototype._store = () => BI.Models.getModel(modelName); - }; -} - -export function model(className: string) { - return function decorator(Base: Constructor): void { - BI.model(className, Base); - }; -} - -export class Model extends Fix.Model { - model: {[key in keyof U['context']]: U['context'][key]} & {[key in keyof ReturnType]: ReturnType[key]} & {[key in keyof this['computed']]: ReturnType} & {[key: string]: undefined}; - - store: this['actions']; - - state(): {[key: string]: any} { - return {}; - } - - // context: Partial; - - context: string[]; - - actions:{[key: string]: (...args: any[]) => any}; - - // childContext: (keyof this['$$childContext'])[]; - - childContext: string[]; - - $$childContext: {[key in keyof this['computed']]: ReturnType} & {[key in keyof ReturnType]: ReturnType[key]}; - - computed: {[key: string]: () => any}; -} +export const { shortcut, model, store, Model, provider } = BI.Decorators; diff --git a/src/modules/pages/connection/components/form_item/form_item.ts b/src/modules/pages/connection/components/form_item/form_item.ts index 6effde3..e08f76f 100644 --- a/src/modules/pages/connection/components/form_item/form_item.ts +++ b/src/modules/pages/connection/components/form_item/form_item.ts @@ -1,7 +1,8 @@ import { shortcut } from '@core/core'; -export const FormItemXtype = 'dec.dcm.connection_form_item'; -@shortcut(FormItemXtype) + +@shortcut() export class FormItem extends BI.Widget { + static xtype = 'dec.dcm.connection_form_item'; props = { name: '', value: '', diff --git a/src/modules/pages/connection/connection.model.ts b/src/modules/pages/connection/connection.model.ts index 1c50111..6fe86dc 100644 --- a/src/modules/pages/connection/connection.model.ts +++ b/src/modules/pages/connection/connection.model.ts @@ -2,18 +2,20 @@ import { model, Model } from '@core/core'; import { AppModel } from '../../app.model'; import { ApiFactory } from 'src/modules/crud/apiFactory'; const api = new ApiFactory().create(); -export const ConnectionModelXtype = 'dec.dcm.model.connection'; -@model(ConnectionModelXtype) +@model() export class ConnectionModel extends Model<{ - context : { - pageIndex: AppModel['$$childContext']['pageIndex']; - connections: AppModel['$$childContext']['connections']; - connectionSelected: AppModel['$$childContext']['connectionSelected']; - connectionSelectedOne: AppModel['$$childContext']['connectionSelectedOne']; - datebaseTypeSelected: AppModel['$$childContext']['datebaseTypeSelected']; - } + types : { + pageIndex: AppModel['TYPE']['pageIndex']; + connections: AppModel['TYPE']['connections']; + connectionSelected: AppModel['TYPE']['connectionSelected']; + connectionSelectedOne: AppModel['TYPE']['connectionSelectedOne']; + datebaseTypeSelected: AppModel['TYPE']['datebaseTypeSelected']; + }, + context: ConnectionModel['context']; }> { - context = ['pageIndex', 'connectionSelected', 'connectionSelectedOne', 'datebaseTypeSelected']; + static xtype = 'dec.dcm.model.connection'; + + context = ['pageIndex', 'connectionSelected', 'connectionSelectedOne', 'datebaseTypeSelected']; actions = { setPageIndex:(index: string) => { diff --git a/src/modules/pages/connection/connection.ts b/src/modules/pages/connection/connection.ts index eda7acd..43387d5 100644 --- a/src/modules/pages/connection/connection.ts +++ b/src/modules/pages/connection/connection.ts @@ -1,19 +1,20 @@ import { shortcut, store } from '@core/core'; -import { ConnectionModel, ConnectionModelXtype } from './connection.model'; +import { ConnectionModel } from './connection.model'; import { PAGE_INDEX } from '@constants/constant'; -import { ConnectionListXtype } from './list/list'; -import { ConnectionJdbcXtype } from './connection_jdbc/connection_jdbc'; -import { ConnectionJndiXtype } from './connection_jndi/connection_jndi'; -import { ConnectionPluginXtype } from './connection_plugin/connection_plugin'; +import { ConnectionList } from './list/list'; +import { ConnectionJdbc } from './connection_jdbc/connection_jdbc'; +import { ConnectionJndi } from './connection_jndi/connection_jndi'; +import { ConnectionPlugin } from './connection_plugin/connection_plugin'; import { connectionType } from '@constants/env'; import { getAllDatabaseTypes, connectionCanEdit, getJdbcDatabaseType, getTextByDatabaseType } from '../../app.service'; import { ConnectionJDBC } from '../../crud/crud.typings'; import { Button, HTapeLayout, Label, ListView } from '@fui/core'; -export const ConnectionXtype = 'dec.dcm.connection'; -@shortcut(ConnectionXtype) -@store(ConnectionModelXtype) +@shortcut() +@store(ConnectionModel) export class Connection extends BI.Widget { + static xtype = 'dec.dcm.connection'; + store: ConnectionModel['store']; model: ConnectionModel['model']; @@ -72,7 +73,7 @@ export class Connection extends BI.Widget { height: 40, }, { - type: ConnectionListXtype, + type: ConnectionList.xtype, tgap: 10, }, ], @@ -143,15 +144,15 @@ export class Connection extends BI.Widget { switch (this.model.connectionSelectedOne.connectionType) { case connectionType.JDBC: return [{ - type: ConnectionJdbcXtype, + type: ConnectionJdbc.xtype, }]; case connectionType.JNDI: return [{ - type: ConnectionJndiXtype, + type: ConnectionJndi.xtype, }]; default: return [{ - type: ConnectionPluginXtype, + type: ConnectionPlugin.xtype, }]; } } diff --git a/src/modules/pages/connection/connection_jdbc/connection_jdbc.model.ts b/src/modules/pages/connection/connection_jdbc/connection_jdbc.model.ts index cb894c0..1661704 100644 --- a/src/modules/pages/connection/connection_jdbc/connection_jdbc.model.ts +++ b/src/modules/pages/connection/connection_jdbc/connection_jdbc.model.ts @@ -1,11 +1,13 @@ import { model, Model } from '@core/core'; -import { ConnectionModel } from '../connection.model'; -export const ConnectionJdbcModelXtype = 'dec.dcm.model.connection_jdbc'; -@model(ConnectionJdbcModelXtype) +import { AppModel } from '../../../app.model'; + +@model() export class ConnectionJdecModel extends Model<{ - context : { - connectionSelectedOne: ConnectionModel['$$childContext']['connectionSelectedOne']; - } + types : { + connectionSelectedOne: AppModel['TYPE']['connectionSelectedOne']; + }, + context: ConnectionJdecModel['context']; }> { - context = ['connectionSelectedOne']; + static xtype = 'dec.dcm.model.connection_jdbc'; + context = ['connectionSelectedOne']; } diff --git a/src/modules/pages/connection/connection_jdbc/connection_jdbc.ts b/src/modules/pages/connection/connection_jdbc/connection_jdbc.ts index c3da8c9..7d7f811 100644 --- a/src/modules/pages/connection/connection_jdbc/connection_jdbc.ts +++ b/src/modules/pages/connection/connection_jdbc/connection_jdbc.ts @@ -1,17 +1,17 @@ import { shortcut, store } from '@core/core'; -import { FormItemXtype } from '../components/form_item/form_item'; -import { CollapseXtype, EVENT_CHANGE } from 'src/modules/components/collapse/collapse'; -import { ConnectionJdbcModelXtype, ConnectionJdecModel } from './connection_jdbc.model'; +import { FormItem } from '../components/form_item/form_item'; +import { Collapse, EVENT_CHANGE } from 'src/modules/components/collapse/collapse'; +import { ConnectionJdecModel } from './connection_jdbc.model'; import { ConnectionJDBC } from 'src/modules/crud/crud.typings'; import { getAllDatabaseTypes, getJdbcDatabaseType, resolveUrlInfo } from '../../../app.service'; import { CONNECTION_LAYOUT } from '@constants/constant'; import { VerticalLayout } from '@fui/core'; -export const ConnectionJdbcXtype = 'dec.dcm.connection_jdbc'; -@shortcut(ConnectionJdbcXtype) -@store(ConnectionJdbcModelXtype) +@shortcut() +@store(ConnectionJdecModel) export class ConnectionJdbc extends BI.Widget { - advancedSet: any; + static xtype = 'dec.dcm.connection_jdbc'; + advancedSet: any; model: ConnectionJdecModel['model']; allDatabaseTypes = getAllDatabaseTypes(); @@ -28,61 +28,61 @@ export class ConnectionJdbc extends BI.Widget { vgap, items: [ { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Driver'), value: driver, }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Name'), value: databaseName, }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Host'), value: host, }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Port'), value: port, }, authType ? { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_AuthType'), value: authType, } : { type: BI.Layout.xtype, }, { - type: FormItemXtype, + type: FormItem.xtype, name: authType ? BI.i18nText('Dec-Dcm_Connection_Form_Principal') : BI.i18nText('Dec-Dcm_Connection_Form_UserName'), value: authType ? principal : user, }, { - type: FormItemXtype, + type: FormItem.xtype, name: authType ? BI.i18nText('Dec-Dcm_Connection_Form_KeyPath') : BI.i18nText('Dec-Dcm_Connection_Form_Password'), value: '******', }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_OriginalCharsetName'), value: originalCharsetName ? originalCharsetName : BI.i18nText('Dec-Dcm_Connection_Form_Auto'), }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Pattern'), value: schema, invisible: !databaseType.hasSchema, }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_URL'), value: url, }, { - type: CollapseXtype, + type: Collapse.xtype, width: 70, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Advanced_Setting'), listeners: [ @@ -104,64 +104,64 @@ export class ConnectionJdbc extends BI.Widget { }, items: [ { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Initial_Size'), value: connectionPoolAttr.initialSize, }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Max_Active'), value: connectionPoolAttr.maxActive, }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Max_Idle'), value: connectionPoolAttr.maxIdle, }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Min_Idle'), value: connectionPoolAttr.minIdle, }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Max_Wait'), value: connectionPoolAttr.maxWait, unit: BI.i18nText('Dec-Dcm_Millisecond'), }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Validation_Query'), value: connectionPoolAttr.validationQuery, }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Test_On_Borrow'), value: connectionPoolAttr.testOnBorrow ? BI.i18nText('Dec-Dcm_Yes') : BI.i18nText('Dec-Dcm_No'), }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Test_On_Return'), value: connectionPoolAttr.testOnReturn ? BI.i18nText('Dec-Dcm_Yes') : BI.i18nText('Dec-Dcm_No'), }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Test_While_Idle'), value: connectionPoolAttr.testWhileIdle ? BI.i18nText('Dec-Dcm_Yes') : BI.i18nText('Dec-Dcm_No'), }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Test_Between_Eviction_Millis'), value: connectionPoolAttr.timeBetweenEvictionRunsMillis, unit: BI.i18nText('Dec-Dcm_Millisecond'), }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Tests_PerEviction_Run_Num'), value: connectionPoolAttr.numTestsPerEvictionRun, }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Min_Evictable_Idle_Time_Millis'), value: connectionPoolAttr.minEvictableIdleTimeMillis, unit: BI.i18nText('BI-Basic_Seconds'), diff --git a/src/modules/pages/connection/connection_jndi/connection_jndi.model.ts b/src/modules/pages/connection/connection_jndi/connection_jndi.model.ts index c4346e8..84440fd 100644 --- a/src/modules/pages/connection/connection_jndi/connection_jndi.model.ts +++ b/src/modules/pages/connection/connection_jndi/connection_jndi.model.ts @@ -1,11 +1,12 @@ +import { AppModel } from 'src/modules/app.model'; import { model, Model } from '@core/core'; -import { ConnectionModel } from '../connection.model'; -export const ConnectionJndiModelXtype = 'dec.dcm.model.connection_jndi'; -@model(ConnectionJndiModelXtype) +@model() export class ConnectionJndiModel extends Model<{ - context : { - connectionSelectedOne: ConnectionModel['$$childContext']['connectionSelectedOne']; - } + types : { + connectionSelectedOne: AppModel['TYPE']['connectionSelectedOne']; + }, + context: ConnectionJndiModel['context']; }> { - context = ['connectionSelectedOne']; + static xtype = 'dec.dcm.model.connection_jndi'; + context = ['connectionSelectedOne']; } diff --git a/src/modules/pages/connection/connection_jndi/connection_jndi.ts b/src/modules/pages/connection/connection_jndi/connection_jndi.ts index 327ea77..1db4a3b 100644 --- a/src/modules/pages/connection/connection_jndi/connection_jndi.ts +++ b/src/modules/pages/connection/connection_jndi/connection_jndi.ts @@ -1,15 +1,16 @@ import { shortcut, store } from '@core/core'; -import { FormItemXtype } from '../components/form_item/form_item'; -import { ConnectionJndiModelXtype, ConnectionJndiModel } from './connection_jndi.model'; +import { FormItem } from '../components/form_item/form_item'; +import { ConnectionJndiModel } from './connection_jndi.model'; import { ConnectionJNDI } from 'src/modules/crud/crud.typings'; -import { CollapseXtype, EVENT_CHANGE } from 'src/modules/components/collapse/collapse'; +import { Collapse, EVENT_CHANGE } from 'src/modules/components/collapse/collapse'; import { CONNECTION_LAYOUT } from '@constants/constant'; import { VerticalLayout } from '@fui/core'; -export const ConnectionJndiXtype = 'dec.dcm.connection_jndi'; -@shortcut(ConnectionJndiXtype) -@store(ConnectionJndiModelXtype) -export class ConnectionJdbc extends BI.Widget { +@shortcut() +@store(ConnectionJndiModel) +export class ConnectionJndi extends BI.Widget { + static xtype = 'dec.dcm.connection_jndi'; + model: ConnectionJndiModel['model']; advancedSet: VerticalLayout; @@ -26,7 +27,7 @@ export class ConnectionJdbc extends BI.Widget { vgap, items: [ { - type: FormItemXtype, + type: FormItem.xtype, nameWidth: 200, name: BI.i18nText('Dec-Dcm_Connection_JNDI_Form_ConnectionName'), value: jndiName, @@ -55,28 +56,28 @@ export class ConnectionJdbc extends BI.Widget { height: 115, items: [ { - type: FormItemXtype, + type: FormItem.xtype, name: 'INTIAL_CONTEXT_FACTORY', nameWidth: 200, isBold: false, value: contextHashtable['java.naming.factory.initial'], }, { - type: FormItemXtype, + type: FormItem.xtype, name: 'PROVIDER_URL', nameWidth: 200, isBold: false, value: contextHashtable['java.naming.provider.url'], }, { - type: FormItemXtype, + type: FormItem.xtype, name: 'SECURITY_PRINCIPAL', nameWidth: 200, isBold: false, value: contextHashtable['java.naming.security.principal'], }, { - type: FormItemXtype, + type: FormItem.xtype, name: 'SECURITY_CREDENTIALS', nameWidth: 200, isBold: false, @@ -88,13 +89,13 @@ export class ConnectionJdbc extends BI.Widget { ], }, { - type: FormItemXtype, + type: FormItem.xtype, nameWidth: 200, name: BI.i18nText('Dec-Dcm_Connection_Form_OriginalCharsetName'), value: originalCharsetName ? originalCharsetName : BI.i18nText('Dec-Dcm_Connection_Form_Auto'), }, { - type: CollapseXtype, + type: Collapse.xtype, width: 70, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Advanced_Setting'), listeners: [ @@ -116,67 +117,67 @@ export class ConnectionJdbc extends BI.Widget { }, items: [ { - type: FormItemXtype, + type: FormItem.xtype, nameWidth: 200, name: 'OBJECT_FACTORIES', value: contextHashtable['java.naming.factory.object'], }, { - type: FormItemXtype, + type: FormItem.xtype, nameWidth: 200, name: 'STATE_FACTORIES', value: contextHashtable['java.naming.factory.state'], }, { - type: FormItemXtype, + type: FormItem.xtype, nameWidth: 200, name: 'URL_PKG_PREFIXES', value: contextHashtable['java.naming.factory.url.pkgs'], }, { - type: FormItemXtype, + type: FormItem.xtype, nameWidth: 200, name: 'DNS_URL', value: contextHashtable['java.naming.dns.url'], }, { - type: FormItemXtype, + type: FormItem.xtype, nameWidth: 200, name: 'AUTHORITATIVE', value: contextHashtable['java.naming.authoritative'], }, { - type: FormItemXtype, + type: FormItem.xtype, nameWidth: 200, name: 'BATCHSIZE', value: contextHashtable['java.naming.batchsize'], }, { - type: FormItemXtype, + type: FormItem.xtype, nameWidth: 200, name: 'REFERRAL', value: contextHashtable['java.naming.referral'], }, { - type: FormItemXtype, + type: FormItem.xtype, nameWidth: 200, name: 'SECURITY_PROTOCOL', value: contextHashtable['java.naming.security.protocol'], }, { - type: FormItemXtype, + type: FormItem.xtype, nameWidth: 200, name: 'SECURITY_AUTHENTICATION', value: contextHashtable['java.naming.security.authentication'], }, { - type: FormItemXtype, + type: FormItem.xtype, nameWidth: 200, name: 'LANGUAGE', value: contextHashtable['java.naming.language'], }, { - type: FormItemXtype, + type: FormItem.xtype, nameWidth: 200, name: 'APPLET', value: contextHashtable['java.naming.applet'], diff --git a/src/modules/pages/connection/connection_plugin/connection_plugin.model.ts b/src/modules/pages/connection/connection_plugin/connection_plugin.model.ts index b6fbc60..fb609ad 100644 --- a/src/modules/pages/connection/connection_plugin/connection_plugin.model.ts +++ b/src/modules/pages/connection/connection_plugin/connection_plugin.model.ts @@ -1,11 +1,14 @@ +import { AppModel } from '../../../app.model'; import { model, Model } from '@core/core'; -import { ConnectionModel } from '../connection.model'; -export const ConnectionPluginModelXtype = 'dec.dcm.model.connection_plugin'; -@model(ConnectionPluginModelXtype) + +@model() export class ConnectionPluginModel extends Model<{ - context : { - connectionSelectedOne: ConnectionModel['$$childContext']['connectionSelectedOne']; - } + types : { + connectionSelectedOne: AppModel['TYPE']['connectionSelectedOne']; + }, + context: ConnectionPluginModel['context']; }> { - context = ['connectionSelectedOne']; + static xtype = 'dec.dcm.model.connection_plugin'; + + context = ['connectionSelectedOne']; } diff --git a/src/modules/pages/connection/connection_plugin/connection_plugin.ts b/src/modules/pages/connection/connection_plugin/connection_plugin.ts index 14e6990..ee66226 100644 --- a/src/modules/pages/connection/connection_plugin/connection_plugin.ts +++ b/src/modules/pages/connection/connection_plugin/connection_plugin.ts @@ -1,10 +1,11 @@ import { shortcut, store } from '@core/core'; -import { ConnectionPluginModelXtype, ConnectionPluginModel } from './connection_plugin.model'; +import { ConnectionPluginModel } from './connection_plugin.model'; import { getPluginWidgetShow } from 'src/modules/app.service'; -export const ConnectionPluginXtype = 'dec.dcm.connection_plugin'; -@shortcut(ConnectionPluginXtype) -@store(ConnectionPluginModelXtype) +@shortcut() +@store(ConnectionPluginModel) export class ConnectionPlugin extends BI.Widget { + static xtype = 'dec.dcm.connection_plugin'; + model: ConnectionPluginModel['model']; render () { diff --git a/src/modules/pages/connection/list/list.model.ts b/src/modules/pages/connection/list/list.model.ts index 4e76792..036f320 100644 --- a/src/modules/pages/connection/list/list.model.ts +++ b/src/modules/pages/connection/list/list.model.ts @@ -2,15 +2,17 @@ import { model, Model } from '@core/core'; import { ApiFactory } from '../../..//crud/apiFactory'; import { AppModel } from '../../../app.model'; const api = new ApiFactory().create(); -export const ConnectionListModelXtype = 'dec.dcm.model.connection.list'; -@model(ConnectionListModelXtype) +@model() export class ConnectionListModel extends Model<{ - context : { - connections: AppModel['$$childContext']['connections']; - connectionSelected: AppModel['$$childContext']['connectionSelected']; - } + types : { + connections: AppModel['TYPE']['connections']; + connectionSelected: AppModel['TYPE']['connectionSelected']; + }, + context: ConnectionListModel['context']; }> { - context = ['connections', 'connectionSelected']; + static xtype = 'dec.dcm.model.connection.list'; + + context = ['connections', 'connectionSelected']; computed = { shwoType: () => BI.size(this.model.connections) > 0 ? 'list' : 'none', diff --git a/src/modules/pages/connection/list/list.ts b/src/modules/pages/connection/list/list.ts index 2ddfa94..0e4be9b 100644 --- a/src/modules/pages/connection/list/list.ts +++ b/src/modules/pages/connection/list/list.ts @@ -1,12 +1,14 @@ import { shortcut, store } from '@core/core'; -import { ListItemXtype } from './list_item/list_item'; -import { ConnectionListModel, ConnectionListModelXtype } from './list.model'; +import { ListItem } from './list_item/list_item'; +import { ConnectionListModel } from './list.model'; import { getDatabaseType } from './list.service'; import { Tab } from '@fui/core'; -export const ConnectionListXtype = 'dec.dcm.connection.list'; -@shortcut(ConnectionListXtype) -@store(ConnectionListModelXtype) + +@shortcut() +@store(ConnectionListModel) export class ConnectionList extends BI.LoadingPane { + static xtype = 'dec.dcm.connection.list'; + store: ConnectionListModel['store']; model: ConnectionListModel['model']; @@ -83,7 +85,7 @@ export class ConnectionList extends BI.LoadingPane { private renderList(start = 0, end = 0) { return this.model.connections.slice(start, end).map((item, index) => { return { - type: ListItemXtype, + type: ListItem.xtype, name: item.connectionName, value: item.connectionName, creator: item.creator, diff --git a/src/modules/pages/connection/list/list_item/list_item.model.ts b/src/modules/pages/connection/list/list_item/list_item.model.ts index efc02ca..a02695d 100644 --- a/src/modules/pages/connection/list/list_item/list_item.model.ts +++ b/src/modules/pages/connection/list/list_item/list_item.model.ts @@ -6,20 +6,22 @@ import { getChartLength } from '../../../../app.service'; import { NAME_MAX_LENGTH } from '../../../../app.constant'; const api = new ApiFactory().create(); -export const ListItemModelXtype = 'dec.dcm.model.connection.list_item'; -@model(ListItemModelXtype) +@model() export class ListItemModel extends Model<{ - context : { - connectionSelected: AppModel['$$childContext']['connectionSelected']; - connectionSelectedOne: AppModel['$$childContext']['connectionSelectedOne']; - datebaseTypeSelectedOne: AppModel['$$childContext']['datebaseTypeSelectedOne']; - connections: AppModel['$$childContext']['connections']; - pageIndex: AppModel['$$childContext']['pageIndex']; - datebaseTypeSelected: AppModel['$$childContext']['datebaseTypeSelected']; - isCopy: AppModel['$$childContext']['isCopy'] - } + types : { + connectionSelected: AppModel['TYPE']['connectionSelected']; + connectionSelectedOne: AppModel['TYPE']['connectionSelectedOne']; + datebaseTypeSelectedOne: AppModel['TYPE']['datebaseTypeSelectedOne']; + connections: AppModel['TYPE']['connections']; + pageIndex: AppModel['TYPE']['pageIndex']; + datebaseTypeSelected: AppModel['TYPE']['datebaseTypeSelected']; + isCopy: AppModel['TYPE']['isCopy'] + }, + context: ListItemModel['context']; }> { - context = ['connectionSelected', 'connections', 'pageIndex', 'datebaseTypeSelectedOne', 'connectionSelectedOne', 'datebaseTypeSelected', 'isCopy']; + static xtype = 'dec.dcm.model.connection.list_item'; + + context = ['connectionSelected', 'connections', 'pageIndex', 'datebaseTypeSelectedOne', 'connectionSelectedOne', 'datebaseTypeSelected', 'isCopy']; state() { return { diff --git a/src/modules/pages/connection/list/list_item/list_item.ts b/src/modules/pages/connection/list/list_item/list_item.ts index 41b06f0..4f098bc 100644 --- a/src/modules/pages/connection/list/list_item/list_item.ts +++ b/src/modules/pages/connection/list/list_item/list_item.ts @@ -1,16 +1,17 @@ import { shortcut, store } from '@core/core'; import './list_item.less'; -import { ListItemModel, ListItemModelXtype } from './list_item.model'; +import { ListItemModel } from './list_item.model'; import { PAGE_INDEX } from '@constants/constant'; import { hasRegistered } from '../list.service'; import { connectionCanEdit, getTextByDatabaseType, getChartLength } from '../../../../app.service'; import { testConnection } from '../../../maintain/forms/form.server'; import { DownListCombo, Label, SignEditor } from '@fui/core'; -export const ListItemXtype = 'dec.dcm.connection.list_item'; -@shortcut(ListItemXtype) -@store(ListItemModelXtype) +@shortcut() +@store(ListItemModel) export class ListItem extends BI.BasicButton { + static xtype = 'dec.dcm.connection.list_item'; + props = { name: '', creator: '', diff --git a/src/modules/pages/connection_pool/connection_pool.model.ts b/src/modules/pages/connection_pool/connection_pool.model.ts index befc9d5..6a18729 100644 --- a/src/modules/pages/connection_pool/connection_pool.model.ts +++ b/src/modules/pages/connection_pool/connection_pool.model.ts @@ -1,15 +1,18 @@ import { model, Model } from '@core/core'; import { AppModel } from '../../app.model'; import { connectionType } from '@constants/env'; -export const ConnectionPoolModelXtype = 'dec.dcm.model.connection_pool'; -@model(ConnectionPoolModelXtype) + +@model() export class ConnectionPoolModel extends Model<{ - context : { - connections: AppModel['$$childContext']['connections']; - } + types : { + connections: AppModel['TYPE']['connections']; + }, + context: ConnectionPoolModel['context']; }> { - childContext = ['selected']; - context = ['connections']; + static xtype = 'dec.dcm.model.connection_pool'; + + childContext = ['selected']; + context = ['connections']; state() { return { diff --git a/src/modules/pages/connection_pool/connection_pool.ts b/src/modules/pages/connection_pool/connection_pool.ts index 0bb76f5..e3547f7 100644 --- a/src/modules/pages/connection_pool/connection_pool.ts +++ b/src/modules/pages/connection_pool/connection_pool.ts @@ -1,13 +1,14 @@ import { shortcut, store } from '@core/core'; -import { ConnectionPoolModel, ConnectionPoolModelXtype } from './connection_pool.model'; -import { ListItemXtype } from './list_item/list_item'; -import { PoolXtype } from './pool/pool'; +import { ConnectionPoolModel } from './connection_pool.model'; +import { ListItem } from './list_item/list_item'; +import { Pool } from './pool/pool'; import { PAGE_SIZE } from '@constants/constant'; import { Label } from '@fui/core'; -export const ConnectionPoolXtype = 'dec.dcm.connection_pool'; -@shortcut(ConnectionPoolXtype) -@store(ConnectionPoolModelXtype) +@shortcut() +@store(ConnectionPoolModel) export class ConnectionPool extends BI.Widget { + static xtype = 'dec.dcm.connection_pool'; + title: Label; model: ConnectionPoolModel['model']; @@ -80,7 +81,7 @@ export class ConnectionPool extends BI.Widget { height: 40, }, { - type: PoolXtype, + type: Pool.xtype, }, ], }; @@ -118,7 +119,7 @@ export class ConnectionPool extends BI.Widget { return this.model.connectionJDBC.slice(start, end).map(item => { return { - type: ListItemXtype, + type: ListItem.xtype, name: item.connectionName, value: item.connectionName, selected: item.connectionName === defaultSelected, diff --git a/src/modules/pages/connection_pool/list_item/list_item.model.ts b/src/modules/pages/connection_pool/list_item/list_item.model.ts index 2cfe828..ae0d68e 100644 --- a/src/modules/pages/connection_pool/list_item/list_item.model.ts +++ b/src/modules/pages/connection_pool/list_item/list_item.model.ts @@ -1,13 +1,14 @@ import { model, Model } from '@core/core'; import { ConnectionPoolModel } from '../connection_pool.model'; -export const ListItemModelXtype = 'dec.dcm.model.connection_pool.list_item'; -@model(ListItemModelXtype) +@model() export class ListItemModel extends Model<{ - context : { - selected: ConnectionPoolModel['$$childContext']['selected']; - } + types : { + selected: ConnectionPoolModel['TYPE']['selected']; + }, + context: ListItemModel['context']; }> { - context = ['selected']; + static xtype = 'dec.dcm.model.connection_pool.list_item'; + context = ['selected']; actions = { setSelected: (selected: string) => { this.model.selected = selected; diff --git a/src/modules/pages/connection_pool/list_item/list_item.ts b/src/modules/pages/connection_pool/list_item/list_item.ts index fa9c9e0..1ae8966 100644 --- a/src/modules/pages/connection_pool/list_item/list_item.ts +++ b/src/modules/pages/connection_pool/list_item/list_item.ts @@ -1,9 +1,10 @@ import { shortcut, store } from '@core/core'; -import { ListItemModel, ListItemModelXtype } from './list_item.model'; -export const ListItemXtype = 'dec.dcm.connection_pool.list_item'; -@shortcut(ListItemXtype) -@store(ListItemModelXtype) +import { ListItemModel } from './list_item.model'; +@shortcut() +@store(ListItemModel) export class ListItem extends BI.BasicButton { + static xtype = 'dec.dcm.connection_pool.list_item'; + props = { name: '', height: 25, diff --git a/src/modules/pages/connection_pool/pool/pool.model.ts b/src/modules/pages/connection_pool/pool/pool.model.ts index 36a7f38..2a3fc33 100644 --- a/src/modules/pages/connection_pool/pool/pool.model.ts +++ b/src/modules/pages/connection_pool/pool/pool.model.ts @@ -3,14 +3,16 @@ import { ConnectionPoolModel } from '../connection_pool.model'; import { ConnectionPoolType } from '../../../crud/crud.typings'; import { ApiFactory } from '../../../crud/apiFactory'; const api = new ApiFactory().create(); -export const PoolModelXtype = 'dec.dcm.model.connection_pool.pool'; -@model(PoolModelXtype) +@model() export class PoolModel extends Model<{ - context : { - selected: ConnectionPoolModel['$$childContext']['selected']; - } + types : { + selected: ConnectionPoolModel['TYPE']['selected']; + }, + context: PoolModel['context']; }> { - context = ['selected']; + static xtype = 'dec.dcm.model.connection_pool.poo'; + + context = ['selected']; state () { return { diff --git a/src/modules/pages/connection_pool/pool/pool.ts b/src/modules/pages/connection_pool/pool/pool.ts index 018acef..9185d24 100644 --- a/src/modules/pages/connection_pool/pool/pool.ts +++ b/src/modules/pages/connection_pool/pool/pool.ts @@ -1,13 +1,14 @@ import { shortcut, store } from '@core/core'; -import { PoolModel, PoolModelXtype } from './pool.model'; +import { PoolModel } from './pool.model'; import './pool.less'; import { ConnectionPoolType } from '../../../crud/crud.typings'; import { Label } from '@fui/core'; -export const PoolXtype = 'dec.dcm.connection_pool.pool'; -@shortcut(PoolXtype) -@store(PoolModelXtype) +@shortcut() +@store(PoolModel) export class Pool extends BI.Widget { + static xtype = 'dec.dcm.connection_pool.pool'; + props = { baseCls: 'dec-dcm-connection-pool', $testId: 'dec-dcm-connection-pool', diff --git a/src/modules/pages/database/database.model.ts b/src/modules/pages/database/database.model.ts index 88b5e21..44109ea 100644 --- a/src/modules/pages/database/database.model.ts +++ b/src/modules/pages/database/database.model.ts @@ -3,15 +3,17 @@ import { AppModel } from 'src/modules/app.model'; import { getAllDatabaseTypes } from '../../app.service'; import { DatabaseType } from '../../app.typings'; -export const DatebaseModelXtype = 'dec.dcm.model.datebase'; -@model(DatebaseModelXtype) +@model() export class DatebaseModel extends Model<{ - context : { - filter: AppModel['$$childContext']['filter']; - datebaseTypeSelected: AppModel['$$childContext']['datebaseTypeSelected']; - } + types : { + filter: AppModel['TYPE']['filter']; + datebaseTypeSelected: AppModel['TYPE']['datebaseTypeSelected']; + }, + context: DatebaseModel['context']; }> { - context = ['filter', 'datebaseTypeSelected']; + static xtype = 'dec.dcm.model.datebase'; + + context = ['filter', 'datebaseTypeSelected']; state() { return { search: '', diff --git a/src/modules/pages/database/database.ts b/src/modules/pages/database/database.ts index 2793e5d..93b32ae 100644 --- a/src/modules/pages/database/database.ts +++ b/src/modules/pages/database/database.ts @@ -1,15 +1,16 @@ import { shortcut, store } from '@core/core'; -import { FilterXtype } from './filter/filter'; -import { DatebaseModel, DatebaseModelXtype } from './database.model'; +import { Filter } from './filter/filter'; +import { DatebaseModel } from './database.model'; import { DATEBASE_FILTER_TYPE, OTHER_JDBC } from '@constants/constant'; import { connectionType } from '@constants/env'; -import { DatebaseTypeXtype } from './database_type/database_type'; +import { DatebaseType } from './database_type/database_type'; import { getAllDatabaseTypes } from '../../app.service'; import { ButtonGroup, MultiSelectItem, SearchEditor } from '@fui/core'; -export const DatebaseXtype = 'dec.dcm.datebase'; -@shortcut(DatebaseXtype) -@store(DatebaseModelXtype) +@shortcut() +@store(DatebaseModel) export class Datebase extends BI.Widget { + static xtype = 'dec.dcm.datebase'; + filter: ButtonGroup; search: SearchEditor; datebaseType: ButtonGroup; @@ -117,18 +118,18 @@ export class Datebase extends BI.Widget { }, items: [ { - type: FilterXtype, + type: Filter.xtype, text: BI.i18nText('Dec-Dcm_Connection_Commonly'), value: DATEBASE_FILTER_TYPE.COMMONLY, selected: true, }, { - type: FilterXtype, + type: Filter.xtype, text: BI.i18nText('Dec-Dcm_Connection_All'), value: DATEBASE_FILTER_TYPE.ALL, }, { - type: FilterXtype, + type: Filter.xtype, text: BI.i18nText('Dec-Dcm_Connection_Other'), value: DATEBASE_FILTER_TYPE.OTHER, }, @@ -219,7 +220,7 @@ export class Datebase extends BI.Widget { return this.model.datebaseTypes.map(item => { return { - type: DatebaseTypeXtype, + type: DatebaseType.xtype, text: item.text, value: item.databaseType, keyword: this.model.search, diff --git a/src/modules/pages/database/database.typings.d.ts b/src/modules/pages/database/database.typings.d.ts deleted file mode 100644 index 2e1513f..0000000 --- a/src/modules/pages/database/database.typings.d.ts +++ /dev/null @@ -1,12 +0,0 @@ -export interface DatabaseType { - text: string; - databaseType: string; - driver?: string; - drivers?: string[]; - url?: string; - commonly: boolean; - internal: boolean; - type: string; - hasSchema?: boolean; - kerberos?: boolean; -} diff --git a/src/modules/pages/database/database_type/database_type.model.ts b/src/modules/pages/database/database_type/database_type.model.ts index 1417d95..cb51507 100644 --- a/src/modules/pages/database/database_type/database_type.model.ts +++ b/src/modules/pages/database/database_type/database_type.model.ts @@ -1,15 +1,16 @@ import { model, Model } from '@core/core'; import { AppModel } from 'src/modules/app.model'; -export const DatebaseTypeModelXtype = 'dec.dcm.model.datebase.type'; -@model(DatebaseTypeModelXtype) +@model() export class DatebaseTypeModel extends Model< { - context: { - datebaseTypeSelected: AppModel['$$childContext']['datebaseTypeSelected']; - pageIndex: AppModel['$$childContext']['pageIndex']; - } + types: { + datebaseTypeSelected: AppModel['TYPE']['datebaseTypeSelected']; + pageIndex: AppModel['TYPE']['pageIndex']; + }, + context: DatebaseTypeModel['context']; }> { - context = ['datebaseTypeSelected', 'pageIndex']; + static xtype = 'dec.dcm.model.datebase.type'; + context = ['datebaseTypeSelected', 'pageIndex']; actions = { setDatebaseTypeSelected: (datebaseTypeSelected: string) => { diff --git a/src/modules/pages/database/database_type/database_type.ts b/src/modules/pages/database/database_type/database_type.ts index 7a99798..6778564 100644 --- a/src/modules/pages/database/database_type/database_type.ts +++ b/src/modules/pages/database/database_type/database_type.ts @@ -1,14 +1,15 @@ import { shortcut, store } from '@core/core'; -import { DatebaseTypeModel, DatebaseTypeModelXtype } from './database_type.model'; +import { DatebaseTypeModel } from './database_type.model'; import { ImgPrefix, PluginImgPrefix } from '@constants/env'; import './database_type.less'; import { PAGE_INDEX } from '@constants/constant'; import { Img } from '@fui/core'; -export const DatebaseTypeXtype = 'dec.dcm.datebase.type'; -@shortcut(DatebaseTypeXtype) -@store(DatebaseTypeModelXtype) +@shortcut() +@store(DatebaseTypeModel) export class DatebaseType extends BI.BasicButton { + static xtype = 'dec.dcm.datebase.type'; + props = { text: '', url: '', diff --git a/src/modules/pages/database/filter/filter.model.ts b/src/modules/pages/database/filter/filter.model.ts index 4ae5eb7..aa98df6 100644 --- a/src/modules/pages/database/filter/filter.model.ts +++ b/src/modules/pages/database/filter/filter.model.ts @@ -1,14 +1,15 @@ import { Model, model } from '@core/core'; import { AppModel } from 'src/modules/app.model'; -export const FilterModelXtype = 'dec.dcm.model.datebase.filter'; -@model(FilterModelXtype) +@model() export class FilterModel extends Model<{ - context : { - filter: AppModel['$$childContext']['filter']; - } + types : { + filter: AppModel['TYPE']['filter']; + }, + context: FilterModel['context']; }> { - context = ['filter']; + static xtype = 'dec.dcm.model.datebase.filter'; + context = ['filter']; actions = { setFilter:(filter: string) => { diff --git a/src/modules/pages/database/filter/filter.ts b/src/modules/pages/database/filter/filter.ts index e5f798b..1f30b58 100644 --- a/src/modules/pages/database/filter/filter.ts +++ b/src/modules/pages/database/filter/filter.ts @@ -1,10 +1,10 @@ import { shortcut, store } from '@core/core'; -import { FilterModel, FilterModelXtype } from './filter.model'; +import { FilterModel } from './filter.model'; -export const FilterXtype = 'dec.dcm.datebase.filter'; -@shortcut(FilterXtype) -@store(FilterModelXtype) +@shortcut() +@store(FilterModel) export class Filter extends BI.BasicButton { + static xtype = 'dec.dcm.datebase.filter'; store: FilterModel['store'] props = { text: '', diff --git a/src/modules/pages/index.ts b/src/modules/pages/index.ts deleted file mode 100644 index 5186c84..0000000 --- a/src/modules/pages/index.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { ConnectionXtype } from './connection/connection'; -import { DatebaseXtype } from './database/database'; -import { MaintainXtype } from './maintain/maintain'; -import { ConnectionPoolXtype } from './connection_pool/connection_pool'; -export { - ConnectionXtype, - DatebaseXtype, - MaintainXtype, - ConnectionPoolXtype, -}; diff --git a/src/modules/pages/maintain/components/form_item/form_item.ts b/src/modules/pages/maintain/components/form_item/form_item.ts index d8cedf7..00b6f1a 100644 --- a/src/modules/pages/maintain/components/form_item/form_item.ts +++ b/src/modules/pages/maintain/components/form_item/form_item.ts @@ -1,8 +1,10 @@ import { shortcut } from '@core/core'; import { CONNECTION_LAYOUT } from '@constants/constant'; -export const FormItemXtype = 'dec.dcm.Maintain_form_item'; -@shortcut(FormItemXtype) + +@shortcut() export class FormItem extends BI.Widget { + static xtype = 'dec.dcm.Maintain_form_item'; + props = { name: '', forms: '', diff --git a/src/modules/pages/maintain/forms/components/form.jdbc.ts b/src/modules/pages/maintain/forms/components/form.jdbc.ts index b9c1f16..700564c 100644 --- a/src/modules/pages/maintain/forms/components/form.jdbc.ts +++ b/src/modules/pages/maintain/forms/components/form.jdbc.ts @@ -1,19 +1,19 @@ import { shortcut } from '@core/core'; -import { CollapseXtype, EVENT_CHANGE } from 'src/modules/components/collapse/collapse'; -import { FormItemXtype } from '../../components/form_item/form_item'; +import { Collapse, EVENT_CHANGE } from 'src/modules/components/collapse/collapse'; +import { FormItem } from '../../components/form_item/form_item'; import { Connection, ConnectionJDBC, ConnectionPoolJDBC } from 'src/modules/crud/crud.typings'; import { connectionType } from '@constants/env'; import { CONNECT_CHARSET, CONNECTION_LAYOUT, INT_MAX_VALUE, INT_MIN_VALUE } from '@constants/constant'; import { getAllDatabaseTypes, getJdbcDatabaseType, resolveUrlInfo, splitUrl } from '../../../../app.service'; -import { TextCheckerXtype } from '../../../../components/text_checker/text_checker'; +import { TextChecker } from '../../../../components/text_checker/text_checker'; import { ApiFactory } from 'src/modules/crud/apiFactory'; import { Editor, EditorIconCheckCombo, Label, TextAreaEditor, TextEditor, TextValueCombo, VerticalLayout } from '@fui/core'; -import { FormItem } from '../../../connection/components/form_item/form_item'; const api = new ApiFactory().create(); -export const FormJdbcXtype = 'dec.dcm.maintain.form.jdbc'; -@shortcut(FormJdbcXtype) +@shortcut() export class FormJdbc extends BI.Widget { + static xtype = 'dec.dcm.maintain.form.jdbc'; + props = { formData: {} as Connection, } @@ -77,22 +77,22 @@ export class FormJdbc extends BI.Widget { vgap, items: [ { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Name'), forms: [{ - type: TextCheckerXtype, + type: TextChecker.xtype, $value: 'connection-name', width: 300, value: connectionName, allowBlank: true, - ref: (_ref: any) => { + ref: (_ref: TextChecker) => { this.form.connectionName = _ref; }, watermark: BI.i18nText('Dec-Dcm_Data_Connections'), }], }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Driver'), forms: [{ type: BI.EditorIconCheckCombo.xtype, @@ -121,7 +121,7 @@ export class FormJdbc extends BI.Widget { }], }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Name'), forms: [{ type: BI.TextEditor.xtype, @@ -142,7 +142,7 @@ export class FormJdbc extends BI.Widget { }], }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Host'), forms: [{ type: BI.TextEditor.xtype, @@ -163,10 +163,10 @@ export class FormJdbc extends BI.Widget { }], }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Port'), forms: [{ - type: TextCheckerXtype, + type: TextChecker.xtype, $value: 'database-port', width: 300, allowBlank: true, @@ -177,7 +177,7 @@ export class FormJdbc extends BI.Widget { checker: (value: string) => this.checkInteger(value), autoFix: true, }, valueRangeConfig], - ref: (_ref: any) => { + ref: (_ref: TextChecker) => { this.form.port = _ref; }, listeners: [{ @@ -189,7 +189,7 @@ export class FormJdbc extends BI.Widget { }], }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_AuthType'), invisible: !databaseType.kerberos, forms: [{ @@ -226,7 +226,7 @@ export class FormJdbc extends BI.Widget { }], }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_UserName'), invisible: !!authType, ref: (_ref: FormItem) => { @@ -245,7 +245,7 @@ export class FormJdbc extends BI.Widget { }], }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Password'), invisible: !!authType, ref: (_ref: FormItem) => { @@ -268,7 +268,7 @@ export class FormJdbc extends BI.Widget { }], }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Principal'), invisible: !authType, ref: (_ref: FormItem) => { @@ -287,7 +287,7 @@ export class FormJdbc extends BI.Widget { }], }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_KeyPath'), invisible: !authType, ref: (_ref: FormItem) => { @@ -318,7 +318,7 @@ export class FormJdbc extends BI.Widget { }, }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_OriginalCharsetName'), forms: [{ type: BI.TextValueCombo.xtype, @@ -332,7 +332,7 @@ export class FormJdbc extends BI.Widget { }], }, { - type: FormItemXtype, + type: FormItem.xtype, invisible: !databaseType.hasSchema, height: 64, name: BI.i18nText('Dec-Dcm_Connection_Form_Pattern'), @@ -373,7 +373,7 @@ export class FormJdbc extends BI.Widget { bgap: 8, }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_URL'), forms: [{ type: BI.TextEditor.xtype, @@ -397,7 +397,7 @@ export class FormJdbc extends BI.Widget { }], }, { - type: CollapseXtype, + type: Collapse.xtype, bgap: -15, width: 70, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Advanced_Setting'), @@ -420,11 +420,11 @@ export class FormJdbc extends BI.Widget { }, items: [ { - type: FormItemXtype, + type: FormItem.xtype, tgap: 15, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Initial_Size'), forms: [{ - type: TextCheckerXtype, + type: TextChecker.xtype, $value: 'initial-size', width: 300, allowBlank: false, @@ -435,16 +435,16 @@ export class FormJdbc extends BI.Widget { autoFix: true, }, valueRangeConfig], watermark: BI.i18nText('Dec-Dcm_Connection_Form_Database_Initial_Size'), - ref: (_ref: any) => { + ref: (_ref: TextChecker) => { this.form.initialSize = _ref; }, }], }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Max_Active'), forms: [{ - type: TextCheckerXtype, + type: TextChecker.xtype, $value: 'max-active', width: 300, allowBlank: false, @@ -455,16 +455,16 @@ export class FormJdbc extends BI.Widget { checker: (value: string) => this.checkInteger(value), autoFix: true, }, valueRangeConfig], - ref: (_ref: any) => { + ref: (_ref: TextChecker) => { this.form.maxActive = _ref; }, }], }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Max_Idle'), forms: [{ - type: TextCheckerXtype, + type: TextChecker.xtype, $value: 'max-idle', width: 300, allowBlank: false, @@ -475,16 +475,16 @@ export class FormJdbc extends BI.Widget { checker: (value: string) => this.checkInteger(value), autoFix: true, }, valueRangeConfig], - ref: (_ref: any) => { + ref: (_ref: TextChecker) => { this.form.maxIdle = _ref; }, }], }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Min_Idle'), forms: [{ - type: TextCheckerXtype, + type: TextChecker.xtype, $value: 'min-idle', width: 300, allowBlank: false, @@ -495,17 +495,17 @@ export class FormJdbc extends BI.Widget { checker: (value: string) => this.checkInteger(value), autoFix: true, }, valueRangeConfig], - ref: (_ref: any) => { + ref: (_ref: TextChecker) => { this.form.minIdle = _ref; }, }], }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Max_Wait'), forms: [ { - type: TextCheckerXtype, + type: TextChecker.xtype, $value: 'max-wait', width: 300, allowBlank: false, @@ -516,7 +516,7 @@ export class FormJdbc extends BI.Widget { checker: (value: string) => this.checkInteger(value), autoFix: true, }, valueRangeConfig], - ref: (_ref: any) => { + ref: (_ref: TextChecker) => { this.form.maxWait = _ref; }, }, @@ -529,7 +529,7 @@ export class FormJdbc extends BI.Widget { ], }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_SQL_Validation_Query'), forms: [{ type: BI.TextAreaEditor.xtype, @@ -546,7 +546,7 @@ export class FormJdbc extends BI.Widget { }], }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Connection-Check'), forms: [{ type: BI.TextValueCombo.xtype, @@ -562,7 +562,7 @@ export class FormJdbc extends BI.Widget { }], }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Test_On_Return'), forms: [{ type: BI.TextValueCombo.xtype, @@ -578,7 +578,7 @@ export class FormJdbc extends BI.Widget { }], }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Test_While_Idle'), forms: [{ type: BI.TextValueCombo.xtype, @@ -594,11 +594,11 @@ export class FormJdbc extends BI.Widget { }], }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Test_Between_Eviction_Millis'), forms: [ { - type: TextCheckerXtype, + type: TextChecker.xtype, $value: 'test-between-evicition-millis', width: 300, allowBlank: false, @@ -609,7 +609,7 @@ export class FormJdbc extends BI.Widget { checker: (value: string) => this.checkNumber(value), autoFix: true, }, valueRangeConfig], - ref: (_ref: any) => { + ref: (_ref: TextChecker) => { this.form.timeBetweenEvictionRunsMillis = _ref; }, }, @@ -622,10 +622,10 @@ export class FormJdbc extends BI.Widget { ], }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Tests_PerEviction_Run_Num'), forms: [{ - type: TextCheckerXtype, + type: TextChecker.xtype, $value: 'test-pereviction-run-num', width: 300, allowBlank: false, @@ -636,17 +636,17 @@ export class FormJdbc extends BI.Widget { checker: (value: string) => this.checkInteger(value), autoFix: true, }, valueRangeConfig], - ref: (_ref: any) => { + ref: (_ref: TextChecker) => { this.form.numTestsPerEvictionRun = _ref; }, }], }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Min_Evictable_Idle_Time_Millis'), forms: [ { - type: TextCheckerXtype, + type: TextChecker.xtype, $value: 'min-evictable-idle-time-millis', width: 300, allowBlank: false, @@ -657,7 +657,7 @@ export class FormJdbc extends BI.Widget { checker: (value: string) => this.checkInteger(value), autoFix: true, }, valueRangeConfig], - ref: (_ref: any) => { + ref: (_ref: TextChecker) => { this.form.minEvictableIdleTimeMillis = _ref; }, }, diff --git a/src/modules/pages/maintain/forms/components/form.jndi.ts b/src/modules/pages/maintain/forms/components/form.jndi.ts index 80b1ea3..7295a93 100644 --- a/src/modules/pages/maintain/forms/components/form.jndi.ts +++ b/src/modules/pages/maintain/forms/components/form.jndi.ts @@ -1,14 +1,16 @@ import { shortcut } from '@core/core'; -import { FormItemXtype } from '../../components/form_item/form_item'; +import { FormItem } from '../../components/form_item/form_item'; import { ConnectionJNDI, Connection, ContextHashtable } from 'src/modules/crud/crud.typings'; import { CONNECT_CHARSET, CONNECTION_LAYOUT, JNDI_FACTORYS } from '@constants/constant'; -import { CollapseXtype, EVENT_CHANGE } from 'src/modules/components/collapse/collapse'; +import { Collapse, EVENT_CHANGE } from 'src/modules/components/collapse/collapse'; import { connectionType } from '@constants/env'; -import { TextCheckerXtype } from '../../../../components/text_checker/text_checker'; +import { TextChecker } from '../../../../components/text_checker/text_checker'; import { EditorIconCheckCombo, TextEditor, TextValueCombo, VerticalLayout } from '@fui/core'; -export const FormJndiXtype = 'dec.dcm.maintain.form.jndi'; -@shortcut(FormJndiXtype) + +@shortcut() export class FormJndi extends BI.Widget { + static xtype = 'dec.dcm.maintain.form.jndi'; + props = { formData: {} as Connection, } @@ -45,21 +47,21 @@ export class FormJndi extends BI.Widget { vgap, items: [ { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Name'), nameWidth: 200, forms: [{ - type: TextCheckerXtype, + type: TextChecker.xtype, $value: 'connection-name', width: 300, value: connectionName, - ref: (_ref: any) => { + ref: (_ref: TextChecker) => { this.form.connectionName = _ref; }, }], }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_JNDI_Form_ConnectionName'), nameWidth: 200, forms: [{ @@ -97,7 +99,7 @@ export class FormJndi extends BI.Widget { height: 175, items: [ { - type: FormItemXtype, + type: FormItem.xtype, name: 'INTIAL_CONTEXT_FACTORY', nameWidth: 200, isBold: false, @@ -127,7 +129,7 @@ export class FormJndi extends BI.Widget { }], }, { - type: FormItemXtype, + type: FormItem.xtype, name: 'PROVIDER_URL', isBold: false, nameWidth: 200, @@ -143,7 +145,7 @@ export class FormJndi extends BI.Widget { }], }, { - type: FormItemXtype, + type: FormItem.xtype, name: 'SECURITY_PRINCIPAL', isBold: false, nameWidth: 200, @@ -159,7 +161,7 @@ export class FormJndi extends BI.Widget { }], }, { - type: FormItemXtype, + type: FormItem.xtype, name: 'SECURITY_CREDENTIALS', isBold: false, nameWidth: 200, @@ -186,7 +188,7 @@ export class FormJndi extends BI.Widget { ], }, { - type: FormItemXtype, + type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_OriginalCharsetName'), nameWidth: 200, forms: [{ @@ -201,7 +203,7 @@ export class FormJndi extends BI.Widget { }], }, { - type: CollapseXtype, + type: Collapse.xtype, width: 70, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Advanced_Setting'), listeners: [ @@ -223,7 +225,7 @@ export class FormJndi extends BI.Widget { }, items: [ { - type: FormItemXtype, + type: FormItem.xtype, name: 'OBJECT_FACTORIES', nameWidth: 200, forms: [{ @@ -238,7 +240,7 @@ export class FormJndi extends BI.Widget { }], }, { - type: FormItemXtype, + type: FormItem.xtype, name: 'STATE_FACTORIES', nameWidth: 200, forms: [{ @@ -253,7 +255,7 @@ export class FormJndi extends BI.Widget { }], }, { - type: FormItemXtype, + type: FormItem.xtype, name: 'URL_PKG_PREFIXES', nameWidth: 200, forms: [{ @@ -268,7 +270,7 @@ export class FormJndi extends BI.Widget { }], }, { - type: FormItemXtype, + type: FormItem.xtype, name: 'DNS_URL', nameWidth: 200, forms: [{ @@ -283,7 +285,7 @@ export class FormJndi extends BI.Widget { }], }, { - type: FormItemXtype, + type: FormItem.xtype, name: 'AUTHORITATIVE', nameWidth: 200, forms: [{ @@ -298,7 +300,7 @@ export class FormJndi extends BI.Widget { }], }, { - type: FormItemXtype, + type: FormItem.xtype, name: 'BATCHSIZE', nameWidth: 200, forms: [{ @@ -313,7 +315,7 @@ export class FormJndi extends BI.Widget { }], }, { - type: FormItemXtype, + type: FormItem.xtype, name: 'REFERRAL', nameWidth: 200, forms: [{ @@ -328,7 +330,7 @@ export class FormJndi extends BI.Widget { }], }, { - type: FormItemXtype, + type: FormItem.xtype, name: 'SECURITY_PROTOCOL', nameWidth: 200, forms: [{ @@ -343,7 +345,7 @@ export class FormJndi extends BI.Widget { }], }, { - type: FormItemXtype, + type: FormItem.xtype, name: 'SECURITY_AUTHENTICATION', nameWidth: 200, forms: [{ @@ -358,7 +360,7 @@ export class FormJndi extends BI.Widget { }], }, { - type: FormItemXtype, + type: FormItem.xtype, name: 'LANGUAGE', nameWidth: 200, forms: [{ @@ -373,7 +375,7 @@ export class FormJndi extends BI.Widget { }], }, { - type: FormItemXtype, + type: FormItem.xtype, name: 'APPLET', nameWidth: 200, forms: [{ diff --git a/src/modules/pages/maintain/forms/components/form.plugin.ts b/src/modules/pages/maintain/forms/components/form.plugin.ts index 6774bca..ae9646e 100644 --- a/src/modules/pages/maintain/forms/components/form.plugin.ts +++ b/src/modules/pages/maintain/forms/components/form.plugin.ts @@ -1,9 +1,9 @@ import { shortcut } from '@core/core'; import { Connection } from 'src/modules/crud/crud.typings'; import { getPluginWidgetEdit } from '../../../../app.service'; -export const FormPluginXtype = 'dec.dcm.maintain_plugin'; -@shortcut(FormPluginXtype) +@shortcut() export class FormPlugin extends BI.Widget { + static xtype = 'dec.dcm.maintain_plugin'; props = { formData: {} as Connection, } diff --git a/src/modules/pages/maintain/forms/form.model.ts b/src/modules/pages/maintain/forms/form.model.ts index a7f5ec6..3bbc66e 100644 --- a/src/modules/pages/maintain/forms/form.model.ts +++ b/src/modules/pages/maintain/forms/form.model.ts @@ -5,21 +5,33 @@ import { ApiFactory } from 'src/modules/crud/apiFactory'; import { PAGE_INDEX } from '@constants/constant'; import { testConnection } from './form.server'; const api = new ApiFactory().create(); -export const MaintainFormModelXtype = 'dec.dcm.model.maintain_form'; -@model(MaintainFormModelXtype) + +@model() export class MaintainFormModel extends Model<{ - context : { - datebaseTypeSelected: AppModel['$$childContext']['datebaseTypeSelected']; - datebaseTypeSelectedOne: AppModel['$$childContext']['datebaseTypeSelectedOne']; - connectionSelectedOne: AppModel['$$childContext']['connectionSelectedOne']; - saveEvent: AppModel['$$childContext']['saveEvent']; - testEvent: AppModel['$$childContext']['testEvent']; - pageIndex: AppModel['$$childContext']['pageIndex']; - connections: AppModel['$$childContext']['connections']; - isCopy: AppModel['$$childContext']['isCopy']; - } + types : { + datebaseTypeSelected: AppModel['TYPE']['datebaseTypeSelected']; + datebaseTypeSelectedOne: AppModel['TYPE']['datebaseTypeSelectedOne']; + connectionSelectedOne: AppModel['TYPE']['connectionSelectedOne']; + saveEvent: AppModel['TYPE']['saveEvent']; + testEvent: AppModel['TYPE']['testEvent']; + pageIndex: AppModel['TYPE']['pageIndex']; + connections: AppModel['TYPE']['connections']; + isCopy: AppModel['TYPE']['isCopy']; + }, + context: MaintainFormModel['context']; }> { - context = ['datebaseTypeSelected', 'datebaseTypeSelectedOne', 'connectionSelectedOne', 'saveEvent', 'pageIndex', 'testEvent', 'connections', 'isCopy']; + static xtype = 'dec.dcm.model.maintain_form'; + + context = [ + 'datebaseTypeSelected', + 'datebaseTypeSelectedOne', + 'connectionSelectedOne', + 'saveEvent', + 'pageIndex', + 'testEvent', + 'connections', + 'isCopy', + ]; actions = { addConnection: (data: Connection) => api.addConnection(data), diff --git a/src/modules/pages/maintain/forms/form.server.ts b/src/modules/pages/maintain/forms/form.server.ts index a862e1f..dc52f4c 100644 --- a/src/modules/pages/maintain/forms/form.server.ts +++ b/src/modules/pages/maintain/forms/form.server.ts @@ -1,7 +1,7 @@ import { Connection, ConnectionJDBC } from '../../../crud/crud.typings'; import { connectionType, errorCode } from '@constants/env'; import { DATA_BASE_DRIVER_LINK, JDBC_ODBC_DRIVER, JDBC_ODBC_DRIVER_HELP_LINK, DEFAULT_HELP_LINK } from '@constants/constant'; -import { TestStatusXtype, EVENT_RELOAD, EVENT_CLOSE } from '../../../components/test_status/test_status'; +import { TestStatus } from '../../../components/test_status/test_status'; import { getJdbcDatabaseType } from '../../../app.service'; import { ApiFactory } from '../../../crud/apiFactory'; const api = new ApiFactory().create(); @@ -58,7 +58,7 @@ export function testConnection(value: Connection): Promise { }; BI.Maskers.create(id, null, { render: { - type: TestStatusXtype, + type: TestStatus.xtype, loadingText: BI.i18nText('Dec-Dcm_Connection_Testing'), loadingCls: 'upload-loading-icon', successText: BI.i18nText('Dec-Dcm_Connection_Test_Success'), @@ -71,14 +71,14 @@ export function testConnection(value: Connection): Promise { }, listeners: [ { - eventName: EVENT_RELOAD, + eventName: TestStatus.EVENT_RELOAD, action: () => { testStatus.setLoading(); testConnection(); }, }, { - eventName: EVENT_CLOSE, + eventName: TestStatus.EVENT_CLOSE, action: () => { BI.Maskers.remove(id); }, diff --git a/src/modules/pages/maintain/forms/form.ts b/src/modules/pages/maintain/forms/form.ts index 6eec4d3..fe33db2 100644 --- a/src/modules/pages/maintain/forms/form.ts +++ b/src/modules/pages/maintain/forms/form.ts @@ -1,17 +1,19 @@ import { shortcut, store } from '@core/core'; -import { MaintainFormModelXtype, MaintainFormModel } from './form.model'; -import { FormJdbc, FormJdbcXtype } from './components/form.jdbc'; -import { FormJndiXtype } from './components/form.jndi'; -import { FormPluginXtype } from './components/form.plugin'; +import { MaintainFormModel } from './form.model'; +import { FormJdbc } from './components/form.jdbc'; +import { FormJndi } from './components/form.jndi'; +import { FormPlugin } from './components/form.plugin'; import { connectionType, errorCode } from '@constants/env'; import { ConnectionJDBC, Connection, ResultType } from 'src/modules/crud/crud.typings'; import { DEFAULT_JNDI_DATA, DEFAULT_JDBC_POOL, DATEBASE_FILTER_TYPE } from '@constants/constant'; import { getJdbcDatabaseType, getChartLength } from '../../../app.service'; import { NAME_MAX_LENGTH } from '../../../app.constant'; -export const MaintainFormXtype = 'dec.dcm.maintain.form'; -@shortcut(MaintainFormXtype) -@store(MaintainFormModelXtype) + +@shortcut() +@store(MaintainFormModel) export class MaintainForm extends BI.Widget { + static xtype = 'dec.dcm.maintain.form'; + props = { connectionType: '', } @@ -86,13 +88,13 @@ export class MaintainForm extends BI.Widget { private getFormType() { switch (this.options.connectionType) { case connectionType.JDBC: - return FormJdbcXtype; + return FormJdbc.xtype; case connectionType.JNDI: - return FormJndiXtype; + return FormJndi.xtype; case DATEBASE_FILTER_TYPE.OTHER: - return FormJdbcXtype; + return FormJdbc.xtype; default: - return FormPluginXtype; + return FormPlugin.xtype; } } diff --git a/src/modules/pages/maintain/maintain.model.ts b/src/modules/pages/maintain/maintain.model.ts index 1eb12e5..3b57597 100644 --- a/src/modules/pages/maintain/maintain.model.ts +++ b/src/modules/pages/maintain/maintain.model.ts @@ -1,18 +1,19 @@ import { model, Model } from '@core/core'; import { AppModel } from '../../app.model'; -export const MaintainModelXtype = 'dec.dcm.model.maintain'; -@model(MaintainModelXtype) +@model() export class MaintainModel extends Model<{ - context : { - pageIndex: AppModel['$$childContext']['pageIndex']; - connections: AppModel['$$childContext']['connections']; - datebaseTypeSelected: AppModel['$$childContext']['datebaseTypeSelected']; - datebaseTypeSelectedOne: AppModel['$$childContext']['datebaseTypeSelectedOne']; - connectionSelectedOne: AppModel['$$childContext']['connectionSelectedOne']; - isCopy: AppModel['$$childContext']['isCopy']; - } + types : { + pageIndex: AppModel['TYPE']['pageIndex']; + connections: AppModel['TYPE']['connections']; + datebaseTypeSelected: AppModel['TYPE']['datebaseTypeSelected']; + datebaseTypeSelectedOne: AppModel['TYPE']['datebaseTypeSelectedOne']; + connectionSelectedOne: AppModel['TYPE']['connectionSelectedOne']; + isCopy: AppModel['TYPE']['isCopy']; + }, + context: MaintainModel['context']; }> { - context = ['pageIndex', 'datebaseTypeSelected', 'datebaseTypeSelectedOne', 'connectionSelectedOne', 'isCopy']; + static xtype = 'dec.dcm.model.maintain'; + context = ['pageIndex', 'datebaseTypeSelected', 'datebaseTypeSelectedOne', 'connectionSelectedOne', 'isCopy']; actions = { setPageIndex:(index: string) => { diff --git a/src/modules/pages/maintain/maintain.ts b/src/modules/pages/maintain/maintain.ts index 83d25a9..98ff521 100644 --- a/src/modules/pages/maintain/maintain.ts +++ b/src/modules/pages/maintain/maintain.ts @@ -1,7 +1,7 @@ import { shortcut, store } from '@core/core'; -import { MaintainModel, MaintainModelXtype } from './maintain.model'; -import { MaintainFormXtype } from './forms/form'; -import { LinkXtype, LinkButton } from 'src/modules/components/link_button/link'; +import { MaintainModel } from './maintain.model'; +import { MaintainForm } from './forms/form'; +import { LinkButton } from 'src/modules/components/link_button/link'; import { PAGE_INDEX } from '@constants/constant'; import { ApiFactory } from 'src/modules/crud/apiFactory'; const api = new ApiFactory().create(); @@ -11,10 +11,11 @@ import { getJdbcDatabaseType, getTextByDatabaseType } from '../../app.service'; import { ConnectionJDBC } from 'src/modules/crud/crud.typings'; import { ListView } from '@fui/core'; -export const MaintainXtype = 'dec.dcm.maintain'; -@shortcut(MaintainXtype) -@store(MaintainModelXtype) +@shortcut() +@store(MaintainModel) export class Maintain extends BI.Widget { + static xtype = 'dec.dcm.maintain'; + model: MaintainModel['model']; store: MaintainModel['store']; @@ -51,7 +52,7 @@ export class Maintain extends BI.Widget { height: 15, }, { - type: LinkXtype, + type: LinkButton.xtype, invisible: true, lgap: 10, text: BI.i18nText('Dec-Dcm_Socket_Unable_Connect_Tip'), @@ -86,7 +87,7 @@ export class Maintain extends BI.Widget { const { type } = this.getEditConnection(); return [{ - type: MaintainFormXtype, + type: MaintainForm.xtype, connectionType: type, }]; } diff --git a/src/modules/title/title.model.ts b/src/modules/title/title.model.ts index 56012db..737c324 100644 --- a/src/modules/title/title.model.ts +++ b/src/modules/title/title.model.ts @@ -1,15 +1,17 @@ import { model, Model } from '@core/core'; import { AppModel } from '../app.model'; -export const TitleModelXtype = 'dec.dcm.model.title'; -@model(TitleModelXtype) +@model() export class TitleModel extends Model<{ - context : { - pageIndex: AppModel['$$childContext']['pageIndex']; - datebaseTypeSelected: AppModel['$$childContext']['datebaseTypeSelected']; - } + types: { + pageIndex: AppModel['TYPE']['pageIndex']; + datebaseTypeSelected: AppModel['TYPE']['datebaseTypeSelected']; + }, + context: TitleModel['context']; }> { - context = ['pageIndex', 'datebaseTypeSelected'] + static xtype = 'dec.dcm.model.title'; + + context = ['pageIndex', 'datebaseTypeSelected'] actions = { setPageIndex: (index: string) => { diff --git a/src/modules/title/title.ts b/src/modules/title/title.ts index 32ba5b7..dc85b0f 100644 --- a/src/modules/title/title.ts +++ b/src/modules/title/title.ts @@ -1,14 +1,15 @@ import { shortcut, store } from '@core/core'; -import { TitleModel, TitleModelXtype } from './title.model'; +import { TitleModel } from './title.model'; import { PAGE_INDEX } from '@constants/constant'; import { TitleDatabase } from './title_database/title_datebase'; import { TitleMaintain } from './title_maintain/title_maintain'; import { LinearSegment, Tab } from '@fui/core'; -export const TitleXtype = 'dec.dcm.title'; -@shortcut(TitleXtype) -@store(TitleModelXtype) +@shortcut() +@store(TitleModel) export class Title extends BI.Widget { + static xtype = 'dec.dcm.title'; + props = { baseCls: 'bi-card', } @@ -76,11 +77,11 @@ export class Title extends BI.Widget { switch (index) { case PAGE_INDEX.DATEBASE: return { - type: TitleDatabase, + type: TitleDatabase.xtype, }; case PAGE_INDEX.MAINTAIN: return { - type: TitleMaintain, + type: TitleMaintain.xtype, }; default: return { diff --git a/src/modules/title/title_database/title_datebase.model.ts b/src/modules/title/title_database/title_datebase.model.ts index 1f45e5d..ba553c3 100644 --- a/src/modules/title/title_database/title_datebase.model.ts +++ b/src/modules/title/title_database/title_datebase.model.ts @@ -1,15 +1,17 @@ import { model, Model } from '@core/core'; import { AppModel } from 'src/modules/app.model'; -export const TitleDatebaseModelXtype = 'dec.dcm.model.title_datebase'; -@model(TitleDatebaseModelXtype) +@model() export class TitleDatebaseModel extends Model<{ - context: { - pageIndex: AppModel['$$childContext']['pageIndex']; - datebaseTypeSelected: AppModel['$$childContext']['datebaseTypeSelected']; - } + types: { + pageIndex: AppModel['TYPE']['pageIndex']; + datebaseTypeSelected: AppModel['TYPE']['datebaseTypeSelected']; + }, + context: TitleDatebaseModel['context']; }> { - context = ['pageIndex', 'datebaseTypeSelected']; + static xtype = 'dec.dcm.model.title_datebase'; + + context = ['pageIndex', 'datebaseTypeSelected']; actions = { setPageIndex: (index: string) => { diff --git a/src/modules/title/title_database/title_datebase.ts b/src/modules/title/title_database/title_datebase.ts index c8274c1..1441d75 100644 --- a/src/modules/title/title_database/title_datebase.ts +++ b/src/modules/title/title_database/title_datebase.ts @@ -1,13 +1,13 @@ import { shortcut, store } from '@core/core'; -import { TitleDatebaseModel, TitleDatebaseModelXtype } from './title_datebase.model'; +import { TitleDatebaseModel } from './title_datebase.model'; import { PAGE_INDEX } from '@constants/constant'; import { Button } from '@fui/core'; -export const TitleDatabase = 'dec.dcm.title.datebase'; +@shortcut() +@store(TitleDatebaseModel) +export class TitleDatabase extends BI.Widget { + static xtype = 'dec.dcm.title.datebase'; -@shortcut(TitleDatabase) -@store(TitleDatebaseModelXtype) -export class TitleDatabaseWidget extends BI.Widget { store: TitleDatebaseModel['store']; model: TitleDatebaseModel['model']; diff --git a/src/modules/title/title_maintain/title_maintain.model.ts b/src/modules/title/title_maintain/title_maintain.model.ts index ca0a8ed..21fd87a 100644 --- a/src/modules/title/title_maintain/title_maintain.model.ts +++ b/src/modules/title/title_maintain/title_maintain.model.ts @@ -2,18 +2,21 @@ import { model, Model } from '@core/core'; import { AppModel } from 'src/modules/app.model'; import { ApiFactory } from 'src/modules/crud/apiFactory'; const api = new ApiFactory().create(); -export const TitleMaintainModelXtype = 'dec.dcm.model.title_maintain'; -@model(TitleMaintainModelXtype) + +@model() export class TitleMaintainModel extends Model<{ - context : { - pageIndex: AppModel['$$childContext']['pageIndex']; - saveEvent: AppModel['$$childContext']['saveEvent']; - connectionSelected: AppModel['$$childContext']['connectionSelected']; - testEvent: AppModel['$$childContext']['testEvent']; - isCopy: AppModel['$$childContext']['isCopy']; - } + types : { + pageIndex: AppModel['TYPE']['pageIndex']; + saveEvent: AppModel['TYPE']['saveEvent']; + connectionSelected: AppModel['TYPE']['connectionSelected']; + testEvent: AppModel['TYPE']['testEvent']; + isCopy: AppModel['TYPE']['isCopy']; + }, + context: TitleMaintainModel['context']; }> { - context = ['pageIndex', 'saveEvent', 'testEvent', 'connectionSelected', 'isCopy']; + static xtype = 'dec.dcm.model.title_maintain'; + + context = ['pageIndex', 'saveEvent', 'testEvent', 'connectionSelected', 'isCopy']; actions = { setPageIndex: (index: string) => { diff --git a/src/modules/title/title_maintain/title_maintain.ts b/src/modules/title/title_maintain/title_maintain.ts index c7e9150..18fdc2c 100644 --- a/src/modules/title/title_maintain/title_maintain.ts +++ b/src/modules/title/title_maintain/title_maintain.ts @@ -1,11 +1,12 @@ import { shortcut, store } from '@core/core'; -import { TitleMaintainModel, TitleMaintainModelXtype } from './title_maintain.model'; +import { TitleMaintainModel } from './title_maintain.model'; import { PAGE_INDEX } from '@constants/constant'; -export const TitleMaintain = 'dec.dcm.title.maintain'; -@shortcut(TitleMaintain) -@store(TitleMaintainModelXtype) -export class TitleMaintainWidget extends BI.Widget { +@shortcut() +@store(TitleMaintainModel) +export class TitleMaintain extends BI.Widget { + static xtype = 'dec.dcm.title.maintain'; + store: TitleMaintainModel['store']; model: TitleMaintainModel['model']; render() {