From e791509dac74e314bf020a049ab83a97e0b27603 Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Thu, 25 May 2017 00:07:41 -0700 Subject: [PATCH 1/3] Moving previews to client side rendering for consistency --- .../DocumentPreview/DocumentPreview.js | 64 +++++++++---------- .../DocumentPreview/DocumentPreview.scss | 20 ------ .../Document => }/components/Editor/Editor.js | 0 .../components/Editor/Editor.scss | 0 .../ClickablePadding/ClickablePadding.js | 0 .../ClickablePadding/ClickablePadding.scss | 0 .../components/ClickablePadding/index.js | 0 .../components/Editor/components/Code.js | 0 .../components/Editor/components/Heading.js | 0 .../components/Editor/components/Image.js | 0 .../components/Editor/components/Link.js | 0 .../components/Editor/components/ListItem.js | 0 .../components/Editor/components/TodoItem.js | 0 .../Editor/components/Toolbar/Toolbar.js | 0 .../Editor/components/Toolbar/Toolbar.scss | 0 .../Toolbar/components/FormattingToolbar.js | 0 .../Toolbar/components/LinkToolbar.js | 0 .../Editor/components/Toolbar/index.js | 0 .../Document => }/components/Editor/index.js | 0 .../components/Editor/plugins.js | 5 +- .../Editor/plugins/KeyboardShortcuts.js | 0 .../Editor/plugins/MarkdownShortcuts.js | 0 .../Document => }/components/Editor/schema.js | 0 .../components/Editor/serializer.js | 0 .../Document => }/components/Editor/types.js | 0 frontend/components/Markdown/Markdown.js | 35 ++++++++++ frontend/components/Markdown/index.js | 3 + frontend/scenes/Document/Document.js | 2 +- 28 files changed, 74 insertions(+), 55 deletions(-) delete mode 100644 frontend/components/DocumentPreview/DocumentPreview.scss rename frontend/{scenes/Document => }/components/Editor/Editor.js (100%) rename frontend/{scenes/Document => }/components/Editor/Editor.scss (100%) rename frontend/{scenes/Document => }/components/Editor/components/ClickablePadding/ClickablePadding.js (100%) rename frontend/{scenes/Document => }/components/Editor/components/ClickablePadding/ClickablePadding.scss (100%) rename frontend/{scenes/Document => }/components/Editor/components/ClickablePadding/index.js (100%) rename frontend/{scenes/Document => }/components/Editor/components/Code.js (100%) rename frontend/{scenes/Document => }/components/Editor/components/Heading.js (100%) rename frontend/{scenes/Document => }/components/Editor/components/Image.js (100%) rename frontend/{scenes/Document => }/components/Editor/components/Link.js (100%) rename frontend/{scenes/Document => }/components/Editor/components/ListItem.js (100%) rename frontend/{scenes/Document => }/components/Editor/components/TodoItem.js (100%) rename frontend/{scenes/Document => }/components/Editor/components/Toolbar/Toolbar.js (100%) rename frontend/{scenes/Document => }/components/Editor/components/Toolbar/Toolbar.scss (100%) rename frontend/{scenes/Document => }/components/Editor/components/Toolbar/components/FormattingToolbar.js (100%) rename frontend/{scenes/Document => }/components/Editor/components/Toolbar/components/LinkToolbar.js (100%) rename frontend/{scenes/Document => }/components/Editor/components/Toolbar/index.js (100%) rename frontend/{scenes/Document => }/components/Editor/index.js (100%) rename frontend/{scenes/Document => }/components/Editor/plugins.js (95%) rename frontend/{scenes/Document => }/components/Editor/plugins/KeyboardShortcuts.js (100%) rename frontend/{scenes/Document => }/components/Editor/plugins/MarkdownShortcuts.js (100%) rename frontend/{scenes/Document => }/components/Editor/schema.js (100%) rename frontend/{scenes/Document => }/components/Editor/serializer.js (100%) rename frontend/{scenes/Document => }/components/Editor/types.js (100%) create mode 100644 frontend/components/Markdown/Markdown.js create mode 100644 frontend/components/Markdown/index.js diff --git a/frontend/components/DocumentPreview/DocumentPreview.js b/frontend/components/DocumentPreview/DocumentPreview.js index 52870f064..08fbbad8a 100644 --- a/frontend/components/DocumentPreview/DocumentPreview.js +++ b/frontend/components/DocumentPreview/DocumentPreview.js @@ -2,43 +2,41 @@ import React from 'react'; import { toJS } from 'mobx'; import { Link } from 'react-router-dom'; - -import styles from './DocumentPreview.scss'; - +import type { Document } from 'types'; +import styled from 'styled-components'; import PublishingInfo from 'components/PublishingInfo'; +import Markdown from 'components/Markdown'; -class Document extends React.Component { - static propTypes = { - document: React.PropTypes.object.isRequired, - }; +type Props = { + document: Document, +}; - render() { - return ( -
- +const Container = styled.div` + width: 100%; + padding: 20px 0; +`; - -

{this.props.document.title}

+const DocumentPreview = ({ document }: Props) => { + return ( + + + +

{document.title}

+ + +
+ + Continue reading… - -
- -
- - Continue reading... - -
- ); - } -} + + ); +}; -export default Document; +export default DocumentPreview; diff --git a/frontend/components/DocumentPreview/DocumentPreview.scss b/frontend/components/DocumentPreview/DocumentPreview.scss deleted file mode 100644 index 122416df9..000000000 --- a/frontend/components/DocumentPreview/DocumentPreview.scss +++ /dev/null @@ -1,20 +0,0 @@ -@import '~styles/constants.scss'; - - -.container { - width: 100%; - padding: 20px 0; -} - -.title { - color: $textColor; - text-decoration: none; - - h2 { - font-size: 1.3em; - } -} - -.continueLink { - text-decoration: none; -} diff --git a/frontend/scenes/Document/components/Editor/Editor.js b/frontend/components/Editor/Editor.js similarity index 100% rename from frontend/scenes/Document/components/Editor/Editor.js rename to frontend/components/Editor/Editor.js diff --git a/frontend/scenes/Document/components/Editor/Editor.scss b/frontend/components/Editor/Editor.scss similarity index 100% rename from frontend/scenes/Document/components/Editor/Editor.scss rename to frontend/components/Editor/Editor.scss diff --git a/frontend/scenes/Document/components/Editor/components/ClickablePadding/ClickablePadding.js b/frontend/components/Editor/components/ClickablePadding/ClickablePadding.js similarity index 100% rename from frontend/scenes/Document/components/Editor/components/ClickablePadding/ClickablePadding.js rename to frontend/components/Editor/components/ClickablePadding/ClickablePadding.js diff --git a/frontend/scenes/Document/components/Editor/components/ClickablePadding/ClickablePadding.scss b/frontend/components/Editor/components/ClickablePadding/ClickablePadding.scss similarity index 100% rename from frontend/scenes/Document/components/Editor/components/ClickablePadding/ClickablePadding.scss rename to frontend/components/Editor/components/ClickablePadding/ClickablePadding.scss diff --git a/frontend/scenes/Document/components/Editor/components/ClickablePadding/index.js b/frontend/components/Editor/components/ClickablePadding/index.js similarity index 100% rename from frontend/scenes/Document/components/Editor/components/ClickablePadding/index.js rename to frontend/components/Editor/components/ClickablePadding/index.js diff --git a/frontend/scenes/Document/components/Editor/components/Code.js b/frontend/components/Editor/components/Code.js similarity index 100% rename from frontend/scenes/Document/components/Editor/components/Code.js rename to frontend/components/Editor/components/Code.js diff --git a/frontend/scenes/Document/components/Editor/components/Heading.js b/frontend/components/Editor/components/Heading.js similarity index 100% rename from frontend/scenes/Document/components/Editor/components/Heading.js rename to frontend/components/Editor/components/Heading.js diff --git a/frontend/scenes/Document/components/Editor/components/Image.js b/frontend/components/Editor/components/Image.js similarity index 100% rename from frontend/scenes/Document/components/Editor/components/Image.js rename to frontend/components/Editor/components/Image.js diff --git a/frontend/scenes/Document/components/Editor/components/Link.js b/frontend/components/Editor/components/Link.js similarity index 100% rename from frontend/scenes/Document/components/Editor/components/Link.js rename to frontend/components/Editor/components/Link.js diff --git a/frontend/scenes/Document/components/Editor/components/ListItem.js b/frontend/components/Editor/components/ListItem.js similarity index 100% rename from frontend/scenes/Document/components/Editor/components/ListItem.js rename to frontend/components/Editor/components/ListItem.js diff --git a/frontend/scenes/Document/components/Editor/components/TodoItem.js b/frontend/components/Editor/components/TodoItem.js similarity index 100% rename from frontend/scenes/Document/components/Editor/components/TodoItem.js rename to frontend/components/Editor/components/TodoItem.js diff --git a/frontend/scenes/Document/components/Editor/components/Toolbar/Toolbar.js b/frontend/components/Editor/components/Toolbar/Toolbar.js similarity index 100% rename from frontend/scenes/Document/components/Editor/components/Toolbar/Toolbar.js rename to frontend/components/Editor/components/Toolbar/Toolbar.js diff --git a/frontend/scenes/Document/components/Editor/components/Toolbar/Toolbar.scss b/frontend/components/Editor/components/Toolbar/Toolbar.scss similarity index 100% rename from frontend/scenes/Document/components/Editor/components/Toolbar/Toolbar.scss rename to frontend/components/Editor/components/Toolbar/Toolbar.scss diff --git a/frontend/scenes/Document/components/Editor/components/Toolbar/components/FormattingToolbar.js b/frontend/components/Editor/components/Toolbar/components/FormattingToolbar.js similarity index 100% rename from frontend/scenes/Document/components/Editor/components/Toolbar/components/FormattingToolbar.js rename to frontend/components/Editor/components/Toolbar/components/FormattingToolbar.js diff --git a/frontend/scenes/Document/components/Editor/components/Toolbar/components/LinkToolbar.js b/frontend/components/Editor/components/Toolbar/components/LinkToolbar.js similarity index 100% rename from frontend/scenes/Document/components/Editor/components/Toolbar/components/LinkToolbar.js rename to frontend/components/Editor/components/Toolbar/components/LinkToolbar.js diff --git a/frontend/scenes/Document/components/Editor/components/Toolbar/index.js b/frontend/components/Editor/components/Toolbar/index.js similarity index 100% rename from frontend/scenes/Document/components/Editor/components/Toolbar/index.js rename to frontend/components/Editor/components/Toolbar/index.js diff --git a/frontend/scenes/Document/components/Editor/index.js b/frontend/components/Editor/index.js similarity index 100% rename from frontend/scenes/Document/components/Editor/index.js rename to frontend/components/Editor/index.js diff --git a/frontend/scenes/Document/components/Editor/plugins.js b/frontend/components/Editor/plugins.js similarity index 95% rename from frontend/scenes/Document/components/Editor/plugins.js rename to frontend/components/Editor/plugins.js index cbdecbe7b..a6940899b 100644 --- a/frontend/scenes/Document/components/Editor/plugins.js +++ b/frontend/components/Editor/plugins.js @@ -15,7 +15,10 @@ const onlyInCode = node => node.type === 'code'; const createPlugins = ({ onImageUploadStart, onImageUploadStop, -}: { onImageUploadStart: Function, onImageUploadStop: Function }) => { +}: { + onImageUploadStart: Function, + onImageUploadStop: Function, +}) => { return [ PasteLinkify({ type: 'link', diff --git a/frontend/scenes/Document/components/Editor/plugins/KeyboardShortcuts.js b/frontend/components/Editor/plugins/KeyboardShortcuts.js similarity index 100% rename from frontend/scenes/Document/components/Editor/plugins/KeyboardShortcuts.js rename to frontend/components/Editor/plugins/KeyboardShortcuts.js diff --git a/frontend/scenes/Document/components/Editor/plugins/MarkdownShortcuts.js b/frontend/components/Editor/plugins/MarkdownShortcuts.js similarity index 100% rename from frontend/scenes/Document/components/Editor/plugins/MarkdownShortcuts.js rename to frontend/components/Editor/plugins/MarkdownShortcuts.js diff --git a/frontend/scenes/Document/components/Editor/schema.js b/frontend/components/Editor/schema.js similarity index 100% rename from frontend/scenes/Document/components/Editor/schema.js rename to frontend/components/Editor/schema.js diff --git a/frontend/scenes/Document/components/Editor/serializer.js b/frontend/components/Editor/serializer.js similarity index 100% rename from frontend/scenes/Document/components/Editor/serializer.js rename to frontend/components/Editor/serializer.js diff --git a/frontend/scenes/Document/components/Editor/types.js b/frontend/components/Editor/types.js similarity index 100% rename from frontend/scenes/Document/components/Editor/types.js rename to frontend/components/Editor/types.js diff --git a/frontend/components/Markdown/Markdown.js b/frontend/components/Markdown/Markdown.js new file mode 100644 index 000000000..5334aef21 --- /dev/null +++ b/frontend/components/Markdown/Markdown.js @@ -0,0 +1,35 @@ +// @flow +import React, { Component } from 'react'; +import { Editor } from 'slate'; +import MarkdownSerializer from '../Editor/serializer'; +import type { State } from '../Editor/types'; +import schema from '../Editor/schema'; +import styles from '../Editor/Editor.scss'; + +type Props = { + text: string, +}; + +export default class MarkdownEditor extends Component { + props: Props; + + state: { + state: State, + }; + + constructor(props: Props) { + super(props); + this.state = { state: MarkdownSerializer.deserialize(props.text) }; + } + + render = () => { + return ( + + ); + }; +} diff --git a/frontend/components/Markdown/index.js b/frontend/components/Markdown/index.js new file mode 100644 index 000000000..ae494d3a1 --- /dev/null +++ b/frontend/components/Markdown/index.js @@ -0,0 +1,3 @@ +// @flow +import Markdown from './Markdown'; +export default Markdown; diff --git a/frontend/scenes/Document/Document.js b/frontend/scenes/Document/Document.js index 41573def2..15a61ab0a 100644 --- a/frontend/scenes/Document/Document.js +++ b/frontend/scenes/Document/Document.js @@ -7,8 +7,8 @@ import { Flex } from 'reflexbox'; import DocumentStore from './DocumentStore'; import Breadcrumbs from './components/Breadcrumbs'; -import Editor from './components/Editor'; import Menu from './components/Menu'; +import Editor from 'components/Editor'; import Layout, { HeaderAction, SaveAction } from 'components/Layout'; import AtlasPreviewLoading from 'components/AtlasPreviewLoading'; import CenteredContent from 'components/CenteredContent'; From c0b85a643cd8d65f3bb29230cf75f6e090f26036 Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Thu, 25 May 2017 21:59:35 -0700 Subject: [PATCH 2/3] Truncated previews now rendered on client --- .../DocumentPreview/DocumentPreview.js | 46 +++++++++----- frontend/components/Editor/Editor.scss | 1 - frontend/components/Markdown/Markdown.js | 62 +++++++++++++++---- frontend/scenes/Search/Search.js | 2 + frontend/styles/constants.js | 46 ++++++++++++++ 5 files changed, 129 insertions(+), 28 deletions(-) create mode 100644 frontend/styles/constants.js diff --git a/frontend/components/DocumentPreview/DocumentPreview.js b/frontend/components/DocumentPreview/DocumentPreview.js index 08fbbad8a..37709d12c 100644 --- a/frontend/components/DocumentPreview/DocumentPreview.js +++ b/frontend/components/DocumentPreview/DocumentPreview.js @@ -4,6 +4,7 @@ import { toJS } from 'mobx'; import { Link } from 'react-router-dom'; import type { Document } from 'types'; import styled from 'styled-components'; +import { color } from 'styles/constants'; import PublishingInfo from 'components/PublishingInfo'; import Markdown from 'components/Markdown'; @@ -16,25 +17,38 @@ const Container = styled.div` padding: 20px 0; `; +const DocumentLink = styled(Link)` + display: block; + margin: -16px; + padding: 16px; + border-radius: 8px; + + h1 { + margin-top: 0; + } + + &:hover { + background: ${color.smokeLight}; + } +`; + +const StyledMarkdown = styled(Markdown)` + pointer-events: none; +`; + const DocumentPreview = ({ document }: Props) => { return ( - - -

{document.title}

- - -
- - Continue reading… - -
+ + + + ); }; diff --git a/frontend/components/Editor/Editor.scss b/frontend/components/Editor/Editor.scss index 3949ebe14..e81138d2d 100644 --- a/frontend/components/Editor/Editor.scss +++ b/frontend/components/Editor/Editor.scss @@ -12,7 +12,6 @@ } .editor { - background: #fff; color: #1b2631; height: auto; width: 100%; diff --git a/frontend/components/Markdown/Markdown.js b/frontend/components/Markdown/Markdown.js index 5334aef21..ee93d5d94 100644 --- a/frontend/components/Markdown/Markdown.js +++ b/frontend/components/Markdown/Markdown.js @@ -1,35 +1,75 @@ // @flow import React, { Component } from 'react'; -import { Editor } from 'slate'; +import { State, Document, Editor } from 'slate'; import MarkdownSerializer from '../Editor/serializer'; -import type { State } from '../Editor/types'; +import type { State as StateType } from '../Editor/types'; import schema from '../Editor/schema'; import styles from '../Editor/Editor.scss'; type Props = { text: string, + className: string, + limit: number, }; -export default class MarkdownEditor extends Component { +function filterDocument({ document, characterLimit, nodeLimit }) { + if (document.text.length <= characterLimit) { + return document; + } + + let totalCharacters = 0; + let totalNodes = 0; + const newNodes = document.nodes.filter(childNode => { + if (childNode.text.length + totalCharacters <= characterLimit) { + totalCharacters += childNode.text.length; + + if (totalNodes++ <= nodeLimit) { + return true; + } + } + return false; + }); + + return Document.create({ + ...document, + nodes: newNodes, + }); +} + +class Markdown extends React.Component { props: Props; state: { - state: State, + state: StateType, }; constructor(props: Props) { super(props); - this.state = { state: MarkdownSerializer.deserialize(props.text) }; + const state = MarkdownSerializer.deserialize(props.text); + + this.state = { + state: State.create({ + document: filterDocument({ + document: state.document, + characterLimit: props.limit, + nodeLimit: 5, + }), + }), + }; } render = () => { return ( - + + + ); }; } + +export default Markdown; diff --git a/frontend/scenes/Search/Search.js b/frontend/scenes/Search/Search.js index e423bc3e0..f7c517849 100644 --- a/frontend/scenes/Search/Search.js +++ b/frontend/scenes/Search/Search.js @@ -52,6 +52,7 @@ type Props = { }; render() { + const query = this.props.match.params.query; const title = ; return ( @@ -80,6 +81,7 @@ type Props = { searchTerm={this.store.searchTerm} onKeyDown={this.handleKeyDown} onChange={this.updateQuery} + value={query} /> </Flex> {this.store.documents.map(document => ( diff --git a/frontend/styles/constants.js b/frontend/styles/constants.js new file mode 100644 index 000000000..cc9cbcc19 --- /dev/null +++ b/frontend/styles/constants.js @@ -0,0 +1,46 @@ +// @flow + +export const size = { + tiny: '2px', + small: '4px', + medium: '8px', + large: '16px', + huge: '24px', + enormous: '32px', +}; + +export const fontSize = { + small: '14px', + medium: '16px', + large: '18px', + huge: '24px', +}; + +export const fontWeight = { + ultraLight: 100, + thin: 200, + light: 300, + regular: 400, + medium: 500, + demiBold: 600, + bold: 700, + heavy: 800, +}; + +export const color = { + /* Brand */ + primary: '#73DF7B', + + /* Dark Grays */ + slate: '#9BA6B2', + slateLight: '#DAE1E9', + slateDark: '#4E5C6E', + + /* Light Grays */ + smoke: '#F4F7FA', + smokeLight: '#F9FBFC', + + /* Misc */ + white: '#FFFFFF', + black: '#000000', +}; From e3b2fcf8c91d5e24b5ce111b89acfc23c7a61182 Mon Sep 17 00:00:00 2001 From: Tom Moor <tom.moor@gmail.com> Date: Fri, 26 May 2017 00:04:13 -0700 Subject: [PATCH 3/3] Improves --- .../DocumentPreview/DocumentPreview.js | 6 +- frontend/components/Markdown/Markdown.js | 34 +++---- .../components/SearchField/SearchField.js | 4 +- frontend/utils/routeHelpers.js | 3 +- package.json | 3 +- yarn.lock | 96 ++++++------------- 6 files changed, 56 insertions(+), 90 deletions(-) diff --git a/frontend/components/DocumentPreview/DocumentPreview.js b/frontend/components/DocumentPreview/DocumentPreview.js index 37709d12c..164fa3fd2 100644 --- a/frontend/components/DocumentPreview/DocumentPreview.js +++ b/frontend/components/DocumentPreview/DocumentPreview.js @@ -5,8 +5,8 @@ import { Link } from 'react-router-dom'; import type { Document } from 'types'; import styled from 'styled-components'; import { color } from 'styles/constants'; -import PublishingInfo from 'components/PublishingInfo'; import Markdown from 'components/Markdown'; +import PublishingInfo from 'components/PublishingInfo'; type Props = { document: Document, @@ -32,7 +32,7 @@ const DocumentLink = styled(Link)` } `; -const StyledMarkdown = styled(Markdown)` +const TruncatedMarkdown = styled(Markdown)` pointer-events: none; `; @@ -47,7 +47,7 @@ const DocumentPreview = ({ document }: Props) => { updatedBy={document.updatedBy} collaborators={toJS(document.collaborators)} /> - <StyledMarkdown text={document.text} limit={150} /> + <TruncatedMarkdown text={document.text} limit={150} /> </DocumentLink> </Container> ); diff --git a/frontend/components/Markdown/Markdown.js b/frontend/components/Markdown/Markdown.js index ee93d5d94..3923a63b2 100644 --- a/frontend/components/Markdown/Markdown.js +++ b/frontend/components/Markdown/Markdown.js @@ -1,5 +1,5 @@ // @flow -import React, { Component } from 'react'; +import React from 'react'; import { State, Document, Editor } from 'slate'; import MarkdownSerializer from '../Editor/serializer'; import type { State as StateType } from '../Editor/types'; @@ -12,14 +12,15 @@ type Props = { limit: number, }; -function filterDocument({ document, characterLimit, nodeLimit }) { +function filterDocumentState({ state, characterLimit, nodeLimit }) { + const { document } = state; if (document.text.length <= characterLimit) { - return document; + return state; } let totalCharacters = 0; let totalNodes = 0; - const newNodes = document.nodes.filter(childNode => { + const nodes = document.nodes.filter(childNode => { if (childNode.text.length + totalCharacters <= characterLimit) { totalCharacters += childNode.text.length; @@ -30,9 +31,11 @@ function filterDocument({ document, characterLimit, nodeLimit }) { return false; }); - return Document.create({ - ...document, - nodes: newNodes, + return State.create({ + document: Document.create({ + ...document, + nodes: nodes, + }), }); } @@ -46,19 +49,18 @@ class Markdown extends React.Component { constructor(props: Props) { super(props); const state = MarkdownSerializer.deserialize(props.text); + const options = { + state, + characterLimit: props.limit, + nodeLimit: 5, + }; this.state = { - state: State.create({ - document: filterDocument({ - document: state.document, - characterLimit: props.limit, - nodeLimit: 5, - }), - }), + state: filterDocumentState(options), }; } - render = () => { + render() { return ( <span className={this.props.className}> <Editor @@ -69,7 +71,7 @@ class Markdown extends React.Component { /> </span> ); - }; + } } export default Markdown; diff --git a/frontend/scenes/Search/components/SearchField/SearchField.js b/frontend/scenes/Search/components/SearchField/SearchField.js index 9730dd959..876508915 100644 --- a/frontend/scenes/Search/components/SearchField/SearchField.js +++ b/frontend/scenes/Search/components/SearchField/SearchField.js @@ -7,8 +7,8 @@ class SearchField extends Component { onChange: Function, }; - handleChange = (event: SyntheticEvent) => { - event.currentTarget.value && this.props.onChange(event.currentTarget.value); + handleChange = (ev: SyntheticEvent) => { + this.props.onChange(ev.currentTarget.value ? ev.currentTarget.value : ''); }; render() { diff --git a/frontend/utils/routeHelpers.js b/frontend/utils/routeHelpers.js index 0e0d46b67..0b9fcecd8 100644 --- a/frontend/utils/routeHelpers.js +++ b/frontend/utils/routeHelpers.js @@ -9,5 +9,6 @@ export function newCollectionUrl() { } export function searchUrl(query: string) { - return `/search/${query}`; + if (query) return `/search/${query}`; + return `/search`; } diff --git a/package.json b/package.json index 7419c328d..787b6e349 100644 --- a/package.json +++ b/package.json @@ -164,7 +164,7 @@ "slug": "0.9.1", "string-hash": "^1.1.0", "style-loader": "0.13.0", - "styled-components": "^1.4.5", + "styled-components": "^2.0.0", "truncate-html": "https://github.com/jorilallo/truncate-html/tarball/master", "url-loader": "0.5.7", "uuid": "2.0.2", @@ -183,7 +183,6 @@ "koa-webpack-dev-middleware": "1.4.5", "koa-webpack-hot-middleware": "1.0.3", "lint-staged": "^3.4.0", - "node-dev": "3.1.0", "nodemon": "1.11.0", "prettier": "1.3.1", "react-addons-test-utils": "^15.3.1", diff --git a/yarn.lock b/yarn.lock index 5c009fab5..57245f230 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1209,7 +1209,7 @@ buffer@^4.3.0, buffer@^4.9.0: ieee754 "^1.1.4" isarray "^1.0.0" -buffer@^5.0.2: +buffer@^5.0.3: version "5.0.6" resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.0.6.tgz#2ea669f7eec0b6eda05b08f8b5ff661b28573588" dependencies: @@ -1580,10 +1580,6 @@ colormin@^1.0.5: css-color-names "0.0.4" has "^1.0.1" -colors@0.5.x: - version "0.5.1" - resolved "https://registry.yarnpkg.com/colors/-/colors-0.5.1.tgz#7d0023eaeb154e8ee9fce75dcb923d0ed1667774" - colors@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" @@ -1929,15 +1925,9 @@ csrf@~3.0.0: tsscmp "1.0.5" uid-safe "2.1.1" -css-color-list@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/css-color-list/-/css-color-list-0.0.1.tgz#8718e8695ae7a2cc8787be8715f1c008a7f28b15" - dependencies: - css-color-names "0.0.1" - -css-color-names@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.1.tgz#5d0548fa256456ede4a9a0c2ac7ab19d3eb1ad81" +css-color-keywords@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05" css-color-names@0.0.4: version "0.0.4" @@ -1983,13 +1973,13 @@ css-selector-tokenizer@^0.6.0: fastparse "^1.1.1" regexpu-core "^1.0.0" -css-to-react-native@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-1.0.6.tgz#728c7e774e56536558a0ecaa990d9507c43a4ac4" +css-to-react-native@^2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-2.0.4.tgz#cf4cc407558b3474d4ba8be1a2cd3b6ce713101b" dependencies: - css-color-list "0.0.1" + css-color-keywords "^1.0.0" fbjs "^0.8.5" - nearley "^2.7.7" + postcss-value-parser "^3.3.0" css-what@2.1: version "2.1.0" @@ -2251,10 +2241,6 @@ direction@^0.1.5: version "0.1.5" resolved "https://registry.yarnpkg.com/direction/-/direction-0.1.5.tgz#ce5d797f97e26f8be7beff53f7dc40e1c1a9ec4c" -discontinuous-range@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a" - dns-prefetch-control@0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/dns-prefetch-control/-/dns-prefetch-control-0.1.0.tgz#60ddb457774e178f1f9415f0cabb0e85b0b300b2" @@ -2993,7 +2979,7 @@ fbjs@^0.8.4: promise "^7.1.1" ua-parser-js "^0.7.9" -fbjs@^0.8.5, fbjs@^0.8.7, fbjs@^0.8.9: +fbjs@^0.8.5, fbjs@^0.8.9: version "0.8.12" resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.12.tgz#10b5d92f76d45575fd63a217d4ea02bea2f8ed04" dependencies: @@ -5882,14 +5868,6 @@ ncname@1.0.x: dependencies: xml-char-classes "^1.0.0" -nearley@^2.7.7: - version "2.8.0" - resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.8.0.tgz#7f88b503e3b373503f5c7e5b3b52bf134c86145b" - dependencies: - nomnom "~1.6.2" - railroad-diagrams "^1.0.0" - randexp "^0.4.2" - negotiator@0.5.3: version "0.5.3" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.5.3.tgz#269d5c476810ec92edbe7b6c2f28316384f9a7e8" @@ -6098,13 +6076,6 @@ nodemon@1.11.0: undefsafe "0.0.3" update-notifier "0.5.0" -nomnom@~1.6.2: - version "1.6.2" - resolved "https://registry.yarnpkg.com/nomnom/-/nomnom-1.6.2.tgz#84a66a260174408fc5b77a18f888eccc44fb6971" - dependencies: - colors "0.5.x" - underscore "~1.4.4" - "nopt@2 || 3", nopt@~3.0.1: version "3.0.6" resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" @@ -6857,7 +6828,7 @@ postcss-unique-selectors@^2.0.2: postcss "^5.0.4" uniqs "^2.0.0" -postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.1.3, postcss-value-parser@^3.2.3: +postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.1.3, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15" @@ -7060,17 +7031,6 @@ querystring@0.2.0, querystring@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" -railroad-diagrams@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e" - -randexp@^0.4.2: - version "0.4.5" - resolved "https://registry.yarnpkg.com/randexp/-/randexp-0.4.5.tgz#ffe3a80c3f666cd71e6b008e477e584c1a32ff3e" - dependencies: - discontinuous-range "1.0.0" - ret "~0.1.10" - random-bytes@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/random-bytes/-/random-bytes-1.0.0.tgz#4f68a1dc0ae58bd3fb95848c30324db75d64360b" @@ -7596,10 +7556,6 @@ restore-cursor@^1.0.1: exit-hook "^1.0.0" onetime "^1.0.0" -ret@~0.1.10: - version "0.1.14" - resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.14.tgz#58c636837b12e161f8a380cf081c6a230fd1664e" - retry-as-promised@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/retry-as-promised/-/retry-as-promised-2.0.1.tgz#6edc0074d685d0520aeb180cface45ed42ddbef7" @@ -8243,18 +8199,24 @@ style-loader@0.13.0: dependencies: loader-utils "^0.2.7" -styled-components@^1.4.5: - version "1.4.5" - resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-1.4.5.tgz#20c52f6355e28c7f20a99c05c6d5108a4858cfba" +styled-components@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-2.0.0.tgz#0906652b77647e7400ca7e5a6d8d45eba6fa77ec" dependencies: - buffer "^5.0.2" - css-to-react-native "^1.0.6" - fbjs "^0.8.7" + buffer "^5.0.3" + css-to-react-native "^2.0.3" + fbjs "^0.8.9" + hoist-non-react-statics "^1.2.0" inline-style-prefixer "^2.0.5" is-function "^1.0.1" is-plain-object "^2.0.1" prop-types "^15.5.4" - supports-color "^3.1.2" + stylis "^2.0.0" + supports-color "^3.2.3" + +stylis@^2.0.0: + version "2.0.12" + resolved "https://registry.yarnpkg.com/stylis/-/stylis-2.0.12.tgz#547253055d170f2a7ac2f6d09365d70635f2bec6" supports-color@^2.0.0: version "2.0.0" @@ -8266,6 +8228,12 @@ supports-color@^3.1.0, supports-color@^3.1.2: dependencies: has-flag "^1.0.0" +supports-color@^3.2.3: + version "3.2.3" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6" + dependencies: + has-flag "^1.0.0" + svgo@^0.7.0: version "0.7.1" resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.1.tgz#287320fed972cb097e72c2bb1685f96fe08f8034" @@ -8604,10 +8572,6 @@ underscore@^1.7.0: version "1.8.3" resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022" -underscore@~1.4.4: - version "1.4.4" - resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.4.4.tgz#61a6a32010622afa07963bf325203cf12239d604" - understyle@^1.2.0: version "1.3.0" resolved "https://registry.yarnpkg.com/understyle/-/understyle-1.3.0.tgz#df3f9a9be96779d718c3da9598fad1c2f90f24ee"