Skip to content

Commit bcaafb6

Browse files
SaerisSaeris
committed
🔧 Fix build errors
1 parent b48579e commit bcaafb6

File tree

8 files changed

+51
-49
lines changed

8 files changed

+51
-49
lines changed

‎packages/app/package.json‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -218,20 +218,20 @@
218218
"xterm": "3.7.0"
219219
},
220220
"devDependencies": {
221-
"@babel/cli": "^7.5.5",
222-
"@babel/core": "^7.5.5",
223-
"@babel/helper-module-imports": "^7.0.0",
224-
"@babel/plugin-proposal-class-properties": "^7.5.5",
225-
"@babel/plugin-proposal-object-rest-spread": "^7.5.5",
226-
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
227-
"@babel/plugin-transform-async-to-generator": "^7.5.0",
228-
"@babel/plugin-transform-react-display-name": "^7.2.0",
229-
"@babel/plugin-transform-runtime": "^7.5.5",
230-
"@babel/plugin-transform-template-literals": "^7.4.4",
231-
"@babel/polyfill": "^7.4.4",
232-
"@babel/preset-flow": "^7.0.0",
233-
"@babel/preset-react": "^7.0.0",
234-
"@babel/preset-typescript": "^7.3.3",
221+
"@babel/cli": "^7.7.4",
222+
"@babel/core": "^7.7.4",
223+
"@babel/helper-module-imports": "^7.7.4",
224+
"@babel/plugin-proposal-class-properties": "^7.7.4",
225+
"@babel/plugin-proposal-object-rest-spread": "^7.7.4",
226+
"@babel/plugin-syntax-dynamic-import": "^7.7.4",
227+
"@babel/plugin-transform-async-to-generator": "^7.7.4",
228+
"@babel/plugin-transform-react-display-name": "^7.7.4",
229+
"@babel/plugin-transform-runtime": "^7.7.4",
230+
"@babel/plugin-transform-template-literals": "^7.7.4",
231+
"@babel/polyfill": "^7.7.0",
232+
"@babel/preset-flow": "^7.7.4",
233+
"@babel/preset-react": "^7.7.4",
234+
"@babel/preset-typescript": "^7.7.4",
235235
"@sentry/cli": "^1.47.1",
236236
"@types/codemirror": "^0.0.72",
237237
"@types/debug": "^4.1.1",
@@ -250,10 +250,10 @@
250250
"@types/stripe-v3": "^3.1.7",
251251
"@types/styled-components": "^4.1.13",
252252
"acorn-dynamic-import": "^4.0.0",
253-
"babel-jest": "^24.8.0",
254-
"babel-loader": "8.0.2",
253+
"babel-jest": "^24.9.0",
254+
"babel-loader": "8.0.6",
255255
"babel-plugin-codegen": "^1.2.0",
256-
"babel-plugin-graphql-tag": "^2.1.0",
256+
"babel-plugin-graphql-tag": "^2.5.0",
257257
"babel-plugin-lodash": "^3.3.4",
258258
"babel-plugin-styled-components": "^1.9.4",
259259
"babel-plugin-syntax-dynamic-import": "^6.18.0",

‎packages/common/package.json‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
},
4242
"dependencies": {
4343
"@babel/plugin-transform-flow-strip-types": "^7.0.0",
44-
"@babel/polyfill": "^7.4.4",
44+
"@babel/polyfill": "^7.7.0",
4545
"@codesandbox/notifications": "^1.0.6",
4646
"@codesandbox/template-icons": "^1.0.2",
4747
"@sentry/browser": "^5.9.0",
@@ -63,21 +63,22 @@
6363
"react-icons": "^2.2.7",
6464
"react-input-autosize": "^2.2.1",
6565
"react-router-dom": "^5.0.1",
66+
"react-scrollbars-custom": "^4.0.21",
6667
"react-spring": "^8.0.25",
6768
"react-textarea-autosize": "^6.1.0",
6869
"semver": "^5.6.0",
6970
"sha1": "^1.1.1",
7071
"styled-components": "^4.2.0"
7172
},
7273
"devDependencies": {
73-
"@babel/cli": "^7.2.3",
74-
"@babel/core": "^7.5.5",
75-
"@babel/plugin-proposal-class-properties": "^7.5.5",
76-
"@babel/plugin-proposal-object-rest-spread": "^7.5.5",
77-
"@babel/plugin-proposal-optional-chaining": "^7.6.0",
78-
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
79-
"@babel/plugin-transform-async-to-generator": "^7.5.0",
80-
"@babel/plugin-transform-runtime": "^7.5.5",
74+
"@babel/cli": "^7.7.4",
75+
"@babel/core": "^7.7.4",
76+
"@babel/plugin-proposal-class-properties": "^7.7.4",
77+
"@babel/plugin-proposal-object-rest-spread": "^7.7.4",
78+
"@babel/plugin-proposal-optional-chaining": "^7.7.4",
79+
"@babel/plugin-syntax-dynamic-import": "^7.7.4",
80+
"@babel/plugin-transform-async-to-generator": "^7.7.4",
81+
"@babel/plugin-transform-runtime": "^7.7.4",
8182
"@storybook/addon-a11y": "^5.1.11",
8283
"@storybook/addon-actions": "^5.1.9",
8384
"@storybook/addon-knobs": "^5.1.9",
@@ -91,7 +92,8 @@
9192
"@types/react-icons": "^2.2.7",
9293
"@types/storybook__addon-actions": "^3.4.3",
9394
"@types/styled-components": "^4.1.13",
94-
"babel-jest": "^24.8.0",
95+
"babel-eslint": "^10.0.3",
96+
"babel-jest": "^24.9.0",
9597
"babel-loader": "^8.0.6",
9698
"babel-plugin-lodash": "^3.3.4",
9799
"babel-plugin-macros": "^2.6.1",
@@ -105,6 +107,7 @@
105107
"jest-enzyme": "^7.1.0",
106108
"jest-styled-components": "^6.3.3",
107109
"jest-svg-transformer": "^1.0.0",
110+
"prettier": "1.19.1",
108111
"rimraf": "^2.6.3",
109112
"typescript": "3.7.2",
110113
"yarn": "^1.17.3"

‎packages/common/src/components/Menu/MenuItem.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React, { cloneElement, Children } from 'react';
2+
import { MenuItemProps } from 'reakit/Menu';
23
import { Link } from '../Link';
34
import { Item, MenuIcon } from './elements';
45

@@ -18,7 +19,7 @@ export const MenuItem: React.FC<IMenuItemProps> = ({
1819
}) =>
1920
to ? (
2021
<Item {...props}>
21-
{itemProps =>
22+
{(itemProps: MenuItemProps) =>
2223
cloneElement(
2324
Children.only(
2425
<Link to={to}>

‎packages/common/src/components/Menu/elements.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,17 @@ export const Container = styled.div`
99
`;
1010

1111
export const MenuButton = styled.button`
12-
${({ theme }) => css`
13-
display: inline-flex;
14-
padding: 0;
15-
margin: 0;
16-
border: none;
17-
background: none;
18-
box-sizing: border-box;
19-
cursor: pointer;
12+
display: inline-flex;
13+
padding: 0;
14+
margin: 0;
15+
border: none;
16+
background: none;
17+
box-sizing: border-box;
18+
cursor: pointer;
2019
21-
&:focus {
22-
outline: none;
23-
}
24-
`}
20+
&:focus {
21+
outline: none;
22+
}
2523
`;
2624

2725
export const List = styled(Menu).attrs({
@@ -57,7 +55,9 @@ export const Separator = styled(MenuSeparator)`
5755
outline: 0px;
5856
`;
5957

60-
export const Item = styled(withoutProps(`danger`)(MenuItem))`
58+
export const Item = styled(withoutProps(`danger`)(MenuItem))<{
59+
danger?: boolean;
60+
}>`
6161
${({ danger = false }) => css`
6262
display: flex;
6363
align-items: center;

‎packages/common/src/components/MultiAction/MultiAction.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ export const MultiAction: React.FC<IMultiActionProps> = memo(
4545

4646
return (
4747
<Container>
48-
{/*
49-
// @ts-ignore */}
5048
<PrimaryAction
5149
onClick={onPrimaryClick}
5250
{...buttonProps}

‎packages/common/src/components/MultiAction/elements.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import styled, { css } from 'styled-components';
22
import { Group } from 'reakit/Group';
33
import { Button } from 'reakit/Button';
44
import { Menu, MenuItem, MenuDisclosure } from 'reakit/Menu';
5-
import { IBaseProps, buttonStyles } from '../Button';
5+
import { IBaseProps, IButtonProps, buttonStyles } from '../Button';
66
import { withoutProps } from '../../utils';
77

88
export const Container = styled(Group)`
@@ -12,7 +12,7 @@ export const Container = styled(Group)`
1212

1313
export const PrimaryAction = styled(
1414
withoutProps(`block`, `secondary`, `danger`, `red`, `small`)(Button)
15-
)<IBaseProps>`
15+
)<IBaseProps & IButtonProps>`
1616
${({ block }) => css`
1717
${buttonStyles};
1818
justify-content: center;
@@ -62,7 +62,7 @@ export const ActionsList = styled(Menu).attrs({
6262
`;
6363

6464
export const SecondaryAction = styled(MenuItem)<{ disabled?: boolean }>`
65-
${({ disabled, theme }) => css`
65+
${({ disabled }) => css`
6666
display: inline-flex;
6767
padding: 0.5rem 1rem;
6868
border: none;

‎packages/common/src/components/SearchInput/elements.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
unstable_Form as Form,
44
unstable_FormSubmitButton as FormSubmitButton,
55
} from 'reakit/Form';
6-
import { Input as BaseInput } from '../Input';
6+
import { FormInput } from '../FormInput';
77

88
export const SearchForm = styled(Form)`
99
position: relative;
@@ -38,7 +38,7 @@ export const SearchButton = styled(FormSubmitButton)`
3838
}
3939
`;
4040

41-
export const Input = styled(BaseInput)`
41+
export const Input = styled(FormInput)`
4242
position: relative;
4343
padding: 4px 6px 4px 32px;
4444
`;

‎packages/common/src/theme/breakpoints.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
interface Bounds {
1+
export interface Bounds {
22
min: number;
33
max: number;
44
}

0 commit comments

Comments
 (0)