Upgrade dependencies and remove styled-components workarounds (#39)

* Upgrade dependencies

* Remove styled-components workarounds

With v5 they're not necessary anymore.

* Remove styled-components note from README

Author: kitten

README.md

@@ -137,24 +137,6 @@ already, `ssrPrepass` will suspend on `<Query>` components.
 
 [More information can be found in Apollo's own docs](https://www.apollographql.com/docs/react/features/server-side-rendering.html#getDataFromTree)
 
-## Optional Dependencies
-
-### Special case for `styled-components`
-
-`react-ssr-prepass` has an optional dependency on `styled-components@>=4.0.0`.
-This optimization skips any styling logic and imitates the attributes and props
-logic of `styled-components` otherwise.
-
-It exists because styled-components may populate the `ServerStyleSheet` as
-part of a `react-ssr-prepass` run, since it behaves like a normal React renderer.
-This is dangerous if the element tree that is passed to `react-ssr-prepass`
-is not wrapped in a `ServerStyleSheet` at all, since it will start accumulating
-styles and cause a memory leak. In `v4` it can also cause these styles to
-become _global_ and be sent to every server-rendered page.
-
-If you're not using styled-components however and are bundling your server-side
-code you need to stub styled-components with an empty package or just install it.
-
 ## Prior Art
 
 This library is (luckily) not a reimplementation from scratch of

package.json

@@ -60,34 +60,33 @@
     "react-is": "^16.8.0"
   },
   "dependencies": {
-    "object-is": "^1.0.1"
+    "object-is": "^1.0.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.5.5",
-    "@babel/plugin-transform-flow-strip-types": "^7.4.4",
-    "@babel/plugin-transform-object-assign": "^7.2.0",
-    "@babel/preset-env": "^7.5.5",
-    "@babel/preset-flow": "^7.0.0",
-    "@babel/preset-react": "^7.0.0",
+    "@babel/core": "^7.8.3",
+    "@babel/plugin-transform-flow-strip-types": "^7.8.3",
+    "@babel/plugin-transform-object-assign": "^7.8.3",
+    "@babel/preset-env": "^7.8.3",
+    "@babel/preset-flow": "^7.8.3",
+    "@babel/preset-react": "^7.8.3",
     "babel-plugin-closure-elimination": "^1.3.0",
-    "babel-plugin-transform-async-to-promises": "^0.8.14",
-    "codecov": "^3.5.0",
-    "flow-bin": "^0.106.3",
-    "husky": "^3.0.5",
+    "babel-plugin-transform-async-to-promises": "^0.8.15",
+    "codecov": "^3.6.1",
+    "flow-bin": "^0.116.1",
+    "husky": "^4.0.10",
     "jest": "^24.9.0",
-    "lint-staged": "^9.2.5",
+    "lint-staged": "^9.5.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^1.18.2",
-    "react": "^16.9.0",
-    "react-dom": "^16.9.0",
-    "react-is": "^16.9.0",
-    "rollup": "^1.20.3",
+    "prettier": "^1.19.1",
+    "react": "^16.12.0",
+    "react-dom": "^16.12.0",
+    "react-is": "^16.12.0",
+    "rollup": "^1.29.0",
     "rollup-plugin-babel": "^4.3.3",
     "rollup-plugin-buble": "^0.19.8",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-replace": "^2.2.0",
-    "rollup-plugin-terser": "^5.1.1",
-    "styled-components": "^4.3.2"
+    "rollup-plugin-terser": "^5.2.0"
   }
 }

src/__tests__/visitor.test.js

@@ -11,7 +11,6 @@ import React, {
 } from 'react'
 
 import { createPortal } from 'react-dom'
-import styled from 'styled-components'
 
 import {
   Dispatcher,
@@ -30,10 +29,6 @@ const {
   ReactCurrentDispatcher
 } = (React: any).__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED
 
-const {
-  StyleSheet
-} = require('styled-components').__DO_NOT_USE_OR_YOU_WILL_BE_HAUNTED_BY_SPOOKY_GHOSTS
-
 let prevDispatcher = null
 
 beforeEach(() => {
@@ -51,10 +46,6 @@ afterEach(() => {
 const Noop = () => null
 
 describe('visitElement', () => {
-  beforeEach(() => {
-    StyleSheet.reset(true)
-  })
-
   it('walks Fragments', () => {
     const element = (
       <Fragment>
@@ -107,43 +98,6 @@ describe('visitElement', () => {
     expect(children[1].type).toBe(Noop)
   })
 
-  it('walks StyledComponent DOM elements', () => {
-    const Comp = styled.div``
-    const children = visitElement(
-      <Comp>
-        <Noop />
-      </Comp>,
-      [],
-      () => {}
-    )
-
-    expect(children.length).toBe(1)
-    expect(children[0].type).toBe(Noop)
-    expect(StyleSheet.master.tags.length).toBe(1)
-
-    const tag = StyleSheet.master.tags[0]
-    expect(tag.css().trim()).toBe('')
-
-    expect(Object.keys(StyleSheet.master.deferred)).toEqual([
-      expect.any(String)
-    ])
-  })
-
-  it('walks StyledComponent wrapper elements', () => {
-    const Comp = styled(Noop)``
-    const children = visitElement(<Comp />, [], () => {})
-
-    expect(children.length).toBe(1)
-    expect(StyleSheet.master.tags.length).toBe(1)
-
-    const tag = StyleSheet.master.tags[0]
-    expect(tag.css().trim()).toBe('')
-
-    expect(Object.keys(StyleSheet.master.deferred)).toEqual([
-      expect.any(String)
-    ])
-  })
-
   it('walks Providers and Consumers', () => {
     const Context = createContext('default')
     const leaf = jest.fn().mockReturnValue(null)

src/render/index.js

@@ -22,8 +22,3 @@ export {
   mount as mountClassComponent,
   update as updateClassComponent
 } from './classComponent'
-
-export {
-  isStyledElement,
-  mount as mountStyledComponent
-} from './styledComponent'

src/render/styledComponent.js

@@ -15,9 +15,7 @@ import {
   mountClassComponent,
   updateClassComponent,
   mountLazyComponent,
-  updateLazyComponent,
-  mountStyledComponent,
-  isStyledElement
+  updateLazyComponent
 } from './render'
 
 import type {
@@ -143,13 +141,6 @@ export const visitElement = (
 
     case REACT_FORWARD_REF_TYPE: {
       const refElement = ((element: any): ForwardRefElement)
-
-      // If we find a StyledComponent, we trigger a specific optimisation
-      // that allows quick rendering of them without computing styles
-      if (isStyledElement(refElement)) {
-        return mountStyledComponent(refElement)
-      }
-
       const { render: type, defaultProps } = refElement.type
       const props = computeProps(refElement.props, defaultProps)
       const child = createElement((type: any), props)