Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[dev]: Update feather to 2.0.x #1416

Merged
merged 11 commits into from
Jul 16, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/venia-concept/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"react": "~16.8.3",
"react-apollo": "~2.5.5",
"react-dom": "~16.8.3",
"react-feather": "~1.1.6",
"react-feather": "~2.0.3",
"react-redux": "~6.0.1",
"react-router-dom": "~5.0.0",
"redux": "~4.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/venia-concept/src/RootComponents/Search/search.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import Icon from 'src/components/Icon';
import { getFilterParams } from 'src/util/getFilterParamsFromUrl';
import getQueryParameterValue from 'src/util/getQueryParameterValue';
import isObjectEmpty from 'src/util/isObjectEmpty';
import CloseIcon from 'react-feather/dist/icons/x';
import { X as CloseIcon } from 'react-feather';
import FilterModal from 'src/components/FilterModal';
import { fullPageLoadingIndicator } from 'src/components/LoadingIndicator';
import defaultClasses from './search.css';
Expand Down
8 changes: 5 additions & 3 deletions packages/venia-concept/src/components/App/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ import Icon from 'src/components/Icon';

import { getToastId, useToasts } from '@magento/peregrine';

import AlertCircleIcon from 'react-feather/dist/icons/alert-circle';
import CloudOffIcon from 'react-feather/dist/icons/cloud-off';
import WifiIcon from 'react-feather/dist/icons/wifi';
import {
AlertCircle as AlertCircleIcon,
CloudOff as CloudOffIcon,
Wifi as WifiIcon
} from 'react-feather';

const OnlineIcon = <Icon src={WifiIcon} attrs={{ width: 18 }} />;
const OfflineIcon = <Icon src={CloudOffIcon} attrs={{ width: 18 }} />;
Expand Down
2 changes: 1 addition & 1 deletion packages/venia-concept/src/components/Checkbox/checkbox.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { compose } from 'redux';
import classify from 'src/classify';
import { Message } from 'src/components/Field';
import Icon from 'src/components/Icon';
import CheckIcon from 'react-feather/dist/icons/check';
import { Check as CheckIcon } from 'react-feather';
import defaultClasses from './checkbox.css';

/* TODO: change lint config to use `label-has-associated-control` */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -782,8 +782,8 @@ exports[`renders empty strings if payment data is not defined 1`] = `
width={18}
xmlns="http://www.w3.org/2000/svg"
>
<polygon
points="16 3 21 8 8 21 3 21 3 16 16 3"
<path
d="M17 3a2.828 2.828 0 1 1 4 4L7.5 20.5 2 22l1.5-5.5L17 3z"
/>
</svg>
</span>
Expand Down Expand Up @@ -925,8 +925,8 @@ exports[`renders name and street if shipping address is entered 1`] = `
width={18}
xmlns="http://www.w3.org/2000/svg"
>
<polygon
points="16 3 21 8 8 21 3 21 3 16 16 3"
<path
d="M17 3a2.828 2.828 0 1 1 4 4L7.5 20.5 2 22l1.5-5.5L17 3z"
/>
</svg>
</span>
Expand Down Expand Up @@ -1128,8 +1128,8 @@ exports[`renders payment method summary if payment method entered 1`] = `
width={18}
xmlns="http://www.w3.org/2000/svg"
>
<polygon
points="16 3 21 8 8 21 3 21 3 16 16 3"
<path
d="M17 3a2.828 2.828 0 1 1 4 4L7.5 20.5 2 22l1.5-5.5L17 3z"
/>
</svg>
</span>
Expand Down Expand Up @@ -1621,8 +1621,8 @@ exports[`renders shipping title if shipping method is selected 1`] = `
width={18}
xmlns="http://www.w3.org/2000/svg"
>
<polygon
points="16 3 21 8 8 21 3 21 3 16 16 3"
<path
d="M17 3a2.828 2.828 0 1 1 4 4L7.5 20.5 2 22l1.5-5.5L17 3z"
/>
</svg>
</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { bool, func } from 'prop-types';

import Button from 'src/components/Button';
import Icon from 'src/components/Icon';
import LockIcon from 'react-feather/dist/icons/lock';
import { Lock as LockIcon } from 'react-feather';

const CheckoutButton = ({ disabled, onClick }) => {
return (
Expand Down
2 changes: 1 addition & 1 deletion packages/venia-concept/src/components/Checkout/section.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { bool, node, shape, string } from 'prop-types';
import EditIcon from 'react-feather/dist/icons/edit-2';
import { Edit2 as EditIcon } from 'react-feather';

import { mergeClasses } from 'src/classify';
import Icon from 'src/components/Icon';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import Icon from 'src/components/Icon';
import Checkmark from 'react-feather/dist/icons/check';
import { Check as Checkmark } from 'react-feather';
import classify from 'src/classify';
import defaultClasses from './filterDefault.css';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ import TextInput from 'src/components/TextInput';
import Trigger from 'src/components/Trigger';
import { Form } from 'informed';
import Icon from 'src/components/Icon';
import ClearIcon from 'react-feather/dist/icons/x';
import SearchIcon from 'react-feather/dist/icons/search';
import { Search as SearchIcon, X as ClearIcon } from 'react-feather';
import classify from 'src/classify';
import defaultClasses from './filterSearch.css';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { compose } from 'redux';
import Icon from 'src/components/Icon';
import Remove from 'react-feather/dist/icons/x';
import { X as Remove } from 'react-feather';
import classify from 'src/classify';
import { withRouter } from 'react-router-dom';
import defaultClasses from './filtersCurrent.css';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import classify from 'src/classify';
import FilterList from './FilterList';
import Icon from 'src/components/Icon';
import { filterModes, filterRenderOptions, filterLayouts } from './constants';
import ArrowDown from 'react-feather/dist/icons/chevron-down';
import ArrowUp from 'react-feather/dist/icons/chevron-up';
import { ChevronDown as ArrowDown, ChevronUp as ArrowUp } from 'react-feather';
import defaultClasses from './filterBlock.css';

class FilterBlock extends Component {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
import { List } from '@magento/peregrine';
import { FiltersCurrent } from './FiltersCurrent';
import classify from 'src/classify';
import CloseIcon from 'react-feather/dist/icons/x';
import { X as CloseIcon } from 'react-feather';
import Icon from 'src/components/Icon';
import FilterBlock from './filterBlock';
import defaultClasses from './filterModal.css';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { toggleCart } from 'src/actions/cart';
import CartCounter from './cartCounter';

import Icon from 'src/components/Icon';
import ShoppingCartIcon from 'react-feather/dist/icons/shopping-cart';
import { ShoppingCart as ShoppingCartIcon } from 'react-feather';
import classify from 'src/classify';
import defaultClasses from './cartTrigger.css';

Expand Down
3 changes: 1 addition & 2 deletions packages/venia-concept/src/components/Header/header.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React, { Suspense } from 'react';
import { bool, func, shape, string } from 'prop-types';
import MenuIcon from 'react-feather/dist/icons/menu';
import SearchIcon from 'react-feather/dist/icons/search';
import { Menu as MenuIcon, Search as SearchIcon } from 'react-feather';

import Icon from 'src/components/Icon';
import Logo from 'src/components/Logo';
Expand Down
2 changes: 1 addition & 1 deletion packages/venia-concept/src/components/MiniCart/header.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { bool, func, shape, string } from 'prop-types';
import CloseIcon from 'react-feather/dist/icons/x';
import { X as CloseIcon } from 'react-feather';

import { mergeClasses } from 'src/classify';
import Icon from 'src/components/Icon';
Expand Down
2 changes: 1 addition & 1 deletion packages/venia-concept/src/components/MiniCart/kebab.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useCallback, useRef, useState } from 'react';
import { node, shape, string } from 'prop-types';
import MoreVerticalIcon from 'react-feather/dist/icons/more-vertical';
import { MoreVertical as MoreVerticalIcon } from 'react-feather';

import { useEventListener } from '@magento/peregrine';

Expand Down
8 changes: 5 additions & 3 deletions packages/venia-concept/src/components/MiniCart/section.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import React from 'react';
import { bool, func, oneOf, shape, string } from 'prop-types';
import HeartIcon from 'react-feather/dist/icons/heart';
import Edit2Icon from 'react-feather/dist/icons/edit-2';
import TrashIcon from 'react-feather/dist/icons/trash';
import {
Edit2 as Edit2Icon,
Heart as HeartIcon,
Trash as TrashIcon
} from 'react-feather';

import { mergeClasses } from 'src/classify';
import Icon from 'src/components/Icon';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import classify from 'src/classify';
import Trigger from 'src/components/Trigger';
import Icon from 'src/components/Icon';
import CloseIcon from 'react-feather/dist/icons/x';
import { X as CloseIcon } from 'react-feather';
import UserInformation from '../UserInformation';
import defaultClasses from './header.css';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Icon from 'src/components/Icon';
import defaultClasses from './myAccountMenuTrigger.css';
import UserInformation from '../UserInformation';
import MyAccountMenuPage from '../MyAccountMenuPage';
import ChevronUpIcon from 'react-feather/dist/icons/chevron-up';
import { ChevronUp as ChevronUpIcon } from 'react-feather';

class MyAccountMenuTrigger extends Component {
static propTypes = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { Component } from 'react';
import PropTypes from 'prop-types';
import classify from 'src/classify';
import Icon from 'src/components/Icon';
import UserIcon from 'react-feather/dist/icons/user';
import { User as UserIcon } from 'react-feather';
import defaultClasses from './userInformation.css';

class UserInformation extends Component {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ import { func, shape, string } from 'prop-types';

import classify from 'src/classify';
import Icon from 'src/components/Icon';
import ArrowLeftIcon from 'react-feather/dist/icons/arrow-left';
import CloseIcon from 'react-feather/dist/icons/x';
import { ArrowLeft as ArrowLeftIcon, X as CloseIcon } from 'react-feather';
import Trigger from 'src/components/Trigger';
import defaultClasses from './navHeader.css';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { bool, shape, string } from 'prop-types';

import CloudOffIcon from 'react-feather/dist/icons/cloud-off';
import { CloudOff as CloudOffIcon } from 'react-feather';
import { mergeClasses } from 'src/classify';

import Icon from 'src/components/Icon';
Expand Down
10 changes: 6 additions & 4 deletions packages/venia-concept/src/components/Pagination/navButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ import React, { Component } from 'react';
import classify from 'src/classify';
import defaultClasses from './navButton.css';
import Icon from '../Icon';
import RewindIcon from 'react-feather/dist/icons/rewind';
import ChevronLeftIcon from 'react-feather/dist/icons/chevron-left';
import ChevronRightIcon from 'react-feather/dist/icons/chevron-right';
import FastForwardIcon from 'react-feather/dist/icons/fast-forward';
import {
ChevronLeft as ChevronLeftIcon,
ChevronRight as ChevronRightIcon,
FastForward as FastForwardIcon,
Rewind as RewindIcon
} from 'react-feather';

const NavIcons = {
Rewind: RewindIcon,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ import memoize from 'memoize-one';

import { resourceUrl } from 'src/drivers';
import Icon from 'src/components/Icon';
import ChevronLeftIcon from 'react-feather/dist/icons/chevron-left';
import ChevronRightIcon from 'react-feather/dist/icons/chevron-right';
import {
ChevronLeft as ChevronLeftIcon,
ChevronRight as ChevronRightIcon
} from 'react-feather';
import classify from 'src/classify';
import ThumbnailList from './thumbnailList';
import defaultClasses from './carousel.css';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { bool, number, object, oneOfType, shape, string } from 'prop-types';
import classify from 'src/classify';
import Icon from 'src/components/Icon';
import Tooltip from './toolTip';
import CheckIcon from 'react-feather/dist/icons/check';
import { Check as CheckIcon } from 'react-feather';

import defaultClasses from './swatch.css';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import React, { Component, Fragment } from 'react';
import { func, number, shape, string } from 'prop-types';
import { Price } from '@magento/peregrine';
import MessageSquareIcon from 'react-feather/dist/icons/message-square';
import ShoppingCartIcon from 'react-feather/dist/icons/shopping-cart';
import Share2Icon from 'react-feather/dist/icons/share-2';
import {
Share2 as Share2Icon,
ShoppingCart as ShoppingCartIcon,
MessageSquare as MessageSquareIcon
} from 'react-feather';

import classify from 'src/classify';
import ButtonGroup from 'src/components/ButtonGroup';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { Component } from 'react';
import { shape, string } from 'prop-types';

import Icon from 'src/components/Icon';
import FilterIcon from 'react-feather/dist/icons/filter';
import { Filter as FilterIcon } from 'react-feather';
import classify from 'src/classify';
import defaultClasses from './filter.css';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { number, oneOfType, shape, string } from 'prop-types';
import { Link, resourceUrl } from 'src/drivers';

import Icon from 'src/components/Icon';
import ChevronRightIcon from 'react-feather/dist/icons/chevron-right';
import { ChevronRight as ChevronRightIcon } from 'react-feather';

import classify from 'src/classify';
import defaultClasses from './purchaseHistoryItem.css';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import React, { useCallback } from 'react';
import { func, shape, string } from 'prop-types';
import { useFieldState, useFormApi } from 'informed';
import ClearIcon from 'react-feather/dist/icons/x';
import SearchIcon from 'react-feather/dist/icons/search';
import { Search as SearchIcon, X as ClearIcon } from 'react-feather';
import { useSearchParam } from '@magento/peregrine';

import Icon from 'src/components/Icon';
Expand Down
2 changes: 1 addition & 1 deletion packages/venia-concept/src/components/Select/select.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { FieldIcons, Message } from 'src/components/Field';
import defaultClasses from './select.css';

import Icon from 'src/components/Icon';
import ChevronDownIcon from 'react-feather/dist/icons/chevron-down';
import { ChevronDown as ChevronDownIcon } from 'react-feather';

const arrow = <Icon src={ChevronDownIcon} size={18} />;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import ToastContainer from '../toastContainer';
import { ToastContextProvider, useToasts } from '@magento/peregrine';
import Icon from 'src/components/Icon';

import SmileIcon from 'react-feather/dist/icons/smile';
import { Smile as SmileIcon } from 'react-feather';

const stories = storiesOf('Toasts', module);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import defaultClasses from './toast.css';
import { mergeClasses } from 'src/classify';
import Icon from 'src/components/Icon';

import CloseIcon from 'react-feather/dist/icons/x';
import { X as CloseIcon } from 'react-feather';

const Toast = props => {
const {
Expand Down
10 changes: 6 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13189,10 +13189,12 @@ react-error-overlay@^5.1.0:
resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-5.1.5.tgz#884530fd055476c764eaa8ab13b8ecf1f57bbf2c"
integrity sha512-O9JRum1Zq/qCPFH5qVEvDDrVun8Jv9vbHtZXCR1EuRj9sKg1xJTlHxBzU6AkCzpvxRLuiY4OKImy3cDLQ+UTdg==

react-feather@~1.1.6:
version "1.1.6"
resolved "https://registry.yarnpkg.com/react-feather/-/react-feather-1.1.6.tgz#2a547e3d5cd5e383d3da0128d593cbdb3c1b32f7"
integrity sha512-iCofWhTjX+vQwvDmg7o6vg0XrUg1c41yBDZG+l83nz1FiCsleJoUgd3O+kHpOeWMXuPrRIFfCixvcqyOLGOgIg==
react-feather@~2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/react-feather/-/react-feather-2.0.3.tgz#1453ff5d8c242f72b8c02846118fbd2d406375ad"
integrity sha512-XVjtxIyMxb2RFlqC2APoB/IZvXKDW9uLN1c264XEeZNYe8jIxjQVQpeTo3nxtHiLTgMfgf0ZYxJC6HwmY8+9BA==
dependencies:
prop-types "^15.7.2"

react-fuzzy@^0.5.2:
version "0.5.2"
Expand Down