volto/master: Merge branch 'spanish-translation' of github.com:plone/volto

"Leonardo J. Caballero G" <jenkins-z4DKO/[email protected]> Fri, 13 Dec 2019 15:04:58 -0800 (PST)
Newsgroups gmane.comp.web.zope.plone.cvs
Message-ID <[email protected]>
Repository: volto
Branch: refs/heads/master
Date: 2019-12-12T05:43:04-04:00
Author: Leonardo J. Caballero G (macagua) <[email protected]>
Commit: https://github.com/plone/volto/commit/472c373d9d7851564272efb14c2414d9362da6e3

Merge branch 'spanish-translation' of github.com:plone/volto into spanish-translation

Files changed:
M .travis.yml
M CHANGELOG.md
M api/base.cfg
M docs/source/upgrade-guide/index.md
M package.json
M src/components/manage/Blocks/Table/View.jsx
M src/components/manage/Blocks/Table/__snapshots__/View.test.jsx.snap
M src/components/manage/Blocks/Text/Edit.jsx
M src/config/RichTextEditor/ToHTML.jsx
M src/helpers/Helmet/Helmet.js
M yarn.lock

b'diff --git a/.travis.yml b/.travis.yml\nindex d98c02d6a..6519cc19e 100644\n--- a/.travis.yml\n+++ b/.travis.yml\n@@ -45,9 +45,9 @@ install:\n   - yarn cy:install\n script:\n   - if [ "$TEST_SUITE" == "unit" ]; then\n-    yarn run prettier;\n-    yarn run lint;\n-    yarn run code-analysis:i18n;\n+    yarn run prettier &&\n+    yarn run lint &&\n+    yarn run code-analysis:i18n &&\n     yarn test:ci;\n     fi\n   - if [ "$TEST_SUITE" == "guillotina" ]; then\ndiff --git a/CHANGELOG.md b/CHANGELOG.md\nindex 4f20907be..7dc71e7a4 100644\n--- a/CHANGELOG.md\n+++ b/CHANGELOG.md\n@@ -6,8 +6,19 @@\n \n - Added translations to spanish @macagua\n \n+- Added CTRL+ENTER feature in text blocks by default. It creates a newline inside the same text chunk (`<p>`) @sneridagh\n+\n+\n ### Changes\n \n+- Rem
 ove "documentDescription" class in table block @sverbois\n+\n+## 4.0.0-alpha.17 (2019-12-03)\n+\n+### Internal\n+\n+- Revert eslint upgrade, because of problems with the react-app preset typescript settings @sneridagh\n+\n ## 4.0.0-alpha.16 (2019-12-02)\n \n ### Changes\ndiff --git a/api/base.cfg b/api/base.cfg\nindex c101fd603..a1f83d012 100644\n--- a/api/base.cfg\n+++ b/api/base.cfg\n@@ -8,6 +8,8 @@ extensions =\n \n [sources]\n kitconcept.voltodemo = git git-9UaJU3cA/F/[email protected]:kitconcept/kitconcept.voltodemo.git branch=master\n+plone.rest = git git-9UaJU3cA/F/[email protected]:plone/plone.rest.git branch=master\n+plone.restapi = git git-9UaJU3cA/F/[email protected]:plone/plone.restapi.git branch=master\n \n [instance]\n recipe = plone.recipe.zope2instance\ndiff --git a/docs/source/upgrade-guide/index.md b/docs/source/upgrade-gu
 ide/index.md\nindex adfa0fe7b..6c8516f06 100644\n--- a/docs/source/upgrade-guide/index.md\n+++ b/docs/source/upgrade-guide/index.md\n@@ -21,6 +21,31 @@ First, update your `package.json` to Volto 4.x.x.\n   }\n ```\n \n+### Rebuild `yarn.lock` in Alpha 17\n+\n+Due to changes in the dependency tree, it\'s required to reset `yarn.lock` file by deleting it before upgrading to Volto alpha 17.\n+\n+### Forked Helmet into Volto core\n+\n+Due to the inactivity of the Helmet project, we decided to fork it to the core. It\'s part of the Volto helpers now. You have to update your imports accordingly. Please notice that now it\'s a named import:\n+\n+```diff\n+--- a/src/components/Views/ReportView.jsx\n++++ b/src/components/Views/ReportView.jsx\n+@@ -1,6 +1,6 @@\n+ import React from \'react\';\n+ im
 port PropTypes from \'prop-types\';\n+-import Helmet from \'react-helmet\';\n++import { Helmet } from \'@plone/volto/helpers\';\n+ import { defineMessages, injectIntl, FormattedMessage } from \'react-intl\';\n+ import { format, parse } from \'date-fns\';\n+ import { filter, map } from \'lodash\';\n+```\n+\n+### Alpha 16 is a brownbag release\n+\n+There was a problem with the projects using Volto eslint config when upgrading to latest versions related to typescript, we will take of that in the near future. So skip this version.\n+\n ### Stylelint and prettier config in Alpha 14\n \n In your project\'s boilerplate, you need to update the stylelint and prettier configuration accordingly to the changes made in Alpha 14 in `package.json` like this:\ndiff --git a/package.json b/package.json\ni
 ndex 67aaed462..9306d1d6b 100644\n--- a/package.json\n+++ b/package.json\n@@ -9,7 +9,7 @@\n     }\n   ],\n   "license": "MIT",\n-  "version": "4.0.0-alpha.16",\n+  "version": "4.0.0-alpha.17",\n   "repository": {\n     "type": "git",\n     "url": "git-9UaJU3cA/F/[email protected]:plone/volto.git"\n@@ -240,18 +240,19 @@\n     "draft-js-inline-toolbar-plugin": "2.0.1",\n     "draft-js-plugins-editor": "2.0.4",\n     "draft-js-plugins-utils": "2.0.3",\n-    "eslint": "6.7.2",\n-    "eslint-config-prettier": "6.7.0",\n-    "eslint-config-react-app": "5.0.2",\n+    "eslint": "5.16.0",\n+    "eslint-config-airbnb": "17.1.0",\n+    "eslint-config-prettier": "4.1.0",\n+    "eslint-config-react-app": "4.0.1",\n     "eslint-import-resolver-alias": "1.1.2",\n     "eslint-import-resolver-babel-plugin-root-import": "1
 .1.1",\n-    "eslint-plugin-flowtype": "4.5.2",\n-    "eslint-plugin-import": "2.18.2",\n-    "eslint-plugin-jsx-a11y": "6.2.3",\n-    "eslint-plugin-prettier": "3.1.1",\n-    "eslint-plugin-react": "7.17.0",\n-    "eslint-plugin-react-hooks": "2.3.0",\n     "express": "4.17.1",\n+    "eslint-plugin-flowtype": "2.50.1",\n+    "eslint-plugin-import": "2.17.2",\n+    "eslint-plugin-jsx-a11y": "6.2.1",\n+    "eslint-plugin-prettier": "3.0.1",\n+    "eslint-plugin-react": "7.13.0",\n+    "eslint-plugin-react-hooks": "1.6.0",\n     "glob": "7.1.3",\n     "hamburgers": "1.1.3",\n     "handlebars": "4.1.2",\ndiff --git a/src/components/manage/Blocks/Table/View.jsx b/src/components/manage/Blocks/Table/View.jsx\nindex 9e9b5762e..97b6bcf1c 100644\n--- a/src/components/manage/Blocks/Table/View.jsx\
 n+++ b/src/components/manage/Blocks/Table/View.jsx\n@@ -17,7 +17,7 @@ import { settings } from \'~/config\';\n  * @extends Component\n  */\n const View = ({ data }) => (\n-  <p className="documentDescription">\n+  <p>\n     {data && data.table && (\n       <Table\n         fixed={data.table.fixed}\ndiff --git a/src/components/manage/Blocks/Table/__snapshots__/View.test.jsx.snap b/src/components/manage/Blocks/Table/__snapshots__/View.test.jsx.snap\nindex a6643f023..3220513e9 100644\n--- a/src/components/manage/Blocks/Table/__snapshots__/View.test.jsx.snap\n+++ b/src/components/manage/Blocks/Table/__snapshots__/View.test.jsx.snap\n@@ -1,9 +1,7 @@\n // Jest Snapshot v1, https://goo.gl/fbAQLP\n \n exports[`renders a view table component 1`] = `\n-<p\n-  className="documentDescription"\n->\n+
 <p>\n   <table\n     className="ui table"\n   >\ndiff --git a/src/components/manage/Blocks/Text/Edit.jsx b/src/components/manage/Blocks/Text/Edit.jsx\nindex 620f9d812..146879b65 100644\n--- a/src/components/manage/Blocks/Text/Edit.jsx\n+++ b/src/components/manage/Blocks/Text/Edit.jsx\n@@ -8,8 +8,9 @@ import PropTypes from \'prop-types\';\n import { Button } from \'semantic-ui-react\';\n import { doesNodeContainClick } from \'semantic-ui-react/dist/commonjs/lib\';\n import Editor from \'draft-js-plugins-editor\';\n-import { convertFromRaw, convertToRaw, EditorState } from \'draft-js\';\n+import { convertFromRaw, convertToRaw, EditorState, RichUtils } from \'draft-js\';\n import createInlineToolbarPlugin from \'draft-js-inline-toolbar-plugin\';\n+import isSoftNewlineEvent from \'draft-js/l
 ib/isSoftNewlineEvent\';\n import { defineMessages, injectIntl } from \'react-intl\';\n import { includes, isEqual } from \'lodash\';\n \n@@ -191,7 +192,13 @@ class Edit extends Component {\n           blockRenderMap={settings.extendedBlockRenderMap}\n           blockStyleFn={settings.blockStyleFn}\n           placeholder={this.props.intl.formatMessage(messages.text)}\n-          handleReturn={() => {\n+          handleReturn={e => {\n+            if (isSoftNewlineEvent(e)) {\n+              this.onChange(\n+                RichUtils.insertSoftNewline(this.state.editorState),\n+              );\n+              return \'handled\';\n+            }\n             if (!this.props.detached) {\n               const selectionState = this.state.editorState.getSelection();\n               const an
 chorKey = selectionState.getAnchorKey();\ndiff --git a/src/config/RichTextEditor/ToHTML.jsx b/src/config/RichTextEditor/ToHTML.jsx\nindex b353ac317..7f77443e9 100644\n--- a/src/config/RichTextEditor/ToHTML.jsx\n+++ b/src/config/RichTextEditor/ToHTML.jsx\n@@ -64,13 +64,32 @@ const getAtomic = (children, { data, keys }) =>\n  * Note that children can be maped to render a list or do other cool stuff\n  */\n const blocks = {\n-  // Rendering blocks like this along with cleanup results in a single p tag for each paragraph\n-  // adding an empty block closes current paragraph and starts a new one\n-  // unstyled: (children, { keys }) => (\n-  //   <p key={keys[0]}>{addBreaklines(children)}</p>\n-  // ),\n-  unstyled: (children, { keys }) =>\n-    children.map(child => <p key={keys[0]}>{child}<
 /p>),\n+  unstyled: (children, { keys }) => {\n+    const processedChildren = children.map(chunks =>\n+      chunks.map(child => {\n+        if (Array.isArray(child)) {\n+          return child.map((subchild, index) => {\n+            if (typeof subchild === \'string\') {\n+              const last = subchild.split(\'\\n\').length - 1;\n+              return subchild.split(\'\\n\').map((item, index) => (\n+                <React.Fragment key={index}>\n+                  {item}\n+                  {index !== last && <br />}\n+                </React.Fragment>\n+              ));\n+            } else {\n+              return subchild;\n+            }\n+          });\n+        } else {\n+          return child;\n+        }\n+      }),\n+    );\n+    return processedChildren.map(\n+      chu
 nk => chunk && <p key={keys[0]}>{chunk}</p>,\n+    );\n+  },\n   atomic: getAtomic,\n   blockquote: (children, { keys }) => (\n     <blockquote key={keys[0]}>{addBreaklines(children)}</blockquote>\ndiff --git a/src/helpers/Helmet/Helmet.js b/src/helpers/Helmet/Helmet.js\nindex 009c904c8..ff06c2f3e 100644\n--- a/src/helpers/Helmet/Helmet.js\n+++ b/src/helpers/Helmet/Helmet.js\n@@ -98,6 +98,7 @@ const Helmet = Component =>\n         return null;\n       }\n \n+      // eslint-disable-next-line default-case\n       switch (child.type) {\n         case TAG_NAMES.SCRIPT:\n         case TAG_NAMES.NOSCRIPT:\n@@ -135,6 +136,7 @@ const Helmet = Component =>\n     }\n \n     mapObjectTypeChildren({ child, newProps, newChildProps, nestedChildren }) {\n+      // eslint-disable-next-line default-case
 \n       switch (child.type) {\n         case TAG_NAMES.TITLE:\n           return {\ndiff --git a/yarn.lock b/yarn.lock\nindex 71cfe4155..a016c8a3b 100644\n--- a/yarn.lock\n+++ b/yarn.lock\n@@ -1036,13 +1036,6 @@\n   dependencies:\n     regenerator-runtime "^0.13.2"\n \n-"@babel/runtime@^7.4.5", "@babel/runtime@^7.6.3":\n-  version "7.7.4"\n-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.4.tgz#b23a856751e4bf099262f867767889c0e3fe175b"\n-  integrity sha512-r24eVUUr0QqNZa+qrImUk8fn5SPhHq+IfYvIoIMg0do3GdK9sMdiLKP3GYVVaxpPKORgm8KRKaNTEhAjgIpLMw==\n-  dependencies:\n-    regenerator-runtime "^0.13.2"\n-\n "@babel/runtime@^7.5.1", "@babel/runtime@^7.6.0", "@babel/runtime@^7.6.2":\n   version "7.6.3"\n   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.
 3.tgz#935122c74c73d2240cafd32ddb5fc2a6cd35cf1f"\n@@ -1050,6 +1043,13 @@\n   dependencies:\n     regenerator-runtime "^0.13.2"\n \n+"@babel/runtime@^7.6.3":\n+  version "7.7.4"\n+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.4.tgz#b23a856751e4bf099262f867767889c0e3fe175b"\n+  integrity sha512-r24eVUUr0QqNZa+qrImUk8fn5SPhHq+IfYvIoIMg0do3GdK9sMdiLKP3GYVVaxpPKORgm8KRKaNTEhAjgIpLMw==\n+  dependencies:\n+    regenerator-runtime "^0.13.2"\n+\n "@babel/template@^7.1.0", "@babel/template@^7.4.4":\n   version "7.4.4"\n   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz#f4b88d1225689a08f5bc3a17483545be9e4ed237"\n@@ -1773,10 +1773,10 @@ acorn-globals@^4.1.0:\n     acorn "^6.0.1"\n     acorn-walk "^6.0.1"\n \n-acorn-jsx@^5.1.0:\n-  version "5.1.0"\n-
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz#294adb71b57398b0680015f0a38c563ee1db5384"\n-  integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==\n+acorn-jsx@^5.0.0:\n+  version "5.0.1"\n+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.1.tgz#32a064fd925429216a09b141102bfdd185fae40e"\n+  integrity sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==\n \n acorn-walk@^6.0.1, acorn-walk@^6.1.1:\n   version "6.2.0"\n@@ -1793,11 +1793,6 @@ acorn@^6.0.1, acorn@^6.0.7, acorn@^6.2.1:\n   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.2.1.tgz#3ed8422d6dec09e6121cc7a843ca86a330a86b51"\n   integrity sha512-JD0xT5FCRDNyjDda3Lrg/IxFscp9q4tiYtxE1/nOzlKCk7h
 IRuYjhq1kCNkbPjMRMZuFq20HNQn1I9k8Oj0E+Q==\n \n-acorn@^7.1.0:\n-  version "7.1.0"\n-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz#949d36f2c292535da602283586c2477c57eb2d6c"\n-  integrity sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==\n-\n [email protected]:\n   version "1.0.3"\n   resolved "https://registry.yarnpkg.com/address/-/address-1.0.3.tgz#b5f50631f8d6cec8bd20c963963afb55e06cbce9"\n@@ -1826,7 +1821,7 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:\n   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"\n   integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==\n \n-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@
 ^6.5.5:\n+ajv@^6.1.0, ajv@^6.10.2, ajv@^6.5.5, ajv@^6.9.1:\n   version "6.10.2"\n   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"\n   integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==\n@@ -1858,7 +1853,7 @@ ansi-escapes@^1.0.0:\n   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"\n   integrity sha1-06ioOzGapneTZisT52HHkRQiMG4=\n \n-ansi-escapes@^3.0.0:\n+ansi-escapes@^3.0.0, ansi-escapes@^3.2.0:\n   version "3.2.0"\n   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"\n   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL
 4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==\n@@ -3605,10 +3600,10 @@ configstore@^4.0.0:\n     write-file-atomic "^2.0.0"\n     xdg-basedir "^3.0.0"\n \n-confusing-browser-globals@^1.0.9:\n-  version "1.0.9"\n-  resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz#72bc13b483c0276801681871d4898516f8f54fdd"\n-  integrity sha512-KbS1Y0jMtyPgIxjO7ZzMAuUpAKMt1SzCL9fsrKsX6b0zJPTaT0SiSPmewwVZg9UAO83HVIlEhZF84LIjZ0lmAw==\n+confusing-browser-globals@^1.0.5, confusing-browser-globals@^1.0.7:\n+  version "1.0.8"\n+  resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.8.tgz#93ffec1f82a6e2bf2bc36769cc3a92fa20e502f3"\n+  integrity sha512-lI7asCibVJ6Qd3FGU7mu4sfG4try4LX3+GVS+Gv8UlrEf2AeW57piecapnog2UHZSbcX/P/1UDWVaTs
 blowlZg==\n \n connect-history-api-fallback@^1.6.0:\n   version "1.6.0"\n@@ -4875,7 +4870,7 @@ error-ex@^1.2.0, error-ex@^1.3.1:\n   dependencies:\n     is-arrayish "^0.2.1"\n \n-es-abstract@^1.12.0, es-abstract@^1.5.1, es-abstract@^1.7.0:\n+es-abstract@^1.11.0, es-abstract@^1.12.0, es-abstract@^1.5.1, es-abstract@^1.7.0:\n   version "1.13.0"\n   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"\n   integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==\n@@ -4887,22 +4882,6 @@ es-abstract@^1.12.0, es-abstract@^1.5.1, es-abstract@^1.7.0:\n     is-regex "^1.0.4"\n     object-keys "^1.0.12"\n \n-es-abstract@^1.15.0:\n-  version "1.16.2"\n-  resolved "https://registry.yarnpk
 g.com/es-abstract/-/es-abstract-1.16.2.tgz#4e874331645e9925edef141e74fc4bd144669d34"\n-  integrity sha512-jYo/J8XU2emLXl3OLwfwtuFfuF2w6DYPs+xy9ZfVyPkDcrauu6LYrw/q2TyCtrbc/KUdCiC5e9UajRhgNkVopA==\n-  dependencies:\n-    es-to-primitive "^1.2.1"\n-    function-bind "^1.1.1"\n-    has "^1.0.3"\n-    has-symbols "^1.0.1"\n-    is-callable "^1.1.4"\n-    is-regex "^1.0.4"\n-    object-inspect "^1.7.0"\n-    object-keys "^1.1.1"\n-    string.prototype.trimleft "^2.1.0"\n-    string.prototype.trimright "^2.1.0"\n-\n es-to-primitive@^1.2.0:\n   version "1.2.0"\n   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"\n@@ -4912,15 +4891,6 @@ es-to-primitive@^1.2.0:\n     is-date-object "^1.0.1"\n     is-symbol "^1.0.2"\n \n-es
 -to-primitive@^1.2.1:\n-  version "1.2.1"\n-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"\n-  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==\n-  dependencies:\n-    is-callable "^1.1.4"\n-    is-date-object "^1.0.1"\n-    is-symbol "^1.0.2"\n-\n escape-html@~1.0.3:\n   version "1.0.3"\n   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"\n@@ -4943,19 +4913,37 @@ escodegen@^1.9.1:\n   optionalDependencies:\n     source-map "~0.6.1"\n \[email protected]:\n-  version "6.7.0"\n-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.7.0.tgz#
 9a876952e12df2b284adbd3440994bf1f39dfbb9"\n-  integrity sha512-FamQVKM3jjUVwhG4hEMnbtsq7xOIDm+SY5iBPfR8gKsJoAB2IQnNF+bk1+8Fy44Nq7PPJaLvkRxILYdJWoguKQ==\n+eslint-config-airbnb-base@^13.1.0:\n+  version "13.2.0"\n+  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-13.2.0.tgz#f6ea81459ff4dec2dda200c35f1d8f7419d57943"\n+  integrity sha512-1mg/7eoB4AUeB0X1c/ho4vb2gYkNH8Trr/EgCT/aGmKhhG+F6vF5s8+iRBlWAzFIAphxIdp3YfEKgEl0f9Xg+w==\n+  dependencies:\n+    confusing-browser-globals "^1.0.5"\n+    object.assign "^4.1.0"\n+    object.entries "^1.1.0"\n+\[email protected]:\n+  version "17.1.0"\n+  resolved "https://registry.yarnpkg.com/eslint-config-airbnb/-/eslint-config-airbnb-17.1.0.tgz#3964ed4bc198240315ff52030bf8636f42bc4732"\n+  integrity s
 ha512-R9jw28hFfEQnpPau01NO5K/JWMGLi6aymiF6RsnMURjTk+MqZKllCqGK/0tOvHkPi/NWSSOU2Ced/GX++YxLnw==\n+  dependencies:\n+    eslint-config-airbnb-base "^13.1.0"\n+    object.assign "^4.1.0"\n+    object.entries "^1.0.4"\n+\[email protected]:\n+  version "4.1.0"\n+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-4.1.0.tgz#181364895899fff9fd3605fecb5c4f20e7d5f395"\n+  integrity sha512-zILwX9/Ocz4SV2vX7ox85AsrAgXV3f2o2gpIicdMIOra48WYqgUnWNH/cR/iHtmD2Vb3dLSC3LiEJnS05Gkw7w==\n   dependencies:\n     get-stdin "^6.0.0"\n \[email protected]:\n-  version "5.0.2"\n-  resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-5.0.2.tgz#df40d73a1402986030680c040bbee520db5a32a4"\n-  integrity sha512-VhlESAQM83u
 ULJ9jsvcKxx2Ab0yrmjUt8kDz5DyhTQufqWE0ssAnejlWri5LXv25xoXfdqOyeDPdfJS9dXKagQ==\[email protected]:\n+  version "4.0.1"\n+  resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-4.0.1.tgz#23fd0fd7ea89442ef1e733f66a7207674b23c8db"\n+  integrity sha512-ZsaoXUIGsK8FCi/x4lT2bZR5mMkL/Kgj+Lnw690rbvvUr/uiwgFiD8FcfAhkCycm7Xte6O5lYz4EqMx2vX7jgw==\n   dependencies:\n-    confusing-browser-globals "^1.0.9"\n+    confusing-browser-globals "^1.0.7"\n \n [email protected]:\n   version "1.1.2"\n@@ -4995,22 +4983,17 @@ eslint-module-utils@^2.4.0:\n     debug "^2.6.8"\n     pkg-dir "^2.0.0"\n \n-eslint-plugin-eslint-plugin@^2.1.0:\n-  version "2.1.0"\n-  resolved "https://registry.yarnpkg.com/eslint-plugin-eslint-plugin/-/eslint-plugin-eslint
 -plugin-2.1.0.tgz#a7a00f15a886957d855feacaafee264f039e62d5"\n-  integrity sha512-kT3A/ZJftt28gbl/Cv04qezb/NQ1dwYIbi8lyf806XMxkus7DvOVCLIfTXMrorp322Pnoez7+zabXH29tADIDg==\n-\[email protected]:\n-  version "4.5.2"\n-  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-4.5.2.tgz#5353449692663ef70e8fc8c2386cebdecac7e86b"\n-  integrity sha512-ByV0EtEQOqiCl6bsrtXtTGnXlIXoyvDrvUq3Nz28huODAhnRDuMotyTrwP+TjAKZMPWbtaNGFHMoUxW3DktGOw==\[email protected]:\n+  version "2.50.1"\n+  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.50.1.tgz#36d4c961ac8b9e9e1dc091d3fba0537dad34ae8a"\n+  integrity sha512-9kRxF9hfM/O6WGZcZPszOVPd2W0TLHBtceulLTsGfwMPtiCCLnCW0ssRiOOiXyqrCA20pm1iXdXm7gQeN306zQ==\n   dependen
 cies:\n-    lodash "^4.17.15"\n+    lodash "^4.17.10"\n \[email protected]:\n-  version "2.18.2"\n-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz#02f1180b90b077b33d447a17a2326ceb400aceb6"\n-  integrity sha512-5ohpsHAiUBRNaBWAF08izwUGlbrJoJJ+W9/TBwsGoR1MnlgfwMIKrFeSjWbt6moabiXW9xNvtFz+97KHRfI4HQ==\[email protected]:\n+  version "2.17.2"\n+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.17.2.tgz#d227d5c6dc67eca71eb590d2bb62fb38d86e9fcb"\n+  integrity sha512-m+cSVxM7oLsIpmwNn2WXTJoReOF9f/CtLMo7qOVmKd1KntBy0hEcuNZ3erTmWjx+DxRO0Zcrm5KwAvI9wHcV5g==\n   dependencies:\n     array-includes "^3.0.3"\n     contains-path "^0.1.0"\n@@ -5019,17 +5002,16 @@ [email protected]:\n     
 eslint-import-resolver-node "^0.3.2"\n     eslint-module-utils "^2.4.0"\n     has "^1.0.3"\n+    lodash "^4.17.11"\n     minimatch "^3.0.4"\n-    object.values "^1.1.0"\n     read-pkg-up "^2.0.0"\n-    resolve "^1.11.0"\n+    resolve "^1.10.0"\n \[email protected]:\n-  version "6.2.3"\n-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.2.3.tgz#b872a09d5de51af70a97db1eea7dc933043708aa"\n-  integrity sha512-CawzfGt9w83tyuVekn0GDPU9ytYtxyxyFZ3aSWROmnRRFQFT2BiPJd7jvRdzNDi6oLWaS2asMeYSNMjWTV4eNg==\[email protected]:\n+  version "6.2.1"\n+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.2.1.tgz#4ebba9f339b600ff415ae4166e3e2e008831cf0c"\n+  integrity sha512-cjN2ObWrRz0TTw7vEcGQrx+YltMvZo
 OEx4hWU8eEERDnBIU00OTq7Vr+jA7DFKxiwLNv4tTh5Pq2GUNEa8b6+w==\n   dependencies:\n-    "@babel/runtime" "^7.4.5"\n     aria-query "^3.0.0"\n     array-includes "^3.0.3"\n     ast-types-flow "^0.0.7"\n@@ -5037,35 +5019,32 @@ [email protected]:\n     damerau-levenshtein "^1.0.4"\n     emoji-regex "^7.0.2"\n     has "^1.0.3"\n-    jsx-ast-utils "^2.2.1"\n+    jsx-ast-utils "^2.0.1"\n \[email protected]:\n-  version "3.1.1"\n-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.1.tgz#507b8562410d02a03f0ddc949c616f877852f2ba"\n-  integrity sha512-A+TZuHZ0KU0cnn56/9mfR7/KjUJ9QNVXUhwvRFSR7PGPe0zQR6PTkmyqg1AtUUEOzTqeRsUwyKFh0oVZKVCrtA==\[email protected]:\n+  version "3.0.1"\n+  resolved "https://registry.yarnpkg.com/eslint
 -plugin-prettier/-/eslint-plugin-prettier-3.0.1.tgz#19d521e3981f69dd6d14f64aec8c6a6ac6eb0b0d"\n+  integrity sha512-/PMttrarPAY78PLvV3xfWibMOdMDl57hmlQ2XqFeA37wd+CJ7WSxV7txqjVPHi/AAFKd2lX0ZqfsOc/i5yFCSQ==\n   dependencies:\n     prettier-linter-helpers "^1.0.0"\n \[email protected]:\n-  version "2.3.0"\n-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.3.0.tgz#53e073961f1f5ccf8dd19558036c1fac8c29d99a"\n-  integrity sha512-gLKCa52G4ee7uXzdLiorca7JIQZPPXRAQDXV83J4bUEeUuc5pIEyZYAZ45Xnxe5IuupxEqHS+hUhSLIimK1EMw==\[email protected]:\n+  version "1.6.0"\n+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-1.6.0.tgz#348efcda8fb426399ac7b8609607c7b4025a6f5f"\n+  integrity sh
 a512-lHBVRIaz5ibnIgNG07JNiAuBUeKhEf8l4etNx5vfAEwqQ5tcuK3jV9yjmopPgQDagQb7HwIuQVsE3IVcGrRnag==\n \[email protected]:\n-  version "7.17.0"\n-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.17.0.tgz#a31b3e134b76046abe3cd278e7482bd35a1d12d7"\n-  integrity sha512-ODB7yg6lxhBVMeiH1c7E95FLD4E/TwmFjltiU+ethv7KPdCwgiFuOZg9zNRHyufStTDLl/dEFqI2Q1VPmCd78A==\[email protected]:\n+  version "7.13.0"\n+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.13.0.tgz#bc13fd7101de67996ea51b33873cd9dc2b7e5758"\n+  integrity sha512-uA5LrHylu8lW/eAH3bEQe9YdzpPaFd9yAJTwTi/i/BKTD7j6aQMKVAdGM/ML72zD6womuSK7EiGtMKuK06lWjQ==\n   dependencies:\n     array-includes "^3.0.3"\n     doctrine "^2.1.0"\n-    eslint-plugin-eslint-plug
 in "^2.1.0"\n     has "^1.0.3"\n-    jsx-ast-utils "^2.2.3"\n-    object.entries "^1.1.0"\n-    object.fromentries "^2.0.1"\n-    object.values "^1.1.0"\n+    jsx-ast-utils "^2.1.0"\n+    object.fromentries "^2.0.0"\n     prop-types "^15.7.2"\n-    resolve "^1.13.1"\n+    resolve "^1.10.1"\n \n eslint-scope@^3.7.1:\n   version "3.7.3"\n@@ -5083,77 +5062,68 @@ eslint-scope@^4.0.3:\n     esrecurse "^4.1.0"\n     estraverse "^4.1.1"\n \n-eslint-scope@^5.0.0:\n-  version "5.0.0"\n-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz#e87c8887c73e8d1ec84f1ca591645c358bfc8fb9"\n-  integrity sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==\n-  dependencies:\n-    esrecurse "^4.1.0"\n-    estraverse "^4.1.1"\n-\n-eslint-util
 s@^1.4.3:\n-  version "1.4.3"\n-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"\n-  integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==\n+eslint-utils@^1.3.1:\n+  version "1.4.2"\n+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.2.tgz#166a5180ef6ab7eb462f162fd0e6f2463d7309ab"\n+  integrity sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==\n   dependencies:\n-    eslint-visitor-keys "^1.1.0"\n+    eslint-visitor-keys "^1.0.0"\n \n-eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:\n+eslint-visitor-keys@^1.0.0:\n   version "1.1.0"\n   resolved "https://registry.yarnpkg.com/eslint-visitor-ke
 ys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"\n   integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==\n \[email protected]:\n-  version "6.7.2"\n-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.7.2.tgz#c17707ca4ad7b2d8af986a33feba71e18a9fecd1"\n-  integrity sha512-qMlSWJaCSxDFr8fBPvJM9kJwbazrhNcBU3+DszDW1OlEwKBBRWsJc7NJFelvwQpanHCR14cOLD41x8Eqvo3Nng==\[email protected]:\n+  version "5.16.0"\n+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea"\n+  integrity sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==\n   dependencies:\n     "@babel/code-frame" "^7.0.0"\n-    ajv "^6.10.0"\n+    ajv "^6.9.1"
 \n     chalk "^2.1.0"\n     cross-spawn "^6.0.5"\n     debug "^4.0.1"\n     doctrine "^3.0.0"\n-    eslint-scope "^5.0.0"\n-    eslint-utils "^1.4.3"\n-    eslint-visitor-keys "^1.1.0"\n-    espree "^6.1.2"\n+    eslint-scope "^4.0.3"\n+    eslint-utils "^1.3.1"\n+    eslint-visitor-keys "^1.0.0"\n+    espree "^5.0.1"\n     esquery "^1.0.1"\n     esutils "^2.0.2"\n     file-entry-cache "^5.0.1"\n     functional-red-black-tree "^1.0.1"\n-    glob-parent "^5.0.0"\n-    globals "^12.1.0"\n+    glob "^7.1.2"\n+    globals "^11.7.0"\n     ignore "^4.0.6"\n     import-fresh "^3.0.0"\n     imurmurhash "^0.1.4"\n-    inquirer "^7.0.0"\n-    is-glob "^4.0.0"\n-    js-yaml "^3.13.1"\n+    inquirer "^6.2.2"\n+    js-yaml "^3.13.0"\n     json-stable-stringify-without-jsonify "^1.0.1"\n     levn "^0.
 3.0"\n-    lodash "^4.17.14"\n+    lodash "^4.17.11"\n     minimatch "^3.0.4"\n     mkdirp "^0.5.1"\n     natural-compare "^1.4.0"\n-    optionator "^0.8.3"\n+    optionator "^0.8.2"\n+    path-is-inside "^1.0.2"\n     progress "^2.0.0"\n     regexpp "^2.0.1"\n-    semver "^6.1.2"\n-    strip-ansi "^5.2.0"\n-    strip-json-comments "^3.0.1"\n+    semver "^5.5.1"\n+    strip-ansi "^4.0.0"\n+    strip-json-comments "^2.0.1"\n     table "^5.2.3"\n     text-table "^0.2.0"\n-    v8-compile-cache "^2.0.3"\n \n-espree@^6.1.2:\n-  version "6.1.2"\n-  resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz#6c272650932b4f91c3714e5e7b5f5e2ecf47262d"\n-  integrity sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA==\n+espree@^5.0.1:\n+  version "5.
 0.1"\n+  resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz#5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a"\n+  integrity sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==\n   dependencies:\n-    acorn "^7.1.0"\n-    acorn-jsx "^5.1.0"\n-    eslint-visitor-keys "^1.1.0"\n+    acorn "^6.0.7"\n+    acorn-jsx "^5.0.0"\n+    eslint-visitor-keys "^1.0.0"\n \n esprima@^3.1.3:\n   version "3.1.3"\n@@ -5532,7 +5502,7 @@ fast-json-stable-stringify@^2.0.0:\n   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"\n   integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=\n \n-fast-levenshtein@~2.0.4, fast-levenshtein@~2.0.6:\n+fast-levenshtein@~2.0.4:\n   version 
 "2.0.6"\n   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"\n   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=\n@@ -6154,18 +6124,11 @@ global-prefix@^3.0.0:\n     kind-of "^6.0.2"\n     which "^1.3.1"\n \n-globals@^11.1.0:\n+globals@^11.1.0, globals@^11.7.0:\n   version "11.12.0"\n   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"\n   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==\n \n-globals@^12.1.0:\n-  version "12.3.0"\n-  resolved "https://registry.yarnpkg.com/globals/-/globals-12.3.0.tgz#1e564ee5c4dded2ab098b0f88f24702a3c56be13"\n-  integrity sha512-wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMR
 XA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw==\n-  dependencies:\n-    type-fest "^0.8.1"\n-\n globals@^9.18.0:\n   version "9.18.0"\n   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"\n@@ -6374,11 +6337,6 @@ has-symbols@^1.0.0:\n   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"\n   integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=\n \n-has-symbols@^1.0.1:\n-  version "1.0.1"\n-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"\n-  integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==\n-\n has-unicode@^2.0.0:\n   version "2.0.1"\n   resolved
  "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"\n@@ -6931,7 +6889,7 @@ [email protected]:\n     strip-ansi "^4.0.0"\n     through "^2.3.6"\n \[email protected], inquirer@^7.0.0:\[email protected]:\n   version "7.0.0"\n   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.0.tgz#9e2b032dde77da1db5db804758b8fea3a970519a"\n   integrity sha512-rSdC7zelHdRQFkWnhsMu2+2SO41mpv2oF2zy4tMhmiLWkcKbOAs87fWAJhVXttKVwhdZvymvnuM95EyEXg2/tQ==\n@@ -6950,6 +6908,25 @@ [email protected], inquirer@^7.0.0:\n     strip-ansi "^5.1.0"\n     through "^2.3.6"\n \n+inquirer@^6.2.2:\n+  version "6.5.0"\n+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.0.tgz#2303317efc9a4ea7ec2e2df6f86569b734accf42"\n+  integrity sha512-scfHejeG/lVZSpvC
 XpsB4j/wQNPM5JC8kiElOI0OUTwmc1RTpXr4H32/HOlQHcZiYl2z2VElwuCVDRG8vFmbnA==\n+  dependencies:\n+    ansi-escapes "^3.2.0"\n+    chalk "^2.4.2"\n+    cli-cursor "^2.1.0"\n+    cli-width "^2.0.0"\n+    external-editor "^3.0.3"\n+    figures "^2.0.0"\n+    lodash "^4.17.12"\n+    mute-stream "0.0.7"\n+    run-async "^2.2.0"\n+    rxjs "^6.4.0"\n+    string-width "^2.1.0"\n+    strip-ansi "^5.1.0"\n+    through "^2.3.6"\n+\n internal-ip@^4.3.0:\n   version "4.3.0"\n   resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"\n@@ -7996,7 +7973,7 @@ js-tokens@^3.0.2:\n   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"\n   integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=\n \n-js-y
 [email protected], js-yaml@^3.11.0, js-yaml@^3.13.1, js-yaml@^3.7.0:\[email protected], js-yaml@^3.11.0, js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.7.0:\n   version "3.13.1"\n   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"\n   integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==\n@@ -8159,10 +8136,10 @@ jsprim@^1.2.2:\n     json-schema "0.2.3"\n     verror "1.10.0"\n \n-jsx-ast-utils@^2.2.1, jsx-ast-utils@^2.2.3:\n-  version "2.2.3"\n-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz#8a9364e402448a3ce7f14d357738310d9248054f"\n-  integrity sha512-EdIHFMm+1BPynpKOpdPqiOsvnIrInRGJD7bzPZdPkjitQEqpdpUuFpq4T0npZFKTiB3RhWFdGN+oqOJIdhDhQA==\n+jsx-ast-util
 s@^2.0.1, jsx-ast-utils@^2.1.0:\n+  version "2.2.1"\n+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.1.tgz#4d4973ebf8b9d2837ee91a8208cc66f3a2776cfb"\n+  integrity sha512-v3FxCcAf20DayI+uxnCuw795+oOIkVu6EnJ1+kSzhqqTZHNkTZ7B66ZgLp4oLJ/gbA64cI0B7WRoHZMSRdyVRQ==\n   dependencies:\n     array-includes "^3.0.3"\n     object.assign "^4.1.0"\n@@ -8638,7 +8615,7 @@ lodash.uniq@^4.5.0:\n   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"\n   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=\n \[email protected], lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.6.1:\[email protected], lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, 
 lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.6.1:\n   version "4.17.15"\n   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"\n   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==\n@@ -9551,12 +9528,7 @@ object-copy@^0.1.0:\n     define-property "^0.2.5"\n     kind-of "^3.0.3"\n \n-object-inspect@^1.7.0:\n-  version "1.7.0"\n-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"\n-  integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==\n-\n-object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:\n+obj
 ect-keys@^1.0.11, object-keys@^1.0.12:\n   version "1.1.1"\n   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"\n   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==\n@@ -9578,7 +9550,7 @@ object.assign@^4.1.0:\n     has-symbols "^1.0.0"\n     object-keys "^1.0.11"\n \n-object.entries@^1.1.0:\n+object.entries@^1.0.4, object.entries@^1.1.0:\n   version "1.1.0"\n   resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.0.tgz#2024fc6d6ba246aee38bdb0ffd5cfbcf371b7519"\n   integrity sha512-l+H6EQ8qzGRxbkHOd5I/aHRhHDKoQXQ8g0BYt4uSweQU1/J6dZUOyWh9a2Vky35YCKjzmgxOzta2hH6kf9HuXA==\n@@ -9588,15 +9560,15 @@ object.entries@^1.1.0:\n     function-bind "^1.1.1
 "\n     has "^1.0.3"\n \n-object.fromentries@^2.0.1:\n-  version "2.0.1"\n-  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.1.tgz#050f077855c7af8ae6649f45c80b16ee2d31e704"\n-  integrity sha512-PUQv8Hbg3j2QX0IQYv3iAGCbGcu4yY4KQ92/dhA4sFSixBmSmp13UpDLs6jGK8rBtbmhNNIK99LD2k293jpiGA==\n+object.fromentries@^2.0.0:\n+  version "2.0.0"\n+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.0.tgz#49a543d92151f8277b3ac9600f1e930b189d30ab"\n+  integrity sha512-9iLiI6H083uiqUuvzyY6qrlmc/Gz8hLQFOcb/Ri/0xXFkSNS3ctV+CbE6yM2+AnkYfOB3dGjdzC0wrMLIhQICA==\n   dependencies:\n-    define-properties "^1.1.3"\n-    es-abstract "^1.15.0"\n+    define-properties "^1.1.2"\n+    es-abstract "^1.11.0"\n     function-bind "^1.1.1"\n-    has "^1.0.3
 "\n+    has "^1.0.1"\n \n object.getownpropertydescriptors@^2.0.3:\n   version "2.0.3"\n@@ -9719,7 +9691,7 @@ optimize-css-assets-webpack-plugin@^5.0.1:\n     cssnano "^4.1.10"\n     last-call-webpack-plugin "^3.0.0"\n \n-optionator@^0.8.1:\n+optionator@^0.8.1, optionator@^0.8.2:\n   version "0.8.2"\n   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"\n   integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=\n@@ -9731,18 +9703,6 @@ optionator@^0.8.1:\n     type-check "~0.3.2"\n     wordwrap "~1.0.0"\n \n-optionator@^0.8.3:\n-  version "0.8.3"\n-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"\n-  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjI
 uYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==\n-  dependencies:\n-    deep-is "~0.1.3"\n-    fast-levenshtein "~2.0.6"\n-    levn "~0.3.0"\n-    prelude-ls "~1.1.2"\n-    type-check "~0.3.2"\n-    word-wrap "~1.2.3"\n-\n [email protected]:\n   version "4.0.2"\n   resolved "https://registry.yarnpkg.com/ora/-/ora-4.0.2.tgz#0e1e68fd45b135d28648b27cf08081fa6e8a297d"\n@@ -12336,14 +12296,14 @@ [email protected]:\n   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"\n   integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=\n \n-resolve@^1.1.6, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.8.1:\n+resolve@^1.1.6, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.8.1:\n   version "1.12.0"\n   resolved "https://registry.yarnpkg.co
 m/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6"\n   integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==\n   dependencies:\n     path-parse "^1.0.6"\n \n-resolve@^1.11.0, resolve@^1.12.0, resolve@^1.13.1:\n+resolve@^1.12.0:\n   version "1.13.1"\n   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.13.1.tgz#be0aa4c06acd53083505abb35f4d66932ab35d16"\n   integrity sha512-CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w==\n@@ -12612,7 +12572,7 @@ [email protected]:\n   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"\n   integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJ
 T25gMg==\n \[email protected], semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:\[email protected], semver@^6.2.0, semver@^6.3.0:\n   version "6.3.0"\n   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"\n   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==\n@@ -13212,22 +13172,6 @@ string-width@^4.1.0:\n     is-fullwidth-code-point "^3.0.0"\n     strip-ansi "^5.2.0"\n \n-string.prototype.trimleft@^2.1.0:\n-  version "2.1.0"\n-  resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz#6cc47f0d7eb8d62b0f3701611715a3954591d634"\n-  integrity sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==\n-  depe
 ndencies:\n-    define-properties "^1.1.3"\n-    function-bind "^1.1.1"\n-\n-string.prototype.trimright@^2.1.0:\n-  version "2.1.0"\n-  resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz#669d164be9df9b6f7559fa8e89945b168a5a6c58"\n-  integrity sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==\n-  dependencies:\n-    define-properties "^1.1.3"\n-    function-bind "^1.1.1"\n-\n string_decoder@^1.0.0, string_decoder@^1.1.1:\n   version "1.3.0"\n   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"\n@@ -13323,12 +13267,7 @@ strip-indent@^3.0.0:\n   dependencies:\n     min-indent "^1.0.0"\n \n-strip-json-comments@^3.0.1:\n- 
  version "3.0.1"\n-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7"\n-  integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==\n-\n-strip-json-comments@~2.0.1:\n+strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:\n   version "2.0.1"\n   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"\n   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=\n@@ -14026,11 +13965,6 @@ type-fest@^0.6.0:\n   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"\n   integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8ql
 wZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==\n \n-type-fest@^0.8.1:\n-  version "0.8.1"\n-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"\n-  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==\n-\n type-is@~1.6.17, type-is@~1.6.18:\n   version "1.6.18"\n   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"\n@@ -14367,7 +14301,7 @@ [email protected]:\n   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866"\n   integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==\n \n-v8-compile-cache@^2.0.3, v8-compile-cache@^2.1.0:\n+v8-compile
 -cache@^2.1.0:\n   version "2.1.0"\n   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e"\n   integrity sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==\n@@ -14797,11 +14731,6 @@ windows-release@^3.1.0:\n   dependencies:\n     execa "^1.0.0"\n \n-word-wrap@~1.2.3:\n-  version "1.2.3"\n-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"\n-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==\n-\n wordwrap@~0.0.2:\n   version "0.0.3"\n   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"\n'