Merge branch 'master' into typing/react-emotion

tkh44 · web-flow · commit 3c896df296e6 · 2018-06-04T12:01:22.000-06:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,8 @@
 language: node_js
 
 node_js:
-  - "8"
+  - "lts/*"
+  - "node"
 
 
 script:
diff --git a/docs/typescript.md b/docs/typescript.md
@@ -134,10 +134,7 @@ type StyledComponentProps = {
 } & ComponentProps
 //  ^^^ You will need this
 
-const StyledComponent =
-  styled <
-  StyledComponentProps >
-  Component`
+const StyledComponent = styled<StyledComponentProps>(Component)`
   color: red;
   background: ${props => props.bgColor};
 `
