From 351201503834433b58bbed1f06c409c9cbf7b1d3 Mon Sep 17 00:00:00 2001 From: MisicDemone <424532913@qq.com> Date: Tue, 2 Feb 2021 17:19:08 +0800 Subject: [PATCH 1/2] feat(vue): add vue3 compatibly --- package.json | 5 +- packages/vue/README.md | 25 ++-- packages/vue/package.json | 12 +- packages/vue/rollup.config.js | 54 +------- .../{ArrayField.vue => ArrayField.ts} | 43 ++++--- .../src/components/{Field.vue => Field.ts} | 44 ++++--- packages/vue/src/components/FormConsumer.ts | 22 ++++ packages/vue/src/components/FormConsumer.vue | 20 --- packages/vue/src/components/FormProvider.ts | 26 ++++ packages/vue/src/components/FormProvider.vue | 26 ---- .../{ObjectField.vue => ObjectField.ts} | 46 ++++--- .../{ReactiveField.vue => ReactiveField.ts} | 44 ++++--- .../{VoidField.vue => VoidField.ts} | 46 ++++--- packages/vue/src/components/index.ts | 12 +- packages/vue/src/global.ts | 8 -- packages/vue/src/hooks/useAttach.ts | 2 +- packages/vue/src/hooks/useField.ts | 2 +- packages/vue/src/hooks/useForm.ts | 2 +- packages/vue/src/hooks/useFormEffects.ts | 2 +- packages/vue/src/index.ts | 1 - packages/vue/src/shared/connect.ts | 25 ++-- packages/vue/src/shared/context.ts | 2 +- packages/vue/src/shims-vue.d.ts | 4 - packages/vue/src/types.ts | 34 +++-- .../src/utils/compatible-create-element.ts | 34 +++++ .../src/utils/define-observable-component.ts | 120 ++---------------- .../src/utils/get-row-component-from-props.ts | 15 +++ packages/vue/src/utils/observer-in-vue2.ts | 105 +++++++++++++++ packages/vue/src/utils/observer-in-vue3.ts | 63 +++++++++ packages/vue/tsconfig.json | 9 +- scripts/rollup.base.js | 3 - yarn.lock | 117 ++--------------- 32 files changed, 496 insertions(+), 477 deletions(-) rename packages/vue/src/components/{ArrayField.vue => ArrayField.ts} (65%) rename packages/vue/src/components/{Field.vue => Field.ts} (63%) create mode 100644 packages/vue/src/components/FormConsumer.ts delete mode 100644 packages/vue/src/components/FormConsumer.vue create mode 100644 packages/vue/src/components/FormProvider.ts delete mode 100644 packages/vue/src/components/FormProvider.vue rename packages/vue/src/components/{ObjectField.vue => ObjectField.ts} (63%) rename packages/vue/src/components/{ReactiveField.vue => ReactiveField.ts} (72%) rename packages/vue/src/components/{VoidField.vue => VoidField.ts} (61%) delete mode 100644 packages/vue/src/global.ts delete mode 100644 packages/vue/src/shims-vue.d.ts create mode 100644 packages/vue/src/utils/compatible-create-element.ts create mode 100644 packages/vue/src/utils/get-row-component-from-props.ts create mode 100644 packages/vue/src/utils/observer-in-vue2.ts create mode 100644 packages/vue/src/utils/observer-in-vue3.ts diff --git a/package.json b/package.json index 9c5ae211b52..3d1b2dd72e9 100644 --- a/package.json +++ b/package.json @@ -57,8 +57,7 @@ "@typescript-eslint/eslint-plugin": "^4.9.1", "@typescript-eslint/parser": "^4.8.2", "@umijs/plugin-sass": "^1.1.1", - "@vue/compiler-sfc": "^3.0.5", - "@vue/composition-api": "^1.0.0-beta.23", + "@vue/composition-api": "^1.0.0-rc.1", "@vuedx/typescript-plugin-vue": "^0.4.1", "antd": "^4.0.0", "chalk": "^2.4.2", @@ -114,7 +113,6 @@ "rollup-plugin-node-resolve": "^5.2.0", "rollup-plugin-typescript2": "^0.29.0", "rollup-plugin-uglify": "^6.0.4", - "rollup-plugin-vue": "^6.0.0", "semver-regex": "^2.0.0", "staged-git-files": "^1.1.2", "style-loader": "^1.1.3", @@ -125,6 +123,7 @@ "ts-node": "^9.1.1", "typescript": "^4.1.2", "vue": "^2.6.12", + "vue-demi": "latest", "vue-eslint-parser": "^7.1.1", "vue-template-compiler": "^2.6.12", "webpack": "^4.41.5", diff --git a/packages/vue/README.md b/packages/vue/README.md index 6e7bbf653e2..d8421d13c8a 100644 --- a/packages/vue/README.md +++ b/packages/vue/README.md @@ -1,12 +1,12 @@ ## Usage -### Preparation +### Requirement -```js -import VueCompositionAPI from '@vue/composition-api' +vue^2.6.0 + @vue/composition-api^1.0.0-beta.1 -Vue.use(VueCompositionAPI) -``` +Or + +vue>=3.0.0-rc.0 ### Quick Start @@ -41,7 +41,6 @@ Vue.use(VueCompositionAPI) > - +}) \ No newline at end of file diff --git a/packages/vue/src/components/Field.vue b/packages/vue/src/components/Field.ts similarity index 63% rename from packages/vue/src/components/Field.vue rename to packages/vue/src/components/Field.ts index 3b4c64b1724..07138f1fbfe 100644 --- a/packages/vue/src/components/Field.vue +++ b/packages/vue/src/components/Field.ts @@ -1,17 +1,12 @@ - - - +}) \ No newline at end of file diff --git a/packages/vue/src/components/FormConsumer.ts b/packages/vue/src/components/FormConsumer.ts new file mode 100644 index 00000000000..37e8ae4d370 --- /dev/null +++ b/packages/vue/src/components/FormConsumer.ts @@ -0,0 +1,22 @@ +import { defineObservableComponent } from '../utils/define-observable-component' +import { useForm } from '../hooks' +import h from '../utils/compatible-create-element' + +export default defineObservableComponent({ + name: 'FormConsumer', + observableSetup(collect, props, { attrs, slots }) { + const form = useForm() + collect({ + form + }) + return () => h( + 'div', + { attrs }, + { + default: () => slots.default && slots.default({ + form + }) + } + ) + } +}) \ No newline at end of file diff --git a/packages/vue/src/components/FormConsumer.vue b/packages/vue/src/components/FormConsumer.vue deleted file mode 100644 index a4f74b4c672..00000000000 --- a/packages/vue/src/components/FormConsumer.vue +++ /dev/null @@ -1,20 +0,0 @@ - - - diff --git a/packages/vue/src/components/FormProvider.ts b/packages/vue/src/components/FormProvider.ts new file mode 100644 index 00000000000..6b15c75f75a --- /dev/null +++ b/packages/vue/src/components/FormProvider.ts @@ -0,0 +1,26 @@ +import { defineObservableComponent } from '../utils/define-observable-component' +import { provide } from 'vue-demi' +import { FormSymbol } from '../shared/context' +import { IProviderProps } from '../types' +import { useAttach } from '../hooks/useAttach' +import h from '../utils/compatible-create-element' + +export default defineObservableComponent({ + name: 'FormProvider', + props: { + form: { + type: Object, + required: true + } + }, + setup(props: IProviderProps, { attrs, slots }) { + useAttach(props.form) + provide(FormSymbol, props.form) + + return () => h( + 'div', + { attrs }, + slots + ) + } +}) \ No newline at end of file diff --git a/packages/vue/src/components/FormProvider.vue b/packages/vue/src/components/FormProvider.vue deleted file mode 100644 index 2a9e1ef8b73..00000000000 --- a/packages/vue/src/components/FormProvider.vue +++ /dev/null @@ -1,26 +0,0 @@ - - - diff --git a/packages/vue/src/components/ObjectField.vue b/packages/vue/src/components/ObjectField.ts similarity index 63% rename from packages/vue/src/components/ObjectField.vue rename to packages/vue/src/components/ObjectField.ts index 40c960e06e3..4bf7410046a 100644 --- a/packages/vue/src/components/ObjectField.vue +++ b/packages/vue/src/components/ObjectField.ts @@ -1,17 +1,12 @@ - - - +}) \ No newline at end of file diff --git a/packages/vue/src/components/ReactiveField.vue b/packages/vue/src/components/ReactiveField.ts similarity index 72% rename from packages/vue/src/components/ReactiveField.vue rename to packages/vue/src/components/ReactiveField.ts index a775302b0c6..d6af7ba576c 100644 --- a/packages/vue/src/components/ReactiveField.vue +++ b/packages/vue/src/components/ReactiveField.ts @@ -1,7 +1,7 @@ - +}) \ No newline at end of file diff --git a/packages/vue/src/components/VoidField.vue b/packages/vue/src/components/VoidField.ts similarity index 61% rename from packages/vue/src/components/VoidField.vue rename to packages/vue/src/components/VoidField.ts index c56bfb3cc2c..4beda7912a8 100644 --- a/packages/vue/src/components/VoidField.vue +++ b/packages/vue/src/components/VoidField.ts @@ -1,17 +1,12 @@ - - - +}) \ No newline at end of file diff --git a/packages/vue/src/components/index.ts b/packages/vue/src/components/index.ts index eeed7b6c905..ba0bfbfbc0a 100644 --- a/packages/vue/src/components/index.ts +++ b/packages/vue/src/components/index.ts @@ -1,6 +1,6 @@ -export { default as FormProvider } from './FormProvider.vue' -export { default as FormConsumer } from './FormConsumer.vue' -export { default as ArrayField } from './ArrayField.vue' -export { default as ObjectField } from './ObjectField.vue' -export { default as VoidField } from './VoidField.vue' -export { default as Field } from './Field.vue' +export { default as FormProvider } from './FormProvider' +export { default as FormConsumer } from './FormConsumer' +export { default as ArrayField } from './ArrayField' +export { default as ObjectField } from './ObjectField' +export { default as VoidField } from './VoidField' +export { default as Field } from './Field' diff --git a/packages/vue/src/global.ts b/packages/vue/src/global.ts deleted file mode 100644 index 6f875a78d9e..00000000000 --- a/packages/vue/src/global.ts +++ /dev/null @@ -1,8 +0,0 @@ -import * as Types from './types' - -declare global { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - namespace Formily.Vue { - export { Types } - } -} diff --git a/packages/vue/src/hooks/useAttach.ts b/packages/vue/src/hooks/useAttach.ts index 386ec76662d..efc818706e7 100644 --- a/packages/vue/src/hooks/useAttach.ts +++ b/packages/vue/src/hooks/useAttach.ts @@ -1,4 +1,4 @@ -import { onMounted, onBeforeUnmount, ref, watch } from '@vue/composition-api' +import { onMounted, onBeforeUnmount, ref, watch } from 'vue-demi' interface IRecycleTarget { onMount: () => void diff --git a/packages/vue/src/hooks/useField.ts b/packages/vue/src/hooks/useField.ts index 04a7f157591..fdb332377c5 100644 --- a/packages/vue/src/hooks/useField.ts +++ b/packages/vue/src/hooks/useField.ts @@ -1,4 +1,4 @@ -import { inject } from '@vue/composition-api' +import { inject } from 'vue-demi' import { FieldSymbol } from '../shared/context' export const useField = (): T => { diff --git a/packages/vue/src/hooks/useForm.ts b/packages/vue/src/hooks/useForm.ts index 7e78dc5a259..47d1dbb9125 100644 --- a/packages/vue/src/hooks/useForm.ts +++ b/packages/vue/src/hooks/useForm.ts @@ -1,4 +1,4 @@ -import { inject } from '@vue/composition-api' +import { inject } from 'vue-demi' import { FormSymbol } from '../shared/context' export const useForm = (): Formily.Core.Models.Form => { diff --git a/packages/vue/src/hooks/useFormEffects.ts b/packages/vue/src/hooks/useFormEffects.ts index 8c20483f354..12922c44cca 100644 --- a/packages/vue/src/hooks/useFormEffects.ts +++ b/packages/vue/src/hooks/useFormEffects.ts @@ -1,4 +1,4 @@ -import { watch, onBeforeUnmount, ref } from '@vue/composition-api' +import { watch, onBeforeUnmount, ref } from 'vue-demi' import { uid } from '@formily/shared' import { useForm } from './useForm' diff --git a/packages/vue/src/index.ts b/packages/vue/src/index.ts index 1a2520d014a..0607ddf855c 100644 --- a/packages/vue/src/index.ts +++ b/packages/vue/src/index.ts @@ -1,5 +1,4 @@ export * from '@formily/core' export * from './components' export * from './shared' -export * from './global' export * from './hooks' diff --git a/packages/vue/src/shared/connect.ts b/packages/vue/src/shared/connect.ts index ba0a6110380..14de0c3cea7 100644 --- a/packages/vue/src/shared/connect.ts +++ b/packages/vue/src/shared/connect.ts @@ -1,13 +1,14 @@ /* eslint-disable vue/one-component-per-file */ -import { h, defineComponent } from '@vue/composition-api' +import { defineComponent } from 'vue-demi' import { isFn, FormPath } from '@formily/shared' import { isVoidField } from '@formily/core' import { defineObservableComponent } from '../utils/define-observable-component' import { VueComponent, IComponentMapper, IStateMapper } from '../types' import { useField } from '../hooks/useField' +import h from '../utils/compatible-create-element' -export function mapProps(...args: IStateMapper[]) { - return (target: VueComponent) => { +export function mapProps(...args: IStateMapper[]) { + return (target: T) => { return defineObservableComponent({ observableSetup(collect, props, { slots }) { const field = useField() @@ -42,15 +43,15 @@ export function mapProps(...args: IStateMapper[]) { { props: results, }, - slots.default && slots.default() + slots ) }, }) } } -export function mapReadPretty(component: VueComponent) { - return (target: VueComponent) => { +export function mapReadPretty(component: C) { + return (target: T) => { return defineObservableComponent({ observableSetup(collect, props: { [key: string]: any }, { slots }) { const field = useField() @@ -65,28 +66,28 @@ export function mapReadPretty(component: VueComponent) { { props: props, }, - slots.default && slots.default() + slots ) }, }) } } -export function connect(target: VueComponent, ...args: IComponentMapper[]) { +export function connect(target: T, ...args: IComponentMapper[]) { const Component = args.reduce((target: VueComponent, mapper) => { return mapper(target) - }, target) as VueComponent - + }, target) + return defineComponent({ name: target['name'], - setup(props: { [key: string]: any }, { slots }) { + setup(props: T['props'], { slots }) { return () => h( Component, { props: props, }, - slots.default && slots.default() + slots ) }, }) diff --git a/packages/vue/src/shared/context.ts b/packages/vue/src/shared/context.ts index 35cfee72999..2ff46360bc4 100644 --- a/packages/vue/src/shared/context.ts +++ b/packages/vue/src/shared/context.ts @@ -1,4 +1,4 @@ -import { InjectionKey } from '@vue/composition-api' +import { InjectionKey } from 'vue-demi' export const FormSymbol: InjectionKey = Symbol('form') export const FieldSymbol: InjectionKey = Symbol( diff --git a/packages/vue/src/shims-vue.d.ts b/packages/vue/src/shims-vue.d.ts deleted file mode 100644 index d9f24faa42e..00000000000 --- a/packages/vue/src/shims-vue.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -declare module '*.vue' { - import Vue from 'vue' - export default Vue -} diff --git a/packages/vue/src/types.ts b/packages/vue/src/types.ts index 8d819659e08..373b034ebee 100644 --- a/packages/vue/src/types.ts +++ b/packages/vue/src/types.ts @@ -1,6 +1,14 @@ -export type VueComponent = Vue.VueConstructor | Vue.FunctionalComponentOptions | Vue.ComponentOptions +import Vue, { ComponentOptions } from 'vue' +import { SetupContext } from 'vue-demi' -export type IProviderProps = { +export type VueComponent = ComponentOptions + +export interface ObservableComponentOptions { + observableSetup?: (collect?: (data: Record) => any, props?: Record, context?: SetupContext) => any + [key: string]: any +} + +export interface IProviderProps { form: Formily.Core.Models.Form } @@ -14,14 +22,14 @@ export type IVoidFieldProps< C extends VueComponent > = Formily.Core.Types.IVoidFieldFactoryProps - export interface IComponentMapper { - (target: T): VueComponent - } - - export type IStateMapper = - | { - extract: keyof Formily.Core.Models.Field - to?: keyof Props - transform?: (value: any) => any - } - | ((props: Props, field: Formily.Core.Types.GeneralField) => Props) \ No newline at end of file +export interface IComponentMapper { + (target: T): VueComponent +} + +export type IStateMapper = + | { + extract: keyof Formily.Core.Models.Field + to?: keyof Props + transform?: (value: any) => any + } + | ((props: Props, field: Formily.Core.Types.GeneralField) => Props) \ No newline at end of file diff --git a/packages/vue/src/utils/compatible-create-element.ts b/packages/vue/src/utils/compatible-create-element.ts new file mode 100644 index 00000000000..6ef802c4461 --- /dev/null +++ b/packages/vue/src/utils/compatible-create-element.ts @@ -0,0 +1,34 @@ +import { h, isVue2 } from 'vue-demi'; +import { Component, AsyncComponent, VNodeData, VNode, VNodeChildren } from 'vue'; + +type RenderChildren = { + [key in string]?: (...args: any[]) => VNode[]; +} + +type Tag = string | Component | AsyncComponent | (() => Component) + +const compatibleCreateElement = (tag: Tag, data: VNodeData, components: RenderChildren) => { + if (isVue2) { + const hInVue2 = h as ((tag: Tag, data: VNodeData, components: VNodeChildren) => VNode) + const children = Object.keys(components).map(key => components[key]()) + return hInVue2(tag, data, children) + } else { + const hInVue3 = h as ((tag: Tag, data: VNodeData, components: RenderChildren) => VNode) + const newData = {} + Object.assign(newData, data.props, data.attrs) + if (data.on) { + const events = Object.keys(data.on) + events.forEach(event => { + const eventName = `on${event[0].toUpperCase()}${event.slice(1)}` + newData[eventName] = data.on[event] + }) + } + return hInVue3(tag, newData, components) + } +} + +export default compatibleCreateElement + +export { + compatibleCreateElement as h +} \ No newline at end of file diff --git a/packages/vue/src/utils/define-observable-component.ts b/packages/vue/src/utils/define-observable-component.ts index b09038962a2..b8917e70fed 100644 --- a/packages/vue/src/utils/define-observable-component.ts +++ b/packages/vue/src/utils/define-observable-component.ts @@ -1,116 +1,16 @@ // some from mobx-vue: https://github.com/mobxjs/mobx-vue -import Vue from 'vue' -import { isObservable, Reaction } from 'mobx' -import { getCurrentInstance, SetupContext } from '@vue/composition-api' - -type Data = { [key: string]: any } - -const noop = () => { - /* empty */ -} - -const disposerSymbol = Symbol('disposerSymbol') - -interface ComponentOptions { - observableSetup?: (collect?: (data: Data) => any, props?: Data, context?: SetupContext) => any - [key: string]: any -} - -const defineObservableComponent = (originalOptions: ComponentOptions) => { - const name = originalOptions.name || 'ObservableComponent' - - const { observableSetup } = originalOptions - let setup = originalOptions.setup - if (observableSetup) { - setup = (props: Data, context: SetupContext) => { - const vm = getCurrentInstance()?.proxy - const collect = (data: Data) => - Object.keys(data).reduce((result: any, field) => { - const value = data[field] - if (isObservable(value)) { - Object.defineProperty(vm, field, { - configurable: true, - get() { - return value - }, - // @formatter:off - // tslint:disable-next-line - set() {} - // @formatter:on - }) - } else { - result[field] = value - } - - return result - }, {}) - return observableSetup(collect, props, context) - } - - delete originalOptions.observableSetup +import { isVue2 } from 'vue-demi' +import { defineObservableComponent as defineObservableComponentV2 } from './observer-in-vue2' +import { defineObservableComponent as defineObservableComponentV3 } from './observer-in-vue3' +import { ObservableComponentOptions } from '../types' + +const defineObservableComponent = (originalOptions: ObservableComponentOptions) => { + if (isVue2) { + return defineObservableComponentV2(originalOptions) + } else { + return defineObservableComponentV3(originalOptions) } - - - const newOptions = { - name, - ...originalOptions, - setup, - // overrider the cached constructor to avoid extending skip - // @see https://github.com/vuejs/vue/blob/6cc070063bd211229dff5108c99f7d11b6778550/src/core/global-api/extend.js#L24 - _Ctor: {} - } as any - - const Component = Vue.extend(newOptions) - - const { $mount, $destroy } = Component.prototype - - Component.prototype.$mount = function(this: any, ...args: any[]) { - let mounted = false - this[disposerSymbol] = noop - - let nativeRenderOfVue: any - const reactiveRender = () => { - reaction.track(() => { - if (!mounted) { - $mount.apply(this, args) - mounted = true - nativeRenderOfVue = this._watcher.getter - // rewrite the native render method of vue with our reactive tracker render - // thus if component updated by vue watcher, we could re track and collect dependencies by mobx - this._watcher.getter = reactiveRender - } else { - nativeRenderOfVue.call(this, this) - } - }) - - return this - } - - const reaction = new Reaction(`${name}.render()`, reactiveRender) - - this[disposerSymbol] = reaction.getDisposer_() - - return reactiveRender() - } - - Component.prototype.$destroy = function(this: Vue) { - ;(this as any)[disposerSymbol]() - $destroy.apply(this) - } - - const extendedComponentNamePropertyDescriptor = - Object.getOwnPropertyDescriptor(Component, 'name') || {} - if (extendedComponentNamePropertyDescriptor.configurable === true) { - Object.defineProperty(Component, 'name', { - writable: false, - value: name, - enumerable: false, - configurable: false - }) - } - - return Component } export { defineObservableComponent } diff --git a/packages/vue/src/utils/get-row-component-from-props.ts b/packages/vue/src/utils/get-row-component-from-props.ts new file mode 100644 index 00000000000..c3833537894 --- /dev/null +++ b/packages/vue/src/utils/get-row-component-from-props.ts @@ -0,0 +1,15 @@ +import { IFieldProps, VueComponent } from '../types' +import { toRaw } from 'vue-demi' + +export const getRowComponentFromProps = (props: IFieldProps) => { + const { component, decorator } = props + let newComponent: typeof props.component + let newDecorator: typeof props.component + if (Array.isArray(component)) { + newComponent = [toRaw(component[0]), component[1]] + } + if (Array.isArray(decorator)) { + newDecorator = [toRaw(decorator[0]), decorator[1]] + } + return { component: newComponent, decorator: newDecorator } +} \ No newline at end of file diff --git a/packages/vue/src/utils/observer-in-vue2.ts b/packages/vue/src/utils/observer-in-vue2.ts new file mode 100644 index 00000000000..3af9e29065b --- /dev/null +++ b/packages/vue/src/utils/observer-in-vue2.ts @@ -0,0 +1,105 @@ +// https://github.com/mobxjs/mobx-vue + +import { isObservable, Reaction } from 'mobx' +import { Vue, getCurrentInstance, SetupContext } from 'vue-demi' +import { ObservableComponentOptions } from '../types' + +type Data = Record + +const noop = () => { + /* empty */ +} + +const disposerSymbol = Symbol('disposerSymbol') + +const defineObservableComponent = (originalOptions: ObservableComponentOptions) => { + const name = originalOptions.name || 'ObservableComponent' + const { observableSetup } = originalOptions + let setup = originalOptions.setup + if (observableSetup) { + setup = (props: Data, context: SetupContext) => { + const vm = getCurrentInstance()?.proxy || getCurrentInstance() + const collect = (data: Data) => + Object.keys(data).reduce((result: any, field) => { + const value = data[field] + if (isObservable(value)) { + Object.defineProperty(vm, field, { + configurable: true, + get() { + return value + }, + set() { + // nothing to do + } + }) + } else { + result[field] = value + } + + return result + }, {}) + const dataOrRenderFunction = observableSetup(collect, props, context) + return dataOrRenderFunction + } + delete originalOptions.observableSetup + } + + + const newOptions = { + name, + ...originalOptions, + setup, + _Ctor: {} + } as any + + const Component = Vue.extend(newOptions) + + const { $mount, $destroy } = Component.prototype + + Component.prototype.$mount = function(this: any, ...args: any[]) { + let mounted = false + this[disposerSymbol] = noop + + let nativeRenderOfVue: any + const reactiveRender = () => { + reaction.track(() => { + if (!mounted) { + $mount.apply(this, args) + mounted = true + nativeRenderOfVue = this._watcher.getter + this._watcher.getter = reactiveRender + } else { + nativeRenderOfVue.call(this, this) + } + }) + + return this + } + + const reaction = new Reaction(`${name}.render()`, reactiveRender) + + this[disposerSymbol] = reaction.getDisposer_() + + return reactiveRender() + } + + Component.prototype.$destroy = function(this: Vue) { + ;(this as any)[disposerSymbol]() + $destroy.apply(this) + } + + const extendedComponentNamePropertyDescriptor = + Object.getOwnPropertyDescriptor(Component, 'name') || {} + if (extendedComponentNamePropertyDescriptor.configurable === true) { + Object.defineProperty(Component, 'name', { + writable: false, + value: name, + enumerable: false, + configurable: false + }) + } + + return Component +} + +export { defineObservableComponent } diff --git a/packages/vue/src/utils/observer-in-vue3.ts b/packages/vue/src/utils/observer-in-vue3.ts new file mode 100644 index 00000000000..1d47b13e43e --- /dev/null +++ b/packages/vue/src/utils/observer-in-vue3.ts @@ -0,0 +1,63 @@ +// https://github.com/umijs/neeko/blob/master/src/vue/observer.ts + +import { autorun } from 'mobx' +import { SetupContext, defineComponent } from 'vue-demi' +import { ObservableComponentOptions } from '../types' + +type Data = Record + +const defineObservableComponent = (originalOptions: ObservableComponentOptions) => { + const name = originalOptions.name || 'ObservableComponent' + let dispose: () => void + const mounted = function (this: any) { + // hack, collect by vue internal render api + // hope this is stable, and without effects + const fn = () => { + this.$.render( + this, + this.$.renderCache, + this.$props, + this.$.setupState, + this.$data, + this.$options, + ) + this.$forceUpdate() + } + + dispose = autorun(fn) + } + + const unmounted = function () { + dispose?.() + } + + const { observableSetup } = originalOptions + let setup = originalOptions.setup + if (observableSetup) { + setup = (props: Data, context: SetupContext) => { + const collect = (data: Data) => data + return observableSetup(collect, props, context) + } + + delete originalOptions.observableSetup + } + + + const newOptions = { + name, + ...originalOptions, + setup, + mounted() { + originalOptions?.mounted?.call(this) + mounted.call(this) + }, + unmounted() { + originalOptions?.unmounted?.call(this) + unmounted.call(this) + }, + } as any + + return defineComponent(newOptions) +} + +export { defineObservableComponent } diff --git a/packages/vue/tsconfig.json b/packages/vue/tsconfig.json index 9891d02b6de..7bb69338c68 100644 --- a/packages/vue/tsconfig.json +++ b/packages/vue/tsconfig.json @@ -1,16 +1,11 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "plugins": [ - { - "name": "@vuedx/typescript-plugin-vue" - } - ] + "outDir": "./lib" }, "include": [ "./src/**/*.ts", - "./src/**/*.tsx", - "./src/**/*.vue" + "./src/**/*.tsx" ], "exclude": [ "./src/__tests__/*", diff --git a/scripts/rollup.base.js b/scripts/rollup.base.js index 45ed15e53c1..fd43f1f8d10 100644 --- a/scripts/rollup.base.js +++ b/scripts/rollup.base.js @@ -1,9 +1,7 @@ import typescript from 'rollup-plugin-typescript2' import resolve from 'rollup-plugin-node-resolve' -import path from 'path' import commonjs from '@rollup/plugin-commonjs' import externalGlobals from 'rollup-plugin-external-globals' -import vue from 'rollup-plugin-vue' import { uglify } from 'rollup-plugin-uglify' const plugins = [ @@ -16,7 +14,6 @@ const plugins = [ }, }, }), - vue(), resolve(), commonjs(), externalGlobals({ diff --git a/yarn.lock b/yarn.lock index f4819a8b7c0..6c7a7c14e13 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3921,7 +3921,7 @@ yargs "15.4.1" yargs-parser "18.1.3" -"@vue/compiler-core@3.0.5", "@vue/compiler-core@^3.0.0", "@vue/compiler-core@^3.0.1", "@vue/compiler-core@^3.0.2": +"@vue/compiler-core@^3.0.0", "@vue/compiler-core@^3.0.1", "@vue/compiler-core@^3.0.2": version "3.0.5" resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.0.5.tgz#a6e54cabe9536e74c6513acd2649f311af1d43ac" integrity sha512-iFXwk2gmU/GGwN4hpBwDWWMLvpkIejf/AybcFtlQ5V1ur+5jwfBaV0Y1RXoR6ePfBPJixtKZ3PmN+M+HgMAtfQ== @@ -3932,48 +3932,10 @@ estree-walker "^2.0.1" source-map "^0.6.1" -"@vue/compiler-dom@3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.5.tgz#7885a13e6d18f64dde8ebceec052ed2c102696c2" - integrity sha512-HSOSe2XSPuCkp20h4+HXSiPH9qkhz6YbW9z9ZtL5vef2T2PMugH7/osIFVSrRZP/Ul5twFZ7MIRlp8tPX6e4/g== - dependencies: - "@vue/compiler-core" "3.0.5" - "@vue/shared" "3.0.5" - -"@vue/compiler-sfc@^3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.5.tgz#3ae08e60244a72faf9598361874fb7bdb5b1d37c" - integrity sha512-uOAC4X0Gx3SQ9YvDC7YMpbDvoCmPvP0afVhJoxRotDdJ+r8VO3q4hFf/2f7U62k4Vkdftp6DVni8QixrfYzs+w== - dependencies: - "@babel/parser" "^7.12.0" - "@babel/types" "^7.12.0" - "@vue/compiler-core" "3.0.5" - "@vue/compiler-dom" "3.0.5" - "@vue/compiler-ssr" "3.0.5" - "@vue/shared" "3.0.5" - consolidate "^0.16.0" - estree-walker "^2.0.1" - hash-sum "^2.0.0" - lru-cache "^5.1.1" - magic-string "^0.25.7" - merge-source-map "^1.1.0" - postcss "^7.0.32" - postcss-modules "^3.2.2" - postcss-selector-parser "^6.0.4" - source-map "^0.6.1" - -"@vue/compiler-ssr@3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.0.5.tgz#7661ad891a0be948726c7f7ad1e425253c587b83" - integrity sha512-Wm//Kuxa1DpgjE4P9W0coZr8wklOfJ35Jtq61CbU+t601CpPTK4+FL2QDBItaG7aoUUDCWL5nnxMkuaOgzTBKg== - dependencies: - "@vue/compiler-dom" "3.0.5" - "@vue/shared" "3.0.5" - -"@vue/composition-api@^1.0.0-beta.23": - version "1.0.0-beta.26" - resolved "https://registry.yarnpkg.com/@vue/composition-api/-/composition-api-1.0.0-beta.26.tgz#7a6027aa4b62c3017cd5991d8bebc2cdb3f67ade" - integrity sha512-mLCon9CNE1/dUwo12KDjsQ9ezxOJIaVv6gnfGxieaJbE8LqZVFnBFK19pGclvg2NreDrOhU4sPNt3FNRJo21Dg== +"@vue/composition-api@^1.0.0-rc.1": + version "1.0.0-rc.1" + resolved "https://r.cnpmjs.org/@vue/composition-api/download/@vue/composition-api-1.0.0-rc.1.tgz#d5286bbaffcd1987e56d5e3a9f26bfb6023e7c41" + integrity sha1-1Shruv/NGYflbV46nya/tgI+fEE= dependencies: tslib "^2.0.3" @@ -5046,7 +5008,7 @@ bindings@^1.5.0: dependencies: file-uri-to-path "1.0.0" -bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5, bluebird@^3.7.2: +bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5: version "3.7.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== @@ -6151,13 +6113,6 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0: resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= -consolidate@^0.16.0: - version "0.16.0" - resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.16.0.tgz#a11864768930f2f19431660a65906668f5fbdc16" - integrity sha512-Nhl1wzCslqXYTJVDyJCu3ODohy9OfBMB5uD2BiBTzd7w+QY0lBzafkR8y8755yMYHAaMD4NuzbAw03/xzfw+eQ== - dependencies: - bluebird "^3.7.2" - constants-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" @@ -8687,13 +8642,6 @@ gauge@~2.7.3: strip-ansi "^3.0.1" wide-align "^1.1.0" -generic-names@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/generic-names/-/generic-names-2.0.1.tgz#f8a378ead2ccaa7a34f0317b05554832ae41b872" - integrity sha512-kPCHWa1m9wGG/OwQpeweTwM/PYiQLrUIxXbt/P4Nic3LbGjCP0YwrALHW1uNLKZ0LIMg+RF+XRlj2ekT9ZlZAQ== - dependencies: - loader-utils "^1.1.0" - genfun@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537" @@ -9614,11 +9562,6 @@ iconv-lite@^0.6.2: dependencies: safer-buffer ">= 2.1.2 < 3.0.0" -icss-replace-symbols@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded" - integrity sha1-Bupvg2ead0njhs/h/oEq5dsiPe0= - icss-utils@^4.0.0, icss-utils@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467" @@ -11597,11 +11540,6 @@ lodash._reinterpolate@^3.0.0: resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0= -lodash.camelcase@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" - integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= - lodash.clone@4.3.2: version "4.3.2" resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.3.2.tgz#e56b176b6823a7dde38f7f2bf58de7d5971200e9" @@ -12187,13 +12125,6 @@ merge-descriptors@1.0.1: resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= -merge-source-map@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646" - integrity sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw== - dependencies: - source-map "^0.6.1" - merge-stream@2.0.0, merge-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" @@ -14229,21 +14160,6 @@ postcss-modules-values@^4.0.0: dependencies: icss-utils "^5.0.0" -postcss-modules@^3.2.2: - version "3.2.2" - resolved "https://registry.yarnpkg.com/postcss-modules/-/postcss-modules-3.2.2.tgz#ee390de0f9f18e761e1778dfb9be26685c02c51f" - integrity sha512-JQ8IAqHELxC0N6tyCg2UF40pACY5oiL6UpiqqcIFRWqgDYO8B0jnxzoQ0EOpPrWXvcpu6BSbQU/3vSiq7w8Nhw== - dependencies: - generic-names "^2.0.1" - icss-replace-symbols "^1.1.0" - lodash.camelcase "^4.3.0" - postcss "^7.0.32" - postcss-modules-extract-imports "^2.0.0" - postcss-modules-local-by-default "^3.0.2" - postcss-modules-scope "^2.2.0" - postcss-modules-values "^3.0.0" - string-hash "^1.1.1" - postcss-nesting@^7.0.0: version "7.0.1" resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-7.0.1.tgz#b50ad7b7f0173e5b5e3880c3501344703e04c052" @@ -16149,16 +16065,7 @@ rollup-plugin-uglify@^6.0.4: serialize-javascript "^2.1.2" uglify-js "^3.4.9" -rollup-plugin-vue@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-vue/-/rollup-plugin-vue-6.0.0.tgz#e379e93e5ae9a8648522f698be2e452e8672aaf2" - integrity sha512-oVvUd84d5u73M2HYM3XsMDLtZRIA/tw2U0dmHlXU2UWP5JARYHzh/U9vcxaN/x/9MrepY7VH3pHFeOhrWpxs/Q== - dependencies: - debug "^4.1.1" - hash-sum "^2.0.0" - rollup-pluginutils "^2.8.2" - -rollup-pluginutils@^2.8.1, rollup-pluginutils@^2.8.2: +rollup-pluginutils@^2.8.1: version "2.8.2" resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e" integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ== @@ -17028,11 +16935,6 @@ string-convert@^0.2.0: resolved "https://registry.yarnpkg.com/string-convert/-/string-convert-0.2.1.tgz#6982cc3049fbb4cd85f8b24568b9d9bf39eeff97" integrity sha1-aYLMMEn7tM2F+LJFaLnZvznu/5c= -string-hash@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/string-hash/-/string-hash-1.1.3.tgz#e8aafc0ac1855b4666929ed7dd1275df5d6c811b" - integrity sha1-6Kr8CsGFW0Zmkp7X3RJ1311sgRs= - string-length@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz#4a973bf31ef77c4edbceadd6af2611996985f8a1" @@ -18452,6 +18354,11 @@ vscode-web-custom-data@^0.3.2: resolved "https://registry.yarnpkg.com/vscode-web-custom-data/-/vscode-web-custom-data-0.3.2.tgz#62a5a924397d8056c5524ff0ff8f14eb815b7066" integrity sha512-GGZ99dJbARyh6rv03dXZImGlP5WvNG382A3nIt0yX1uyqBa558L/klHWcgEJzcVkG4t16OQWwPedMR3JkeD2Qg== +vue-demi@latest: + version "0.6.0" + resolved "https://r.cnpmjs.org/vue-demi/download/vue-demi-0.6.0.tgz#e314282f704cb449119b9fd002cbbc0e39f591fe" + integrity sha1-4xQoL3BMtEkRm5/QAsu8Djn1kf4= + vue-eslint-parser@^7.1.1, vue-eslint-parser@^7.3.0: version "7.3.0" resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.3.0.tgz#894085839d99d81296fa081d19643733f23d7559" From 1cf561ce81aca6b52a33c971f283a3b38488ebcf Mon Sep 17 00:00:00 2001 From: MisicDemone <424532913@qq.com> Date: Tue, 2 Feb 2021 20:46:35 +0800 Subject: [PATCH 2/2] feat: add .yarnrc --- .npmrc | 1 - .yarnrc | 1 + yarn.lock | 749 +++++++++++++++++++++++++++--------------------------- 3 files changed, 375 insertions(+), 376 deletions(-) delete mode 100644 .npmrc create mode 100644 .yarnrc diff --git a/.npmrc b/.npmrc deleted file mode 100644 index 9cf9495031e..00000000000 --- a/.npmrc +++ /dev/null @@ -1 +0,0 @@ -package-lock=false \ No newline at end of file diff --git a/.yarnrc b/.yarnrc new file mode 100644 index 00000000000..6c8b0a19069 --- /dev/null +++ b/.yarnrc @@ -0,0 +1 @@ +registry "https://registry.yarnpkg.com" \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 6c7a7c14e13..da34989defa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -43,7 +43,7 @@ resolved "https://registry.yarnpkg.com/@ant-design/icons-svg/-/icons-svg-4.1.0.tgz#480b025f4b20ef7fe8f47d4a4846e4fee84ea06c" integrity sha512-Fi03PfuUqRs76aI3UWYpP864lkrfPo0hluwGqh7NJdLhvH4iRDc3jbJqZIvRDLHKbXrvAfPPV3+zjUccfFvWOQ== -"@ant-design/icons@^4.0.0", "@ant-design/icons@^4.0.2", "@ant-design/icons@^4.3.0": +"@ant-design/icons@^4.0.0", "@ant-design/icons@^4.0.2", "@ant-design/icons@^4.4.0": version "4.4.0" resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-4.4.0.tgz#d4e4ba5910454e1d3f67a802d2aad9ee75a51dea" integrity sha512-+X44IouK56JbP3r7zM+Zoykv5wQlXBlxY0NTaFXGpiyYSS/Bh6HIo9aTF62QkSuDTqA3UpeNVTRFioKKRmkWDQ== @@ -1290,9 +1290,9 @@ integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw== "@ctrl/tinycolor@^3.3.1": - version "3.3.2" - resolved "https://registry.yarnpkg.com/@ctrl/tinycolor/-/tinycolor-3.3.2.tgz#902c4c7e6b48553e4f83c0c1c565a6b071b02520" - integrity sha512-28A2j9DISNtHRcfc+FSCkxIAMnQoORQYz+UQLjc0+KlsGl80MqfbG3EzqXxzVmCMatlgmHfcX7/DBoMg+ik/Fg== + version "3.3.4" + resolved "https://registry.yarnpkg.com/@ctrl/tinycolor/-/tinycolor-3.3.4.tgz#59691edd031eedc431bda1bdf601257c06289a40" + integrity sha512-8vmPV/nIULFDWsnJalQJDqFLC2uTPx6A/ASA2t27QGp+7oXnbWWXCe0uV8xasIH2rGbI/XoB2vmkdP/94WvMrw== "@emotion/cache@^10.0.27": version "10.0.29" @@ -2503,33 +2503,33 @@ fastq "^1.6.0" "@npmcli/move-file@^1.0.1": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.0.tgz#4ef8a53d727b9e43facf35404caf55ebf92cfec8" - integrity sha512-Iv2iq0JuyYjKeFkSR4LPaCdDZwlGK9X2cP/01nJcp3yMJ1FjNd9vpiEYvLUgzBxKPg2SFmaOhizoQsPc0LWeOQ== + version "1.1.1" + resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.1.tgz#31a3afae95308ef12f58ac147b3e33aae621241d" + integrity sha512-LtWTicuF2wp7PNTuyCwABx7nNG+DnzSE8gN0iWxkC6mpgm/iOPu0ZMTkXuCxmJxtWFsDxUaixM9COSNJEMUfuQ== dependencies: mkdirp "^1.0.4" - rimraf "^2.7.1" + rimraf "^3.0.2" "@octokit/auth-token@^2.4.0": - version "2.4.4" - resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.4.4.tgz#ee31c69b01d0378c12fd3ffe406030f3d94d3b56" - integrity sha512-LNfGu3Ro9uFAYh10MUZVaT7X2CnNm2C8IDQmabx+3DygYIQjs9FwzFAHN/0t6mu5HEPhxcb1XOuxdpY82vCg2Q== + version "2.4.5" + resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.4.5.tgz#568ccfb8cb46f36441fac094ce34f7a875b197f3" + integrity sha512-BpGYsPgJt05M7/L/5FoE1PiAbdxXFZkX/3kDYcsvd1v6UhlnE5e96dTDr0ezX/EFwciQxf3cNV0loipsURU+WA== dependencies: - "@octokit/types" "^6.0.0" + "@octokit/types" "^6.0.3" "@octokit/endpoint@^6.0.1": - version "6.0.10" - resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.10.tgz#741ce1fa2f4fb77ce8ebe0c6eaf5ce63f565f8e8" - integrity sha512-9+Xef8nT7OKZglfkOMm7IL6VwxXUQyR7DUSU0LH/F7VNqs8vyd7es5pTfz9E7DwUIx7R3pGscxu1EBhYljyu7Q== + version "6.0.11" + resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.11.tgz#082adc2aebca6dcefa1fb383f5efb3ed081949d1" + integrity sha512-fUIPpx+pZyoLW4GCs3yMnlj2LfoXTWDUVPTC4V3MUEKZm48W+XYpeWSZCv+vYF1ZABUm2CqnDVf1sFtIYrj7KQ== dependencies: - "@octokit/types" "^6.0.0" + "@octokit/types" "^6.0.3" is-plain-object "^5.0.0" universal-user-agent "^6.0.0" -"@octokit/openapi-types@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-2.3.1.tgz#4e06e97bfcce5ad64fe89a1b5bdbed05e31ed1ab" - integrity sha512-KTzpRDT07euvbBYbPs121YDqq5DT94nBDFIyogsDhOnWL8yDCHev6myeiPTgS+VLmyUbdNCYu6L/gVj+Bd1q8Q== +"@octokit/openapi-types@^3.4.1": + version "3.4.1" + resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-3.4.1.tgz#317f78cede7f387046e6bad2041e01ddf9607e96" + integrity sha512-7Sjm3UwEAM11f+ck9+qlyEfgl8hCk5sSZBU2qcWY8+8ibowjqcwxhhtvY0/pjHPF8mcvmedFpGmmIYs2qM9/+Q== "@octokit/plugin-enterprise-rest@^6.0.1": version "6.0.1" @@ -2544,9 +2544,9 @@ "@octokit/types" "^2.0.1" "@octokit/plugin-request-log@^1.0.0": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.2.tgz#394d59ec734cd2f122431fbaf05099861ece3c44" - integrity sha512-oTJSNAmBqyDR41uSMunLQKMX0jmEXbwD1fpz8FG27lScV3RhtGfBa1/BBLym+PxcC16IBlF7KH9vP1BUYxA+Eg== + version "1.0.3" + resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.3.tgz#70a62be213e1edc04bb8897ee48c311482f9700d" + integrity sha512-4RFU4li238jMJAzLgAwkBAw+4Loile5haQMQr+uhFq27BmyJXcXSKvoQKqh0agsZEiUlW6iSv3FAgvmGkur7OQ== "@octokit/plugin-rest-endpoint-methods@2.4.0": version "2.4.0" @@ -2566,22 +2566,22 @@ once "^1.4.0" "@octokit/request-error@^2.0.0": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.0.4.tgz#07dd5c0521d2ee975201274c472a127917741262" - integrity sha512-LjkSiTbsxIErBiRh5wSZvpZqT4t0/c9+4dOe0PII+6jXR+oj/h66s7E4a/MghV7iT8W9ffoQ5Skoxzs96+gBPA== + version "2.0.5" + resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.0.5.tgz#72cc91edc870281ad583a42619256b380c600143" + integrity sha512-T/2wcCFyM7SkXzNoyVNWjyVlUwBvW3igM3Btr/eKYiPmucXTtkxt2RBsf6gn3LTzaLSLTQtNmvg+dGsOxQrjZg== dependencies: - "@octokit/types" "^6.0.0" + "@octokit/types" "^6.0.3" deprecation "^2.0.0" once "^1.4.0" "@octokit/request@^5.2.0": - version "5.4.12" - resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.12.tgz#b04826fa934670c56b135a81447be2c1723a2ffc" - integrity sha512-MvWYdxengUWTGFpfpefBBpVmmEYfkwMoxonIB3sUGp5rhdgwjXL1ejo6JbgzG/QD9B/NYt/9cJX1pxXeSIUCkg== + version "5.4.14" + resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.14.tgz#ec5f96f78333bb2af390afa5ff66f114b063bc96" + integrity sha512-VkmtacOIQp9daSnBmDI92xNIeLuSRDOIuplp/CJomkvzt7M18NXgG044Cx/LFKLgjKt9T2tZR6AtJayba9GTSA== dependencies: "@octokit/endpoint" "^6.0.1" "@octokit/request-error" "^2.0.0" - "@octokit/types" "^6.0.3" + "@octokit/types" "^6.7.1" deprecation "^2.0.0" is-plain-object "^5.0.0" node-fetch "^2.6.1" @@ -2617,12 +2617,12 @@ dependencies: "@types/node" ">= 8" -"@octokit/types@^6.0.0", "@octokit/types@^6.0.3": - version "6.3.2" - resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.3.2.tgz#d57069a0c3c1ae57a87342f1700e4184c9e038ed" - integrity sha512-H6cbnDumWOQJneyNKCBWgnktRqTWcEm6gq2cIS3frtVgpCqB8zguromnjIWJW375btjnxwmbYBTEAEouruZ2Yw== +"@octokit/types@^6.0.3", "@octokit/types@^6.7.1": + version "6.7.1" + resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.7.1.tgz#01fdc5bbc67bf10ab0ca0aa2461d19ff9dd67fb7" + integrity sha512-OzRXbizUfixgzTjlSZQj+yuo0J9vAMOLtpsIm3JjQUsI3CcLXZnVaxRIWtYD+iwHznnvG9fJlPHM6SRp77fUcw== dependencies: - "@octokit/openapi-types" "^2.3.1" + "@octokit/openapi-types" "^3.4.1" "@types/node" ">= 8" "@pmmmwh/react-refresh-webpack-plugin@0.4.3": @@ -2638,9 +2638,9 @@ source-map "^0.7.3" "@rollup/plugin-commonjs@^17.0.0": - version "17.0.0" - resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-17.0.0.tgz#2ae2228354cf0fbba6cf9f06f30b2c66a974324c" - integrity sha512-/omBIJG1nHQc+bgkYDuLpb/V08QyutP9amOrJRUSlYJZP+b/68gM//D8sxJe3Yry2QnYIr3QjR3x4AlxJEN3GA== + version "17.1.0" + resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-17.1.0.tgz#757ec88737dffa8aa913eb392fade2e45aef2a2d" + integrity sha512-PoMdXCw0ZyvjpCMT5aV4nkL0QywxP29sODQsSGeDpr/oI49Qq9tRtAsb/LbYbDzFlOydVEqHmmZWFtXJEAX9ew== dependencies: "@rollup/pluginutils" "^3.1.0" commondir "^1.0.1" @@ -2832,9 +2832,9 @@ redent "^3.0.0" "@testing-library/react@^11.2.3": - version "11.2.3" - resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-11.2.3.tgz#9971ede1c8465a231d7982eeca3c39fc362d5443" - integrity sha512-BirBUGPkTW28ULuCwIbYo0y2+0aavHczBT6N9r3LrsswEW3pg25l1wgoE7I8QBIy1upXWkwKpYdWY7NYYP0Bxw== + version "11.2.4" + resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-11.2.4.tgz#85e39be292973c49d638df20dcab5a7e73cda2f1" + integrity sha512-0j4A3eHc89g6ymLhvDzwIwTCCKf0voO387ACvJvH46YrBUFt1E66PvxSXH/u/kDVhLs8dtSPFCM06Bjo4sUojQ== dependencies: "@babel/runtime" "^7.12.5" "@testing-library/dom" "^7.28.1" @@ -3090,9 +3090,9 @@ jest-diff "^24.3.0" "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6": - version "7.0.6" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0" - integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw== + version "7.0.7" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad" + integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA== "@types/json5@^0.0.29": version "0.0.29" @@ -3123,9 +3123,9 @@ chalk "^2.4.1" "@types/marked@*", "@types/marked@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@types/marked/-/marked-1.2.1.tgz#9864ecc10d0edb72e7be4e94acb5fcc607c15eed" - integrity sha512-d5adCgRHB+NAme23hkiTkvpfZUDqoNtL2Sr2nZBJqSj3zyHLxsfFWsGQ2sK2z9aX6L1xkJzon2c0jTPcsEjpaQ== + version "1.2.2" + resolved "https://registry.yarnpkg.com/@types/marked/-/marked-1.2.2.tgz#1f858a0e690247ecf3b2eef576f98f86e8d960d4" + integrity sha512-wLfw1hnuuDYrFz97IzJja0pdVsC0oedtS4QsKH1/inyW9qkLQbXgMUqEQT0MVtUBx3twjWeInUfjQbhBVLECXw== "@types/mdast@^3.0.0": version "3.0.3" @@ -3190,9 +3190,9 @@ integrity sha512-dj4gq0BwsONZw/jqEf1qDBkAhAdBfIb7K+RDEQQvGfd6uTkfzKNxjz6NCeg50bveU0ydi8DruGp/9+FgIxli5w== "@types/node@*", "@types/node@>= 8": - version "14.14.21" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.21.tgz#d934aacc22424fe9622ebf6857370c052eae464e" - integrity sha512-cHYfKsnwllYhjOzuC5q1VpguABBeecUp24yFluHpn/BQaVxB1CuQ1FSRZCzrPxrkIfWISXV2LbeoBthLWg0+0A== + version "14.14.22" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.22.tgz#0d29f382472c4ccf3bd96ff0ce47daf5b7b84b18" + integrity sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw== "@types/node@14.0.23": version "14.0.23" @@ -3200,9 +3200,9 @@ integrity sha512-Z4U8yDAl5TFkmYsZdFPdjeMa57NOvnaf1tljHzhouaPEp7LCj2JKkejpI1ODviIAQuW4CcQmxkQ77rnLsOOoKw== "@types/node@^12.6.8": - version "12.19.14" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.14.tgz#59e5029a3c2aea34f68b717955381692fd47cafb" - integrity sha512-2U9uLN46+7dv9PiS8VQJcHhuoOjiDPZOLAt0WuA1EanEknIMae+2QbMhayF7cgGqjvRVIfNpt+6jLPczJZFiRw== + version "12.19.15" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.15.tgz#0de7e978fb43db62da369db18ea088a63673c182" + integrity sha512-lowukE3GUI+VSYSu6VcBXl14d61Rp5hA1D+61r16qnwC0lYNSqdxcvRh0pswejorHfS+HgwBasM8jLXz0/aOsw== "@types/normalize-package-data@^2.4.0": version "2.4.0" @@ -3479,7 +3479,7 @@ resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d" integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw== -"@types/yargs@15.0.12", "@types/yargs@^15.0.0": +"@types/yargs@15.0.12": version "15.0.12" resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.12.tgz#6234ce3e3e3fa32c5db301a170f96a599c960d74" integrity sha512-f+fD/fQAo3BCbCDlrUpznF1A5Zp9rB0noS5vnoormHSIPFKL0Z2DcUJ3Gxp5ytH4uLRNxy7AwYUC9exZzqGMAw== @@ -3493,13 +3493,20 @@ dependencies: "@types/yargs-parser" "*" +"@types/yargs@^15.0.0": + version "15.0.13" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.13.tgz#34f7fec8b389d7f3c1fd08026a5763e072d3c6dc" + integrity sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ== + dependencies: + "@types/yargs-parser" "*" + "@typescript-eslint/eslint-plugin@^4.9.1": - version "4.14.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.14.0.tgz#92db8e7c357ed7d69632d6843ca70b71be3a721d" - integrity sha512-IJ5e2W7uFNfg4qh9eHkHRUCbgZ8VKtGwD07kannJvM5t/GU8P8+24NX8gi3Hf5jST5oWPY8kyV1s/WtfiZ4+Ww== + version "4.14.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.14.2.tgz#47a15803cfab89580b96933d348c2721f3d2f6fe" + integrity sha512-uMGfG7GFYK/nYutK/iqYJv6K/Xuog/vrRRZX9aEP4Zv1jsYXuvFUMDFLhUnc8WFv3D2R5QhNQL3VYKmvLS5zsQ== dependencies: - "@typescript-eslint/experimental-utils" "4.14.0" - "@typescript-eslint/scope-manager" "4.14.0" + "@typescript-eslint/experimental-utils" "4.14.2" + "@typescript-eslint/scope-manager" "4.14.2" debug "^4.1.1" functional-red-black-tree "^1.0.1" lodash "^4.17.15" @@ -3507,48 +3514,48 @@ semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/experimental-utils@4.14.0": - version "4.14.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.14.0.tgz#5aa7b006736634f588a69ee343ca959cd09988df" - integrity sha512-6i6eAoiPlXMKRbXzvoQD5Yn9L7k9ezzGRvzC/x1V3650rUk3c3AOjQyGYyF9BDxQQDK2ElmKOZRD0CbtdkMzQQ== +"@typescript-eslint/experimental-utils@4.14.2": + version "4.14.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.14.2.tgz#9df35049d1d36b6cbaba534d703648b9e1f05cbb" + integrity sha512-mV9pmET4C2y2WlyHmD+Iun8SAEqkLahHGBkGqDVslHkmoj3VnxnGP4ANlwuxxfq1BsKdl/MPieDbohCEQgKrwA== dependencies: "@types/json-schema" "^7.0.3" - "@typescript-eslint/scope-manager" "4.14.0" - "@typescript-eslint/types" "4.14.0" - "@typescript-eslint/typescript-estree" "4.14.0" + "@typescript-eslint/scope-manager" "4.14.2" + "@typescript-eslint/types" "4.14.2" + "@typescript-eslint/typescript-estree" "4.14.2" eslint-scope "^5.0.0" eslint-utils "^2.0.0" "@typescript-eslint/parser@^4.8.2": - version "4.14.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.14.0.tgz#62d4cd2079d5c06683e9bfb200c758f292c4dee7" - integrity sha512-sUDeuCjBU+ZF3Lzw0hphTyScmDDJ5QVkyE21pRoBo8iDl7WBtVFS+WDN3blY1CH3SBt7EmYCw6wfmJjF0l/uYg== + version "4.14.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.14.2.tgz#31e216e4baab678a56e539f9db9862e2542c98d0" + integrity sha512-ipqSP6EuUsMu3E10EZIApOJgWSpcNXeKZaFeNKQyzqxnQl8eQCbV+TSNsl+s2GViX2d18m1rq3CWgnpOxDPgHg== dependencies: - "@typescript-eslint/scope-manager" "4.14.0" - "@typescript-eslint/types" "4.14.0" - "@typescript-eslint/typescript-estree" "4.14.0" + "@typescript-eslint/scope-manager" "4.14.2" + "@typescript-eslint/types" "4.14.2" + "@typescript-eslint/typescript-estree" "4.14.2" debug "^4.1.1" -"@typescript-eslint/scope-manager@4.14.0": - version "4.14.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.14.0.tgz#55a4743095d684e1f7b7180c4bac2a0a3727f517" - integrity sha512-/J+LlRMdbPh4RdL4hfP1eCwHN5bAhFAGOTsvE6SxsrM/47XQiPSgF5MDgLyp/i9kbZV9Lx80DW0OpPkzL+uf8Q== +"@typescript-eslint/scope-manager@4.14.2": + version "4.14.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.14.2.tgz#64cbc9ca64b60069aae0c060b2bf81163243b266" + integrity sha512-cuV9wMrzKm6yIuV48aTPfIeqErt5xceTheAgk70N1V4/2Ecj+fhl34iro/vIssJlb7XtzcaD07hWk7Jk0nKghg== dependencies: - "@typescript-eslint/types" "4.14.0" - "@typescript-eslint/visitor-keys" "4.14.0" + "@typescript-eslint/types" "4.14.2" + "@typescript-eslint/visitor-keys" "4.14.2" -"@typescript-eslint/types@4.14.0": - version "4.14.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.14.0.tgz#d8a8202d9b58831d6fd9cee2ba12f8a5a5dd44b6" - integrity sha512-VsQE4VvpldHrTFuVPY1ZnHn/Txw6cZGjL48e+iBxTi2ksa9DmebKjAeFmTVAYoSkTk7gjA7UqJ7pIsyifTsI4A== +"@typescript-eslint/types@4.14.2": + version "4.14.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.14.2.tgz#d96da62be22dc9dc6a06647f3633815350fb3174" + integrity sha512-LltxawRW6wXy4Gck6ZKlBD05tCHQUj4KLn4iR69IyRiDHX3d3NCAhO+ix5OR2Q+q9bjCrHE/HKt+riZkd1At8Q== -"@typescript-eslint/typescript-estree@4.14.0": - version "4.14.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.14.0.tgz#4bcd67486e9acafc3d0c982b23a9ab8ac8911ed7" - integrity sha512-wRjZ5qLao+bvS2F7pX4qi2oLcOONIB+ru8RGBieDptq/SudYwshveORwCVU4/yMAd4GK7Fsf8Uq1tjV838erag== +"@typescript-eslint/typescript-estree@4.14.2": + version "4.14.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.14.2.tgz#9c5ebd8cae4d7b014f890acd81e8e17f309c9df9" + integrity sha512-ESiFl8afXxt1dNj8ENEZT12p+jl9PqRur+Y19m0Z/SPikGL6rqq4e7Me60SU9a2M28uz48/8yct97VQYaGl0Vg== dependencies: - "@typescript-eslint/types" "4.14.0" - "@typescript-eslint/visitor-keys" "4.14.0" + "@typescript-eslint/types" "4.14.2" + "@typescript-eslint/visitor-keys" "4.14.2" debug "^4.1.1" globby "^11.0.1" is-glob "^4.0.1" @@ -3556,45 +3563,45 @@ semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/visitor-keys@4.14.0": - version "4.14.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.14.0.tgz#b1090d9d2955b044b2ea2904a22496849acbdf54" - integrity sha512-MeHHzUyRI50DuiPgV9+LxcM52FCJFYjJiWHtXlbyC27b80mfOwKeiKI+MHOTEpcpfmoPFm/vvQS88bYIx6PZTA== +"@typescript-eslint/visitor-keys@4.14.2": + version "4.14.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.14.2.tgz#997cbe2cb0690e1f384a833f64794e98727c70c6" + integrity sha512-KBB+xLBxnBdTENs/rUgeUKO0UkPBRs2vD09oMRRIkj5BEN8PX1ToXV532desXfpQnZsYTyLLviS7JrPhdL154w== dependencies: - "@typescript-eslint/types" "4.14.0" + "@typescript-eslint/types" "4.14.2" eslint-visitor-keys "^2.0.0" -"@umijs/ast@3.3.6": - version "3.3.6" - resolved "https://registry.yarnpkg.com/@umijs/ast/-/ast-3.3.6.tgz#bd5bfbc94e0ad2bdce2b8cc25913f2cebb867798" - integrity sha512-Gq19kgHcUqzE9pulOvcE2eLtFc36++9larm4OdVUDe+t49JAHIiSLwuQhjEQgouvrGjOimeLAL12rNpnwSZ6oA== +"@umijs/ast@3.3.7": + version "3.3.7" + resolved "https://registry.yarnpkg.com/@umijs/ast/-/ast-3.3.7.tgz#e11be90e1cb417f099575a7c329776a568e0bb58" + integrity sha512-O0YqCbpRQifRSZ5k6SpEwpTn8bYiwpCFivEomQAa3Mn7KiiT3vLryaCXPoVwNoyYuUbCyCqFhlyH4z1TBm7g1Q== dependencies: - "@umijs/utils" "3.3.6" + "@umijs/utils" "3.3.7" -"@umijs/babel-plugin-auto-css-modules@3.3.6": - version "3.3.6" - resolved "https://registry.yarnpkg.com/@umijs/babel-plugin-auto-css-modules/-/babel-plugin-auto-css-modules-3.3.6.tgz#2c84102834d3b4a81a7a21f0d55e09d4914291a1" - integrity sha512-qXKtE00baNjQvIZJPz0UU2RdGtYiIdKcPe45zHeJwf7/QHfjerqQupQexO7yURN2PcU10PR4tqVx+fqO8dclJA== +"@umijs/babel-plugin-auto-css-modules@3.3.7": + version "3.3.7" + resolved "https://registry.yarnpkg.com/@umijs/babel-plugin-auto-css-modules/-/babel-plugin-auto-css-modules-3.3.7.tgz#e78941d230d39cd721af111c8802861a59baa863" + integrity sha512-0br35/3MVQsTG64qP0b1LQhXNWx5T4Y6Fy4cT2zhcSMwbPn8HisipC0ePw0qy98QxAMrc/k2+U3FU5+A2sRMZg== -"@umijs/babel-plugin-import-to-await-require@3.3.6": - version "3.3.6" - resolved "https://registry.yarnpkg.com/@umijs/babel-plugin-import-to-await-require/-/babel-plugin-import-to-await-require-3.3.6.tgz#ac37e454e92fd1e2b65fe607567a19b4be9a8354" - integrity sha512-CAiqZkIqNg9g9hcaQVun2nDaC9MrVjH9MTby5dXwzKfLx2b2Y61VX+G6oM8HSa/67kBQI6TePY5VuTKohKTdeg== +"@umijs/babel-plugin-import-to-await-require@3.3.7": + version "3.3.7" + resolved "https://registry.yarnpkg.com/@umijs/babel-plugin-import-to-await-require/-/babel-plugin-import-to-await-require-3.3.7.tgz#ba5090953d04fc98079e6e02b5df4b918ba1fd64" + integrity sha512-4vCtx7vUjA0vQPUYu2X84hERtOjUDMhaQTot26O1QZzkvxIM//ib0BCrjH802fNh7gxZDOnvmyPHCzP6Ct+3dg== dependencies: "@babel/types" "7.12.6" -"@umijs/babel-plugin-lock-core-js-3@3.3.6": - version "3.3.6" - resolved "https://registry.yarnpkg.com/@umijs/babel-plugin-lock-core-js-3/-/babel-plugin-lock-core-js-3-3.3.6.tgz#7daf2975054180006c8ef68c1e7b1e60b958d874" - integrity sha512-75ykiGHjQjWCVGaCM3e7wR9KaGI0sCSUjD8v3r1TMidSKaddLmDnNuZVvR8207lvsvTV6xWLucfUHGDCerp57A== +"@umijs/babel-plugin-lock-core-js-3@3.3.7": + version "3.3.7" + resolved "https://registry.yarnpkg.com/@umijs/babel-plugin-lock-core-js-3/-/babel-plugin-lock-core-js-3-3.3.7.tgz#eee3eb8a07ca70b833c7ba444c9c004e82f17f14" + integrity sha512-SftbwONkp+hdDN70OvQqRCFijivpgrBdwP/MmZI/1z1KOHj8YEuKje2wLN9bCfDJpq3oMIlyrUFgrdFuCOsQ9g== dependencies: - "@umijs/utils" "3.3.6" + "@umijs/utils" "3.3.7" core-js "3.6.5" -"@umijs/babel-preset-umi@3.3.6", "@umijs/babel-preset-umi@3.x": - version "3.3.6" - resolved "https://registry.yarnpkg.com/@umijs/babel-preset-umi/-/babel-preset-umi-3.3.6.tgz#073a708051c637d74267f290961e3787e95b15ef" - integrity sha512-F0SqtNjHyPlOLWu2hUE5sNI0S+nWkaT7i8jcrWpCO22JszXrdwAjPbeQvFjofKPNqCdME43lgvXjlPdDvq3Tnw== +"@umijs/babel-preset-umi@3.3.7", "@umijs/babel-preset-umi@3.x": + version "3.3.7" + resolved "https://registry.yarnpkg.com/@umijs/babel-preset-umi/-/babel-preset-umi-3.3.7.tgz#0627fcdbbb0d9e64138be6b05ef2c3d447acaca0" + integrity sha512-MB7K3mjo86qG2zLMCNZcfxP0PKca/Aow481ul6DKxppXyoAX30kRci7kThbCeSS20nCHPTlh7iS4BifqLbNC+w== dependencies: "@babel/plugin-proposal-class-properties" "7.12.1" "@babel/plugin-proposal-decorators" "7.12.1" @@ -3613,9 +3620,9 @@ "@babel/preset-typescript" "7.12.1" "@babel/runtime" "7.12.5" "@svgr/webpack" "4.3.3" - "@umijs/babel-plugin-auto-css-modules" "3.3.6" - "@umijs/babel-plugin-import-to-await-require" "3.3.6" - "@umijs/babel-plugin-lock-core-js-3" "3.3.6" + "@umijs/babel-plugin-auto-css-modules" "3.3.7" + "@umijs/babel-plugin-import-to-await-require" "3.3.7" + "@umijs/babel-plugin-lock-core-js-3" "3.3.7" babel-plugin-dynamic-import-node "2.3.3" babel-plugin-import "^1.13.1" babel-plugin-named-asset-import "0.3.7" @@ -3623,27 +3630,27 @@ babel-plugin-transform-react-remove-prop-types "0.4.24" babel-plugin-transform-typescript-metadata "0.3.1" -"@umijs/bundler-utils@3.3.6": - version "3.3.6" - resolved "https://registry.yarnpkg.com/@umijs/bundler-utils/-/bundler-utils-3.3.6.tgz#d736af38e83ca62e6c2b2a5969679666e0ff2e82" - integrity sha512-UJOFVQoMjEil7jjQ61mzPgdQkCIkm6aYTceCWRQeW7wCN0VlhpV07D0lTyfCb9qEKfKLOw5uGucIouK8WodMPw== +"@umijs/bundler-utils@3.3.7": + version "3.3.7" + resolved "https://registry.yarnpkg.com/@umijs/bundler-utils/-/bundler-utils-3.3.7.tgz#6058d33dac442c3678c61507eef728acdfde7e96" + integrity sha512-MYH7C3AU0nXAr27P2CdxjnCvt5Cc29AY1CoNHg62cMNq7aCv4Hzylo2+ZF951Ok5ujl/zpN17d9bvIRJ4BCEGA== dependencies: - "@umijs/babel-preset-umi" "3.3.6" - "@umijs/types" "3.3.6" - "@umijs/utils" "3.3.6" + "@umijs/babel-preset-umi" "3.3.7" + "@umijs/types" "3.3.7" + "@umijs/utils" "3.3.7" -"@umijs/bundler-webpack@3.3.6": - version "3.3.6" - resolved "https://registry.yarnpkg.com/@umijs/bundler-webpack/-/bundler-webpack-3.3.6.tgz#9c8ca7a368686835268d40211a556b5aced2603b" - integrity sha512-vuenQOWTqQSEg8JMRp9zHAte93B1h1KQCEe8JK6Rty8gfxqhzJkZuHqfX1lnbroY7UPUO42zZ8bo1NLxN6c+KA== +"@umijs/bundler-webpack@3.3.7": + version "3.3.7" + resolved "https://registry.yarnpkg.com/@umijs/bundler-webpack/-/bundler-webpack-3.3.7.tgz#25af5cfd1baf228fcc10ebdb721b29329eca71ce" + integrity sha512-qc1u9vAe3nFUI6RGFdPO2ZchaU13/S3XetdmctOatHHPPYtioDOQzMIS10oUr98KoO1Pn0AjY1ScLvBT0X4snA== dependencies: "@babel/core" "7.12.10" "@types/sockjs-client" "1.1.1" "@types/webpack" "4.41.25" "@types/webpack-dev-middleware" "3.7.2" - "@umijs/bundler-utils" "3.3.6" - "@umijs/types" "3.3.6" - "@umijs/utils" "3.3.6" + "@umijs/bundler-utils" "3.3.7" + "@umijs/types" "3.3.7" + "@umijs/utils" "3.3.7" babel-loader "8.2.2" copy-webpack-plugin "6.1.0" css-loader "3.6.0" @@ -3678,10 +3685,10 @@ webpack-sources "^1.1.0" webpackbar "5.0.0-3" -"@umijs/core@3.3.6": - version "3.3.6" - resolved "https://registry.yarnpkg.com/@umijs/core/-/core-3.3.6.tgz#46040d58b938423cdcb15440d61172eff1332a74" - integrity sha512-pifYvJq/vFNTnkbE+/xSeAeIsTSIEERWd2b9UpdpHuufkx+kxg9TEllGiM397vHbyKn4Z7Dw9Gy8rH7JUtEfvA== +"@umijs/core@3.3.7": + version "3.3.7" + resolved "https://registry.yarnpkg.com/@umijs/core/-/core-3.3.7.tgz#490b9453c8cc7af056cf7f8b8fd70dfe5ac3b0d6" + integrity sha512-7RmPBUagAvh3LrbACs7U3zi63FI8AQVIt8qlLErWnrZC7+C4T1sIIdQN7UKDSHqVbeMT71sJLcrizDIt5eMqrA== dependencies: "@babel/core" "7.12.10" "@babel/register" "7.12.10" @@ -3692,10 +3699,10 @@ "@types/marked-terminal" "^3.1.1" "@types/prettier" "2.1.6" "@types/tapable" "1.0.6" - "@umijs/ast" "3.3.6" - "@umijs/babel-preset-umi" "3.3.6" + "@umijs/ast" "3.3.7" + "@umijs/babel-preset-umi" "3.3.7" "@umijs/error-code-map" "^1.0.1" - "@umijs/utils" "3.3.6" + "@umijs/utils" "3.3.7" dotenv "8.2.0" ejs "3.1.5" marked "1.2.7" @@ -3723,10 +3730,10 @@ sass "^1.26.2" sass-loader "^8.0.2" -"@umijs/preset-built-in@3.3.6": - version "3.3.6" - resolved "https://registry.yarnpkg.com/@umijs/preset-built-in/-/preset-built-in-3.3.6.tgz#e35febca86b3678345a1e7dcb1f34db1a93b8d40" - integrity sha512-84IDsYXjjOgUbH9aqEGNfO5xohXSBx7utle/zaNvF/tsYE9qiDhRtWk+gmFDtZu9v1inW8zbA7+e7CRfFy+WJg== +"@umijs/preset-built-in@3.3.7": + version "3.3.7" + resolved "https://registry.yarnpkg.com/@umijs/preset-built-in/-/preset-built-in-3.3.7.tgz#d8ff265c40db49692c7f80418bb07a248f405968" + integrity sha512-bHmJl0Z3sWo4uNyFqc+MszAbe9UVNkpbIujc700iZU50A9kcjeG6bOv9ODRLeqs/mwRp+2YJ6m0LzmoBDOeDgw== dependencies: "@hapi/joi" "16.1.8" "@pmmmwh/react-refresh-webpack-plugin" "0.4.3" @@ -3734,14 +3741,14 @@ "@types/multer" "1.4.3" "@types/react-router-config" "5.0.1" "@types/serialize-javascript" "4.0.0" - "@umijs/babel-preset-umi" "3.3.6" - "@umijs/bundler-webpack" "3.3.6" - "@umijs/renderer-mpa" "3.3.6" - "@umijs/renderer-react" "3.3.6" - "@umijs/runtime" "3.3.6" - "@umijs/server" "3.3.6" - "@umijs/types" "3.3.6" - "@umijs/utils" "3.3.6" + "@umijs/babel-preset-umi" "3.3.7" + "@umijs/bundler-webpack" "3.3.7" + "@umijs/renderer-mpa" "3.3.7" + "@umijs/renderer-react" "3.3.7" + "@umijs/runtime" "3.3.7" + "@umijs/server" "3.3.7" + "@umijs/types" "3.3.7" + "@umijs/utils" "3.3.7" cliui "6.0.0" es5-imcompatible-versions "^0.1.62" fork-ts-checker-webpack-plugin "6.0.5" @@ -3759,10 +3766,10 @@ umi-webpack-bundle-analyzer "3.6.0" zlib "1.0.5" -"@umijs/preset-dumi@1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@umijs/preset-dumi/-/preset-dumi-1.1.2.tgz#32d331863d16fcd9acb5338390b0bfdd2054af31" - integrity sha512-1s0mZpeka5WQkunq05+23vYwUkeinJ4cgAINvwqZCizxKxbyjnuoaABqNa9Kp5YHTehBsWKR3uQ5O7oW87yRBQ== +"@umijs/preset-dumi@1.1.4": + version "1.1.4" + resolved "https://registry.yarnpkg.com/@umijs/preset-dumi/-/preset-dumi-1.1.4.tgz#6e06a203f6badc329629e6a243fea721dc8e5e87" + integrity sha512-CkyNWsaS9BeD6BWSuoYQFKnmqwqJ7WYUuc6R53LL6jWeBppBRD80AhzPAMCO/snO2ZcLhZ/v9AR6rlNkrBt88Q== dependencies: "@babel/core" "^7.7.2" "@babel/generator" "^7.7.2" @@ -3778,7 +3785,7 @@ copy-text-to-clipboard "^2.2.0" deepmerge "^4.2.2" dumi-assets-types "1.0.0" - dumi-theme-default "1.0.2" + dumi-theme-default "1.0.4" enhanced-resolve "^4.1.1" github-slugger "^1.3.0" hast-util-has-property "^1.0.4" @@ -3806,30 +3813,30 @@ unist-util-visit "^2.0.1" unist-util-visit-parents "^3.0.1" -"@umijs/renderer-mpa@3.3.6": - version "3.3.6" - resolved "https://registry.yarnpkg.com/@umijs/renderer-mpa/-/renderer-mpa-3.3.6.tgz#c65793535844121bffed01ca3001d54cb4cadc36" - integrity sha512-XSx15PW9TFr0SnQsBdW9AsvIhDGo2P5L5R35TZM0hhUx/AVs/LgdNHBudg1uMUo42pZ75JSUFVoN33et4NUVrg== +"@umijs/renderer-mpa@3.3.7": + version "3.3.7" + resolved "https://registry.yarnpkg.com/@umijs/renderer-mpa/-/renderer-mpa-3.3.7.tgz#4f71f33528173ffc46bca1ac6bb1d7b037584795" + integrity sha512-/lCuPra20gtepfDn9jlrKqBbl/Ct+O1LFTpqYTqvCfkLUkD3Af/JzZYHh2BVVecX9I0vm2D+7UgSzK346I5NWw== dependencies: "@types/react" "^16.9.43" "@types/react-dom" "^16.9.8" - "@umijs/runtime" "3.3.6" + "@umijs/runtime" "3.3.7" -"@umijs/renderer-react@3.3.6": - version "3.3.6" - resolved "https://registry.yarnpkg.com/@umijs/renderer-react/-/renderer-react-3.3.6.tgz#27ebb4081122cf2c2cf4a8288e4e6b706f43754d" - integrity sha512-qfrEqi0vlc6mfsN6bdmhGl/8CX5ghTuvGzkA7zKv17U5ZeyZDYzB/rp3WvmyGWpV7oP7J4PZnB68bqAAAWe57Q== +"@umijs/renderer-react@3.3.7": + version "3.3.7" + resolved "https://registry.yarnpkg.com/@umijs/renderer-react/-/renderer-react-3.3.7.tgz#de84e2043711e3aa2e62db4b6893923987847b51" + integrity sha512-bfYTh5w8JEqtjp+C7Jo+sXNz++ui5dCCgOcdUygQBPHBiUD4jyAoFFzxGSpolTI1NKIfUUnrUziveIe4YOjr9A== dependencies: "@types/react" "^16.9.43" "@types/react-dom" "^16.9.8" "@types/react-router-config" "^5.0.1" - "@umijs/runtime" "3.3.6" + "@umijs/runtime" "3.3.7" react-router-config "5.1.1" -"@umijs/runtime@3.3.6", "@umijs/runtime@^3.2.14": - version "3.3.6" - resolved "https://registry.yarnpkg.com/@umijs/runtime/-/runtime-3.3.6.tgz#ff5d7d18600813f331cebb8541355b12961cd29b" - integrity sha512-XEOK2Pb6W2q8F3WtbJCxuNxdgsJL440TIh2UtN6LwyupaO6ZLeZryElInblyT/dV4VXyAzCDG+r4vJQRHSWsUw== +"@umijs/runtime@3.3.7", "@umijs/runtime@^3.2.14": + version "3.3.7" + resolved "https://registry.yarnpkg.com/@umijs/runtime/-/runtime-3.3.7.tgz#5e265ea80f0b94c536152b3b2cd06be240b3dece" + integrity sha512-Av2gubtRDpJnx87s7dv3VR1tMdcoXJFkAGCUL4PBXh3jxtmd41zS5lr3/bCqYdr7csw/MPW0EzSNEruNKQl18w== dependencies: "@types/react-router" "5.1.8" "@types/react-router-dom" "5.1.5" @@ -3838,17 +3845,17 @@ react-router-dom "5.2.0" use-subscription "1.4.1" -"@umijs/server@3.3.6": - version "3.3.6" - resolved "https://registry.yarnpkg.com/@umijs/server/-/server-3.3.6.tgz#09439f53b49f7e547320f4026731180193f022bc" - integrity sha512-EJ1k1Sd30Esxx5oOQ4761uBmfTqoXW+mzO1I0OWMCNag8tCmBgknVf0LdEABkh8FF1GdgBbozJHketY+miWcpg== +"@umijs/server@3.3.7": + version "3.3.7" + resolved "https://registry.yarnpkg.com/@umijs/server/-/server-3.3.7.tgz#7694bff486f586fccdb880d0251a1d213f70529d" + integrity sha512-OfuG84+CfRa44er1e0P9fYMHItfb96w87hs+aeupHHbwARvO+an6p23dDwT3A7shdFXzTYeNimwDe5NCCV99uA== dependencies: "@types/compression" "1.7.0" "@types/express" "4.17.7" "@types/node" "14.0.23" "@types/sockjs" "0.3.32" "@types/spdy" "3.4.4" - "@umijs/utils" "3.3.6" + "@umijs/utils" "3.3.7" compression "1.7.4" express "4.17.1" http-proxy-middleware "1.0.6" @@ -3857,25 +3864,25 @@ sockjs "0.3.21" spdy "4.0.2" -"@umijs/types@3.3.6", "@umijs/types@3.x": - version "3.3.6" - resolved "https://registry.yarnpkg.com/@umijs/types/-/types-3.3.6.tgz#a10e7e6bdd3cdf6f0f2d00f31a0578fe60fa67bc" - integrity sha512-nEK4m1YGEaNE0YmQddgi7J0WVNlAjQXsdH5iJw0VtbiWaEYPj78tJnIeGDF/8NHfOg6f/KimKPsdm3NHMrl+Rw== +"@umijs/types@3.3.7", "@umijs/types@3.x": + version "3.3.7" + resolved "https://registry.yarnpkg.com/@umijs/types/-/types-3.3.7.tgz#0a84fd99841a1fdcca28398dcbcef7bc3652a671" + integrity sha512-pVYN90B8VseBVFzyuGEzdku3uXka1PhNPjChIa0uG9Yt8mAQM8SuOwXHDTm7iI5FkD2coWomArQOCgkNMDYneg== dependencies: "@types/cheerio" "0.22.23" "@types/express" "4.17.7" "@types/webpack" "4.41.21" "@types/webpack-bundle-analyzer" "3.8.0" - "@umijs/babel-preset-umi" "3.3.6" - "@umijs/core" "3.3.6" - "@umijs/server" "3.3.6" - "@umijs/utils" "3.3.6" + "@umijs/babel-preset-umi" "3.3.7" + "@umijs/core" "3.3.7" + "@umijs/server" "3.3.7" + "@umijs/utils" "3.3.7" webpack-chain "6.5.1" -"@umijs/utils@3.3.6", "@umijs/utils@^3.2.28": - version "3.3.6" - resolved "https://registry.yarnpkg.com/@umijs/utils/-/utils-3.3.6.tgz#a4cb1f1e95c040cf92aff8cb3920385377fa0250" - integrity sha512-aXByDQua6i3/aQRjThYoaBW48MeArz/o8Q7HDv+q8QU7aqfQT7jbCK1DiGZ3pbtwF+VFZybMcyL7fdwxZebt+Q== +"@umijs/utils@3.3.7", "@umijs/utils@^3.2.28": + version "3.3.7" + resolved "https://registry.yarnpkg.com/@umijs/utils/-/utils-3.3.7.tgz#33a5dcb86508428c96774f03191842ac299bbe22" + integrity sha512-DYm7yYRUeBe/9L9hmuE6mZnt0bFCtlDLU1G9bN7dHpw+g7OeXLLKO6d2aXBMcXxusH87eRNXJ8EvIKw/M6OE6g== dependencies: "@babel/parser" "7.12.11" "@babel/register" "7.12.10" @@ -3934,8 +3941,8 @@ "@vue/composition-api@^1.0.0-rc.1": version "1.0.0-rc.1" - resolved "https://r.cnpmjs.org/@vue/composition-api/download/@vue/composition-api-1.0.0-rc.1.tgz#d5286bbaffcd1987e56d5e3a9f26bfb6023e7c41" - integrity sha1-1Shruv/NGYflbV46nya/tgI+fEE= + resolved "https://registry.yarnpkg.com/@vue/composition-api/-/composition-api-1.0.0-rc.1.tgz#d5286bbaffcd1987e56d5e3a9f26bfb6023e7c41" + integrity sha512-6I5LkfA+VvVOLZufRugzQ5sWKQH81/Cr9gRLidDSeUmjRPolEEWgG4MAnWtBR5zgP5qbRMwZJ4IEYtKhnadMQQ== dependencies: tslib "^2.0.3" @@ -4299,9 +4306,9 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4, ajv uri-js "^4.2.2" ajv@^7.0.2: - version "7.0.3" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.0.3.tgz#13ae747eff125cafb230ac504b2406cf371eece2" - integrity sha512-R50QRlXSxqXcQP5SvKUrw8VZeypvo12i2IX0EeR5PiZ7bEKeHWgzgo264LDadUsCU42lTJVhFikTqJwNeH34gQ== + version "7.0.4" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.0.4.tgz#827e5f5ae32f5e5c1637db61f253a112229b5e2f" + integrity sha512-xzzzaqgEQfmuhbhAoqjJ8T/1okb6gAzXn/eQRNpAN1AEUoHJTNF9xCDRTtf/s3SKldtZfa+RJeTs+BQq+eZ/sw== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" @@ -4397,12 +4404,12 @@ ansicolors@~0.3.2: integrity sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk= antd@^4.0.0: - version "4.10.3" - resolved "https://registry.yarnpkg.com/antd/-/antd-4.10.3.tgz#54da18519470f6c68c348d29e646836321f8ddc0" - integrity sha512-J/IZvW15MwTmUxK/AWFkSU51T1Hyn4e0GchJWlIe7+FrPpLoTgLf9/Cx3mgxiooHfE9OfvnYvvRli1VxHH6H0Q== + version "4.11.2" + resolved "https://registry.yarnpkg.com/antd/-/antd-4.11.2.tgz#28c20409e2d186d8915cdc6eacf1cfb2b82d9b5b" + integrity sha512-cdjPRlmamETae6c2uvQHRXDN5/T7I/zPiByaeolbq/FRG14JYv9hyUaydXI7n4s6rynPQ2Q6bFdCQ+/r9xZYbA== dependencies: "@ant-design/colors" "^5.0.0" - "@ant-design/icons" "^4.3.0" + "@ant-design/icons" "^4.4.0" "@ant-design/react-slick" "~0.28.1" "@babel/runtime" "^7.11.2" array-tree-filter "^2.1.0" @@ -4416,8 +4423,8 @@ antd@^4.0.0: rc-dialog "~8.5.1" rc-drawer "~4.2.0" rc-dropdown "~3.2.0" - rc-field-form "~1.17.3" - rc-image "~5.0.2" + rc-field-form "~1.18.0" + rc-image "~5.1.1" rc-input-number "~6.1.0" rc-mentions "~1.5.0" rc-menu "~8.10.0" @@ -4438,6 +4445,7 @@ antd@^4.0.0: rc-tooltip "~5.0.0" rc-tree "~4.1.0" rc-tree-select "~4.3.0" + rc-trigger "^5.2.1" rc-upload "~3.3.4" rc-util "^5.7.0" scroll-into-view-if-needed "^2.2.25" @@ -4967,9 +4975,9 @@ bcrypt-pbkdf@^1.0.0: tweetnacl "^0.14.3" before-after-hook@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.1.0.tgz#b6c03487f44e24200dd30ca5e6a1979c5d2fb635" - integrity sha512-IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A== + version "2.1.1" + resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.1.1.tgz#99ae36992b5cfab4a83f6bee74ab27835f28f405" + integrity sha512-5ekuQOvO04MDj7kYZJaMab2S8SPjGJbotVNyv7QYFCOAwrGZs/YnoDNlh1U+m5hl7H2D/+n0taaAV/tfyd3KMA== bfj@^6.1.1: version "6.1.2" @@ -5172,15 +5180,15 @@ browserify-zlib@^0.2.0: pako "~1.0.5" browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.1, browserslist@^4.6.4: - version "4.16.1" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.1.tgz#bf757a2da376b3447b800a16f0f1c96358138766" - integrity sha512-UXhDrwqsNcpTYJBTZsbGATDxZbiVDsx6UjpmRUmtnP10pr8wAYr5LgFoEFw9ixriQH2mv/NX2SfGzE/o8GndLA== + version "4.16.3" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz#340aa46940d7db878748567c5dea24a48ddf3717" + integrity sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw== dependencies: - caniuse-lite "^1.0.30001173" + caniuse-lite "^1.0.30001181" colorette "^1.2.1" - electron-to-chromium "^1.3.634" + electron-to-chromium "^1.3.649" escalade "^3.1.1" - node-releases "^1.1.69" + node-releases "^1.1.70" bs-logger@0.x: version "0.2.6" @@ -5459,10 +5467,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001173: - version "1.0.30001178" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001178.tgz#3ad813b2b2c7d585b0be0a2440e1e233c6eabdbc" - integrity sha512-VtdZLC0vsXykKni8Uztx45xynytOi71Ufx9T8kHptSw9AL4dpqailUJJHavttuzUe1KYuBYtChiWv+BAb7mPmQ== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001181: + version "1.0.30001183" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001183.tgz#7a57ba9d6584119bb5f2bc76d3cc47ba9356b3e2" + integrity sha512-7JkwTEE1hlRKETbCFd8HDZeLiQIUcl8rC6JgNjvHCNaxOeNmQ9V4LvQXRUsKIV2CC73qKxljwVhToaA3kLRqTw== capture-exit@^2.0.0: version "2.0.0" @@ -6099,9 +6107,9 @@ connect-history-api-fallback@^1.6.0: integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg== consola@^2.15.0: - version "2.15.0" - resolved "https://registry.yarnpkg.com/consola/-/consola-2.15.0.tgz#40fc4eefa4d2f8ef2e2806147f056ea207fcc0e9" - integrity sha512-vlcSGgdYS26mPf7qNi+dCisbhiyDnrN1zaRbw3CSuc2wGOMEGGPsp46PdRG5gqXwgtJfjxDkxRNAgRPr1B77vQ== + version "2.15.1" + resolved "https://registry.yarnpkg.com/consola/-/consola-2.15.1.tgz#6c9141d97798537551e5b411a1423e39e4a7abd6" + integrity sha512-uNINF19d9f1/Pza5aNmQ/JlrmY4uPOW0BxID3Xvw5iOP6diJArUXp+JgcIQ4fR56qV+HB9o/ZRUnrnYd92LxZw== console-browserify@^1.1.0: version "1.2.0" @@ -6817,9 +6825,9 @@ dateformat@^3.0.0: integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== dayjs@^1.8.30: - version "1.10.3" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.3.tgz#cf3357c8e7f508432826371672ebf376cb7d619b" - integrity sha512-/2fdLN987N8Ki7Id8BUN2nhuiRyxTLumQnSQf9CNncFCyqFsSKb9TNhzRYcC8K8eJSJOKvbvkImo/MKKhNi4iw== + version "1.10.4" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.4.tgz#8e544a9b8683f61783f570980a8a80eaf54ab1e2" + integrity sha512-RI/Hh4kqRc1UKLOAf/T5zdMMX5DQIlDxwUe3wSyMMnEbGunnpENCdbUgM+dW7kXidZqCttBrmw7BhN4TMddkCw== de-indent@^1.0.2: version "1.0.2" @@ -7278,21 +7286,21 @@ dumi-assets-types@1.0.0: resolved "https://registry.yarnpkg.com/dumi-assets-types/-/dumi-assets-types-1.0.0.tgz#d5368cb11045b203bf1ef1080e553b2287a2ec81" integrity sha512-7nhSeWM15vybbUAMPLZsdls2jKoHB2UU4P1RM6kLPucuS8eC/HSmufquFqTTYtX4oIDLHGtil/dVtMreNGwhdA== -dumi-theme-default@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/dumi-theme-default/-/dumi-theme-default-1.0.2.tgz#03b8734135c9740aa8b7e72b5799cbcbef12900d" - integrity sha512-nI413eZDTYmTc2hyFgguySSgf34ukRUlqxLM/mf8rapNKJdneMTv4nhgcrjyYyOhmefMG50rdiTtJzqQn2+tEA== +dumi-theme-default@1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/dumi-theme-default/-/dumi-theme-default-1.0.4.tgz#b7cb18c873c898fc9dd743763397cea7eccac7ab" + integrity sha512-FP3IdCSYuyoI0wPjX9WYaOnMnRVrMmgsShknVbOQdTI/gH7vND500K+S3osUyq3UuEo602pqijgTehc2pYp2/Q== dependencies: prism-react-renderer "^1.1.1" prismjs "^1.21.0" rc-tabs "^11.7.1" dumi@^1.1.0-rc.8: - version "1.1.2" - resolved "https://registry.yarnpkg.com/dumi/-/dumi-1.1.2.tgz#66c6e1e6e20bf5fe624d90a457125f4ab6611487" - integrity sha512-L+Atu0eWnWEmODoVp33of5nmg3/YFGEzWlWRV9FEYOUSD8mp4dzwZnJERq+wxwie4W1HcDFlXhqQtFsbqeY1Xw== + version "1.1.4" + resolved "https://registry.yarnpkg.com/dumi/-/dumi-1.1.4.tgz#5cf40bb90b8d6fa6c69b619d7e791f19ce8705a8" + integrity sha512-ZxUzweqaB2LZBRYlXj1/ivok1nwZefWCNHRziaBN9wCtIZtwCOl8zKvA2OxveWS60n6GBlICjHo6CZIO8Faq1A== dependencies: - "@umijs/preset-dumi" "1.1.2" + "@umijs/preset-dumi" "1.1.4" umi "^3.0.0" duplexer3@^0.1.4: @@ -7340,10 +7348,10 @@ ejs@^2.6.1: resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba" integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== -electron-to-chromium@^1.3.634: - version "1.3.641" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.641.tgz#03f14efd70a7971eff2efc947b3c1d0f717c82b9" - integrity sha512-b0DLhsHSHESC1I+Nx6n4w4Lr61chMd3m/av1rZQhS2IXTzaS5BMM5N+ldWdMIlni9CITMRM09m8He4+YV/92TA== +electron-to-chromium@^1.3.649: + version "1.3.650" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.650.tgz#24e821fff2ed61fd71fee092f2a0631b3c0c22a6" + integrity sha512-j6pRuNylFBbroG6NB8Lw/Im9oDY74s2zWHBP5TmdYg73cBuL6cz//SMgolVa0gIJk/DSL+kO7baJ1DSXW1FUZg== elegant-spinner@^1.0.1: version "1.0.1" @@ -7434,9 +7442,9 @@ entities@^1.1.1, entities@~1.1.1: integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w== entities@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5" - integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w== + version "2.2.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" + integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== env-paths@^2.2.0: version "2.2.0" @@ -7444,9 +7452,9 @@ env-paths@^2.2.0: integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA== envinfo@^7.3.1: - version "7.7.3" - resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.7.3.tgz#4b2d8622e3e7366afb8091b23ed95569ea0208cc" - integrity sha512-46+j5QxbPWza0PB1i15nZx0xQ4I/EfQxg9J8Had3b408SV63nEtor2e+oiY63amTo9KTuh2a3XLObNwduxYwwA== + version "7.7.4" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.7.4.tgz#c6311cdd38a0e86808c1c9343f667e4267c4a320" + integrity sha512-TQXTYFVVwwluWSFis6K2XKxgrD22jEv0FTuLCQI+OjH7rn93+iY0fSSFM5lrSxFY+H1+B0/cvvlamr3UsBivdQ== err-code@^1.0.0: version "1.1.2" @@ -7474,7 +7482,7 @@ error-stack-parser@^2.0.0, error-stack-parser@^2.0.6: dependencies: stackframe "^1.1.1" -es-abstract@^1.17.0-next.1, es-abstract@^1.17.2: +es-abstract@^1.17.2: version "1.17.7" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c" integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g== @@ -7700,14 +7708,14 @@ eslint-plugin-react@^7.14.2: string.prototype.matchall "^4.0.2" eslint-plugin-vue@^7.0.1: - version "7.4.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.4.1.tgz#2526ef0c010c218824a89423dbe6ddbe76f04fd6" - integrity sha512-W/xPNHYIkGJphLUM2UIYYGKbRw3BcDoMIPY9lu1TTa2YLiZoxurddfnmOP+UOVywxb5vi438ejzwvKdZqydtIw== + version "7.5.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.5.0.tgz#cc6d983eb22781fa2440a7573cf39af439bb5725" + integrity sha512-QnMMTcyV8PLxBz7QQNAwISSEs6LYk2LJvGlxalXvpCtfKnqo7qcY0aZTIxPe8QOnHd7WCwiMZLOJzg6A03T0Gw== dependencies: eslint-utils "^2.1.0" natural-compare "^1.4.0" semver "^7.3.2" - vue-eslint-parser "^7.3.0" + vue-eslint-parser "^7.4.1" eslint-scope@^4.0.3: version "4.0.3" @@ -7743,9 +7751,9 @@ eslint-visitor-keys@^2.0.0: integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== eslint@^7.14.0: - version "7.18.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.18.0.tgz#7fdcd2f3715a41fe6295a16234bd69aed2c75e67" - integrity sha512-fbgTiE8BfUJZuBeq2Yi7J3RB3WGUQ9PNuNbmgi6jt9Iv8qrkxfy19Ds3OpL1Pm7zg3BtTVhvcUZbIRQ0wmSjAQ== + version "7.19.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.19.0.tgz#6719621b196b5fad72e43387981314e5d0dc3f41" + integrity sha512-CGlMgJY56JZ9ZSYhJuhow61lMPPjUzWmChFya71Z/jilVos7mR/jPgaEfVGgMBY5DshbKdG8Ezb8FDCHcoMEMg== dependencies: "@babel/code-frame" "^7.0.0" "@eslint/eslintrc" "^0.3.0" @@ -8155,9 +8163,9 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= fastq@^1.6.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.10.0.tgz#74dbefccade964932cdf500473ef302719c652bb" - integrity sha512-NL2Qc5L3iQEsyYzweq7qfgy5OtXCmGzGvhElGEd/SoFWEMOEczNh5s5ocaF01HDetxz+p8ecjNPA6cZxxIHmzA== + version "1.10.1" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.10.1.tgz#8b8f2ac8bf3632d67afcd65dac248d5fdc45385e" + integrity sha512-AWuv6Ery3pM+dY7LYS8YIaCiQvUaos9OB1RyNgaOWnaX+Tik7Onvcsf8x8c+YtDeT0maYLniBip2hox5KtEXXA== dependencies: reusify "^1.0.4" @@ -8402,9 +8410,9 @@ flatten@^1.0.2: integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg== flow-parser@0.*: - version "0.142.0" - resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.142.0.tgz#68792438f2593a9e3d862a5ce2278493991619aa" - integrity sha512-gkdbagtuYQw7fo/D1AwCsDpMyxp/bdZkgfq95ev2MoETD1OW84PhU+vitupwte+6AJc2MRJyCdgfWhan8AGhzA== + version "0.143.1" + resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.143.1.tgz#c18e1745df97d1132e60036e88cbf1925b5094e4" + integrity sha512-DWmnt0P1tieuQErYeWmxCNIkzm5Fqd5sMH685v/jCtu8CAvdLEwKi45jqYhij178k+NAy+FNe2jDvQNs7WLBIA== flush-write-stream@^1.0.0: version "1.1.1" @@ -8428,9 +8436,9 @@ fn-name@~2.0.1: integrity sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc= follow-redirects@^1.0.0: - version "1.13.1" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.1.tgz#5f69b813376cee4fd0474a3aba835df04ab763b7" - integrity sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg== + version "1.13.2" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.2.tgz#dd73c8effc12728ba5cf4259d760ea5fb83e3147" + integrity sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA== for-in@^0.1.3: version "0.1.8" @@ -8548,14 +8556,14 @@ fs-extra@^7.0.0, fs-extra@^7.0.1: universalify "^0.1.0" fs-extra@^9.0.0: - version "9.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc" - integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ== + version "9.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" + integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== dependencies: at-least-node "^1.0.0" graceful-fs "^4.2.0" jsonfile "^6.0.1" - universalify "^1.0.0" + universalify "^2.0.0" fs-minipass@^1.2.5: version "1.2.7" @@ -8662,10 +8670,10 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-intrinsic@^1.0.1, get-intrinsic@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.2.tgz#6820da226e50b24894e08859469dc68361545d49" - integrity sha512-aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg== +get-intrinsic@^1.0.1, get-intrinsic@^1.0.2, get-intrinsic@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.0.tgz#892e62931e6938c8a23ea5aaebcfb67bd97da97e" + integrity sha512-M11rgtQp5GZMZzDL7jLTNxbDfurpzuau5uqRWDPvlHjfvg3TdScAZo96GLvhMjImrmR8uAt0FS2RLoMrfWGKlg== dependencies: function-bind "^1.1.1" has "^1.0.3" @@ -8781,9 +8789,9 @@ git-up@^4.0.0: parse-url "^5.0.0" git-url-parse@^11.1.2: - version "11.4.3" - resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-11.4.3.tgz#1610284edf1f14964180f5b3399ec68b692cfd87" - integrity sha512-LZTTk0nqJnKN48YRtOpR8H5SEfp1oM2tls90NuZmBxN95PnCvmuXGzqQ4QmVirBgKx2KPYfPGteX3/raWjKenQ== + version "11.4.4" + resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-11.4.4.tgz#5d747debc2469c17bc385719f7d0427802d83d77" + integrity sha512-Y4o9o7vQngQDIU9IjyCmRJBin5iYjI5u9ZITnddRZpD7dcCFQj2sL2XuMNbLRE4b4B/4ENPsp2Q8P44fjAZ0Pw== dependencies: git-up "^4.0.0" @@ -9333,9 +9341,9 @@ hosted-git-info@^2.1.4, hosted-git-info@^2.7.1: integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg== hosted-git-info@^3.0.2, hosted-git-info@^3.0.6: - version "3.0.7" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.7.tgz#a30727385ea85acfcee94e0aad9e368c792e036c" - integrity sha512-fWqc0IcuXs+BmE9orLDyVykAG9GJtGLGuZAAqgcckPgv5xad4AcXGIv8galtQvlwutxSlaMcdw7BUtq2EIvqCQ== + version "3.0.8" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.8.tgz#6e35d4cc87af2c5f816e4cb9ce350ba87a3f370d" + integrity sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw== dependencies: lru-cache "^6.0.0" @@ -9803,13 +9811,13 @@ internal-ip@^4.3.0: ipaddr.js "^1.9.0" internal-slot@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz#9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3" - integrity sha512-2cQNfwhAfJIkU4KZPkDI+Gj5yNNnbqi40W9Gge6dfnk4TocEVm00B3bdiL+JINrbGJil2TeHvM4rETGzk/f/0g== + version "1.0.3" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" + integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA== dependencies: - es-abstract "^1.17.0-next.1" + get-intrinsic "^1.1.0" has "^1.0.3" - side-channel "^1.0.2" + side-channel "^1.0.4" interpret@^1.4.0: version "1.4.0" @@ -9927,9 +9935,9 @@ is-buffer@^2.0.0: integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ== is-callable@^1.1.4, is-callable@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9" - integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA== + version "1.2.3" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e" + integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ== is-ci@^1.0.10: version "1.2.1" @@ -10223,10 +10231,11 @@ is-reference@^1.2.1: "@types/estree" "*" is-regex@^1.0.4, is-regex@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9" - integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg== + version "1.1.2" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz#81c8ebde4db142f2cf1c53fc86d6a45788266251" + integrity sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg== dependencies: + call-bind "^1.0.2" has-symbols "^1.0.1" is-regexp@^1.0.0: @@ -11109,9 +11118,9 @@ json3@^3.3.3: integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA== json5@2.x, json5@^2.1.2, json5@^2.1.3: - version "2.1.3" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43" - integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA== + version "2.2.0" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" + integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== dependencies: minimist "^1.2.5" @@ -11582,7 +11591,7 @@ lodash.map@^4.5.1: resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3" integrity sha1-dx7Hg540c9nEzeKLGTlMNWL09tM= -lodash.memoize@4.x, lodash.memoize@^4.1.2: +lodash.memoize@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= @@ -11622,7 +11631,7 @@ lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@4.17.20, "lodash@>=3.5 <5", lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0: +lodash@4.17.20, lodash@4.x, "lodash@>=3.5 <5", lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0: version "4.17.20" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== @@ -12167,9 +12176,9 @@ micromark-extension-frontmatter@^0.2.0: fault "^1.0.0" micromark-extension-gfm-autolink-literal@~0.5.0: - version "0.5.4" - resolved "https://registry.yarnpkg.com/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-0.5.4.tgz#0c8cc7004dd2277ed8f52e01195432291c47e699" - integrity sha512-471VKd4k3SiX7vx9fC+IYeGQL0RnxwBBXeEc5WConb7naJDG5m16guA+VoFzyXchrvmU08t0dUWWPZ0mkJSXVw== + version "0.5.5" + resolved "https://registry.yarnpkg.com/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-0.5.5.tgz#ca1951b12766e21c0533372b8fb9d78435de1604" + integrity sha512-UBK5/7efGCyfNW3bGAOIB0zaMfclhXi7/f4JPJkLCBgoksPJJs2UeX/uk2FS7H/cbnGd7L7X0CbNkH6ceK82Ww== dependencies: micromark "~2.11.0" @@ -12220,9 +12229,9 @@ micromark-extension-math@^0.1.0: micromark "~2.11.0" micromark@~2.11.0: - version "2.11.2" - resolved "https://registry.yarnpkg.com/micromark/-/micromark-2.11.2.tgz#e8b6a05f54697d2d3d27fc89600c6bc40dd05f35" - integrity sha512-IXuP76p2uj8uMg4FQc1cRE7lPCLsfAXuEfdjtdO55VRiFO1asrCSQ5g43NmPqFtRwzEnEhafRVzn2jg0UiKArQ== + version "2.11.3" + resolved "https://registry.yarnpkg.com/micromark/-/micromark-2.11.3.tgz#648e1e7970ea66a946cc2cbc678093ed814f29ed" + integrity sha512-oph5YYkVqR2U9OtWBcXYysZMtrdIvi8dfSeyEdr1wFr3Bk6YwI6THosX2AzKnhdps7mVUbXiqhmosu9DcA+xlQ== dependencies: debug "^4.0.0" parse-entities "^2.0.0" @@ -12477,14 +12486,14 @@ mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1: minimist "^1.2.5" mobx-react-lite@^3.1.6: - version "3.1.6" - resolved "https://registry.yarnpkg.com/mobx-react-lite/-/mobx-react-lite-3.1.6.tgz#e7f4809ab66edd1acca5adb00c6b88c600ae1952" - integrity sha512-MM3x9BLt5nC7iE/ILA5n2+hfrplEKYbFjqROEuGkzBdZP/KD+Z44+2gseczRrTG0xFuiPWfEzgT68+6/zqOiEw== + version "3.2.0" + resolved "https://registry.yarnpkg.com/mobx-react-lite/-/mobx-react-lite-3.2.0.tgz#331d7365a6b053378dfe9c087315b4e41c5df69f" + integrity sha512-q5+UHIqYCOpBoFm/PElDuOhbcatvTllgRp3M1s+Hp5j0Z6XNgDbgqxawJ0ZAUEyKM8X1zs70PCuhAIzX1f4Q/g== mobx@^6.0.4: - version "6.0.4" - resolved "https://registry.yarnpkg.com/mobx/-/mobx-6.0.4.tgz#8fc3e3629a3346f8afddf5bd954411974744dad1" - integrity sha512-wT2QJT9tW19VSHo9x7RPKU3z/I2Ps6wUS8Kb1OO+kzmg7UY3n4AkcaYG6jq95Lp1R9ohjC/NGYuT2PtuvBjhFg== + version "6.1.4" + resolved "https://registry.yarnpkg.com/mobx/-/mobx-6.1.4.tgz#6ba17f4e291146a3a26605a9c3a0c3ff8aea1e0b" + integrity sha512-DorvGl+ssJ9i5Sef90XzcIuOBMa2kWSC+PidTLHtgBX4f1bXOd+NKtujSjaRnQMDLTRkCzfJEFcC08hEjzCVaA== modify-values@^1.0.0: version "1.0.1" @@ -12792,7 +12801,7 @@ node-notifier@^8.0.0: uuid "^8.3.0" which "^2.0.2" -node-releases@^1.1.69: +node-releases@^1.1.70: version "1.1.70" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.70.tgz#66e0ed0273aa65666d7fe78febe7634875426a08" integrity sha512-Slf2s69+2/uAD79pVVQo8uSiC34+g8GWY8UH2Qtqv34ZfhYrxpYpfzs9Js9d6O0mbDmALuxaTlplnBTnSELcrw== @@ -14877,7 +14886,7 @@ rc-collapse@~3.1.0: rc-util "^5.2.1" shallowequal "^1.1.0" -rc-dialog@~8.5.1: +rc-dialog@~8.5.0, rc-dialog@~8.5.1: version "8.5.1" resolved "https://registry.yarnpkg.com/rc-dialog/-/rc-dialog-8.5.1.tgz#df316dd93e1685d7df1f5e4164ee35cba4a9af88" integrity sha512-EcLgHHjF3Jp4C+TFceO2j7gIrpx0YIhY6ronki5QJDL/z+qWYozY5RNh4rnv4a6R21SPVhV+SK+gMMlMHZ/YRQ== @@ -14905,29 +14914,29 @@ rc-dropdown@^3.1.3, rc-dropdown@~3.2.0: classnames "^2.2.6" rc-trigger "^5.0.4" -rc-field-form@~1.17.3: - version "1.17.4" - resolved "https://registry.yarnpkg.com/rc-field-form/-/rc-field-form-1.17.4.tgz#6e2bea66bfb636ba5bf297f29bafc5314a32cb6d" - integrity sha512-QI9fe0F9YAmEX946lQpxTs6Qc/FwaLeakWquiBNEmhtqurj/qDdrv+eLb4TfnHTjkdyxU3G7p901WEuuBrrdkA== +rc-field-form@~1.18.0: + version "1.18.1" + resolved "https://registry.yarnpkg.com/rc-field-form/-/rc-field-form-1.18.1.tgz#41027816c80d1acf6f51db085d34c2c35213a701" + integrity sha512-/YRnelnHLxygl/ROGhFqfCT+uAZ5xLvu3qjtlETOneb7fXKk7tqp+RGfYqZ4uNViXlsfxox3qqMMTVet6wYfEA== dependencies: "@babel/runtime" "^7.8.4" async-validator "^3.0.3" rc-util "^5.0.0" -rc-image@~5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/rc-image/-/rc-image-5.0.2.tgz#5b00b3201ef4bb9ef8f18a6ffe60724011f3cba3" - integrity sha512-bNCOGxo9ICe2S+MuVQtxVjk2esL0QJX4YcUB10S98z8CWO1sswySH6inH69YU778aCXs8/nKhtZMUmiU1To0bQ== +rc-image@~5.1.1: + version "5.1.4" + resolved "https://registry.yarnpkg.com/rc-image/-/rc-image-5.1.4.tgz#e251101159db80c3e33276aaa4669a991c7486c0" + integrity sha512-hilxwwEAYJXocY6i+lEdEibvHVOLgN43EQFfjKFiiruRNiUQzGWcdCseyaeTZgInTDrf+QWZP6MujlZjtEbpkA== dependencies: "@babel/runtime" "^7.11.2" classnames "^2.2.6" - rc-dialog "~8.5.1" + rc-dialog "~8.5.0" rc-util "^5.0.6" rc-input-number@~6.1.0: - version "6.1.2" - resolved "https://registry.yarnpkg.com/rc-input-number/-/rc-input-number-6.1.2.tgz#6663eda0ae6b75e464e63df375d29308cebb0ed8" - integrity sha512-UvP0tpOUeGetx6caS8RzBs3Du+NwPUn9ijQ3LeR1jOmzjXNuXvv58U6hvIXSHx/4ulPleQ5BAQP/aLTsFB4yGw== + version "6.1.3" + resolved "https://registry.yarnpkg.com/rc-input-number/-/rc-input-number-6.1.3.tgz#d558be65793429807cc2cdc360af407599d80283" + integrity sha512-qCLWK9NuuKGTsPXjRU/XvSOX7EKdnHlOpg59nPjYSDdH/czsAHZyYq50O6b6RF2TMPOjVpmsZQoMjNJYcnn6JA== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.5" @@ -15038,9 +15047,9 @@ rc-resize-observer@^1.0.0: resize-observer-polyfill "^1.5.1" rc-select@^12.0.0, rc-select@~12.1.0: - version "12.1.1" - resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-12.1.1.tgz#5a31082be4bc3ab4d8aa662d3e9ddc2cab65aae1" - integrity sha512-FugmUHtLf17clTrK5TiGY3G2PT0N/vT4wkuNyuwfMZvvB4EtShJaYcoLDoa0RkY0FGzHdtjMPBqW5gRrqkkPew== + version "12.1.2" + resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-12.1.2.tgz#7f5f06838b8a8c86516acb66ead26adbc55fbc16" + integrity sha512-WEcqj4ljz5kgp/yPN4RDQEZRvjGkwdk1PugpFrtd6tY+YqwKZs7vSZt6xphVIvWlmtwmZMe7e9G1U8XykUN0+g== dependencies: "@babel/runtime" "^7.10.1" classnames "2.x" @@ -15080,9 +15089,9 @@ rc-switch@~3.2.0: rc-util "^5.0.1" rc-table@~7.12.0: - version "7.12.3" - resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-7.12.3.tgz#c86e93b40dc3e2b8aae9e54ad7aa5a64ff7d261e" - integrity sha512-R87lx28os4Ftm/9x+MamwzLw+Dtp9yxihceAgLA/9JS9QP/sqej1qlO+3T/Uw4paZqCg9SpW0XzLI1MandviWA== + version "7.12.5" + resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-7.12.5.tgz#92fe3ff62ab59d3d29f5da53d4fba68dc02b836c" + integrity sha512-XV4m5h0W+NjGkNzvp5ahOhYHyNG8oPNV9pTLre2EsfmyStXUJBICyfkNID7WZulMdCehv/Wa3MdqXwZ4EsJchw== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.5" @@ -15142,7 +15151,7 @@ rc-tree@^4.0.0, rc-tree@~4.1.0: rc-util "^5.0.0" rc-virtual-list "^3.0.1" -rc-trigger@^5.0.0, rc-trigger@^5.0.4, rc-trigger@^5.1.2: +rc-trigger@^5.0.0, rc-trigger@^5.0.4, rc-trigger@^5.1.2, rc-trigger@^5.2.1: version "5.2.1" resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-5.2.1.tgz#54686220b884ed1e0750c4f2411fbb34d4928c99" integrity sha512-XZilSlSDnb0L/R3Ff2xo9C0Fho2aBDoAn8u3coM60XdLqTCo24nsOh1bfAMm0uIB1qVjh5eqeyFqnBPmXi8pJg== @@ -15245,9 +15254,9 @@ react-is@^17.0.1: integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA== react-json-view@^1.19.1: - version "1.20.2" - resolved "https://registry.yarnpkg.com/react-json-view/-/react-json-view-1.20.2.tgz#b3bfaeb13842c68a752e0a10fb165761dca6d523" - integrity sha512-DOGrMqhDHrvBwzwiIU/LKpZ7CFrOHrjoQ+e+d1aOJHn82t++PKuB4atiNR1Ko8UBEoGrMv44RagRSyYWTsEHKg== + version "1.20.4" + resolved "https://registry.yarnpkg.com/react-json-view/-/react-json-view-1.20.4.tgz#c993baa28bf2a16110f61e4434af3b4fecb416d8" + integrity sha512-QBhb1STnWif+wY8Bsl+ISyDnKTocN/37gSauq8MNHjvu7UOLmdTAgynnC5/rrPh1sAdakg7oIhxU0l660xQg+Q== dependencies: flux "^4.0.1" react-base16-styling "^0.6.0" @@ -15676,9 +15685,9 @@ regjsgen@^0.5.1: integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A== regjsparser@^0.6.4: - version "0.6.6" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.6.tgz#6d8c939d1a654f78859b08ddcc4aa777f3fa800a" - integrity sha512-jjyuCp+IEMIm3N1H1LLTJW1EISEJV9+5oHdEyrt43Pg9cDSb6rrLZei2cVWpl0xTjmmlpec/lEQGYgM7xfpGCQ== + version "0.6.7" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.7.tgz#c00164e1e6713c2e3ee641f1701c4b7aa0a7f86c" + integrity sha512-ib77G0uxsA2ovgiYbCVGx4Pv3PSttAx2vIwidqQzbL2U5S4Q+j00HdSAneSBuyVcMvEnTXMjiGgB+DlXozVhpQ== dependencies: jsesc "~0.5.0" @@ -16001,7 +16010,7 @@ rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2: dependencies: glob "^7.1.3" -rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3, rimraf@^2.7.1: +rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -16073,11 +16082,11 @@ rollup-pluginutils@^2.8.1: estree-walker "^0.6.1" rollup@^2.37.1: - version "2.37.1" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.37.1.tgz#aa7aadffd75c80393f9314f9857e851b0ffd34e7" - integrity sha512-V3ojEeyGeSdrMSuhP3diBb06P+qV4gKQeanbDv+Qh/BZbhdZ7kHV0xAt8Yjk4GFshq/WjO7R4c7DFM20AwTFVQ== + version "2.38.4" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.38.4.tgz#1b84ea8728c73b1a00a6a6e9c630ec8c3fe48cea" + integrity sha512-B0LcJhjiwKkTl79aGVF/u5KdzsH8IylVfV56Ut6c9ouWLJcUK17T83aZBetNYSnZtXf2OHD4+2PbmRW+Fp5ulg== optionalDependencies: - fsevents "~2.1.2" + fsevents "~2.3.1" rsvp@^4.8.4: version "4.8.5" @@ -16162,9 +16171,9 @@ sass-loader@^8.0.2: semver "^6.3.0" sass@^1.26.2: - version "1.32.4" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.4.tgz#308bf29dd7f53d44ae4f06580e9a910ad9aa411e" - integrity sha512-N0BT0PI/t3+gD8jKa83zJJUb7ssfQnRRfqN+GIErokW6U4guBpfYl8qYB+OFLEho+QvnV5ZH1R9qhUC/Z2Ch9w== + version "1.32.6" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.6.tgz#e3646c8325cd97ff75a8a15226007f3ccd221393" + integrity sha512-1bcDHDcSqeFtMr0JXI3xc/CXX6c4p0wHHivJdru8W7waM7a1WjKMm4m/Z5sY7CbVw4Whi2Chpcw6DFfSWwGLzQ== dependencies: chokidar ">=2.0.0 <4.0.0" @@ -16459,7 +16468,7 @@ shellwords@^0.1.1: resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b" integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww== -side-channel@^1.0.2, side-channel@^1.0.3: +side-channel@^1.0.3, side-channel@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== @@ -16659,9 +16668,9 @@ source-map-support@^0.5.16, source-map-support@^0.5.17, source-map-support@^0.5. source-map "^0.6.0" source-map-url@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" - integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM= + version "0.4.1" + resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" + integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw== source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: version "0.6.1" @@ -16808,9 +16817,9 @@ ssri@^6.0.0, ssri@^6.0.1: figgy-pudding "^3.5.1" ssri@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.0.tgz#79ca74e21f8ceaeddfcb4b90143c458b8d988808" - integrity sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA== + version "8.0.1" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af" + integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ== dependencies: minipass "^3.1.1" @@ -17654,9 +17663,9 @@ ts-import-plugin@1.6.1: tslib "^1.10.0" ts-jest@^26.0.0: - version "26.4.4" - resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.4.4.tgz#61f13fb21ab400853c532270e52cc0ed7e502c49" - integrity sha512-3lFWKbLxJm34QxyVNNCgXX1u4o/RV0myvA2y2Bxm46iGIjKlaY0own9gIckbjZJPn+WaJEnfPPJ20HHGpoq4yg== + version "26.5.0" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.5.0.tgz#3e3417d91bc40178a6716d7dacc5b0505835aa21" + integrity sha512-Ya4IQgvIFNa2Mgq52KaO8yBw2W8tWp61Ecl66VjF0f5JaV8u50nGoptHVILOPGoI7SDnShmEqnYQEmyHdQ+56g== dependencies: "@types/jest" "26.x" bs-logger "0.x" @@ -17664,7 +17673,7 @@ ts-jest@^26.0.0: fast-json-stable-stringify "2.x" jest-util "^26.1.0" json5 "2.x" - lodash.memoize "4.x" + lodash "4.x" make-error "1.x" mkdirp "1.x" semver "7.x" @@ -17719,9 +17728,9 @@ tslib@^2.0.3: integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== tsutils@^3.17.1: - version "3.19.1" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.19.1.tgz#d8566e0c51c82f32f9c25a4d367cd62409a547a9" - integrity sha512-GEdoBf5XI324lu7ycad7s6laADfnAqCw6wLGI+knxvw9vsIYBaJfYdmeCEG3FMMUiSm3OGgNb+m6utsWf5h9Vw== + version "3.20.0" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.20.0.tgz#ea03ea45462e146b53d70ce0893de453ff24f698" + integrity sha512-RYbuQuvkhuqVeXweWT3tJLKOEJ/UUw9GjNEZGWdrLLlM+611o1gwLHBpxoFJKKl25fLprp2eVthtKs5JOrNeXg== dependencies: tslib "^1.8.1" @@ -17834,15 +17843,10 @@ uglify-js@3.4.x: commander "~2.19.0" source-map "~0.6.1" -uglify-js@^3.1.4: - version "3.12.4" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.12.4.tgz#93de48bb76bb3ec0fc36563f871ba46e2ee5c7ee" - integrity sha512-L5i5jg/SHkEqzN18gQMTWsZk3KelRsfD1wUVNqtq0kzqWQqcJjyL8yc1o8hJgRrWqrAl2mUFbhfznEIoi7zi2A== - -uglify-js@^3.4.9: - version "3.12.5" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.12.5.tgz#83241496087c640efe9dfc934832e71725aba008" - integrity sha512-SgpgScL4T7Hj/w/GexjnBHi3Ien9WS1Rpfg5y91WXMj9SY997ZCQU76mH4TpLwwfmMvoOU8wiaRkIf6NaH3mtg== +uglify-js@^3.1.4, uglify-js@^3.4.9: + version "3.12.6" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.12.6.tgz#f884584fcc42e10bca70db5cb32e8625c2c42535" + integrity sha512-aqWHe3DfQmZUDGWBbabZ2eQnJlQd1fKlMUu7gV+MiTuDzdgDw31bI3wA2jLLsV/hNcDP26IfyEgSVoft5+0SVw== uid-number@0.0.6: version "0.0.6" @@ -17874,16 +17878,16 @@ umi-webpack-bundle-analyzer@3.6.0: ws "^6.0.0" umi@^3.0.0: - version "3.3.6" - resolved "https://registry.yarnpkg.com/umi/-/umi-3.3.6.tgz#e7cf491388be1ccd33d3072fbc8b7dd6ea7bf9b1" - integrity sha512-DFrGMDJDVlDZR7XCGZPxsNJJZr9pLhDBLt29yQ8v5elkwx14XF9cdW7L/RAN/VDFAdCXGlA2Mnkz0PGCG4bGTw== + version "3.3.7" + resolved "https://registry.yarnpkg.com/umi/-/umi-3.3.7.tgz#1531eea04b3bb6f16f17c5816bc23912d0b159b5" + integrity sha512-lpDArz+zxGiMRFtFT2ddDginbNq7+aT6jtK25e/qAxkd4vvaWs8aLw7aCtyXPjXonuSkEtKLJcMUapjfDOBKwg== dependencies: "@babel/core" "7.12.10" - "@umijs/core" "3.3.6" - "@umijs/preset-built-in" "3.3.6" - "@umijs/runtime" "3.3.6" - "@umijs/types" "3.3.6" - "@umijs/utils" "3.3.6" + "@umijs/core" "3.3.7" + "@umijs/preset-built-in" "3.3.7" + "@umijs/runtime" "3.3.7" + "@umijs/types" "3.3.7" + "@umijs/utils" "3.3.7" react "16.x" react-dom "16.x" resolve-cwd "3.0.0" @@ -18050,11 +18054,6 @@ universalify@^0.1.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== -universalify@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d" - integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug== - universalify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" @@ -18350,19 +18349,19 @@ vscode-uri@^2.1.2: integrity sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A== vscode-web-custom-data@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/vscode-web-custom-data/-/vscode-web-custom-data-0.3.2.tgz#62a5a924397d8056c5524ff0ff8f14eb815b7066" - integrity sha512-GGZ99dJbARyh6rv03dXZImGlP5WvNG382A3nIt0yX1uyqBa558L/klHWcgEJzcVkG4t16OQWwPedMR3JkeD2Qg== + version "0.3.3" + resolved "https://registry.yarnpkg.com/vscode-web-custom-data/-/vscode-web-custom-data-0.3.3.tgz#9e1f2388c718d6f190038a19d144834a436b876f" + integrity sha512-orMjjj1r4efP5ocODYZm3orpANakRBsxPZPDoD5UIrFOPKDFtMJQLp6PIH1rb3AYVRD1iYXMhDQoC6tZ+DrigA== vue-demi@latest: version "0.6.0" - resolved "https://r.cnpmjs.org/vue-demi/download/vue-demi-0.6.0.tgz#e314282f704cb449119b9fd002cbbc0e39f591fe" - integrity sha1-4xQoL3BMtEkRm5/QAsu8Djn1kf4= + resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.6.0.tgz#e314282f704cb449119b9fd002cbbc0e39f591fe" + integrity sha512-8GEJa0mHJpYJeGeq5fD1pJct2kfdl30PHfmL1NaJ97mgKPyKojlIRt/3inGBK4Y0ylCI6T5vOo3chwpqDOq/Hw== -vue-eslint-parser@^7.1.1, vue-eslint-parser@^7.3.0: - version "7.3.0" - resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.3.0.tgz#894085839d99d81296fa081d19643733f23d7559" - integrity sha512-n5PJKZbyspD0+8LnaZgpEvNCrjQx1DyDHw8JdWwoxhhC+yRip4TAvSDpXGf9SWX6b0umeB5aR61gwUo6NVvFxw== +vue-eslint-parser@^7.1.1, vue-eslint-parser@^7.4.1: + version "7.4.1" + resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.4.1.tgz#e4adcf7876a7379758d9056a72235af18a587f92" + integrity sha512-AFvhdxpFvliYq1xt/biNBslTHE/zbEvSnr1qfHA/KxRIpErmEDrQZlQnvEexednRHmLfDNOMuDYwZL5xkLzIXQ== dependencies: debug "^4.1.1" eslint-scope "^5.0.0"