Skip to content

Commit

Permalink
chore: update deps + fix deprecation warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
RomanHotsiy committed Aug 24, 2018
1 parent 81c0df0 commit 0dd1c80
Show file tree
Hide file tree
Showing 14 changed files with 200 additions and 148 deletions.
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@
"license-check": "license-checker --production --onlyAllow 'MIT;ISC;Apache-2.0;BSD;BSD-2-Clause;BSD-3-Clause' --summary"
},
"devDependencies": {
"@babel/core": "7.0.0-rc.1",
"@babel/plugin-syntax-decorators": "7.0.0-rc.1",
"@babel/plugin-syntax-jsx": "7.0.0-rc.1",
"@babel/plugin-syntax-typescript": "7.0.0-rc.1",
"@babel/core": "7.0.0-rc.2",
"@babel/plugin-syntax-decorators": "7.0.0-rc.2",
"@babel/plugin-syntax-jsx": "7.0.0-rc.2",
"@babel/plugin-syntax-typescript": "7.0.0-rc.2",
"@cypress/webpack-preprocessor": "2.0.1",
"@types/chai": "4.1.4",
"@types/dompurify": "^0.0.31",
Expand All @@ -65,29 +65,29 @@
"@types/lodash": "^4.14.116",
"@types/lunr": "^2.1.6",
"@types/mark.js": "^8.11.1",
"@types/marked": "^0.4.0",
"@types/marked": "^0.4.1",
"@types/prismjs": "^1.6.4",
"@types/prop-types": "^15.5.5",
"@types/react": "^16.4.11",
"@types/react-dom": "^16.0.7",
"@types/react-hot-loader": "^4.1.0",
"@types/react-tabs": "^1.0.5",
"@types/tapable": "1.0.4",
"@types/webpack": "^4.4.10",
"@types/webpack": "^4.4.11",
"@types/webpack-env": "^1.13.0",
"@types/yargs": "^11.1.1",
"babel-loader": "8.0.0-beta.2",
"babel-plugin-styled-components": "^1.5.1",
"beautify-benchmark": "^0.2.4",
"bundlesize": "^0.17.0",
"conventional-changelog-cli": "^2.0.1",
"conventional-changelog-cli": "^2.0.5",
"copy-webpack-plugin": "^4.5.2",
"core-js": "^2.5.7",
"coveralls": "^3.0.2",
"css-loader": "^1.0.0",
"cypress": "~3.1.0",
"deploy-to-gh-pages": "^1.3.6",
"enzyme": "^3.4.3",
"enzyme": "^3.4.4",
"enzyme-adapter-react-16": "^1.2.0",
"enzyme-to-json": "^3.3.4",
"fork-ts-checker-webpack-plugin": "0.4.3",
Expand All @@ -113,7 +113,7 @@
"tslint": "^5.11.0",
"tslint-react": "^3.4.0",
"typescript": "^3.0.1",
"webpack": "^4.16.5",
"webpack": "^4.17.1",
"webpack-cli": "^3.1.0",
"webpack-dev-server": "^3.1.5",
"webpack-node-externals": "^1.6.0",
Expand All @@ -139,15 +139,15 @@
"mobx-react": "^5.2.5",
"openapi-sampler": "1.0.0-beta.14",
"perfect-scrollbar": "^1.4.0",
"polished": "^1.9.3",
"polished": "^2.0.2",
"prismjs": "^1.15.0",
"prop-types": "^15.6.2",
"react-dropdown": "^1.6.1",
"react-hot-loader": "^4.3.4",
"react-dropdown": "^1.6.2",
"react-hot-loader": "^4.3.5",
"react-tabs": "^2.0.0",
"slugify": "^1.3.1",
"stickyfill": "^1.1.1",
"styled-components": "^3.4.2",
"styled-components": "^3.4.5",
"tslib": "^1.9.3"
},
"resolutions": {
Expand Down
2 changes: 1 addition & 1 deletion src/common-elements/dropdown.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export const StyledDropdown = withProps<DropdownProps>(styled(Dropdown))`
}
` as StyledComponentClass<any, DropdownProps>;

export const SimpleDropdown = StyledDropdown.extend`
export const SimpleDropdown = styled(StyledDropdown)`
margin-left: 10px;
text-transform: none;
font-size: 0.929em;
Expand Down
4 changes: 2 additions & 2 deletions src/common-elements/fields-layout.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ export const PropertyCell = styled.td`
}
`;

export const PropertyCellWithInner = PropertyCell.extend`
export const PropertyCellWithInner = styled(PropertyCell)`
padding: 0;
`;

export const PropertyNameCell = withProps<{ kind?: string }>(PropertyCell.extend)`
export const PropertyNameCell = withProps<{ kind?: string }>(styled(PropertyCell))`
vertical-align: top;
line-height: 20px;
white-space: nowrap;
Expand Down
20 changes: 10 additions & 10 deletions src/common-elements/fields.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import styled, { extensionsHook } from '../styled-components';
import { PropertyNameCell } from './fields-layout';
import { ShelfIcon } from './shelfs';

export const ClickablePropertyNameCell = PropertyNameCell.extend`
export const ClickablePropertyNameCell = styled(PropertyNameCell)`
cursor: pointer;
${ShelfIcon} {
Expand All @@ -22,39 +22,39 @@ export const FieldLabel = styled.span`
line-height: 20px;
`;

export const TypePrefix = FieldLabel.extend`
export const TypePrefix = styled(FieldLabel)`
color: ${props => transparentize(0.2, props.theme.schema.typeNameColor)};
`;

export const TypeName = FieldLabel.extend`
export const TypeName = styled(FieldLabel)`
color: ${props => props.theme.schema.typeNameColor};
`;

export const TypeTitle = FieldLabel.extend`
export const TypeTitle = styled(FieldLabel)`
color: ${props => props.theme.schema.typeTitleColor};
`;

export const TypeFormat = TypeName;

export const RequiredLabel = FieldLabel.withComponent('div').extend`
export const RequiredLabel = styled(FieldLabel.withComponent('div'))`
color: ${props => props.theme.schema.requireLabelColor};
font-size: ${props => props.theme.schema.labelsTextSize};
font-weight: normal;
margin-left: 20px;
line-height: 1;
`;

export const RecursiveLabel = FieldLabel.extend`
export const RecursiveLabel = styled(FieldLabel)`
color: ${({ theme }) => theme.colors.warning.main};
font-size: 13px;
`;

export const NullableLabel = FieldLabel.extend`
export const NullableLabel = styled(FieldLabel)`
color: #3195a6;
font-size: 13px;
`;

export const PatternLabel = FieldLabel.extend`
export const PatternLabel = styled(FieldLabel)`
color: #3195a6;
&::before,
&::after {
Expand All @@ -63,7 +63,7 @@ export const PatternLabel = FieldLabel.extend`
}
`;

export const ExampleValue = FieldLabel.extend`
export const ExampleValue = styled(FieldLabel)`
border-radius: 2px;
${({ theme }) => `
background-color: ${transparentize(0.95, theme.colors.text.primary)};
Expand All @@ -79,7 +79,7 @@ export const ExampleValue = FieldLabel.extend`
${extensionsHook('ExampleValue')};
`;

export const ConstraintItem = FieldLabel.extend`
export const ConstraintItem = styled(FieldLabel)`
border-radius: 2px;
${({ theme }) => `
background-color: ${transparentize(0.95, theme.colors.primary.light)};
Expand Down
2 changes: 1 addition & 1 deletion src/common-elements/panels.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export const RightPanel = styled.div`
`};
`;

export const DarkRightPanel = RightPanel.extend`
export const DarkRightPanel = styled(RightPanel)`
background-color: ${props => props.theme.rightPanel.backgroundColor};
`;

Expand Down
2 changes: 1 addition & 1 deletion src/common-elements/tabs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export const Tabs = styled(ReactTabs)`
}
`;

export const SmallTabs = Tabs.extend`
export const SmallTabs = styled(Tabs)`
> ul {
display: block;
> li {
Expand Down
2 changes: 1 addition & 1 deletion src/components/ApiInfo/styled.elements.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const delimiterWidth = 15;

export const ApiInfoWrap = MiddlePanel;

export const ApiHeader = H1.extend`
export const ApiHeader = styled(H1)`
margin-top: 0;
margin-bottom: 0.5em;
Expand Down
4 changes: 2 additions & 2 deletions src/components/Markdown/styled.elements.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { headerCommonMixin, linkifyMixin } from '../../common-elements';
import { PrismDiv } from '../../common-elements/PrismDiv';
import { css, extensionsHook, withProps } from '../../styled-components';
import styled, { css, extensionsHook, withProps } from '../../styled-components';

export const linksCss = css`
a {
Expand All @@ -18,7 +18,7 @@ export const linksCss = css`
`;

export const StyledMarkdownBlock = withProps<{ dense?: boolean; inline?: boolean }>(
PrismDiv.extend,
styled(PrismDiv),
)`
font-family: ${props => props.theme.typography.fontFamily};
Expand Down
2 changes: 1 addition & 1 deletion src/components/Operation/Operation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { ResponseSamples } from '../ResponseSamples/ResponseSamples';
import { OperationModel as OperationType } from '../../services/models';
import styled from '../../styled-components';

const OperationRow = Row.extend`
const OperationRow = styled(Row)`
backface-visibility: hidden;
contain: content;
Expand Down
2 changes: 1 addition & 1 deletion src/components/PayloadSamples/styled.elements.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export const MimeLabel = styled.div`
color: rgba(255, 255, 255, 0.8);
`;

export const InvertedSimpleDropdown = StyledDropdown.extend`
export const InvertedSimpleDropdown = styled(StyledDropdown)`
margin-left: 10px;
text-transform: none;
font-size: 0.929em;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Responses/styled.elements.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const ResponseDetailsWrap = styled.div`
padding: 10px;
`;

export const HeadersCaption = UnderlinedHeader.withComponent('caption').extend`
export const HeadersCaption = styled(UnderlinedHeader.withComponent('caption'))`
text-align: left;
margin-top: 1em;
caption-side: top;
Expand Down
2 changes: 1 addition & 1 deletion src/components/SecurityRequirement/SecurityRequirement.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ const SecuritiesColumn = styled.div`
width: ${props => props.theme.schema.defaultDetailsWidth};
`;

const AuthHeader = UnderlinedHeader.extend`
const AuthHeader = styled(UnderlinedHeader)`
display: inline-block;
margin: 0;
`;
Expand Down
3 changes: 2 additions & 1 deletion src/components/SourceCode/SourceCode.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ import { highlight } from '../../utils';
import { SampleControls, SampleControlsWrap } from '../../common-elements';
import { CopyButtonWrapper } from '../../common-elements/CopyButtonWrapper';
import { PrismDiv } from '../../common-elements/PrismDiv';
import styled from '../../styled-components';

const StyledPre = PrismDiv.withComponent('pre').extend`
const StyledPre = styled(PrismDiv.withComponent('pre'))`
font-family: ${props => props.theme.typography.code.fontFamily};
font-size: ${props => props.theme.typography.code.fontSize};
overflow-x: auto;
Expand Down
Loading

0 comments on commit 0dd1c80

Please sign in to comment.