From 177e0747779a550dd317333e83982ac78a83ecc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Sat, 16 Jul 2022 13:11:33 -0500 Subject: [PATCH 01/77] add html structure for home page --- docs/main.html | 64 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-) diff --git a/docs/main.html b/docs/main.html index 92f93b1613a0..db4b4d0fef53 100644 --- a/docs/main.html +++ b/docs/main.html @@ -2,4 +2,66 @@ lhn_content: 'homepage' --- - +

+ Welcome to Expensify Community! +

+ +

+ Find all the answers to all your Expensify questions, as well as support for user and admin questions from the Expensify Community. +

+ +

+ Which best describes how you use Expensify? +

+ +
+ +
+
+ +
+
+
Send money
+
Brief description of who would fall under this category.
+
+
+ +
+
+ +
+
+
Request money
+
Brief description of who would fall under this category.
+
+
+ +
+ +

+ Our most popular guides and tutorials +

+ +
+ +
+
+ +
+
+
Send money
+
Brief description of who would fall under this category.
+
+
+ +
+
+ +
+
+
Request money
+
Brief description of who would fall under this category.
+
+
+ +
From a7c26ca94a10f984dc3730820dd2fe3ddbccb30a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Sat, 16 Jul 2022 13:13:36 -0500 Subject: [PATCH 02/77] add icons --- docs/assets/images/concierge-avatar.svg | 5 +++++ docs/assets/images/shield.svg | 4 ++++ docs/assets/images/users.svg | 14 ++++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 docs/assets/images/concierge-avatar.svg create mode 100644 docs/assets/images/shield.svg create mode 100644 docs/assets/images/users.svg diff --git a/docs/assets/images/concierge-avatar.svg b/docs/assets/images/concierge-avatar.svg new file mode 100644 index 000000000000..2372f3ea9183 --- /dev/null +++ b/docs/assets/images/concierge-avatar.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/docs/assets/images/shield.svg b/docs/assets/images/shield.svg new file mode 100644 index 000000000000..cf0c301345b0 --- /dev/null +++ b/docs/assets/images/shield.svg @@ -0,0 +1,4 @@ + + + + diff --git a/docs/assets/images/users.svg b/docs/assets/images/users.svg new file mode 100644 index 000000000000..4263fec3cca6 --- /dev/null +++ b/docs/assets/images/users.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + From 3a966d2d9552daa01e2232fd4be7f50bae60b51e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Sat, 16 Jul 2022 13:18:38 -0500 Subject: [PATCH 03/77] add icons to home page and change color --- docs/assets/images/shield.svg | 6 +++--- docs/assets/images/users.svg | 12 ++++++------ docs/main.html | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/assets/images/shield.svg b/docs/assets/images/shield.svg index cf0c301345b0..9066e116c94c 100644 --- a/docs/assets/images/shield.svg +++ b/docs/assets/images/shield.svg @@ -1,4 +1,4 @@ - - - + + + diff --git a/docs/assets/images/users.svg b/docs/assets/images/users.svg index 4263fec3cca6..c7f34b284438 100644 --- a/docs/assets/images/users.svg +++ b/docs/assets/images/users.svg @@ -1,10 +1,10 @@ - + - - - - - + + + + + diff --git a/docs/main.html b/docs/main.html index db4b4d0fef53..48ae3b1032d7 100644 --- a/docs/main.html +++ b/docs/main.html @@ -18,7 +18,7 @@

- +
Send money
@@ -28,7 +28,7 @@

- +
Request money
From eea4fbf3324dd39d8875e6a196a8830491a8e98a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Sat, 16 Jul 2022 13:31:18 -0500 Subject: [PATCH 04/77] add styles to homepage --- docs/_sass/_main.scss | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index 6b3e7d8ae696..aeaa15766c77 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -371,6 +371,22 @@ textarea { } } +.homepage { + h1 { + text-align: center; + padding-bottom: 20px; + } + h2 { + padding-bottom: 24px; + } + p { + margin-bottom: 40px; + } + .cards-group { + padding-bottom: 32px; + } +} + .coming-soon { overflow: hidden; From fa4f9e6876b4e9ec4fb6502f018c56bb68f8e51b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Sat, 16 Jul 2022 13:34:12 -0500 Subject: [PATCH 05/77] restructure html in homepage --- docs/main.html | 104 +++++++++++++++++++++++++++---------------------- 1 file changed, 58 insertions(+), 46 deletions(-) diff --git a/docs/main.html b/docs/main.html index 48ae3b1032d7..8147308e592a 100644 --- a/docs/main.html +++ b/docs/main.html @@ -2,66 +2,78 @@ lhn_content: 'homepage' --- -

- Welcome to Expensify Community! -

+
-

- Find all the answers to all your Expensify questions, as well as support for user and admin questions from the Expensify Community. -

+

+ Welcome to Expensify Community! +

-

- Which best describes how you use Expensify? -

+

+ Find all the answers to all your Expensify questions, as well as support for user and admin questions from the + Expensify Community. +

-
+

+ Which best describes how you use Expensify? +

-
-
- -
-
-
Send money
-
Brief description of who would fall under this category.
-
-
+
-
-
- +
+
+ +
+
+
Send money
+
Brief description of who would fall under this category.
+
-
-
Request money
-
Brief description of who would fall under this category.
+ +
+
+ +
+
+
Request money
+
Brief description of who would fall under this category.
+
-
-
+
-

- Our most popular guides and tutorials -

+

+ Our most popular guides and tutorials +

-
+
-
-
- +
+
+
Getting started
+
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui.
+
-
-
Send money
-
Brief description of who would fall under this category.
+ +
+
+
Getting started
+
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui.
+
-
-
-
- +
+
+
Getting started
+
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui.
+
-
-
Request money
-
Brief description of who would fall under this category.
+ +
+
+
Getting started
+
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui.
+
-
-
+
+
\ No newline at end of file From 9ec59c133c85024a171a8c70ce337b55c271c6d6 Mon Sep 17 00:00:00 2001 From: Harshdeep Joshi <88710727+Harshdeepjoshi@users.noreply.github.com> Date: Mon, 18 Jul 2022 19:46:23 +0530 Subject: [PATCH 06/77] Update ContextMenuActions.js --- src/pages/home/report/ContextMenu/ContextMenuActions.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.js b/src/pages/home/report/ContextMenu/ContextMenuActions.js index 575e2ff1686d..3dc6d72cb6ee 100644 --- a/src/pages/home/report/ContextMenu/ContextMenuActions.js +++ b/src/pages/home/report/ContextMenu/ContextMenuActions.js @@ -89,7 +89,7 @@ export default [ successIcon: Expensicons.Checkmark, shouldShow: (type, reportAction) => (type === CONTEXT_MENU_TYPES.REPORT_ACTION && reportAction.actionName !== CONST.REPORT.ACTIONS.TYPE.IOU - && !ReportUtils.isReportMessageAttachment(lodashGet(reportAction, ['message', 0, 'text'], ''))), + && !ReportUtils.isReportMessageAttachment(lodashGet(reportAction, ['message', 0], {}))), // If return value is true, we switch the `text` and `icon` on // `ContextMenuItem` with `successText` and `successIcon` which will fallback to @@ -121,7 +121,7 @@ export default [ { textTranslateKey: 'reportActionContextMenu.copyLink', icon: Expensicons.LinkCopy, - shouldShow: () => true, + shouldShow: (type, reportAction) => type === CONTEXT_MENU_TYPES.REPORT_ACTION && !ReportUtils.isReportMessageAttachment(lodashGet(reportAction, ['message', 0], {})), onPress: (closePopover, {reportAction, reportID}) => { Environment.getEnvironmentURL() .then((environmentURL) => { From f935943b0f0bdb8e46b7de430ea7f7bd7a466060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Tue, 19 Jul 2022 14:58:22 -0500 Subject: [PATCH 07/77] set color and border styles to cards in main page --- docs/_sass/_colors.scss | 1 + docs/_sass/_main.scss | 25 ++++++++++++++++++++----- docs/main.html | 4 ++-- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/docs/_sass/_colors.scss b/docs/_sass/_colors.scss index d21afc515591..bf4e46b61e7b 100644 --- a/docs/_sass/_colors.scss +++ b/docs/_sass/_colors.scss @@ -5,3 +5,4 @@ $color-gray1: #FAFAFA; $color-gray2: #ECECEC; $color-gray3: #C6C9CA; $color-white: #FFFFFF; +$color-green: #07d973; diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index aeaa15766c77..7e366cf2189a 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -67,7 +67,7 @@ hr { display: inline-block; width: 24px; height: 2px; - margin: 0 0 15px; + margin: 0 0 16px; } strong { @@ -331,22 +331,36 @@ textarea { .card { display: flex; flex-wrap: nowrap; - border-radius: 15px; + border-radius: 16px; border: 1px solid $color-gray2; padding: 28px; font-weight: bold; cursor: pointer; + &.send-money { + border-color: $color-blue; + border-width: 1.5px; + } + + &.request-money { + border-color: $color-green; + border-width: 1.5px; + } + .left-icon { display: flex; align-items: center; - padding-right: 15px; + padding-right: 28px; + + img { + width: 32px; + } } .right-icon { display: flex; align-items: center; - padding-left: 15px; + padding-left: 16px; } .body { @@ -357,7 +371,8 @@ textarea { } .description { - margin-top: 15px; + margin-top: 16px; + font-weight: normal; } } diff --git a/docs/main.html b/docs/main.html index 8147308e592a..f05ca6238c4e 100644 --- a/docs/main.html +++ b/docs/main.html @@ -19,7 +19,7 @@

-
+
@@ -29,7 +29,7 @@

-
+
From 00e585551bd4f007dff84a19ca10c50fdbe2872e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Tue, 19 Jul 2022 16:22:37 -0500 Subject: [PATCH 08/77] center the content area for bigger screens --- docs/_sass/_main.scss | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index 7e366cf2189a..ef27432ed9c6 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -247,6 +247,13 @@ textarea { padding: 52px 68px; box-sizing: border-box; + @media screen and (min-width: 1600px) { + /* Center content area for bigger screens */ + margin-left: calc(420px + (100vw - 1000px - 420px)/2); + padding: 52px 0; + max-width: 1000px; + } + @media screen and (max-width: 1024px) { margin-left: 320px; } From 8a9d1d7098fde2afeb40152f0f3bf66260520ba2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Wed, 20 Jul 2022 15:17:25 -0500 Subject: [PATCH 09/77] fix title for main page --- docs/_sass/_main.scss | 8 ++++++-- docs/main.html | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index ef27432ed9c6..2d62fa522635 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -395,14 +395,18 @@ textarea { .homepage { h1 { - text-align: center; padding-bottom: 20px; + + @media screen and (max-width: 800px) { + margin-top: 0; + padding-top: 8px; + } } h2 { padding-bottom: 24px; } p { - margin-bottom: 40px; + margin-bottom: 20px; } .cards-group { padding-bottom: 32px; diff --git a/docs/main.html b/docs/main.html index f05ca6238c4e..91a1593e8d80 100644 --- a/docs/main.html +++ b/docs/main.html @@ -5,7 +5,7 @@

- Welcome to Expensify Community! + Welcome to Expensify Help!

From f4ddf53b120ff96cc9946ed1ba3c7af87b7223cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Wed, 20 Jul 2022 15:20:54 -0500 Subject: [PATCH 10/77] fix margin for title h1 --- docs/_sass/_main.scss | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index 2d62fa522635..6f3f2805f0af 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -98,6 +98,13 @@ h6 { font-family: "GTAmericaExp-Regular"; font-weight: bold; padding-bottom: 12px; +} + +h2, +h3, +h4, +h5, +h6 { margin-top: 20px; } From c6184985cff6702cd67567664291be4122407dd8 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Thu, 21 Jul 2022 15:25:40 -0700 Subject: [PATCH 11/77] remove fetchAllReports from app init --- src/libs/actions/App.js | 43 ++++++++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 7 deletions(-) diff --git a/src/libs/actions/App.js b/src/libs/actions/App.js index 46b003d5418b..81d73cae6509 100644 --- a/src/libs/actions/App.js +++ b/src/libs/actions/App.js @@ -10,7 +10,6 @@ import CONST from '../../CONST'; import Log from '../Log'; import Performance from '../Performance'; import Timing from './Timing'; -import * as Report from './Report'; import * as BankAccounts from './BankAccounts'; import * as Policy from './Policy'; import NetworkConnection from '../NetworkConnection'; @@ -97,15 +96,9 @@ AppState.addEventListener('change', (nextAppState) => { /** * Fetches data needed for app initialization - * @returns {Promise} */ function getAppData() { BankAccounts.fetchUserWallet(); - - // We should update the syncing indicator when personal details and reports are both done fetching. - return Promise.all([ - Report.fetchAllReports(true), - ]); } /** @@ -128,6 +121,26 @@ function getPolicyIDList(policies) { function openApp(policies) { API.read('OpenApp', { policyIDList: getPolicyIDList(policies), + }, { + optimisticData: [{ + onyxMethod: CONST.ONYX.METHOD.MERGE, + key: ONYXKEYS.IS_LOADING_REPORT_DATA, + value: true, + }], + successData: [{ + onyxMethod: CONST.ONYX.METHOD.MERGE, + key: ONYXKEYS.INITIAL_REPORT_DATA_LOADED, + value: true, + }, { + onyxMethod: CONST.ONYX.METHOD.MERGE, + key: ONYXKEYS.IS_LOADING_REPORT_DATA, + value: false, + }], + failureData: [{ + onyxMethod: CONST.ONYX.METHOD.MERGE, + key: ONYXKEYS.IS_LOADING_REPORT_DATA, + value: false, + }], }); } @@ -137,6 +150,22 @@ function openApp(policies) { function reconnectApp() { API.read('ReconnectApp', { policyIDList: getPolicyIDList(allPolicies), + }, { + optimisticData: [{ + onyxMethod: CONST.ONYX.METHOD.MERGE, + key: ONYXKEYS.IS_LOADING_REPORT_DATA, + value: true, + }], + successData: [{ + onyxMethod: CONST.ONYX.METHOD.MERGE, + key: ONYXKEYS.IS_LOADING_REPORT_DATA, + value: false, + }], + failureData: [{ + onyxMethod: CONST.ONYX.METHOD.MERGE, + key: ONYXKEYS.IS_LOADING_REPORT_DATA, + value: false, + }], }); } From 9d678de4b892543fc2f97547e239003a2dcc6c53 Mon Sep 17 00:00:00 2001 From: ntdiary <2471314@gmail.com> Date: Sun, 24 Jul 2022 15:24:59 +0800 Subject: [PATCH 12/77] fix issue 9253 --- src/pages/home/ReportScreen.js | 61 +++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 24 deletions(-) diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js index 4cc4589ec04d..7734fd16a826 100644 --- a/src/pages/home/ReportScreen.js +++ b/src/pages/home/ReportScreen.js @@ -5,6 +5,7 @@ import {Keyboard, View} from 'react-native'; import lodashGet from 'lodash/get'; import _ from 'underscore'; import lodashFindLast from 'lodash/findLast'; +import DrawerStatusContext from '@react-navigation/drawer/lib/module/utils/DrawerStatusContext'; import styles from '../../styles/styles'; import ScreenWrapper from '../../components/ScreenWrapper'; import HeaderView from './HeaderView'; @@ -22,6 +23,8 @@ import FullScreenLoadingIndicator from '../../components/FullscreenLoadingIndica import reportActionPropTypes from './report/reportActionPropTypes'; import ArchivedReportFooter from '../../components/ArchivedReportFooter'; import toggleReportActionComposeView from '../../libs/toggleReportActionComposeView'; +import compose from '../../libs/compose'; +import withWindowDimensions, {windowDimensionsPropTypes} from '../../components/withWindowDimensions'; const propTypes = { /** Navigation route context info provided by react navigation */ @@ -73,6 +76,8 @@ const propTypes = { /** The type of the policy */ type: PropTypes.string, })).isRequired, + + ...windowDimensionsPropTypes, }; const defaultProps = { @@ -193,6 +198,10 @@ class ReportScreen extends React.Component { return null; } + if (this.props.isSmallScreenWidth && this.context === 'open') { + return null; + } + // We let Free Plan default rooms to be shown in the App - it's the one exception to the beta, otherwise do not show policy rooms in product if (!Permissions.canUseDefaultRooms(this.props.betas) && ReportUtils.isDefaultRoom(this.props.report) @@ -262,30 +271,34 @@ class ReportScreen extends React.Component { } } +ReportScreen.contextType = DrawerStatusContext; ReportScreen.propTypes = propTypes; ReportScreen.defaultProps = defaultProps; -export default withOnyx({ - isSidebarLoaded: { - key: ONYXKEYS.IS_SIDEBAR_LOADED, - }, - session: { - key: ONYXKEYS.SESSION, - }, - reportActions: { - key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${getReportID(route)}`, - canEvict: false, - }, - report: { - key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${getReportID(route)}`, - }, - isComposerFullSize: { - key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT_IS_COMPOSER_FULL_SIZE}${getReportID(route)}`, - }, - betas: { - key: ONYXKEYS.BETAS, - }, - policies: { - key: ONYXKEYS.COLLECTION.POLICY, - }, -})(ReportScreen); +export default compose( + withWindowDimensions, + withOnyx({ + isSidebarLoaded: { + key: ONYXKEYS.IS_SIDEBAR_LOADED, + }, + session: { + key: ONYXKEYS.SESSION, + }, + reportActions: { + key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${getReportID(route)}`, + canEvict: false, + }, + report: { + key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${getReportID(route)}`, + }, + isComposerFullSize: { + key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT_IS_COMPOSER_FULL_SIZE}${getReportID(route)}`, + }, + betas: { + key: ONYXKEYS.BETAS, + }, + policies: { + key: ONYXKEYS.COLLECTION.POLICY, + }, + }), +)(ReportScreen); From dd516419c2733e910338c0e823bc581f5b7dc8bd Mon Sep 17 00:00:00 2001 From: Harshdeep Joshi <88710727+Harshdeepjoshi@users.noreply.github.com> Date: Tue, 26 Jul 2022 03:40:00 +0530 Subject: [PATCH 13/77] Disable Copy link context menu for attachment suggestion 1 Co-authored-by: Rajat Parashar --- src/pages/home/report/ContextMenu/ContextMenuActions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.js b/src/pages/home/report/ContextMenu/ContextMenuActions.js index 3dc6d72cb6ee..0110b4f8ebf6 100644 --- a/src/pages/home/report/ContextMenu/ContextMenuActions.js +++ b/src/pages/home/report/ContextMenu/ContextMenuActions.js @@ -89,7 +89,7 @@ export default [ successIcon: Expensicons.Checkmark, shouldShow: (type, reportAction) => (type === CONTEXT_MENU_TYPES.REPORT_ACTION && reportAction.actionName !== CONST.REPORT.ACTIONS.TYPE.IOU - && !ReportUtils.isReportMessageAttachment(lodashGet(reportAction, ['message', 0], {}))), + && !ReportUtils.isReportMessageAttachment(_.last(lodashGet(reportAction, ['message'], [{}])))), // If return value is true, we switch the `text` and `icon` on // `ContextMenuItem` with `successText` and `successIcon` which will fallback to From 93f10a2848dbe3289e023540e790cb17cbee952f Mon Sep 17 00:00:00 2001 From: Harshdeep Joshi <88710727+Harshdeepjoshi@users.noreply.github.com> Date: Tue, 26 Jul 2022 03:40:33 +0530 Subject: [PATCH 14/77] Disable Copy link context menu for attachments and url suggestion 2 Co-authored-by: Rajat Parashar --- src/pages/home/report/ContextMenu/ContextMenuActions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.js b/src/pages/home/report/ContextMenu/ContextMenuActions.js index 0110b4f8ebf6..875b0dc776d2 100644 --- a/src/pages/home/report/ContextMenu/ContextMenuActions.js +++ b/src/pages/home/report/ContextMenu/ContextMenuActions.js @@ -121,7 +121,7 @@ export default [ { textTranslateKey: 'reportActionContextMenu.copyLink', icon: Expensicons.LinkCopy, - shouldShow: (type, reportAction) => type === CONTEXT_MENU_TYPES.REPORT_ACTION && !ReportUtils.isReportMessageAttachment(lodashGet(reportAction, ['message', 0], {})), + shouldShow: (type, reportAction) => type === CONTEXT_MENU_TYPES.REPORT_ACTION && !ReportUtils.isReportMessageAttachment(_.last(lodashGet(reportAction, ['message'], [{}]))), onPress: (closePopover, {reportAction, reportID}) => { Environment.getEnvironmentURL() .then((environmentURL) => { From 3f20e81838ebbd118185c635120d0e5d6964150a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Tue, 26 Jul 2022 14:36:42 -0500 Subject: [PATCH 15/77] fix selected home link --- docs/_includes/home-lhn.html | 2 +- docs/_sass/_main.scss | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/docs/_includes/home-lhn.html b/docs/_includes/home-lhn.html index 4d165f97091e..7b131c1e5d9c 100644 --- a/docs/_includes/home-lhn.html +++ b/docs/_includes/home-lhn.html @@ -1,6 +1,6 @@

  • -
    Home
    +
    Home
  • diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index 6f3f2805f0af..c0a6ce15e24d 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -230,15 +230,12 @@ textarea { display: grid; grid-template-columns: 40px auto; cursor: pointer; + } - &.selected { - cursor: auto; - - span { - font-weight: bold; - color: $color-dark; - } - } + .selected { + cursor: auto; + font-weight: bold; + color: $color-dark; } .hide { From df397389b67c00760a7ce3f32f16015a7ee3c08c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Tue, 26 Jul 2022 15:09:36 -0500 Subject: [PATCH 16/77] remove underling for hover --- docs/_sass/_main.scss | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index c0a6ce15e24d..b766d4129ec1 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -84,7 +84,6 @@ a { &:hover { color: $color-blueHover; - text-decoration: underline; } } @@ -290,7 +289,6 @@ textarea { &:hover { color: $color-blueHover; - text-decoration: underline; } } From 99705d81b71f5da6f7d438d29bf3f42f20b4bd3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Tue, 26 Jul 2022 15:37:59 -0500 Subject: [PATCH 17/77] use default font for strong --- docs/_sass/_main.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index b766d4129ec1..67e5c2a8de5d 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -70,10 +70,6 @@ hr { margin: 0 0 16px; } -strong { - font-family: "GTAmericaExp-Bold", "Helvetica Neue", "Helvetica", Arial, sans-serif; -} - em { font-style: italic; } From b6a1d2b3619c5a17a2c571aed4f845d0063f125c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Tue, 26 Jul 2022 15:43:46 -0500 Subject: [PATCH 18/77] add onclick events to home page cards --- docs/main.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/main.html b/docs/main.html index 91a1593e8d80..1f6235e7dd7a 100644 --- a/docs/main.html +++ b/docs/main.html @@ -19,7 +19,7 @@

    -
    +
    @@ -29,7 +29,7 @@

    -
    +
    @@ -47,28 +47,28 @@

    -
    +
    Getting started
    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui.
    -
    +
    Getting started
    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui.
    -
    +
    Getting started
    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui.
    -
    +
    Getting started
    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui.
    From 2281ec1826243415adc8ad2a605afd3f32ebee7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Wed, 27 Jul 2022 12:38:18 -0500 Subject: [PATCH 19/77] change card border color for hover --- docs/_sass/_main.scss | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index 67e5c2a8de5d..80b2bd6b9aa4 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -341,15 +341,28 @@ textarea { padding: 28px; font-weight: bold; cursor: pointer; + $border-amount-darken: 15%; + + &:hover { + border-color: darken($color-gray2, $border-amount-darken); + } &.send-money { border-color: $color-blue; border-width: 1.5px; + + &:hover { + border-color: darken($color-blue, $border-amount-darken); + } } &.request-money { border-color: $color-green; border-width: 1.5px; + + &:hover { + border-color: darken($color-green, $border-amount-darken); + } } .left-icon { From c7c6328cb47961ba8403d8d5aefd195c8e68556c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Wed, 27 Jul 2022 12:50:51 -0500 Subject: [PATCH 20/77] use font-weight: bold for strong tag --- docs/_sass/_fonts.scss | 4 ---- docs/_sass/_main.scss | 5 ++++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/_sass/_fonts.scss b/docs/_sass/_fonts.scss index a43d35ed9d26..ad6eaf466609 100644 --- a/docs/_sass/_fonts.scss +++ b/docs/_sass/_fonts.scss @@ -93,7 +93,3 @@ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } - -strong { - font-weight: 600; -} diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index 80b2bd6b9aa4..02f66aacbb12 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -70,6 +70,10 @@ hr { margin: 0 0 16px; } +strong { + font-weight: bold; +} + em { font-style: italic; } @@ -90,7 +94,6 @@ h4, h5, h6 { color: $color-dark; - font-family: "GTAmericaExp-Regular"; font-weight: bold; padding-bottom: 12px; } From 91deb3561fcb629044f36b0ab47ee77c81c8381a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Metehan=20=C3=96zyurt?= Date: Sat, 30 Jul 2022 10:03:58 +0300 Subject: [PATCH 21/77] Login container center issue fixed --- src/pages/signin/SignInPageLayout/SignInPageContent.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/signin/SignInPageLayout/SignInPageContent.js b/src/pages/signin/SignInPageLayout/SignInPageContent.js index 4006d65a0093..b761ecd69ca2 100755 --- a/src/pages/signin/SignInPageLayout/SignInPageContent.js +++ b/src/pages/signin/SignInPageLayout/SignInPageContent.js @@ -56,7 +56,8 @@ const SignInPageContent = props => ( behavior="position" contentContainerStyle={[ props.isSmallScreenWidth ? styles.signInPageNarrowContentMargin : {}, - !props.isMediumScreenWidth ? styles.signInPageWideLeftContentMargin : {}, + !props.isMediumScreenWidth + || (props.isMediumScreenWidth && props.windowHeight < variables.minHeightToShowGraphics) ? styles.signInPageWideLeftContentMargin : {}, styles.mb3, StyleUtils.getModalPaddingStyles({ shouldAddBottomSafeAreaPadding: true, From d36f220df39896f8c3fe8908032f7cebda9a688b Mon Sep 17 00:00:00 2001 From: Kosuke Tseng Date: Mon, 1 Aug 2022 23:28:05 -0700 Subject: [PATCH 22/77] give buttonDropdown disable --- src/components/ButtonWithDropdown.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/components/ButtonWithDropdown.js b/src/components/ButtonWithDropdown.js index e4eb23502741..f68090b26096 100644 --- a/src/components/ButtonWithDropdown.js +++ b/src/components/ButtonWithDropdown.js @@ -19,6 +19,9 @@ const propTypes = { /** Whether we should show a loading state for the main button */ isLoading: PropTypes.bool, + + /** Should the button be disabled */ + isDisabled: PropTypes.bool, }; const defaultProps = { @@ -33,6 +36,7 @@ const ButtonWithDropdown = props => ( success onPress={props.onButtonPress} text={props.buttonText} + isDisabled={props.isDisabled} isLoading={props.isLoading} shouldRemoveRightBorderRadius style={[styles.flex1]} @@ -40,6 +44,7 @@ const ButtonWithDropdown = props => ( />
    +
    @@ -47,28 +47,28 @@

    -
    +
    Getting started
    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui.
    -
    + -
    +
    Getting started
    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui.
    -
    + -
    +
    Getting started
    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui.
    -
    +
    Getting started
    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui.
    From 72a71b4b1a224d0f0b9bbb30863cc0d84a7cbf5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Tue, 2 Aug 2022 17:35:22 -0500 Subject: [PATCH 28/77] set original color for a tags with card class --- docs/_sass/_main.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index 02f66aacbb12..950a07eee200 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -345,9 +345,11 @@ textarea { font-weight: bold; cursor: pointer; $border-amount-darken: 15%; + color: $color-dark; &:hover { border-color: darken($color-gray2, $border-amount-darken); + color: $color-dark; } &.send-money { From 8fa30a4d899c10e3bc94d6fefb993c34c35d840d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Tue, 2 Aug 2022 17:38:09 -0500 Subject: [PATCH 29/77] change remaining card divs to a tags --- docs/hubs/request-money.html | 4 ++-- docs/main.html | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/hubs/request-money.html b/docs/hubs/request-money.html index e08699537aaf..b242268e8d13 100644 --- a/docs/hubs/request-money.html +++ b/docs/hubs/request-money.html @@ -24,14 +24,14 @@

    -
    +
    SmartScan
    -
    + diff --git a/docs/main.html b/docs/main.html index 18fbf1eb0e54..cc552844bfa1 100644 --- a/docs/main.html +++ b/docs/main.html @@ -61,19 +61,19 @@

    -
    +
    Getting started
    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui.
    -
    + -
    +
    Getting started
    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui.
    -
    +
    \ No newline at end of file From 30de7bb660a16d93d352e5f0921cbb42621d3ea9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Tue, 2 Aug 2022 17:42:04 -0500 Subject: [PATCH 30/77] update instructions that use card div --- docs/README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/README.md b/docs/README.md index fee70463178b..30b83dc6e406 100644 --- a/docs/README.md +++ b/docs/README.md @@ -68,23 +68,23 @@ There are 3 main components in the hub page: 1. Stage title, 2. Row of Card butt -
    +
    SmartScan
    -
    + -
    +
    Another Article
    -
    + @@ -119,14 +119,14 @@ A card button is the box that contains the article title and the caret right ico In order to add a new Card button in the respective hub page ([send-money/index.html](https://github.com/Expensify/App/blob/main/docs/hubs/send-money.html) or [request-money/index.html](https://github.com/Expensify/App/blob/main/docs/hubs/request-money.html)) just copy and pase the following Card element: ```html -
    +
    SmartScan
    -
    + ``` Then replace the article title accordingly (in this case replace the value `SmartScan` with the new article title) and add a link to the relative path of the article (in this case replace `./request-money/SmartScan` accordingly to the path of the new article file without the file extension). From 0fb392f6ba8e4f1681618e03a5e1adaf3329d639 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Tue, 2 Aug 2022 16:42:24 -0600 Subject: [PATCH 31/77] add waitForCollectionCallback param and clean up policyIDList --- .../Navigation/AppNavigator/AuthScreens.js | 5 +-- src/libs/actions/App.js | 33 +++++-------------- 2 files changed, 9 insertions(+), 29 deletions(-) diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.js b/src/libs/Navigation/AppNavigator/AuthScreens.js index 4779e0ae1ca9..ef12e8b1758b 100644 --- a/src/libs/Navigation/AppNavigator/AuthScreens.js +++ b/src/libs/Navigation/AppNavigator/AuthScreens.js @@ -112,7 +112,7 @@ class AuthScreens extends React.Component { // Listen for report changes and fetch some data we need on initialization UnreadIndicatorUpdater.listenForReportChanges(); App.getAppData(); - App.openApp(this.props.allPolicies); + App.openApp(); App.fixAccountAndReloadData(); App.setUpPoliciesAndNavigate(this.props.session); @@ -319,8 +319,5 @@ export default compose( session: { key: ONYXKEYS.SESSION, }, - allPolicies: { - key: ONYXKEYS.COLLECTION.POLICY, - }, }), )(AuthScreens); diff --git a/src/libs/actions/App.js b/src/libs/actions/App.js index 81d73cae6509..0a4235061f7b 100644 --- a/src/libs/actions/App.js +++ b/src/libs/actions/App.js @@ -32,15 +32,16 @@ Onyx.connect({ initWithStoredValues: false, }); -const allPolicies = {}; +let policyIDList = []; Onyx.connect({ key: ONYXKEYS.COLLECTION.POLICY, - callback: (val, key) => { - if (!val || !key) { + waitForCollectionCallback: true, + callback: (val) => { + if (_.isEmpty(val)) { return; } - allPolicies[key] = {...allPolicies[key], ...val}; + policyIDList = _.map(_.values(val), policy => policy.id); }, }); @@ -101,27 +102,11 @@ function getAppData() { BankAccounts.fetchUserWallet(); } -/** - * Gets a comma separated list of locally stored policy ids - * - * @param {Array} policies - * @return {String} - */ -function getPolicyIDList(policies) { - return _.chain(policies) - .filter(Boolean) - .map(policy => policy.id) - .join(','); -} - /** * Fetches data needed for app initialization - * @param {Array} policies */ -function openApp(policies) { - API.read('OpenApp', { - policyIDList: getPolicyIDList(policies), - }, { +function openApp() { + API.read('OpenApp', {policyIDList}, { optimisticData: [{ onyxMethod: CONST.ONYX.METHOD.MERGE, key: ONYXKEYS.IS_LOADING_REPORT_DATA, @@ -148,9 +133,7 @@ function openApp(policies) { * Refreshes data when the app reconnects */ function reconnectApp() { - API.read('ReconnectApp', { - policyIDList: getPolicyIDList(allPolicies), - }, { + API.read('ReconnectApp', {policyIDList}, { optimisticData: [{ onyxMethod: CONST.ONYX.METHOD.MERGE, key: ONYXKEYS.IS_LOADING_REPORT_DATA, From c7eaae0cdf9c5f879dfe416e6d540b2fc2f649f9 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Tue, 2 Aug 2022 17:07:22 -0600 Subject: [PATCH 32/77] update onyx --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 391e624dad25..6165ce0c1791 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43901,9 +43901,9 @@ } }, "react-native-onyx": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.10.tgz", - "integrity": "sha512-cWKb/LEDtVCeVoYP8OIbb2Xz4aYjqtRaDxHrWmSB5TtSeEQa0JztJzJt9EnTQ0+Xbc2VE0eHBBvBbWUrPQVsVg==", + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.11.tgz", + "integrity": "sha512-vHKbkpABwwzJDzOy/D+/JUfxzyarzd2caiVjq49Aaop+8VPpo+QE9N6qBfFZd+eZiP+723IRTK1ev1gvYhq0cQ==", "requires": { "ascii-table": "0.0.9", "lodash": "^4.17.21", diff --git a/package.json b/package.json index f283e12576bb..13841eab7eef 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "react-native-image-size": "git+https://github.com/Expensify/react-native-image-size#6b5ab5110dc3ed554f8eafbc38d7d87c17147972", "react-native-keyboard-spacer": "^0.4.1", "react-native-modal": "^13.0.0", - "react-native-onyx": "1.0.10", + "react-native-onyx": "1.0.11", "react-native-pdf": "^6.2.2", "react-native-performance": "^2.0.0", "react-native-permissions": "^3.0.1", From b449e65469f6fbc1ba924aeb764cd6b3976c76f1 Mon Sep 17 00:00:00 2001 From: Kosuke Tseng Date: Tue, 2 Aug 2022 17:15:46 -0700 Subject: [PATCH 33/77] use constant --- src/libs/actions/PaymentMethods.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libs/actions/PaymentMethods.js b/src/libs/actions/PaymentMethods.js index ddfd69f26d06..66600abdd78b 100644 --- a/src/libs/actions/PaymentMethods.js +++ b/src/libs/actions/PaymentMethods.js @@ -107,21 +107,21 @@ function openPaymentsPage() { const onyxData = { optimisticData: [ { - onyxMethod: 'merge', + onyxMethod: CONST.ONYX.METHOD.MERGE, key: ONYXKEYS.IS_LOADING_PAYMENT_METHODS, value: true, }, ], successData: [ { - onyxMethod: 'merge', + onyxMethod: CONST.ONYX.METHOD.MERGE, key: ONYXKEYS.IS_LOADING_PAYMENT_METHODS, value: false, }, ], failureData: [ { - onyxMethod: 'merge', + onyxMethod: CONST.ONYX.METHOD.MERGE, key: ONYXKEYS.IS_LOADING_PAYMENT_METHODS, value: false, }, From 30d8dcbfb4b8cb9ac52565e4522e1c8f3844dd21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Metehan=20=C3=96zyurt?= Date: Wed, 3 Aug 2022 09:05:59 +0300 Subject: [PATCH 34/77] code has been simplified --- .../SignInPageLayout/SignInPageContent.js | 4 +--- src/styles/StyleUtils.js | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/pages/signin/SignInPageLayout/SignInPageContent.js b/src/pages/signin/SignInPageLayout/SignInPageContent.js index b761ecd69ca2..97e42ea4b7d2 100755 --- a/src/pages/signin/SignInPageLayout/SignInPageContent.js +++ b/src/pages/signin/SignInPageLayout/SignInPageContent.js @@ -55,9 +55,7 @@ const SignInPageContent = props => ( Date: Wed, 3 Aug 2022 01:25:26 -0700 Subject: [PATCH 35/77] revert use of hasPaymentMethod --- src/components/ButtonWithDropdown.js | 1 + src/components/KYCWall/BaseKYCWall.js | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/components/ButtonWithDropdown.js b/src/components/ButtonWithDropdown.js index f68090b26096..8955c3bc83b8 100644 --- a/src/components/ButtonWithDropdown.js +++ b/src/components/ButtonWithDropdown.js @@ -27,6 +27,7 @@ const propTypes = { const defaultProps = { onButtonPress: () => {}, onDropdownPress: () => {}, + isDisabled: false, isLoading: false, }; diff --git a/src/components/KYCWall/BaseKYCWall.js b/src/components/KYCWall/BaseKYCWall.js index 1ee0e6c8fea1..d1bb9309579d 100644 --- a/src/components/KYCWall/BaseKYCWall.js +++ b/src/components/KYCWall/BaseKYCWall.js @@ -1,12 +1,12 @@ import React from 'react'; import {withOnyx} from 'react-native-onyx'; import {ActivityIndicator, Dimensions} from 'react-native'; -import lodashGet from 'lodash/get'; import themeColors from '../../styles/themes/default'; import CONST from '../../CONST'; import Navigation from '../../libs/Navigation/Navigation'; import AddPaymentMethodMenu from '../AddPaymentMethodMenu'; import getClickedElementLocation from '../../libs/getClickedElementLocation'; +import * as PaymentUtils from '../../libs/PaymentUtils'; import * as PaymentMethods from '../../libs/actions/PaymentMethods'; import ONYXKEYS from '../../ONYXKEYS'; import Log from '../../libs/Log'; @@ -96,7 +96,7 @@ class KYCWall extends React.Component { }); // Check to see if user has a valid payment method on file and display the add payment popover if they don't - if (!lodashGet(this.props.userWallet, 'hasPaymentMethod', false)) { + if (!PaymentUtils.hasExpensifyPaymentMethod(this.props.cardList, this.props.bankAccountList)) { Log.info('[KYC Wallet] User does not have valid payment method'); const clickedElementLocation = getClickedElementLocation(event.nativeEvent); const position = this.getAnchorPosition(clickedElementLocation); @@ -154,6 +154,12 @@ export default withOnyx({ userWallet: { key: ONYXKEYS.USER_WALLET, }, + cardList: { + key: ONYXKEYS.CARD_LIST, + }, + bankAccountList: { + key: ONYXKEYS.BANK_ACCOUNT_LIST, + }, isLoadingPaymentMethods: { key: ONYXKEYS.IS_LOADING_PAYMENT_METHODS, initWithStoredValues: false, From 1c0ce5a757bb9a1082578091a2ee3a2bdd11eb47 Mon Sep 17 00:00:00 2001 From: Kosuke Tseng Date: Wed, 3 Aug 2022 01:26:10 -0700 Subject: [PATCH 36/77] only get p2p cards --- src/libs/PaymentUtils.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/libs/PaymentUtils.js b/src/libs/PaymentUtils.js index 3e48fd1bce67..1177c5b38e95 100644 --- a/src/libs/PaymentUtils.js +++ b/src/libs/PaymentUtils.js @@ -14,10 +14,15 @@ import * as Localize from './Localize'; * @returns {Boolean} */ function hasExpensifyPaymentMethod(cardList = [], bankAccountList = []) { - return _.some(cardList, card => card) || _.some(bankAccountList, (bankAccountJSON) => { + const validBankAccount = _.some(bankAccountList, (bankAccountJSON) => { const bankAccount = new BankAccount(bankAccountJSON); return bankAccount.isDefaultCredit(); }); + + // Hide any billing cards that are not P2P debit cards for now because you cannot make them your default method, or delete them + const validDebitCard = _.some(cardList, card => lodashGet(card, 'additionalData.isP2PDebitCard', false)); + + return validBankAccount || validDebitCard; } /** From ebb51ffdcad59822cbf2c875326e9e6e455249da Mon Sep 17 00:00:00 2001 From: Harshdeepjoshi Date: Wed, 3 Aug 2022 02:08:25 +0530 Subject: [PATCH 37/77] disable copy link only on image target. --- .../home/report/ContextMenu/BaseReportActionContextMenu.js | 6 +++++- src/pages/home/report/ContextMenu/ContextMenuActions.js | 7 ++++++- .../report/ContextMenu/PopoverReportActionContextMenu.js | 3 +++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js index ea0b478aaf63..fb3488c60964 100755 --- a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js +++ b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js @@ -16,6 +16,9 @@ import withWindowDimensions, {windowDimensionsPropTypes} from '../../../../compo const propTypes = { /** String representing the context menu type [LINK, REPORT_ACTION] which controls context menu choices */ type: PropTypes.string, + + /** Target node which is the target of ContentMenu */ + anchor: PropTypes.node, ...genericReportActionContextMenuPropTypes, ...withLocalizePropTypes, ...windowDimensionsPropTypes, @@ -23,6 +26,7 @@ const propTypes = { const defaultProps = { type: CONTEXT_MENU_TYPES.REPORT_ACTION, + anchor: null, ...GenericReportActionContextMenuDefaultProps, }; class BaseReportActionContextMenu extends React.Component { @@ -32,7 +36,7 @@ class BaseReportActionContextMenu extends React.Component { } render() { - const shouldShowFilter = contextAction => contextAction.shouldShow(this.props.type, this.props.reportAction); + const shouldShowFilter = contextAction => contextAction.shouldShow(this.props.type, this.props.reportAction, this.props.anchor); return this.props.isVisible && ( diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.js b/src/pages/home/report/ContextMenu/ContextMenuActions.js index 875b0dc776d2..aa6e9f800dbe 100644 --- a/src/pages/home/report/ContextMenu/ContextMenuActions.js +++ b/src/pages/home/report/ContextMenu/ContextMenuActions.js @@ -121,7 +121,11 @@ export default [ { textTranslateKey: 'reportActionContextMenu.copyLink', icon: Expensicons.LinkCopy, - shouldShow: (type, reportAction) => type === CONTEXT_MENU_TYPES.REPORT_ACTION && !ReportUtils.isReportMessageAttachment(_.last(lodashGet(reportAction, ['message'], [{}]))), + shouldShow: (type, reportAction, menuTarget) => { + const isAttachment = ReportUtils.isReportMessageAttachment(_.last(lodashGet(reportAction, ['message'], [{}]))); + const isAttachmentTarget = lodashGet(menuTarget, 'tagName') === 'IMG' && isAttachment; + return type === CONTEXT_MENU_TYPES.REPORT_ACTION && !isAttachmentTarget; + }, onPress: (closePopover, {reportAction, reportID}) => { Environment.getEnvironmentURL() .then((environmentURL) => { @@ -140,6 +144,7 @@ export default [ shouldShow: type => type === CONTEXT_MENU_TYPES.REPORT_ACTION, onPress: (closePopover, {reportAction, reportID}) => { Report.markCommentAsUnread(reportID, reportAction.sequenceNumber); + Report.setNewMarkerPosition(reportID, reportAction.sequenceNumber); if (closePopover) { hideContextMenu(true, ReportActionComposeFocusManager.focus); } diff --git a/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.js b/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.js index b77599ad9bea..e75d5d908bcb 100644 --- a/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.js +++ b/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.js @@ -124,6 +124,7 @@ class PopoverReportActionContextMenu extends React.Component { ) { const nativeEvent = event.nativeEvent || {}; this.contextMenuAnchor = contextMenuAnchor; + this.contextMenuTargetNode = nativeEvent.target; // Singleton behaviour of ContextMenu creates race conditions when user requests multiple contextMenus. // But it is possible that every new request registers new callbacks thus instanceID is used to corelate those callbacks @@ -222,6 +223,7 @@ class PopoverReportActionContextMenu extends React.Component { selection={this.state.selection} reportID={this.state.reportID} reportAction={this.state.reportAction} + anchor={this.contextMenuTargetNode} /> ); } @@ -293,6 +295,7 @@ class PopoverReportActionContextMenu extends React.Component { reportID={this.state.reportID} reportAction={this.state.reportAction} draftMessage={this.state.reportActionDraftMessage} + anchor={this.contextMenuTargetNode} /> Date: Wed, 3 Aug 2022 15:29:57 +0530 Subject: [PATCH 38/77] Coments added and remove extra code --- src/pages/home/report/ContextMenu/ContextMenuActions.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.js b/src/pages/home/report/ContextMenu/ContextMenuActions.js index 9a545752be3b..29c43e37bcd5 100644 --- a/src/pages/home/report/ContextMenu/ContextMenuActions.js +++ b/src/pages/home/report/ContextMenu/ContextMenuActions.js @@ -127,6 +127,8 @@ export default [ icon: Expensicons.LinkCopy, shouldShow: (type, reportAction, betas, menuTarget) => { const isAttachment = ReportUtils.isReportMessageAttachment(_.last(lodashGet(reportAction, ['message'], [{}]))); + + // Only hide the copylink menu item when context menu is opened over img element. const isAttachmentTarget = lodashGet(menuTarget, 'tagName') === 'IMG' && isAttachment; return Permissions.canUseCommentLinking(betas) && type === CONTEXT_MENU_TYPES.REPORT_ACTION && !isAttachmentTarget; }, @@ -148,7 +150,6 @@ export default [ shouldShow: type => type === CONTEXT_MENU_TYPES.REPORT_ACTION, onPress: (closePopover, {reportAction, reportID}) => { Report.markCommentAsUnread(reportID, reportAction.sequenceNumber); - Report.setNewMarkerPosition(reportID, reportAction.sequenceNumber); if (closePopover) { hideContextMenu(true, ReportActionComposeFocusManager.focus); } From 88aeb6f56f82f8c7ba6e15736882b71f7b55d643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Wed, 3 Aug 2022 13:48:21 -0500 Subject: [PATCH 39/77] replace navigateTo with anchore with href --- docs/_includes/home-lhn.html | 8 ++++---- docs/_includes/request-money-lhn.html | 8 ++++---- docs/_includes/send-money-lhn.html | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/_includes/home-lhn.html b/docs/_includes/home-lhn.html index 7b131c1e5d9c..4622d7e0e1e9 100644 --- a/docs/_includes/home-lhn.html +++ b/docs/_includes/home-lhn.html @@ -3,15 +3,15 @@
    Home

  • -
    +
    Send money
    -
    +
  • -
    +
    Request money
    -
    +
diff --git a/docs/_includes/request-money-lhn.html b/docs/_includes/request-money-lhn.html index b5f459b80bcc..ebe2d76722a7 100644 --- a/docs/_includes/request-money-lhn.html +++ b/docs/_includes/request-money-lhn.html @@ -3,10 +3,10 @@
Home
  • -
    + - Send money -
    + Send money +
  • @@ -23,7 +23,7 @@
  • Request money
    • diff --git a/docs/_includes/send-money-lhn.html b/docs/_includes/send-money-lhn.html index 4638c2ad8fb3..bf51dfd9d999 100644 --- a/docs/_includes/send-money-lhn.html +++ b/docs/_includes/send-money-lhn.html @@ -15,9 +15,9 @@
  • -
    + - Request money -
    + Request money +
    • From d89c7f6110542c7b55084810bf9e6256e4ea1a13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Wed, 3 Aug 2022 13:55:35 -0500 Subject: [PATCH 40/77] change navigateToHome with anchor with href --- docs/_includes/request-money-lhn.html | 2 +- docs/_includes/send-money-lhn.html | 2 +- docs/assets/js/main.js | 9 --------- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/docs/_includes/request-money-lhn.html b/docs/_includes/request-money-lhn.html index ebe2d76722a7..bed3e3c3f891 100644 --- a/docs/_includes/request-money-lhn.html +++ b/docs/_includes/request-money-lhn.html @@ -1,6 +1,6 @@
    • -
      Home
      + Home
    • diff --git a/docs/_includes/send-money-lhn.html b/docs/_includes/send-money-lhn.html index bf51dfd9d999..37c6262827ad 100644 --- a/docs/_includes/send-money-lhn.html +++ b/docs/_includes/send-money-lhn.html @@ -1,6 +1,6 @@
      • -
        Home
        +         Home
      • diff --git a/docs/assets/js/main.js b/docs/assets/js/main.js index 2de6d84efb81..7d6b68e2de46 100644 --- a/docs/assets/js/main.js +++ b/docs/assets/js/main.js @@ -1,14 +1,5 @@ /* eslint-disable no-unused-vars */ -function navigateTo(path) { - window.location.href = path; -} - -function navigateToHome() { - // TODO: Change to '/index' when the site is live - navigateTo('/main'); -} - function toggleHeaderMenu() { const lhn = document.getElementById('lhn'); const lhnContent = document.getElementById('lhn-content'); From fcee8e6b88f42d47683b7ca2addb9a0f37c64c56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Wed, 3 Aug 2022 14:38:19 -0500 Subject: [PATCH 41/77] add click event to header-button --- docs/_layouts/default.html | 2 +- docs/_sass/_main.scss | 2 +- docs/assets/js/main.js | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index a7d905fcf2b4..567e47e24719 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -24,7 +24,7 @@
        -
        +
        diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index 950a07eee200..83299926ef06 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -202,7 +202,7 @@ textarea { padding: 24px; } - .header-button { + #header-button { position: absolute; display: none; diff --git a/docs/assets/js/main.js b/docs/assets/js/main.js index 7d6b68e2de46..225b44847e20 100644 --- a/docs/assets/js/main.js +++ b/docs/assets/js/main.js @@ -66,3 +66,5 @@ if (window.tocbot) { }, }); } + +document.getElementById('header-button').addEventListener('click', toggleHeaderMenu); From 6757edc610d4dd97a4930783e422800a8158e339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Wed, 3 Aug 2022 14:43:00 -0500 Subject: [PATCH 42/77] attach back button logic in js --- docs/_layouts/default.html | 2 +- docs/assets/js/main.js | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index 567e47e24719..b263a75502b1 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -41,7 +41,7 @@ {% when "send-money" %} {% include send-money-lhn.html %} {% else %} -
        + diff --git a/docs/assets/js/main.js b/docs/assets/js/main.js index 225b44847e20..59f618842193 100644 --- a/docs/assets/js/main.js +++ b/docs/assets/js/main.js @@ -68,3 +68,8 @@ if (window.tocbot) { } document.getElementById('header-button').addEventListener('click', toggleHeaderMenu); + +const backButton = document.getElementById('back-button'); +if (backButton) { + backButton.addEventListener('click', navigateBack); +} From bf96ccdb668e24ca7ec39529477ffb48a5687570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Wed, 3 Aug 2022 14:57:46 -0500 Subject: [PATCH 43/77] remove unnecessary div in home lhn --- docs/_includes/home-lhn.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/_includes/home-lhn.html b/docs/_includes/home-lhn.html index 4622d7e0e1e9..6ff3a4462dcd 100644 --- a/docs/_includes/home-lhn.html +++ b/docs/_includes/home-lhn.html @@ -5,13 +5,13 @@
      • -
        Send money
        + Send money
      • -
        Request money
        + Request money
      From f2994e5d3ecdfa4d2df554c653dde398303fd82c Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Wed, 3 Aug 2022 18:16:06 -0600 Subject: [PATCH 44/77] rm INITIAL_REPORT_DATA_LOADED --- src/Expensify.js | 10 +--------- src/ONYXKEYS.js | 4 ---- src/libs/actions/App.js | 4 ---- src/libs/actions/Report.js | 1 - src/pages/home/sidebar/SidebarLinks.js | 9 +-------- 5 files changed, 2 insertions(+), 26 deletions(-) diff --git a/src/Expensify.js b/src/Expensify.js index 1f0e249eb244..8313770c46c8 100644 --- a/src/Expensify.js +++ b/src/Expensify.js @@ -47,9 +47,6 @@ const propTypes = { /** Whether a new update is available and ready to install. */ updateAvailable: PropTypes.bool, - /** Whether the initial data needed to render the app is ready */ - initialReportDataLoaded: PropTypes.bool, - /** Tells us if the sidebar has rendered */ isSidebarLoaded: PropTypes.bool, @@ -72,7 +69,6 @@ const defaultProps = { accountID: null, }, updateAvailable: false, - initialReportDataLoaded: false, isSidebarLoaded: false, screenShareRequest: null, }; @@ -123,8 +119,7 @@ class Expensify extends PureComponent { } if (this.state.isNavigationReady && this.state.isSplashShown) { - const authStackReady = this.props.initialReportDataLoaded && this.props.isSidebarLoaded; - const shouldHideSplash = !this.isAuthenticated() || authStackReady; + const shouldHideSplash = !this.isAuthenticated() || this.props.isSidebarLoaded; if (shouldHideSplash) { BootSplash.hide(); @@ -223,9 +218,6 @@ export default compose( key: ONYXKEYS.UPDATE_AVAILABLE, initWithStoredValues: false, }, - initialReportDataLoaded: { - key: ONYXKEYS.INITIAL_REPORT_DATA_LOADED, - }, isSidebarLoaded: { key: ONYXKEYS.IS_SIDEBAR_LOADED, }, diff --git a/src/ONYXKEYS.js b/src/ONYXKEYS.js index 17302ba46467..b2fcb76fab9b 100755 --- a/src/ONYXKEYS.js +++ b/src/ONYXKEYS.js @@ -12,10 +12,6 @@ export default { // which tab is the leader, and which ones are the followers ACTIVE_CLIENTS: 'activeClients', - // A key that is set while we are still waiting for the initial round of reports to load. Once set it should not be - // false unless we sign out. If there are reports in storage when the app inits this will be `true`. - INITIAL_REPORT_DATA_LOADED: 'initialReportDataLoaded', - // Boolean flag set whenever we are waiting for the reconnection callbacks to finish. IS_LOADING_AFTER_RECONNECT: 'isLoadingAfterReconnect', diff --git a/src/libs/actions/App.js b/src/libs/actions/App.js index 110908ebab38..334b10417b25 100644 --- a/src/libs/actions/App.js +++ b/src/libs/actions/App.js @@ -115,10 +115,6 @@ function openApp() { value: true, }], successData: [{ - onyxMethod: CONST.ONYX.METHOD.MERGE, - key: ONYXKEYS.INITIAL_REPORT_DATA_LOADED, - value: true, - }, { onyxMethod: CONST.ONYX.METHOD.MERGE, key: ONYXKEYS.IS_LOADING_REPORT_DATA, value: false, diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js index 31384254d8a6..471ad97be82b 100644 --- a/src/libs/actions/Report.js +++ b/src/libs/actions/Report.js @@ -712,7 +712,6 @@ function fetchAllReports( return fetchOrCreateChatReport([currentUserEmail, CONST.EMAIL.CONCIERGE], false); }) .then((returnedReports) => { - Onyx.set(ONYXKEYS.INITIAL_REPORT_DATA_LOADED, true); Onyx.set(ONYXKEYS.IS_LOADING_REPORT_DATA, false); // If at this point the user still doesn't have a Concierge report, create it for them. diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js index 6e2f425d303b..2e856569b0c1 100644 --- a/src/pages/home/sidebar/SidebarLinks.js +++ b/src/pages/home/sidebar/SidebarLinks.js @@ -79,9 +79,6 @@ const propTypes = { /** The chat priority mode */ priorityMode: PropTypes.string, - /** Whether we have the necessary report data to load the sidebar */ - initialReportDataLoaded: PropTypes.bool, - // Whether we are syncing app data isSyncingData: PropTypes.bool, @@ -97,7 +94,6 @@ const defaultProps = { }, currentlyViewedReportID: '', priorityMode: CONST.PRIORITY_MODE.DEFAULT, - initialReportDataLoaded: false, isSyncingData: false, }; @@ -242,7 +238,7 @@ class SidebarLinks extends React.Component { render() { // Wait until the reports and personalDetails are actually loaded before displaying the LHN - if (!this.props.initialReportDataLoaded || _.isEmpty(this.props.personalDetails)) { + if (_.isEmpty(this.props.personalDetails)) { return null; } @@ -342,9 +338,6 @@ export default compose( priorityMode: { key: ONYXKEYS.NVP_PRIORITY_MODE, }, - initialReportDataLoaded: { - key: ONYXKEYS.INITIAL_REPORT_DATA_LOADED, - }, isSyncingData: { key: ONYXKEYS.IS_LOADING_AFTER_RECONNECT, initWithStoredValues: false, From 46ba0fdf6c408de66cae5417ac3afaf4c3b787cd Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Wed, 3 Aug 2022 21:57:08 -0600 Subject: [PATCH 45/77] add logic to policyIDList --- src/libs/actions/App.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/libs/actions/App.js b/src/libs/actions/App.js index 334b10417b25..901d605499ca 100644 --- a/src/libs/actions/App.js +++ b/src/libs/actions/App.js @@ -50,7 +50,19 @@ Onyx.connect({ return; } - policyIDList = _.map(_.values(val), policy => policy.id); + const tempPolicyIDList = []; + _.each(_.keys(val), (key) => { + if (!val[key] || !val[key].id) { + return; + } + tempPolicyIDList.push(val[key].id); + }); + + if (_.isEmpty(tempPolicyIDList)) { + return; + } + console.log(tempPolicyIDList); + policyIDList = tempPolicyIDList; }, }); From eca036049304ff34ee00d3c814f35f20f759fcd1 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Thu, 4 Aug 2022 11:12:07 -0600 Subject: [PATCH 46/77] update onyx --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6165ce0c1791..a0137b29960b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43901,9 +43901,9 @@ } }, "react-native-onyx": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.11.tgz", - "integrity": "sha512-vHKbkpABwwzJDzOy/D+/JUfxzyarzd2caiVjq49Aaop+8VPpo+QE9N6qBfFZd+eZiP+723IRTK1ev1gvYhq0cQ==", + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.12.tgz", + "integrity": "sha512-hSjJvZ7tz827xhUJcAV4FtUUm+BqKM4Pbp4HD0Y+GBSexFCsf9DgmjI6rEEkonruqksz88hYs1ptxO31G5Ub6Q==", "requires": { "ascii-table": "0.0.9", "lodash": "^4.17.21", diff --git a/package.json b/package.json index 13841eab7eef..bfaf3e3e178e 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "react-native-image-size": "git+https://github.com/Expensify/react-native-image-size#6b5ab5110dc3ed554f8eafbc38d7d87c17147972", "react-native-keyboard-spacer": "^0.4.1", "react-native-modal": "^13.0.0", - "react-native-onyx": "1.0.11", + "react-native-onyx": "1.0.12", "react-native-pdf": "^6.2.2", "react-native-performance": "^2.0.0", "react-native-permissions": "^3.0.1", From 1db2e166e37931f7595e19fb595c6d790d8bdd72 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Thu, 4 Aug 2022 12:02:55 -0600 Subject: [PATCH 47/77] rm log --- src/libs/actions/App.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/libs/actions/App.js b/src/libs/actions/App.js index 901d605499ca..6723c75d10c5 100644 --- a/src/libs/actions/App.js +++ b/src/libs/actions/App.js @@ -46,10 +46,6 @@ Onyx.connect({ key: ONYXKEYS.COLLECTION.POLICY, waitForCollectionCallback: true, callback: (val) => { - if (_.isEmpty(val)) { - return; - } - const tempPolicyIDList = []; _.each(_.keys(val), (key) => { if (!val[key] || !val[key].id) { @@ -61,7 +57,7 @@ Onyx.connect({ if (_.isEmpty(tempPolicyIDList)) { return; } - console.log(tempPolicyIDList); + policyIDList = tempPolicyIDList; }, }); From a3e8e2e68affb7264e64efb9df032c326dc95907 Mon Sep 17 00:00:00 2001 From: aimane-chnaif Date: Fri, 5 Aug 2022 10:33:31 -0600 Subject: [PATCH 48/77] fix page size changing after use wrong 2fa and clicking on Save button --- .../SignInPageLayout/SignInPageContent.js | 82 ++++++++++--------- 1 file changed, 45 insertions(+), 37 deletions(-) diff --git a/src/pages/signin/SignInPageLayout/SignInPageContent.js b/src/pages/signin/SignInPageLayout/SignInPageContent.js index 4006d65a0093..522bccdcc13f 100755 --- a/src/pages/signin/SignInPageLayout/SignInPageContent.js +++ b/src/pages/signin/SignInPageLayout/SignInPageContent.js @@ -37,54 +37,62 @@ const SignInPageContent = props => ( showsVerticalScrollIndicator={false} style={[ styles.h100, - styles.alignSelfCenter, + !props.isSmallScreenWidth && styles.alignSelfCenter, !props.isSmallScreenWidth && styles.signInPageWideLeftContainer, ]} contentContainerStyle={[ scrollViewContentContainerStyles, + styles.alignItemsCenter, !props.isSmallScreenWidth && styles.ph6, ]} > - - + - - + + + + + {props.shouldShowWelcomeText && ( + + {props.welcomeText} + + )} + {props.children} + + + + - {props.shouldShowWelcomeText && ( - - {props.welcomeText} - - )} - {props.children} - - - - + ); From 5eb6f4a983748d528c88ca722400866c5acdcbc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Metehan=20=C3=96zyurt?= Date: Fri, 5 Aug 2022 22:38:29 +0300 Subject: [PATCH 49/77] logic bug fixed --- src/styles/StyleUtils.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/styles/StyleUtils.js b/src/styles/StyleUtils.js index 93ceef7c6abe..1e7e5aeabdf4 100644 --- a/src/styles/StyleUtils.js +++ b/src/styles/StyleUtils.js @@ -330,13 +330,14 @@ function getLoginContainerMarginStyles({ isMediumScreenWidth, windowHeight, }) { + let marginStyle = {}; if (isSmallScreenWidth) { - return styles.signInPageNarrowContentMargin; + marginStyle = {...marginStyle, ...styles.signInPageNarrowContentMargin}; } if (!isMediumScreenWidth || (isMediumScreenWidth && windowHeight < variables.minHeightToShowGraphics)) { - return styles.signInPageWideLeftContentMargin; + marginStyle = {...marginStyle, ...styles.signInPageWideLeftContentMargin}; } - return {}; + return marginStyle; } /** From ef2e5331111edcbdaff9da16e8e07e1a3c571e8f Mon Sep 17 00:00:00 2001 From: Kosuke Tseng Date: Mon, 8 Aug 2022 00:27:21 -1000 Subject: [PATCH 50/77] clarify comment --- src/components/KYCWall/kycWallPropTypes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/KYCWall/kycWallPropTypes.js b/src/components/KYCWall/kycWallPropTypes.js index 77c2fbd6d617..007199e33d32 100644 --- a/src/components/KYCWall/kycWallPropTypes.js +++ b/src/components/KYCWall/kycWallPropTypes.js @@ -17,7 +17,7 @@ const propTypes = { /** Listen for window resize event on web and desktop */ shouldListenForResize: PropTypes.bool, - /** Wrapped components are disabled, not loading */ + /** Wrapped components should be disabled, and not in spinner/loading state */ isDisabled: PropTypes.bool, ...userWalletPropTypes, From c43c27569ef656cd887d69b74e7aefc65ea53a9d Mon Sep 17 00:00:00 2001 From: Alex Beaman Date: Mon, 8 Aug 2022 12:42:18 +0200 Subject: [PATCH 51/77] Delete old unused param --- src/libs/actions/PersonalDetails.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/libs/actions/PersonalDetails.js b/src/libs/actions/PersonalDetails.js index 4f40b1724429..cadff9c44b72 100644 --- a/src/libs/actions/PersonalDetails.js +++ b/src/libs/actions/PersonalDetails.js @@ -265,8 +265,6 @@ function setPersonalDetails(details, shouldGrowl) { function updateProfile(firstName, lastName, pronouns, timezone) { const myPersonalDetails = personalDetails[currentUserEmail]; API.write('UpdateProfile', { - // 'details' is an old param that will be removed in https://github.com/Expensify/Expensify/issues/220321 - details: JSON.stringify({firstName, lastName, pronouns}), firstName, lastName, pronouns, From 143112e29f22f680697eafbbae73c532059781ca Mon Sep 17 00:00:00 2001 From: errahsoufiane Date: Tue, 9 Aug 2022 02:47:50 +1000 Subject: [PATCH 52/77] fix "Unable to move cursor (left/right) in searchbar" --- src/components/EmojiPicker/EmojiPickerMenu/index.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/components/EmojiPicker/EmojiPickerMenu/index.js b/src/components/EmojiPicker/EmojiPickerMenu/index.js index 2c9ef4a3ad33..8a7abed187d7 100755 --- a/src/components/EmojiPicker/EmojiPickerMenu/index.js +++ b/src/components/EmojiPicker/EmojiPickerMenu/index.js @@ -147,10 +147,12 @@ class EmojiPickerMenu extends Component { this.keyDownHandler = (keyBoardEvent) => { if (keyBoardEvent.key.startsWith('Arrow')) { - keyBoardEvent.preventDefault(); + if (!this.state.isFocused || keyBoardEvent.key === 'ArrowUp' || keyBoardEvent.key === 'ArrowDown') { + keyBoardEvent.preventDefault(); - // Move the highlight when arrow keys are pressed - this.highlightAdjacentEmoji(keyBoardEvent.key); + // Move the highlight when arrow keys are pressed + this.highlightAdjacentEmoji(keyBoardEvent.key); + } return; } From 34b37213fa62684e6166406963f4cb754e0498d8 Mon Sep 17 00:00:00 2001 From: Andrew Rosiclair Date: Mon, 8 Aug 2022 15:40:37 -0400 Subject: [PATCH 53/77] added concierge url to config --- src/CONFIG.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/CONFIG.js b/src/CONFIG.js index df13eb629ec0..a60b17e1e75b 100644 --- a/src/CONFIG.js +++ b/src/CONFIG.js @@ -17,6 +17,7 @@ const secureExpensifyUrl = Url.addTrailingForwardSlash(lodashGet( const useNgrok = lodashGet(Config, 'USE_NGROK', 'false') === 'true'; const useWebProxy = lodashGet(Config, 'USE_WEB_PROXY', 'true') === 'true'; const expensifyComWithProxy = getPlatform() === 'web' && useWebProxy ? '/' : expensifyURL; +const conciergeUrl = `${expensifyURL}concierge/`; // Throw errors on dev if config variables are not set correctly if (ENVIRONMENT === CONST.ENVIRONMENT.DEV) { @@ -48,6 +49,7 @@ export default { PARTNER_NAME: lodashGet(Config, 'EXPENSIFY_PARTNER_NAME', 'chat-expensify-com'), PARTNER_PASSWORD: lodashGet(Config, 'EXPENSIFY_PARTNER_PASSWORD', 'e21965746fd75f82bb66'), EXPENSIFY_CASH_REFERER: 'ecash', + CONCIERGE_URL: conciergeUrl, }, IS_IN_PRODUCTION: Platform.OS === 'web' ? process.env.NODE_ENV === 'production' : !__DEV__, IS_USING_LOCAL_WEB: useNgrok || expensifyURLRoot.includes('dev'), From 3f9f8a869ef02e5e3c08edb8c64bf3cc5afe354f Mon Sep 17 00:00:00 2001 From: Andrew Rosiclair Date: Mon, 8 Aug 2022 15:41:32 -0400 Subject: [PATCH 54/77] stopped using old dot link handling for concierge links --- .../HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js b/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js index 0553b51cf650..e93ba851d996 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js +++ b/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js @@ -24,7 +24,9 @@ const AnchorRenderer = (props) => { const attrHref = htmlAttribs.href || ''; const internalNewExpensifyPath = (attrHref.startsWith(CONST.NEW_EXPENSIFY_URL) && attrHref.replace(CONST.NEW_EXPENSIFY_URL, '')) || (attrHref.startsWith(CONST.STAGING_NEW_EXPENSIFY_URL) && attrHref.replace(CONST.STAGING_NEW_EXPENSIFY_URL, '')); - const internalExpensifyPath = attrHref.startsWith(CONFIG.EXPENSIFY.EXPENSIFY_URL) && attrHref.replace(CONFIG.EXPENSIFY.EXPENSIFY_URL, ''); + const internalExpensifyPath = attrHref.startsWith(CONFIG.EXPENSIFY.EXPENSIFY_URL) + && !attrHref.startsWith(CONFIG.EXPENSIFY.CONCIERGE_URL) + && attrHref.replace(CONFIG.EXPENSIFY.EXPENSIFY_URL, ''); // If we are handling a New Expensify link then we will assume this should be opened by the app internally. This ensures that the links are opened internally via react-navigation // instead of in a new tab or with a page refresh (which is the default behavior of an anchor tag) @@ -39,7 +41,7 @@ const AnchorRenderer = (props) => { ); } - // If we are handling an old dot Expensify link we need to open it with openOldDotLink() so we can navigate to it with the user already logged in. + // If we are handling an old dot Expensify link (excluding Concierge) we need to open it with openOldDotLink() so we can navigate to it with the user already logged in. // As attachments also use expensify.com we don't want it working the same as links. if (internalExpensifyPath && !isAttachment) { return ( From 2dbe4fb6aa8eb10e99299372bec75e4e036eb855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Metehan=20=C3=96zyurt?= Date: Mon, 8 Aug 2022 22:43:39 +0300 Subject: [PATCH 55/77] code reverted --- .../SignInPageLayout/SignInPageContent.js | 3 ++- src/styles/StyleUtils.js | 22 ------------------- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/src/pages/signin/SignInPageLayout/SignInPageContent.js b/src/pages/signin/SignInPageLayout/SignInPageContent.js index 97e42ea4b7d2..002ef6b76b7e 100755 --- a/src/pages/signin/SignInPageLayout/SignInPageContent.js +++ b/src/pages/signin/SignInPageLayout/SignInPageContent.js @@ -55,7 +55,8 @@ const SignInPageContent = props => ( Date: Mon, 8 Aug 2022 15:20:46 -0600 Subject: [PATCH 56/77] simplify connect callback logic --- src/libs/actions/App.js | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/libs/actions/App.js b/src/libs/actions/App.js index b185d6e69fbe..2f3f6906fe9a 100644 --- a/src/libs/actions/App.js +++ b/src/libs/actions/App.js @@ -51,20 +51,8 @@ let policyIDList = []; Onyx.connect({ key: ONYXKEYS.COLLECTION.POLICY, waitForCollectionCallback: true, - callback: (val) => { - const tempPolicyIDList = []; - _.each(_.keys(val), (key) => { - if (!val[key] || !val[key].id) { - return; - } - tempPolicyIDList.push(val[key].id); - }); - - if (_.isEmpty(tempPolicyIDList)) { - return; - } - - policyIDList = tempPolicyIDList; + callback: (policies) => { + policyIDList = _.filter(_.pluck(policies, 'id')); }, }); From da812396afd458c947b9a5925497f8b99beee4ab Mon Sep 17 00:00:00 2001 From: Kosuke Tseng Date: Mon, 8 Aug 2022 14:40:23 -1000 Subject: [PATCH 57/77] remove extra offlineindicator --- src/pages/iou/IOUDetailsModal.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/iou/IOUDetailsModal.js b/src/pages/iou/IOUDetailsModal.js index aa892e60d73c..a4d111835c45 100644 --- a/src/pages/iou/IOUDetailsModal.js +++ b/src/pages/iou/IOUDetailsModal.js @@ -151,7 +151,6 @@ class IOUDetailsModal extends Component { ))} )} - ); } From cbe0ecf02fb157dfd373986ff45801298edb8290 Mon Sep 17 00:00:00 2001 From: Kosuke Tseng Date: Mon, 8 Aug 2022 14:50:05 -1000 Subject: [PATCH 58/77] fix style --- src/pages/iou/IOUDetailsModal.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/iou/IOUDetailsModal.js b/src/pages/iou/IOUDetailsModal.js index a4d111835c45..84ca46ed8321 100644 --- a/src/pages/iou/IOUDetailsModal.js +++ b/src/pages/iou/IOUDetailsModal.js @@ -22,7 +22,6 @@ import SettlementButton from '../../components/SettlementButton'; import ROUTES from '../../ROUTES'; import FixedFooter from '../../components/FixedFooter'; import networkPropTypes from '../../components/networkPropTypes'; -import OfflineIndicator from '../../components/OfflineIndicator'; const propTypes = { /** URL Route params */ From 45045557c4c3d26775ebcee0f4f7287af62ddf85 Mon Sep 17 00:00:00 2001 From: Marc Glasser Date: Mon, 8 Aug 2022 15:54:17 -1000 Subject: [PATCH 59/77] Add initial code to render comment errors with OfflineWithFeedback component --- src/libs/actions/Report.js | 20 +------------- src/libs/actions/ReportActions.js | 11 ++++++++ src/pages/home/report/ReportActionsList.js | 32 ++++++++++++++++------ 3 files changed, 35 insertions(+), 28 deletions(-) diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js index 31384254d8a6..eba624564383 100644 --- a/src/libs/actions/Report.js +++ b/src/libs/actions/Report.js @@ -821,7 +821,7 @@ function buildOptimisticReportAction(reportID, text, file) { isFirstItem: false, isAttachment, attachmentInfo, - isLoading: true, + pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD, shouldShow: true, }, }; @@ -931,26 +931,8 @@ function addActions(reportID, text = '', file) { DateUtils.setTimezoneUpdated(); } - const failureDataReportActions = {}; - const defaultLoadingState = { - isLoading: false, - }; - - if (text) { - failureDataReportActions[reportCommentAction.clientID] = defaultLoadingState; - } - - if (file) { - failureDataReportActions[attachmentAction.clientID] = defaultLoadingState; - } - API.write(commandName, parameters, { optimisticData, - failureData: [{ - onyxMethod: CONST.ONYX.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, - value: failureDataReportActions, - }], }); } diff --git a/src/libs/actions/ReportActions.js b/src/libs/actions/ReportActions.js index 8b87ccb8480f..caed131681db 100644 --- a/src/libs/actions/ReportActions.js +++ b/src/libs/actions/ReportActions.js @@ -130,10 +130,21 @@ function isFromCurrentUser(reportID, sequenceNumber, currentUserAccountID, actio return action.actorAccountID === currentUserAccountID; } +/** + * @param {Number} reportID + * @param {String} clientID + */ +function deleteClientAction(reportID, clientID) { + Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, { + [clientID]: null, + }); +} + export { isReportMissingActions, dangerouslyGetReportActionsMaxSequenceNumber, getDeletedCommentsCount, getLastVisibleMessageText, isFromCurrentUser, + deleteClientAction, }; diff --git a/src/pages/home/report/ReportActionsList.js b/src/pages/home/report/ReportActionsList.js index 5ef4b3603808..cfc8a4046c78 100644 --- a/src/pages/home/report/ReportActionsList.js +++ b/src/pages/home/report/ReportActionsList.js @@ -17,6 +17,8 @@ import * as ReportActionsUtils from '../../../libs/ReportActionsUtils'; import reportActionPropTypes from './reportActionPropTypes'; import CONST from '../../../CONST'; import * as StyleUtils from '../../../styles/StyleUtils'; +import OfflineWithFeedback from '../../../components/OfflineWithFeedback'; +import * as ReportActions from '../../../libs/actions/ReportActions'; const propTypes = { /** Personal details of all the users */ @@ -137,15 +139,27 @@ class ReportActionsList extends React.Component { const shouldDisplayNewIndicator = this.props.report.newMarkerSequenceNumber > 0 && item.action.sequenceNumber === this.props.report.newMarkerSequenceNumber; return ( - + { + if (item.action.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) { + ReportActions.deleteClientAction(this.props.report.reportID, item.action.clientID); + } else if (item.action.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || item.action.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.EDIT) { + // Revert + } + }} + pendingAction={item.action.pendingAction} + errors={item.action.errors} + > + + ); } From 5d1038535c3ea217953944360a9fe4a84a74062b Mon Sep 17 00:00:00 2001 From: Marc Glasser Date: Mon, 8 Aug 2022 16:03:10 -1000 Subject: [PATCH 60/77] add success data --- src/libs/actions/Report.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js index eba624564383..460d67dc307d 100644 --- a/src/libs/actions/Report.js +++ b/src/libs/actions/Report.js @@ -931,8 +931,16 @@ function addActions(reportID, text = '', file) { DateUtils.setTimezoneUpdated(); } + const successData = []; + if (text) { + optimisticReportActions[reportCommentAction.clientID] = {pendingAction: null}; + } + if (file) { + optimisticReportActions[attachmentAction.clientID] = {pendingAction: null}; + } API.write(commandName, parameters, { optimisticData, + successData, }); } From 05bb219aeb3888e740a3f37509a4115ddf3bbbdf Mon Sep 17 00:00:00 2001 From: Marc Glasser Date: Tue, 9 Aug 2022 06:24:42 -1000 Subject: [PATCH 61/77] Remove other junk --- src/libs/OptionsListUtils.js | 59 ++++++++++++------------------------ 1 file changed, 20 insertions(+), 39 deletions(-) diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js index e18cdb7632e5..61e05b4a5a9f 100644 --- a/src/libs/OptionsListUtils.js +++ b/src/libs/OptionsListUtils.js @@ -12,8 +12,6 @@ import * as Localize from './Localize'; import Permissions from './Permissions'; import * as CollectionUtils from './CollectionUtils'; -const memoizedOrderBy = memoizeOne(lodashOrderBy); - /** * OptionsListUtils is used to build a list options passed to the OptionsList component. Several different UI views can * be configured to display different results based on the options passed to the private getOptions() method. Public @@ -117,8 +115,6 @@ function getPersonalDetailsForLogins(logins, personalDetails) { return personalDetailsForLogins; } -const memoizedGetPersonalDetailsForLogins = memoizeOne(getPersonalDetailsForLogins); - /** * Constructs a Set with all possible names (displayName, firstName, lastName, email) for all participants in a report, * to be used in isSearchStringMatch. @@ -182,8 +178,6 @@ function getSearchText(report, reportName, personalDetailList, isChatRoomOrPolic return _.unique(searchTerms).join(' '); } -const memoizedGetSearchText = memoizeOne(getSearchText); - /** * Determines whether a report has a draft comment. * @@ -214,7 +208,7 @@ function createOption(logins, personalDetails, report, reportsWithDraft, { }) { const isChatRoom = ReportUtils.isChatRoom(report); const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(report); - const personalDetailMap = memoizedGetPersonalDetailsForLogins(logins, personalDetails); + const personalDetailMap = getPersonalDetailsForLogins(logins, personalDetails); const personalDetailList = _.values(personalDetailMap); const isArchivedRoom = ReportUtils.isArchivedRoom(report); const hasMultipleParticipants = personalDetailList.length > 1 || isChatRoom || isPolicyExpenseChat; @@ -273,7 +267,7 @@ function createOption(logins, personalDetails, report, reportsWithDraft, { isUnread: report ? report.unreadActionCount > 0 : null, hasDraftComment, keyForList: report ? String(report.reportID) : personalDetail.login, - searchText: memoizedGetSearchText(report, reportName, personalDetailList, isChatRoom || isPolicyExpenseChat), + searchText: getSearchText(report, reportName, personalDetailList, isChatRoom || isPolicyExpenseChat), isPinned: lodashGet(report, 'isPinned', false), hasOutstandingIOU, iouReportID: lodashGet(report, 'iouReportID'), @@ -286,8 +280,6 @@ function createOption(logins, personalDetails, report, reportsWithDraft, { }; } -const memoizedCreateOption = memoizeOne(createOption); - /** * Searches for a match when provided with a value * @@ -341,10 +333,6 @@ function isCurrentUser(userDetails) { return result; } -// We are storing a map of logins in the format {[login]: [login]} so that the memoized functions looking for an array with a login in it -// treat this like the same argument (because it will use the same reference). Memoization for personalDetails won't work properly without this. -const loginArrayMap = {}; - /** * Build the options * @@ -396,7 +384,7 @@ function getOptions(reports, personalDetails, activeReportID, { } const sortDirection = [sortByAlphaAsc ? 'asc' : 'desc']; - let orderedReports = memoizedOrderBy(reports, sortProperty, sortDirection); + let orderedReports = lodashOrderBy(reports, sortProperty, sortDirection); // Move the archived Rooms to the last orderedReports = _.sortBy(orderedReports, report => ReportUtils.isArchivedRoom(report)); @@ -461,33 +449,26 @@ function getOptions(reports, personalDetails, activeReportID, { reportMapForLogins[logins[0]] = report; } const isSearchingSomeonesPolicyExpenseChat = !report.isOwnPolicyExpenseChat && searchValue !== ''; - allReportOptions.push(memoizedCreateOption(logins, personalDetails, report, reportsWithDraft, { + allReportOptions.push(createOption(logins, personalDetails, report, reportsWithDraft, { showChatPreviewLine, forcePolicyNamePreview: isPolicyExpenseChat ? isSearchingSomeonesPolicyExpenseChat : forcePolicyNamePreview, })); }); - let allPersonalDetailsOptions = _.map(personalDetails, (personalDetail) => { - // We want to use the same argument reference when creating the personalDetails option as memoization won't work properly - // if we passed [personalDetail.login] directly (that would be a new argument since we'd initialize a new array) - if (!loginArrayMap[personalDetail.login]) { - loginArrayMap[personalDetail.login] = [personalDetail.login]; - } - return memoizedCreateOption( - loginArrayMap[personalDetail.login], - personalDetails, - reportMapForLogins[personalDetail.login], - reportsWithDraft, - { - showChatPreviewLine, - forcePolicyNamePreview, - }, - ); - }); + let allPersonalDetailsOptions = _.map(personalDetails, personalDetail => createOption( + [personalDetail.login], + personalDetails, + reportMapForLogins[personalDetail.login], + reportsWithDraft, + { + showChatPreviewLine, + forcePolicyNamePreview, + }, + )); if (sortPersonalDetailsByAlphaAsc) { // PersonalDetails should be ordered Alphabetically by default - https://github.com/Expensify/App/issues/8220#issuecomment-1104009435 - allPersonalDetailsOptions = memoizedOrderBy(allPersonalDetailsOptions, [personalDetail => personalDetail.text.toLowerCase()], 'asc'); + allPersonalDetailsOptions = lodashOrderBy(allPersonalDetailsOptions, [personalDetail => personalDetail.text.toLowerCase()], 'asc'); } // Always exclude already selected options and the currently logged in user @@ -545,20 +526,20 @@ function getOptions(reports, personalDetails, activeReportID, { // If we are prioritizing reports with draft comments, add them before the normal recent report options // and sort them by report name. if (prioritizeReportsWithDraftComments) { - const sortedDraftReports = memoizedOrderBy(draftReportOptions, ['text'], ['asc']); + const sortedDraftReports = lodashOrderBy(draftReportOptions, ['text'], ['asc']); recentReportOptions = sortedDraftReports.concat(recentReportOptions); } // If we are prioritizing IOUs the user owes, add them before the normal recent report options and reports // with draft comments. if (prioritizeIOUDebts) { - const sortedIOUReports = memoizedOrderBy(iouDebtReportOptions, ['iouReportAmount'], ['desc']); + const sortedIOUReports = lodashOrderBy(iouDebtReportOptions, ['iouReportAmount'], ['desc']); recentReportOptions = sortedIOUReports.concat(recentReportOptions); } // If we are prioritizing our pinned reports then shift them to the front and sort them by report name if (prioritizePinnedReports) { - const sortedPinnedReports = memoizedOrderBy(pinnedReportOptions, ['text'], ['asc']); + const sortedPinnedReports = lodashOrderBy(pinnedReportOptions, ['text'], ['asc']); recentReportOptions = sortedPinnedReports.concat(recentReportOptions); } @@ -600,7 +581,7 @@ function getOptions(reports, personalDetails, activeReportID, { const login = (Str.isValidPhone(searchValue) && !searchValue.includes('+')) ? `+${countryCodeByIP}${searchValue}` : searchValue; - userToInvite = memoizedCreateOption([login], personalDetails, null, reportsWithDraft, { + userToInvite = createOption([login], personalDetails, null, reportsWithDraft, { showChatPreviewLine, }); userToInvite.icons = [ReportUtils.getDefaultAvatar(login)]; @@ -611,7 +592,7 @@ function getOptions(reports, personalDetails, activeReportID, { // When sortByReportTypeInSearch is true, recentReports will be returned with all the reports including personalDetailsOptions in the correct Order. recentReportOptions.push(...personalDetailsOptions); personalDetailsOptions = []; - recentReportOptions = memoizedOrderBy(recentReportOptions, [(option) => { + recentReportOptions = lodashOrderBy(recentReportOptions, [(option) => { if (option.isChatRoom || option.isArchivedRoom) { return 3; } From f8eb05e5a354f9ebc94758034b2343928bf0e92e Mon Sep 17 00:00:00 2001 From: Ionatan Wiznia Date: Tue, 9 Aug 2022 19:40:25 +0200 Subject: [PATCH 62/77] Expose Onyx in web development --- src/App.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/App.js b/src/App.js index 87a3efb2920c..2f25e4122d42 100644 --- a/src/App.js +++ b/src/App.js @@ -3,6 +3,7 @@ import React from 'react'; import {LogBox} from 'react-native'; import {GestureHandlerRootView} from 'react-native-gesture-handler'; import {SafeAreaProvider} from 'react-native-safe-area-context'; +import Onyx from 'react-native-onyx'; import CustomStatusBar from './components/CustomStatusBar'; import ErrorBoundary from './components/ErrorBoundary'; import Expensify from './Expensify'; @@ -11,6 +12,12 @@ import OnyxProvider from './components/OnyxProvider'; import HTMLEngineProvider from './components/HTMLEngineProvider'; import ComposeProviders from './components/ComposeProviders'; import SafeArea from './components/SafeArea'; +import * as Environment from './libs/Environment/Environment'; + +// For easier debugging and development, when we are in web we expose Onyx to the window, so you can more easily set data into Onyx +if (window && Environment.isDevelopment()) { + window.Onyx = Onyx; +} LogBox.ignoreLogs([ // Basically it means that if the app goes in the background and back to foreground on Android, From ec9d33dfcfe11ef90a3634e415e7110ed78cadf5 Mon Sep 17 00:00:00 2001 From: Peter Velkov Date: Tue, 9 Aug 2022 20:27:08 +0300 Subject: [PATCH 63/77] package.json: prefix run `react-native` through `npx` Some clarity on npx: - it works a bit differently in npm 6 (which we currently use) - namely it downloads and executes a package without the user confirming first. - it would not download a package if it's available locally in node_modules/.bin - right now it downloads react-native every time because it's missing from .bin - it works pretty much like npm run Using npx does not mean "always run with the latest version" of the given package, but "use any local version we have (.bin), or download it otherwise) npx would use the latest version only when we don't have a package installed locally This means that adding the npx prefix would help fix the problem quickly now And would make no difference when we switch to newer node and npm later, because the react-native package would be avaialable in node_modules/.bin (The problem is `react-native` is not being recognized as installed in package scripts. The source of the problem is using npm6 which is now a bit obsolete) (More details in this slack thread: https://expensify.slack.com/archives/C01GTK53T8Q/p1659765865205259) --- package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 6308ee32b8b8..42b11049f83e 100644 --- a/package.json +++ b/package.json @@ -8,12 +8,12 @@ "private": true, "scripts": { "postinstall": "scripts/react-native-web.sh && cd desktop && npm install", - "clean": "react-native clean-project-auto", - "android": "npm run check-metro-bundler-port && scripts/set-pusher-suffix.sh && react-native run-android", - "ios": "npm run check-metro-bundler-port && scripts/set-pusher-suffix.sh && react-native run-ios", - "ipad": "npm run check-metro-bundler-port && react-native run-ios --simulator=\"iPad Pro (12.9-inch) (4th generation)\"", - "ipad-sm": "npm run check-metro-bundler-port && react-native run-ios --simulator=\"iPad Pro (9.7-inch)\"", - "start": "react-native start", + "clean": "npx react-native clean-project-auto", + "android": "npm run check-metro-bundler-port && scripts/set-pusher-suffix.sh && npx react-native run-android", + "ios": "npm run check-metro-bundler-port && scripts/set-pusher-suffix.sh && npx react-native run-ios", + "ipad": "npm run check-metro-bundler-port && npx react-native run-ios --simulator=\"iPad Pro (12.9-inch) (4th generation)\"", + "ipad-sm": "npm run check-metro-bundler-port && npx react-native run-ios --simulator=\"iPad Pro (9.7-inch)\"", + "start": "npx react-native start", "web": "scripts/set-pusher-suffix.sh && concurrently npm:web-proxy npm:web-server", "web-proxy": "node web/proxy.js", "web-server": "webpack-dev-server --open --config config/webpack/webpack.dev.js", From 05fccfae39140dda5042cdea9d65fd092a80e20c Mon Sep 17 00:00:00 2001 From: Marc Glasser Date: Tue, 9 Aug 2022 08:15:38 -1000 Subject: [PATCH 64/77] Add logic for RBR indicator --- src/CONST.js | 3 +++ src/libs/OptionsListUtils.js | 29 ++++++++++++++++++++++---- src/pages/home/sidebar/SidebarLinks.js | 4 ++++ 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/src/CONST.js b/src/CONST.js index 22a5ea8a3c82..e5ffb21bbe37 100755 --- a/src/CONST.js +++ b/src/CONST.js @@ -777,6 +777,9 @@ const CONST = { DELETE: 'delete', UPDATE: 'update', }, + BRICK_ROAD_INDICATOR_STATUS: { + ERROR: 'error', + }, }; export default CONST; diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js index 61e05b4a5a9f..d793bfaaef2d 100644 --- a/src/libs/OptionsListUtils.js +++ b/src/libs/OptionsListUtils.js @@ -190,6 +190,21 @@ function hasReportDraftComment(report, reportsWithDraft = {}) { && lodashGet(reportsWithDraft, `${ONYXKEYS.COLLECTION.REPORTS_WITH_DRAFT}${report.reportID}`, false); } +/** + * @param {Object} report + * @param {Object} reportActions + * @returns {String} + */ +function getBrickRoadIndicatorStatusForReport(report, reportActions) { + const reportID = lodashGet(report, 'reportID'); + const reportsActions = lodashGet(reportActions, `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, {}); + if (_.isEmpty(reportsActions)) { + return ''; + } + + return _.find(reportsActions, action => !_.isEmpty(action.errors)) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : ''; +} + /** * Creates a report list option * @@ -197,12 +212,13 @@ function hasReportDraftComment(report, reportsWithDraft = {}) { * @param {Object} personalDetails * @param {Object} report * @param {Object} reportsWithDraft + * @param {Object} reportActions * @param {Object} options * @param {Boolean} [options.showChatPreviewLine] * @param {Boolean} [options.forcePolicyNamePreview] * @returns {Object} */ -function createOption(logins, personalDetails, report, reportsWithDraft, { +function createOption(logins, personalDetails, report, reportsWithDraft, reportActions = {}, { showChatPreviewLine = false, forcePolicyNamePreview = false, }) { @@ -252,6 +268,7 @@ function createOption(logins, personalDetails, report, reportsWithDraft, { return { text: reportName, alternateText, + brickRoadIndicator: getBrickRoadIndicatorStatusForReport(report, reportActions), icons: ReportUtils.getIcons(report, personalDetails, policies, lodashGet(personalDetail, ['avatar'])), tooltipText, ownerEmail: lodashGet(report, ['ownerEmail']), @@ -345,6 +362,7 @@ function isCurrentUser(userDetails) { */ function getOptions(reports, personalDetails, activeReportID, { reportsWithDraft = {}, + reportActions = {}, betas = [], selectedOptions = [], maxRecentReportsToShow = 0, @@ -449,7 +467,7 @@ function getOptions(reports, personalDetails, activeReportID, { reportMapForLogins[logins[0]] = report; } const isSearchingSomeonesPolicyExpenseChat = !report.isOwnPolicyExpenseChat && searchValue !== ''; - allReportOptions.push(createOption(logins, personalDetails, report, reportsWithDraft, { + allReportOptions.push(createOption(logins, personalDetails, report, reportsWithDraft, reportActions, { showChatPreviewLine, forcePolicyNamePreview: isPolicyExpenseChat ? isSearchingSomeonesPolicyExpenseChat : forcePolicyNamePreview, })); @@ -460,6 +478,7 @@ function getOptions(reports, personalDetails, activeReportID, { personalDetails, reportMapForLogins[personalDetail.login], reportsWithDraft, + reportActions, { showChatPreviewLine, forcePolicyNamePreview, @@ -581,7 +600,7 @@ function getOptions(reports, personalDetails, activeReportID, { const login = (Str.isValidPhone(searchValue) && !searchValue.includes('+')) ? `+${countryCodeByIP}${searchValue}` : searchValue; - userToInvite = createOption([login], personalDetails, null, reportsWithDraft, { + userToInvite = createOption([login], personalDetails, null, reportsWithDraft, reportActions, { showChatPreviewLine, }); userToInvite.icons = [ReportUtils.getDefaultAvatar(login)]; @@ -744,9 +763,10 @@ function getMemberInviteOptions( * @param {String} priorityMode * @param {Array} betas * @param {Object} reportsWithDraft + * @param {Object} reportActions * @returns {Object} */ -function calculateSidebarOptions(reports, personalDetails, activeReportID, priorityMode, betas, reportsWithDraft) { +function calculateSidebarOptions(reports, personalDetails, activeReportID, priorityMode, betas, reportsWithDraft, reportActions) { let sideBarOptions = { prioritizeIOUDebts: true, prioritizeReportsWithDraftComments: true, @@ -767,6 +787,7 @@ function calculateSidebarOptions(reports, personalDetails, activeReportID, prior prioritizePinnedReports: true, ...sideBarOptions, reportsWithDraft, + reportActions, }); } diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js index 4931b1f6ffdb..a9c64edc0ec0 100644 --- a/src/pages/home/sidebar/SidebarLinks.js +++ b/src/pages/home/sidebar/SidebarLinks.js @@ -138,6 +138,7 @@ class SidebarLinks extends React.Component { props.priorityMode, props.betas, props.reportsWithDraft, + props.reportActions, ); return sidebarOptions.recentReports; } @@ -371,5 +372,8 @@ export default compose( reportsWithDraft: { key: ONYXKEYS.COLLECTION.REPORTS_WITH_DRAFT, }, + reportActions: { + key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, + }, }), )(SidebarLinks); From 0ac1547d2e7eaa0edf581731a7aeadf66013b012 Mon Sep 17 00:00:00 2001 From: Marc Glasser Date: Tue, 9 Aug 2022 09:08:34 -1000 Subject: [PATCH 65/77] Fix styles --- src/components/OfflineWithFeedback.js | 8 ++++- src/components/OptionRow.js | 15 +++++++++ src/components/optionPropTypes.js | 4 +++ src/libs/actions/Report.js | 36 ++++++---------------- src/pages/home/report/ReportActionsList.js | 1 + src/styles/utilities/spacing.js | 4 +++ 6 files changed, 41 insertions(+), 27 deletions(-) diff --git a/src/components/OfflineWithFeedback.js b/src/components/OfflineWithFeedback.js index 2422e4745b73..926297f8a4e7 100644 --- a/src/components/OfflineWithFeedback.js +++ b/src/components/OfflineWithFeedback.js @@ -43,6 +43,11 @@ const propTypes = { PropTypes.arrayOf(PropTypes.object), PropTypes.object, ]), + + /** Additional style object for the error row */ + // eslint-disable-next-line react/forbid-prop-types + errorStyle: PropTypes.object, + ...withLocalizePropTypes, }; @@ -50,6 +55,7 @@ const defaultProps = { pendingAction: null, errors: null, style: [], + errorStyle: {}, }; /** @@ -97,7 +103,7 @@ const OfflineWithFeedback = (props) => { )} {hasErrors && ( - + diff --git a/src/components/OptionRow.js b/src/components/OptionRow.js index a6a75bceb48a..a7eb1df83d0e 100644 --- a/src/components/OptionRow.js +++ b/src/components/OptionRow.js @@ -23,6 +23,7 @@ import SelectCircle from './SelectCircle'; import SubscriptAvatar from './SubscriptAvatar'; import CONST from '../CONST'; import * as ReportUtils from '../libs/ReportUtils'; +import variables from '../styles/variables'; const propTypes = { /** Background Color of the Option Row */ @@ -205,6 +206,16 @@ const OptionRow = (props) => { ) : null} + {props.option.brickRoadIndicator === CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR && ( + + + + )} {props.showSelectedState && } @@ -298,5 +309,9 @@ export default withLocalize(memo(OptionRow, (prevProps, nextProps) => { return false; } + if (prevProps.option.brickRoadIndicator !== nextProps.option.brickRoadIndicator) { + return false; + } + return true; })); diff --git a/src/components/optionPropTypes.js b/src/components/optionPropTypes.js index 47af58d240cb..78dbd19b5339 100644 --- a/src/components/optionPropTypes.js +++ b/src/components/optionPropTypes.js @@ -1,4 +1,5 @@ import PropTypes from 'prop-types'; +import CONST from '../CONST'; import participantPropTypes from './participantPropTypes'; export default PropTypes.shape({ @@ -49,4 +50,7 @@ export default PropTypes.shape({ // Text to show for tooltip tooltipText: PropTypes.string, + + /** If we need to show a brick road indicator or not */ + brickRoadIndicator: PropTypes.oneOf([CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR, '']), }); diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js index 460d67dc307d..1afd43e199a4 100644 --- a/src/libs/actions/Report.js +++ b/src/libs/actions/Report.js @@ -398,26 +398,6 @@ function setLocalIOUReportData(iouReportObject) { Onyx.merge(iouReportKey, iouReportObject); } -/** - * Remove all optimistic actions from report actions and reset the optimisticReportActionsIDs array. We do this - * to clear any stuck optimistic actions that have not be updated for whatever reason. - * - * @param {Number} reportID - */ -function removeOptimisticActions(reportID) { - const actionIDs = optimisticReportActionIDs[reportID] || []; - const actionsToRemove = _.reduce(actionIDs, (actions, actionID) => ({ - ...actions, - [actionID]: null, - }), {}); - Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, actionsToRemove); - - // Reset the optimistic report action IDs to an empty array - Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, { - optimisticReportActionIDs: [], - }); -} - /** * Fetch the iouReport and persist the data to Onyx. * @@ -663,10 +643,6 @@ function fetchActions(reportID) { reportActionsLimit: CONST.REPORT.ACTIONS.LIMIT, }) .then((data) => { - // We must remove all optimistic actions so there will not be any stuck comments. At this point, we should - // be caught up and no longer need any optimistic comments. - removeOptimisticActions(reportID); - const indexedData = _.indexBy(data.history, 'sequenceNumber'); Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, indexedData); }); @@ -933,10 +909,18 @@ function addActions(reportID, text = '', file) { const successData = []; if (text) { - optimisticReportActions[reportCommentAction.clientID] = {pendingAction: null}; + successData.push({ + onyxMethod: CONST.ONYX.METHOD.MERGE, + key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`, + value: {[reportCommentAction.clientID]: {pendingAction: null}}, + }); } if (file) { - optimisticReportActions[attachmentAction.clientID] = {pendingAction: null}; + successData.push({ + onyxMethod: CONST.ONYX.METHOD.MERGE, + key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`, + value: {[attachmentAction.clientID]: {pendingAction: null}}, + }); } API.write(commandName, parameters, { optimisticData, diff --git a/src/pages/home/report/ReportActionsList.js b/src/pages/home/report/ReportActionsList.js index cfc8a4046c78..d8953ec0ee9b 100644 --- a/src/pages/home/report/ReportActionsList.js +++ b/src/pages/home/report/ReportActionsList.js @@ -149,6 +149,7 @@ class ReportActionsList extends React.Component { }} pendingAction={item.action.pendingAction} errors={item.action.errors} + errorStyle={styles.ml10} > Date: Wed, 10 Aug 2022 05:39:17 +1000 Subject: [PATCH 66/77] move highlight when arrow left/right keys are pressed even when focused input --- src/components/EmojiPicker/EmojiPickerMenu/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/EmojiPicker/EmojiPickerMenu/index.js b/src/components/EmojiPicker/EmojiPickerMenu/index.js index 8a7abed187d7..470f570603f3 100755 --- a/src/components/EmojiPicker/EmojiPickerMenu/index.js +++ b/src/components/EmojiPicker/EmojiPickerMenu/index.js @@ -149,10 +149,10 @@ class EmojiPickerMenu extends Component { if (keyBoardEvent.key.startsWith('Arrow')) { if (!this.state.isFocused || keyBoardEvent.key === 'ArrowUp' || keyBoardEvent.key === 'ArrowDown') { keyBoardEvent.preventDefault(); - - // Move the highlight when arrow keys are pressed - this.highlightAdjacentEmoji(keyBoardEvent.key); } + + // Move the highlight when arrow keys are pressed + this.highlightAdjacentEmoji(keyBoardEvent.key); return; } From 9e8141dda8e8ab1c4153f0b760c42ce464e2a037 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Tue, 9 Aug 2022 13:45:25 -0600 Subject: [PATCH 67/77] update onyx --- package-lock.json | 582 +++++++++++++++++++++++----------------------- package.json | 2 +- 2 files changed, 292 insertions(+), 292 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3b1c1e075adb..a6ca635d82ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22124,7 +22124,7 @@ "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", "requires": { "is-buffer": "^1.1.5" } @@ -23215,12 +23215,12 @@ "inherits": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=" + "integrity": "sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA==" }, "util": { "version": "0.10.3", "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", - "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", + "integrity": "sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==", "requires": { "inherits": "2.0.1" } @@ -23380,13 +23380,13 @@ "js-tokens": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", - "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", + "integrity": "sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg==", "dev": true }, "strip-ansi": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", "dev": true, "requires": { "ansi-regex": "^2.0.0" @@ -23395,7 +23395,7 @@ "supports-color": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==", "dev": true } } @@ -24470,7 +24470,7 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "dev": true } } @@ -24490,7 +24490,7 @@ "to-fast-properties": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", - "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", + "integrity": "sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og==", "dev": true } } @@ -24529,7 +24529,7 @@ "define-property": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==", "requires": { "is-descriptor": "^1.0.0" } @@ -25806,7 +25806,7 @@ "define-property": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==", "requires": { "is-descriptor": "^0.1.0" } @@ -25971,7 +25971,7 @@ "co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" + "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==" }, "coa": { "version": "2.0.2", @@ -26039,7 +26039,7 @@ "code-point-at": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" + "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==" }, "collapse-white-space": { "version": "1.0.6", @@ -26056,7 +26056,7 @@ "collection-visit": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", - "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", + "integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==", "requires": { "map-visit": "^1.0.0", "object-visit": "^1.0.0" @@ -26138,12 +26138,12 @@ "commondir": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=" + "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==" }, "compare-version": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz", - "integrity": "sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA=", + "integrity": "sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A==", "dev": true }, "component-emitter": { @@ -26184,14 +26184,14 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" } } }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, "concat-stream": { "version": "1.6.2", @@ -26309,7 +26309,7 @@ "is-fullwidth-code-point": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==", "dev": true }, "locate-path": { @@ -26334,19 +26334,19 @@ "path-exists": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", "dev": true }, "pify": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==", "dev": true }, "read-pkg": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-4.0.1.tgz", - "integrity": "sha1-ljYlN48+HE1IyFhytabsfV0JMjc=", + "integrity": "sha512-+UBirHHDm5J+3WDmLBZYSklRYg82nMlz+enn+GMZ22nSR2f4bzxmhso6rzQW/3mT2PVzpzDTiYIZahk8UmZ44w==", "dev": true, "requires": { "normalize-package-data": "^2.3.2", @@ -26521,13 +26521,13 @@ "console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", + "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==", "dev": true }, "constants-browserify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", - "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=" + "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==" }, "content-disposition": { "version": "0.5.3", @@ -26561,7 +26561,7 @@ "cookie-signature": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", + "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", "dev": true }, "copy-concurrently": { @@ -26581,7 +26581,7 @@ "copy-descriptor": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", - "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" + "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==" }, "copy-webpack-plugin": { "version": "6.2.1", @@ -26995,7 +26995,7 @@ "css-color-keywords": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz", - "integrity": "sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU=" + "integrity": "sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==" }, "css-loader": { "version": "5.2.4", @@ -27262,7 +27262,7 @@ "cyclist": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz", - "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=", + "integrity": "sha512-NJGVKPS81XejHcLhaLJS7plab0fK3slPh11mESeeDq2W4ZI5kUKK/LRRdVDvjJseojbPB7ZwjnyOybg3Igea/A==", "dev": true }, "damerau-levenshtein": { @@ -27313,7 +27313,7 @@ "decamelize": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" + "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==" }, "decimal.js": { "version": "10.3.1", @@ -27324,7 +27324,7 @@ "decode-uri-component": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" + "integrity": "sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==" }, "decompress-response": { "version": "3.3.0", @@ -27338,7 +27338,7 @@ "dedent": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", - "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=", + "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==", "dev": true }, "deep-equal": { @@ -27489,7 +27489,7 @@ "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", "dev": true }, "delegate": { @@ -27500,7 +27500,7 @@ "delegates": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", + "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==", "dev": true }, "denodeify": { @@ -27555,7 +27555,7 @@ "detect-file": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", - "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=", + "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==", "dev": true }, "detect-newline": { @@ -27758,7 +27758,7 @@ "commander": { "version": "2.9.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", - "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", + "integrity": "sha512-bmkUukX8wAOjHdN26xj5c4ctEV22TQ7dQYhSmuckKhToXrkUn0iIaolHdIxYYqD55nhpSPA9zPQ1yP57GdXP2A==", "dev": true, "requires": { "graceful-readlink": ">= 1.0.0" @@ -27888,7 +27888,7 @@ "dns-equal": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz", - "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=", + "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==", "dev": true }, "dns-packet": { @@ -27904,7 +27904,7 @@ "dns-txt": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz", - "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=", + "integrity": "sha512-Ix5PrWjphuSoUXV/Zv5gaFHjnaJtb02F2+Si3Ht9dyJ87+Z/lMmy+dpNHtTGraNK958ndXq2i+GLkWsWHcKaBQ==", "dev": true, "requires": { "buffer-indexof": "^1.0.0" @@ -28075,7 +28075,7 @@ "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "ejs": { "version": "3.1.8", @@ -28521,7 +28521,7 @@ "encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" }, "end-of-stream": { "version": "1.4.4", @@ -28577,7 +28577,7 @@ "enhanced-resolve": { "version": "3.4.1", "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz", - "integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=", + "integrity": "sha512-ZaAux1rigq1e2nQrztHn4h2ugvpzZxs64qneNah+8Mh/K0CRqJFJc+UoXnUsq+1yX+DmQFPPdVqboKAJ89e0Iw==", "requires": { "graceful-fs": "^4.1.2", "memory-fs": "^0.4.0", @@ -28758,12 +28758,12 @@ "escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" }, "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==" }, "escodegen": { "version": "2.0.0", @@ -29388,7 +29388,7 @@ "jsonfile": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", "dev": true, "requires": { "graceful-fs": "^4.1.6" @@ -30128,7 +30128,7 @@ "etag": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" + "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==" }, "event-stream": { "version": "4.0.1", @@ -30204,7 +30204,7 @@ "expand-brackets": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", - "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==", "requires": { "debug": "^2.3.3", "define-property": "^0.2.5", @@ -30226,7 +30226,7 @@ "define-property": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==", "requires": { "is-descriptor": "^0.1.0" } @@ -30234,7 +30234,7 @@ "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", "requires": { "is-extendable": "^0.1.0" } @@ -30242,14 +30242,14 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" } } }, "expand-tilde": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", - "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", + "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==", "dev": true, "requires": { "homedir-polyfill": "^1.0.1" @@ -30455,7 +30455,7 @@ "extend-shallow": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==", "requires": { "assign-symbols": "^1.0.0", "is-extendable": "^1.0.1" @@ -30500,7 +30500,7 @@ "define-property": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==", "requires": { "is-descriptor": "^1.0.0" } @@ -30508,7 +30508,7 @@ "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", "requires": { "is-extendable": "^0.1.0" } @@ -30665,7 +30665,7 @@ "fast-deep-equal": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", + "integrity": "sha512-bCK/2Z4zLidyB4ReuIsvALH6w31YfAQDmXMqMx6FyfHqvBxtjC0eRumeSu4Bs3XtXwpyIywtSTrVT99BxY1f9w==", "dev": true } } @@ -30678,7 +30678,7 @@ "fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", "dev": true }, "fastq": { @@ -30898,7 +30898,7 @@ "filter-obj": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz", - "integrity": "sha1-mzERErxsYSehbgFsbF1/GeCAXFs=" + "integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==" }, "finalhandler": { "version": "1.1.2", @@ -30925,7 +30925,7 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" } } }, @@ -30942,13 +30942,13 @@ "json5": { "version": "0.5.1", "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", + "integrity": "sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==", "dev": true }, "path-exists": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", "dev": true } } @@ -31042,12 +31042,12 @@ "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=" + "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==" }, "for-own": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", - "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", + "integrity": "sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==", "requires": { "for-in": "^1.0.1" } @@ -31224,7 +31224,7 @@ "fragment-cache": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", - "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", + "integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==", "requires": { "map-cache": "^0.2.2" } @@ -31232,17 +31232,17 @@ "fresh": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==" }, "from": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz", - "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=" + "integrity": "sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==" }, "from2": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", - "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", + "integrity": "sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==", "dev": true, "requires": { "inherits": "^2.0.1", @@ -31279,7 +31279,7 @@ "fs-write-stream-atomic": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz", - "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=", + "integrity": "sha512-gehEzmPn2nAwr39eay+x3X34Ra+M2QlVUTLhkXPjWdeO8RF9kszk116avgBJM3ZyNHgHXBNx+VmPaFC36k0PzA==", "dev": true, "requires": { "graceful-fs": "^4.1.2", @@ -31291,7 +31291,7 @@ "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, "fsevents": { "version": "1.2.13", @@ -31437,7 +31437,7 @@ "functional-red-black-tree": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", + "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==", "dev": true }, "functions-have-names": { @@ -31543,7 +31543,7 @@ "get-value": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", - "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=" + "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==" }, "github-slugger": { "version": "1.4.0", @@ -31584,7 +31584,7 @@ "glob-to-regexp": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz", - "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=", + "integrity": "sha512-Iozmtbqv0noj0uDDqoL0zNq0VBEfK2YFoMAZoxJe4cwphvLR+JskfF30QhXHOR4m3KrE6NLRYw+U9MRXvifyig==", "dev": true }, "global": { @@ -31673,7 +31673,7 @@ "global-prefix": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", - "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", + "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==", "dev": true, "requires": { "expand-tilde": "^2.0.2", @@ -31766,7 +31766,7 @@ "graceful-readlink": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", - "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=", + "integrity": "sha512-8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w==", "dev": true }, "growly": { @@ -31830,7 +31830,7 @@ "has-ansi": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==", "dev": true, "requires": { "ansi-regex": "^2.0.0" @@ -31857,7 +31857,7 @@ "has-glob": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-glob/-/has-glob-1.0.0.tgz", - "integrity": "sha1-mqqe7b/7G6OZCnsAEPtnjuAIEgc=", + "integrity": "sha512-D+8A457fBShSEI3tFCj65PAbT++5sKiFtdCdOam0gnfBgw9D277OERk+HM9qYJXmdVLZ/znez10SqHN0BBQ50g==", "dev": true, "requires": { "is-glob": "^3.0.0" @@ -31866,7 +31866,7 @@ "is-glob": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==", "dev": true, "requires": { "is-extglob": "^2.1.0" @@ -31905,13 +31905,13 @@ "has-unicode": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", + "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", "dev": true }, "has-value": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", - "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", + "integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==", "requires": { "get-value": "^2.0.6", "has-values": "^1.0.0", @@ -31921,7 +31921,7 @@ "has-values": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", - "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", + "integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==", "requires": { "is-number": "^3.0.0", "kind-of": "^4.0.0" @@ -31930,7 +31930,7 @@ "kind-of": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", - "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", + "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==", "requires": { "is-buffer": "^1.1.5" } @@ -32114,7 +32114,7 @@ "history": { "version": "4.5.1", "resolved": "https://registry.npmjs.org/history/-/history-4.5.1.tgz", - "integrity": "sha1-RJNaUQIeO45n66wmejVnVzKrpWk=", + "integrity": "sha512-gfHeJeYeMzFtos61gdA1AloO0hGXPF2Yum+2FRdJvlylYQOz51OnT1zuwg9UYst1BRrONhcAh3Nmsg9iblgl6g==", "requires": { "invariant": "^2.2.1", "loose-envify": "^1.2.0", @@ -32136,7 +32136,7 @@ "hmac-drbg": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", - "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", + "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==", "requires": { "hash.js": "^1.0.3", "minimalistic-assert": "^1.0.0", @@ -32168,7 +32168,7 @@ "hpack.js": { "version": "2.1.6", "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz", - "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=", + "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==", "dev": true, "requires": { "inherits": "^2.0.1", @@ -32331,7 +32331,7 @@ "http-deceiver": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz", - "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=", + "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==", "dev": true }, "http-errors": { @@ -32389,7 +32389,7 @@ "https-browserify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", - "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=" + "integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==" }, "https-proxy-agent": { "version": "5.0.1", @@ -32444,7 +32444,7 @@ "iferr": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz", - "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=", + "integrity": "sha512-DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA==", "dev": true }, "ignore": { @@ -32461,12 +32461,12 @@ "immediate": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", - "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=" + "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==" }, "import-fresh": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz", - "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=", + "integrity": "sha512-eZ5H8rcgYazHbKC3PG4ClHNykCSxtAhxSSEM+2mb+7evD2CKF5V7c0dNum7AdpDh0ZdICwZY9sRSn8f+KH96sg==", "requires": { "caller-path": "^2.0.0", "resolve-from": "^3.0.0" @@ -32475,7 +32475,7 @@ "import-lazy": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", - "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=", + "integrity": "sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A==", "dev": true }, "import-local": { @@ -32491,7 +32491,7 @@ "imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==" }, "indent-string": { "version": "3.2.0", @@ -32508,7 +32508,7 @@ "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "requires": { "once": "^1.3.0", "wrappy": "1" @@ -32646,7 +32646,7 @@ "invert-kv": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=" + "integrity": "sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==" }, "ip": { "version": "1.1.5", @@ -32656,7 +32656,7 @@ "ip-regex": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz", - "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=", + "integrity": "sha512-58yWmlHpp7VYfcdTwMTvwMmqx/Elfxjd9RXTDyMsbL7lLWmhMylLEqiYVLKuLzOZqVgiWXD9MfR62Vv89VRxkw==", "dev": true }, "ipaddr.js": { @@ -32674,7 +32674,7 @@ "is-accessor-descriptor": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==", "requires": { "kind-of": "^3.0.2" }, @@ -32682,7 +32682,7 @@ "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", "requires": { "is-buffer": "^1.1.5" } @@ -32772,7 +32772,7 @@ "is-data-descriptor": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==", "requires": { "kind-of": "^3.0.2" }, @@ -32780,7 +32780,7 @@ "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", "requires": { "is-buffer": "^1.1.5" } @@ -32818,7 +32818,7 @@ "is-directory": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz", - "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=" + "integrity": "sha512-yVChGzahRFvbkscn2MlwGismPO12i9+znNruC5gVEntG3qu0xQMzsGg/JFbrsqDOHtHFPci+V5aP5T9I+yeKqw==" }, "is-docker": { "version": "2.1.1", @@ -32839,12 +32839,12 @@ "is-extendable": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=" + "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==" }, "is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==" }, "is-finite": { "version": "1.1.0", @@ -33018,7 +33018,7 @@ "is-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" + "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==" }, "is-string": { "version": "1.0.5", @@ -33036,7 +33036,7 @@ "is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", + "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==", "dev": true }, "is-unicode-supported": { @@ -33047,7 +33047,7 @@ "is-utf8": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", - "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=" + "integrity": "sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==" }, "is-weakref": { "version": "1.0.1", @@ -33066,7 +33066,7 @@ "is-window": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-window/-/is-window-1.0.2.tgz", - "integrity": "sha1-LIlspT25feRdPDMTOmXYyfVjSA0=", + "integrity": "sha512-uj00kdXyZb9t9RcAUAwMZAnkBUwdYGhYlt7djMXhfyhUCzwNba50tIiBKR7q0l7tdoBtFVw/3JmLY6fI3rmZmg==", "dev": true }, "is-windows": { @@ -33083,7 +33083,7 @@ "is-wsl": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", - "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=" + "integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==" }, "is-yarn-global": { "version": "0.3.0", @@ -33094,7 +33094,7 @@ "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==" }, "isbinaryfile": { "version": "4.0.10", @@ -33105,12 +33105,12 @@ "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" }, "isobject": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==" }, "isomorphic-unfetch": { "version": "3.1.0", @@ -34617,7 +34617,7 @@ "js-string-escape": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/js-string-escape/-/js-string-escape-1.0.1.tgz", - "integrity": "sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8=", + "integrity": "sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg==", "dev": true }, "js-tokens": { @@ -35186,7 +35186,7 @@ "json-buffer": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", - "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=", + "integrity": "sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==", "dev": true }, "json-loader": { @@ -35242,7 +35242,7 @@ "json-stable-stringify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", - "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", + "integrity": "sha512-i/J297TW6xyj7sDFa7AmBPkQvLIxWr2kKPWI26tXydnZrzVAocNqn5DMNT1Mzk0vit1V5UkRM7C1KdVNp7Lmcg==", "requires": { "jsonify": "~0.0.0" } @@ -35250,13 +35250,13 @@ "json-stable-stringify-without-jsonify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", "dev": true }, "json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", + "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==", "dev": true, "optional": true }, @@ -35281,7 +35281,7 @@ "jsonify": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", - "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=" + "integrity": "sha512-trvBk1ki43VZptdBI5rIlG4YOzyeH/WefQt5rj1grasPn4iiZWKet8nkgc4GlsAylaztn0qZfUYOiTsASJFdNA==" }, "jsx-ast-utils": { "version": "3.1.0", @@ -35322,7 +35322,7 @@ "klaw": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz", - "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=", + "integrity": "sha512-TED5xi9gGQjGpNnvRWknrwAB1eL5GciPfVFOt3Vk1OJCVDQbzuSfrF3hkUQKlsgKrG1F+0t5W0m+Fje1jIt8rw==", "requires": { "graceful-fs": "^4.1.9" } @@ -35350,7 +35350,7 @@ "lazy-cache": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", - "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=" + "integrity": "sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ==" }, "lazy-universal-dotenv": { "version": "3.0.1", @@ -35382,7 +35382,7 @@ "lcid": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", - "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "integrity": "sha512-YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw==", "requires": { "invert-kv": "^1.0.0" } @@ -35405,7 +35405,7 @@ "lie": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz", - "integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=", + "integrity": "sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==", "requires": { "immediate": "~3.0.5" } @@ -35419,7 +35419,7 @@ "load-json-file": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "integrity": "sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==", "requires": { "graceful-fs": "^4.1.2", "parse-json": "^2.2.0", @@ -35431,7 +35431,7 @@ "parse-json": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==", "requires": { "error-ex": "^1.2.0" } @@ -35439,7 +35439,7 @@ "pify": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==" } } }, @@ -35482,17 +35482,17 @@ "lodash.assign": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", - "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=" + "integrity": "sha512-hFuH8TY+Yji7Eja3mGiuAxBqLagejScbG8GbG0j6o9vzn0YL14My+ktnqtZgFTosKymC9/44wP6s7xyuLfnClw==" }, "lodash.debounce": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=" + "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==" }, "lodash.isequal": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", - "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=" + "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==" }, "lodash.throttle": { "version": "4.1.1", @@ -35502,7 +35502,7 @@ "lodash.uniq": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", - "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=", + "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==", "dev": true }, "log-symbols": { @@ -35533,7 +35533,7 @@ "longest": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", - "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=" + "integrity": "sha512-k+yt5n3l48JU4k8ftnKG6V7u32wyH2NfKzeMto9F/QRE0amxy/LayxwlvjjkZEIzqR+19IrtFO8p5kB9QaYUFg==" }, "loose-envify": { "version": "1.4.0", @@ -35624,7 +35624,7 @@ "map-cache": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", - "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=" + "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==" }, "map-obj": { "version": "1.0.1", @@ -35636,18 +35636,18 @@ "map-or-similar": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/map-or-similar/-/map-or-similar-1.5.0.tgz", - "integrity": "sha1-beJlMXSt+12e3DPGnT6Sobdvrwg=", + "integrity": "sha512-0aF7ZmVon1igznGI4VS30yugpduQW3y3GkcgGJOp7d8x8QrizhigUxjI/m2UojsXXto+jLAH3KSz+xOJTiORjg==", "dev": true }, "map-stream": { "version": "0.0.7", "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz", - "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=" + "integrity": "sha512-C0X0KQmGm3N2ftbTGBhSyuydQ+vV1LC3f3zPvT3RXHXNZrvfPZcoXp/N5DOa8vedX/rTMm2CjTtivFg2STJMRQ==" }, "map-visit": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", - "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", + "integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==", "requires": { "object-visit": "^1.0.0" } @@ -35736,13 +35736,13 @@ "mdurl": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", - "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=", + "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==", "dev": true }, "media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", + "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", "dev": true }, "memfs": { @@ -35762,7 +35762,7 @@ "memoizerific": { "version": "1.11.3", "resolved": "https://registry.npmjs.org/memoizerific/-/memoizerific-1.11.3.tgz", - "integrity": "sha1-fIekZGREwy11Q4VwkF8tvRsagFo=", + "integrity": "sha512-/EuHYwAPdLtXwAwSZkh/Gutery6pD2KYd44oQLhAvQp/50mpyduZh8Q7PYHXTCJ+wuXxt7oij2LXyIJOOYFPog==", "dev": true, "requires": { "map-or-similar": "^1.5.0" @@ -35771,7 +35771,7 @@ "memory-fs": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", - "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", + "integrity": "sha512-cda4JKCxReDXFXRqOHPQscuIYg1PvxbE2S2GP45rnwfEK+vZaXC8C1OFvdHIbgw0DLzowXGVoxLaAmlgRy14GQ==", "requires": { "errno": "^0.1.3", "readable-stream": "^2.0.1" @@ -35855,7 +35855,7 @@ "clone-deep": { "version": "0.2.4", "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.2.4.tgz", - "integrity": "sha1-TnPdCen7lxzDhnDF3O2cGJZIHMY=", + "integrity": "sha512-we+NuQo2DHhSl+DP6jlUiAhyAjBQrYnpOk15rN6c6JSPScjiCLh8IbSU+VTcph6YS3o7mASE8a0+gbZ7ChLpgg==", "dev": true, "requires": { "for-own": "^0.1.3", @@ -35868,7 +35868,7 @@ "for-own": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", - "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", + "integrity": "sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw==", "dev": true, "requires": { "for-in": "^1.0.1" @@ -35877,7 +35877,7 @@ "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", "dev": true, "requires": { "is-buffer": "^1.1.5" @@ -35886,7 +35886,7 @@ "shallow-clone": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz", - "integrity": "sha1-WQnodLp3EG1zrEFM/sH/yofZcGA=", + "integrity": "sha512-J1zdXCky5GmNnuauESROVu31MQSnLoYvlyEn6j2Ztk6Q5EHFIhxkMhYcv6vuDzl2XEzoRr856QwzMgWM/TmZgw==", "dev": true, "requires": { "is-extendable": "^0.1.1", @@ -35898,7 +35898,7 @@ "kind-of": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz", - "integrity": "sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=", + "integrity": "sha512-0u8i1NZ/mg0b+W3MGGw5I7+6Eib2nx72S/QvXa0hYjEkjTknYmEYQJwGu3mLC0BrhtJjtQafTkyRUQ75Kx0LVg==", "dev": true, "requires": { "is-buffer": "^1.0.2" @@ -35907,7 +35907,7 @@ "lazy-cache": { "version": "0.2.7", "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz", - "integrity": "sha1-f+3fLctu23fRHvHRF6tf/fCrG2U=", + "integrity": "sha512-gkX52wvU/R8DVMMt78ATVPFMJqfW8FPz1GZ1sVHBVQHmu/WvhIWE4cE1GBzhJNFicDeYhnwp6Rl35BcAIM3YOQ==", "dev": true } } @@ -35917,7 +35917,7 @@ "merge-descriptors": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", + "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==", "dev": true }, "merge-options": { @@ -35947,7 +35947,7 @@ "methods": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", + "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", "dev": true }, "metro": { @@ -38942,7 +38942,7 @@ "min-document": { "version": "2.19.0", "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz", - "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=", + "integrity": "sha512-9Wy1B3m3f66bPPmU5hdA4DR4PB2OfDU/+GS3yAB7IQozE3tqXaVv2zOjgla7MEGSRv95+ILmOuvhLkOK6wJtCQ==", "dev": true, "requires": { "dom-walk": "^0.1.0" @@ -38957,7 +38957,7 @@ "mingo": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/mingo/-/mingo-1.3.3.tgz", - "integrity": "sha1-aSLE0Ufvx3GgFCWixMj3eER4xUY=" + "integrity": "sha512-Y4wGTD/M7AMqF8QxKaBGps+axq/Z48hdtRAeiKtInkEXMLzUWUwT0OPDzrB26xrav9GF1AOYJfwVWPcLwnkgTA==" }, "minimalistic-assert": { "version": "1.0.1", @@ -38967,7 +38967,7 @@ "minimalistic-crypto-utils": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", - "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=" + "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==" }, "minimatch": { "version": "3.0.4", @@ -39084,7 +39084,7 @@ "mixin-object": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz", - "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=", + "integrity": "sha512-ALGF1Jt9ouehcaXaHhn6t1yGWRqGaHkPFndtFVHfZXOvkIZ/yoGaSi0AHVTafb3ZBGg4dr/bDwnaEKqCXzchMA==", "requires": { "for-in": "^0.1.3", "is-extendable": "^0.1.1" @@ -39093,7 +39093,7 @@ "for-in": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz", - "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=" + "integrity": "sha512-F0to7vbBSHP8E3l6dCjxNOLuSFAACIxFy3UehTUlG7svlXi37HHsDkyVcHo0Pq8QwrE+pXvWSVX3ZT1T9wAZ9g==" } } }, @@ -39127,7 +39127,7 @@ "move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", - "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=", + "integrity": "sha512-hdrFxZOycD/g6A6SoI2bB5NA/5NEqD0569+S47WZhPvm46sD50ZHdYaFmnua5lndde9rCHGjmfK7Z8BuCt/PcQ==", "dev": true, "requires": { "aproba": "^1.1.1", @@ -39156,7 +39156,7 @@ "multicast-dns-service-types": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz", - "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=", + "integrity": "sha512-cnAsSVxIDsYt0v7HmC0hWZFwwXSh+E6PgCrREDuN/EsjgLwA5XRmlMHhSiDPrt6HxY1gTivEa/Zh7GtODoLevQ==", "dev": true }, "mute-stream": { @@ -39197,7 +39197,7 @@ "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, "negotiator": { @@ -39246,7 +39246,7 @@ "node-dir": { "version": "0.1.17", "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz", - "integrity": "sha1-X1Zl2TNRM1yqvvjxxVRRbPXx5OU=", + "integrity": "sha512-tmPX422rYgofd4epzrNoOXiE8XFZYOcCq1vD7MAXCDO+O+zndlA2ztdKKMa+EeuBG5tHETpr4ml4RGgpqDCCAg==", "requires": { "minimatch": "^3.0.2" } @@ -39265,7 +39265,7 @@ "node-int64": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", - "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=" + "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==" }, "node-libs-browser": { "version": "2.2.1", @@ -39305,7 +39305,7 @@ "punycode": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==" } } }, @@ -39399,7 +39399,7 @@ "normalize-range": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", - "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=", + "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==", "dev": true }, "normalize-url": { @@ -39431,7 +39431,7 @@ "npm-run-path": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", - "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", + "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==", "requires": { "path-key": "^2.0.0" } @@ -39464,13 +39464,13 @@ "num2fraction": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", - "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=", + "integrity": "sha512-Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg==", "dev": true }, "number-is-nan": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" + "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==" }, "nwsapi": { "version": "2.2.1", @@ -39486,12 +39486,12 @@ "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" }, "object-copy": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", - "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", + "integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==", "requires": { "copy-descriptor": "^0.1.0", "define-property": "^0.2.5", @@ -39501,7 +39501,7 @@ "define-property": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==", "requires": { "is-descriptor": "^0.1.0" } @@ -39509,7 +39509,7 @@ "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", "requires": { "is-buffer": "^1.1.5" } @@ -39545,7 +39545,7 @@ "object-visit": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", - "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", + "integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==", "requires": { "isobject": "^3.0.0" } @@ -39660,7 +39660,7 @@ "object.pick": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", - "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", + "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==", "requires": { "isobject": "^3.0.1" } @@ -39713,7 +39713,7 @@ "on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", + "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==", "requires": { "ee-first": "1.1.1" } @@ -39726,7 +39726,7 @@ "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", "requires": { "wrappy": "1" } @@ -39842,7 +39842,7 @@ "os-browserify": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", - "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=" + "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==" }, "os-homedir": { "version": "1.0.2", @@ -39854,7 +39854,7 @@ "os-locale": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", - "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", + "integrity": "sha512-PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g==", "requires": { "lcid": "^1.0.0" } @@ -39862,7 +39862,7 @@ "os-tmpdir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" + "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==" }, "p-all": { "version": "2.1.0", @@ -39906,7 +39906,7 @@ "p-finally": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", - "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" + "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==" }, "p-limit": { "version": "2.3.0", @@ -40045,7 +40045,7 @@ "parse-json": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", + "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==", "requires": { "error-ex": "^1.3.1", "json-parse-better-errors": "^1.0.1" @@ -40054,7 +40054,7 @@ "parse-passwd": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", - "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=", + "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==", "dev": true }, "parse5": { @@ -40081,7 +40081,7 @@ "pascalcase": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", - "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=" + "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==" }, "path-browserify": { "version": "0.0.1", @@ -40091,7 +40091,7 @@ "path-dirname": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", - "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=" + "integrity": "sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==" }, "path-exists": { "version": "4.0.0", @@ -40101,18 +40101,18 @@ "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==" }, "path-is-inside": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", - "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", + "integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==", "dev": true }, "path-key": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=" + "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==" }, "path-parse": { "version": "1.0.7", @@ -40122,7 +40122,7 @@ "path-type": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "integrity": "sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==", "requires": { "graceful-fs": "^4.1.2", "pify": "^2.0.0", @@ -40132,14 +40132,14 @@ "pify": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==" } } }, "pause-stream": { "version": "0.0.11", "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", - "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=", + "integrity": "sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==", "requires": { "through": "~2.3" } @@ -40190,12 +40190,12 @@ "pinkie": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=" + "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==" }, "pinkie-promise": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==", "requires": { "pinkie": "^2.0.0" } @@ -40245,7 +40245,7 @@ "path-exists": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==" } } }, @@ -40289,7 +40289,7 @@ "path-exists": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", "dev": true } } @@ -40345,7 +40345,7 @@ "posix-character-classes": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", - "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" + "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==" }, "postcss": { "version": "7.0.39", @@ -40512,7 +40512,7 @@ "prepend-http": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", - "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", + "integrity": "sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==", "dev": true }, "prettier": { @@ -40607,7 +40607,7 @@ "pretty-hrtime": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", - "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=", + "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==", "dev": true }, "prismjs": { @@ -40619,7 +40619,7 @@ "process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=" + "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==" }, "process-nextick-args": { "version": "2.0.1", @@ -40643,7 +40643,7 @@ "promise-inflight": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=", + "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==", "dev": true }, "promise.allsettled": { @@ -41125,7 +41125,7 @@ "prr": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", - "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=" + "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==" }, "psl": { "version": "1.9.0", @@ -41216,7 +41216,7 @@ "q": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", - "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=", + "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==", "dev": true }, "qs": { @@ -41239,12 +41239,12 @@ "querystring": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=" + "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==" }, "querystring-es3": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", - "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=" + "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==" }, "querystringify": { "version": "2.2.0", @@ -42120,9 +42120,9 @@ } }, "react-native-onyx": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.12.tgz", - "integrity": "sha512-hSjJvZ7tz827xhUJcAV4FtUUm+BqKM4Pbp4HD0Y+GBSexFCsf9DgmjI6rEEkonruqksz88hYs1ptxO31G5Ub6Q==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.13.tgz", + "integrity": "sha512-ZQvj/1FgTibrWtmQ6EGl5Naiq/R9ZDyeEiTRrS9MBjOkTzntFGqyXHtyt9uQOxwSF9ZGlN9cCfS26F/mwys1Eg==", "requires": { "ascii-table": "0.0.9", "lodash": "^4.17.21", @@ -42541,7 +42541,7 @@ "react-web-config": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/react-web-config/-/react-web-config-1.0.0.tgz", - "integrity": "sha1-U7jMEuHJL+JopJ3yYchyK4tRC2M=", + "integrity": "sha512-WOB3fKtPLhzhu4iGIZgdTX7CBtfrK3arcz+aHNSVHKC34Fw9YhR41ojNTN52xyuFHWVkxK/1SQToNDoMm38pvg==", "requires": { "dotenv": "^4.0.0", "webpack": "^2.3.3" @@ -42579,7 +42579,7 @@ "cliui": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", - "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", + "integrity": "sha512-GIOYRizG+TGoc7Wgc1LiOTLare95R3mzKgoln+Q/lE4ceiYH19gUpl0l0Ffq4lJDEf3FxujMe6IBfOCs7pfqNA==", "requires": { "center-align": "^0.1.1", "right-align": "^0.1.1", @@ -42589,12 +42589,12 @@ "dotenv": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-4.0.0.tgz", - "integrity": "sha1-hk7xN5rO1Vzm+V3r7NzhefegzR0=" + "integrity": "sha512-XcaMACOr3JMVcEv0Y/iUM2XaOsATRZ3U1In41/1jjK6vJZ2PZbQ1bzCG8uvaByfaBpl9gqc9QWJovpUGBXLLYQ==" }, "emojis-list": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz", - "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=" + "integrity": "sha512-knHEZMgs8BB+MInokmNTg/OyPlAddghe1YBgNwJBc5zsJi/uyIcXoSDsL/W9ymOsBoBGdPIHXYJ9+qKFwRwDng==" }, "get-caller-file": { "version": "1.0.3", @@ -42604,12 +42604,12 @@ "has-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" + "integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==" }, "is-fullwidth-code-point": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==", "requires": { "number-is-nan": "^1.0.0" } @@ -42617,12 +42617,12 @@ "json5": { "version": "0.5.1", "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=" + "integrity": "sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==" }, "loader-utils": { "version": "0.2.17", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", - "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", + "integrity": "sha512-tiv66G0SmiOx+pLWMtGEkfSEejxvb6N6uRrQjfWJIT79W9GMpgKeCAmm9aVBKtd4WEgntciI8CsGqjpDoCWJug==", "requires": { "big.js": "^3.1.3", "emojis-list": "^2.0.0", @@ -42633,12 +42633,12 @@ "require-main-filename": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" + "integrity": "sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==" }, "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==", "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -42648,7 +42648,7 @@ "strip-ansi": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", "requires": { "ansi-regex": "^2.0.0" } @@ -42656,7 +42656,7 @@ "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "integrity": "sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==", "requires": { "has-flag": "^1.0.0" } @@ -42664,7 +42664,7 @@ "uglify-js": { "version": "2.8.29", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", - "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", + "integrity": "sha512-qLq/4y2pjcU3vhlhseXGGJ7VbFO4pBANu0kwl8VCa9KEI0V8VfZIx2Fy3w01iSTA/pGwKZSmu/+I4etLNDdt5w==", "requires": { "source-map": "~0.5.1", "uglify-to-browserify": "~1.0.0", @@ -42674,7 +42674,7 @@ "yargs": { "version": "3.10.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", - "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", + "integrity": "sha512-QFzUah88GAGy9lyDKGBqZdkYApt63rCXYBGYnEP4xDJPXNqXXnBDACnbrXnViV6jRSqAePwrATi2i8mfYm4L1A==", "requires": { "camelcase": "^1.0.2", "cliui": "^2.1.0", @@ -42715,7 +42715,7 @@ "which-module": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", - "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=" + "integrity": "sha512-F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ==" }, "wordwrap": { "version": "0.0.2", @@ -42725,7 +42725,7 @@ "wrap-ansi": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "integrity": "sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==", "requires": { "string-width": "^1.0.1", "strip-ansi": "^3.0.1" @@ -42739,7 +42739,7 @@ "yargs": { "version": "6.6.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz", - "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=", + "integrity": "sha512-6/QWTdisjnu5UHUzQGst+UOEuEVwIzFVGBjq3jMTFNs5WJQsH/X6nMURSaScIdF5txylr1Ao9bvbWiKi2yXbwA==", "requires": { "camelcase": "^3.0.0", "cliui": "^3.2.0", @@ -42764,7 +42764,7 @@ "cliui": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "integrity": "sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w==", "requires": { "string-width": "^1.0.1", "strip-ansi": "^3.0.1", @@ -42776,7 +42776,7 @@ "yargs-parser": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz", - "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=", + "integrity": "sha512-+QQWqC2xeL0N5/TE+TY6OGEqyNRM+g2/r712PDNYgiCdXYCApXf1vzfmDSLBxfGRwV+moTq/V8FnMI24JCm2Yg==", "requires": { "camelcase": "^3.0.0" }, @@ -42835,7 +42835,7 @@ "read-pkg": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==", "requires": { "load-json-file": "^1.0.0", "normalize-package-data": "^2.3.2", @@ -42845,7 +42845,7 @@ "read-pkg-up": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==", "requires": { "find-up": "^1.0.0", "read-pkg": "^1.0.0" @@ -42854,7 +42854,7 @@ "find-up": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==", "requires": { "path-exists": "^2.0.0", "pinkie-promise": "^2.0.0" @@ -42863,7 +42863,7 @@ "path-exists": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==", "requires": { "pinkie-promise": "^2.0.0" } @@ -43084,7 +43084,7 @@ "relateurl": { "version": "0.2.7", "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", - "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=", + "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==", "dev": true }, "remark-external-links": { @@ -43404,7 +43404,7 @@ "remove-trailing-separator": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=" + "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==" }, "renderkid": { "version": "2.0.4", @@ -43484,7 +43484,7 @@ "repeat-string": { "version": "1.6.1", "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" + "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==" }, "repeating": { "version": "2.0.1", @@ -43499,7 +43499,7 @@ "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==" }, "require-from-string": { "version": "2.0.2", @@ -43521,7 +43521,7 @@ "requires-port": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", - "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", + "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", "dev": true }, "reselect": { @@ -43550,7 +43550,7 @@ "resolve-dir": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", - "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", + "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==", "dev": true, "requires": { "expand-tilde": "^2.0.0", @@ -43583,12 +43583,12 @@ "resolve-url": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", - "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=" + "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==" }, "responselike": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", - "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", + "integrity": "sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==", "dev": true, "requires": { "lowercase-keys": "^1.0.0" @@ -43611,7 +43611,7 @@ "retry": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=", + "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", "dev": true }, "reusify": { @@ -43623,7 +43623,7 @@ "right-align": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", - "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", + "integrity": "sha512-yqINtL/G7vs2v+dFIZmFUDbnVyFUJFKd6gK22Kgo6R4jfJGFtisKyncWDDULgjfqf4ASQuIQyjJ7XZ+3aWpsAg==", "requires": { "align-text": "^0.1.1" } @@ -43696,7 +43696,7 @@ "run-queue": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", - "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", + "integrity": "sha512-ntymy489o0/QQplUDnpYAYUsO50K9SBrIVaKCWDOJzYJts0f9WH9RFJkyagebkw5+y1oi00R7ynNW/d12GBumg==", "dev": true, "requires": { "aproba": "^1.1.1" @@ -43719,7 +43719,7 @@ "safe-regex": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", - "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", + "integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==", "requires": { "ret": "~0.1.10" } @@ -43808,7 +43808,7 @@ "select-hose": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", - "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=", + "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==", "dev": true }, "selfsigned": { @@ -43929,7 +43929,7 @@ "serve-favicon": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.5.0.tgz", - "integrity": "sha1-k10kDN/g9YBTB/3+ln2IlCosvPA=", + "integrity": "sha512-FMW2RvqNr03x+C0WxTyu6sOv21oOjkq5j8tjquWccwa6ScNyGFOGJVpuS1NmTVGBAHS07xnSKotgf2ehQmf9iA==", "dev": true, "requires": { "etag": "~1.8.1", @@ -43956,7 +43956,7 @@ "serve-index": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz", - "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", + "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==", "dev": true, "requires": { "accepts": "~1.3.4", @@ -43980,7 +43980,7 @@ "http-errors": { "version": "1.6.3", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", - "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", + "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==", "dev": true, "requires": { "depd": "~1.1.2", @@ -43992,13 +43992,13 @@ "inherits": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==", "dev": true }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "dev": true }, "setprototypeof": { @@ -44023,7 +44023,7 @@ "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==" }, "set-value": { "version": "2.0.1", @@ -44039,7 +44039,7 @@ "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", "requires": { "is-extendable": "^0.1.0" } @@ -44049,7 +44049,7 @@ "setimmediate": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" + "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==" }, "setprototypeof": { "version": "1.1.1", @@ -44091,7 +44091,7 @@ "shebang-command": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==", "requires": { "shebang-regex": "^1.0.0" } @@ -44099,7 +44099,7 @@ "shebang-regex": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=" + "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==" }, "shell-quote": { "version": "1.7.3", @@ -44136,7 +44136,7 @@ "simple-swizzle": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", - "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=", + "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==", "requires": { "is-arrayish": "^0.3.1" }, @@ -44252,7 +44252,7 @@ "define-property": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==", "requires": { "is-descriptor": "^0.1.0" } @@ -44260,7 +44260,7 @@ "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", "requires": { "is-extendable": "^0.1.0" } @@ -44268,7 +44268,7 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" } } }, @@ -44285,7 +44285,7 @@ "define-property": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==", "requires": { "is-descriptor": "^1.0.0" } @@ -44329,7 +44329,7 @@ "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", "requires": { "is-buffer": "^1.1.5" } @@ -44427,7 +44427,7 @@ "source-map": { "version": "0.5.6", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", - "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=" + "integrity": "sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA==" }, "source-map-resolve": { "version": "0.5.3", @@ -44471,7 +44471,7 @@ "spawn-command": { "version": "0.0.2-1", "resolved": "https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2-1.tgz", - "integrity": "sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A=", + "integrity": "sha512-n98l9E2RMSJ9ON1AKisHzz7V42VDiBQGY6PB1BwRglz99wpVsSuGzQ+jOi6lFXBGVTCrRpltvjm+/XA+tpeJrg==", "dev": true }, "spdx-correct": { @@ -44566,7 +44566,7 @@ "sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==" }, "ssri": { "version": "8.0.1", @@ -44655,7 +44655,7 @@ "static-extend": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", - "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", + "integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==", "requires": { "define-property": "^0.2.5", "object-copy": "^0.1.0" @@ -44664,7 +44664,7 @@ "define-property": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==", "requires": { "is-descriptor": "^0.1.0" } @@ -44674,7 +44674,7 @@ "statuses": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" + "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==" }, "store2": { "version": "2.13.1", @@ -44694,7 +44694,7 @@ "stream-combiner": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz", - "integrity": "sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=", + "integrity": "sha512-6yHMqgLYDzQDcAkL+tjJDC5nSNuNIx0vZtRZeiPh7Saef7VHX9H5Ijn9l2VIol2zaNYlYEX6KyuT/237A58qEQ==", "requires": { "duplexer": "~0.1.1", "through": "~2.3.4" @@ -44731,7 +44731,7 @@ "strict-uri-encode": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz", - "integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY=" + "integrity": "sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==" }, "string-hash-64": { "version": "1.0.3", @@ -45505,7 +45505,7 @@ "strip-bom": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "integrity": "sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==", "requires": { "is-utf8": "^0.2.0" } @@ -45513,7 +45513,7 @@ "strip-eof": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", - "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=" + "integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==" }, "strip-final-newline": { "version": "2.0.0", @@ -45530,7 +45530,7 @@ "strip-json-comments": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", "dev": true }, "style-loader": { @@ -46271,7 +46271,7 @@ "text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", "dev": true }, "throat": { @@ -46288,7 +46288,7 @@ "through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==" }, "through2": { "version": "2.0.5", @@ -46308,7 +46308,7 @@ "time-zone": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/time-zone/-/time-zone-1.0.0.tgz", - "integrity": "sha1-mcW/VZWJZq9tBtg73zgA3IL67F0=", + "integrity": "sha512-TIsDdtKo6+XrPtiTm1ssmMngN1sAhyKnTO2kunQWqNPWIVvCm15Wmw4SWInwTVgJ5u/Tr04+8Ei9TNcw4x4ONA==", "dev": true }, "timers-browserify": { @@ -46370,17 +46370,17 @@ "to-arraybuffer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", - "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=" + "integrity": "sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA==" }, "to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=" + "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==" }, "to-object-path": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", - "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", + "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==", "requires": { "kind-of": "^3.0.2" }, @@ -46388,7 +46388,7 @@ "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", "requires": { "is-buffer": "^1.1.5" } @@ -46469,7 +46469,7 @@ "trim": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz", - "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0=", + "integrity": "sha512-YzQV+TZg4AxpKxaTHK3c3D+kRDCGVEE7LemdlQZoQXn0iennk10RsIoY6ikzAqJTc9Xjl9C1/waHom/J86ziAQ==", "dev": true }, "trim-newlines": { @@ -46494,7 +46494,7 @@ "truncate-utf8-bytes": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz", - "integrity": "sha1-QFkjkJWS1W94pYGENLC3hInKXys=", + "integrity": "sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ==", "dev": true, "requires": { "utf8-byte-length": "^1.0.1" @@ -46547,7 +46547,7 @@ "strip-bom": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", "dev": true } } @@ -46569,7 +46569,7 @@ "tty-browserify": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", - "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=" + "integrity": "sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==" }, "tunnel": { "version": "0.0.6", @@ -46615,7 +46615,7 @@ "typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", + "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==", "dev": true }, "typedarray-to-buffer": { @@ -46651,7 +46651,7 @@ "uglify-to-browserify": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", - "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", + "integrity": "sha512-vb2s1lYx2xBtUgy+ta+b2J/GLVUR+wmpINwHePmPRhOsIVCG2wDzKJ0n14GslH1BifsqVzSOwQhRaCAsZ/nI4Q==", "optional": true }, "unbox-primitive": { @@ -46870,18 +46870,18 @@ "unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" + "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==" }, "unquote": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz", - "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=", + "integrity": "sha512-vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg==", "dev": true }, "unset-value": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", - "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", + "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==", "requires": { "has-value": "^0.3.1", "isobject": "^3.0.0" @@ -46890,7 +46890,7 @@ "has-value": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", - "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", + "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==", "requires": { "get-value": "^2.0.3", "has-values": "^0.1.4", @@ -46900,7 +46900,7 @@ "isobject": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", + "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==", "requires": { "isarray": "1.0.0" } @@ -46910,7 +46910,7 @@ "has-values": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", - "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=" + "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==" } } }, @@ -46981,12 +46981,12 @@ "urix": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", - "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=" + "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==" }, "url": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", - "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", + "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==", "requires": { "punycode": "1.3.2", "querystring": "0.2.0" @@ -46995,7 +46995,7 @@ "punycode": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" + "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==" } } }, @@ -47023,7 +47023,7 @@ "url-parse-lax": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", - "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", + "integrity": "sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==", "dev": true, "requires": { "prepend-http": "^2.0.0" @@ -47042,7 +47042,7 @@ "utf8-byte-length": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz", - "integrity": "sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=", + "integrity": "sha512-4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA==", "dev": true }, "util": { @@ -47056,14 +47056,14 @@ "inherits": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==" } } }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" }, "util.promisify": { "version": "1.0.0", @@ -47078,13 +47078,13 @@ "utila": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz", - "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=", + "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==", "dev": true }, "utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" + "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==" }, "uuid": { "version": "3.4.0", @@ -47095,7 +47095,7 @@ "uuid-browser": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/uuid-browser/-/uuid-browser-3.1.0.tgz", - "integrity": "sha1-DwWkCu90+eWVHiDvv0SxGHHlZBA=", + "integrity": "sha512-dsNgbLaTrd6l3MMxTtouOCFw4CBFc/3a+GgYA2YyrJvyQ1u6q4pcu3ktLoUZ/VN/Aw9WsauazbgsgdfVWgAKQg==", "dev": true }, "v8-compile-cache": { @@ -47135,12 +47135,12 @@ "value-equal": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-0.2.1.tgz", - "integrity": "sha1-wiCjBDYfzmmU277ao8fhobiVhx0=" + "integrity": "sha512-yRL36Xb2K/HmFT5Fe3M86S7mu4+a12/3l7uytUh6eNPPjP77ldPBvsAvmnWff39sXn55naRMZN8LZWRO8PWaeQ==" }, "vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" + "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==" }, "verror": { "version": "1.10.0", @@ -47793,7 +47793,7 @@ "is-fullwidth-code-point": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==", "dev": true }, "json5": { @@ -47848,7 +47848,7 @@ "path-exists": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", "dev": true }, "string-width": { @@ -48491,7 +48491,7 @@ "which-module": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" + "integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==" }, "wide-align": { "version": "1.1.5", @@ -48520,7 +48520,7 @@ "window-size": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", - "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=" + "integrity": "sha512-1pTPQDKTdd61ozlKGNCjhNRd+KPmgLSGa3mZTHoOliaGcESD8G1PXhh7c1fgiPjVbNVfgy2Faw4BI8/m0cC8Mg==" }, "word-wrap": { "version": "1.2.3", @@ -48574,7 +48574,7 @@ "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, "write": { "version": "1.0.3", diff --git a/package.json b/package.json index b9d82d593f07..a9506fa324c8 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "react-native-image-picker": "^4.7.3", "react-native-image-size": "git+https://github.com/Expensify/react-native-image-size#6b5ab5110dc3ed554f8eafbc38d7d87c17147972", "react-native-modal": "^13.0.0", - "react-native-onyx": "1.0.12", + "react-native-onyx": "1.0.13", "react-native-pdf": "^6.6.2", "react-native-performance": "^2.0.0", "react-native-permissions": "^3.0.1", From 57cc4a81b31921e1ea3ed6c723b1819ef9f36a76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Tue, 9 Aug 2022 15:15:53 -0500 Subject: [PATCH 68/77] move event listeners and tocbot.init to DOMContentLoaded event --- docs/assets/js/main.js | 66 ++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/docs/assets/js/main.js b/docs/assets/js/main.js index 59f618842193..c7418d2dc0a5 100644 --- a/docs/assets/js/main.js +++ b/docs/assets/js/main.js @@ -31,45 +31,47 @@ function navigateBack() { setTimeout(toggleHeaderMenu, 250); } -if (window.tocbot) { - window.tocbot.init({ +window.addEventListener('DOMContentLoaded', () => { + if (window.tocbot) { + window.tocbot.init({ // Where to render the table of contents. - tocSelector: '.article-toc', + tocSelector: '.article-toc', - // Where to grab the headings to build the table of contents. - contentSelector: '.article-toc-content', + // Where to grab the headings to build the table of contents. + contentSelector: '.article-toc-content', - // Disable the collapsible functionality of the library by - // setting the maximum number of heading levels (6) - collapseDepth: 6, + // Disable the collapsible functionality of the library by + // setting the maximum number of heading levels (6) + collapseDepth: 6, - // Main class to add to lists. - listClass: 'lhn-items', + // Main class to add to lists. + listClass: 'lhn-items', - // Main class to add to links. - linkClass: 'link', + // Main class to add to links. + linkClass: 'link', - // Class to add to active links, - // the link corresponding to the top most heading on the page. - activeLinkClass: 'selected-article', + // Class to add to active links, + // the link corresponding to the top most heading on the page. + activeLinkClass: 'selected-article', - // Headings offset between the headings and the top of the document (requires scrollSmooth enabled) - headingsOffset: 80, - scrollSmoothOffset: -80, - scrollSmooth: true, + // Headings offset between the headings and the top of the document (requires scrollSmooth enabled) + headingsOffset: 80, + scrollSmoothOffset: -80, + scrollSmooth: true, - // onclick function to apply to all links in toc. will be called with - // the event as the first parameter, and this can be used to stop, - // propagation, prevent default or perform action - onClick() { - toggleHeaderMenu(); - }, - }); -} + // onclick function to apply to all links in toc. will be called with + // the event as the first parameter, and this can be used to stop, + // propagation, prevent default or perform action + onClick() { + toggleHeaderMenu(); + }, + }); + } -document.getElementById('header-button').addEventListener('click', toggleHeaderMenu); + document.getElementById('header-button').addEventListener('click', toggleHeaderMenu); -const backButton = document.getElementById('back-button'); -if (backButton) { - backButton.addEventListener('click', navigateBack); -} + const backButton = document.getElementById('back-button'); + if (backButton) { + backButton.addEventListener('click', navigateBack); + } +}); From 1a0f9bcd4654207549d1e5c1779440b6e852261c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Tue, 9 Aug 2022 15:19:34 -0500 Subject: [PATCH 69/77] add comment to back button --- docs/assets/js/main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/assets/js/main.js b/docs/assets/js/main.js index c7418d2dc0a5..efa68a6b1e7f 100644 --- a/docs/assets/js/main.js +++ b/docs/assets/js/main.js @@ -70,6 +70,7 @@ window.addEventListener('DOMContentLoaded', () => { document.getElementById('header-button').addEventListener('click', toggleHeaderMenu); + // Back button doesn't exist on all the pages const backButton = document.getElementById('back-button'); if (backButton) { backButton.addEventListener('click', navigateBack); From ee1b25c0ad081f6a081fd5dc43f83c8d83c0c64c Mon Sep 17 00:00:00 2001 From: Marc Glasser Date: Tue, 9 Aug 2022 11:08:08 -1000 Subject: [PATCH 70/77] Remove more optimisticReportActionIDs logic. Fix tests --- src/libs/actions/Report.js | 38 +------------------------------------ tests/actions/ReportTest.js | 6 +++--- 2 files changed, 4 insertions(+), 40 deletions(-) diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js index 1afd43e199a4..4abdb48a9fd7 100644 --- a/src/libs/actions/Report.js +++ b/src/libs/actions/Report.js @@ -59,10 +59,6 @@ const allReports = {}; let conciergeChatReportID; const typingWatchTimers = {}; -// Map of optimistic report action IDs. These should be cleared when replaced by a recent fetch of report history -// since we will then be up to date and any optimistic actions that are still waiting to be replaced can be removed. -const optimisticReportActionIDs = {}; - /** * @param {Number} reportID * @param {Number} lastReadSequenceNumber @@ -852,19 +848,6 @@ function addActions(reportID, text = '', file) { lastReadSequenceNumber: newSequenceNumber, }; - // Store the optimistic action ID on the report the comment was added to. It will be removed later when refetching - // report actions in order to clear out any stuck actions (i.e. actions where the client never received a Pusher - // event, for whatever reason, from the server with the new action data - optimisticReport.optimisticReportActionIDs = [...(optimisticReportActionIDs[reportID] || [])]; - - if (text) { - optimisticReport.optimisticReportActionIDs.push(reportCommentAction.clientID); - } - - if (file) { - optimisticReport.optimisticReportActionIDs.push(attachmentAction.clientID); - } - // Optimistically add the new actions to the store before waiting to save them to the server const optimisticReportActions = {}; if (text) { @@ -907,24 +890,8 @@ function addActions(reportID, text = '', file) { DateUtils.setTimezoneUpdated(); } - const successData = []; - if (text) { - successData.push({ - onyxMethod: CONST.ONYX.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`, - value: {[reportCommentAction.clientID]: {pendingAction: null}}, - }); - } - if (file) { - successData.push({ - onyxMethod: CONST.ONYX.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`, - value: {[attachmentAction.clientID]: {pendingAction: null}}, - }); - } API.write(commandName, parameters, { optimisticData, - successData, }); } @@ -1221,9 +1188,6 @@ function handleReportChanged(report) { if (report.reportID && report.reportName === undefined) { fetchChatReportsByIDs([report.reportID]); } - - // Store optimistic actions IDs for each report - optimisticReportActionIDs[report.reportID] = report.optimisticReportActionIDs; } /** @@ -1464,7 +1428,7 @@ function viewNewReportAction(reportID, action) { if (isFromCurrentUser) { updatedReportObject.unreadActionCount = 0; updatedReportObject.lastVisitedTimestamp = Date.now(); - updatedReportObject.lastReadSequenceNumber = action.sequenceNumber; + updatedReportObject.lastReadSequenceNumber = action.pendingAction ? lastReadSequenceNumber : action.sequenceNumber; } else if (incomingSequenceNumber > lastReadSequenceNumber) { updatedReportObject.unreadActionCount = getUnreadActionCount(reportID) + 1; } diff --git a/tests/actions/ReportTest.js b/tests/actions/ReportTest.js index 3955959b2d1f..697dca649066 100644 --- a/tests/actions/ReportTest.js +++ b/tests/actions/ReportTest.js @@ -95,13 +95,13 @@ describe('actions/Report', () => { clientID = resultAction.sequenceNumber; expect(resultAction.message).toEqual(REPORT_ACTION.message); expect(resultAction.person).toEqual(REPORT_ACTION.person); - expect(resultAction.isLoading).toEqual(true); + expect(resultAction.pendingAction).toEqual(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD); // We subscribed to the Pusher channel above and now we need to simulate a reportComment action // Pusher event so we can verify that action was handled correctly and merged into the reportActions. const channel = Pusher.getChannel(`${CONST.PUSHER.PRIVATE_USER_CHANNEL_PREFIX}1${CONFIG.PUSHER.SUFFIX}`); const actionWithoutLoading = {...resultAction}; - delete actionWithoutLoading.isLoading; + delete actionWithoutLoading.pendingAction; channel.emit(Pusher.TYPE.ONYX_API_UPDATE, [ { onyxMethod: CONST.ONYX.METHOD.MERGE, @@ -137,7 +137,7 @@ describe('actions/Report', () => { const resultAction = reportActions[ACTION_ID]; // Verify that our action is no longer in the loading state - expect(resultAction.isLoading).not.toBeDefined(); + expect(resultAction.pendingAction).not.toBeDefined(); }); }); From 13e71e206433191e054f082564aaeae07494fcc1 Mon Sep 17 00:00:00 2001 From: Marc Glasser Date: Tue, 9 Aug 2022 11:10:44 -1000 Subject: [PATCH 71/77] only one action to take when tapping the x for now --- src/pages/home/report/ReportActionsList.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/pages/home/report/ReportActionsList.js b/src/pages/home/report/ReportActionsList.js index d8953ec0ee9b..3fa7d128f631 100644 --- a/src/pages/home/report/ReportActionsList.js +++ b/src/pages/home/report/ReportActionsList.js @@ -140,13 +140,7 @@ class ReportActionsList extends React.Component { && item.action.sequenceNumber === this.props.report.newMarkerSequenceNumber; return ( { - if (item.action.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) { - ReportActions.deleteClientAction(this.props.report.reportID, item.action.clientID); - } else if (item.action.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || item.action.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.EDIT) { - // Revert - } - }} + onClose={() => ReportActions.deleteClientAction(this.props.report.reportID, item.action.clientID)} pendingAction={item.action.pendingAction} errors={item.action.errors} errorStyle={styles.ml10} From 37cca7163345c0d55f0dd923a8659f36ae87cf77 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Tue, 9 Aug 2022 16:16:29 -0600 Subject: [PATCH 72/77] use compact --- src/libs/actions/App.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/actions/App.js b/src/libs/actions/App.js index 2f3f6906fe9a..cfd13a52387e 100644 --- a/src/libs/actions/App.js +++ b/src/libs/actions/App.js @@ -52,7 +52,7 @@ Onyx.connect({ key: ONYXKEYS.COLLECTION.POLICY, waitForCollectionCallback: true, callback: (policies) => { - policyIDList = _.filter(_.pluck(policies, 'id')); + policyIDList = _.compact(_.pluck(policies, 'id')); }, }); From 01565c927829cef51af417b8cca57a9e6c317b0c Mon Sep 17 00:00:00 2001 From: Marc Glasser Date: Tue, 9 Aug 2022 14:03:59 -1000 Subject: [PATCH 73/77] Make the error inside the hoverable area --- src/components/OfflineWithFeedback.js | 7 +++-- src/pages/home/report/ReportActionItem.js | 31 ++++++++++++++-------- src/pages/home/report/ReportActionsList.js | 27 +++++++------------ 3 files changed, 32 insertions(+), 33 deletions(-) diff --git a/src/components/OfflineWithFeedback.js b/src/components/OfflineWithFeedback.js index 926297f8a4e7..9c2c5db58aa8 100644 --- a/src/components/OfflineWithFeedback.js +++ b/src/components/OfflineWithFeedback.js @@ -45,8 +45,7 @@ const propTypes = { ]), /** Additional style object for the error row */ - // eslint-disable-next-line react/forbid-prop-types - errorStyle: PropTypes.object, + errorRowStyles: PropTypes.arrayOf(PropTypes.object), ...withLocalizePropTypes, }; @@ -55,7 +54,7 @@ const defaultProps = { pendingAction: null, errors: null, style: [], - errorStyle: {}, + errorRowStyles: [], }; /** @@ -103,7 +102,7 @@ const OfflineWithFeedback = (props) => { )} {hasErrors && ( - + diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js index 948cac72c2e2..9d5926987242 100644 --- a/src/pages/home/report/ReportActionItem.js +++ b/src/pages/home/report/ReportActionItem.js @@ -31,6 +31,8 @@ import styles from '../../../styles/styles'; import SelectionScraper from '../../../libs/SelectionScraper'; import * as User from '../../../libs/actions/User'; import * as ReportUtils from '../../../libs/ReportUtils'; +import OfflineWithFeedback from '../../../components/OfflineWithFeedback'; +import * as ReportActions from '../../../libs/actions/ReportActions'; const propTypes = { /** The ID of the report this action is on. */ @@ -185,17 +187,24 @@ class ReportActionItem extends Component { (this.props.network.isOffline && this.props.action.isLoading) || this.props.action.error, )} > - {!this.props.displayAsGroup - ? ( - - {children} - - ) - : ( - - {children} - - )} + ReportActions.deleteClientAction(this.props.report.reportID, this.props.action.clientID)} + pendingAction={this.props.action.pendingAction} + errors={this.props.action.errors} + errorRowStyles={[styles.ml10, styles.mr2]} + > + {!this.props.displayAsGroup + ? ( + + {children} + + ) + : ( + + {children} + + )} + 0 && item.action.sequenceNumber === this.props.report.newMarkerSequenceNumber; return ( - ReportActions.deleteClientAction(this.props.report.reportID, item.action.clientID)} - pendingAction={item.action.pendingAction} - errors={item.action.errors} - errorStyle={styles.ml10} - > - - + ); } From 80bd6dea8aec75a2d843f1fbb57469acdba703ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Metehan=20=C3=96zyurt?= Date: Wed, 10 Aug 2022 08:59:32 +0300 Subject: [PATCH 74/77] conflicts resolved --- .../SignInPageLayout/SignInPageContent.js | 24 +------------------ 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/src/pages/signin/SignInPageLayout/SignInPageContent.js b/src/pages/signin/SignInPageLayout/SignInPageContent.js index 81b08330fcf0..1bbfc1838ee7 100755 --- a/src/pages/signin/SignInPageLayout/SignInPageContent.js +++ b/src/pages/signin/SignInPageLayout/SignInPageContent.js @@ -46,33 +46,11 @@ const SignInPageContent = props => ( !props.isSmallScreenWidth && styles.ph6, ]} > -<<<<<<< HEAD - - >>>>>> f5f076a13bb4a991dbeaf32a8f7a7b0625e8a3cc > ( behavior="position" contentContainerStyle={[ props.isSmallScreenWidth ? styles.signInPageNarrowContentMargin : {}, - !props.isMediumScreenWidth ? styles.signInPageWideLeftContentMargin : {}, + !props.isMediumScreenWidth || (props.isMediumScreenWidth && props.windowHeight < variables.minHeightToShowGraphics) ? styles.signInPageWideLeftContentMargin : {}, styles.mb3, StyleUtils.getModalPaddingStyles({ shouldAddBottomSafeAreaPadding: true, From 085873621d2c611f3783d9d343029e1c6a52b8d9 Mon Sep 17 00:00:00 2001 From: Marc Glasser Date: Wed, 10 Aug 2022 06:58:28 -1000 Subject: [PATCH 75/77] remove double brackets --- src/components/MenuItem.js | 2 +- src/components/OptionRow.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/MenuItem.js b/src/components/MenuItem.js index 08b3085c0be3..e4cfd785dac3 100644 --- a/src/components/MenuItem.js +++ b/src/components/MenuItem.js @@ -133,7 +133,7 @@ const MenuItem = props => ( )} {props.brickRoadIndicator && ( - + { ) : null} {props.option.brickRoadIndicator === CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR && ( - + Date: Wed, 10 Aug 2022 19:00:29 +0200 Subject: [PATCH 76/77] Add exposing of onyx to window in readme --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 8881a1ab3a71..c8bb33fae3ab 100644 --- a/README.md +++ b/README.md @@ -121,6 +121,9 @@ Our React Native Android app now uses the `Hermes` JS engine which requires your 3. You should now see a "Hermes React Native" target with an "inspect" link which can be used to bring up a debugger. If you don't see the "inspect" link, make sure the Metro server is running. 4. You can now use the Chrome debug tools. See [React Native Debugging Hermes](https://reactnative.dev/docs/hermes#debugging-hermes-using-google-chromes-devtools) +## Web + +To make it easier to test things in web, we expose the Onyx object to the window, so you can easily do `Onyx.set('bla', 1)`. --- # App Structure and Conventions From 6c4f97ce38345876e65fbd8f5fe7182b68d04200 Mon Sep 17 00:00:00 2001 From: Ionatan Wiznia Date: Wed, 10 Aug 2022 12:14:20 -0600 Subject: [PATCH 77/77] Update README.md Co-authored-by: Puneet Lath --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c8bb33fae3ab..1e540b193a15 100644 --- a/README.md +++ b/README.md @@ -124,6 +124,7 @@ Our React Native Android app now uses the `Hermes` JS engine which requires your ## Web To make it easier to test things in web, we expose the Onyx object to the window, so you can easily do `Onyx.set('bla', 1)`. + --- # App Structure and Conventions