diff --git a/CHANGELOG.md b/CHANGELOG.md index 2573f1e2fb..9db3b856b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,5 @@ # [5.0.0-alpha.5](https://github.com/dhis2/ui/compare/v5.0.0-alpha.4...v5.0.0-alpha.5) (2020-04-16) - ### Code Refactoring * layers and overlay components ([24ead4c](https://github.com/dhis2/ui/commit/24ead4c31a650cfedf3221a5086baf911ea1e544)) diff --git a/package.json b/package.json index 1b15f93954..deae147e62 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,10 @@ { "name": "root", "version": "5.0.0-alpha.5", - "repository": "git@github.com:dhis2/ui.git", + "repository": { + "type": "git", + "url": "https://github.com/dhis2/ui.git" + }, "author": "Viktor Varland ", "license": "BSD-3-Clause", "private": true, @@ -45,21 +48,21 @@ "watch:widgets": "yarn build:widgets --watch --dev" }, "devDependencies": { - "@dhis2/cli-app-scripts": "^3.2.5", - "@dhis2/cli-style": "^6.0.0", + "@dhis2/cli-app-scripts": "^3.2.9", + "@dhis2/cli-style": "^7.0.0", "@dhis2/cli-utils-cypress": "^1.0.2", "@dhis2/cli-utils-docsite": "^1.3.0", "@storybook/addons": "^5.3.9", "@storybook/components": "^5.3.14", "@storybook/csf": "^0.0.1", - "@storybook/preset-create-react-app": "^1.5.2", - "@storybook/react": "^5.3.14", + "@storybook/preset-create-react-app": "^2.1.1", + "@storybook/react": "^5.3.17", "@wertarbyte/react-props-md-table": "^1.1.1", "concurrently": "^5.1.0", "enzyme": "^3.11.0", "enzyme-adapter-react-16": "^1.15.2", "react": "16.8", - "react-dev-utils": "^10.2.0", + "react-dev-utils": "^10.2.1", "react-docgen": "^5.3.0", "react-dom": "16.8", "styled-jsx": "^3.2.4", diff --git a/packages/constants/package.json b/packages/constants/package.json index 0fa36f9727..e64ff8b463 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -19,7 +19,7 @@ "build": "d2-app-scripts build" }, "dependencies": { - "@dhis2/prop-types": "^1.5.0" + "@dhis2/prop-types": "^1.6.4" }, "files": [ "build" diff --git a/packages/forms/package.json b/packages/forms/package.json index 163cee44da..f2422d7957 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -20,7 +20,7 @@ "react-dom": "^16.8" }, "dependencies": { - "@dhis2/prop-types": "^1.5", + "@dhis2/prop-types": "^1.6.4", "@dhis2/ui-core": "5.0.0-alpha.5", "@dhis2/ui-widgets": "5.0.0-alpha.5", "classnames": "^2.2.6", diff --git a/packages/icons/src/Cancel--outline.js b/packages/icons/src/Cancel--outline.js new file mode 100644 index 0000000000..f1b54509b8 --- /dev/null +++ b/packages/icons/src/Cancel--outline.js @@ -0,0 +1,27 @@ +import React from 'react' +import propTypes from '@dhis2/prop-types' + +export function CancelOutline({ className }) { + return ( + + + + + + ) +} +CancelOutline.propTypes = { + className: propTypes.string, +} diff --git a/packages/icons/src/index.js b/packages/icons/src/index.js index d4a85d7997..b3e9963817 100644 --- a/packages/icons/src/index.js +++ b/packages/icons/src/index.js @@ -21,3 +21,4 @@ export * from './Single.js' export * from './Status.js' export * from './Switch.js' export * from './Upload.js' +export * from './Cancel--outline.js' diff --git a/packages/widgets/i18n/zh_CN.po b/packages/widgets/i18n/zh_CN.po new file mode 100644 index 0000000000..32ec555472 --- /dev/null +++ b/packages/widgets/i18n/zh_CN.po @@ -0,0 +1,39 @@ +# Translators: +# 晓东 林 <13981924470@126.com>, 2020 +# +msgid "" +msgstr "" +"Project-Id-Version: i18next-conv\n" +"POT-Creation-Date: 2020-02-18T13:19:29.126Z\n" +"PO-Revision-Date: 2019-08-12 21:09+0000\n" +"Last-Translator: 晓东 林 <13981924470@126.com>, 2020\n" +"Language-Team: Chinese (China) (https://www.transifex.com/hisp-uio/teams/100509/zh_CN/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +msgid "Search apps" +msgstr "搜索APP" + +msgid "Edit profile" +msgstr "编辑基本信息" + +msgid "Settings" +msgstr "设置" + +msgid "Account" +msgstr "账号" + +msgid "Help" +msgstr "帮助" + +msgid "About DHIS2" +msgstr "关于DHIS2" + +msgid "Logout" +msgstr "退出" + +msgid "Something went wrong with loading the children." +msgstr "载入下属资源出错" diff --git a/packages/widgets/package.json b/packages/widgets/package.json index 4c57d6e7b7..726b199992 100644 --- a/packages/widgets/package.json +++ b/packages/widgets/package.json @@ -25,7 +25,7 @@ "dependencies": { "@dhis2/app-runtime": "^2.1.0", "@dhis2/d2-i18n": "^1", - "@dhis2/prop-types": "^1.5", + "@dhis2/prop-types": "^1.6.4", "@dhis2/ui-constants": "5.0.0-alpha.5", "@dhis2/ui-core": "5.0.0-alpha.5", "@dhis2/ui-icons": "5.0.0-alpha.5", diff --git a/packages/widgets/src/Chip/Chip.js b/packages/widgets/src/Chip/Chip.js index b60e62429e..c4c0095cb4 100644 --- a/packages/widgets/src/Chip/Chip.js +++ b/packages/widgets/src/Chip/Chip.js @@ -18,6 +18,7 @@ import { Remove } from './Remove.js' */ const Chip = ({ selected, + dense, disabled, dragging, overflow, @@ -36,6 +37,7 @@ const Chip = ({ }} className={cx(className, { selected, + dense, disabled, dragging, })} @@ -60,6 +62,12 @@ const Chip = ({ color: ${colors.grey900}; } + .dense { + height: 24px; + font-size: 13px; + line-height: 15px; + } + span:hover { background-color: ${colors.grey300}; } @@ -110,6 +118,7 @@ Chip.defaultProps = { * @prop {function} [onClick] * @prop {function} [onRemove] * @prop {boolean} [selected] + * @prop {boolean} [dense] * @prop {boolean} [disabled] * @prop {boolean} [dragging] * @prop {boolean} [overflow] @@ -119,6 +128,7 @@ Chip.propTypes = { children: propTypes.string, className: propTypes.string, dataTest: propTypes.string, + dense: propTypes.bool, disabled: propTypes.bool, dragging: propTypes.bool, icon: propTypes.element, diff --git a/packages/widgets/src/Chip/Chip.stories.js b/packages/widgets/src/Chip/Chip.stories.js index 4dfcdc3148..6112b34352 100644 --- a/packages/widgets/src/Chip/Chip.stories.js +++ b/packages/widgets/src/Chip/Chip.stories.js @@ -42,6 +42,14 @@ storiesOf('Component/Widget/Chip', module) )) + .add('Dense', () => I am dense) + + .add('Dense removeable', () => ( + + Removeable and dense + + )) + const Globe = () => ( LGTM icon diff --git a/packages/widgets/src/Chip/Remove.js b/packages/widgets/src/Chip/Remove.js index 9ef1ec280f..f8aa7a2a47 100644 --- a/packages/widgets/src/Chip/Remove.js +++ b/packages/widgets/src/Chip/Remove.js @@ -2,31 +2,34 @@ import React from 'react' import propTypes from '@dhis2/prop-types' import { css, resolve } from 'styled-jsx/css' -import { Cancel } from '@dhis2/ui-icons' +import { CancelOutline } from '@dhis2/ui-icons' import { colors } from '@dhis2/ui-constants' const containerStyle = css` span { - display: block; - height: 18px; - width: 18px; + display: flex; + justify-content: center; + align-items: center; + height: 20px; + width: 20px; margin-right: 4px; + border-radius: 12px; + margin-left: -8px; + } + span:hover { + background: ${colors.grey400}; } ` const removeIcon = resolve` svg { - color: ${colors.grey700}; - height: 18px; - width: 18px; + fill: ${colors.grey600}; + height: 16px; + width: 16px; cursor: pointer; opacity: 1; pointer-events: all; } - - svg:hover { - opacity: 0.82; - } ` export const Remove = ({ onRemove, dataTest }) => { @@ -42,7 +45,7 @@ export const Remove = ({ onRemove, dataTest }) => { }} data-test={dataTest} > - + {removeIcon.styles} diff --git a/packages/widgets/src/MultiSelect/SelectionList.js b/packages/widgets/src/MultiSelect/SelectionList.js index d2e32bce6d..52cacfd170 100644 --- a/packages/widgets/src/MultiSelect/SelectionList.js +++ b/packages/widgets/src/MultiSelect/SelectionList.js @@ -41,6 +41,7 @@ const SelectionList = ({ selected, onChange, disabled, options }) => ( onRemove={onRemove} disabled={isDisabled} overflow + dense > {selectedOption.props.label} diff --git a/yarn.lock b/yarn.lock index a95be7f5ad..11b14e094f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1342,7 +1342,7 @@ typeface-roboto "^0.0.75" typescript "^3.6.3" -"@dhis2/cli-app-scripts@^3.2.5": +"@dhis2/cli-app-scripts@^3.2.5", "@dhis2/cli-app-scripts@^3.2.9": version "3.2.9" resolved "https://registry.yarnpkg.com/@dhis2/cli-app-scripts/-/cli-app-scripts-3.2.9.tgz#39111e3aa63e8dd23464ddd8cb1a7a0c86dbd3c0" integrity sha512-+VMUPBQ4t9j2Vk3FAFJqtTMcqC8U3e1hhaBgZqOkCe+eGKVagJwWwEWfvZcGF74+bC11VIiqUryaUqcMPVoRCA== @@ -1408,27 +1408,27 @@ handlebars "^4.5.3" isbinaryfile "^4.0.2" -"@dhis2/cli-style@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@dhis2/cli-style/-/cli-style-6.0.0.tgz#299f0dd0992123e3f8487a561f0c11726ee660ac" - integrity sha512-YDzXgkcrHwLWzO44f8QkmD0LVDqgEWPx3iBrobVd8ucmkhyjCCt9OU0OfbOUPEgoZqMlEVwgrHcpKIy+m7QdeA== +"@dhis2/cli-style@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@dhis2/cli-style/-/cli-style-7.0.0.tgz#50bfdac29527d1ecb7eb66e560e98331075b84de" + integrity sha512-SYT7nmT4N5jYhRnoF6eRGa2zLDSjaG+NHOx1nqhospzrkyZroyVWdqfMANFTYYX4/PE3gAYEcz4Y2gB8mwg88w== dependencies: "@commitlint/cli" "^8.3.5" "@commitlint/config-conventional" "^8.3.4" "@dhis2/cli-helpers-engine" "1.5.0" - babel-eslint "^10.0.3" + babel-eslint "^10.1.0" cross-spawn "^7.0.1" eslint "^6.8.0" - eslint-config-prettier "^6.10.0" + eslint-config-prettier "^6.10.1" eslint-plugin-prettier "^3.1.2" - eslint-plugin-react "^7.18.0" - fast-glob "^3.1.1" + eslint-plugin-react "^7.19.0" + fast-glob "^3.2.2" fs-extra "^8.1.0" - husky "^4.2.1" + husky "^4.2.3" perfy "^1.1.5" prettier "^1.19.1" - semver "^7.1.1" - yargs "^15.1.0" + semver "^7.1.3" + yargs "^15.3.1" "@dhis2/cli-utils-cypress@^1.0.2": version "1.0.2" @@ -1464,7 +1464,14 @@ i18next "^10.3" moment "^2.24.0" -"@dhis2/prop-types@^1.5", "@dhis2/prop-types@^1.5.0": +"@dhis2/prop-types@^1.5", "@dhis2/prop-types@^1.5.0", "@dhis2/prop-types@^1.6.4": + version "1.6.4" + resolved "https://registry.yarnpkg.com/@dhis2/prop-types/-/prop-types-1.6.4.tgz#ec4d256c9440d4d00071524422a727c61ddaa6f6" + integrity sha512-qkVj8OuyjDmSxzYDlCWZllvC9hIbrIImMp79/U5CVsIRbjUF0zA/tfbv4rWnsWALmwEHOQFbzl5GnO5D8RNneA== + dependencies: + prop-types "^15" + +"@dhis2/prop-types@^1.6.4": version "1.6.4" resolved "https://registry.yarnpkg.com/@dhis2/prop-types/-/prop-types-1.6.4.tgz#ec4d256c9440d4d00071524422a727c61ddaa6f6" integrity sha512-qkVj8OuyjDmSxzYDlCWZllvC9hIbrIImMp79/U5CVsIRbjUF0zA/tfbv4rWnsWALmwEHOQFbzl5GnO5D8RNneA== @@ -1472,11 +1479,11 @@ prop-types "^15" "@dhis2/ui-core@^4.6.1": - version "4.16.0" - resolved "https://registry.yarnpkg.com/@dhis2/ui-core/-/ui-core-4.16.0.tgz#868555c2d8758af3f26e168d2a469bde39c91b1d" - integrity sha512-pa47/ZZrQa9SUXlOW4r8HKyuzfO/i4vENR1u2+2zrPfBtbFK4FPwXANmdVAw+V6epbWJU8k2Fi31j1ZMwauq/w== + version "4.17.1" + resolved "https://registry.yarnpkg.com/@dhis2/ui-core/-/ui-core-4.17.1.tgz#960f3184f1ba69b1fa299863ae5c6b498dd871a1" + integrity sha512-8RkJ7xH9u2Yh5UtaaNhwrkoXSBhQnEqLu3P4tW7shIVCpJBBMPoIaS/ybsLeyf/BHn8IHoqkJNIA4CUEvGbjDQ== dependencies: - "@dhis2/prop-types" "^1.5.0" + "@dhis2/prop-types" "^1.6.4" "@popperjs/core" "^2.1.0" classnames "^2.2.6" @@ -2099,6 +2106,18 @@ pretty-hrtime "^1.0.3" regenerator-runtime "^0.13.3" +"@storybook/node-logger@^5.3.17": + version "5.3.17" + resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.3.17.tgz#f3ad5bf9dd74d8e1cdfb8d831d66a80c5039cf4c" + integrity sha512-onfcxl37BYZI1HGuPI9MelkyUWjn7NpfN8RUYdqG9P6WKiIY5xbpG0V6qod5jvIKIypK0NmfJTtneOu46L/oDg== + dependencies: + "@types/npmlog" "^4.1.2" + chalk "^3.0.0" + core-js "^3.0.1" + npmlog "^4.1.2" + pretty-hrtime "^1.0.3" + regenerator-runtime "^0.13.3" + "@storybook/preset-create-react-app@^1.5.2": version "1.5.2" resolved "https://registry.yarnpkg.com/@storybook/preset-create-react-app/-/preset-create-react-app-1.5.2.tgz#9bbdb599623031155f866b738bab8f4b2d41ca1c" @@ -2109,7 +2128,18 @@ react-docgen-typescript-loader "^3.6.0" semver "^7.1.1" -"@storybook/react@^5.3.13", "@storybook/react@^5.3.14": +"@storybook/preset-create-react-app@^2.1.1": + version "2.1.1" + resolved "https://registry.yarnpkg.com/@storybook/preset-create-react-app/-/preset-create-react-app-2.1.1.tgz#6e4249d4c594596bdced74213e4c9238505c085c" + integrity sha512-ywnpCr7gHuIv/fv8yiQHLY8RikQRqn401CPTKh5nsWwkUbIOQ47Cyewjo2QuVTpivOLLuyJiIpq1jAAS1iW2Ow== + dependencies: + "@storybook/node-logger" "^5.3.17" + "@types/babel__core" "^7.1.6" + "@types/webpack" "^4.41.7" + pnp-webpack-plugin "^1.6.4" + semver "^7.1.3" + +"@storybook/react@^5.3.13", "@storybook/react@^5.3.17": version "5.3.18" resolved "https://registry.yarnpkg.com/@storybook/react/-/react-5.3.18.tgz#c057b680924e188d44149c3d67dd31aead88b28a" integrity sha512-6yNg+phcrEqEjC2NOiu0mJuxbTwX7yzbkcusIn0S7N/KTXNO7CGvYjAkdjfw0gTLjfuVDZIjDQfoosslvfsj3w== @@ -2324,10 +2354,10 @@ resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a" integrity sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA== -"@types/babel__core@^7.1.0": - version "7.1.7" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.7.tgz#1dacad8840364a57c98d0dd4855c6dd3752c6b89" - integrity sha512-RL62NqSFPCDK2FM1pSDH0scHpJvsXtZNiYlMB73DgPBaG1E38ZYVL+ei5EkWRbr+KC4YNiAUNBnRj+bgwpgjMw== +"@types/babel__core@^7.1.0", "@types/babel__core@^7.1.6": + version "7.1.6" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.6.tgz#16ff42a5ae203c9af1c6e190ed1f30f83207b610" + integrity sha512-tTnhWszAqvXnhW7m5jQU9PomXSiKXk2sFxpahXvI20SZKu9ylPi8WtIxueZ6ehDWikPT0jeFujMj3X4ZHuf3Tg== dependencies: "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" @@ -2628,6 +2658,18 @@ "@types/webpack-sources" "*" source-map "^0.6.0" +"@types/webpack@^4.41.7": + version "4.41.12" + resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.12.tgz#0386ee2a2814368e2f2397abb036c0bf173ff6c3" + integrity sha512-BpCtM4NnBen6W+KEhrL9jKuZCXVtiH6+0b6cxdvNt2EwU949Al334PjQSl2BeAyvAX9mgoNNG21wvjP3xZJJ5w== + dependencies: + "@types/anymatch" "*" + "@types/node" "*" + "@types/tapable" "*" + "@types/uglify-js" "*" + "@types/webpack-sources" "*" + source-map "^0.6.0" + "@types/yargs-parser@*": version "15.0.0" resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d" @@ -3719,7 +3761,7 @@ babel-code-frame@^6.22.0: esutils "^2.0.2" js-tokens "^3.0.2" -babel-eslint@10.1.0, babel-eslint@^10.0.3: +babel-eslint@10.1.0, babel-eslint@^10.1.0: version "10.1.0" resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232" integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg== @@ -4521,7 +4563,7 @@ browserify@^16.1.0: vm-browserify "^1.0.0" xtend "^4.0.0" -browserslist@4.10.0: +browserslist@4.10.0, browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.6.2, browserslist@^4.6.4, browserslist@^4.8.3: version "4.10.0" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.10.0.tgz#f179737913eaf0d2b98e4926ac1ca6a15cbcc6a9" integrity sha512-TpfK0TDgv71dzuTsEAlQiHeWQ/tiPqgNZVdv046fvNtBZrjbv2O3TsWCDU0AWGJJKCF/KsjNdLzR9hXOsh/CfA== @@ -4540,7 +4582,7 @@ browserslist@4.7.0: electron-to-chromium "^1.3.247" node-releases "^1.1.29" -browserslist@^4.0.0, browserslist@^4.11.1, browserslist@^4.6.0, browserslist@^4.6.2, browserslist@^4.6.4, browserslist@^4.8.3, browserslist@^4.9.1: +browserslist@^4.11.1, browserslist@^4.9.1: version "4.11.1" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.11.1.tgz#92f855ee88d6e050e7e7311d987992014f1a1f1b" integrity sha512-DCTr3kDrKEYNw6Jb9HFxVLQNaue8z+0ZfRBRjmCunKDEXEBajKDj2Y+Uelg+Pi29OnvaSGwjOsnRyNEkXzHg5g== @@ -4800,7 +4842,22 @@ 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.30000989, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001038, caniuse-lite@^1.0.30001039: +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981: + version "1.0.30001022" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001022.tgz#9eeffe580c3a8f110b7b1742dcf06a395885e4c6" + integrity sha512-FjwPPtt/I07KyLPkBQ0g7/XuZg6oUkYBVnPHNj3VHJbOjmmJ/GdSo/GUY6MwINEQvjhP6WZVbX8Tvms8xh0D5A== + +caniuse-lite@^1.0.30000989: + version "1.0.30000998" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000998.tgz#7227a8046841e7d01e156ae7227a504d065f6744" + integrity sha512-8Tj5sPZR9kMHeDD9SZXIVr5m9ofufLLCG2Y4QwQrH18GIwG+kCc+zYdlR036ZRkuKjVVetyxeAgGA1xF7XdmzQ== + +caniuse-lite@^1.0.30001035: + version "1.0.30001038" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001038.tgz#44da3cbca2ab6cb6aa83d1be5d324e17f141caff" + integrity sha512-zii9quPo96XfOiRD4TrfYGs+QsGZpb2cGiMAzPjtf/hpFgB6zCPZgJb7I1+EATeMw/o+lG8FyRAnI+CWStHcaQ== + +caniuse-lite@^1.0.30001038, caniuse-lite@^1.0.30001039: version "1.0.30001039" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001039.tgz#b3814a1c38ffeb23567f8323500c09526a577bbe" integrity sha512-SezbWCTT34eyFoWHgx8UWso7YtvtM7oosmFoXbCkdC6qJzRfBTeTgE9REtKtiuKXuMwWTZEvdnFNGAyVMorv8Q== @@ -4869,6 +4926,14 @@ chalk@^3.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" +chalk@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.0.0.tgz#6e98081ed2d17faab615eb52ac66ec1fe6209e72" + integrity sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + character-entities-legacy@^1.0.0: version "1.1.4" resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1" @@ -5339,7 +5404,7 @@ compare-func@^1.3.1: array-ify "^1.0.0" dot-prop "^3.0.0" -compare-versions@^3.5.1: +compare-versions@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62" integrity sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA== @@ -6759,11 +6824,16 @@ ejs@^3.0.2: resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.0.2.tgz#745b01cdcfe38c1c6a2da3bbb2d9957060a31226" integrity sha512-IncmUpn1yN84hy2shb0POJ80FWrfGNY0cxO9f4v+/sG7qcBvAtVWUA1IdzY/8EYUmOVhoKJVdJjNd3AZcnxOjA== -electron-to-chromium@^1.3.247, electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.390: +electron-to-chromium@^1.3.247, electron-to-chromium@^1.3.390: version "1.3.398" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.398.tgz#4c01e29091bf39e578ac3f66c1f157d92fa5725d" integrity sha512-BJjxuWLKFbM5axH3vES7HKMQgAknq9PZHBkMK/rEXUQG9i1Iw5R+6hGkm6GtsQSANjSUrh/a6m32nzCNDNo/+w== +electron-to-chromium@^1.3.378: + version "1.3.386" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.386.tgz#224f97c808da76014096848f80bb9342b6a95cdb" + integrity sha512-M7JHfp32Bq6Am59AWgglh2d3nqe6y8Y94Vcb/AXUsO3DGvKUHYI5ML9+U5oNShfdOEfurrrjKSoSgFt2mz7mpw== + elegant-spinner@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e" @@ -7067,7 +7137,7 @@ escodegen@^1.11.0, escodegen@^1.9.1: optionalDependencies: source-map "~0.6.1" -eslint-config-prettier@^6.10.0: +eslint-config-prettier@^6.10.1: version "6.10.1" resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.10.1.tgz#129ef9ec575d5ddc0e269667bf09defcd898642a" integrity sha512-svTy6zh1ecQojvpbJSgH3aei/Rt7C6i090l5f2WQ4aB05lYHeZIR1qL4wZyyILTbtmnbHP5Yn8MrsOJMGa8RkQ== @@ -7160,7 +7230,7 @@ eslint-plugin-react-hooks@^1.6.1: resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-1.7.0.tgz#6210b6d5a37205f0b92858f895a4e827020a7d04" integrity sha512-iXTCFcOmlWvw4+TOE8CLWj6yX1GwzT0Y6cUfHHZqWnSk144VmVIRcVGtUAzrLES7C798lmvnt02C7rxaOX1HNA== -eslint-plugin-react@7.19.0, eslint-plugin-react@^7.18.0: +eslint-plugin-react@7.19.0, eslint-plugin-react@^7.19.0: version "7.19.0" resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.19.0.tgz#6d08f9673628aa69c5559d33489e855d83551666" integrity sha512-SPT8j72CGuAP+JFbT0sJHOB80TX/pu44gQ4vXH/cq+hQTiY2PuZ6IHkqXJV6x1b28GDdo1lbInjKUrrdUf0LOQ== @@ -7563,7 +7633,7 @@ fast-glob@^2.0.2: merge2 "^1.2.3" micromatch "^3.1.10" -fast-glob@^3.1.1: +fast-glob@^3.2.2: version "3.2.2" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.2.tgz#ade1a9d91148965d4bf7c51f72e1ca662d32e63d" integrity sha512-UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A== @@ -8838,14 +8908,14 @@ https-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= -husky@^4.2.1: - version "4.2.3" - resolved "https://registry.yarnpkg.com/husky/-/husky-4.2.3.tgz#3b18d2ee5febe99e27f2983500202daffbc3151e" - integrity sha512-VxTsSTRwYveKXN4SaH1/FefRJYCtx+wx04sSVcOpD7N2zjoHxa+cEJ07Qg5NmV3HAK+IRKOyNVpi2YBIVccIfQ== +husky@^4.2.3: + version "4.2.5" + resolved "https://registry.yarnpkg.com/husky/-/husky-4.2.5.tgz#2b4f7622673a71579f901d9885ed448394b5fa36" + integrity sha512-SYZ95AjKcX7goYVZtVZF2i6XiZcHknw50iXvY7b0MiGoj5RwdgRQNEHdb+gPDPCXKlzwrybjFjkL6FOj8uRhZQ== dependencies: - chalk "^3.0.0" + chalk "^4.0.0" ci-info "^2.0.0" - compare-versions "^3.5.1" + compare-versions "^3.6.0" cosmiconfig "^6.0.0" find-versions "^3.2.0" opencollective-postinstall "^2.0.2" @@ -11742,7 +11812,21 @@ node-notifier@^5.4.2: shellwords "^0.1.1" which "^1.3.0" -node-releases@^1.1.29, node-releases@^1.1.52, node-releases@^1.1.53: +node-releases@^1.1.29: + version "1.1.34" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.34.tgz#ced4655ee1ba9c3a2c5dcbac385e19434155fd40" + integrity sha512-fNn12JTEfniTuCqo0r9jXgl44+KxRH/huV7zM/KAGOKxDKrHr6EbT7SSs4B+DNxyBE2mks28AD+Jw6PkfY5uwA== + dependencies: + semver "^6.3.0" + +node-releases@^1.1.52: + version "1.1.52" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.52.tgz#bcffee3e0a758e92e44ecfaecd0a47554b0bcba9" + integrity sha512-snSiT1UypkgGt2wxPqS6ImEUICbNCMb31yaxWrOLXjhlt2z2/IBpaOxzONExqSm4y5oLnAqjjRWu+wsDzK5yNQ== + dependencies: + semver "^6.3.0" + +node-releases@^1.1.53: version "1.1.53" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.53.tgz#2d821bfa499ed7c5dffc5e2f28c88e78a08ee3f4" integrity sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ== @@ -12593,7 +12677,7 @@ pnp-webpack-plugin@1.5.0: dependencies: ts-pnp "^1.1.2" -pnp-webpack-plugin@1.6.4: +pnp-webpack-plugin@1.6.4, pnp-webpack-plugin@^1.6.4: version "1.6.4" resolved "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz#c9711ac4dc48a685dabafc86f8b6dd9f8df84149" integrity sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg== @@ -13766,7 +13850,7 @@ react-clientside-effect@^1.2.2: dependencies: "@babel/runtime" "^7.0.0" -react-dev-utils@^10.2.0, react-dev-utils@^10.2.1: +react-dev-utils@^10.2.1: version "10.2.1" resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-10.2.1.tgz#f6de325ae25fa4d546d09df4bb1befdc6dd19c19" integrity sha512-XxTbgJnYZmxuPtY3y/UV0D8/65NKkmaia4rXzViknVnZeVlklSh8u6TnaEYPfAi/Gh1TP4mEOXHI6jQOPbeakQ== @@ -15004,6 +15088,11 @@ semver@^7.1.1: resolved "https://registry.yarnpkg.com/semver/-/semver-7.2.1.tgz#d997aa36bdbb00b501ae4ac4c7d17e9f7a587ae5" integrity sha512-aHhm1pD02jXXkyIpq25qBZjr3CQgg8KST8uX0OWXch3xE6jw+1bfbWnCjzMwojsTquroUmKFHNzU6x26mEiRxw== +semver@^7.1.3: + version "7.3.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" + integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== + send@0.17.1, send@latest: version "0.17.1" resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" @@ -16477,21 +16566,26 @@ ts-essentials@^6.0.3: resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-6.0.4.tgz#d36055bf0a7620b1338da6aafd2268787e208aab" integrity sha512-ZtU9zgSnn8DcAxDZY1DJF8rnxsen8M0IVkO7dVB5fTEOVs7o/0RA4V6i99PIg99bpX81Sgb0FCLjQqD5Ufz3rQ== -ts-pnp@1.1.6: +ts-pnp@1.1.6, ts-pnp@^1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.6.tgz#389a24396d425a0d3162e96d2b4638900fdc289a" integrity sha512-CrG5GqAAzMT7144Cl+UIFP7mz/iIhiy+xQ6GGcnjTezhALT02uPMRw7tgDSESgB5MsfKt55+GPWw4ir1kVtMIQ== -ts-pnp@^1.1.2, ts-pnp@^1.1.6: +ts-pnp@^1.1.2: version "1.2.0" resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92" integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw== -tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: +tslib@^1.10.0: version "1.11.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35" integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA== +tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: + version "1.10.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" + integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== + tsutils@^3.17.1: version "3.17.1" resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759" @@ -17709,7 +17803,7 @@ yargs@^13.1.0, yargs@^13.3.0: y18n "^4.0.0" yargs-parser "^13.1.2" -yargs@^15.0.0, yargs@^15.1.0, yargs@^15.3.1: +yargs@^15.0.0, yargs@^15.3.1: version "15.3.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b" integrity sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==