From 7314672c6de0492befc27bca53feacb6eccafa6b Mon Sep 17 00:00:00 2001 From: nolleto Date: Wed, 30 Dec 2020 15:35:03 -0300 Subject: [PATCH 1/5] chore: update `React` to 17.0.1 --- package.json | 4 ++-- yarn.lock | 27 +++++++++++++++++---------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 03ca1bd..eef6534 100644 --- a/package.json +++ b/package.json @@ -52,9 +52,9 @@ "postcss-preset-env": "^6.6.0", "prop-types": "^15.7.2", "ramda": "^0.26.1", - "react": "^16.8.6", + "react": "17.0.1", "react-contextmenu": "^2.11.0", - "react-dom": "^16.8.6", + "react-dom": "17.0.1", "react-file-download": "^0.3.5", "react-modal": "^3.1.7", "react-redux": "^7.0.3", diff --git a/yarn.lock b/yarn.lock index 11fa912..9ad8a5e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7592,14 +7592,14 @@ react-contextmenu@^2.11.0: classnames "^2.2.5" object-assign "^4.1.0" -react-dom@^16.8.6: - version "16.8.6" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.6.tgz#71d6303f631e8b0097f56165ef608f051ff6e10f" +react-dom@17.0.1: + version "17.0.1" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.1.tgz#1de2560474ec9f0e334285662ede52dbc5426fc6" + integrity sha512-6eV150oJZ9U2t9svnsspTMrWNyHc6chX0KzDeAOXftRa8bNeOKTTfCJ7KorIwenkHd2xqVTBTCZd79yk/lx/Ug== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" - prop-types "^15.6.2" - scheduler "^0.13.6" + scheduler "^0.20.1" react-file-download@^0.3.5: version "0.3.5" @@ -7642,14 +7642,13 @@ react-test-renderer@^16.0.0-0: react-is "^16.8.6" scheduler "^0.13.6" -react@^16.8.6: - version "16.8.6" - resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe" +react@17.0.1: + version "17.0.1" + resolved "https://registry.yarnpkg.com/react/-/react-17.0.1.tgz#6e0600416bd57574e3f86d92edba3d9008726127" + integrity sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" - prop-types "^15.6.2" - scheduler "^0.13.6" read-cache@^1.0.0: version "1.0.0" @@ -8161,6 +8160,14 @@ scheduler@^0.13.6: loose-envify "^1.1.0" object-assign "^4.1.1" +scheduler@^0.20.1: + version "0.20.1" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.1.tgz#da0b907e24026b01181ecbc75efdc7f27b5a000c" + integrity sha512-LKTe+2xNJBNxu/QhHvDR14wUXHRQbVY5ZOYpOGWRzhydZUqrLb2JBvLPY7cAqFmqrWuDED0Mjk7013SZiOz6Bw== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + schema-utils@^0.4.5: version "0.4.7" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187" From 4534360ee2bf70427736955e97e2124251c28908 Mon Sep 17 00:00:00 2001 From: nolleto Date: Wed, 30 Dec 2020 19:09:22 -0300 Subject: [PATCH 2/5] chore(alias): update alias with `@` to avoid imports errors --- __mocks__/my-components.js | 18 +++---- __mocks__/utils/colors.js | 1 - .../bayesin-network/network.spec.js | 2 +- .../bayesin-network/node-connection.spec.js | 2 +- .../node-probabilities.spec.js | 2 +- .../bayesin-network/node-states.spec.js | 2 +- .../integration/bayesin-network/node.spec.js | 2 +- jest.config.js | 22 ++++---- jsconfig.json | 22 ++++---- src/actions/editing-node-cpt.js | 4 +- src/actions/editing-node-cpt.test.js | 4 +- src/actions/editing-node-states.js | 4 +- src/actions/editing-node-states.test.js | 4 +- src/actions/index.js | 2 +- src/actions/index.test.js | 51 ++++++++++--------- src/actions/network.js | 9 ++-- src/actions/network.test.js | 12 ++--- src/components/AddNodeModal/index.js | 14 ++--- src/components/App/index.js | 8 +-- src/components/Arrow/component.js | 9 ++-- src/components/Arrow/enhance.js | 7 ++- .../ArrowMovingPlaceholder/component.js | 16 +++--- .../ArrowMovingPlaceholder/index.test.js | 6 +-- src/components/ArrowPlaceholder/index.js | 2 +- src/components/Arrows/component.js | 7 +-- src/components/Button/index.js | 4 +- src/components/Canvas/index.js | 10 ++-- src/components/ContextMenu/index.js | 7 +-- src/components/ContextMenu/index.test.js | 8 +-- src/components/ContextMenuItems/index.js | 17 ++++--- src/components/EditNodeCptModal/component.js | 16 +++--- src/components/EditNodeCptModal/enhance.js | 15 +++--- src/components/EditNodeCptModal/index.test.js | 14 ++--- src/components/EditNodeCptTableRow/index.js | 25 ++++----- .../EditNodeCptTableRow/index.test.js | 10 ++-- .../EditNodeStatesModal/component.js | 24 ++++----- src/components/EditNodeStatesModal/enhance.js | 11 ++-- src/components/GenericNode/component.js | 8 +-- src/components/GenericNode/enhance.js | 6 +-- src/components/GenericPanel/index.js | 8 +-- src/components/Header/index.js | 16 +++--- src/components/InputCpt/index.js | 9 ++-- src/components/LinkagesModal/index.js | 6 +-- src/components/Modal/index.js | 2 +- src/components/Network/index.js | 19 +++---- src/components/NetworkBN/component.js | 10 ++-- src/components/NetworkBN/enhance.js | 13 ++--- src/components/NetworkMSBN/index.js | 46 ++++++++--------- src/components/Node/index.js | 14 ++--- src/components/NodeAddState/index.js | 19 +++---- src/components/NodeAddState/index.test.js | 10 ++-- src/components/NodeConnections/component.js | 8 +-- src/components/NodeConnections/enhance.js | 6 +-- src/components/NodeCptEditTable/index.js | 13 ++--- src/components/NodeCptEditTable/index.test.js | 7 +-- .../NodeCptParentStatesTable/index.js | 4 +- src/components/NodeCptStatesThead/index.js | 4 +- src/components/NodeMovingPlaceholder/index.js | 8 +-- .../NodeMovingPlaceholder/index.test.js | 6 +-- src/components/NodeState/component.js | 6 +-- src/components/NodeState/enhance.js | 4 +- src/components/NodeStateEdit/index.js | 11 ++-- src/components/NodeStates/component.js | 2 +- src/components/NodeStates/enhance.js | 4 +- src/components/NodeStatesEditList/index.js | 8 +-- src/components/Nodes/component.js | 2 +- src/components/PropertiesNetwork/index.js | 22 ++++---- src/components/PropertiesNode/component.js | 22 ++++---- src/components/PropertiesNode/enhance.js | 10 ++-- src/components/PropertiesPanel/index.js | 12 ++--- src/components/PropertiesSuperNode/index.js | 4 +- src/components/SubNetwork/index.js | 13 +++-- src/components/SvgMousePosition/component.js | 2 +- src/components/SvgText/component.js | 2 +- src/index.js | 4 +- src/middlewares/persistState.js | 4 +- src/models/network.js | 6 +-- src/models/state-to-save.js | 6 +-- src/reducers/arrows.js | 2 +- src/reducers/arrows.test.js | 2 +- src/reducers/editing-node-cpt.js | 4 +- src/reducers/editing-node-cpt.test.js | 5 +- src/reducers/editing-node-states.js | 4 +- src/reducers/editing-node-states.test.js | 5 +- src/reducers/network/beliefs.js | 7 +-- src/reducers/network/beliefs.test.js | 3 +- src/reducers/network/description.js | 4 +- src/reducers/network/description.test.js | 5 +- src/reducers/network/height.js | 6 +-- src/reducers/network/height.test.js | 5 +- src/reducers/network/id.js | 5 +- src/reducers/network/id.test.js | 3 +- src/reducers/network/inferenceEnabled.js | 6 +-- src/reducers/network/inferenceEnabled.test.js | 5 +- src/reducers/network/kind.js | 7 +-- src/reducers/network/kind.test.js | 5 +- src/reducers/network/linkages.js | 9 ++-- src/reducers/network/linkages.test.js | 2 +- src/reducers/network/name.js | 6 +-- src/reducers/network/name.test.js | 4 +- src/reducers/network/nodes.js | 16 +++--- src/reducers/network/nodes.test.js | 31 +++++------ src/reducers/network/positions.js | 12 ++--- src/reducers/network/positions.test.js | 3 +- .../network/propertiesPanelVisible.js | 6 +-- .../network/propertiesPanelVisible.test.js | 4 +- src/reducers/network/selectedNodes.js | 9 ++-- src/reducers/network/selectedNodes.test.js | 8 +-- src/reducers/network/subnetworks.js | 13 +++-- src/reducers/network/subnetworks.test.js | 21 ++++---- src/reducers/network/width.js | 6 +-- src/reducers/network/width.test.js | 4 +- src/selectors/combiners.js | 7 +-- src/selectors/index.js | 19 ++++--- src/selectors/index.test.js | 10 ++-- src/store/configureStore.js | 4 +- src/utils/math.js | 2 +- src/utils/node-cpt.js | 4 +- src/utils/node-cpt.test.js | 3 +- src/utils/node-size.js | 4 +- src/utils/node.test.js | 5 +- src/validations/network.js | 3 +- src/validations/network.test.js | 7 +-- src/validations/node.js | 3 +- webpack.config.resolve.js | 22 ++++---- 125 files changed, 578 insertions(+), 531 deletions(-) delete mode 100644 __mocks__/utils/colors.js diff --git a/__mocks__/my-components.js b/__mocks__/my-components.js index c5726a2..ad95783 100644 --- a/__mocks__/my-components.js +++ b/__mocks__/my-components.js @@ -1,9 +1,9 @@ -jest.mock('components/Arrow', () => 'Arrow'); -jest.mock('components/SvgText', () => 'SvgText'); -jest.mock('components/NodeDivider', () => 'NodeDivider'); -jest.mock('components/NodeConnections', () => 'NodeConnections'); -jest.mock('components/NodeConnection', () => 'NodeConnection'); -jest.mock('components/GenericNode', () => 'GenericNode'); -jest.mock('components/NodeState', () => 'NodeState'); -jest.mock('components/NodeStates', () => 'NodeStates'); -jest.mock('components/NodeStateBar', () => 'NodeStateBar'); +jest.mock('@components/Arrow', () => 'Arrow'); +jest.mock('@components/SvgText', () => 'SvgText'); +jest.mock('@components/NodeDivider', () => 'NodeDivider'); +jest.mock('@components/NodeConnections', () => 'NodeConnections'); +jest.mock('@components/NodeConnection', () => 'NodeConnection'); +jest.mock('@components/GenericNode', () => 'GenericNode'); +jest.mock('@components/NodeState', () => 'NodeState'); +jest.mock('@components/NodeStates', () => 'NodeStates'); +jest.mock('@components/NodeStateBar', () => 'NodeStateBar'); diff --git a/__mocks__/utils/colors.js b/__mocks__/utils/colors.js deleted file mode 100644 index 26118a2..0000000 --- a/__mocks__/utils/colors.js +++ /dev/null @@ -1 +0,0 @@ -export const getRandomColor = () => '#FFFF00'; diff --git a/cypress/integration/bayesin-network/network.spec.js b/cypress/integration/bayesin-network/network.spec.js index 49b139f..011fdd5 100644 --- a/cypress/integration/bayesin-network/network.spec.js +++ b/cypress/integration/bayesin-network/network.spec.js @@ -1,4 +1,4 @@ -import { getComponentTestId } from 'utils/test-utils'; +import { getComponentTestId } from '@utils/test-utils'; describe('Network', () => { it('creates a new one', () => { diff --git a/cypress/integration/bayesin-network/node-connection.spec.js b/cypress/integration/bayesin-network/node-connection.spec.js index 3166c00..db9c0c9 100644 --- a/cypress/integration/bayesin-network/node-connection.spec.js +++ b/cypress/integration/bayesin-network/node-connection.spec.js @@ -1,4 +1,4 @@ -import { getComponentTestId } from 'utils/test-utils'; +import { getComponentTestId } from '@utils/test-utils'; describe('Node Connection', () => { it('connect two nodes and then disconnect', () => { diff --git a/cypress/integration/bayesin-network/node-probabilities.spec.js b/cypress/integration/bayesin-network/node-probabilities.spec.js index c72ae16..20e13c2 100644 --- a/cypress/integration/bayesin-network/node-probabilities.spec.js +++ b/cypress/integration/bayesin-network/node-probabilities.spec.js @@ -1,4 +1,4 @@ -import { getComponentTestId } from 'utils/test-utils'; +import { getComponentTestId } from '@utils/test-utils'; describe('Node Probabilities', () => { const nodeName = 'Node 1'; diff --git a/cypress/integration/bayesin-network/node-states.spec.js b/cypress/integration/bayesin-network/node-states.spec.js index 6e17aa4..4cb05ca 100644 --- a/cypress/integration/bayesin-network/node-states.spec.js +++ b/cypress/integration/bayesin-network/node-states.spec.js @@ -1,4 +1,4 @@ -import { getComponentTestId } from 'utils/test-utils'; +import { getComponentTestId } from '@utils/test-utils'; describe('Node States', () => { const nodeName = 'Node 1'; diff --git a/cypress/integration/bayesin-network/node.spec.js b/cypress/integration/bayesin-network/node.spec.js index e7d2abe..09481c4 100644 --- a/cypress/integration/bayesin-network/node.spec.js +++ b/cypress/integration/bayesin-network/node.spec.js @@ -1,4 +1,4 @@ -import { getComponentTestId } from 'utils/test-utils'; +import { getComponentTestId } from '@utils/test-utils'; describe('Node', () => { const nodeName = 'Node 1'; diff --git a/jest.config.js b/jest.config.js index 34b3ba6..6bef3ad 100644 --- a/jest.config.js +++ b/jest.config.js @@ -4,16 +4,16 @@ module.exports = { snapshotSerializers: ['enzyme-to-json/serializer'], moduleNameMapper: { '\\.(css|less|scss|sss|styl)$': '/node_modules/jest-css-modules', - '^json-templates(.*)$': '/__fixtures__$1', - '^components(.*)$': '/src/components$1', - '^utils(.*)$': '/src/utils$1', - '^models(.*)$': '/src/models$1', - '^reducers(.*)$': '/src/reducers$1', - '^selectors(.*)$': '/src/selectors$1', - '^actions(.*)$': '/src/actions$1', - '^decorators(.*)$': '/src/decorators$1', - '^constants(.*)$': '/src/constants$1', - '^validations(.*)$': '/src/validations$1', - '^portals(.*)$': '/src/portals$1', + '^@json-templates(.*)$': '/__fixtures__$1', + '^@components(.*)$': '/src/components$1', + '^@utils(.*)$': '/src/utils$1', + '^@models(.*)$': '/src/models$1', + '^@reducers(.*)$': '/src/reducers$1', + '^@selectors(.*)$': '/src/selectors$1', + '^@actions(.*)$': '/src/actions$1', + '^@decorators(.*)$': '/src/decorators$1', + '^@constants(.*)$': '/src/constants$1', + '^@validations(.*)$': '/src/validations$1', + '^@portals(.*)$': '/src/portals$1', }, }; diff --git a/jsconfig.json b/jsconfig.json index 8806493..3e70ffc 100644 --- a/jsconfig.json +++ b/jsconfig.json @@ -5,17 +5,17 @@ "target": "es2016", "jsx": "preserve", "paths": { - "json-templates/*": ["./__fixtures__/*"], - "components/*": ["./src/components/*"], - "utils/*": ["./src/utils/*"], - "models/*": ["./src/models/*"], - "reducers/*": ["./src/reducers/*"], - "selectors/*": ["./src/selectors/*"], - "actions/*": ["./src/actions/*"], - "decorators/*": ["./src/decorators/*"], - "constants/*": ["./src/constants/*"], - "validations/*": ["./src/validations/*"], - "portals/*": ["./src/portals/*"], + "@json-templates/*": ["./__fixtures__/*"], + "@components/*": ["./src/components/*"], + "@utils/*": ["./src/utils/*"], + "@models/*": ["./src/models/*"], + "@reducers/*": ["./src/reducers/*"], + "@selectors/*": ["./src/selectors/*"], + "@actions/*": ["./src/actions/*"], + "@decorators/*": ["./src/decorators/*"], + "@constants/*": ["./src/constants/*"], + "@validations/*": ["./src/validations/*"], + "@portals/*": ["./src/portals/*"], } }, "exclude": [ diff --git a/src/actions/editing-node-cpt.js b/src/actions/editing-node-cpt.js index c26b59f..f759689 100644 --- a/src/actions/editing-node-cpt.js +++ b/src/actions/editing-node-cpt.js @@ -1,8 +1,8 @@ import { - EDITING_NODE_CPT, CANCEL_EDITING_NODE_CPT, + EDITING_NODE_CPT, SAVE_EDITING_NODE_CPT, -} from 'constants/editing-node-cpt'; +} from '@constants/editing-node-cpt'; export const onEditingNodeCpt = node => ({ type: EDITING_NODE_CPT, diff --git a/src/actions/editing-node-cpt.test.js b/src/actions/editing-node-cpt.test.js index 4b0b9f0..0f60c04 100644 --- a/src/actions/editing-node-cpt.test.js +++ b/src/actions/editing-node-cpt.test.js @@ -1,8 +1,8 @@ import { - EDITING_NODE_CPT, CANCEL_EDITING_NODE_CPT, + EDITING_NODE_CPT, SAVE_EDITING_NODE_CPT, -} from 'constants/editing-node-cpt'; +} from '@constants/editing-node-cpt'; import { onCancelEditingNodeCpt, onEditingNodeCpt, diff --git a/src/actions/editing-node-states.js b/src/actions/editing-node-states.js index 8b451f4..e0a9222 100644 --- a/src/actions/editing-node-states.js +++ b/src/actions/editing-node-states.js @@ -1,8 +1,8 @@ import { - EDITING_NODE_STATES, CANCEL_EDITING_NODE_STATES, + EDITING_NODE_STATES, SAVE_EDITING_NODE_STATES, -} from 'constants/editing-node-states'; +} from '@constants/editing-node-states'; export const onEditingNodeStates = node => ({ type: EDITING_NODE_STATES, diff --git a/src/actions/editing-node-states.test.js b/src/actions/editing-node-states.test.js index 4ea5b21..01b143e 100644 --- a/src/actions/editing-node-states.test.js +++ b/src/actions/editing-node-states.test.js @@ -1,8 +1,8 @@ import { - EDITING_NODE_STATES, CANCEL_EDITING_NODE_STATES, + EDITING_NODE_STATES, SAVE_EDITING_NODE_STATES, -} from 'constants/editing-node-states'; +} from '@constants/editing-node-states'; import { onCancelEditingNodeStates, onEditingNodeStates, diff --git a/src/actions/index.js b/src/actions/index.js index 5028e10..52bf30c 100644 --- a/src/actions/index.js +++ b/src/actions/index.js @@ -1,4 +1,4 @@ -import { NETWORK_KINDS } from 'constants/network'; +import { NETWORK_KINDS } from '@constants/network'; export const PERSIST_STATE = 'PERSIST_STATE'; export const NEW_NETWORK = 'NEW_NETWORK'; diff --git a/src/actions/index.test.js b/src/actions/index.test.js index 06855ca..d8a4991 100644 --- a/src/actions/index.test.js +++ b/src/actions/index.test.js @@ -1,37 +1,38 @@ -import { NETWORK_KINDS } from 'constants/network'; import { - persistState, - newNetwork, - loadNetwork, - setBelief, - changeNodeId, - changeNodePosition, - changeNodeDescription, - addNode, - addLinkage, - addSuperNode, - removeSuperNode, - removeLinkage, - PERSIST_STATE, - NEW_NETWORK, - LOAD_NETWORK, - SET_BELIEF, - CHANGE_NODE_ID, - CHANGE_NODE_POSITION, - CHANGE_NODE_DESCRIPTION, - ADD_NODE, ADD_LINKAGE, + ADD_NODE, + ADD_PARENT, ADD_SUPER_NODE, - REMOVE_SUPER_NODE, + CHANGE_NODE_DESCRIPTION, + CHANGE_NODE_ID, + CHANGE_NODE_POSITION, + LOAD_NETWORK, + NEW_NETWORK, + PERSIST_STATE, REMOVE_LINKAGE, - removeNode, REMOVE_NODE, + REMOVE_PARENT, + REMOVE_SUPER_NODE, + SET_BELIEF, + addLinkage, + addNode, addParent, - ADD_PARENT, + addSuperNode, + changeNodeDescription, + changeNodeId, + changeNodePosition, + loadNetwork, + newNetwork, + persistState, + removeLinkage, + removeNode, removeParent, - REMOVE_PARENT, + removeSuperNode, + setBelief, } from './index'; +import { NETWORK_KINDS } from '@constants/network'; + const persistStateAction = { type: PERSIST_STATE, }; diff --git a/src/actions/network.js b/src/actions/network.js index c74a76a..397b449 100644 --- a/src/actions/network.js +++ b/src/actions/network.js @@ -1,14 +1,13 @@ import { - persistState, - UPDATE_NETWORK_NAME, UPDATE_NETWORK_DESCRIPTION, - UPDATE_NETWORK_WIDTH, UPDATE_NETWORK_HEIGHT, UPDATE_NETWORK_INFERENCE_ENABLED, + UPDATE_NETWORK_NAME, UPDATE_NETWORK_PROPERTIES_PANEL_VISIBLE, UPDATE_NETWORK_SELECTED_NODES, -} from 'actions'; - + UPDATE_NETWORK_WIDTH, + persistState, +} from '@actions'; export const onUpdateNetworkName = name => (dispatch) => { dispatch({ diff --git a/src/actions/network.test.js b/src/actions/network.test.js index 4e8d48c..e7080ba 100644 --- a/src/actions/network.test.js +++ b/src/actions/network.test.js @@ -1,25 +1,23 @@ import { PERSIST_STATE, - UPDATE_NETWORK_NAME, UPDATE_NETWORK_DESCRIPTION, - UPDATE_NETWORK_WIDTH, UPDATE_NETWORK_HEIGHT, UPDATE_NETWORK_INFERENCE_ENABLED, + UPDATE_NETWORK_NAME, UPDATE_NETWORK_PROPERTIES_PANEL_VISIBLE, UPDATE_NETWORK_SELECTED_NODES, -} from 'actions'; - + UPDATE_NETWORK_WIDTH, +} from '@actions'; import { - onUpdateNetworkName, onUpdateNetworkDescription, - onUpdateNetworkWidth, onUpdateNetworkHeight, onUpdateNetworkInferenceEnabled, + onUpdateNetworkName, onUpdateNetworkPropertiesPanelVisible, onUpdateNetworkSelectedNodes, + onUpdateNetworkWidth, } from './network'; - const persistStateAction = { type: PERSIST_STATE, }; diff --git a/src/components/AddNodeModal/index.js b/src/components/AddNodeModal/index.js index 5c37a81..8375794 100644 --- a/src/components/AddNodeModal/index.js +++ b/src/components/AddNodeModal/index.js @@ -1,14 +1,14 @@ import React, { Component } from 'react'; -import { nodePropTypes, positionPropTypes } from 'models'; +import { nodePropTypes, positionPropTypes } from '@models'; -import Button from 'components/Button'; -import Modal from 'components/Modal'; +import Button from '@components/Button'; +import Modal from '@components/Modal'; +import NodeAddState from '@components/NodeAddState'; +import NodeStatesEditList from '@components/NodeStatesEditList'; import PropTypes from 'prop-types'; -import { addNode } from 'actions'; +import { addNode } from '@actions'; import { connect } from 'react-redux'; -import { getNodes } from 'selectors'; -import NodeStatesEditList from 'components/NodeStatesEditList'; -import NodeAddState from 'components/NodeAddState'; +import { getNodes } from '@selectors'; import styles from './styles.css'; const initialState = { diff --git a/src/components/App/index.js b/src/components/App/index.js index 76bb04e..5d4cf28 100644 --- a/src/components/App/index.js +++ b/src/components/App/index.js @@ -1,12 +1,12 @@ import React, { Component } from 'react'; -import { connect } from 'react-redux'; -import { - getNetworkKind, -} from 'selectors'; import Canvas from '../Canvas'; import Header from '../Header'; import PropertiesPanel from '../PropertiesPanel'; +import { connect } from 'react-redux'; +import { + getNetworkKind, +} from '@selectors'; import styles from './styles.css'; class App extends Component { diff --git a/src/components/Arrow/component.js b/src/components/Arrow/component.js index d33933c..cbe239b 100644 --- a/src/components/Arrow/component.js +++ b/src/components/Arrow/component.js @@ -1,11 +1,12 @@ +import { contextMenuItemPropTypes, positionPropTypes } from '@models/'; + +import { CONTEXTMENU_TYPES } from '@constants/contextmenu'; +import ContextMenu from '@components/ContextMenu'; import PropTypes from 'prop-types'; import React from 'react'; -import { getComponentTestId } from 'utils/test-utils'; +import { getComponentTestId } from '@utils/test-utils'; import { noop } from 'lodash'; import { pick } from 'ramda'; -import { positionPropTypes, contextMenuItemPropTypes } from 'models'; -import { CONTEXTMENU_TYPES } from 'constants/contextmenu'; -import ContextMenu from 'components/ContextMenu'; const style = { transition: 'stroke-opacity 0.2s', diff --git a/src/components/Arrow/enhance.js b/src/components/Arrow/enhance.js index 201ad4c..db29d07 100644 --- a/src/components/Arrow/enhance.js +++ b/src/components/Arrow/enhance.js @@ -1,8 +1,11 @@ import { - withProps, pure, compose, withHandlers, + compose, + pure, + withHandlers, + withProps, } from 'recompose'; -import { makeArrowLine } from 'utils/arrows-positions'; +import { makeArrowLine } from '@utils/arrows-positions'; const enhance = compose( pure, diff --git a/src/components/ArrowMovingPlaceholder/component.js b/src/components/ArrowMovingPlaceholder/component.js index df4f663..4c5490a 100644 --- a/src/components/ArrowMovingPlaceholder/component.js +++ b/src/components/ArrowMovingPlaceholder/component.js @@ -1,15 +1,15 @@ -import { inRange, noop } from 'lodash'; -import PropTypes from 'prop-types'; - -import ArrowPlaceholder from 'components/ArrowPlaceholder'; import React, { PureComponent } from 'react'; import { - positionPropTypes, + elementInstancePropTypes, nodePropTypes, + positionPropTypes, subnetworkPropTypes, - elementInstancePropTypes, -} from 'models'; -import SvgMousePosition from 'components/SvgMousePosition'; +} from '@models'; +import { inRange, noop } from 'lodash'; + +import ArrowPlaceholder from '@components/ArrowPlaceholder'; +import PropTypes from 'prop-types'; +import SvgMousePosition from '@components/SvgMousePosition'; const isBetweenCreator = value => (min, max) => inRange(value, min, max); diff --git a/src/components/ArrowMovingPlaceholder/index.test.js b/src/components/ArrowMovingPlaceholder/index.test.js index 9409fc7..66ac178 100644 --- a/src/components/ArrowMovingPlaceholder/index.test.js +++ b/src/components/ArrowMovingPlaceholder/index.test.js @@ -1,8 +1,8 @@ -import ArrowPlaceholder from 'components/ArrowPlaceholder'; +import ArrowMovingPlaceholder from './component'; +import ArrowPlaceholder from '@components/ArrowPlaceholder'; import React from 'react'; -import SvgMousePosition from 'components/SvgMousePosition'; +import SvgMousePosition from '@components/SvgMousePosition'; import { shallow } from 'enzyme'; -import ArrowMovingPlaceholder from './component'; const svg = document.createElement('svg'); const shallowComponent = (props = {}) => shallow(); diff --git a/src/components/ArrowPlaceholder/index.js b/src/components/ArrowPlaceholder/index.js index d5cb133..f1563a5 100644 --- a/src/components/ArrowPlaceholder/index.js +++ b/src/components/ArrowPlaceholder/index.js @@ -1,5 +1,5 @@ import React from 'react'; -import { positionPropTypes } from 'models'; +import { positionPropTypes } from '@models'; const ArrowPlaceholder = ({ from, to }) => ( (e) => { diff --git a/src/components/EditNodeCptModal/enhance.js b/src/components/EditNodeCptModal/enhance.js index 32415cc..f0cf215 100644 --- a/src/components/EditNodeCptModal/enhance.js +++ b/src/components/EditNodeCptModal/enhance.js @@ -1,20 +1,21 @@ -import { connectify } from 'decorators'; import { branch, compose, renderNothing, - withProps, withHandlers, + withProps, } from 'recompose'; import { + complement, + isEmpty, isNil, - prop, pipe, - isEmpty, - complement, + prop, } from 'ramda'; -import { getEditingNodeCpt } from 'selectors/editing-node-cpt'; -import { onCancelEditingNodeCpt, onSaveEditingNodeCpt } from 'actions/editing-node-cpt'; +import { onCancelEditingNodeCpt, onSaveEditingNodeCpt } from '@actions/editing-node-cpt'; + +import { connectify } from '@decorators'; +import { getEditingNodeCpt } from '@selectors/editing-node-cpt'; const hasNotNode = pipe(prop('node'), isNil); const isNotEmpty = complement(isEmpty); diff --git a/src/components/EditNodeCptModal/index.test.js b/src/components/EditNodeCptModal/index.test.js index 0e77a8b..5ba30fd 100644 --- a/src/components/EditNodeCptModal/index.test.js +++ b/src/components/EditNodeCptModal/index.test.js @@ -1,11 +1,13 @@ +import * as eventUtils from '@utils/event'; +import * as nodeValidation from '@validations/node'; + +import { fireEvent, render } from '@testing-library/react'; + +import EditNodeCptModal from './component'; +import Modal from 'react-modal'; import React from 'react'; -import { render, fireEvent } from '@testing-library/react'; -import { getComponentTestId } from 'utils/test-utils'; +import { getComponentTestId } from '@utils/test-utils'; import { head } from 'ramda'; -import Modal from 'react-modal'; -import * as nodeValidation from 'validations/node'; -import * as eventUtils from 'utils/event'; -import EditNodeCptModal from './component'; const renderComponent = (props) => { Modal.setAppElement(document.body); diff --git a/src/components/EditNodeCptTableRow/index.js b/src/components/EditNodeCptTableRow/index.js index 7c8b120..95bed60 100644 --- a/src/components/EditNodeCptTableRow/index.js +++ b/src/components/EditNodeCptTableRow/index.js @@ -1,22 +1,23 @@ import React, { useMemo } from 'react'; -import { NODE_CPT_PRECISION } from 'constants/node'; -import float from 'float'; -import InputCpt from 'components/InputCpt'; -import PropTypes from 'prop-types'; import { + complement, + equals, + find, keys, + length, pipe, - find, - equals, - complement, reduce, - length, } from 'ramda'; -import { noop } from 'lodash'; -import { cptWithoutParentsPropTypes } from 'models'; -import { updateCptValue } from 'utils/node-cpt'; -import { isNodeCptValid } from 'validations/node'; + +import InputCpt from '@components/InputCpt'; +import { NODE_CPT_PRECISION } from '@constants/node'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; +import { cptWithoutParentsPropTypes } from '@models'; +import float from 'float'; +import { isNodeCptValid } from '@validations/node'; +import { noop } from 'lodash'; +import { updateCptValue } from '@utils/node-cpt'; import styles from './styles.scss'; const isLengthEqualsTwo = pipe(length, equals(2)); diff --git a/src/components/EditNodeCptTableRow/index.test.js b/src/components/EditNodeCptTableRow/index.test.js index ad0b604..5f2d693 100644 --- a/src/components/EditNodeCptTableRow/index.test.js +++ b/src/components/EditNodeCptTableRow/index.test.js @@ -1,8 +1,10 @@ -import React from 'react'; -import { render, fireEvent } from '@testing-library/react'; -import * as nodeValidations from 'validations/node'; -import { getComponentTestId } from 'utils/test-utils'; +import * as nodeValidations from '@validations/node'; + +import { fireEvent, render } from '@testing-library/react'; + import EditNodeCptTableRow from './index'; +import React from 'react'; +import { getComponentTestId } from '@utils/test-utils'; const renderComponent = props => render( diff --git a/src/components/EditNodeStatesModal/component.js b/src/components/EditNodeStatesModal/component.js index 00288cd..1f18401 100644 --- a/src/components/EditNodeStatesModal/component.js +++ b/src/components/EditNodeStatesModal/component.js @@ -1,21 +1,21 @@ -import React, { useState, useCallback } from 'react'; -import PropTypes from 'prop-types'; - -import Button from 'components/Button'; -import NodeStatesEditList from 'components/NodeStatesEditList'; -import NodeAddState from 'components/NodeAddState'; -import Modal from 'components/Modal'; -import { nodePropTypes } from 'models'; +import React, { useCallback, useState } from 'react'; import { - prop, - remove, append, - includes, complement, + includes, isEmpty, + prop, + remove, thunkify, } from 'ramda'; -import { bem } from 'utils/styles'; + +import Button from '@components/Button'; +import Modal from '@components/Modal'; +import NodeAddState from '@components/NodeAddState'; +import NodeStatesEditList from '@components/NodeStatesEditList'; +import PropTypes from 'prop-types'; +import { bem } from '@utils/styles'; +import { nodePropTypes } from '@models'; import styles from './styles.scss'; const componentClassName = bem(styles); diff --git a/src/components/EditNodeStatesModal/enhance.js b/src/components/EditNodeStatesModal/enhance.js index 195c649..666fe38 100644 --- a/src/components/EditNodeStatesModal/enhance.js +++ b/src/components/EditNodeStatesModal/enhance.js @@ -1,6 +1,6 @@ import { - compose, branch, + compose, renderNothing, withHandlers, } from 'recompose'; @@ -9,10 +9,11 @@ import { pipe, prop, } from 'ramda'; -import { connectify } from 'decorators'; -import { getEditingNodeStates } from 'selectors/editing-node-states'; -import { onCancelEditingNodeStates, onSaveEditingNodeStates } from 'actions/editing-node-states'; -import { getNodes } from 'selectors'; +import { onCancelEditingNodeStates, onSaveEditingNodeStates } from '@actions/editing-node-states'; + +import { connectify } from '@decorators'; +import { getEditingNodeStates } from '@selectors/editing-node-states'; +import { getNodes } from '@selectors'; const hasNotNode = pipe(prop('node'), isNil); diff --git a/src/components/GenericNode/component.js b/src/components/GenericNode/component.js index 3f7e081..b6b61bc 100644 --- a/src/components/GenericNode/component.js +++ b/src/components/GenericNode/component.js @@ -1,10 +1,10 @@ -import { positionPropTypes, sizePropTypes } from 'models'; +import { positionPropTypes, sizePropTypes } from '@models'; -import NodeDivider from 'components/NodeDivider'; +import NodeDivider from '@components/NodeDivider'; import PropTypes from 'prop-types'; import React from 'react'; -import SvgText from 'components/SvgText'; -import { getComponentTestId } from 'utils/test-utils'; +import SvgText from '@components/SvgText'; +import { getComponentTestId } from '@utils/test-utils'; import { noop } from 'lodash'; import styles from './styles.css'; diff --git a/src/components/GenericNode/enhance.js b/src/components/GenericNode/enhance.js index 43426da..5aa21b0 100644 --- a/src/components/GenericNode/enhance.js +++ b/src/components/GenericNode/enhance.js @@ -1,7 +1,7 @@ -import { getNodeDescriptionHeight, getNodeHeaderHeight } from 'utils/node-size'; +import { getNodeDescriptionHeight, getNodeHeaderHeight } from '@utils/node-size'; -import { NODE_PADDING } from 'constants/node'; -import { hasDescription } from 'validations/node'; +import { NODE_PADDING } from '@constants/node'; +import { hasDescription } from '@validations/node'; import { withProps } from 'recompose'; const enhance = withProps(({ diff --git a/src/components/GenericPanel/index.js b/src/components/GenericPanel/index.js index bfa35aa..7245fd1 100644 --- a/src/components/GenericPanel/index.js +++ b/src/components/GenericPanel/index.js @@ -1,12 +1,12 @@ import React, { Component } from 'react'; +import Button from '../Button'; +import PropTypes from 'prop-types'; import classNames from 'classnames'; import { connect } from 'react-redux'; import fontAwesome from 'font-awesome/css/font-awesome.css'; -import PropTypes from 'prop-types'; -import { onUpdateNetworkPropertiesPanelVisible } from 'actions/network'; -import { getPanelVisibility } from 'selectors'; -import Button from '../Button'; +import { getPanelVisibility } from '@selectors'; +import { onUpdateNetworkPropertiesPanelVisible } from '@actions/network'; import styles from './styles.css'; class GenericPanel extends Component { diff --git a/src/components/Header/index.js b/src/components/Header/index.js index ce159f0..adee4c3 100644 --- a/src/components/Header/index.js +++ b/src/components/Header/index.js @@ -1,18 +1,18 @@ +import React, { Component } from 'react'; import { loadNetwork, newNetwork, -} from 'actions'; -import { NETWORK_KINDS } from 'constants/network'; -import React, { Component } from 'react'; -import { openFile, saveFile } from 'utils/file'; +} from '@actions'; +import { openFile, saveFile } from '@utils/file'; -import Button from 'components/Button'; +import Button from '@components/Button'; +import { NETWORK_KINDS } from '@constants/network'; import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import fontAwesome from 'font-awesome/css/font-awesome.css'; -import { getComponentTestId } from 'utils/test-utils'; -import { getStateToSave } from 'selectors'; -import { stateToSavePropTypes } from 'models'; +import { getComponentTestId } from '@utils/test-utils'; +import { getStateToSave } from '@selectors'; +import { stateToSavePropTypes } from '@models'; import { v4 } from 'uuid'; import styles from './styles.css'; diff --git a/src/components/InputCpt/index.js b/src/components/InputCpt/index.js index 56f0b04..b86ab50 100644 --- a/src/components/InputCpt/index.js +++ b/src/components/InputCpt/index.js @@ -1,10 +1,11 @@ -import React from 'react'; -import float from 'float'; import { clamp, path, pipe } from 'ramda'; + +import { NODE_CPT_PRECISION } from '@constants/node'; import PropTypes from 'prop-types'; +import React from 'react'; +import float from 'float'; +import { getComponentTestId } from '@utils/test-utils'; import { noop } from 'lodash'; -import { NODE_CPT_PRECISION } from 'constants/node'; -import { getComponentTestId } from 'utils/test-utils'; import styles from './styles.scss'; const clamp0And1 = clamp(0, 1); diff --git a/src/components/LinkagesModal/index.js b/src/components/LinkagesModal/index.js index 37442de..44566ee 100644 --- a/src/components/LinkagesModal/index.js +++ b/src/components/LinkagesModal/index.js @@ -1,10 +1,10 @@ import React, { Component } from 'react'; -import Button from 'components/Button'; -import Modal from 'components/Modal'; +import Button from '@components/Button'; +import Modal from '@components/Modal'; import PropTypes from 'prop-types'; import fontAwesome from 'font-awesome/css/font-awesome.css'; -import { linkagesPropTypes } from 'models'; +import { linkagesPropTypes } from '@models'; import styles from './styles.css'; class LinkagesModal extends Component { diff --git a/src/components/Modal/index.js b/src/components/Modal/index.js index 867bc5b..1d1ba6c 100644 --- a/src/components/Modal/index.js +++ b/src/components/Modal/index.js @@ -3,7 +3,7 @@ import React from 'react'; import ReactModal from 'react-modal'; import classNames from 'classnames'; import fontAwesome from 'font-awesome/css/font-awesome.css'; -import { getComponentTestId } from 'utils/test-utils'; +import { getComponentTestId } from '@utils/test-utils'; import styles from './styles.css'; const style = { diff --git a/src/components/Network/index.js b/src/components/Network/index.js index 1a522ee..71ddb94 100644 --- a/src/components/Network/index.js +++ b/src/components/Network/index.js @@ -1,22 +1,23 @@ import React, { PureComponent } from 'react'; import { arrowPropTypes, + contextMenuItemPropTypes, networkPropTypes, nodePropTypes, subnetworkPropTypes, - contextMenuItemPropTypes, -} from 'models'; +} from '@models'; import { isFunction, noop } from 'lodash'; -import ArrowMovingPlaceholder from 'components/ArrowMovingPlaceholder'; -import Arrows from 'components/Arrows'; -import ContextMenu from 'components/ContextMenu'; -import NodeMovingPlaceholder from 'components/NodeMovingPlaceholder'; -import Nodes from 'components/Nodes'; + +import ArrowMovingPlaceholder from '@components/ArrowMovingPlaceholder'; +import Arrows from '@components/Arrows'; +import { CONTEXTMENU_TYPES } from '@constants/contextmenu'; +import ContextMenu from '@components/ContextMenu'; +import NodeMovingPlaceholder from '@components/NodeMovingPlaceholder'; +import Nodes from '@components/Nodes'; import PropTypes from 'prop-types'; import { propEq } from 'ramda'; -import { v4 } from 'uuid'; -import { CONTEXTMENU_TYPES } from 'constants/contextmenu'; import styles from './styles.css'; +import { v4 } from 'uuid'; class Network extends PureComponent { state = { diff --git a/src/components/NetworkBN/component.js b/src/components/NetworkBN/component.js index 5e79258..6b8e100 100644 --- a/src/components/NetworkBN/component.js +++ b/src/components/NetworkBN/component.js @@ -1,13 +1,13 @@ import React, { Component } from 'react'; -import PropTypes from 'prop-types'; -import { nodePropTypes, networkPropTypes, inferenceResultsPropTypes } from 'models'; -import { getArrowsPositions } from 'utils/arrows-positions'; -import { isDeleteKey } from 'utils/event'; -import Network from '../Network'; +import { inferenceResultsPropTypes, networkPropTypes, nodePropTypes } from '@models'; import AddNodeModal from '../AddNodeModal'; import EditNodeCptModal from '../EditNodeCptModal'; import EditNodeStatesModal from '../EditNodeStatesModal'; +import Network from '../Network'; +import PropTypes from 'prop-types'; +import { getArrowsPositions } from '@utils/arrows-positions'; +import { isDeleteKey } from '@utils/event'; class NetworkBN extends Component { componentDidMount() { diff --git a/src/components/NetworkBN/enhance.js b/src/components/NetworkBN/enhance.js index 522c9b5..3135a08 100644 --- a/src/components/NetworkBN/enhance.js +++ b/src/components/NetworkBN/enhance.js @@ -4,16 +4,17 @@ import { removeNode, removeParent, setBelief, -} from 'actions'; -import { onUpdateNetworkSelectedNodes } from 'actions/network'; +} from '@actions'; import { getInferenceResults, getNetwork, getNodesWithPositionsAndSizes, -} from 'selectors'; -import { connectify } from 'decorators'; -import { onEditingNodeCpt } from 'actions/editing-node-cpt'; -import { onEditingNodeStates } from 'actions/editing-node-states'; +} from '@selectors'; + +import { connectify } from '@decorators'; +import { onEditingNodeCpt } from '@actions/editing-node-cpt'; +import { onEditingNodeStates } from '@actions/editing-node-states'; +import { onUpdateNetworkSelectedNodes } from '@actions/network'; const enhance = connectify({ network: getNetwork, diff --git a/src/components/NetworkMSBN/index.js b/src/components/NetworkMSBN/index.js index d3a18ec..0661541 100644 --- a/src/components/NetworkMSBN/index.js +++ b/src/components/NetworkMSBN/index.js @@ -1,3 +1,4 @@ +import React, { Component } from 'react'; import { addLinkage, addSuperNode, @@ -5,12 +6,17 @@ import { removeLinkage, removeSuperNode, setBelief, -} from 'actions'; -import { onUpdateNetworkSelectedNodes } from 'actions/network'; -import { NETWORK_KINDS } from 'constants/network'; -import Network from 'components/Network'; -import React, { Component } from 'react'; -import { combNodesWithPositions, combNodesWithSizes } from 'selectors/combiners'; +} from '@actions'; +import { + allLinkagesBySubnetworkWithoutIdPropTypes, + inferenceResultsMSBNPropTypes, + linkagesByNodePropTypes, + linkagesByTwoNodePropTypes, + linkagesPropTypes, + networkPropTypes, + subnetworkPropTypes, +} from '@models'; +import { combNodesWithPositions, combNodesWithSizes } from '@selectors/combiners'; import { getAllLinkagesBySubnetworkWithoutId, getInferenceResultsMSBN, @@ -21,27 +27,21 @@ import { getSubnetworksById, getSubnetworksColorById, getSubnetworksWithPositionAndSizes, -} from 'selectors'; -import { - linkagesPropTypes, - networkPropTypes, - subnetworkPropTypes, - linkagesByNodePropTypes, - linkagesByTwoNodePropTypes, - allLinkagesBySubnetworkWithoutIdPropTypes, - inferenceResultsMSBNPropTypes, -} from 'models'; +} from '@selectors'; -import LinkagesModal from 'components/LinkagesModal'; +import LinkagesModal from '@components/LinkagesModal'; +import { NETWORK_KINDS } from '@constants/network'; +import Network from '@components/Network'; import PropTypes from 'prop-types'; -import SubNetwork from 'components/SubNetwork'; +import SubNetwork from '@components/SubNetwork'; import { connect } from 'react-redux'; -import { getArrowsPositionsForMSBN } from 'utils/arrows-positions'; -import { openFile } from 'utils/file'; -import { v4 } from 'uuid'; -import { isDeleteKey } from 'utils/event'; -import { hasCycles } from 'validations/network'; +import { getArrowsPositionsForMSBN } from '@utils/arrows-positions'; +import { hasCycles } from '@validations/network'; +import { isDeleteKey } from '@utils/event'; import { mergeNetworks } from './helpers'; +import { onUpdateNetworkSelectedNodes } from '@actions/network'; +import { openFile } from '@utils/file'; +import { v4 } from 'uuid'; class NetworkMSBN extends Component { state = { diff --git a/src/components/Node/index.js b/src/components/Node/index.js index 4eb2ea4..e6f6782 100644 --- a/src/components/Node/index.js +++ b/src/components/Node/index.js @@ -1,17 +1,17 @@ import { + contextMenuItemPropTypes, positionPropTypes, sizePropTypes, statePropTypes, - contextMenuItemPropTypes, -} from 'models'; +} from '@models'; -import GenericNode from 'components/GenericNode'; -import NodeConnections from 'components/NodeConnections'; -import NodeStates from 'components/NodeStates'; +import { CONTEXTMENU_TYPES } from '@constants/contextmenu'; +import ContextMenu from '@components/ContextMenu'; +import GenericNode from '@components/GenericNode'; +import NodeConnections from '@components/NodeConnections'; +import NodeStates from '@components/NodeStates'; import PropTypes from 'prop-types'; import React from 'react'; -import ContextMenu from 'components/ContextMenu'; -import { CONTEXTMENU_TYPES } from 'constants/contextmenu'; const Node = (props) => { const { id, contextItems } = props; diff --git a/src/components/NodeAddState/index.js b/src/components/NodeAddState/index.js index 0f806bf..039e848 100644 --- a/src/components/NodeAddState/index.js +++ b/src/components/NodeAddState/index.js @@ -1,17 +1,18 @@ -import React, { useState, useCallback } from 'react'; -import Icon from 'components/Icon'; -import Button from 'components/Button'; -import PropTypes from 'prop-types'; +import React, { useCallback, useState } from 'react'; import { - pipe, - path, + both, complement, isEmpty, + path, + pipe, trim, - both, } from 'ramda'; -import { isEnterKey } from 'utils/event'; -import { bem } from 'utils/styles'; + +import Button from '@components/Button'; +import Icon from '@components/Icon'; +import PropTypes from 'prop-types'; +import { bem } from '@utils/styles'; +import { isEnterKey } from '@utils/event'; import styles from './styles.scss'; const componentClassName = bem(styles); diff --git a/src/components/NodeAddState/index.test.js b/src/components/NodeAddState/index.test.js index 313ba00..0e0b8ee 100644 --- a/src/components/NodeAddState/index.test.js +++ b/src/components/NodeAddState/index.test.js @@ -1,8 +1,10 @@ -import React from 'react'; -import { render, fireEvent } from '@testing-library/react'; -import * as eventUtils from 'utils/event'; -import { getComponentTestId } from 'utils/test-utils'; +import * as eventUtils from '@utils/event'; + +import { fireEvent, render } from '@testing-library/react'; + import NodeAddState from './index'; +import React from 'react'; +import { getComponentTestId } from '@utils/test-utils'; const renderComponent = props => render( diff --git a/src/components/NodeConnections/component.js b/src/components/NodeConnections/component.js index 6f2ae0c..815966f 100644 --- a/src/components/NodeConnections/component.js +++ b/src/components/NodeConnections/component.js @@ -1,11 +1,11 @@ import { addIndex, map } from 'ramda'; -import { networkConnection, sizePropTypes } from 'models'; +import { networkConnection, sizePropTypes } from '@models'; -import NodeConnection from 'components/NodeConnection'; -import NodeDivider from 'components/NodeDivider'; +import NodeConnection from '@components/NodeConnection'; +import NodeDivider from '@components/NodeDivider'; import PropTypes from 'prop-types'; import React from 'react'; -import SvgText from 'components/SvgText'; +import SvgText from '@components/SvgText'; const mapIndexed = addIndex(map); const mapConnectionsCreator = cy => mapIndexed(({ networkName, ...props }, index) => ( diff --git a/src/components/NodeConnections/enhance.js b/src/components/NodeConnections/enhance.js index f5c166b..2493205 100644 --- a/src/components/NodeConnections/enhance.js +++ b/src/components/NodeConnections/enhance.js @@ -5,11 +5,11 @@ import { renderNothing, withProps, } from 'recompose'; -import { getNodeConnectionsHeight, getNodeConnectionsOffset } from 'utils/node-size'; +import { getNodeConnectionsHeight, getNodeConnectionsOffset } from '@utils/node-size'; import { not, path, pipe } from 'ramda'; -import { NODE_PADDING } from 'constants/node'; -import { hasConnections } from 'validations/node'; +import { NODE_PADDING } from '@constants/node'; +import { hasConnections } from '@validations/node'; const pathConnections = path(['linkedNode', 'connections']); const hasNoLinkedNodes = pipe(hasConnections, not); diff --git a/src/components/NodeCptEditTable/index.js b/src/components/NodeCptEditTable/index.js index 3b3ee22..61e90b1 100644 --- a/src/components/NodeCptEditTable/index.js +++ b/src/components/NodeCptEditTable/index.js @@ -1,15 +1,16 @@ -import React from 'react'; -import EditNodeCptTableRow from 'components/EditNodeCptTableRow'; import { - set, - toString, complement, isNil, lensPath, + set, + toString, } from 'ramda'; +import { cptWithParentsPropTypes, cptWithoutParentsPropTypes, statePropTypes } from '@models'; + +import EditNodeCptTableRow from '@components/EditNodeCptTableRow'; +import NodeCptStatesThead from '@components/NodeCptStatesThead'; import PropTypes from 'prop-types'; -import { statePropTypes, cptWithoutParentsPropTypes, cptWithParentsPropTypes } from 'models'; -import NodeCptStatesThead from 'components/NodeCptStatesThead'; +import React from 'react'; const isNotNil = complement(isNil); diff --git a/src/components/NodeCptEditTable/index.test.js b/src/components/NodeCptEditTable/index.test.js index e89f412..67b4c10 100644 --- a/src/components/NodeCptEditTable/index.test.js +++ b/src/components/NodeCptEditTable/index.test.js @@ -1,8 +1,9 @@ +import { fireEvent, render } from '@testing-library/react'; + +import NodeCptEditTable from './index'; import React from 'react'; -import { render, fireEvent } from '@testing-library/react'; -import { getComponentTestId } from 'utils/test-utils'; +import { getComponentTestId } from '@utils/test-utils'; import { head } from 'ramda'; -import NodeCptEditTable from './index'; const renderComponent = props => render( diff --git a/src/components/NodeCptParentStatesTable/index.js b/src/components/NodeCptParentStatesTable/index.js index 216aea2..aa60873 100644 --- a/src/components/NodeCptParentStatesTable/index.js +++ b/src/components/NodeCptParentStatesTable/index.js @@ -1,7 +1,7 @@ +import NodeCptStatesThead from '@components/NodeCptStatesThead'; import React from 'react'; +import { nodePropTypes } from '@models'; import { toString } from 'ramda'; -import { nodePropTypes } from 'models'; -import NodeCptStatesThead from 'components/NodeCptStatesThead'; const NodeCptParentStatesTable = ({ node: { parents, cpt } }) => ( diff --git a/src/components/NodeCptStatesThead/index.js b/src/components/NodeCptStatesThead/index.js index 7380daa..7300d0a 100644 --- a/src/components/NodeCptStatesThead/index.js +++ b/src/components/NodeCptStatesThead/index.js @@ -1,6 +1,6 @@ -import React from 'react'; -import { statePropTypes } from 'models'; import PropTypes from 'prop-types'; +import React from 'react'; +import { statePropTypes } from '@models'; const NodeCptStatesThead = ({ states }) => ( diff --git a/src/components/NodeMovingPlaceholder/index.js b/src/components/NodeMovingPlaceholder/index.js index aa3ce61..a28e4ce 100644 --- a/src/components/NodeMovingPlaceholder/index.js +++ b/src/components/NodeMovingPlaceholder/index.js @@ -1,10 +1,10 @@ import React, { Component } from 'react'; -import { elementInstancePropTypes, networkPropTypes, nodePropTypes } from 'models'; +import { elementInstancePropTypes, networkPropTypes, nodePropTypes } from '@models'; -import NodePlaceholder from 'components/NodePlaceholder'; +import NodePlaceholder from '@components/NodePlaceholder'; import PropTypes from 'prop-types'; -import SvgMousePosition from 'components/SvgMousePosition'; -import { subtractPositions } from 'utils/position'; +import SvgMousePosition from '@components/SvgMousePosition'; +import { subtractPositions } from '@utils/position'; class NodeMovingPlaceholder extends Component { componentDidMount() { diff --git a/src/components/NodeMovingPlaceholder/index.test.js b/src/components/NodeMovingPlaceholder/index.test.js index 53cd78a..184d6e1 100644 --- a/src/components/NodeMovingPlaceholder/index.test.js +++ b/src/components/NodeMovingPlaceholder/index.test.js @@ -1,8 +1,8 @@ -import NodePlaceholder from 'components/NodePlaceholder'; +import NodeMovingPlaceholder from './index'; +import NodePlaceholder from '@components/NodePlaceholder'; import React from 'react'; -import SvgMousePosition from 'components/SvgMousePosition'; +import SvgMousePosition from '@components/SvgMousePosition'; import { shallow } from 'enzyme'; -import NodeMovingPlaceholder from './index'; const svg = document.createElement('svg'); const shallowComponent = (props = {}) => shallow(); diff --git a/src/components/NodeState/component.js b/src/components/NodeState/component.js index 0abcf05..890b9c3 100644 --- a/src/components/NodeState/component.js +++ b/src/components/NodeState/component.js @@ -1,8 +1,8 @@ -import NodeStateBar from 'components/NodeStateBar'; +import NodeStateBar from '@components/NodeStateBar'; import PropTypes from 'prop-types'; import React from 'react'; -import SvgText from 'components/SvgText'; -import { getComponentTestId } from 'utils/test-utils'; +import SvgText from '@components/SvgText'; +import { getComponentTestId } from '@utils/test-utils'; const NodeState = ({ state, diff --git a/src/components/NodeState/enhance.js b/src/components/NodeState/enhance.js index 946bc85..09031ed 100644 --- a/src/components/NodeState/enhance.js +++ b/src/components/NodeState/enhance.js @@ -1,5 +1,5 @@ -import { NODE_PADDING } from 'constants/node'; -import { getNodeStatesOffset } from 'utils/node-size'; +import { NODE_PADDING } from '@constants/node'; +import { getNodeStatesOffset } from '@utils/node-size'; import { withProps } from 'recompose'; const enhance = withProps(({ index, width, ...props }) => { diff --git a/src/components/NodeStateEdit/index.js b/src/components/NodeStateEdit/index.js index 0018576..e30a323 100644 --- a/src/components/NodeStateEdit/index.js +++ b/src/components/NodeStateEdit/index.js @@ -1,10 +1,9 @@ -import React from 'react'; +import Button from '@components/Button'; +import Icon from '@components/Icon'; import PropTypes from 'prop-types'; - -import Button from 'components/Button'; -import Icon from 'components/Icon'; -import { bem } from 'utils/styles'; -import { getComponentTestId } from 'utils/test-utils'; +import React from 'react'; +import { bem } from '@utils/styles'; +import { getComponentTestId } from '@utils/test-utils'; import styles from './styles.scss'; const componentClassName = bem(styles); diff --git a/src/components/NodeStates/component.js b/src/components/NodeStates/component.js index b1a0d42..19b585b 100644 --- a/src/components/NodeStates/component.js +++ b/src/components/NodeStates/component.js @@ -1,5 +1,5 @@ +import NodeState from '@components/NodeState'; import React from 'react'; -import NodeState from 'components/NodeState'; const NodeStates = ({ id, diff --git a/src/components/NodeStates/enhance.js b/src/components/NodeStates/enhance.js index 4b358b4..7d43774 100644 --- a/src/components/NodeStates/enhance.js +++ b/src/components/NodeStates/enhance.js @@ -7,8 +7,8 @@ import { } from 'recompose'; import { not, pipe } from 'ramda'; -import { getNodeStateHeight } from 'utils/node-size'; -import { hasStates } from 'validations/node'; +import { getNodeStateHeight } from '@utils/node-size'; +import { hasStates } from '@validations/node'; const hasNoStates = pipe(hasStates, not); diff --git a/src/components/NodeStatesEditList/index.js b/src/components/NodeStatesEditList/index.js index ac18d81..fc0045f 100644 --- a/src/components/NodeStatesEditList/index.js +++ b/src/components/NodeStatesEditList/index.js @@ -1,8 +1,8 @@ -import React from 'react'; -import NodeStateEdit from 'components/NodeStateEdit'; +import NodeStateEdit from '@components/NodeStateEdit'; import PropTypes from 'prop-types'; -import { statePropTypes } from 'models'; -import { bem } from 'utils/styles'; +import React from 'react'; +import { bem } from '@utils/styles'; +import { statePropTypes } from '@models'; import styles from './styles.scss'; const componentClassName = bem(styles); diff --git a/src/components/Nodes/component.js b/src/components/Nodes/component.js index c279a7a..ae6034a 100644 --- a/src/components/Nodes/component.js +++ b/src/components/Nodes/component.js @@ -1,5 +1,5 @@ +import Node from '@components/Node'; import React from 'react'; -import Node from 'components/Node'; const Nodes = ({ nodes, diff --git a/src/components/PropertiesNetwork/index.js b/src/components/PropertiesNetwork/index.js index 5ea4478..4f5bc69 100644 --- a/src/components/PropertiesNetwork/index.js +++ b/src/components/PropertiesNetwork/index.js @@ -1,20 +1,20 @@ import React, { Component } from 'react'; - -import PropTypes from 'prop-types'; +import { camelCase, upperFirst } from 'lodash'; +import { getNetwork, getNetworkKind } from '@selectors'; import { - onUpdateNetworkName, onUpdateNetworkDescription, onUpdateNetworkHeight, - onUpdateNetworkWidth, onUpdateNetworkInferenceEnabled, -} from 'actions/network'; -import { getNetwork, getNetworkKind } from 'selectors'; -import { connectify } from 'decorators'; -import { NETWORK_KINDS } from 'constants/network'; -import { getComponentTestId } from 'utils/test-utils'; -import { networkPropTypes } from 'models'; -import { upperFirst, camelCase } from 'lodash'; + onUpdateNetworkName, + onUpdateNetworkWidth, +} from '@actions/network'; + +import { NETWORK_KINDS } from '@constants/network'; +import PropTypes from 'prop-types'; +import { connectify } from '@decorators'; +import { getComponentTestId } from '@utils/test-utils'; import { invoker } from 'ramda'; +import { networkPropTypes } from '@models'; import styles from './styles.css'; class PropertiesNetwork extends Component { diff --git a/src/components/PropertiesNode/component.js b/src/components/PropertiesNode/component.js index 0cb16b2..ec69f1a 100644 --- a/src/components/PropertiesNode/component.js +++ b/src/components/PropertiesNode/component.js @@ -1,23 +1,23 @@ -import React, { useState, useEffect, useCallback } from 'react'; -import PropTypes from 'prop-types'; +import React, { useCallback, useEffect, useState } from 'react'; import { - equals, + both, complement, + defaultTo, + equals, isEmpty, - propEq, + none, + not, path, pipe, - defaultTo, prop, - both, - not, - none, + propEq, } from 'ramda'; -import { getComponentTestId } from 'utils/test-utils'; -import { nodePropTypes } from 'models'; -import { isEnterKey } from 'utils/event'; import Button from '../Button'; +import PropTypes from 'prop-types'; +import { getComponentTestId } from '@utils/test-utils'; +import { isEnterKey } from '@utils/event'; +import { nodePropTypes } from '@models'; import styles from './styles.css'; const isNotEmpty = complement(isEmpty); diff --git a/src/components/PropertiesNode/enhance.js b/src/components/PropertiesNode/enhance.js index 4425dec..245d43f 100644 --- a/src/components/PropertiesNode/enhance.js +++ b/src/components/PropertiesNode/enhance.js @@ -1,9 +1,9 @@ -import { changeNodeDescription, changeNodeId } from 'actions'; +import { changeNodeDescription, changeNodeId } from '@actions'; -import { getNodes } from 'selectors'; -import { connectify } from 'decorators'; -import { onEditingNodeCpt } from 'actions/editing-node-cpt'; -import { onEditingNodeStates } from 'actions/editing-node-states'; +import { connectify } from '@decorators'; +import { getNodes } from '@selectors'; +import { onEditingNodeCpt } from '@actions/editing-node-cpt'; +import { onEditingNodeStates } from '@actions/editing-node-states'; const enhance = connectify({ nodes: getNodes, diff --git a/src/components/PropertiesPanel/index.js b/src/components/PropertiesPanel/index.js index 267b7a0..4c4cc22 100644 --- a/src/components/PropertiesPanel/index.js +++ b/src/components/PropertiesPanel/index.js @@ -1,12 +1,12 @@ import React, { Component } from 'react'; -import { getSelectedNode, getSelectedSubnetwork } from 'selectors'; -import { nodePropTypes, subnetworkPropTypes } from 'models'; +import { getSelectedNode, getSelectedSubnetwork } from '@selectors'; +import { nodePropTypes, subnetworkPropTypes } from '@models'; +import GenericPanel from '@components/GenericPanel'; import PropTypes from 'prop-types'; -import GenericPanel from 'components/GenericPanel'; -import PropertiesNetwork from 'components/PropertiesNetwork'; -import PropertiesNode from 'components/PropertiesNode'; -import PropertiesSuperNode from 'components/PropertiesSuperNode'; +import PropertiesNetwork from '@components/PropertiesNetwork'; +import PropertiesNode from '@components/PropertiesNode'; +import PropertiesSuperNode from '@components/PropertiesSuperNode'; import { connect } from 'react-redux'; import styles from './styles.css'; diff --git a/src/components/PropertiesSuperNode/index.js b/src/components/PropertiesSuperNode/index.js index 07edebe..a3b9053 100644 --- a/src/components/PropertiesSuperNode/index.js +++ b/src/components/PropertiesSuperNode/index.js @@ -1,9 +1,9 @@ import React, { Component } from 'react'; -import PropTypes from 'prop-types'; -import { subnetworkPropTypes } from 'models'; import Button from '../Button'; +import PropTypes from 'prop-types'; import styles from './styles.css'; +import { subnetworkPropTypes } from '@models'; class PropertiesSuperNode extends Component { getDrescription = (subnetwork) => { diff --git a/src/components/SubNetwork/index.js b/src/components/SubNetwork/index.js index 9e13e35..b46040d 100644 --- a/src/components/SubNetwork/index.js +++ b/src/components/SubNetwork/index.js @@ -1,19 +1,18 @@ -import Network from 'components/Network'; import React, { Component } from 'react'; -import Modal from 'components/Modal'; import { linkedNodePropTypes, networkPropTypes, nodePropTypes, subNetworkInferenceResultsPropTypes, -} from 'models'; -import { propEq } from 'ramda'; +} from '@models'; +import Modal from '@components/Modal'; +import Network from '@components/Network'; import PropTypes from 'prop-types'; -import { getArrowsPositions } from 'utils/arrows-positions'; -import { getNodeSize } from 'utils/node-size'; +import { getArrowsPositions } from '@utils/arrows-positions'; +import { getNodeSize } from '@utils/node-size'; import { noop } from 'lodash'; - +import { propEq } from 'ramda'; class SubNetwork extends Component { state = { diff --git a/src/components/SvgMousePosition/component.js b/src/components/SvgMousePosition/component.js index eed9485..68ea475 100644 --- a/src/components/SvgMousePosition/component.js +++ b/src/components/SvgMousePosition/component.js @@ -2,7 +2,7 @@ import { noop, throttle } from 'lodash'; import { Component } from 'react'; import PropTypes from 'prop-types'; -import { elementInstancePropTypes } from 'models'; +import { elementInstancePropTypes } from '@models'; class SvgMousePosition extends Component { state = { diff --git a/src/components/SvgText/component.js b/src/components/SvgText/component.js index 2b967e3..a464b29 100644 --- a/src/components/SvgText/component.js +++ b/src/components/SvgText/component.js @@ -1,6 +1,6 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { getComponentTestId } from 'utils/test-utils'; +import { getComponentTestId } from '@utils/test-utils'; const style = { margin: 0, diff --git a/src/index.js b/src/index.js index 0f7cfee..ffdc8c4 100644 --- a/src/index.js +++ b/src/index.js @@ -1,13 +1,13 @@ import 'normalize.css'; import 'font-awesome/css/font-awesome.css'; -import App from 'components/App'; +import App from '@components/App'; import Modal from 'react-modal'; import { Provider } from 'react-redux'; import React from 'react'; -import { render } from 'react-dom'; import configureStore from './store/configureStore'; import { loadState } from './middlewares/persistState'; +import { render } from 'react-dom'; const preloadedState = loadState(); const store = configureStore(preloadedState); diff --git a/src/middlewares/persistState.js b/src/middlewares/persistState.js index 4f1c360..2655438 100644 --- a/src/middlewares/persistState.js +++ b/src/middlewares/persistState.js @@ -1,5 +1,5 @@ -import { PERSIST_STATE } from 'actions'; -import { getStateToSave } from 'selectors'; +import { PERSIST_STATE } from '@actions'; +import { getStateToSave } from '@selectors'; export const persistState = store => next => (action) => { if (action.type !== PERSIST_STATE) { diff --git a/src/models/network.js b/src/models/network.js index 46d50d6..b097fdf 100644 --- a/src/models/network.js +++ b/src/models/network.js @@ -1,8 +1,8 @@ import PropTypes, { shape } from 'prop-types'; -import { nodePropTypes } from 'models/node'; -import { positionPropTypes } from 'models/position'; -import { linkagesPropTypes } from 'models/linkage'; +import { linkagesPropTypes } from '@models/linkage'; +import { nodePropTypes } from '@models/node'; +import { positionPropTypes } from '@models/position'; const beliefsPropTypes = PropTypes.objectOf(PropTypes.string); const beliefsMSBNPropTypes = PropTypes.objectOf(beliefsPropTypes); diff --git a/src/models/state-to-save.js b/src/models/state-to-save.js index e62fe1a..0e4baf5 100644 --- a/src/models/state-to-save.js +++ b/src/models/state-to-save.js @@ -1,8 +1,8 @@ import PropTypes, { shape } from 'prop-types'; -import { networkPropTypes } from 'models/network'; -import { nodePropTypes } from 'models/node'; -import { positionPropTypes } from 'models/position'; +import { networkPropTypes } from '@models/network'; +import { nodePropTypes } from '@models/node'; +import { positionPropTypes } from '@models/position'; export const stateToSavePropTypes = shape({ version: PropTypes.number.isRequired, diff --git a/src/reducers/arrows.js b/src/reducers/arrows.js index 06bcb72..5cb21cf 100644 --- a/src/reducers/arrows.js +++ b/src/reducers/arrows.js @@ -1,6 +1,6 @@ import { NEW_NETWORK, -} from 'actions'; +} from '@actions'; export default (state = [], action) => { switch (action.type) { diff --git a/src/reducers/arrows.test.js b/src/reducers/arrows.test.js index dc6a218..a29c48b 100644 --- a/src/reducers/arrows.test.js +++ b/src/reducers/arrows.test.js @@ -1,6 +1,6 @@ import { NEW_NETWORK, -} from 'actions'; +} from '@actions'; import reducer from './arrows'; describe('Arrows Reducers', () => { diff --git a/src/reducers/editing-node-cpt.js b/src/reducers/editing-node-cpt.js index ffae1ed..c2b9447 100644 --- a/src/reducers/editing-node-cpt.js +++ b/src/reducers/editing-node-cpt.js @@ -1,8 +1,8 @@ import { - EDITING_NODE_CPT, CANCEL_EDITING_NODE_CPT, + EDITING_NODE_CPT, SAVE_EDITING_NODE_CPT, -} from 'constants/editing-node-cpt'; +} from '@constants/editing-node-cpt'; import { path, pick, pipe } from 'ramda'; const pickNodeProps = pick(['id', 'cpt', 'states', 'parents']); diff --git a/src/reducers/editing-node-cpt.test.js b/src/reducers/editing-node-cpt.test.js index e5e6190..bf8c86c 100644 --- a/src/reducers/editing-node-cpt.test.js +++ b/src/reducers/editing-node-cpt.test.js @@ -1,8 +1,9 @@ import { - EDITING_NODE_CPT, CANCEL_EDITING_NODE_CPT, + EDITING_NODE_CPT, SAVE_EDITING_NODE_CPT, -} from 'constants/editing-node-cpt'; +} from '@constants/editing-node-cpt'; + import reducer from './editing-node-cpt'; describe('EditingNodeCpt Reducers', () => { diff --git a/src/reducers/editing-node-states.js b/src/reducers/editing-node-states.js index 96bf2b4..30ba257 100644 --- a/src/reducers/editing-node-states.js +++ b/src/reducers/editing-node-states.js @@ -1,8 +1,8 @@ import { - EDITING_NODE_STATES, CANCEL_EDITING_NODE_STATES, + EDITING_NODE_STATES, SAVE_EDITING_NODE_STATES, -} from 'constants/editing-node-states'; +} from '@constants/editing-node-states'; import { path, pick, pipe } from 'ramda'; const pickNodeProps = pick(['id', 'cpt', 'states', 'parents']); diff --git a/src/reducers/editing-node-states.test.js b/src/reducers/editing-node-states.test.js index 2921b23..0dfce04 100644 --- a/src/reducers/editing-node-states.test.js +++ b/src/reducers/editing-node-states.test.js @@ -1,8 +1,9 @@ import { - EDITING_NODE_STATES, CANCEL_EDITING_NODE_STATES, + EDITING_NODE_STATES, SAVE_EDITING_NODE_STATES, -} from 'constants/editing-node-states'; +} from '@constants/editing-node-states'; + import reducer from './editing-node-states'; describe('EditingNodeStates Reducers', () => { diff --git a/src/reducers/network/beliefs.js b/src/reducers/network/beliefs.js index c2246c0..2fc9f92 100644 --- a/src/reducers/network/beliefs.js +++ b/src/reducers/network/beliefs.js @@ -1,6 +1,7 @@ -import { SET_BELIEF, LOAD_NETWORK, NEW_NETWORK } from 'actions'; -import { over, lensPath } from 'ramda'; -import { updateNetworkBelief } from 'utils/network'; +import { LOAD_NETWORK, NEW_NETWORK, SET_BELIEF } from '@actions'; +import { lensPath, over } from 'ramda'; + +import { updateNetworkBelief } from '@utils/network'; const defaultValue = {}; diff --git a/src/reducers/network/beliefs.test.js b/src/reducers/network/beliefs.test.js index 825b090..7e9d46d 100644 --- a/src/reducers/network/beliefs.test.js +++ b/src/reducers/network/beliefs.test.js @@ -1,4 +1,5 @@ -import { SET_BELIEF, LOAD_NETWORK, NEW_NETWORK } from 'actions'; +import { LOAD_NETWORK, NEW_NETWORK, SET_BELIEF } from '@actions'; + import reducer from './beliefs'; describe('Network Beliefs Reducer', () => { diff --git a/src/reducers/network/description.js b/src/reducers/network/description.js index 72b7900..e9e3224 100644 --- a/src/reducers/network/description.js +++ b/src/reducers/network/description.js @@ -2,8 +2,8 @@ import { LOAD_NETWORK, NEW_NETWORK, UPDATE_NETWORK_DESCRIPTION, -} from 'actions'; -import { pathOr, path } from 'ramda'; +} from '@actions'; +import { path, pathOr } from 'ramda'; const defaultValue = ''; const getNetworkDescription = pathOr(defaultValue, ['payload', 'state', 'network', 'description']); diff --git a/src/reducers/network/description.test.js b/src/reducers/network/description.test.js index f91a7d2..a83d145 100644 --- a/src/reducers/network/description.test.js +++ b/src/reducers/network/description.test.js @@ -1,8 +1,9 @@ import { - UPDATE_NETWORK_DESCRIPTION, LOAD_NETWORK, NEW_NETWORK, -} from 'actions'; + UPDATE_NETWORK_DESCRIPTION, +} from '@actions'; + import reducer from './description'; describe('Network Description Reducer', () => { diff --git a/src/reducers/network/height.js b/src/reducers/network/height.js index 8522952..6ba28de 100644 --- a/src/reducers/network/height.js +++ b/src/reducers/network/height.js @@ -1,9 +1,9 @@ import { - UPDATE_NETWORK_HEIGHT, LOAD_NETWORK, NEW_NETWORK, -} from 'actions'; -import { pathOr, path } from 'ramda'; + UPDATE_NETWORK_HEIGHT, +} from '@actions'; +import { path, pathOr } from 'ramda'; const defaultValue = 500; const getNetworkHeight = pathOr(defaultValue, ['payload', 'state', 'network', 'height']); diff --git a/src/reducers/network/height.test.js b/src/reducers/network/height.test.js index 9dea60d..75a9f38 100644 --- a/src/reducers/network/height.test.js +++ b/src/reducers/network/height.test.js @@ -1,8 +1,9 @@ import { - UPDATE_NETWORK_HEIGHT, LOAD_NETWORK, NEW_NETWORK, -} from 'actions'; + UPDATE_NETWORK_HEIGHT, +} from '@actions'; + import reducer from './height'; describe('Network Height Reducer', () => { diff --git a/src/reducers/network/id.js b/src/reducers/network/id.js index 198a500..dc1f7a4 100644 --- a/src/reducers/network/id.js +++ b/src/reducers/network/id.js @@ -1,6 +1,7 @@ +import { LOAD_NETWORK, NEW_NETWORK } from '@actions'; +import { either, path } from 'ramda'; + import { v4 } from 'uuid'; -import { NEW_NETWORK, LOAD_NETWORK } from 'actions'; -import { path, either } from 'ramda'; const getNetworkId = either( path(['payload', 'state', 'network', 'id']), diff --git a/src/reducers/network/id.test.js b/src/reducers/network/id.test.js index 776f218..185f2e9 100644 --- a/src/reducers/network/id.test.js +++ b/src/reducers/network/id.test.js @@ -1,4 +1,5 @@ -import { LOAD_NETWORK, NEW_NETWORK } from 'actions'; +import { LOAD_NETWORK, NEW_NETWORK } from '@actions'; + import reducer from './id'; describe('Network Id Reducer', () => { diff --git a/src/reducers/network/inferenceEnabled.js b/src/reducers/network/inferenceEnabled.js index 745023b..40df1bd 100644 --- a/src/reducers/network/inferenceEnabled.js +++ b/src/reducers/network/inferenceEnabled.js @@ -1,9 +1,9 @@ import { - UPDATE_NETWORK_INFERENCE_ENABLED, LOAD_NETWORK, NEW_NETWORK, -} from 'actions'; -import { pathOr, path } from 'ramda'; + UPDATE_NETWORK_INFERENCE_ENABLED, +} from '@actions'; +import { path, pathOr } from 'ramda'; const defaultValue = true; const getNetworkInfenceEnabled = pathOr(defaultValue, ['payload', 'state', 'network', 'inferenceEnabled']); diff --git a/src/reducers/network/inferenceEnabled.test.js b/src/reducers/network/inferenceEnabled.test.js index 63211e9..7f57beb 100644 --- a/src/reducers/network/inferenceEnabled.test.js +++ b/src/reducers/network/inferenceEnabled.test.js @@ -1,8 +1,9 @@ import { - UPDATE_NETWORK_INFERENCE_ENABLED, LOAD_NETWORK, NEW_NETWORK, -} from 'actions'; + UPDATE_NETWORK_INFERENCE_ENABLED, +} from '@actions'; + import reducer from './inferenceEnabled'; describe('Network InferenceEnabled Reducer', () => { diff --git a/src/reducers/network/kind.js b/src/reducers/network/kind.js index b0903ab..ae1cfe7 100644 --- a/src/reducers/network/kind.js +++ b/src/reducers/network/kind.js @@ -1,6 +1,7 @@ -import { NEW_NETWORK, LOAD_NETWORK } from 'actions'; -import { NETWORK_KINDS } from 'constants/network'; -import { always, path, either } from 'ramda'; +import { LOAD_NETWORK, NEW_NETWORK } from '@actions'; +import { always, either, path } from 'ramda'; + +import { NETWORK_KINDS } from '@constants/network'; const defaultValue = NETWORK_KINDS.BN; const getNetworKind = either( diff --git a/src/reducers/network/kind.test.js b/src/reducers/network/kind.test.js index 9c781ae..fae7eb5 100644 --- a/src/reducers/network/kind.test.js +++ b/src/reducers/network/kind.test.js @@ -1,5 +1,6 @@ -import { NEW_NETWORK, LOAD_NETWORK } from 'actions'; -import { NETWORK_KINDS } from 'constants/network'; +import { LOAD_NETWORK, NEW_NETWORK } from '@actions'; + +import { NETWORK_KINDS } from '@constants/network'; import reducer from './kind'; describe('Network Kind Reducer', () => { diff --git a/src/reducers/network/linkages.js b/src/reducers/network/linkages.js index 9849270..ada3767 100644 --- a/src/reducers/network/linkages.js +++ b/src/reducers/network/linkages.js @@ -3,10 +3,13 @@ import { LOAD_NETWORK, NEW_NETWORK, REMOVE_LINKAGE, -} from 'actions'; - +} from '@actions'; import { - dissoc, path, assoc, defaultTo, pipe, + assoc, + defaultTo, + dissoc, + path, + pipe, } from 'ramda'; const getLinkagesFromAction = path(['payload', 'state', 'network', 'linkages']); diff --git a/src/reducers/network/linkages.test.js b/src/reducers/network/linkages.test.js index 38fce0a..ac3ff20 100644 --- a/src/reducers/network/linkages.test.js +++ b/src/reducers/network/linkages.test.js @@ -3,7 +3,7 @@ import { LOAD_NETWORK, NEW_NETWORK, REMOVE_LINKAGE, -} from 'actions'; +} from '@actions'; import reducer from './linkages'; diff --git a/src/reducers/network/name.js b/src/reducers/network/name.js index a91f4e8..7f27e86 100644 --- a/src/reducers/network/name.js +++ b/src/reducers/network/name.js @@ -1,9 +1,9 @@ import { - UPDATE_NETWORK_NAME, LOAD_NETWORK, NEW_NETWORK, -} from 'actions'; -import { pathOr, path } from 'ramda'; + UPDATE_NETWORK_NAME, +} from '@actions'; +import { path, pathOr } from 'ramda'; const defaultValue = 'Rede Bayesiana'; const getNetworkName = pathOr(defaultValue, ['payload', 'state', 'network', 'name']); diff --git a/src/reducers/network/name.test.js b/src/reducers/network/name.test.js index 1f5cc55..7277dd2 100644 --- a/src/reducers/network/name.test.js +++ b/src/reducers/network/name.test.js @@ -1,8 +1,8 @@ import { - UPDATE_NETWORK_NAME, LOAD_NETWORK, NEW_NETWORK, -} from 'actions'; + UPDATE_NETWORK_NAME, +} from '@actions'; import reducer from './name'; diff --git a/src/reducers/network/nodes.js b/src/reducers/network/nodes.js index fa1df85..fa57ff8 100644 --- a/src/reducers/network/nodes.js +++ b/src/reducers/network/nodes.js @@ -7,7 +7,7 @@ import { NEW_NETWORK, REMOVE_NODE, REMOVE_PARENT, -} from 'actions'; +} from '@actions'; import { T, allPass, @@ -33,7 +33,7 @@ import { addNodeParent, changeNodeParentName, filterNodeParents, -} from 'utils/node-parents'; +} from '@utils/node-parents'; import { addNodeParentInCpt, createCpt, @@ -41,13 +41,13 @@ import { updateNodeParentIdInCpt, updateNodeParentStatesInCpt, updateStatesInCpt, -} from 'utils/node-cpt'; -import { findNodeById, removeNodeById } from 'utils/node'; +} from '@utils/node-cpt'; +import { findNodeById, removeNodeById } from '@utils/node'; -import { SAVE_EDITING_NODE_CPT } from 'constants/editing-node-cpt'; -import { SAVE_EDITING_NODE_STATES } from 'constants/editing-node-states'; -import { containsParentInNode } from 'validations/node'; -import { hasCycleAddingNodeParent } from 'validations/network'; +import { SAVE_EDITING_NODE_CPT } from '@constants/editing-node-cpt'; +import { SAVE_EDITING_NODE_STATES } from '@constants/editing-node-states'; +import { containsParentInNode } from '@validations/node'; +import { hasCycleAddingNodeParent } from '@validations/network'; const propId = prop('id'); const propStates = prop('states'); diff --git a/src/reducers/network/nodes.test.js b/src/reducers/network/nodes.test.js index 73f8dc1..7b97618 100644 --- a/src/reducers/network/nodes.test.js +++ b/src/reducers/network/nodes.test.js @@ -1,15 +1,3 @@ -import NetworkChangeStatesInitial from 'json-templates/networks/change-states/initial.json'; -import NetworkChangeNodeStatesWithParents from 'json-templates/networks/change-states/node-with-parents.json'; -import NetworkChangeNodeStatesWithoutParents from 'json-templates/networks/change-states/node-without-parents.json'; -import NetworkChangeCptInitial from 'json-templates/networks/change-cpt/initial.json'; -import NetworkChangeNodeCpt from 'json-templates/networks/change-cpt/updated.json'; -import NetworkChangeParentsNotConnected from 'json-templates/networks/change-parents/not-connected.json'; -import NetworkChangeParentsConnectedWithParents from 'json-templates/networks/change-parents/connected-with-parents.json'; -import NetworkChangeParentsConnectedWithoutParents from 'json-templates/networks/change-parents/connected-without-parents.json'; -import NetworkChangeIdInitial from 'json-templates/networks/change-id/initial.json'; -import NetworkChangeIdUpdated from 'json-templates/networks/change-id/updated.json'; -import NetworkRemoveNodeInitial from 'json-templates/networks/remove-node/initial.json'; -import NetworkRemoveNodeUpdated from 'json-templates/networks/remove-node/updated.json'; import { ADD_NODE, ADD_PARENT, @@ -19,9 +7,22 @@ import { NEW_NETWORK, REMOVE_NODE, REMOVE_PARENT, -} from 'actions'; -import { SAVE_EDITING_NODE_CPT } from 'constants/editing-node-cpt'; -import { SAVE_EDITING_NODE_STATES } from 'constants/editing-node-states'; +} from '@actions'; + +import NetworkChangeCptInitial from '@json-templates/networks/change-cpt/initial.json'; +import NetworkChangeIdInitial from '@json-templates/networks/change-id/initial.json'; +import NetworkChangeIdUpdated from '@json-templates/networks/change-id/updated.json'; +import NetworkChangeNodeCpt from '@json-templates/networks/change-cpt/updated.json'; +import NetworkChangeNodeStatesWithParents from '@json-templates/networks/change-states/node-with-parents.json'; +import NetworkChangeNodeStatesWithoutParents from '@json-templates/networks/change-states/node-without-parents.json'; +import NetworkChangeParentsConnectedWithParents from '@json-templates/networks/change-parents/connected-with-parents.json'; +import NetworkChangeParentsConnectedWithoutParents from '@json-templates/networks/change-parents/connected-without-parents.json'; +import NetworkChangeParentsNotConnected from '@json-templates/networks/change-parents/not-connected.json'; +import NetworkChangeStatesInitial from '@json-templates/networks/change-states/initial.json'; +import NetworkRemoveNodeInitial from '@json-templates/networks/remove-node/initial.json'; +import NetworkRemoveNodeUpdated from '@json-templates/networks/remove-node/updated.json'; +import { SAVE_EDITING_NODE_CPT } from '@constants/editing-node-cpt'; +import { SAVE_EDITING_NODE_STATES } from '@constants/editing-node-states'; import reducer from './nodes'; describe('Nodes Reducer', () => { diff --git a/src/reducers/network/positions.js b/src/reducers/network/positions.js index 45de974..fa84497 100644 --- a/src/reducers/network/positions.js +++ b/src/reducers/network/positions.js @@ -6,17 +6,17 @@ import { LOAD_NETWORK, NEW_NETWORK, REMOVE_NODE, -} from 'actions'; +} from '@actions'; import { assoc, - path, - prop, - pipe, dissoc, - over, - lens, identity, + lens, + over, + path, pick, + pipe, + prop, } from 'ramda'; const propPayload = prop('payload'); diff --git a/src/reducers/network/positions.test.js b/src/reducers/network/positions.test.js index f5c139a..e938787 100644 --- a/src/reducers/network/positions.test.js +++ b/src/reducers/network/positions.test.js @@ -6,7 +6,8 @@ import { LOAD_NETWORK, NEW_NETWORK, REMOVE_NODE, -} from 'actions'; +} from '@actions'; + import reducer from './positions'; const positions = { diff --git a/src/reducers/network/propertiesPanelVisible.js b/src/reducers/network/propertiesPanelVisible.js index 44a2ed0..777c540 100644 --- a/src/reducers/network/propertiesPanelVisible.js +++ b/src/reducers/network/propertiesPanelVisible.js @@ -1,9 +1,9 @@ import { - UPDATE_NETWORK_PROPERTIES_PANEL_VISIBLE, LOAD_NETWORK, NEW_NETWORK, -} from 'actions'; -import { pathOr, path } from 'ramda'; + UPDATE_NETWORK_PROPERTIES_PANEL_VISIBLE, +} from '@actions'; +import { path, pathOr } from 'ramda'; const defaultValue = true; const getNetworkPropertiesPanelVisible = pathOr(defaultValue, ['payload', 'state', 'network', 'propertiesPanelVisible']); diff --git a/src/reducers/network/propertiesPanelVisible.test.js b/src/reducers/network/propertiesPanelVisible.test.js index 0f82228..0486fa1 100644 --- a/src/reducers/network/propertiesPanelVisible.test.js +++ b/src/reducers/network/propertiesPanelVisible.test.js @@ -1,8 +1,8 @@ import { - UPDATE_NETWORK_PROPERTIES_PANEL_VISIBLE, LOAD_NETWORK, NEW_NETWORK, -} from 'actions'; + UPDATE_NETWORK_PROPERTIES_PANEL_VISIBLE, +} from '@actions'; import reducer from './propertiesPanelVisible'; diff --git a/src/reducers/network/selectedNodes.js b/src/reducers/network/selectedNodes.js index b110f0f..63a6be3 100644 --- a/src/reducers/network/selectedNodes.js +++ b/src/reducers/network/selectedNodes.js @@ -1,12 +1,13 @@ import { - UPDATE_NETWORK_SELECTED_NODES, - REMOVE_NODE, CHANGE_NODE_ID, LOAD_NETWORK, NEW_NETWORK, -} from 'actions'; -import { updateSelectedNodesId } from 'utils/network'; + REMOVE_NODE, + UPDATE_NETWORK_SELECTED_NODES, +} from '@actions'; + import { path } from 'ramda'; +import { updateSelectedNodesId } from '@utils/network'; const defaultValue = []; const getSelectedNodes = path(['payload', 'selectedNodes']); diff --git a/src/reducers/network/selectedNodes.test.js b/src/reducers/network/selectedNodes.test.js index f37369c..5a79a5e 100644 --- a/src/reducers/network/selectedNodes.test.js +++ b/src/reducers/network/selectedNodes.test.js @@ -1,12 +1,12 @@ import { - UPDATE_NETWORK_SELECTED_NODES, CHANGE_NODE_ID, - REMOVE_NODE, LOAD_NETWORK, NEW_NETWORK, -} from 'actions'; -import reducer from './selectedNodes'; + REMOVE_NODE, + UPDATE_NETWORK_SELECTED_NODES, +} from '@actions'; +import reducer from './selectedNodes'; describe('Network SelectedNodes Reducer', () => { describe('DEFAULT', () => { diff --git a/src/reducers/network/subnetworks.js b/src/reducers/network/subnetworks.js index 263441c..b26c1a1 100644 --- a/src/reducers/network/subnetworks.js +++ b/src/reducers/network/subnetworks.js @@ -4,19 +4,18 @@ import { NEW_NETWORK, REMOVE_SUPER_NODE, SET_BELIEF, -} from 'actions'; - -import { getRandomColor } from 'utils/colors'; +} from '@actions'; import { - map, + identity, ifElse, - over, lensProp, + map, + over, propEq, - identity, } from 'ramda'; -import { updateNetworkBelief } from 'utils/network'; +import { getRandomColor } from '@utils/colors'; +import { updateNetworkBelief } from '@utils/network'; const formatNetwork = (state) => { const { network, positions, nodes } = state; diff --git a/src/reducers/network/subnetworks.test.js b/src/reducers/network/subnetworks.test.js index c38140c..5e9d351 100644 --- a/src/reducers/network/subnetworks.test.js +++ b/src/reducers/network/subnetworks.test.js @@ -1,20 +1,23 @@ -import InitialSubnetworksMsbnAddBelief from 'json-templates/subnetworks/add-belief/msbn/initial.json'; -import InitialSubnetworksMsbnChangeBelief from 'json-templates/subnetworks/change-belief/msbn/initial.json'; -import InitialSubnetworksMsbnRemoveBelief from 'json-templates/subnetworks/remove-belief/msbn/initial.json'; -import UpdatedSubnetworksMsbnAddBelief from 'json-templates/subnetworks/add-belief/msbn/updated.json'; -import UpdatedSubnetworksMsbnChangeBelief from 'json-templates/subnetworks/change-belief/msbn/updated.json'; -import UpdatedSubnetworksMsbnRemoveBelief from 'json-templates/subnetworks/remove-belief/msbn/updated.json'; - import { ADD_SUPER_NODE, LOAD_NETWORK, NEW_NETWORK, REMOVE_SUPER_NODE, SET_BELIEF, -} from 'actions'; - +} from '@actions'; + +import InitialSubnetworksMsbnAddBelief from '@json-templates/subnetworks/add-belief/msbn/initial.json'; +import InitialSubnetworksMsbnChangeBelief from '@json-templates/subnetworks/change-belief/msbn/initial.json'; +import InitialSubnetworksMsbnRemoveBelief from '@json-templates/subnetworks/remove-belief/msbn/initial.json'; +import UpdatedSubnetworksMsbnAddBelief from '@json-templates/subnetworks/add-belief/msbn/updated.json'; +import UpdatedSubnetworksMsbnChangeBelief from '@json-templates/subnetworks/change-belief/msbn/updated.json'; +import UpdatedSubnetworksMsbnRemoveBelief from '@json-templates/subnetworks/remove-belief/msbn/updated.json'; import reducer from './subnetworks'; +jest.mock('@utils/colors', () => ({ + getRandomColor: () => '#FFFF00', +})); + describe('Subnetwork Reducers', () => { describe('DEFAULT', () => { it('returns an empty array', () => { diff --git a/src/reducers/network/width.js b/src/reducers/network/width.js index 62a1dbd..988ee17 100644 --- a/src/reducers/network/width.js +++ b/src/reducers/network/width.js @@ -1,9 +1,9 @@ import { - UPDATE_NETWORK_WIDTH, LOAD_NETWORK, NEW_NETWORK, -} from 'actions'; -import { pathOr, path } from 'ramda'; + UPDATE_NETWORK_WIDTH, +} from '@actions'; +import { path, pathOr } from 'ramda'; const defaultValue = 800; const getNetworkWidth = pathOr(defaultValue, ['payload', 'state', 'network', 'width']); diff --git a/src/reducers/network/width.test.js b/src/reducers/network/width.test.js index 7755f94..c9d35a3 100644 --- a/src/reducers/network/width.test.js +++ b/src/reducers/network/width.test.js @@ -1,8 +1,8 @@ import { - UPDATE_NETWORK_WIDTH, LOAD_NETWORK, NEW_NETWORK, -} from 'actions'; + UPDATE_NETWORK_WIDTH, +} from '@actions'; import reducer from './width'; diff --git a/src/selectors/combiners.js b/src/selectors/combiners.js index aa159e3..87789a1 100644 --- a/src/selectors/combiners.js +++ b/src/selectors/combiners.js @@ -1,7 +1,8 @@ import { addNode, infer } from 'bayesjs'; -import { getNodeSize } from 'utils/node-size'; -import { equals, any, map } from 'ramda'; -import { createKey, createMissingLinkages, mergeNetworks } from 'components/NetworkMSBN/helpers'; +import { any, equals, map } from 'ramda'; +import { createKey, createMissingLinkages, mergeNetworks } from '@components/NetworkMSBN/helpers'; + +import { getNodeSize } from '@utils/node-size'; const weakMap = new WeakMap(); diff --git a/src/selectors/index.js b/src/selectors/index.js index 42e0874..e3c16f4 100644 --- a/src/selectors/index.js +++ b/src/selectors/index.js @@ -1,21 +1,26 @@ -import { createSelector } from 'reselect'; -import { NETWORK_KINDS } from 'constants/network'; -import { - either, prop, propOr, path, pathOr, -} from 'ramda'; import { combAllLinkagesBySubnetwork, combLinkagesBySubnetwork, combLinkagesByTwoSubnetwork, + combNetworkMSBNDescription, combNodesAndBeliefs, combNodesAndBeliefsMSBN, + combNodesIsSelected, combNodesWithPositions, combNodesWithSizes, combSubnetworksById, combSubnetworksColorById, - combNodesIsSelected, - combNetworkMSBNDescription, } from './combiners'; +import { + either, + path, + pathOr, + prop, + propOr, +} from 'ramda'; + +import { NETWORK_KINDS } from '@constants/network'; +import { createSelector } from 'reselect'; export const getNetwork = prop('network'); export const getNodes = either(path(['network', 'nodes']), propOr([], 'nodes')); diff --git a/src/selectors/index.test.js b/src/selectors/index.test.js index f9cca09..1d0bcef 100644 --- a/src/selectors/index.test.js +++ b/src/selectors/index.test.js @@ -1,16 +1,16 @@ -import { NETWORK_KINDS } from 'constants/network'; import { + getBeliefs, + getLinkages, getNetwork, + getNetworkKind, getNodes, + getPanelVisibility, getPositions, - getBeliefs, getSelectedNodes, getSubnetworks, - getNetworkKind, - getPanelVisibility, - getLinkages, } from './index'; +import { NETWORK_KINDS } from '@constants/network'; describe('Main Selectors', () => { describe('getNetwork selector', () => { diff --git a/src/store/configureStore.js b/src/store/configureStore.js index 8998471..41b7a78 100644 --- a/src/store/configureStore.js +++ b/src/store/configureStore.js @@ -1,8 +1,8 @@ import { applyMiddleware, compose, createStore } from 'redux'; -import thunk from 'redux-thunk'; -import rootReducer from 'reducers'; import { persistState } from '../middlewares/persistState'; +import rootReducer from '@reducers'; +import thunk from 'redux-thunk'; export default (preloadedState) => { const store = createStore( diff --git a/src/utils/math.js b/src/utils/math.js index d8af7df..6de7cf9 100644 --- a/src/utils/math.js +++ b/src/utils/math.js @@ -1,4 +1,4 @@ +import { NODE_CPT_PRECISION } from '@constants/node'; import float from 'float'; -import { NODE_CPT_PRECISION } from 'constants/node'; export const roundValue = value => float.round(value, NODE_CPT_PRECISION); diff --git a/src/utils/node-cpt.js b/src/utils/node-cpt.js index 3b8e532..747c8a5 100644 --- a/src/utils/node-cpt.js +++ b/src/utils/node-cpt.js @@ -17,12 +17,12 @@ import { evolve, flatten, flip, + head, identity, ifElse, includes, invertObj, is, - head, keys, length, lensPath, @@ -45,7 +45,7 @@ import { useWith, values, } from 'ramda'; -import { containsParentInNode, isNodeWithoutParents } from 'validations/node'; +import { containsParentInNode, isNodeWithoutParents } from '@validations/node'; import { createNodeCombinations } from './combinations'; import { filterNodeParents } from './node-parents'; diff --git a/src/utils/node-cpt.test.js b/src/utils/node-cpt.test.js index e73602d..c93a66c 100644 --- a/src/utils/node-cpt.test.js +++ b/src/utils/node-cpt.test.js @@ -1,4 +1,3 @@ -import SimpleNetwork from 'json-templates/networks/simple.json'; import { addNodeParentInCpt, createCpt, @@ -9,6 +8,8 @@ import { updateStatesInCpt, } from './node-cpt'; +import SimpleNetwork from '@json-templates/networks/simple.json'; + describe('Node Cpt Utils', () => { describe('updateCptValue', () => { describe('When cpt is a object', () => { diff --git a/src/utils/node-size.js b/src/utils/node-size.js index 2c738c4..ab8f9ec 100644 --- a/src/utils/node-size.js +++ b/src/utils/node-size.js @@ -1,4 +1,4 @@ -import { NODE_HEIGHT_SIZES, NODE_WIDTH_SIZE } from 'constants/node'; +import { NODE_HEIGHT_SIZES, NODE_WIDTH_SIZE } from '@constants/node'; import { add, always, @@ -9,7 +9,7 @@ import { prop, sum, } from 'ramda'; -import { hasConnections, hasDescription, hasStates } from 'validations/node'; +import { hasConnections, hasDescription, hasStates } from '@validations/node'; const addOne = add(1); const getStatesLength = pipe( diff --git a/src/utils/node.test.js b/src/utils/node.test.js index de943cd..16a7c27 100644 --- a/src/utils/node.test.js +++ b/src/utils/node.test.js @@ -1,5 +1,6 @@ -import SimpleNetwork from 'json-templates/networks/simple.json'; -import { findNodeById, removeNodeById, findIndexNodeById } from './node'; +import { findIndexNodeById, findNodeById, removeNodeById } from './node'; + +import SimpleNetwork from '@json-templates/networks/simple.json'; describe('Node Utils', () => { describe('findNodeById', () => { diff --git a/src/validations/network.js b/src/validations/network.js index d9455c2..43c035b 100644 --- a/src/validations/network.js +++ b/src/validations/network.js @@ -15,8 +15,9 @@ import { reject, useWith, } from 'ramda'; -import { findIndexNodeById } from 'utils/node'; + import { containsParentInNode } from './node'; +import { findIndexNodeById } from '@utils/node'; const isNotEmpty = complement(isEmpty); const propId = prop('id'); diff --git a/src/validations/network.test.js b/src/validations/network.test.js index da0927d..31d2024 100644 --- a/src/validations/network.test.js +++ b/src/validations/network.test.js @@ -1,6 +1,7 @@ -import SimpleNetwork from 'json-templates/networks/simple.json'; -import CyclicNetwork from 'json-templates/networks/cyclic.json'; -import { hasCycles, hasCycleAddingNodeParent } from './network'; +import { hasCycleAddingNodeParent, hasCycles } from './network'; + +import CyclicNetwork from '@json-templates/networks/cyclic.json'; +import SimpleNetwork from '@json-templates/networks/simple.json'; describe('Network Utils', () => { describe('hasCycles', () => { diff --git a/src/validations/node.js b/src/validations/node.js index acd20e0..32b76f8 100644 --- a/src/validations/node.js +++ b/src/validations/node.js @@ -15,7 +15,8 @@ import { useWith, values, } from 'ramda'; -import { roundValue } from 'utils/math'; + +import { roundValue } from '@utils/math'; const isArray = is(Array); const isObject = is(Object); diff --git a/webpack.config.resolve.js b/webpack.config.resolve.js index a29e764..ee00043 100644 --- a/webpack.config.resolve.js +++ b/webpack.config.resolve.js @@ -4,16 +4,16 @@ module.exports = { modules: ['node_modules', path.resolve(__dirname)], extensions: ['.js', '.jsx', '.json', '.scss'], alias: { - 'json-templates': path.resolve(__dirname, '__fixtures__/'), - components: path.resolve(__dirname, 'src/components/'), - utils: path.resolve(__dirname, 'src/utils/'), - models: path.resolve(__dirname, 'src/models/'), - reducers: path.resolve(__dirname, 'src/reducers/'), - selectors: path.resolve(__dirname, 'src/selectors/'), - actions: path.resolve(__dirname, 'src/actions/'), - decorators: path.resolve(__dirname, 'src/decorators/'), - constants: path.resolve(__dirname, 'src/constants/'), - validations: path.resolve(__dirname, 'src/validations/'), - portals: path.resolve(__dirname, 'src/portals/'), + '@json-templates': path.resolve(__dirname, '__fixtures__/'), + '@components': path.resolve(__dirname, 'src/components/'), + '@utils': path.resolve(__dirname, 'src/utils/'), + '@models': path.resolve(__dirname, 'src/models/'), + '@reducers': path.resolve(__dirname, 'src/reducers/'), + '@selectors': path.resolve(__dirname, 'src/selectors/'), + '@actions': path.resolve(__dirname, 'src/actions/'), + '@decorators': path.resolve(__dirname, 'src/decorators/'), + '@constants': path.resolve(__dirname, 'src/constants/'), + '@validations': path.resolve(__dirname, 'src/validations/'), + '@portals': path.resolve(__dirname, 'src/portals/'), }, }; From de8c8c4544191d65f1d1b778887204248235d007 Mon Sep 17 00:00:00 2001 From: nolleto Date: Wed, 30 Dec 2020 19:10:00 -0300 Subject: [PATCH 3/5] chore(tests): update `jest` to `v26` --- jest.setup.js | 2 +- package.json | 8 +- yarn.lock | 2557 ++++++++++++++++++++++++++++++++++--------------- 3 files changed, 1765 insertions(+), 802 deletions(-) diff --git a/jest.setup.js b/jest.setup.js index 97ac8a7..4ad7c1e 100644 --- a/jest.setup.js +++ b/jest.setup.js @@ -1,6 +1,6 @@ import './__mocks__/my-components'; -import Adapter from 'enzyme-adapter-react-16'; +import Adapter from '@wojtekmaj/enzyme-adapter-react-17'; import Enzyme from 'enzyme'; Enzyme.configure({ adapter: new Adapter() }); diff --git a/package.json b/package.json index eef6534..115dd5c 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ }, "dependencies": { "@cypress/webpack-preprocessor": "^4.0.3", - "babel-jest": "^24.8.0", + "babel-jest": "^26.6.3", "bayesjs": "0.4.3", "change-case": "^3.1.0", "classnames": "^2.2.5", @@ -78,6 +78,7 @@ "@commitlint/cli": "^11.0.0", "@commitlint/config-conventional": "^11.0.0", "@testing-library/react": "^9.1.4", + "@wojtekmaj/enzyme-adapter-react-17": "^0.4.1", "babel-eslint": "^10.0.1", "babel-loader": "^8.0.6", "babel-plugin-syntax-trailing-function-commas": "^6.22.0", @@ -87,7 +88,6 @@ "cypress": "^3.2.0", "cz-conventional-changelog": "3.3.0", "enzyme": "^3.9.0", - "enzyme-adapter-react-16": "^1.12.1", "enzyme-to-json": "^3.3.5", "eslint": "^5.15.2", "eslint-config-airbnb": "^17.1.0", @@ -99,8 +99,8 @@ "gh-pages": "^2.0.1", "husky": "^5.0.6", "is-ci": "^2.0.0", - "jest": "^24.8.0", - "jest-css-modules": "^2.0.0", + "jest": "^26.6.3", + "jest-css-modules": "^2.1.0", "json-loader": "^0.5.7", "node-sass": "^4.12.0", "postcss": "^7.0.16", diff --git a/yarn.lock b/yarn.lock index 9ad8a5e..0ad7a66 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8,6 +8,13 @@ dependencies: "@babel/highlight" "^7.0.0" +"@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" + integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== + dependencies: + "@babel/highlight" "^7.10.4" + "@babel/core@^7.0.1", "@babel/core@^7.1.0", "@babel/core@^7.4.5": version "7.4.5" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.4.5.tgz#081f97e8ffca65a9b4b0fdc7e274e703f000c06a" @@ -27,7 +34,37 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.4.0", "@babel/generator@^7.4.4": +"@babel/core@^7.7.5": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.10.tgz#b79a2e1b9f70ed3d84bbfb6d8c4ef825f606bccd" + integrity sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w== + dependencies: + "@babel/code-frame" "^7.10.4" + "@babel/generator" "^7.12.10" + "@babel/helper-module-transforms" "^7.12.1" + "@babel/helpers" "^7.12.5" + "@babel/parser" "^7.12.10" + "@babel/template" "^7.12.7" + "@babel/traverse" "^7.12.10" + "@babel/types" "^7.12.10" + convert-source-map "^1.7.0" + debug "^4.1.0" + gensync "^1.0.0-beta.1" + json5 "^2.1.2" + lodash "^4.17.19" + semver "^5.4.1" + source-map "^0.5.0" + +"@babel/generator@^7.12.10", "@babel/generator@^7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.11.tgz#98a7df7b8c358c9a37ab07a24056853016aba3af" + integrity sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA== + dependencies: + "@babel/types" "^7.12.11" + jsesc "^2.5.1" + source-map "^0.5.0" + +"@babel/generator@^7.4.4": version "7.4.4" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.4.4.tgz#174a215eb843fc392c7edcaabeaa873de6e8f041" dependencies: @@ -99,12 +136,28 @@ "@babel/template" "^7.1.0" "@babel/types" "^7.0.0" +"@babel/helper-function-name@^7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz#1fd7738aee5dcf53c3ecff24f1da9c511ec47b42" + integrity sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA== + dependencies: + "@babel/helper-get-function-arity" "^7.12.10" + "@babel/template" "^7.12.7" + "@babel/types" "^7.12.11" + "@babel/helper-get-function-arity@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3" dependencies: "@babel/types" "^7.0.0" +"@babel/helper-get-function-arity@^7.12.10": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz#b158817a3165b5faa2047825dfa61970ddcc16cf" + integrity sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag== + dependencies: + "@babel/types" "^7.12.10" + "@babel/helper-hoist-variables@^7.4.4": version "7.4.4" resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz#0298b5f25c8c09c53102d52ac4a98f773eb2850a" @@ -117,12 +170,26 @@ dependencies: "@babel/types" "^7.0.0" +"@babel/helper-member-expression-to-functions@^7.12.7": + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz#aa77bd0396ec8114e5e30787efa78599d874a855" + integrity sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw== + dependencies: + "@babel/types" "^7.12.7" + "@babel/helper-module-imports@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz#96081b7111e486da4d2cd971ad1a4fe216cc2e3d" dependencies: "@babel/types" "^7.0.0" +"@babel/helper-module-imports@^7.12.1": + version "7.12.5" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb" + integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA== + dependencies: + "@babel/types" "^7.12.5" + "@babel/helper-module-transforms@^7.1.0", "@babel/helper-module-transforms@^7.4.4": version "7.4.4" resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.4.4.tgz#96115ea42a2f139e619e98ed46df6019b94414b8" @@ -134,16 +201,43 @@ "@babel/types" "^7.4.4" lodash "^4.17.11" +"@babel/helper-module-transforms@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz#7954fec71f5b32c48e4b303b437c34453fd7247c" + integrity sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w== + dependencies: + "@babel/helper-module-imports" "^7.12.1" + "@babel/helper-replace-supers" "^7.12.1" + "@babel/helper-simple-access" "^7.12.1" + "@babel/helper-split-export-declaration" "^7.11.0" + "@babel/helper-validator-identifier" "^7.10.4" + "@babel/template" "^7.10.4" + "@babel/traverse" "^7.12.1" + "@babel/types" "^7.12.1" + lodash "^4.17.19" + "@babel/helper-optimise-call-expression@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz#a2920c5702b073c15de51106200aa8cad20497d5" dependencies: "@babel/types" "^7.0.0" +"@babel/helper-optimise-call-expression@^7.12.10": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz#94ca4e306ee11a7dd6e9f42823e2ac6b49881e2d" + integrity sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ== + dependencies: + "@babel/types" "^7.12.10" + "@babel/helper-plugin-utils@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250" +"@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" + integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg== + "@babel/helper-regex@^7.0.0", "@babel/helper-regex@^7.4.4": version "7.4.4" resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.4.4.tgz#a47e02bc91fb259d2e6727c2a30013e3ac13c4a2" @@ -169,6 +263,16 @@ "@babel/traverse" "^7.4.4" "@babel/types" "^7.4.4" +"@babel/helper-replace-supers@^7.12.1": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz#ea511658fc66c7908f923106dd88e08d1997d60d" + integrity sha512-q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA== + dependencies: + "@babel/helper-member-expression-to-functions" "^7.12.7" + "@babel/helper-optimise-call-expression" "^7.12.10" + "@babel/traverse" "^7.12.10" + "@babel/types" "^7.12.11" + "@babel/helper-simple-access@^7.1.0": version "7.1.0" resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz#65eeb954c8c245beaa4e859da6188f39d71e585c" @@ -176,12 +280,31 @@ "@babel/template" "^7.1.0" "@babel/types" "^7.0.0" +"@babel/helper-simple-access@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz#32427e5aa61547d38eb1e6eaf5fd1426fdad9136" + integrity sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA== + dependencies: + "@babel/types" "^7.12.1" + +"@babel/helper-split-export-declaration@^7.11.0", "@babel/helper-split-export-declaration@^7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz#1b4cc424458643c47d37022223da33d76ea4603a" + integrity sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g== + dependencies: + "@babel/types" "^7.12.11" + "@babel/helper-split-export-declaration@^7.4.4": version "7.4.4" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz#ff94894a340be78f53f06af038b205c49d993677" dependencies: "@babel/types" "^7.4.4" +"@babel/helper-validator-identifier@^7.10.4", "@babel/helper-validator-identifier@^7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed" + integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw== + "@babel/helper-wrap-function@^7.1.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz#c4e0012445769e2815b55296ead43a958549f6fa" @@ -191,6 +314,15 @@ "@babel/traverse" "^7.1.0" "@babel/types" "^7.2.0" +"@babel/helpers@^7.12.5": + version "7.12.5" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz#1a1ba4a768d9b58310eda516c449913fe647116e" + integrity sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA== + dependencies: + "@babel/template" "^7.10.4" + "@babel/traverse" "^7.12.5" + "@babel/types" "^7.12.5" + "@babel/helpers@^7.4.4": version "7.4.4" resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.4.4.tgz#868b0ef59c1dd4e78744562d5ce1b59c89f2f2a5" @@ -207,10 +339,24 @@ esutils "^2.0.2" js-tokens "^4.0.0" -"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.4.4", "@babel/parser@^7.4.5": +"@babel/highlight@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143" + integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA== + dependencies: + "@babel/helper-validator-identifier" "^7.10.4" + chalk "^2.0.0" + js-tokens "^4.0.0" + +"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.4", "@babel/parser@^7.4.5": version "7.4.5" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.4.5.tgz#04af8d5d5a2b044a2a1bffacc1e5e6673544e872" +"@babel/parser@^7.12.10", "@babel/parser@^7.12.11", "@babel/parser@^7.12.7": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.11.tgz#9ce3595bcd74bc5c466905e86c535b8b25011e79" + integrity sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg== + "@babel/plugin-proposal-async-generator-functions@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz#b289b306669dce4ad20b0252889a15768c9d417e" @@ -261,30 +407,114 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" +"@babel/plugin-syntax-async-generators@^7.8.4": + version "7.8.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" + integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-bigint@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea" + integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-class-properties@^7.8.3": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz#bcb297c5366e79bebadef509549cd93b04f19978" + integrity sha512-U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-syntax-import-meta@^7.8.3": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51" + integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-json-strings@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz#72bd13f6ffe1d25938129d2a186b11fd62951470" dependencies: "@babel/helper-plugin-utils" "^7.0.0" +"@babel/plugin-syntax-json-strings@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" + integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + "@babel/plugin-syntax-jsx@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz#0b85a3b4bc7cdf4cc4b8bf236335b907ca22e7c7" dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.2.0": +"@babel/plugin-syntax-logical-assignment-operators@^7.8.3": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" + integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" + integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-numeric-separator@^7.8.3": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" + integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-syntax-object-rest-spread@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz#3b7a3e733510c57e820b9142a6579ac8b0dfad2e" dependencies: "@babel/helper-plugin-utils" "^7.0.0" +"@babel/plugin-syntax-object-rest-spread@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" + integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + "@babel/plugin-syntax-optional-catch-binding@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz#a94013d6eda8908dfe6a477e7f9eda85656ecf5c" dependencies: "@babel/helper-plugin-utils" "^7.0.0" +"@babel/plugin-syntax-optional-catch-binding@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" + integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-optional-chaining@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" + integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-top-level-await@^7.8.3": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz#dd6c0b357ac1bb142d98537450a319625d13d2a0" + integrity sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-transform-arrow-functions@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz#9aeafbe4d6ffc6563bf8f8372091628f00779550" @@ -607,7 +837,7 @@ dependencies: regenerator-runtime "^0.13.2" -"@babel/template@^7.1.0", "@babel/template@^7.4.0", "@babel/template@^7.4.4": +"@babel/template@^7.1.0", "@babel/template@^7.4.4": version "7.4.4" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz#f4b88d1225689a08f5bc3a17483545be9e4ed237" dependencies: @@ -615,7 +845,16 @@ "@babel/parser" "^7.4.4" "@babel/types" "^7.4.4" -"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.4", "@babel/traverse@^7.4.5": +"@babel/template@^7.10.4", "@babel/template@^7.12.7", "@babel/template@^7.3.3": + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc" + integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow== + dependencies: + "@babel/code-frame" "^7.10.4" + "@babel/parser" "^7.12.7" + "@babel/types" "^7.12.7" + +"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.4", "@babel/traverse@^7.4.5": version "7.4.5" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.4.5.tgz#4e92d1728fd2f1897dafdd321efbff92156c3216" dependencies: @@ -629,7 +868,22 @@ globals "^11.1.0" lodash "^4.17.11" -"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4": +"@babel/traverse@^7.12.1", "@babel/traverse@^7.12.10", "@babel/traverse@^7.12.5": + version "7.12.12" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.12.tgz#d0cd87892704edd8da002d674bc811ce64743376" + integrity sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w== + dependencies: + "@babel/code-frame" "^7.12.11" + "@babel/generator" "^7.12.11" + "@babel/helper-function-name" "^7.12.11" + "@babel/helper-split-export-declaration" "^7.12.11" + "@babel/parser" "^7.12.11" + "@babel/types" "^7.12.12" + debug "^4.1.0" + globals "^11.1.0" + lodash "^4.17.19" + +"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.4.4": version "7.4.4" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.4.4.tgz#8db9e9a629bb7c29370009b4b779ed93fe57d5f0" dependencies: @@ -637,6 +891,20 @@ lodash "^4.17.11" to-fast-properties "^2.0.0" +"@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.12", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.3": + version "7.12.12" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.12.tgz#4608a6ec313abbd87afa55004d373ad04a96c299" + integrity sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ== + dependencies: + "@babel/helper-validator-identifier" "^7.12.11" + lodash "^4.17.19" + to-fast-properties "^2.0.0" + +"@bcoe/v8-coverage@^0.2.3": + version "0.2.3" + resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" + integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== + "@cnakazawa/watch@^1.0.3": version "1.0.3" resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef" @@ -812,133 +1080,181 @@ debug "^3.1.0" lodash.once "^4.1.1" -"@jest/console@^24.7.1": - version "24.7.1" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.7.1.tgz#32a9e42535a97aedfe037e725bd67e954b459545" +"@istanbuljs/load-nyc-config@^1.0.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" + integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ== dependencies: - "@jest/source-map" "^24.3.0" - chalk "^2.0.1" - slash "^2.0.0" + camelcase "^5.3.1" + find-up "^4.1.0" + get-package-type "^0.1.0" + js-yaml "^3.13.1" + resolve-from "^5.0.0" -"@jest/core@^24.8.0": - version "24.8.0" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-24.8.0.tgz#fbbdcd42a41d0d39cddbc9f520c8bab0c33eed5b" - dependencies: - "@jest/console" "^24.7.1" - "@jest/reporters" "^24.8.0" - "@jest/test-result" "^24.8.0" - "@jest/transform" "^24.8.0" - "@jest/types" "^24.8.0" - ansi-escapes "^3.0.0" - chalk "^2.0.1" - exit "^0.1.2" - graceful-fs "^4.1.15" - jest-changed-files "^24.8.0" - jest-config "^24.8.0" - jest-haste-map "^24.8.0" - jest-message-util "^24.8.0" - jest-regex-util "^24.3.0" - jest-resolve-dependencies "^24.8.0" - jest-runner "^24.8.0" - jest-runtime "^24.8.0" - jest-snapshot "^24.8.0" - jest-util "^24.8.0" - jest-validate "^24.8.0" - jest-watcher "^24.8.0" - micromatch "^3.1.10" - p-each-series "^1.0.0" - pirates "^4.0.1" - realpath-native "^1.1.0" - rimraf "^2.5.4" - strip-ansi "^5.0.0" +"@istanbuljs/schema@^0.1.2": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" + integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== -"@jest/environment@^24.8.0": - version "24.8.0" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-24.8.0.tgz#0342261383c776bdd652168f68065ef144af0eac" +"@jest/console@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.6.2.tgz#4e04bc464014358b03ab4937805ee36a0aeb98f2" + integrity sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g== dependencies: - "@jest/fake-timers" "^24.8.0" - "@jest/transform" "^24.8.0" - "@jest/types" "^24.8.0" - jest-mock "^24.8.0" + "@jest/types" "^26.6.2" + "@types/node" "*" + chalk "^4.0.0" + jest-message-util "^26.6.2" + jest-util "^26.6.2" + slash "^3.0.0" + +"@jest/core@^26.6.3": + version "26.6.3" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.6.3.tgz#7639fcb3833d748a4656ada54bde193051e45fad" + integrity sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw== + dependencies: + "@jest/console" "^26.6.2" + "@jest/reporters" "^26.6.2" + "@jest/test-result" "^26.6.2" + "@jest/transform" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/node" "*" + ansi-escapes "^4.2.1" + chalk "^4.0.0" + exit "^0.1.2" + graceful-fs "^4.2.4" + jest-changed-files "^26.6.2" + jest-config "^26.6.3" + jest-haste-map "^26.6.2" + jest-message-util "^26.6.2" + jest-regex-util "^26.0.0" + jest-resolve "^26.6.2" + jest-resolve-dependencies "^26.6.3" + jest-runner "^26.6.3" + jest-runtime "^26.6.3" + jest-snapshot "^26.6.2" + jest-util "^26.6.2" + jest-validate "^26.6.2" + jest-watcher "^26.6.2" + micromatch "^4.0.2" + p-each-series "^2.1.0" + rimraf "^3.0.0" + slash "^3.0.0" + strip-ansi "^6.0.0" -"@jest/fake-timers@^24.8.0": - version "24.8.0" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-24.8.0.tgz#2e5b80a4f78f284bcb4bd5714b8e10dd36a8d3d1" +"@jest/environment@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.6.2.tgz#ba364cc72e221e79cc8f0a99555bf5d7577cf92c" + integrity sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA== dependencies: - "@jest/types" "^24.8.0" - jest-message-util "^24.8.0" - jest-mock "^24.8.0" + "@jest/fake-timers" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/node" "*" + jest-mock "^26.6.2" -"@jest/reporters@^24.8.0": - version "24.8.0" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-24.8.0.tgz#075169cd029bddec54b8f2c0fc489fd0b9e05729" +"@jest/fake-timers@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.6.2.tgz#459c329bcf70cee4af4d7e3f3e67848123535aad" + integrity sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA== dependencies: - "@jest/environment" "^24.8.0" - "@jest/test-result" "^24.8.0" - "@jest/transform" "^24.8.0" - "@jest/types" "^24.8.0" - chalk "^2.0.1" + "@jest/types" "^26.6.2" + "@sinonjs/fake-timers" "^6.0.1" + "@types/node" "*" + jest-message-util "^26.6.2" + jest-mock "^26.6.2" + jest-util "^26.6.2" + +"@jest/globals@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.6.2.tgz#5b613b78a1aa2655ae908eba638cc96a20df720a" + integrity sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA== + dependencies: + "@jest/environment" "^26.6.2" + "@jest/types" "^26.6.2" + expect "^26.6.2" + +"@jest/reporters@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.6.2.tgz#1f518b99637a5f18307bd3ecf9275f6882a667f6" + integrity sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw== + dependencies: + "@bcoe/v8-coverage" "^0.2.3" + "@jest/console" "^26.6.2" + "@jest/test-result" "^26.6.2" + "@jest/transform" "^26.6.2" + "@jest/types" "^26.6.2" + chalk "^4.0.0" + collect-v8-coverage "^1.0.0" exit "^0.1.2" glob "^7.1.2" - istanbul-lib-coverage "^2.0.2" - istanbul-lib-instrument "^3.0.1" - istanbul-lib-report "^2.0.4" - istanbul-lib-source-maps "^3.0.1" - istanbul-reports "^2.1.1" - jest-haste-map "^24.8.0" - jest-resolve "^24.8.0" - jest-runtime "^24.8.0" - jest-util "^24.8.0" - jest-worker "^24.6.0" - node-notifier "^5.2.1" - slash "^2.0.0" + graceful-fs "^4.2.4" + istanbul-lib-coverage "^3.0.0" + istanbul-lib-instrument "^4.0.3" + istanbul-lib-report "^3.0.0" + istanbul-lib-source-maps "^4.0.0" + istanbul-reports "^3.0.2" + jest-haste-map "^26.6.2" + jest-resolve "^26.6.2" + jest-util "^26.6.2" + jest-worker "^26.6.2" + slash "^3.0.0" source-map "^0.6.0" - string-length "^2.0.0" + string-length "^4.0.1" + terminal-link "^2.0.0" + v8-to-istanbul "^7.0.0" + optionalDependencies: + node-notifier "^8.0.0" -"@jest/source-map@^24.3.0": - version "24.3.0" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.3.0.tgz#563be3aa4d224caf65ff77edc95cd1ca4da67f28" +"@jest/source-map@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.6.2.tgz#29af5e1e2e324cafccc936f218309f54ab69d535" + integrity sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA== dependencies: callsites "^3.0.0" - graceful-fs "^4.1.15" + graceful-fs "^4.2.4" source-map "^0.6.0" -"@jest/test-result@^24.8.0": - version "24.8.0" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.8.0.tgz#7675d0aaf9d2484caa65e048d9b467d160f8e9d3" +"@jest/test-result@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.6.2.tgz#55da58b62df134576cc95476efa5f7949e3f5f18" + integrity sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ== dependencies: - "@jest/console" "^24.7.1" - "@jest/types" "^24.8.0" + "@jest/console" "^26.6.2" + "@jest/types" "^26.6.2" "@types/istanbul-lib-coverage" "^2.0.0" + collect-v8-coverage "^1.0.0" -"@jest/test-sequencer@^24.8.0": - version "24.8.0" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-24.8.0.tgz#2f993bcf6ef5eb4e65e8233a95a3320248cf994b" +"@jest/test-sequencer@^26.6.3": + version "26.6.3" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz#98e8a45100863886d074205e8ffdc5a7eb582b17" + integrity sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw== dependencies: - "@jest/test-result" "^24.8.0" - jest-haste-map "^24.8.0" - jest-runner "^24.8.0" - jest-runtime "^24.8.0" + "@jest/test-result" "^26.6.2" + graceful-fs "^4.2.4" + jest-haste-map "^26.6.2" + jest-runner "^26.6.3" + jest-runtime "^26.6.3" -"@jest/transform@^24.8.0": - version "24.8.0" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-24.8.0.tgz#628fb99dce4f9d254c6fd9341e3eea262e06fef5" +"@jest/transform@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.6.2.tgz#5ac57c5fa1ad17b2aae83e73e45813894dcf2e4b" + integrity sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA== dependencies: "@babel/core" "^7.1.0" - "@jest/types" "^24.8.0" - babel-plugin-istanbul "^5.1.0" - chalk "^2.0.1" + "@jest/types" "^26.6.2" + babel-plugin-istanbul "^6.0.0" + chalk "^4.0.0" convert-source-map "^1.4.0" fast-json-stable-stringify "^2.0.0" - graceful-fs "^4.1.15" - jest-haste-map "^24.8.0" - jest-regex-util "^24.3.0" - jest-util "^24.8.0" - micromatch "^3.1.10" - realpath-native "^1.1.0" - slash "^2.0.0" + graceful-fs "^4.2.4" + jest-haste-map "^26.6.2" + jest-regex-util "^26.0.0" + jest-util "^26.6.2" + micromatch "^4.0.2" + pirates "^4.0.1" + slash "^3.0.0" source-map "^0.6.1" - write-file-atomic "2.4.1" + write-file-atomic "^3.0.0" "@jest/types@^24.8.0": version "24.8.0" @@ -956,10 +1272,35 @@ "@types/istanbul-reports" "^1.1.1" "@types/yargs" "^13.0.0" +"@jest/types@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e" + integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^3.0.0" + "@types/node" "*" + "@types/yargs" "^15.0.0" + chalk "^4.0.0" + "@sheerun/mutationobserver-shim@^0.3.2": version "0.3.2" resolved "https://registry.yarnpkg.com/@sheerun/mutationobserver-shim/-/mutationobserver-shim-0.3.2.tgz#8013f2af54a2b7d735f71560ff360d3a8176a87b" +"@sinonjs/commons@^1.7.0": + version "1.8.1" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz#e7df00f98a203324f6dc7cc606cad9d4a8ab2217" + integrity sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw== + dependencies: + type-detect "4.0.8" + +"@sinonjs/fake-timers@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz#293674fccb3262ac782c7aadfdeca86b10c75c40" + integrity sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA== + dependencies: + "@sinonjs/commons" "^1.7.0" + "@testing-library/dom@^6.1.0": version "6.2.0" resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-6.2.0.tgz#6eeee738af12a2f02e74dc8cbadeaed1fc4223e5" @@ -979,9 +1320,10 @@ "@testing-library/dom" "^6.1.0" "@types/testing-library__react" "^9.1.0" -"@types/babel__core@^7.1.0": - version "7.1.2" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.2.tgz#608c74f55928033fce18b99b213c16be4b3d114f" +"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7": + version "7.1.12" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz#4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d" + integrity sha512-wMTHiiTiBAAPebqaPiPDLFA4LYPKr6Ph0Xq/6rq1Ur3v66HXyG+clfR9CNETkD7MQS8ZHvpQOtA53DLws5WAEQ== dependencies: "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" @@ -1008,6 +1350,13 @@ dependencies: "@babel/types" "^7.3.0" +"@types/babel__traverse@^7.0.4": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.0.tgz#b9a1efa635201ba9bc850323a8793ee2d36c04a0" + integrity sha512-kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg== + dependencies: + "@babel/types" "^7.3.0" + "@types/events@*": version "3.0.0" resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7" @@ -1020,10 +1369,22 @@ "@types/minimatch" "*" "@types/node" "*" +"@types/graceful-fs@^4.1.2": + version "4.1.4" + resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.4.tgz#4ff9f641a7c6d1a3508ff88bc3141b152772e753" + integrity sha512-mWA/4zFQhfvOA8zWkXobwJvBD7vzcxgrOQ0J5CH1votGqdq9m7+FwtGaqyCZqC3NyyBkc9z4m+iry4LlqcMWJg== + dependencies: + "@types/node" "*" + "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0": version "2.0.1" resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff" +"@types/istanbul-lib-coverage@^2.0.1": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762" + integrity sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw== + "@types/istanbul-lib-report@*": version "1.1.1" resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz#e5471e7fa33c61358dd38426189c037a58433b8c" @@ -1037,6 +1398,13 @@ "@types/istanbul-lib-coverage" "*" "@types/istanbul-lib-report" "*" +"@types/istanbul-reports@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821" + integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA== + dependencies: + "@types/istanbul-lib-report" "*" + "@types/minimatch@*": version "3.0.3" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" @@ -1060,6 +1428,11 @@ resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== +"@types/prettier@^2.0.0": + version "2.1.6" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.1.6.tgz#f4b1efa784e8db479cdb8b14403e2144b1e9ff03" + integrity sha512-6gOkRe7OIioWAXfnO/2lFiv+SJichKVSys1mSsgyrYHSEjk8Ctv4tSR/Odvnu+HWlH2C8j53dahU03XmQdd5fA== + "@types/prop-types@*": version "15.7.2" resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.2.tgz#0e58ae66773d7fd7c372a493aff740878ec9ceaa" @@ -1077,9 +1450,10 @@ "@types/prop-types" "*" csstype "^2.2.0" -"@types/stack-utils@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e" +"@types/stack-utils@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff" + integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw== "@types/testing-library__dom@*", "@types/testing-library__dom@^6.0.0": version "6.0.3" @@ -1103,7 +1477,7 @@ version "13.1.0" resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.1.0.tgz#c563aa192f39350a1d18da36c5a8da382bbd8228" -"@types/yargs@^12.0.2", "@types/yargs@^12.0.9": +"@types/yargs@^12.0.9": version "12.0.12" resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.12.tgz#45dd1d0638e8c8f153e87d296907659296873916" @@ -1113,6 +1487,13 @@ dependencies: "@types/yargs-parser" "*" +"@types/yargs@^15.0.0": + version "15.0.12" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.12.tgz#6234ce3e3e3fa32c5db301a170f96a599c960d74" + integrity sha512-f+fD/fQAo3BCbCDlrUpznF1A5Zp9rB0noS5vnoormHSIPFKL0Z2DcUJ3Gxp5ytH4uLRNxy7AwYUC9exZzqGMAw== + dependencies: + "@types/yargs-parser" "*" + "@webassemblyjs/ast@1.8.5": version "1.8.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359" @@ -1241,6 +1622,21 @@ "@webassemblyjs/wast-parser" "1.8.5" "@xtuc/long" "4.2.2" +"@wojtekmaj/enzyme-adapter-react-17@^0.4.1": + version "0.4.1" + resolved "https://registry.yarnpkg.com/@wojtekmaj/enzyme-adapter-react-17/-/enzyme-adapter-react-17-0.4.1.tgz#a9d4a2873025c6de19e1142ca076661bac69f587" + integrity sha512-WZr8i4C6WVDV7Mb8sbm7GdlEPmk1f+xOMjUKThqrkWgwsfvu90zJyyX54wyAvsS91sjtKZ0JipGj2cJnEDaxPA== + dependencies: + enzyme-adapter-utils "^1.14.0" + enzyme-shallow-equal "^1.0.4" + has "^1.0.3" + object.assign "^4.1.0" + object.values "^1.1.1" + prop-types "^15.7.2" + react-is "^17.0.0" + react-test-renderer "^17.0.0" + semver "^5.7.0" + "@xtuc/ieee754@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" @@ -1257,9 +1653,10 @@ JSONStream@^1.0.4: jsonparse "^1.2.0" through ">=2.2.7 <3" -abab@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f" +abab@^2.0.3: + version "2.0.5" + resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" + integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q== abbrev@1: version "1.1.1" @@ -1272,26 +1669,24 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: mime-types "~2.1.24" negotiator "0.6.2" -acorn-globals@^4.1.0: - version "4.3.2" - resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.2.tgz#4e2c2313a597fd589720395f6354b41cd5ec8006" +acorn-globals@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45" + integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg== dependencies: - acorn "^6.0.1" - acorn-walk "^6.0.1" + acorn "^7.1.1" + acorn-walk "^7.1.1" acorn-jsx@^5.0.0: version "5.0.1" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.1.tgz#32a064fd925429216a09b141102bfdd185fae40e" -acorn-walk@^6.0.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.1.tgz#d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913" - -acorn@^5.5.3: - version "5.7.3" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" +acorn-walk@^7.1.1: + version "7.2.0" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" + integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== -acorn@^6.0.1, acorn@^6.0.7: +acorn@^6.0.7: version "6.1.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f" @@ -1299,20 +1694,25 @@ acorn@^6.2.1: version "6.3.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.3.0.tgz#0087509119ffa4fc0a0041d1e93a417e68cb856e" -airbnb-prop-types@^2.13.2: - version "2.13.2" - resolved "https://registry.yarnpkg.com/airbnb-prop-types/-/airbnb-prop-types-2.13.2.tgz#43147a5062dd2a4a5600e748a47b64004cc5f7fc" +acorn@^7.1.1: + version "7.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" + integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== + +airbnb-prop-types@^2.16.0: + version "2.16.0" + resolved "https://registry.yarnpkg.com/airbnb-prop-types/-/airbnb-prop-types-2.16.0.tgz#b96274cefa1abb14f623f804173ee97c13971dc2" + integrity sha512-7WHOFolP/6cS96PhKNrslCLMYAI8yB1Pp6u6XmxozQOiZbsI5ycglZr5cHhBFfuRcQQjzCMith5ZPZdYiJCxUg== dependencies: - array.prototype.find "^2.0.4" - function.prototype.name "^1.1.0" - has "^1.0.3" - is-regex "^1.0.4" - object-is "^1.0.1" + array.prototype.find "^2.1.1" + function.prototype.name "^1.1.2" + is-regex "^1.1.0" + object-is "^1.1.2" object.assign "^4.1.0" - object.entries "^1.1.0" + object.entries "^1.1.2" prop-types "^15.7.2" prop-types-exact "^1.2.0" - react-is "^16.8.6" + react-is "^16.13.1" ajv-errors@^1.0.0: version "1.0.1" @@ -1344,6 +1744,16 @@ ajv@^6.10.2: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^6.12.3: + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + amdefine@>=0.0.4: version "1.0.1" resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" @@ -1356,10 +1766,17 @@ ansi-escapes@^1.0.0: version "1.4.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e" -ansi-escapes@^3.0.0, ansi-escapes@^3.2.0: +ansi-escapes@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" +ansi-escapes@^4.2.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61" + integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA== + dependencies: + type-fest "^0.11.0" + ansi-html@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e" @@ -1405,6 +1822,14 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" +anymatch@^3.0.3: + version "3.1.1" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" + integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + aproba@^1.0.3, aproba@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" @@ -1445,10 +1870,6 @@ arr-union@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" -array-equal@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93" - array-filter@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83" @@ -1495,12 +1916,13 @@ array-unique@^0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" -array.prototype.find@^2.0.4: - version "2.1.0" - resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.1.0.tgz#630f2eaf70a39e608ac3573e45cf8ccd0ede9ad7" +array.prototype.find@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.1.1.tgz#3baca26108ca7affb08db06bf0be6cb3115a969c" + integrity sha512-mi+MYNJYLTx2eNYy+Yh6raoQacCsNeeMUaspFPh9Y141lFSsWxxB8V9mM2ye+eqiRs917J6/pJ4M9ZPzenWckA== dependencies: define-properties "^1.1.3" - es-abstract "^1.13.0" + es-abstract "^1.17.4" array.prototype.flat@^1.2.1: version "1.2.1" @@ -1564,10 +1986,6 @@ async-foreach@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542" -async-limiter@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8" - async@2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610" @@ -1633,17 +2051,19 @@ babel-eslint@^10.0.1: eslint-scope "3.7.1" eslint-visitor-keys "^1.0.0" -babel-jest@^24.8.0: - version "24.8.0" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.8.0.tgz#5c15ff2b28e20b0f45df43fe6b7f2aae93dba589" +babel-jest@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.3.tgz#d87d25cb0037577a0c89f82e5755c5d293c01056" + integrity sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA== dependencies: - "@jest/transform" "^24.8.0" - "@jest/types" "^24.8.0" - "@types/babel__core" "^7.1.0" - babel-plugin-istanbul "^5.1.0" - babel-preset-jest "^24.6.0" - chalk "^2.4.2" - slash "^2.0.0" + "@jest/transform" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/babel__core" "^7.1.7" + babel-plugin-istanbul "^6.0.0" + babel-preset-jest "^26.6.2" + chalk "^4.0.0" + graceful-fs "^4.2.4" + slash "^3.0.0" babel-loader@^8.0.2, babel-loader@^8.0.6: version "8.0.6" @@ -1654,18 +2074,25 @@ babel-loader@^8.0.2, babel-loader@^8.0.6: mkdirp "^0.5.1" pify "^4.0.1" -babel-plugin-istanbul@^5.1.0: - version "5.1.4" - resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.1.4.tgz#841d16b9a58eeb407a0ddce622ba02fe87a752ba" - dependencies: - find-up "^3.0.0" - istanbul-lib-instrument "^3.3.0" - test-exclude "^5.2.3" - -babel-plugin-jest-hoist@^24.6.0: - version "24.6.0" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.6.0.tgz#f7f7f7ad150ee96d7a5e8e2c5da8319579e78019" +babel-plugin-istanbul@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765" + integrity sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ== dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@istanbuljs/load-nyc-config" "^1.0.0" + "@istanbuljs/schema" "^0.1.2" + istanbul-lib-instrument "^4.0.0" + test-exclude "^6.0.0" + +babel-plugin-jest-hoist@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz#8185bd030348d254c6d7dd974355e6a28b21e62d" + integrity sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw== + dependencies: + "@babel/template" "^7.3.3" + "@babel/types" "^7.3.3" + "@types/babel__core" "^7.0.0" "@types/babel__traverse" "^7.0.6" babel-plugin-syntax-trailing-function-commas@^6.22.0: @@ -1676,12 +2103,31 @@ babel-plugin-transform-react-remove-prop-types@^0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz#f2edaf9b4c6a5fbe5c1d678bfb531078c1555f3a" -babel-preset-jest@^24.6.0: - version "24.6.0" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.6.0.tgz#66f06136eefce87797539c0d63f1769cc3915984" - dependencies: - "@babel/plugin-syntax-object-rest-spread" "^7.0.0" - babel-plugin-jest-hoist "^24.6.0" +babel-preset-current-node-syntax@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b" + integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ== + dependencies: + "@babel/plugin-syntax-async-generators" "^7.8.4" + "@babel/plugin-syntax-bigint" "^7.8.3" + "@babel/plugin-syntax-class-properties" "^7.8.3" + "@babel/plugin-syntax-import-meta" "^7.8.3" + "@babel/plugin-syntax-json-strings" "^7.8.3" + "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" + "@babel/plugin-syntax-numeric-separator" "^7.8.3" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" + "@babel/plugin-syntax-top-level-await" "^7.8.3" + +babel-preset-jest@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz#747872b1171df032252426586881d62d31798fee" + integrity sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ== + dependencies: + babel-plugin-jest-hoist "^26.6.2" + babel-preset-current-node-syntax "^1.0.0" balanced-match@^1.0.0: version "1.0.0" @@ -1819,15 +2265,10 @@ brorand@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" -browser-process-hrtime@^0.1.2: - version "0.1.3" - resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz#616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4" - -browser-resolve@^1.11.3: - version "1.11.3" - resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz#9b7cbb3d0f510e4cb86bdbd796124d28b5890af6" - dependencies: - resolve "1.1.7" +browser-process-hrtime@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" + integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== browserify-aes@^1.0.0, browserify-aes@^1.0.4: version "1.2.0" @@ -1977,6 +2418,14 @@ cachedir@2.2.0: resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-2.2.0.tgz#19afa4305e05d79e417566882e0c8f960f62ff0e" integrity sha512-VvxA0xhNqIIfg0V9AmJkDg91DaJwryutH5rVEZAhcNi4iJFj9f+QxmAjgK1LT9I8OgToX27fypX6/MeCXVbBjQ== +call-bind@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.0.tgz#24127054bb3f9bdcb4b1fb82418186072f77b8ce" + integrity sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w== + dependencies: + function-bind "^1.1.1" + get-intrinsic "^1.0.0" + callsites@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" @@ -2020,6 +2469,11 @@ camelcase@^5.0.0, camelcase@^5.2.0, camelcase@^5.3.1: version "5.3.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" +camelcase@^6.0.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" + integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== + caniuse-lite@^1.0.30000939, caniuse-lite@^1.0.30000957, caniuse-lite@^1.0.30000967: version "1.0.30000971" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000971.tgz#d1000e4546486a6977756547352bc96a4cfd2b13" @@ -2087,6 +2541,11 @@ change-emitter@^0.1.2: version "0.1.6" resolved "https://registry.yarnpkg.com/change-emitter/-/change-emitter-0.1.6.tgz#e8b2fe3d7f1ab7d69a32199aff91ea6931409515" +char-regex@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" + integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== + chardet@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" @@ -2149,6 +2608,11 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: inherits "^2.0.1" safe-buffer "^5.0.1" +cjs-module-lexer@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz#4186fcca0eae175970aee870b9fe2d6cf8d5655f" + integrity sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw== + class-utils@^0.3.5: version "0.3.6" resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" @@ -2236,6 +2700,11 @@ code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" +collect-v8-coverage@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" + integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg== + collection-visit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" @@ -2291,10 +2760,6 @@ commander@~2.19.0: version "2.19.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" -commander@~2.20.3: - version "2.20.3" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" - commitizen@^4.0.3: version "4.2.2" resolved "https://registry.yarnpkg.com/commitizen/-/commitizen-4.2.2.tgz#1a93dd07208521ea1ebbf832593542dac714cc79" @@ -2446,6 +2911,13 @@ convert-source-map@^1.1.0, convert-source-map@^1.4.0: dependencies: safe-buffer "~5.1.1" +convert-source-map@^1.6.0, convert-source-map@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" + integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== + dependencies: + safe-buffer "~5.1.1" + cookie-signature@1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" @@ -2574,6 +3046,15 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5: shebang-command "^1.2.0" which "^1.2.9" +cross-spawn@^7.0.0: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + crypto-browserify@^3.11.0: version "3.12.0" resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" @@ -2650,15 +3131,22 @@ cssesc@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" -cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0": - version "0.3.6" - resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.6.tgz#f85206cee04efa841f3c5982a74ba96ab20d65ad" +cssom@^0.4.4: + version "0.4.4" + resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10" + integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw== -cssstyle@^1.0.0: - version "1.2.2" - resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.2.2.tgz#427ea4d585b18624f6fdbf9de7a2a1a3ba713077" +cssom@~0.3.6: + version "0.3.8" + resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" + integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== + +cssstyle@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852" + integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A== dependencies: - cssom "0.3.x" + cssom "~0.3.6" csstype@^2.2.0: version "2.6.6" @@ -2739,13 +3227,14 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" -data-urls@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.1.0.tgz#15ee0582baa5e22bb59c77140da8f9c76963bbfe" +data-urls@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b" + integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ== dependencies: - abab "^2.0.0" - whatwg-mimetype "^2.2.0" - whatwg-url "^7.0.0" + abab "^2.0.3" + whatwg-mimetype "^2.3.0" + whatwg-url "^8.0.0" date-fns@^1.27.2: version "1.30.1" @@ -2791,6 +3280,11 @@ decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" +decimal.js@^10.2.0: + version "10.2.1" + resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz#238ae7b0f0c793d3e3cea410108b35a2c01426a3" + integrity sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw== + decode-uri-component@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" @@ -2812,6 +3306,11 @@ deep-is@~0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" +deepmerge@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" + integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== + default-gateway@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b" @@ -2892,17 +3391,19 @@ detect-libc@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" -detect-newline@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2" +detect-newline@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" + integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== detect-node@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" -diff-sequences@^24.3.0: - version "24.3.0" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.3.0.tgz#0f20e8a1df1abddaf4d9c226680952e64118b975" +diff-sequences@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1" + integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q== diffie-hellman@^5.0.0: version "5.0.3" @@ -2973,11 +3474,12 @@ domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" -domexception@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90" +domexception@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304" + integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg== dependencies: - webidl-conversions "^4.0.2" + webidl-conversions "^5.0.0" domhandler@^2.3.0: version "2.4.2" @@ -3060,6 +3562,11 @@ email-addresses@^3.0.1: version "3.0.3" resolved "https://registry.yarnpkg.com/email-addresses/-/email-addresses-3.0.3.tgz#fc3c6952f68da24239914e982c8a7783bc2ed96d" +emittery@^0.7.1: + version "0.7.2" + resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.2.tgz#25595908e13af0f5674ab419396e2fb394cdfa82" + integrity sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ== + emoji-regex@^7.0.1, emoji-regex@^7.0.2: version "7.0.3" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" @@ -3118,29 +3625,26 @@ entities@^1.1.1, entities@~1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" -enzyme-adapter-react-16@^1.12.1: - version "1.13.2" - resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.13.2.tgz#8a574d7cbbef7ef0cab2022e9bfc12aeaebb7ae5" +enzyme-adapter-utils@^1.14.0: + version "1.14.0" + resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.14.0.tgz#afbb0485e8033aa50c744efb5f5711e64fbf1ad0" + integrity sha512-F/z/7SeLt+reKFcb7597IThpDp0bmzcH1E9Oabqv+o01cID2/YInlqHbFl7HzWBl4h3OdZYedtwNDOmSKkk0bg== dependencies: - enzyme-adapter-utils "^1.12.0" + airbnb-prop-types "^2.16.0" + function.prototype.name "^1.1.3" has "^1.0.3" - object.assign "^4.1.0" - object.values "^1.1.0" + object.assign "^4.1.2" + object.fromentries "^2.0.3" prop-types "^15.7.2" - react-is "^16.8.6" - react-test-renderer "^16.0.0-0" - semver "^5.7.0" + semver "^5.7.1" -enzyme-adapter-utils@^1.12.0: - version "1.12.0" - resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.12.0.tgz#96e3730d76b872f593e54ce1c51fa3a451422d93" +enzyme-shallow-equal@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.4.tgz#b9256cb25a5f430f9bfe073a84808c1d74fced2e" + integrity sha512-MttIwB8kKxypwHvRynuC3ahyNc+cFbR8mjVIltnmzQ0uKGqmsfO4bfBuLxb0beLNPhjblUEYvEbsg+VSygvF1Q== dependencies: - airbnb-prop-types "^2.13.2" - function.prototype.name "^1.1.0" - object.assign "^4.1.0" - object.fromentries "^2.0.0" - prop-types "^15.7.2" - semver "^5.6.0" + has "^1.0.3" + object-is "^1.1.2" enzyme-to-json@^3.3.5: version "3.3.5" @@ -3186,7 +3690,7 @@ error-ex@^1.2.0, error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.10.0, es-abstract@^1.11.0, es-abstract@^1.12.0, es-abstract@^1.13.0, es-abstract@^1.5.0, es-abstract@^1.5.1, es-abstract@^1.7.0: +es-abstract@^1.10.0, es-abstract@^1.11.0, es-abstract@^1.12.0, es-abstract@^1.5.0, es-abstract@^1.5.1, es-abstract@^1.7.0: version "1.13.0" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9" dependencies: @@ -3197,6 +3701,41 @@ es-abstract@^1.10.0, es-abstract@^1.11.0, es-abstract@^1.12.0, es-abstract@^1.13 is-regex "^1.0.4" object-keys "^1.0.12" +es-abstract@^1.17.4: + version "1.17.7" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c" + integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g== + dependencies: + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + is-callable "^1.2.2" + is-regex "^1.1.1" + object-inspect "^1.8.0" + object-keys "^1.1.1" + object.assign "^4.1.1" + string.prototype.trimend "^1.0.1" + string.prototype.trimstart "^1.0.1" + +es-abstract@^1.18.0-next.1: + version "1.18.0-next.1" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68" + integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA== + dependencies: + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + is-callable "^1.2.2" + is-negative-zero "^2.0.0" + is-regex "^1.1.1" + object-inspect "^1.8.0" + object-keys "^1.1.1" + object.assign "^4.1.1" + string.prototype.trimend "^1.0.1" + string.prototype.trimstart "^1.0.1" + es-to-primitive@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377" @@ -3205,6 +3744,15 @@ es-to-primitive@^1.2.0: is-date-object "^1.0.1" is-symbol "^1.0.2" +es-to-primitive@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" + integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== + dependencies: + is-callable "^1.1.4" + is-date-object "^1.0.1" + is-symbol "^1.0.2" + escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" @@ -3213,11 +3761,17 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" -escodegen@^1.9.1: - version "1.11.1" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.1.tgz#c485ff8d6b4cdb89e27f4a856e91f118401ca510" +escape-string-regexp@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" + integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== + +escodegen@^1.14.1: + version "1.14.3" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503" + integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw== dependencies: - esprima "^3.1.3" + esprima "^4.0.1" estraverse "^4.2.0" esutils "^2.0.2" optionator "^0.8.1" @@ -3385,11 +3939,7 @@ espree@^5.0.1: acorn-jsx "^5.0.0" eslint-visitor-keys "^1.0.0" -esprima@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" - -esprima@^4.0.0: +esprima@^4.0.0, esprima@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" @@ -3490,6 +4040,21 @@ execa@^1.0.0: signal-exit "^3.0.0" strip-eof "^1.0.0" +execa@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a" + integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA== + dependencies: + cross-spawn "^7.0.0" + get-stream "^5.0.0" + human-signals "^1.1.1" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^4.0.0" + onetime "^5.1.0" + signal-exit "^3.0.2" + strip-final-newline "^2.0.0" + executable@4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/executable/-/executable-4.1.1.tgz#41532bff361d3e57af4d763b70582db18f5d133c" @@ -3526,16 +4091,17 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2: dependencies: homedir-polyfill "^1.0.1" -expect@^24.8.0: - version "24.8.0" - resolved "https://registry.yarnpkg.com/expect/-/expect-24.8.0.tgz#471f8ec256b7b6129ca2524b2a62f030df38718d" +expect@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/expect/-/expect-26.6.2.tgz#c6b996bf26bf3fe18b67b2d0f51fc981ba934417" + integrity sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA== dependencies: - "@jest/types" "^24.8.0" - ansi-styles "^3.2.0" - jest-get-type "^24.8.0" - jest-matcher-utils "^24.8.0" - jest-message-util "^24.8.0" - jest-regex-util "^24.3.0" + "@jest/types" "^26.6.2" + ansi-styles "^4.0.0" + jest-get-type "^26.3.0" + jest-matcher-utils "^26.6.2" + jest-message-util "^26.6.2" + jest-regex-util "^26.0.0" express@^4.17.0: version "4.17.1" @@ -3640,6 +4206,11 @@ fast-deep-equal@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" +fast-deep-equal@^3.1.1: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== + fast-json-stable-stringify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" @@ -3806,7 +4377,7 @@ find-up@^3.0.0: dependencies: locate-path "^3.0.0" -find-up@^4.1.0: +find-up@^4.0.0, find-up@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== @@ -3980,6 +4551,11 @@ fsevents@^1.2.7: nan "^2.12.1" node-pre-gyp "^0.12.0" +fsevents@^2.1.2: + version "2.2.1" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.2.1.tgz#1fb02ded2036a8ac288d507a65962bd87b97628d" + integrity sha512-bTLYHSeC0UH/EFXS9KqWnXuOl/wHK5Z/d+ghd5AsFMYN7wIGkUCOJyzy88+wJKkZPGON8u4Z9f6U4FdgURE9qA== + fstream@^1.0.0, fstream@^1.0.12: version "1.0.12" resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045" @@ -4001,10 +4577,25 @@ function.prototype.name@^1.1.0: function-bind "^1.1.1" is-callable "^1.1.3" +function.prototype.name@^1.1.2, function.prototype.name@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.3.tgz#0bb034bb308e7682826f215eb6b2ae64918847fe" + integrity sha512-H51qkbNSp8mtkJt+nyW1gyStBiKZxfRqySNUR99ylq6BPXHKI4SEvIlTKp4odLfjRKJV04DFWMU3G/YRlQOsag== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + es-abstract "^1.18.0-next.1" + functions-have-names "^1.2.1" + functional-red-black-tree@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" +functions-have-names@^1.2.1: + version "1.2.2" + resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.2.tgz#98d93991c39da9361f8e50b337c4f6e41f120e21" + integrity sha512-bLgc3asbWdwPbx2mNk2S49kmJCuQeu0nfmaOgbs8WIyzzkw3r4htszdIi9Q9EMezDPTYuJx2wvjZ/EwgAthpnA== + gauge@~2.7.3: version "2.7.4" resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" @@ -4024,6 +4615,11 @@ gaze@^1.0.0: dependencies: globule "^1.0.0" +gensync@^1.0.0-beta.1: + version "1.0.0-beta.2" + resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" + integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== + get-caller-file@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" @@ -4033,6 +4629,20 @@ get-caller-file@^2.0.1: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== +get-intrinsic@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.2.tgz#6820da226e50b24894e08859469dc68361545d49" + integrity sha512-aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg== + dependencies: + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + +get-package-type@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" + integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q== + get-stdin@8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53" @@ -4052,6 +4662,13 @@ get-stream@^4.0.0: dependencies: pump "^3.0.0" +get-stream@^5.0.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" + integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== + dependencies: + pump "^3.0.0" + get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" @@ -4171,7 +4788,7 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6 version "4.1.15" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" -graceful-fs@^4.2.0: +graceful-fs@^4.2.0, graceful-fs@^4.2.4: version "4.2.4" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== @@ -4188,16 +4805,6 @@ handle-thing@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754" -handlebars@^4.1.2: - version "4.5.3" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.3.tgz#5cf75bd8714f7605713511a56be7c349becb0482" - dependencies: - neo-async "^2.6.0" - optimist "^0.6.1" - source-map "^0.6.1" - optionalDependencies: - uglify-js "^3.1.4" - har-schema@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" @@ -4209,6 +4816,14 @@ har-validator@~5.1.0: ajv "^6.5.5" har-schema "^2.0.0" +har-validator@~5.1.3: + version "5.1.5" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd" + integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w== + dependencies: + ajv "^6.12.3" + har-schema "^2.0.0" + hard-rejection@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883" @@ -4237,6 +4852,11 @@ has-symbols@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44" +has-symbols@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" + integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== + has-unicode@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" @@ -4357,16 +4977,22 @@ html-element-map@^1.0.0: dependencies: array-filter "^1.0.0" -html-encoding-sniffer@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8" +html-encoding-sniffer@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3" + integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ== dependencies: - whatwg-encoding "^1.0.1" + whatwg-encoding "^1.0.5" html-entities@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f" +html-escaper@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" + integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== + html-minifier@^3.2.3: version "3.5.21" resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.21.tgz#d0040e054730e354db008463593194015212d20c" @@ -4458,6 +5084,11 @@ https-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" +human-signals@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" + integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== + humanize-url@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/humanize-url/-/humanize-url-1.0.1.tgz#f4ab99e0d288174ca4e1e50407c55fbae464efff" @@ -4544,6 +5175,14 @@ import-local@^2.0.0: pkg-dir "^3.0.0" resolve-cwd "^2.0.0" +import-local@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6" + integrity sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA== + dependencies: + pkg-dir "^4.2.0" + resolve-cwd "^3.0.0" + imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" @@ -4710,6 +5349,11 @@ is-callable@^1.1.3, is-callable@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" +is-callable@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9" + integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA== + is-ci@1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c" @@ -4766,6 +5410,11 @@ is-directory@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" +is-docker@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156" + integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw== + is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" @@ -4830,6 +5479,11 @@ is-lower-case@^1.1.0: dependencies: lower-case "^1.1.0" +is-negative-zero@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" + integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== + is-number-object@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.3.tgz#f265ab89a9f445034ef6aff15a8f00b00f551799" @@ -4882,6 +5536,11 @@ is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: dependencies: isobject "^3.0.1" +is-potential-custom-element-name@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397" + integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c= + is-promise@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" @@ -4892,10 +5551,22 @@ is-regex@^1.0.4: dependencies: has "^1.0.1" +is-regex@^1.1.0, is-regex@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9" + integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg== + dependencies: + has-symbols "^1.0.1" + is-stream@^1.0.1, is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" +is-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" + integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== + is-string@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.4.tgz#cc3a9b69857d621e963725a24caeec873b826e64" @@ -4917,9 +5588,10 @@ is-text-path@^1.0.1: dependencies: text-extensions "^1.0.0" -is-typedarray@~1.0.0: +is-typedarray@^1.0.0, is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= is-upper-case@^1.1.0: version "1.1.2" @@ -4939,6 +5611,13 @@ is-wsl@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" +is-wsl@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" + integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== + dependencies: + is-docker "^2.0.0" + isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" @@ -4974,375 +5653,426 @@ isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" -istanbul-lib-coverage@^2.0.2, istanbul-lib-coverage@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49" +istanbul-lib-coverage@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec" + integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg== -istanbul-lib-instrument@^3.0.1, istanbul-lib-instrument@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz#a5f63d91f0bbc0c3e479ef4c5de027335ec6d630" - dependencies: - "@babel/generator" "^7.4.0" - "@babel/parser" "^7.4.3" - "@babel/template" "^7.4.0" - "@babel/traverse" "^7.4.3" - "@babel/types" "^7.4.0" - istanbul-lib-coverage "^2.0.5" - semver "^6.0.0" +istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d" + integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ== + dependencies: + "@babel/core" "^7.7.5" + "@istanbuljs/schema" "^0.1.2" + istanbul-lib-coverage "^3.0.0" + semver "^6.3.0" -istanbul-lib-report@^2.0.4: - version "2.0.8" - resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz#5a8113cd746d43c4889eba36ab10e7d50c9b4f33" +istanbul-lib-report@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6" + integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw== dependencies: - istanbul-lib-coverage "^2.0.5" - make-dir "^2.1.0" - supports-color "^6.1.0" + istanbul-lib-coverage "^3.0.0" + make-dir "^3.0.0" + supports-color "^7.1.0" -istanbul-lib-source-maps@^3.0.1: - version "3.0.6" - resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz#284997c48211752ec486253da97e3879defba8c8" +istanbul-lib-source-maps@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz#75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9" + integrity sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg== dependencies: debug "^4.1.1" - istanbul-lib-coverage "^2.0.5" - make-dir "^2.1.0" - rimraf "^2.6.3" + istanbul-lib-coverage "^3.0.0" source-map "^0.6.1" -istanbul-reports@^2.1.1: - version "2.2.6" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.6.tgz#7b4f2660d82b29303a8fe6091f8ca4bf058da1af" +istanbul-reports@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz#d593210e5000683750cb09fc0644e4b6e27fd53b" + integrity sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw== dependencies: - handlebars "^4.1.2" + html-escaper "^2.0.0" + istanbul-lib-report "^3.0.0" -jest-changed-files@^24.8.0: - version "24.8.0" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.8.0.tgz#7e7eb21cf687587a85e50f3d249d1327e15b157b" +jest-changed-files@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.6.2.tgz#f6198479e1cc66f22f9ae1e22acaa0b429c042d0" + integrity sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ== dependencies: - "@jest/types" "^24.8.0" - execa "^1.0.0" - throat "^4.0.0" + "@jest/types" "^26.6.2" + execa "^4.0.0" + throat "^5.0.0" -jest-cli@^24.8.0: - version "24.8.0" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-24.8.0.tgz#b075ac914492ed114fa338ade7362a301693e989" +jest-cli@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.6.3.tgz#43117cfef24bc4cd691a174a8796a532e135e92a" + integrity sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg== dependencies: - "@jest/core" "^24.8.0" - "@jest/test-result" "^24.8.0" - "@jest/types" "^24.8.0" - chalk "^2.0.1" + "@jest/core" "^26.6.3" + "@jest/test-result" "^26.6.2" + "@jest/types" "^26.6.2" + chalk "^4.0.0" exit "^0.1.2" - import-local "^2.0.0" + graceful-fs "^4.2.4" + import-local "^3.0.2" is-ci "^2.0.0" - jest-config "^24.8.0" - jest-util "^24.8.0" - jest-validate "^24.8.0" + jest-config "^26.6.3" + jest-util "^26.6.2" + jest-validate "^26.6.2" prompts "^2.0.1" - realpath-native "^1.1.0" - yargs "^12.0.2" + yargs "^15.4.1" -jest-config@^24.8.0: - version "24.8.0" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-24.8.0.tgz#77db3d265a6f726294687cbbccc36f8a76ee0f4f" +jest-config@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.6.3.tgz#64f41444eef9eb03dc51d5c53b75c8c71f645349" + integrity sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg== dependencies: "@babel/core" "^7.1.0" - "@jest/test-sequencer" "^24.8.0" - "@jest/types" "^24.8.0" - babel-jest "^24.8.0" - chalk "^2.0.1" + "@jest/test-sequencer" "^26.6.3" + "@jest/types" "^26.6.2" + babel-jest "^26.6.3" + chalk "^4.0.0" + deepmerge "^4.2.2" glob "^7.1.1" - jest-environment-jsdom "^24.8.0" - jest-environment-node "^24.8.0" - jest-get-type "^24.8.0" - jest-jasmine2 "^24.8.0" - jest-regex-util "^24.3.0" - jest-resolve "^24.8.0" - jest-util "^24.8.0" - jest-validate "^24.8.0" - micromatch "^3.1.10" - pretty-format "^24.8.0" - realpath-native "^1.1.0" - -jest-css-modules@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/jest-css-modules/-/jest-css-modules-2.0.0.tgz#d96b91026e292e1b5c6e7def9860de7fc734975d" + graceful-fs "^4.2.4" + jest-environment-jsdom "^26.6.2" + jest-environment-node "^26.6.2" + jest-get-type "^26.3.0" + jest-jasmine2 "^26.6.3" + jest-regex-util "^26.0.0" + jest-resolve "^26.6.2" + jest-util "^26.6.2" + jest-validate "^26.6.2" + micromatch "^4.0.2" + pretty-format "^26.6.2" + +jest-css-modules@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/jest-css-modules/-/jest-css-modules-2.1.0.tgz#9c25ebe9d0214d8f55861a442268fdd4b01b4781" + integrity sha512-my3Scnt6l2tOll/eGwNZeh1KLAFkNzdl4MyZRdpl46GO6/93JcKKdTjNqK6Nokg8A8rT84MFLOpY1pzqKBEqMw== dependencies: identity-obj-proxy "3.0.0" -jest-diff@^24.8.0: - version "24.8.0" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.8.0.tgz#146435e7d1e3ffdf293d53ff97e193f1d1546172" +jest-diff@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394" + integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA== dependencies: - chalk "^2.0.1" - diff-sequences "^24.3.0" - jest-get-type "^24.8.0" - pretty-format "^24.8.0" - -jest-docblock@^24.3.0: - version "24.3.0" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-24.3.0.tgz#b9c32dac70f72e4464520d2ba4aec02ab14db5dd" - dependencies: - detect-newline "^2.1.0" - -jest-each@^24.8.0: - version "24.8.0" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-24.8.0.tgz#a05fd2bf94ddc0b1da66c6d13ec2457f35e52775" - dependencies: - "@jest/types" "^24.8.0" - chalk "^2.0.1" - jest-get-type "^24.8.0" - jest-util "^24.8.0" - pretty-format "^24.8.0" + chalk "^4.0.0" + diff-sequences "^26.6.2" + jest-get-type "^26.3.0" + pretty-format "^26.6.2" -jest-environment-jsdom@^24.8.0: - version "24.8.0" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-24.8.0.tgz#300f6949a146cabe1c9357ad9e9ecf9f43f38857" +jest-docblock@^26.0.0: + version "26.0.0" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-26.0.0.tgz#3e2fa20899fc928cb13bd0ff68bd3711a36889b5" + integrity sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w== dependencies: - "@jest/environment" "^24.8.0" - "@jest/fake-timers" "^24.8.0" - "@jest/types" "^24.8.0" - jest-mock "^24.8.0" - jest-util "^24.8.0" - jsdom "^11.5.1" + detect-newline "^3.0.0" -jest-environment-node@^24.8.0: - version "24.8.0" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-24.8.0.tgz#d3f726ba8bc53087a60e7a84ca08883a4c892231" +jest-each@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.6.2.tgz#02526438a77a67401c8a6382dfe5999952c167cb" + integrity sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A== dependencies: - "@jest/environment" "^24.8.0" - "@jest/fake-timers" "^24.8.0" - "@jest/types" "^24.8.0" - jest-mock "^24.8.0" - jest-util "^24.8.0" + "@jest/types" "^26.6.2" + chalk "^4.0.0" + jest-get-type "^26.3.0" + jest-util "^26.6.2" + pretty-format "^26.6.2" + +jest-environment-jsdom@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz#78d09fe9cf019a357009b9b7e1f101d23bd1da3e" + integrity sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q== + dependencies: + "@jest/environment" "^26.6.2" + "@jest/fake-timers" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/node" "*" + jest-mock "^26.6.2" + jest-util "^26.6.2" + jsdom "^16.4.0" + +jest-environment-node@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.6.2.tgz#824e4c7fb4944646356f11ac75b229b0035f2b0c" + integrity sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag== + dependencies: + "@jest/environment" "^26.6.2" + "@jest/fake-timers" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/node" "*" + jest-mock "^26.6.2" + jest-util "^26.6.2" -jest-get-type@^24.8.0: - version "24.8.0" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.8.0.tgz#a7440de30b651f5a70ea3ed7ff073a32dfe646fc" +jest-get-type@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0" + integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig== -jest-haste-map@^24.8.0: - version "24.8.0" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.8.0.tgz#51794182d877b3ddfd6e6d23920e3fe72f305800" +jest-haste-map@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.6.2.tgz#dd7e60fe7dc0e9f911a23d79c5ff7fb5c2cafeaa" + integrity sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w== dependencies: - "@jest/types" "^24.8.0" - anymatch "^2.0.0" + "@jest/types" "^26.6.2" + "@types/graceful-fs" "^4.1.2" + "@types/node" "*" + anymatch "^3.0.3" fb-watchman "^2.0.0" - graceful-fs "^4.1.15" - invariant "^2.2.4" - jest-serializer "^24.4.0" - jest-util "^24.8.0" - jest-worker "^24.6.0" - micromatch "^3.1.10" + graceful-fs "^4.2.4" + jest-regex-util "^26.0.0" + jest-serializer "^26.6.2" + jest-util "^26.6.2" + jest-worker "^26.6.2" + micromatch "^4.0.2" sane "^4.0.3" walker "^1.0.7" optionalDependencies: - fsevents "^1.2.7" + fsevents "^2.1.2" -jest-jasmine2@^24.8.0: - version "24.8.0" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-24.8.0.tgz#a9c7e14c83dd77d8b15e820549ce8987cc8cd898" +jest-jasmine2@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz#adc3cf915deacb5212c93b9f3547cd12958f2edd" + integrity sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg== dependencies: "@babel/traverse" "^7.1.0" - "@jest/environment" "^24.8.0" - "@jest/test-result" "^24.8.0" - "@jest/types" "^24.8.0" - chalk "^2.0.1" + "@jest/environment" "^26.6.2" + "@jest/source-map" "^26.6.2" + "@jest/test-result" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/node" "*" + chalk "^4.0.0" co "^4.6.0" - expect "^24.8.0" + expect "^26.6.2" is-generator-fn "^2.0.0" - jest-each "^24.8.0" - jest-matcher-utils "^24.8.0" - jest-message-util "^24.8.0" - jest-runtime "^24.8.0" - jest-snapshot "^24.8.0" - jest-util "^24.8.0" - pretty-format "^24.8.0" - throat "^4.0.0" - -jest-leak-detector@^24.8.0: - version "24.8.0" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-24.8.0.tgz#c0086384e1f650c2d8348095df769f29b48e6980" - dependencies: - pretty-format "^24.8.0" - -jest-matcher-utils@^24.8.0: - version "24.8.0" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.8.0.tgz#2bce42204c9af12bde46f83dc839efe8be832495" + jest-each "^26.6.2" + jest-matcher-utils "^26.6.2" + jest-message-util "^26.6.2" + jest-runtime "^26.6.3" + jest-snapshot "^26.6.2" + jest-util "^26.6.2" + pretty-format "^26.6.2" + throat "^5.0.0" + +jest-leak-detector@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz#7717cf118b92238f2eba65054c8a0c9c653a91af" + integrity sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg== + dependencies: + jest-get-type "^26.3.0" + pretty-format "^26.6.2" + +jest-matcher-utils@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz#8e6fd6e863c8b2d31ac6472eeb237bc595e53e7a" + integrity sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw== dependencies: - chalk "^2.0.1" - jest-diff "^24.8.0" - jest-get-type "^24.8.0" - pretty-format "^24.8.0" + chalk "^4.0.0" + jest-diff "^26.6.2" + jest-get-type "^26.3.0" + pretty-format "^26.6.2" -jest-message-util@^24.8.0: - version "24.8.0" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.8.0.tgz#0d6891e72a4beacc0292b638685df42e28d6218b" +jest-message-util@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.6.2.tgz#58173744ad6fc0506b5d21150b9be56ef001ca07" + integrity sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA== dependencies: "@babel/code-frame" "^7.0.0" - "@jest/test-result" "^24.8.0" - "@jest/types" "^24.8.0" - "@types/stack-utils" "^1.0.1" - chalk "^2.0.1" - micromatch "^3.1.10" - slash "^2.0.0" - stack-utils "^1.0.1" - -jest-mock@^24.8.0: - version "24.8.0" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.8.0.tgz#2f9d14d37699e863f1febf4e4d5a33b7fdbbde56" - dependencies: - "@jest/types" "^24.8.0" + "@jest/types" "^26.6.2" + "@types/stack-utils" "^2.0.0" + chalk "^4.0.0" + graceful-fs "^4.2.4" + micromatch "^4.0.2" + pretty-format "^26.6.2" + slash "^3.0.0" + stack-utils "^2.0.2" + +jest-mock@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.6.2.tgz#d6cb712b041ed47fe0d9b6fc3474bc6543feb302" + integrity sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew== + dependencies: + "@jest/types" "^26.6.2" + "@types/node" "*" -jest-pnp-resolver@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz#ecdae604c077a7fbc70defb6d517c3c1c898923a" +jest-pnp-resolver@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c" + integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w== -jest-regex-util@^24.3.0: - version "24.3.0" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.3.0.tgz#d5a65f60be1ae3e310d5214a0307581995227b36" +jest-regex-util@^26.0.0: + version "26.0.0" + resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28" + integrity sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A== -jest-resolve-dependencies@^24.8.0: - version "24.8.0" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-24.8.0.tgz#19eec3241f2045d3f990dba331d0d7526acff8e0" +jest-resolve-dependencies@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz#6680859ee5d22ee5dcd961fe4871f59f4c784fb6" + integrity sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg== dependencies: - "@jest/types" "^24.8.0" - jest-regex-util "^24.3.0" - jest-snapshot "^24.8.0" + "@jest/types" "^26.6.2" + jest-regex-util "^26.0.0" + jest-snapshot "^26.6.2" -jest-resolve@^24.8.0: - version "24.8.0" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-24.8.0.tgz#84b8e5408c1f6a11539793e2b5feb1b6e722439f" +jest-resolve@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.6.2.tgz#a3ab1517217f469b504f1b56603c5bb541fbb507" + integrity sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ== dependencies: - "@jest/types" "^24.8.0" - browser-resolve "^1.11.3" - chalk "^2.0.1" - jest-pnp-resolver "^1.2.1" - realpath-native "^1.1.0" - -jest-runner@^24.8.0: - version "24.8.0" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-24.8.0.tgz#4f9ae07b767db27b740d7deffad0cf67ccb4c5bb" - dependencies: - "@jest/console" "^24.7.1" - "@jest/environment" "^24.8.0" - "@jest/test-result" "^24.8.0" - "@jest/types" "^24.8.0" - chalk "^2.4.2" + "@jest/types" "^26.6.2" + chalk "^4.0.0" + graceful-fs "^4.2.4" + jest-pnp-resolver "^1.2.2" + jest-util "^26.6.2" + read-pkg-up "^7.0.1" + resolve "^1.18.1" + slash "^3.0.0" + +jest-runner@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.6.3.tgz#2d1fed3d46e10f233fd1dbd3bfaa3fe8924be159" + integrity sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ== + dependencies: + "@jest/console" "^26.6.2" + "@jest/environment" "^26.6.2" + "@jest/test-result" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/node" "*" + chalk "^4.0.0" + emittery "^0.7.1" exit "^0.1.2" - graceful-fs "^4.1.15" - jest-config "^24.8.0" - jest-docblock "^24.3.0" - jest-haste-map "^24.8.0" - jest-jasmine2 "^24.8.0" - jest-leak-detector "^24.8.0" - jest-message-util "^24.8.0" - jest-resolve "^24.8.0" - jest-runtime "^24.8.0" - jest-util "^24.8.0" - jest-worker "^24.6.0" + graceful-fs "^4.2.4" + jest-config "^26.6.3" + jest-docblock "^26.0.0" + jest-haste-map "^26.6.2" + jest-leak-detector "^26.6.2" + jest-message-util "^26.6.2" + jest-resolve "^26.6.2" + jest-runtime "^26.6.3" + jest-util "^26.6.2" + jest-worker "^26.6.2" source-map-support "^0.5.6" - throat "^4.0.0" - -jest-runtime@^24.8.0: - version "24.8.0" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-24.8.0.tgz#05f94d5b05c21f6dc54e427cd2e4980923350620" - dependencies: - "@jest/console" "^24.7.1" - "@jest/environment" "^24.8.0" - "@jest/source-map" "^24.3.0" - "@jest/transform" "^24.8.0" - "@jest/types" "^24.8.0" - "@types/yargs" "^12.0.2" - chalk "^2.0.1" + throat "^5.0.0" + +jest-runtime@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.6.3.tgz#4f64efbcfac398331b74b4b3c82d27d401b8fa2b" + integrity sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw== + dependencies: + "@jest/console" "^26.6.2" + "@jest/environment" "^26.6.2" + "@jest/fake-timers" "^26.6.2" + "@jest/globals" "^26.6.2" + "@jest/source-map" "^26.6.2" + "@jest/test-result" "^26.6.2" + "@jest/transform" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/yargs" "^15.0.0" + chalk "^4.0.0" + cjs-module-lexer "^0.6.0" + collect-v8-coverage "^1.0.0" exit "^0.1.2" glob "^7.1.3" - graceful-fs "^4.1.15" - jest-config "^24.8.0" - jest-haste-map "^24.8.0" - jest-message-util "^24.8.0" - jest-mock "^24.8.0" - jest-regex-util "^24.3.0" - jest-resolve "^24.8.0" - jest-snapshot "^24.8.0" - jest-util "^24.8.0" - jest-validate "^24.8.0" - realpath-native "^1.1.0" - slash "^2.0.0" - strip-bom "^3.0.0" - yargs "^12.0.2" - -jest-serializer@^24.4.0: - version "24.4.0" - resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.4.0.tgz#f70c5918c8ea9235ccb1276d232e459080588db3" + graceful-fs "^4.2.4" + jest-config "^26.6.3" + jest-haste-map "^26.6.2" + jest-message-util "^26.6.2" + jest-mock "^26.6.2" + jest-regex-util "^26.0.0" + jest-resolve "^26.6.2" + jest-snapshot "^26.6.2" + jest-util "^26.6.2" + jest-validate "^26.6.2" + slash "^3.0.0" + strip-bom "^4.0.0" + yargs "^15.4.1" + +jest-serializer@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.6.2.tgz#d139aafd46957d3a448f3a6cdabe2919ba0742d1" + integrity sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g== + dependencies: + "@types/node" "*" + graceful-fs "^4.2.4" -jest-snapshot@^24.8.0: - version "24.8.0" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.8.0.tgz#3bec6a59da2ff7bc7d097a853fb67f9d415cb7c6" +jest-snapshot@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.6.2.tgz#f3b0af1acb223316850bd14e1beea9837fb39c84" + integrity sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og== dependencies: "@babel/types" "^7.0.0" - "@jest/types" "^24.8.0" - chalk "^2.0.1" - expect "^24.8.0" - jest-diff "^24.8.0" - jest-matcher-utils "^24.8.0" - jest-message-util "^24.8.0" - jest-resolve "^24.8.0" - mkdirp "^0.5.1" + "@jest/types" "^26.6.2" + "@types/babel__traverse" "^7.0.4" + "@types/prettier" "^2.0.0" + chalk "^4.0.0" + expect "^26.6.2" + graceful-fs "^4.2.4" + jest-diff "^26.6.2" + jest-get-type "^26.3.0" + jest-haste-map "^26.6.2" + jest-matcher-utils "^26.6.2" + jest-message-util "^26.6.2" + jest-resolve "^26.6.2" natural-compare "^1.4.0" - pretty-format "^24.8.0" - semver "^5.5.0" + pretty-format "^26.6.2" + semver "^7.3.2" -jest-util@^24.8.0: - version "24.8.0" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-24.8.0.tgz#41f0e945da11df44cc76d64ffb915d0716f46cd1" +jest-util@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1" + integrity sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q== dependencies: - "@jest/console" "^24.7.1" - "@jest/fake-timers" "^24.8.0" - "@jest/source-map" "^24.3.0" - "@jest/test-result" "^24.8.0" - "@jest/types" "^24.8.0" - callsites "^3.0.0" - chalk "^2.0.1" - graceful-fs "^4.1.15" + "@jest/types" "^26.6.2" + "@types/node" "*" + chalk "^4.0.0" + graceful-fs "^4.2.4" is-ci "^2.0.0" - mkdirp "^0.5.1" - slash "^2.0.0" - source-map "^0.6.0" + micromatch "^4.0.2" -jest-validate@^24.8.0: - version "24.8.0" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.8.0.tgz#624c41533e6dfe356ffadc6e2423a35c2d3b4849" - dependencies: - "@jest/types" "^24.8.0" - camelcase "^5.0.0" - chalk "^2.0.1" - jest-get-type "^24.8.0" - leven "^2.1.0" - pretty-format "^24.8.0" +jest-validate@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.6.2.tgz#23d380971587150467342911c3d7b4ac57ab20ec" + integrity sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ== + dependencies: + "@jest/types" "^26.6.2" + camelcase "^6.0.0" + chalk "^4.0.0" + jest-get-type "^26.3.0" + leven "^3.1.0" + pretty-format "^26.6.2" -jest-watcher@^24.8.0: - version "24.8.0" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-24.8.0.tgz#58d49915ceddd2de85e238f6213cef1c93715de4" +jest-watcher@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.6.2.tgz#a5b683b8f9d68dbcb1d7dae32172d2cca0592975" + integrity sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ== dependencies: - "@jest/test-result" "^24.8.0" - "@jest/types" "^24.8.0" - "@types/yargs" "^12.0.9" - ansi-escapes "^3.0.0" - chalk "^2.0.1" - jest-util "^24.8.0" - string-length "^2.0.0" + "@jest/test-result" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/node" "*" + ansi-escapes "^4.2.1" + chalk "^4.0.0" + jest-util "^26.6.2" + string-length "^4.0.1" -jest-worker@^24.6.0: - version "24.6.0" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.6.0.tgz#7f81ceae34b7cde0c9827a6980c35b7cdc0161b3" +jest-worker@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed" + integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ== dependencies: - merge-stream "^1.0.1" - supports-color "^6.1.0" + "@types/node" "*" + merge-stream "^2.0.0" + supports-color "^7.0.0" -jest@^24.8.0: - version "24.8.0" - resolved "https://registry.yarnpkg.com/jest/-/jest-24.8.0.tgz#d5dff1984d0d1002196e9b7f12f75af1b2809081" +jest@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest/-/jest-26.6.3.tgz#40e8fdbe48f00dfa1f0ce8121ca74b88ac9148ef" + integrity sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q== dependencies: - import-local "^2.0.0" - jest-cli "^24.8.0" + "@jest/core" "^26.6.3" + import-local "^3.0.2" + jest-cli "^26.6.3" joi@^13.0.0: version "13.7.0" @@ -5371,39 +6101,48 @@ js-yaml@^3.11.0, js-yaml@^3.13.0, js-yaml@^3.9.0: argparse "^1.0.7" esprima "^4.0.0" +js-yaml@^3.13.1: + version "3.14.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" -jsdom@^11.5.1: - version "11.12.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.12.0.tgz#1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8" - dependencies: - abab "^2.0.0" - acorn "^5.5.3" - acorn-globals "^4.1.0" - array-equal "^1.0.0" - cssom ">= 0.3.2 < 0.4.0" - cssstyle "^1.0.0" - data-urls "^1.0.0" - domexception "^1.0.1" - escodegen "^1.9.1" - html-encoding-sniffer "^1.0.2" - left-pad "^1.3.0" - nwsapi "^2.0.7" - parse5 "4.0.0" - pn "^1.1.0" - request "^2.87.0" - request-promise-native "^1.0.5" - sax "^1.2.4" - symbol-tree "^3.2.2" - tough-cookie "^2.3.4" - w3c-hr-time "^1.0.1" - webidl-conversions "^4.0.2" - whatwg-encoding "^1.0.3" - whatwg-mimetype "^2.1.0" - whatwg-url "^6.4.1" - ws "^5.2.0" +jsdom@^16.4.0: + version "16.4.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz#36005bde2d136f73eee1a830c6d45e55408edddb" + integrity sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w== + dependencies: + abab "^2.0.3" + acorn "^7.1.1" + acorn-globals "^6.0.0" + cssom "^0.4.4" + cssstyle "^2.2.0" + data-urls "^2.0.0" + decimal.js "^10.2.0" + domexception "^2.0.1" + escodegen "^1.14.1" + html-encoding-sniffer "^2.0.1" + is-potential-custom-element-name "^1.0.0" + nwsapi "^2.2.0" + parse5 "5.1.1" + request "^2.88.2" + request-promise-native "^1.0.8" + saxes "^5.0.0" + symbol-tree "^3.2.4" + tough-cookie "^3.0.1" + w3c-hr-time "^1.0.2" + w3c-xmlserializer "^2.0.0" + webidl-conversions "^6.1.0" + whatwg-encoding "^1.0.5" + whatwg-mimetype "^2.3.0" + whatwg-url "^8.0.0" + ws "^7.2.3" xml-name-validator "^3.0.0" jsesc@^2.5.1: @@ -5463,6 +6202,13 @@ json5@^2.1.0: dependencies: minimist "^1.2.0" +json5@^2.1.2: + version "2.1.3" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43" + integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA== + dependencies: + minimist "^1.2.5" + jsonfile@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66" @@ -5557,13 +6303,10 @@ lcov-parse@^0.0.10: version "0.0.10" resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-0.0.10.tgz#1b0b8ff9ac9c7889250582b70b71315d9da6d9a3" -left-pad@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e" - -leven@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580" +leven@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" + integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A== levn@^0.3.0, levn@~0.3.0: version "0.3.0" @@ -5643,15 +6386,6 @@ load-json-file@^2.0.0: pify "^2.0.0" strip-bom "^3.0.0" -load-json-file@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b" - dependencies: - graceful-fs "^4.1.2" - parse-json "^4.0.0" - pify "^3.0.0" - strip-bom "^3.0.0" - loader-runner@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" @@ -5843,13 +6577,20 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -make-dir@^2.0.0, make-dir@^2.1.0: +make-dir@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" dependencies: pify "^4.0.1" semver "^5.6.0" +make-dir@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" + integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== + dependencies: + semver "^6.0.0" + makeerror@1.0.x: version "1.0.11" resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c" @@ -5964,11 +6705,10 @@ merge-descriptors@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" -merge-stream@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1" - dependencies: - readable-stream "^2.0.1" +merge-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" + integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== merge@^1.2.1: version "1.2.1" @@ -5997,7 +6737,7 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4: snapdragon "^0.8.1" to-regex "^3.0.2" -micromatch@^4.0.0: +micromatch@^4.0.0, micromatch@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q== @@ -6034,9 +6774,10 @@ mimic-fn@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" -mimic-fn@^2.0.0: +mimic-fn@^2.0.0, mimic-fn@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== min-indent@^1.0.0: version "1.0.1" @@ -6074,15 +6815,11 @@ minimist@1.2.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" -minimist@1.2.5: +minimist@1.2.5, minimist@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== -minimist@~0.0.1: - version "0.0.10" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" - minipass@^2.2.1, minipass@^2.3.4: version "2.3.5" resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848" @@ -6212,7 +6949,7 @@ negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" -neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1: +neo-async@^2.5.0, neo-async@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c" @@ -6322,15 +7059,17 @@ node-modules-regexp@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40" -node-notifier@^5.2.1: - version "5.4.0" - resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.4.0.tgz#7b455fdce9f7de0c63538297354f3db468426e6a" +node-notifier@^8.0.0: + version "8.0.1" + resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.1.tgz#f86e89bbc925f2b068784b31f382afdc6ca56be1" + integrity sha512-BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA== dependencies: growly "^1.3.0" - is-wsl "^1.1.0" - semver "^5.5.0" + is-wsl "^2.2.0" + semver "^7.3.2" shellwords "^0.1.1" - which "^1.3.0" + uuid "^8.3.0" + which "^2.0.2" node-pre-gyp@^0.12.0: version "0.12.0" @@ -6451,6 +7190,13 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" +npm-run-path@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" + integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== + dependencies: + path-key "^3.0.0" + "npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" @@ -6474,9 +7220,10 @@ number-is-nan@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" -nwsapi@^2.0.7: - version "2.1.4" - resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.1.4.tgz#e006a878db23636f8e8a67d33ca0e4edf61a842f" +nwsapi@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7" + integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ== oauth-sign@~0.9.0: version "0.9.0" @@ -6498,11 +7245,24 @@ object-inspect@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b" +object-inspect@^1.8.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a" + integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw== + object-is@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6" -object-keys@^1.0.11, object-keys@^1.0.12: +object-is@^1.1.2: + version "1.1.4" + resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.4.tgz#63d6c83c00a43f4cbc9434eb9757c8a5b8565068" + integrity sha512-1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + +object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" @@ -6521,7 +7281,17 @@ object.assign@^4.1.0: has-symbols "^1.0.0" object-keys "^1.0.11" -object.entries@^1.0.4, object.entries@^1.1.0: +object.assign@^4.1.1, object.assign@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" + integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + has-symbols "^1.0.1" + object-keys "^1.1.1" + +object.entries@^1.0.4: version "1.1.0" resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.0.tgz#2024fc6d6ba246aee38bdb0ffd5cfbcf371b7519" dependencies: @@ -6530,6 +7300,16 @@ object.entries@^1.0.4, object.entries@^1.1.0: function-bind "^1.1.1" has "^1.0.3" +object.entries@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.3.tgz#c601c7f168b62374541a07ddbd3e2d5e4f7711a6" + integrity sha512-ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + es-abstract "^1.18.0-next.1" + has "^1.0.3" + object.fromentries@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.0.tgz#49a543d92151f8277b3ac9600f1e930b189d30ab" @@ -6539,6 +7319,16 @@ object.fromentries@^2.0.0: function-bind "^1.1.1" has "^1.0.1" +object.fromentries@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.3.tgz#13cefcffa702dc67750314a3305e8cb3fad1d072" + integrity sha512-IDUSMXs6LOSJBWE++L0lzIbSqHl9KDCfff2x/JSEIDtEUavUnyMYC2ZGay/04Zq4UT8lvd4xNhU4/YHKibAOlw== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + es-abstract "^1.18.0-next.1" + has "^1.0.3" + object.getownpropertydescriptors@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16" @@ -6552,7 +7342,7 @@ object.pick@^1.3.0: dependencies: isobject "^3.0.1" -object.values@^1.0.4, object.values@^1.1.0: +object.values@^1.0.4: version "1.1.0" resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.0.tgz#bf6810ef5da3e5325790eaaa2be213ea84624da9" dependencies: @@ -6561,6 +7351,16 @@ object.values@^1.0.4, object.values@^1.1.0: function-bind "^1.1.1" has "^1.0.3" +object.values@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.2.tgz#7a2015e06fcb0f546bd652486ce8583a4731c731" + integrity sha512-MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + es-abstract "^1.18.0-next.1" + has "^1.0.3" + obuf@^1.0.0, obuf@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" @@ -6591,19 +7391,19 @@ onetime@^2.0.0: dependencies: mimic-fn "^1.0.0" +onetime@^5.1.0: + version "5.1.2" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== + dependencies: + mimic-fn "^2.1.0" + opn@^5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc" dependencies: is-wsl "^1.1.0" -optimist@^0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686" - dependencies: - minimist "~0.0.1" - wordwrap "~0.0.2" - optionator@^0.8.1, optionator@^0.8.2: version "0.8.2" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64" @@ -6667,11 +7467,10 @@ p-defer@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c" -p-each-series@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-1.0.0.tgz#930f3d12dd1f50e7434457a22cd6f04ac6ad7f71" - dependencies: - p-reduce "^1.0.0" +p-each-series@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.2.0.tgz#105ab0357ce72b202a8a8b94933672657b5e2a9a" + integrity sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA== p-finally@^1.0.0: version "1.0.0" @@ -6741,10 +7540,6 @@ p-map@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175" -p-reduce@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa" - p-try@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" @@ -6815,9 +7610,10 @@ parse-passwd@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" -parse5@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608" +parse5@5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" + integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug== parse5@^3.0.1: version "3.0.3" @@ -6885,6 +7681,11 @@ path-key@^2.0.0, path-key@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" +path-key@^3.0.0, path-key@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== + path-parse@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" @@ -6907,12 +7708,6 @@ path-type@^2.0.0: dependencies: pify "^2.0.0" -path-type@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" - dependencies: - pify "^3.0.0" - path-type@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" @@ -6942,6 +7737,11 @@ performance-now@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" +picomatch@^2.0.4: + version "2.2.2" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" + integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== + picomatch@^2.0.5: version "2.2.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz#21bac888b6ed8601f831ce7816e335bc779f0a4a" @@ -6951,10 +7751,6 @@ pify@^2.0.0, pify@^2.2.0, pify@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" -pify@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" - pify@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" @@ -6987,9 +7783,12 @@ pkg-dir@^3.0.0: dependencies: find-up "^3.0.0" -pn@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb" +pkg-dir@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== + dependencies: + find-up "^4.0.0" portfinder@^1.0.20: version "1.0.20" @@ -7369,6 +8168,16 @@ pretty-format@^24.8.0: ansi-styles "^3.2.0" react-is "^16.8.4" +pretty-format@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93" + integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg== + dependencies: + "@jest/types" "^26.6.2" + ansi-regex "^5.0.0" + ansi-styles "^4.0.0" + react-is "^17.0.1" + private@^0.1.6: version "0.1.8" resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" @@ -7410,7 +8219,7 @@ prop-types-exact@^1.2.0: object.assign "^4.1.0" reflect.ownkeys "^0.2.0" -prop-types@^15.5.10, prop-types@^15.6.2, prop-types@^15.7.2: +prop-types@^15.5.10, prop-types@^15.7.2: version "15.7.2" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" dependencies: @@ -7605,6 +8414,16 @@ react-file-download@^0.3.5: version "0.3.5" resolved "https://registry.yarnpkg.com/react-file-download/-/react-file-download-0.3.5.tgz#7a4e75874528806bfa53ddddd98b4da427d3a897" +"react-is@^16.12.0 || ^17.0.0", react-is@^17.0.0, react-is@^17.0.1: + version "17.0.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339" + integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA== + +react-is@^16.13.1: + version "16.13.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" + integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== + react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6: version "16.8.6" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16" @@ -7633,14 +8452,23 @@ react-redux@^7.0.3: prop-types "^15.7.2" react-is "^16.8.6" -react-test-renderer@^16.0.0-0: - version "16.8.6" - resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.8.6.tgz#188d8029b8c39c786f998aa3efd3ffe7642d5ba1" +react-shallow-renderer@^16.13.1: + version "16.14.1" + resolved "https://registry.yarnpkg.com/react-shallow-renderer/-/react-shallow-renderer-16.14.1.tgz#bf0d02df8a519a558fd9b8215442efa5c840e124" + integrity sha512-rkIMcQi01/+kxiTE9D3fdS959U1g7gs+/rborw++42m1O9FAQiNI/UNRZExVUoAOprn4umcXf+pFRou8i4zuBg== dependencies: object-assign "^4.1.1" - prop-types "^15.6.2" - react-is "^16.8.6" - scheduler "^0.13.6" + react-is "^16.12.0 || ^17.0.0" + +react-test-renderer@^17.0.0: + version "17.0.1" + resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-17.0.1.tgz#3187e636c3063e6ae498aedf21ecf972721574c7" + integrity sha512-/dRae3mj6aObwkjCcxZPlxDFh73XZLgvwhhyON2haZGUEhiaY5EjfAdw+d/rQmlcFwdTpMXCSGVk374QbCTlrA== + dependencies: + object-assign "^4.1.1" + react-is "^17.0.1" + react-shallow-renderer "^16.13.1" + scheduler "^0.20.1" react@17.0.1: version "17.0.1" @@ -7670,13 +8498,6 @@ read-pkg-up@^2.0.0: find-up "^2.0.0" read-pkg "^2.0.0" -read-pkg-up@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978" - dependencies: - find-up "^3.0.0" - read-pkg "^3.0.0" - read-pkg-up@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507" @@ -7702,14 +8523,6 @@ read-pkg@^2.0.0: normalize-package-data "^2.3.2" path-type "^2.0.0" -read-pkg@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389" - dependencies: - load-json-file "^4.0.0" - normalize-package-data "^2.3.2" - path-type "^3.0.0" - read-pkg@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" @@ -7757,12 +8570,6 @@ readdirp@^2.2.1: micromatch "^3.1.10" readable-stream "^2.0.2" -realpath-native@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz#2003294fea23fb0672f2476ebe22fcf498a2d65c" - dependencies: - util.promisify "^1.0.0" - recompose@^0.30.0: version "0.30.0" resolved "https://registry.yarnpkg.com/recompose/-/recompose-0.30.0.tgz#82773641b3927e8c7d24a0d87d65aeeba18aabd0" @@ -7908,17 +8715,19 @@ request-progress@0.4.0: node-eta "^0.1.1" throttleit "^0.0.2" -request-promise-core@1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.2.tgz#339f6aababcafdb31c799ff158700336301d3346" +request-promise-core@1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f" + integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw== dependencies: - lodash "^4.17.11" + lodash "^4.17.19" -request-promise-native@^1.0.5: - version "1.0.7" - resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.7.tgz#a49868a624bdea5069f1251d0a836e0d89aa2c59" +request-promise-native@^1.0.8: + version "1.0.9" + resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28" + integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g== dependencies: - request-promise-core "1.1.2" + request-promise-core "1.1.4" stealthy-require "^1.1.1" tough-cookie "^2.3.3" @@ -7947,6 +8756,32 @@ request@2.88.0, request@^2.86.0, request@^2.87.0, request@^2.88.0: tunnel-agent "^0.6.0" uuid "^3.3.2" +request@^2.88.2: + version "2.88.2" + resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" + integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== + dependencies: + aws-sign2 "~0.7.0" + aws4 "^1.8.0" + caseless "~0.12.0" + combined-stream "~1.0.6" + extend "~3.0.2" + forever-agent "~0.6.1" + form-data "~2.3.2" + har-validator "~5.1.3" + http-signature "~1.2.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.19" + oauth-sign "~0.9.0" + performance-now "^2.1.0" + qs "~6.5.2" + safe-buffer "^5.1.2" + tough-cookie "~2.5.0" + tunnel-agent "^0.6.0" + uuid "^3.3.2" + require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" @@ -7977,6 +8812,13 @@ resolve-cwd@^2.0.0: dependencies: resolve-from "^3.0.0" +resolve-cwd@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" + integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg== + dependencies: + resolve-from "^5.0.0" + resolve-dir@^1.0.0, resolve-dir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43" @@ -8008,17 +8850,13 @@ resolve-url@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" -resolve@1.1.7: - version "1.1.7" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" - resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.0, resolve@^1.3.2, resolve@^1.5.0: version "1.11.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.0.tgz#4014870ba296176b86343d50b60f3b50609ce232" dependencies: path-parse "^1.0.6" -resolve@^1.17.0: +resolve@^1.17.0, resolve@^1.18.1: version "1.19.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c" integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg== @@ -8056,6 +8894,13 @@ rimraf@2.6.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3: dependencies: glob "^7.1.3" +rimraf@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + ripemd160@^2.0.0, ripemd160@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c" @@ -8153,12 +8998,12 @@ sax@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" -scheduler@^0.13.6: - version "0.13.6" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.6.tgz#466a4ec332467b31a91b9bf74e5347072e4cd889" +saxes@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" + integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw== dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" + xmlchars "^2.2.0" scheduler@^0.20.1: version "0.20.1" @@ -8216,6 +9061,11 @@ semver@7.3.2: resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== +semver@^5.7.1: + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + semver@^6.0.0, semver@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.0.tgz#e95dc415d45ecf03f2f9f83b264a6b11f49c0cca" @@ -8338,10 +9188,22 @@ shebang-command@^1.2.0: dependencies: shebang-regex "^1.0.0" +shebang-command@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== + dependencies: + shebang-regex "^3.0.0" + shebang-regex@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" +shebang-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== + shellwords@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b" @@ -8358,9 +9220,10 @@ sisteransi@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.0.tgz#77d9622ff909080f1c19e5f4a1df0c1b0a27b88c" -slash@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" +slash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" + integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== slice-ansi@0.0.4: version "0.0.4" @@ -8477,6 +9340,11 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" +source-map@^0.7.3: + version "0.7.3" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" + integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== + spdx-correct@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4" @@ -8570,9 +9438,12 @@ ssri@^6.0.1: dependencies: figgy-pudding "^3.5.1" -stack-utils@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8" +stack-utils@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.3.tgz#cd5f030126ff116b78ccb3c027fe302713b61277" + integrity sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw== + dependencies: + escape-string-regexp "^2.0.0" start-server-and-test@^1.7.13: version "1.9.1" @@ -8649,12 +9520,13 @@ strict-uri-encode@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" -string-length@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed" +string-length@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz#4a973bf31ef77c4edbceadd6af2611996985f8a1" + integrity sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw== dependencies: - astral-regex "^1.0.0" - strip-ansi "^4.0.0" + char-regex "^1.0.2" + strip-ansi "^6.0.0" string-width@^1.0.1, string-width@^1.0.2: version "1.0.2" @@ -8696,6 +9568,22 @@ string.prototype.trim@^1.1.2: es-abstract "^1.5.0" function-bind "^1.0.2" +string.prototype.trimend@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz#a22bd53cca5c7cf44d7c9d5c732118873d6cd18b" + integrity sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + +string.prototype.trimstart@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz#9b4cb590e123bb36564401d59824298de50fd5aa" + integrity sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + string_decoder@^1.0.0, string_decoder@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d" @@ -8720,7 +9608,7 @@ strip-ansi@^4.0.0: dependencies: ansi-regex "^3.0.0" -strip-ansi@^5.0.0, strip-ansi@^5.1.0: +strip-ansi@^5.1.0: version "5.2.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" dependencies: @@ -8733,7 +9621,7 @@ strip-ansi@^6.0.0: dependencies: ansi-regex "^5.0.0" -strip-bom@4.0.0: +strip-bom@4.0.0, strip-bom@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878" integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w== @@ -8752,6 +9640,11 @@ strip-eof@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" +strip-final-newline@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" + integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== + strip-indent@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2" @@ -8813,13 +9706,21 @@ supports-color@^6.1.0: dependencies: has-flag "^3.0.0" -supports-color@^7.1.0: +supports-color@^7.0.0, supports-color@^7.1.0: version "7.2.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== dependencies: has-flag "^4.0.0" +supports-hyperlinks@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47" + integrity sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA== + dependencies: + has-flag "^4.0.0" + supports-color "^7.0.0" + swap-case@^1.1.0: version "1.1.2" resolved "https://registry.yarnpkg.com/swap-case/-/swap-case-1.1.2.tgz#c39203a4587385fad3c850a0bd1bcafa081974e3" @@ -8835,9 +9736,10 @@ symbol-observable@^1.0.4, symbol-observable@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" -symbol-tree@^3.2.2: - version "3.2.2" - resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6" +symbol-tree@^3.2.4: + version "3.2.4" + resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" + integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== table@^5.2.3: version "5.4.0" @@ -8876,6 +9778,14 @@ tar@^4: safe-buffer "^5.1.2" yallist "^3.0.2" +terminal-link@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994" + integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ== + dependencies: + ansi-escapes "^4.2.1" + supports-hyperlinks "^2.0.0" + terser-webpack-plugin@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz#61b18e40eaee5be97e771cdbb10ed1280888c2b4" @@ -8898,14 +9808,14 @@ terser@^4.1.2: source-map "~0.6.1" source-map-support "~0.5.12" -test-exclude@^5.2.3: - version "5.2.3" - resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0" +test-exclude@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e" + integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w== dependencies: - glob "^7.1.3" + "@istanbuljs/schema" "^0.1.2" + glob "^7.1.4" minimatch "^3.0.4" - read-pkg-up "^4.0.0" - require-main-filename "^2.0.0" text-extensions@^1.0.0: version "1.9.0" @@ -8916,9 +9826,10 @@ text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" -throat@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a" +throat@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b" + integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA== throttleit@^0.0.2: version "0.0.2" @@ -9031,13 +9942,22 @@ toposort@^1.0.0: version "1.0.7" resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029" -tough-cookie@^2.3.3, tough-cookie@^2.3.4: +tough-cookie@^2.3.3, tough-cookie@~2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" dependencies: psl "^1.1.28" punycode "^2.1.1" +tough-cookie@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2" + integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg== + dependencies: + ip-regex "^2.1.0" + psl "^1.1.28" + punycode "^2.1.1" + tough-cookie@~2.4.3: version "2.4.3" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781" @@ -9045,11 +9965,12 @@ tough-cookie@~2.4.3: psl "^1.1.24" punycode "^1.4.1" -tr46@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09" +tr46@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479" + integrity sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg== dependencies: - punycode "^2.1.0" + punycode "^2.1.1" trim-newlines@^1.0.0: version "1.0.0" @@ -9116,6 +10037,16 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" +type-detect@4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" + integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== + +type-fest@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" + integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== + type-fest@^0.18.0: version "0.18.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f" @@ -9138,6 +10069,13 @@ type-is@~1.6.17, type-is@~1.6.18: media-typer "0.3.0" mime-types "~2.1.24" +typedarray-to-buffer@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" + integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== + dependencies: + is-typedarray "^1.0.0" + typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" @@ -9153,13 +10091,6 @@ uglify-js@3.4.x: commander "~2.19.0" source-map "~0.6.1" -uglify-js@^3.1.4: - version "3.7.3" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.3.tgz#f918fce9182f466d5140f24bb0ff35c2d32dcc6a" - dependencies: - commander "~2.20.3" - source-map "~0.6.1" - unicode-canonical-property-names-ecmascript@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818" @@ -9283,7 +10214,7 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" -util.promisify@1.0.0, util.promisify@^1.0.0: +util.promisify@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030" dependencies: @@ -9314,10 +10245,24 @@ uuid@^3.0.1, uuid@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" +uuid@^8.3.0: + version "8.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" + integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== + v8-compile-cache@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe" +v8-to-istanbul@^7.0.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.0.tgz#5b95cef45c0f83217ec79f8fc7ee1c8b486aee07" + integrity sha512-uXUVqNUCLa0AH1vuVxzi+MI4RfxEOKt9pBgKwHbgH7st8Kv2P1m+jvWNnektzBh5QShF3ODgKmUFCf38LnVz1g== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.1" + convert-source-map "^1.6.0" + source-map "^0.7.3" + validate-npm-package-license@^3.0.1: version "3.0.4" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" @@ -9347,11 +10292,19 @@ vm-browserify@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.0.tgz#bd76d6a23323e2ca8ffa12028dc04559c75f9019" -w3c-hr-time@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045" +w3c-hr-time@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" + integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ== + dependencies: + browser-process-hrtime "^1.0.0" + +w3c-xmlserializer@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a" + integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA== dependencies: - browser-process-hrtime "^0.1.2" + xml-name-validator "^3.0.0" wait-for-expect@^1.3.0: version "1.3.0" @@ -9393,9 +10346,15 @@ wbuf@^1.1.0, wbuf@^1.7.3: dependencies: minimalistic-assert "^1.0.0" -webidl-conversions@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" +webidl-conversions@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff" + integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA== + +webidl-conversions@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514" + integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w== webpack-cli@^3.3.2: version "3.3.2" @@ -9523,9 +10482,10 @@ websocket-extensions@>=0.1.1: version "0.1.3" resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29" -whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3: +whatwg-encoding@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0" + integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw== dependencies: iconv-lite "0.4.24" @@ -9533,25 +10493,19 @@ whatwg-fetch@>=0.10.0: version "3.0.0" resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb" -whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0: +whatwg-mimetype@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" + integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== -whatwg-url@^6.4.1: - version "6.5.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.5.0.tgz#f2df02bff176fd65070df74ad5ccbb5a199965a8" - dependencies: - lodash.sortby "^4.7.0" - tr46 "^1.0.1" - webidl-conversions "^4.0.2" - -whatwg-url@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz#fde926fa54a599f3adf82dff25a9f7be02dc6edd" +whatwg-url@^8.0.0: + version "8.4.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.4.0.tgz#50fb9615b05469591d2b2bd6dfaed2942ed72837" + integrity sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw== dependencies: lodash.sortby "^4.7.0" - tr46 "^1.0.1" - webidl-conversions "^4.0.2" + tr46 "^2.0.2" + webidl-conversions "^6.1.0" which-module@^1.0.0: version "1.0.0" @@ -9561,12 +10515,19 @@ which-module@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" -which@1, which@^1.2.14, which@^1.2.9, which@^1.3.0: +which@1, which@^1.2.14, which@^1.2.9: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" dependencies: isexe "^2.0.0" +which@^2.0.1, which@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + wide-align@^1.1.0: version "1.1.3" resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" @@ -9578,10 +10539,6 @@ word-wrap@^1.0.3: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== -wordwrap@~0.0.2: - version "0.0.3" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" - wordwrap@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" @@ -9612,13 +10569,15 @@ wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" -write-file-atomic@2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.1.tgz#d0b05463c188ae804396fd5ab2a370062af87529" +write-file-atomic@^3.0.0: + version "3.0.3" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" + integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== dependencies: - graceful-fs "^4.1.11" imurmurhash "^0.1.4" + is-typedarray "^1.0.0" signal-exit "^3.0.2" + typedarray-to-buffer "^3.1.5" write@1.0.3: version "1.0.3" @@ -9626,16 +10585,20 @@ write@1.0.3: dependencies: mkdirp "^0.5.1" -ws@^5.2.0: - version "5.2.2" - resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f" - dependencies: - async-limiter "~1.0.0" +ws@^7.2.3: + version "7.4.2" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.2.tgz#782100048e54eb36fe9843363ab1c68672b261dd" + integrity sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA== xml-name-validator@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" +xmlchars@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" + integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== + xtend@^4.0.0, xtend@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" @@ -9692,7 +10655,7 @@ yargs-parser@^5.0.0: dependencies: camelcase "^3.0.0" -yargs@12.0.5, yargs@^12.0.2, yargs@^12.0.5: +yargs@12.0.5, yargs@^12.0.5: version "12.0.5" resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13" dependencies: @@ -9709,7 +10672,7 @@ yargs@12.0.5, yargs@^12.0.2, yargs@^12.0.5: y18n "^3.2.1 || ^4.0.0" yargs-parser "^11.1.1" -yargs@^15.1.0: +yargs@^15.1.0, yargs@^15.4.1: version "15.4.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8" integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== From eb49e836c59c42483380cafff12273afd414ce61 Mon Sep 17 00:00:00 2001 From: nolleto Date: Wed, 30 Dec 2020 19:27:08 -0300 Subject: [PATCH 4/5] chore(lint): add lint-staged --- .husky/pre-commit | 4 + package.json | 4 + yarn.lock | 212 ++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 215 insertions(+), 5 deletions(-) create mode 100755 .husky/pre-commit diff --git a/.husky/pre-commit b/.husky/pre-commit new file mode 100755 index 0000000..247a0fe --- /dev/null +++ b/.husky/pre-commit @@ -0,0 +1,4 @@ +#!/bin/sh +. "$(dirname $0)/_/husky.sh" + +yarn lint-staged diff --git a/package.json b/package.json index 115dd5c..6eb1a61 100644 --- a/package.json +++ b/package.json @@ -102,6 +102,7 @@ "jest": "^26.6.3", "jest-css-modules": "^2.1.0", "json-loader": "^0.5.7", + "lint-staged": ">=10", "node-sass": "^4.12.0", "postcss": "^7.0.16", "postcss-loader": "^3.0.0", @@ -117,5 +118,8 @@ "commitizen": { "path": "./node_modules/cz-conventional-changelog" } + }, + "lint-staged": { + "*.js": "lint" } } diff --git a/yarn.lock b/yarn.lock index 0ad7a66..d8857b8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1699,6 +1699,14 @@ acorn@^7.1.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== +aggregate-error@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" + integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== + dependencies: + clean-stack "^2.0.0" + indent-string "^4.0.0" + airbnb-prop-types@^2.16.0: version "2.16.0" resolved "https://registry.yarnpkg.com/airbnb-prop-types/-/airbnb-prop-types-2.16.0.tgz#b96274cefa1abb14f623f804173ee97c13971dc2" @@ -1762,6 +1770,11 @@ ansi-colors@^3.0.0: version "3.2.4" resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf" +ansi-colors@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" + integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== + ansi-escapes@^1.0.0: version "1.4.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e" @@ -1770,7 +1783,7 @@ ansi-escapes@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" -ansi-escapes@^4.2.1: +ansi-escapes@^4.2.1, ansi-escapes@^4.3.0: version "4.3.1" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61" integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA== @@ -1978,6 +1991,11 @@ astral-regex@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9" +astral-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" + integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== + async-each@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" @@ -2496,7 +2514,7 @@ chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4. escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@4.1.0, chalk@^4.0.0: +chalk@4.1.0, chalk@^4.0.0, chalk@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== @@ -2632,6 +2650,11 @@ clean-css@4.2.x: dependencies: source-map "~0.6.0" +clean-stack@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" + integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== + cli-cursor@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987" @@ -2644,6 +2667,13 @@ cli-cursor@^2.1.0: dependencies: restore-cursor "^2.0.0" +cli-cursor@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" + integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw== + dependencies: + restore-cursor "^3.1.0" + cli-spinners@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-0.1.2.tgz#bb764d88e185fb9e1e6a2a1f19772318f605e31c" @@ -2655,6 +2685,14 @@ cli-truncate@^0.2.1: slice-ansi "0.0.4" string-width "^1.0.1" +cli-truncate@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" + integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg== + dependencies: + slice-ansi "^3.0.0" + string-width "^4.2.0" + cli-width@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" @@ -2756,6 +2794,11 @@ commander@^2.20.0: version "2.20.1" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.1.tgz#3863ce3ca92d0831dcf2a102f5fb4b5926afd0f9" +commander@^6.2.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c" + integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA== + commander@~2.19.0: version "2.19.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" @@ -3268,6 +3311,13 @@ debug@4.1.1, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: dependencies: ms "^2.1.1" +debug@^4.2.0: + version "4.3.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" + integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== + dependencies: + ms "2.1.2" + decamelize-keys@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9" @@ -3289,7 +3339,7 @@ decode-uri-component@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" -dedent@0.7.0: +dedent@0.7.0, dedent@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw= @@ -3621,6 +3671,13 @@ enhanced-resolve@~0.9.0: memory-fs "^0.2.0" tapable "^0.1.8" +enquirer@^2.3.6: + version "2.3.6" + resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" + integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== + dependencies: + ansi-colors "^4.1.1" + entities@^1.1.1, entities@~1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" @@ -4040,7 +4097,7 @@ execa@^1.0.0: signal-exit "^3.0.0" strip-eof "^1.0.0" -execa@^4.0.0: +execa@^4.0.0, execa@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a" integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA== @@ -4278,6 +4335,13 @@ figures@^2.0.0: dependencies: escape-string-regexp "^1.0.5" +figures@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" + integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg== + dependencies: + escape-string-regexp "^1.0.5" + file-entry-cache@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c" @@ -4638,6 +4702,11 @@ get-intrinsic@^1.0.0: has "^1.0.3" has-symbols "^1.0.1" +get-own-enumerable-property-symbols@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" + integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g== + get-package-type@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" @@ -5499,6 +5568,11 @@ is-number@^7.0.0: resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== +is-obj@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" + integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= + is-obj@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" @@ -5558,6 +5632,11 @@ is-regex@^1.1.0, is-regex@^1.1.1: dependencies: has-symbols "^1.0.1" +is-regexp@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" + integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk= + is-stream@^1.0.1, is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" @@ -6320,6 +6399,27 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= +lint-staged@>=10: + version "10.5.3" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.5.3.tgz#c682838b3eadd4c864d1022da05daa0912fb1da5" + integrity sha512-TanwFfuqUBLufxCc3RUtFEkFraSPNR3WzWcGF39R3f2J7S9+iF9W0KTVLfSy09lYGmZS5NDCxjNvhGMSJyFCWg== + dependencies: + chalk "^4.1.0" + cli-truncate "^2.1.0" + commander "^6.2.0" + cosmiconfig "^7.0.0" + debug "^4.2.0" + dedent "^0.7.0" + enquirer "^2.3.6" + execa "^4.1.0" + listr2 "^3.2.2" + log-symbols "^4.0.0" + micromatch "^4.0.2" + normalize-path "^3.0.0" + please-upgrade-node "^3.2.0" + string-argv "0.3.1" + stringify-object "^3.3.0" + listr-silent-renderer@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e" @@ -6346,6 +6446,20 @@ listr-verbose-renderer@^0.4.0: date-fns "^1.27.2" figures "^1.7.0" +listr2@^3.2.2: + version "3.2.3" + resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.2.3.tgz#ef9e0d790862f038dde8a9837be552b1adfd1c07" + integrity sha512-vUb80S2dSUi8YxXahO8/I/s29GqnOL8ozgHVLjfWQXa03BNEeS1TpBLjh2ruaqq5ufx46BRGvfymdBSuoXET5w== + dependencies: + chalk "^4.1.0" + cli-truncate "^2.1.0" + figures "^3.2.0" + indent-string "^4.0.0" + log-update "^4.0.0" + p-map "^4.0.0" + rxjs "^6.6.3" + through "^2.3.8" + listr@0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/listr/-/listr-0.12.0.tgz#6bce2c0f5603fa49580ea17cd6a00cc0e5fa451a" @@ -6518,6 +6632,13 @@ log-symbols@^1.0.2: dependencies: chalk "^1.0.0" +log-symbols@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920" + integrity sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA== + dependencies: + chalk "^4.0.0" + log-update@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/log-update/-/log-update-1.0.2.tgz#19929f64c4093d2d2e7075a1dad8af59c296b8d1" @@ -6525,6 +6646,16 @@ log-update@^1.0.2: ansi-escapes "^1.0.0" cli-cursor "^1.0.2" +log-update@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz#589ecd352471f2a1c0c570287543a64dfd20e0a1" + integrity sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg== + dependencies: + ansi-escapes "^4.3.0" + cli-cursor "^3.1.0" + slice-ansi "^4.0.0" + wrap-ansi "^6.2.0" + loglevel@^1.6.1: version "1.6.1" resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa" @@ -6888,6 +7019,11 @@ ms@2.1.1, ms@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" +ms@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + multicast-dns-service-types@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901" @@ -7540,6 +7676,13 @@ p-map@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175" +p-map@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" + integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== + dependencies: + aggregate-error "^3.0.0" + p-try@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" @@ -7790,6 +7933,13 @@ pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" +please-upgrade-node@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942" + integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg== + dependencies: + semver-compare "^1.0.0" + portfinder@^1.0.20: version "1.0.20" resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a" @@ -8878,6 +9028,14 @@ restore-cursor@^2.0.0: onetime "^2.0.0" signal-exit "^3.0.2" +restore-cursor@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" + integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA== + dependencies: + onetime "^5.1.0" + signal-exit "^3.0.2" + ret@~0.1.10: version "0.1.15" resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" @@ -8947,6 +9105,13 @@ rxjs@^6.4.0: dependencies: tslib "^1.9.0" +rxjs@^6.6.3: + version "6.6.3" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552" + integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ== + dependencies: + tslib "^1.9.0" + safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" @@ -9052,6 +9217,11 @@ selfsigned@^1.10.4: dependencies: node-forge "0.7.5" +semver-compare@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" + integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= + "semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0: version "5.7.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b" @@ -9237,6 +9407,24 @@ slice-ansi@^2.1.0: astral-regex "^1.0.0" is-fullwidth-code-point "^2.0.0" +slice-ansi@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" + integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ== + dependencies: + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" + +slice-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" + integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ== + dependencies: + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" + snake-case@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-2.1.0.tgz#41bdb1b73f30ec66a04d4e2cad1b76387d4d6d9f" @@ -9520,6 +9708,11 @@ strict-uri-encode@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" +string-argv@0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da" + integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg== + string-length@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz#4a973bf31ef77c4edbceadd6af2611996985f8a1" @@ -9596,6 +9789,15 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" +stringify-object@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629" + integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw== + dependencies: + get-own-enumerable-property-symbols "^3.0.0" + is-obj "^1.0.1" + is-regexp "^1.0.0" + strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" @@ -9849,7 +10051,7 @@ through2@^4.0.0: dependencies: readable-stream "3" -through@2, "through@>=2.2.7 <3", through@^2.3.6, through@~2.3, through@~2.3.1: +through@2, "through@>=2.2.7 <3", through@^2.3.6, through@^2.3.8, through@~2.3, through@~2.3.1: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" From 90ab757363fb38ddcfad7705e42b9abdecc5164f Mon Sep 17 00:00:00 2001 From: nolleto Date: Fri, 8 Jan 2021 17:15:55 -0300 Subject: [PATCH 5/5] refactor(lint): fix import order --- src/actions/index.test.js | 2 +- src/components/App/index.js | 2 +- .../ArrowMovingPlaceholder/index.test.js | 2 +- src/components/ContextMenu/index.test.js | 2 +- src/components/EditNodeCptModal/index.test.js | 2 +- .../EditNodeCptTableRow/index.test.js | 2 +- src/components/GenericPanel/index.js | 2 +- src/components/Network/index.js | 2 +- src/components/NetworkBN/component.js | 6 +++--- src/components/NetworkMSBN/index.js | 2 +- src/components/NodeAddState/index.test.js | 2 +- src/components/NodeCptEditTable/index.test.js | 2 +- .../NodeMovingPlaceholder/index.test.js | 2 +- src/components/PropertiesNode/component.js | 2 +- src/index.js | 2 +- src/selectors/index.js | 20 +++++++++---------- src/selectors/index.test.js | 2 +- src/store/configureStore.js | 2 +- src/utils/node-cpt.test.js | 2 +- src/utils/node.test.js | 2 +- src/validations/network.js | 2 +- src/validations/network.test.js | 2 +- 22 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/actions/index.test.js b/src/actions/index.test.js index d8a4991..edccd8e 100644 --- a/src/actions/index.test.js +++ b/src/actions/index.test.js @@ -1,3 +1,4 @@ +import { NETWORK_KINDS } from '@constants/network'; import { ADD_LINKAGE, ADD_NODE, @@ -31,7 +32,6 @@ import { setBelief, } from './index'; -import { NETWORK_KINDS } from '@constants/network'; const persistStateAction = { type: PERSIST_STATE, diff --git a/src/components/App/index.js b/src/components/App/index.js index 5d4cf28..9c975b7 100644 --- a/src/components/App/index.js +++ b/src/components/App/index.js @@ -1,9 +1,9 @@ import React, { Component } from 'react'; +import { connect } from 'react-redux'; import Canvas from '../Canvas'; import Header from '../Header'; import PropertiesPanel from '../PropertiesPanel'; -import { connect } from 'react-redux'; import { getNetworkKind, } from '@selectors'; diff --git a/src/components/ArrowMovingPlaceholder/index.test.js b/src/components/ArrowMovingPlaceholder/index.test.js index 66ac178..7641561 100644 --- a/src/components/ArrowMovingPlaceholder/index.test.js +++ b/src/components/ArrowMovingPlaceholder/index.test.js @@ -1,8 +1,8 @@ -import ArrowMovingPlaceholder from './component'; import ArrowPlaceholder from '@components/ArrowPlaceholder'; import React from 'react'; import SvgMousePosition from '@components/SvgMousePosition'; import { shallow } from 'enzyme'; +import ArrowMovingPlaceholder from './component'; const svg = document.createElement('svg'); const shallowComponent = (props = {}) => shallow(); diff --git a/src/components/ContextMenu/index.test.js b/src/components/ContextMenu/index.test.js index a4d8a63..a97c00c 100644 --- a/src/components/ContextMenu/index.test.js +++ b/src/components/ContextMenu/index.test.js @@ -1,8 +1,8 @@ -import ContextMenu from './index'; import ContextMenuItems from '@components/ContextMenuItems'; import { ContextMenuTrigger } from 'react-contextmenu'; import React from 'react'; import { shallow } from 'enzyme'; +import ContextMenu from './index'; const defaultProps = { id: 'id', diff --git a/src/components/EditNodeCptModal/index.test.js b/src/components/EditNodeCptModal/index.test.js index 5ba30fd..368f726 100644 --- a/src/components/EditNodeCptModal/index.test.js +++ b/src/components/EditNodeCptModal/index.test.js @@ -3,11 +3,11 @@ import * as nodeValidation from '@validations/node'; import { fireEvent, render } from '@testing-library/react'; -import EditNodeCptModal from './component'; import Modal from 'react-modal'; import React from 'react'; import { getComponentTestId } from '@utils/test-utils'; import { head } from 'ramda'; +import EditNodeCptModal from './component'; const renderComponent = (props) => { Modal.setAppElement(document.body); diff --git a/src/components/EditNodeCptTableRow/index.test.js b/src/components/EditNodeCptTableRow/index.test.js index 5f2d693..8b36ef0 100644 --- a/src/components/EditNodeCptTableRow/index.test.js +++ b/src/components/EditNodeCptTableRow/index.test.js @@ -2,9 +2,9 @@ import * as nodeValidations from '@validations/node'; import { fireEvent, render } from '@testing-library/react'; -import EditNodeCptTableRow from './index'; import React from 'react'; import { getComponentTestId } from '@utils/test-utils'; +import EditNodeCptTableRow from './index'; const renderComponent = props => render( diff --git a/src/components/GenericPanel/index.js b/src/components/GenericPanel/index.js index 7245fd1..9b1ef03 100644 --- a/src/components/GenericPanel/index.js +++ b/src/components/GenericPanel/index.js @@ -1,12 +1,12 @@ import React, { Component } from 'react'; -import Button from '../Button'; import PropTypes from 'prop-types'; import classNames from 'classnames'; import { connect } from 'react-redux'; import fontAwesome from 'font-awesome/css/font-awesome.css'; import { getPanelVisibility } from '@selectors'; import { onUpdateNetworkPropertiesPanelVisible } from '@actions/network'; +import Button from '../Button'; import styles from './styles.css'; class GenericPanel extends Component { diff --git a/src/components/Network/index.js b/src/components/Network/index.js index 71ddb94..1a50e85 100644 --- a/src/components/Network/index.js +++ b/src/components/Network/index.js @@ -16,8 +16,8 @@ import NodeMovingPlaceholder from '@components/NodeMovingPlaceholder'; import Nodes from '@components/Nodes'; import PropTypes from 'prop-types'; import { propEq } from 'ramda'; -import styles from './styles.css'; import { v4 } from 'uuid'; +import styles from './styles.css'; class Network extends PureComponent { state = { diff --git a/src/components/NetworkBN/component.js b/src/components/NetworkBN/component.js index 6b8e100..edbffe0 100644 --- a/src/components/NetworkBN/component.js +++ b/src/components/NetworkBN/component.js @@ -1,13 +1,13 @@ import React, { Component } from 'react'; import { inferenceResultsPropTypes, networkPropTypes, nodePropTypes } from '@models'; +import PropTypes from 'prop-types'; +import { getArrowsPositions } from '@utils/arrows-positions'; +import { isDeleteKey } from '@utils/event'; import AddNodeModal from '../AddNodeModal'; import EditNodeCptModal from '../EditNodeCptModal'; import EditNodeStatesModal from '../EditNodeStatesModal'; import Network from '../Network'; -import PropTypes from 'prop-types'; -import { getArrowsPositions } from '@utils/arrows-positions'; -import { isDeleteKey } from '@utils/event'; class NetworkBN extends Component { componentDidMount() { diff --git a/src/components/NetworkMSBN/index.js b/src/components/NetworkMSBN/index.js index 0661541..d50103c 100644 --- a/src/components/NetworkMSBN/index.js +++ b/src/components/NetworkMSBN/index.js @@ -38,10 +38,10 @@ import { connect } from 'react-redux'; import { getArrowsPositionsForMSBN } from '@utils/arrows-positions'; import { hasCycles } from '@validations/network'; import { isDeleteKey } from '@utils/event'; -import { mergeNetworks } from './helpers'; import { onUpdateNetworkSelectedNodes } from '@actions/network'; import { openFile } from '@utils/file'; import { v4 } from 'uuid'; +import { mergeNetworks } from './helpers'; class NetworkMSBN extends Component { state = { diff --git a/src/components/NodeAddState/index.test.js b/src/components/NodeAddState/index.test.js index 0e0b8ee..35a4869 100644 --- a/src/components/NodeAddState/index.test.js +++ b/src/components/NodeAddState/index.test.js @@ -2,9 +2,9 @@ import * as eventUtils from '@utils/event'; import { fireEvent, render } from '@testing-library/react'; -import NodeAddState from './index'; import React from 'react'; import { getComponentTestId } from '@utils/test-utils'; +import NodeAddState from './index'; const renderComponent = props => render( diff --git a/src/components/NodeCptEditTable/index.test.js b/src/components/NodeCptEditTable/index.test.js index 67b4c10..ab6d8d8 100644 --- a/src/components/NodeCptEditTable/index.test.js +++ b/src/components/NodeCptEditTable/index.test.js @@ -1,9 +1,9 @@ import { fireEvent, render } from '@testing-library/react'; -import NodeCptEditTable from './index'; import React from 'react'; import { getComponentTestId } from '@utils/test-utils'; import { head } from 'ramda'; +import NodeCptEditTable from './index'; const renderComponent = props => render( diff --git a/src/components/NodeMovingPlaceholder/index.test.js b/src/components/NodeMovingPlaceholder/index.test.js index 184d6e1..171778b 100644 --- a/src/components/NodeMovingPlaceholder/index.test.js +++ b/src/components/NodeMovingPlaceholder/index.test.js @@ -1,8 +1,8 @@ -import NodeMovingPlaceholder from './index'; import NodePlaceholder from '@components/NodePlaceholder'; import React from 'react'; import SvgMousePosition from '@components/SvgMousePosition'; import { shallow } from 'enzyme'; +import NodeMovingPlaceholder from './index'; const svg = document.createElement('svg'); const shallowComponent = (props = {}) => shallow(); diff --git a/src/components/PropertiesNode/component.js b/src/components/PropertiesNode/component.js index ec69f1a..45e714c 100644 --- a/src/components/PropertiesNode/component.js +++ b/src/components/PropertiesNode/component.js @@ -13,10 +13,10 @@ import { propEq, } from 'ramda'; -import Button from '../Button'; import PropTypes from 'prop-types'; import { getComponentTestId } from '@utils/test-utils'; import { isEnterKey } from '@utils/event'; +import Button from '../Button'; import { nodePropTypes } from '@models'; import styles from './styles.css'; diff --git a/src/index.js b/src/index.js index ffdc8c4..12f8566 100644 --- a/src/index.js +++ b/src/index.js @@ -5,9 +5,9 @@ import App from '@components/App'; import Modal from 'react-modal'; import { Provider } from 'react-redux'; import React from 'react'; +import { render } from 'react-dom'; import configureStore from './store/configureStore'; import { loadState } from './middlewares/persistState'; -import { render } from 'react-dom'; const preloadedState = loadState(); const store = configureStore(preloadedState); diff --git a/src/selectors/index.js b/src/selectors/index.js index e3c16f4..b2f2dab 100644 --- a/src/selectors/index.js +++ b/src/selectors/index.js @@ -1,3 +1,13 @@ +import { + either, + path, + pathOr, + prop, + propOr, +} from 'ramda'; + +import { NETWORK_KINDS } from '@constants/network'; +import { createSelector } from 'reselect'; import { combAllLinkagesBySubnetwork, combLinkagesBySubnetwork, @@ -11,16 +21,6 @@ import { combSubnetworksById, combSubnetworksColorById, } from './combiners'; -import { - either, - path, - pathOr, - prop, - propOr, -} from 'ramda'; - -import { NETWORK_KINDS } from '@constants/network'; -import { createSelector } from 'reselect'; export const getNetwork = prop('network'); export const getNodes = either(path(['network', 'nodes']), propOr([], 'nodes')); diff --git a/src/selectors/index.test.js b/src/selectors/index.test.js index 1d0bcef..ce68c0e 100644 --- a/src/selectors/index.test.js +++ b/src/selectors/index.test.js @@ -1,3 +1,4 @@ +import { NETWORK_KINDS } from '@constants/network'; import { getBeliefs, getLinkages, @@ -10,7 +11,6 @@ import { getSubnetworks, } from './index'; -import { NETWORK_KINDS } from '@constants/network'; describe('Main Selectors', () => { describe('getNetwork selector', () => { diff --git a/src/store/configureStore.js b/src/store/configureStore.js index 41b7a78..747cd0f 100644 --- a/src/store/configureStore.js +++ b/src/store/configureStore.js @@ -1,8 +1,8 @@ import { applyMiddleware, compose, createStore } from 'redux'; +import thunk from 'redux-thunk'; import { persistState } from '../middlewares/persistState'; import rootReducer from '@reducers'; -import thunk from 'redux-thunk'; export default (preloadedState) => { const store = createStore( diff --git a/src/utils/node-cpt.test.js b/src/utils/node-cpt.test.js index c93a66c..0831a3b 100644 --- a/src/utils/node-cpt.test.js +++ b/src/utils/node-cpt.test.js @@ -1,3 +1,4 @@ +import SimpleNetwork from '@json-templates/networks/simple.json'; import { addNodeParentInCpt, createCpt, @@ -8,7 +9,6 @@ import { updateStatesInCpt, } from './node-cpt'; -import SimpleNetwork from '@json-templates/networks/simple.json'; describe('Node Cpt Utils', () => { describe('updateCptValue', () => { diff --git a/src/utils/node.test.js b/src/utils/node.test.js index 16a7c27..d2a109e 100644 --- a/src/utils/node.test.js +++ b/src/utils/node.test.js @@ -1,6 +1,6 @@ +import SimpleNetwork from '@json-templates/networks/simple.json'; import { findIndexNodeById, findNodeById, removeNodeById } from './node'; -import SimpleNetwork from '@json-templates/networks/simple.json'; describe('Node Utils', () => { describe('findNodeById', () => { diff --git a/src/validations/network.js b/src/validations/network.js index 43c035b..b05bed4 100644 --- a/src/validations/network.js +++ b/src/validations/network.js @@ -16,8 +16,8 @@ import { useWith, } from 'ramda'; -import { containsParentInNode } from './node'; import { findIndexNodeById } from '@utils/node'; +import { containsParentInNode } from './node'; const isNotEmpty = complement(isEmpty); const propId = prop('id'); diff --git a/src/validations/network.test.js b/src/validations/network.test.js index 31d2024..d3f7874 100644 --- a/src/validations/network.test.js +++ b/src/validations/network.test.js @@ -1,7 +1,7 @@ -import { hasCycleAddingNodeParent, hasCycles } from './network'; import CyclicNetwork from '@json-templates/networks/cyclic.json'; import SimpleNetwork from '@json-templates/networks/simple.json'; +import { hasCycleAddingNodeParent, hasCycles } from './network'; describe('Network Utils', () => { describe('hasCycles', () => {