Merge pull request #292 from styled-components/update-deps

Update deps

Author: quantizor

.travis.yml

@@ -5,3 +5,4 @@ branches:
 node_js:
   - 10
   - 12
+  - 14

package.json

@@ -22,9 +22,9 @@
     "babel-core": "7.0.0-bridge.0",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
     "babel-test": "^0.2.1",
-    "jest": "^25.1.0",
+    "jest": "^26.1.0",
     "jest-file-snapshot": "^0.3.6",
-    "prettier": "^1.18.2",
+    "prettier": "^2.0.5",
     "rimraf": "^3.0.0",
     "styled-components": "^5.0.0"
   },

test/fixtures/annotate-create-global-style-with-pure-comments/output.js

@@ -1,7 +1,5 @@
 import { createGlobalStyle } from 'styled-components';
-const GlobalStyle =
-/*#__PURE__*/
-createGlobalStyle`
+const GlobalStyle = /*#__PURE__*/createGlobalStyle`
   body {
     color: red;
   }

test/fixtures/annotate-css-with-pure-comments/output.js

@@ -1,10 +1,6 @@
 import styled, { css } from 'styled-components';
-const partial =
-/*#__PURE__*/
-css(["color:red;"]);
-const Component =
-/*#__PURE__*/
-styled.div.withConfig({
+const partial = /*#__PURE__*/css(["color:red;"]);
+const Component = /*#__PURE__*/styled.div.withConfig({
   displayName: "code__Component",
   componentId: "sc-4wpzk3-0"
 })(["", ";background:blue;"], partial);

test/fixtures/annotate-keyframes-with-pure-comments/output.js

@@ -1,4 +1,2 @@
 import { keyframes } from 'styled-components';
-const Animation =
-/*#__PURE__*/
-keyframes(["0%{opacity:0;}100%{opacity:1;}"]);
+const Animation = /*#__PURE__*/keyframes(["0%{opacity:0;}100%{opacity:1;}"]);

test/fixtures/annotate-styled-calls-with-pure-comments/output.js

@@ -1,13 +1,9 @@
 import styled from 'styled-components';
-const Test =
-/*#__PURE__*/
-styled.div.withConfig({
+const Test = /*#__PURE__*/styled.div.withConfig({
   displayName: "code__Test",
   componentId: "u20i28-0"
 })(["width:100%;"]);
-const Test2 =
-/*#__PURE__*/
-styled('div').withConfig({
+const Test2 = /*#__PURE__*/styled('div').withConfig({
   displayName: "code__Test2",
   componentId: "u20i28-1"
 })([""]);
@@ -29,23 +25,17 @@ Component = styled.div.withConfig({
   displayName: "code__Component",
   componentId: "u20i28-5"
 })([""]);
-const WrappedComponent =
-/*#__PURE__*/
-styled(Inner).withConfig({
+const WrappedComponent = /*#__PURE__*/styled(Inner).withConfig({
   displayName: "code__WrappedComponent",
   componentId: "u20i28-6"
 })([""]);
-const StyledObjectForm =
-/*#__PURE__*/
-styled.div.withConfig({
+const StyledObjectForm = /*#__PURE__*/styled.div.withConfig({
   displayName: "code__StyledObjectForm",
   componentId: "u20i28-7"
 })({
   color: red
 });
-const StyledFunctionForm =
-/*#__PURE__*/
-styled.div.withConfig({
+const StyledFunctionForm = /*#__PURE__*/styled.div.withConfig({
   displayName: "code__StyledFunctionForm",
   componentId: "u20i28-8"
 })(p => ({

test/fixtures/annotate-withtheme-with-pure-comments/output.js

@@ -1,4 +1,2 @@
 import { withTheme } from 'styled-components';
-const ThemedComponent =
-/*#__PURE__*/
-withTheme(() => null);
+const ThemedComponent = /*#__PURE__*/withTheme(() => null);

test/fixtures/transpile-css-prop-all-options-on/output.js

@@ -247,7 +247,7 @@ var _StyledP13 = (0, _styledComponents["default"])("p").withConfig({
   displayName: "code___StyledP13",
   componentId: "sc-7evkve-20"
 })(function (p) {
-  return _objectSpread({}, _objectSpread({
+  return _objectSpread(_objectSpread({}, _objectSpread({
     '::before': {
       content: p._css8
     },
@@ -261,7 +261,7 @@ var _StyledP13 = (0, _styledComponents["default"])("p").withConfig({
     '::after': {
       content: p._css11
     }
-  }), {
+  })), {}, {
     background: p._css12,
     textAlign: 'left',
     '::before': {