Merge pull request #573 from neo4j/revert-558-3.0-upgrade-sc

Revert "Upgrade styled-components to v2"

Author: pe4cey

package.json

@@ -134,7 +134,7 @@
     "redux-observable": "^0.14.1",
     "rxjs": "^5.0.3",
     "save-as": "^0.1.7",
-    "styled-components": "^2.0.0",
+    "styled-components": "^1.4.4",
     "suber": "^5.0.1",
     "swipe-js-iso": "^2.0.3",
     "uuid": "^3.0.1",

src/browser/components/buttons/index.jsx

@@ -79,11 +79,11 @@ export const EditorButton = styled.span`
   vertical-align: middle;
   display: inline-block;
   &:before {
-    content: ${props => props.icon};
+    content: ${props => props.icon}
     text-decoration: none;
   }
   &:hover::before {
-    content: ${props => props.hoverIcon};
+    content: ${props => props.hoverIcon}
   }
 `
 
@@ -124,7 +124,7 @@ const StyledFormButton = styled.button`
   line-height: 20px;
   &:hover {
     background-color: ${props => props.theme.formButtonBackgroundHover};
-    border: ${props => props.theme.formButtonBorderHover};
+    border: ${props => props.theme.formButtonBorderHover}
   }
 `
 

src/browser/modules/ClickToCode/__snapshots__/index.test.js.snap

@@ -8,4 +8,4 @@ exports[`ClickToCode renders children as code if no code is provided 1`] = `"<co
 
 exports[`ClickToCode renders code as the code when code is available 1`] = `"<code>yo</code>"`;
 
-exports[`ClickToCode renders if no CodeComponent is provided 1`] = `"<code class=\\"sc-bdVaJa biJQaZ\\">my code</code>"`;
+exports[`ClickToCode renders if no CodeComponent is provided 1`] = `"<code class=\\"kOlXwI\\">my code</code>"`;

src/browser/modules/D3Visualization/components/styled.jsx

@@ -165,7 +165,7 @@ export const StyledInspectorFooterRowListValue = styled.div`
 export const StyledInlineList = styled.ul`
   padding-left: 0;
   list-style: none;
-  word-break: break-word;
+  word-break: break-word
 `
 
 export const StyledInlineListItem = styled.li`
@@ -188,7 +188,7 @@ export const StyledStatusBar = styled.div`
   white-space: nowrap;
   overflow: hidden;
   border-top: 1px solid #e6e9ef;
-  ${props => props.fullscreen ? 'margin-top: -39px;' : 'margin-bottom: -39px;'};
+  ${props => props.fullscreen ? 'margin-top: -39px;' : 'margin-bottom: -39px;'}
 `
 
 export const StyledStatus = styled.div`
@@ -251,7 +251,7 @@ export const StyledLegendContents = styled.div`
 export const StyledLegendRow = styled.div`
   border-bottom: 1px solid #e6e9ef;
   &.contracted {
-    max-height: ${legendRowHeight}px;
+    max-height: ${legendRowHeight}px
     overflow: hidden;
   }
 `

src/browser/modules/Editor/styled.jsx

@@ -27,7 +27,7 @@ export const BaseBar = styled.div`
   display: flex;
   flex-direction: row;
   align-items: middle;
-  min-height: ${props => Math.max(dim.editorbarHeight, props.minHeight + editorPadding * 2)}px;
+  min-height: ${props => Math.max(dim.editorbarHeight, props.minHeight + editorPadding * 2)}px
   overflow: hidden;
   box-shadow: 0 1px 4px rgba(0,0,0,.1);
   margin: 0 24px;
@@ -59,7 +59,7 @@ const BaseEditorWrapper = styled.div`
   padding: ${editorPadding}px;
   background-color: ${props => props.theme.editorBarBackground};
   font-family: Monaco,"Courier New",Terminal,monospace;
-  min-Height: ${props => Math.max(dim.editorbarHeight, props.minHeight + editorPadding * 2)}px;
+  min-Height: ${props => Math.max(dim.editorbarHeight, props.minHeight + editorPadding * 2)}px
 `
 
 export const EditorWrapper = styled(BaseEditorWrapper)`

src/browser/modules/Main/styled.jsx

@@ -58,10 +58,10 @@ export const ErrorBanner = styled(Banner)`
   background-color: ${props => props.theme.error};
 `
 export const WarningBanner = styled(Banner)`
-  background-color: ${props => props.theme.warning};
+  background-color: ${props => props.theme.warning}
 `
 export const NotAuthedBanner = styled(Banner)`
-  background-color: ${props => props.theme.auth};
+  background-color: ${props => props.theme.auth}
 `
 
 export const StyledCodeBlockAuthBar = styled(StyledCodeBlock)`
@@ -74,7 +74,7 @@ export const StyledCodeBlockErrorBar = styled(StyledCodeBlock)`
 `
 
 export const SyncDisconnectedBanner = styled(Banner)`
-  background-color: ${props => props.theme.auth};
+  background-color: ${props => props.theme.auth}
   display: flex;
   justify-content: space-between;
 `

src/browser/modules/Stream/styled.jsx

@@ -64,13 +64,13 @@ export const StyledFrame = styled.article`
 export const StyledVisContainer = styled.div`
   width: 100%;
   height: ${props => (props.fullscreen ? '100vh' : (dim.frameBodyHeight - (dim.frameTitlebarHeight * 2)) + 'px')};
-  display : ${props => props.style.display};
+  display : ${props => props.style.display}
 `
 
 export const StyledFrameBody = styled.div`
   min-height: ${dim.frameBodyHeight / 2}px;
   max-height: ${props => props.collapsed ? 0 : (props.fullscreen ? '100%' : (dim.frameBodyHeight - dim.frameStatusbarHeight) + 1 + 'px')};
-  display: ${props => props.collapsed ? 'none' : 'flex'};
+  display: ${props => props.collapsed ? 'none' : 'flex'};;
   flex-direction: row;
 `
 
@@ -84,7 +84,7 @@ export const StyledFrameContents = styled.div`
   overflow: auto;
   min-height: ${dim.frameBodyHeight / 2}px;
   max-height: ${props => (props.fullscreen ? '100vh' : (dim.frameBodyHeight - (dim.frameStatusbarHeight * 2)) + 'px')};
-  ${props => props.fullscreen ? 'height: 100vh' : null};
+  ${props => props.fullscreen ? 'height: 100vh' : null}
 `
 
 export const PaddedDiv = styled.div`
@@ -111,7 +111,7 @@ export const StyledFrameSidebar = styled.ul`
 export const StyledFrameStatusbar = styled.div`
   border-top: ${props => props.theme.inFrameBorder};
   height: ${dim.frameStatusbarHeight + 1}px;
-  ${props => props.fullscreen ? 'margin-top: -78px;' : ''};
+  ${props => props.fullscreen ? 'margin-top: -78px;' : ''}
   display: flex;
   flex-direction: row;
 `
@@ -192,26 +192,26 @@ export const StyledLinkContainer = styled.div`
 `
 
 export const StyledCypherMessage = styled.div`
-  font-weight: bold;
-  line-height: 1em;
-  text-align: center;
-  white-space: nowrap;
-  vertical-align: baseline;
-  user-select: none;
-  font-size: 12px;
-  margin-right: 5px;
-  padding: 4px 7px 4px 5px;
-  border-radius: 3px;
-  float: left;
+  font-weight: bold
+  line-height: 1em
+  text-align: center
+  white-space: nowrap
+  vertical-align: baseline
+  user-select: none
+  font-size: 12px
+  margin-right: 5px
+  padding: 4px 7px 4px 5px
+  border-radius: 3px
+  float: left
 `
 export const StyledCypherWarningMessage = styled(StyledCypherMessage)`
-  background-color: #FFA500;
-  color: #FFFFFF;
+  background-color: #FFA500
+  color: #FFFFFF
 `
 
 export const StyledCypherErrorMessage = styled(StyledCypherMessage)`
-  background-color: #E74C3C;
-  color: #FFFFFF;
+  background-color: #E74C3C
+  color: #FFFFFF
 `
 
 export const StyledH4 = styled.h4`
@@ -255,7 +255,7 @@ export const StyledStatsBar = styled.div`
 `
 
 export const StyledSchemaBody = styled(StyledPreformattedArea)`
-  padding-top: 6px;
+  padding-top: 6px
 `
 export const StyledBodyMessage = styled.div`
   padding-top: 20px;

yarn.lock

@@ -1034,7 +1034,7 @@ buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
-buffer@^5.0.3:
+buffer@^5.0.2:
   version "5.0.6"
   resolved "https://neo.jfrog.io/neo/api/npm/npm/buffer/-/buffer-5.0.6.tgz#2ea669f7eec0b6eda05b08f8b5ff661b28573588"
   dependencies:
@@ -1299,6 +1299,10 @@ colormin@^1.0.5:
     css-color-names "0.0.4"
     has "^1.0.1"
 
+[email protected]:
+  version "0.5.1"
+  resolved "https://neo.jfrog.io/neo/api/npm/npm/colors/-/colors-0.5.1.tgz#7d0023eaeb154e8ee9fce75dcb923d0ed1667774"
+
 colors@~1.1.2:
   version "1.1.2"
   resolved "https://neo.jfrog.io/neo/api/npm/npm/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
@@ -1507,9 +1511,15 @@ css-color-function@^1.2.0:
     debug "~0.7.4"
     rgb "~0.1.0"
 
-css-color-keywords@^1.0.0:
-  version "1.0.0"
-  resolved "https://neo.jfrog.io/neo/api/npm/npm/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05"
+[email protected]:
+  version "0.0.1"
+  resolved "https://neo.jfrog.io/neo/api/npm/npm/css-color-list/-/css-color-list-0.0.1.tgz#8718e8695ae7a2cc8787be8715f1c008a7f28b15"
+  dependencies:
+    css-color-names "0.0.1"
+
+[email protected]:
+  version "0.0.1"
+  resolved "https://neo.jfrog.io/neo/api/npm/npm/css-color-names/-/css-color-names-0.0.1.tgz#5d0548fa256456ede4a9a0c2ac7ab19d3eb1ad81"
 
 [email protected]:
   version "0.0.4"
@@ -1558,13 +1568,13 @@ css-selector-tokenizer@^0.7.0:
     fastparse "^1.1.1"
     regexpu-core "^1.0.0"
 
-css-to-react-native@^2.0.3:
-  version "2.0.4"
-  resolved "https://neo.jfrog.io/neo/api/npm/npm/css-to-react-native/-/css-to-react-native-2.0.4.tgz#cf4cc407558b3474d4ba8be1a2cd3b6ce713101b"
+css-to-react-native@^1.0.6:
+  version "1.0.6"
+  resolved "https://neo.jfrog.io/neo/api/npm/npm/css-to-react-native/-/css-to-react-native-1.0.6.tgz#728c7e774e56536558a0ecaa990d9507c43a4ac4"
   dependencies:
-    css-color-keywords "^1.0.0"
+    css-color-list "0.0.1"
     fbjs "^0.8.5"
-    postcss-value-parser "^3.3.0"
+    nearley "^2.7.7"
 
 [email protected]:
   version "2.1.0"
@@ -1799,6 +1809,10 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
+[email protected]:
+  version "1.0.0"
+  resolved "https://neo.jfrog.io/neo/api/npm/npm/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a"
+
 disposables@^1.0.1:
   version "1.0.1"
   resolved "https://neo.jfrog.io/neo/api/npm/npm/disposables/-/disposables-1.0.1.tgz#064727a25b54f502bd82b89aa2dfb8df9f1b39e3"
@@ -2431,7 +2445,7 @@ fb-watchman@^2.0.0:
   dependencies:
     bser "^2.0.0"
 
-fbjs@^0.8.4, fbjs@^0.8.5, fbjs@^0.8.9:
+fbjs@^0.8.4, fbjs@^0.8.5, fbjs@^0.8.7, fbjs@^0.8.9:
   version "0.8.12"
   resolved "https://neo.jfrog.io/neo/api/npm/npm/fbjs/-/fbjs-0.8.12.tgz#10b5d92f76d45575fd63a217d4ea02bea2f8ed04"
   dependencies:
@@ -4128,6 +4142,14 @@ [email protected]:
   dependencies:
     xml-char-classes "^1.0.0"
 
+nearley@^2.7.7:
+  version "2.9.2"
+  resolved "https://neo.jfrog.io/neo/api/npm/npm/nearley/-/nearley-2.9.2.tgz#b06e36b2341403a43e20b7da1f1d6a553f7389ea"
+  dependencies:
+    nomnom "~1.6.2"
+    railroad-diagrams "^1.0.0"
+    randexp "^0.4.2"
+
 [email protected]:
   version "0.6.1"
   resolved "https://neo.jfrog.io/neo/api/npm/npm/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
@@ -4229,6 +4251,13 @@ node-pre-gyp@^0.6.29:
     tar "^2.2.1"
     tar-pack "^3.4.0"
 
+nomnom@~1.6.2:
+  version "1.6.2"
+  resolved "https://neo.jfrog.io/neo/api/npm/npm/nomnom/-/nomnom-1.6.2.tgz#84a66a260174408fc5b77a18f888eccc44fb6971"
+  dependencies:
+    colors "0.5.x"
+    underscore "~1.4.4"
+
 nopt@^4.0.1:
   version "4.0.1"
   resolved "https://neo.jfrog.io/neo/api/npm/npm/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
@@ -5385,6 +5414,17 @@ querystringify@~1.0.0:
   version "1.0.0"
   resolved "https://neo.jfrog.io/neo/api/npm/npm/querystringify/-/querystringify-1.0.0.tgz#6286242112c5b712fa654e526652bf6a13ff05cb"
 
+railroad-diagrams@^1.0.0:
+  version "1.0.0"
+  resolved "https://neo.jfrog.io/neo/api/npm/npm/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e"
+
+randexp@^0.4.2:
+  version "0.4.5"
+  resolved "https://neo.jfrog.io/neo/api/npm/npm/randexp/-/randexp-0.4.5.tgz#ffe3a80c3f666cd71e6b008e477e584c1a32ff3e"
+  dependencies:
+    discontinuous-range "1.0.0"
+    ret "~0.1.10"
+
 randomatic@^1.1.3:
   version "1.1.6"
   resolved "https://neo.jfrog.io/neo/api/npm/npm/randomatic/-/randomatic-1.1.6.tgz#110dcabff397e9dcff7c0789ccc0a49adf1ec5bb"
@@ -5794,6 +5834,10 @@ restore-cursor@^1.0.1:
     exit-hook "^1.0.0"
     onetime "^1.0.0"
 
+ret@~0.1.10:
+  version "0.1.14"
+  resolved "https://neo.jfrog.io/neo/api/npm/npm/ret/-/ret-0.1.14.tgz#58c636837b12e161f8a380cf081c6a230fd1664e"
+
 rgb-hex@^1.0.0:
   version "1.0.0"
   resolved "https://neo.jfrog.io/neo/api/npm/npm/rgb-hex/-/rgb-hex-1.0.0.tgz#bfaf8cd9cd9164b5a26d71eb4f15a0965324b3c1"
@@ -6248,24 +6292,18 @@ style-loader@^0.17.0:
   dependencies:
     loader-utils "^1.0.2"
 
-styled-components@^2.0.0:
-  version "2.0.0"
-  resolved "https://neo.jfrog.io/neo/api/npm/npm/styled-components/-/styled-components-2.0.0.tgz#0906652b77647e7400ca7e5a6d8d45eba6fa77ec"
+styled-components@^1.4.4:
+  version "1.4.6"
+  resolved "https://neo.jfrog.io/neo/api/npm/npm/styled-components/-/styled-components-1.4.6.tgz#58f32e8a6ab510fb1481e901e838e0477f148b06"
   dependencies:
-    buffer "^5.0.3"
-    css-to-react-native "^2.0.3"
-    fbjs "^0.8.9"
-    hoist-non-react-statics "^1.2.0"
+    buffer "^5.0.2"
+    css-to-react-native "^1.0.6"
+    fbjs "^0.8.7"
     inline-style-prefixer "^2.0.5"
     is-function "^1.0.1"
     is-plain-object "^2.0.1"
     prop-types "^15.5.4"
-    stylis "^2.0.0"
-    supports-color "^3.2.3"
-
-stylis@^2.0.0:
-  version "2.0.12"
-  resolved "https://neo.jfrog.io/neo/api/npm/npm/stylis/-/stylis-2.0.12.tgz#547253055d170f2a7ac2f6d09365d70635f2bec6"
+    supports-color "^3.1.2"
 
 suber@^5.0.1:
   version "5.0.1"
@@ -6492,6 +6530,10 @@ ultron@~1.1.0:
   version "1.1.0"
   resolved "https://neo.jfrog.io/neo/api/npm/npm/ultron/-/ultron-1.1.0.tgz#b07a2e6a541a815fc6a34ccd4533baec307ca864"
 
+underscore@~1.4.4:
+  version "1.4.4"
+  resolved "https://neo.jfrog.io/neo/api/npm/npm/underscore/-/underscore-1.4.4.tgz#61a6a32010622afa07963bf325203cf12239d604"
+
 uniq@^1.0.1:
   version "1.0.1"
   resolved "https://neo.jfrog.io/neo/api/npm/npm/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"