Curls 3

packages/buttons/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stellar-apps/buttons",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "main": "dist/cjs/index.js",
   "author": "Jared Lunde <[email protected]> (https://BeStellar.co)",
   "license": "MIT",
@@ -25,7 +25,8 @@
     "@babel/runtime": "^7.3.1",
     "@babel/runtime-corejs2": "^7.3.1",
     "empty": "^0.10.1",
-    "memoize-two-args": "^1.0.7"
+    "memoize-two-args": "^1.0.7",
+    "trie-memoize": "^1.0.3"
   },
   "peerDependencies": {
     "@jaredlunde/curls-addons": "^4.0.0",

packages/buttons/src/Button.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import {Button, ThemeConsumer, createComponent} from 'curls'
+import {Button, ThemeConsumer} from 'curls'
 import * as buttonDefaults from 'curls/dist/es/Button/defaultTheme'
 
 
@@ -13,7 +13,7 @@ export const defaultTheme = {
 export default React.forwardRef(
   function Button ({outline = false, ...props}, ref) {
     return (
-      <ThemeConsumer path='button' defaultTheme={defaultTheme}>
+      <ThemeConsumer name='button' defaultTheme={defaultTheme}>
         {({theme}) => {
           props = {...theme.defaultProps, ...props}
 

packages/buttons/src/LinkButton.js

@@ -1,11 +1,11 @@
 import React from 'react'
 import {withRouter} from 'react-router-dom'
-import memoize from 'memoize-two-args'
+import memoize from 'trie-memoize'
 import TypeButton from './TypeButton'
 
 
 // necessary for keeping TypeButton purity
-const getOnClick = memoize((to, push) => () => push(to), Map)
+const getOnClick = memoize([Map, WeakMap], (to, push) => () => push(to))
 
 export default React.forwardRef(
   function LinkButton (props, ref) {

packages/buttons/src/SpinnerButton.js

@@ -25,7 +25,7 @@ export default React.forwardRef(
     ref
   ) {
     return (
-      <ThemeConsumer path='button' defaultTheme={defaultTheme}>
+      <ThemeConsumer name='button' defaultTheme={defaultTheme}>
         {({theme}) => {
           const spinnerProps = {...theme.spinner}
 

packages/buttons/src/TypeButton.js

@@ -19,7 +19,7 @@ export const defaultTheme = {
 export default React.forwardRef(
   function TypeButton ({typeSize, typeWeight, typeFace, typeColor, ...props}, ref) {
     return (
-      <ThemeConsumer path='button' defaultTheme={defaultTheme}>
+      <ThemeConsumer name='button' defaultTheme={defaultTheme}>
         {({theme}) => {
           if (props.outline === true) {
             typeColor = typeColor || props.bg || theme.defaultProps.bg

packages/buttons/yarn.lock

@@ -2751,6 +2751,13 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
+trie-memoize@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/trie-memoize/-/trie-memoize-1.0.3.tgz#0aefd975f39ee53ef56309466f4a666b48d00870"
+  integrity sha512-R3pm9Cuz6Uf7FK+wJQBQho6aYaBxzDYDL45VcVbC4PE+z3S84xPCay1g9Zxi59cndAKJUIJK+6QPRq9Sc59AIg==
+  dependencies:
+    is-plain-object "^2.0.4"
+
 trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"

packages/content/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stellar-apps/content",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "main": "dist/cjs/index.js",
   "author": "Jared Lunde <[email protected]> (https://BeStellar.co)",
   "license": "MIT",

packages/content/src/Content.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import {createComponent, renderNode, FlexBox} from 'curls'
+import {createComponent, renderNode, FlexBox, memoThemeValue} from 'curls'
 import {css} from '@emotion/core'
 
 
@@ -17,22 +17,17 @@ const defaultTheme = {
 }
 
 const SFC = createComponent({
-  name: 'Content',
-  propTypes: {
-    slim: PropTypes.bool
-  },
-  CSS: {
-    __base: (val, theme) => css`max-width: ${theme.width}px;`,
-    slim: (val, theme) => val === true && (
+  name: 'content',
+  styles: {
+    __base: memoThemeValue((val, theme) => css`max-width: ${theme.width}px;`),
+    slim: memoThemeValue((val, theme) => val === true && (
       css`max-width: ${theme.slimWidth || theme.width * 0.61803398875}px;`
-    )
+    ))
   },
-  defaultTheme,
-  themePath: 'content'
+  defaultTheme
 })
 
-
-export default React.forwardRef(
+const Content = React.forwardRef(
   function Content (props, innerRef) {
     return SFC({
       __base: true,
@@ -52,3 +47,6 @@ export default React.forwardRef(
     })
   }
 )
+
+export default Content
+Content.propTypes /* remove-proptypes */ = {slim: PropTypes.bool}

packages/hamburger-menu/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stellar-apps/hamburger-menu",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "main": "dist/cjs/index.js",
   "author": "Jared Lunde <[email protected]> (https://BeStellar.co)",
   "license": "MIT",

packages/hamburger-menu/src/HamburgerMenu.js

@@ -22,7 +22,7 @@ const containerPropNames = [
   'verySlow'
 ]
 
-export default React.memo(
+const HamburgerMenu = React.memo(
   React.forwardRef(
     function HamburgerMenu (
       {
@@ -57,4 +57,6 @@ export default React.memo(
       )
     }
   )
-)
+)
+
+export default HamburgerMenu

packages/hamburger-menu/src/createHamburger.js

@@ -19,19 +19,14 @@ const defaultTheme = {
     contain: strict;
   `
 }
-const themePath = 'hamburger'
+
 const SFC = createComponent({
-  name: 'Hamburger',
-  propTypes: {
-    color: PropTypes.string,
-    lineNo: PropTypes.number
-  },
-  CSS: {
+  name: 'hamburger',
+  styles: {
     lineNo: (n, theme) => theme.getLine(n, theme),
     color: (val, theme) => val && colorize('background-color', val, theme)
   },
-  defaultTheme,
-  themePath: 'hamburger'
+  defaultTheme
 })
 
 export default function createHamburger (
@@ -55,7 +50,7 @@ export default function createHamburger (
     lines.push(<SFC {...sfcProps}/>)
   }
 
-  return function Hamburger ({show, hide, toggle, isVisible}) {
+  const Hamburger = ({show, hide, toggle, isVisible}) => {
     return closeButton !== void 0 && isVisible === true
       ? closeButton({show, hide, toggle, isVisible, lines, ref})
       : <Button
@@ -74,4 +69,11 @@ export default function createHamburger (
           children={lines}
         />
   }
+
+  Hamburger.propTypes /* remove-proptypes */ = {
+    color: PropTypes.string,
+      lineNo: PropTypes.number
+  }
+
+  return Hamburger
 }

packages/inst-templates/create-react-apollo-app/lib/src/client.js

@@ -26,25 +26,17 @@ const requestHeadersLink = createRequestHeadersLink({
   )
 })
 const apolloClient = createApolloClient(requestHeadersLink, httpLink)
-
-async function render (App) {
-  const app = (
-    <ApolloProvider client={apolloClient}>
-      <Router history={history}>
-        <App/>
-      </Router>
-    </ApolloProvider>
-  )
-
-  if (process.env.NODE_ENV === 'production') {
-    await Broker.loadInitial()
-  }
-
-  return ReactDOM.hydrate(app, root)
-}
+const hydrate = App => ReactDOM.hydrate(
+  <ApolloProvider client={apolloClient}>
+    <Router history={history}>
+      <App/>
+    </Router>
+  </ApolloProvider>,
+  root
+)
 
 if (__DEV__) {
-  module.hot && module.hot.accept('./index', () => render(require('./index').default))
+  module.hot && module.hot.accept('./index', () => hydrate(require('./index').default))
 }
 
-render(App)
+Broker.loadInitial().then(() => hydrate(App))

packages/inst-templates/create-react-apollo-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stellar-apps/create-react-apollo-app",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "main": "index.js",
   "author": "Jared Lunde <[email protected]> (https://BeStellar.co)",
   "license": "MIT",

packages/inst-templates/create-react-app/index.js

@@ -87,7 +87,7 @@ module.exports.dependencies = {
   "prop-types": "^15.6.2",
   "react": "^16.8.1",
   "react-dom": "^16.8.1",
-  "react-broker": "^1.1.2",
+  "react-broker": "^1.2.0",
   "react-helmet-async": "^0.2.0",
   "serverless-http": "^1.9.0",
 }

packages/inst-templates/create-react-app/lib/src/client.js

@@ -5,17 +5,10 @@ import App from './index'
 
 
 const root = document.getElementById('⚛️')
-
-async function render (App) {
-  if (process.env.NODE_ENV === 'production') {
-    await Broker.loadInitial()
-  }
-
-  return ReactDOM.hydrate(<App/>, root)
-}
+const hydrate = App => ReactDOM.hydrate(<App/>, root)
 
 if (__DEV__) {
-  module.hot && module.hot.accept('./index', () => render(require('./index').default))
+  module.hot && module.hot.accept('./index', () => hydrate(require('./index').default))
 }
 
-render(App)
+Broker.loadInitial().then(() => hydrate(App))

packages/inst-templates/create-react-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stellar-apps/create-react-app",
-  "version": "1.0.45",
+  "version": "1.0.46",
   "main": "index.js",
   "author": "Jared Lunde <[email protected]> (https://BeStellar.co)",
   "license": "MIT",

packages/inst-templates/create-react-router-app/index.js

@@ -17,8 +17,8 @@ module.exports.dependencies = {
   ...reactApp.dependencies,
   "resolve-url": "^0.2.1",
   "react-router-dom": "^4.3.1",
-  "@jaredlunde/curls-addons": "^3.0.3",
-  "@stellar-apps/min-height-hero": "^2.0.0"
+  "@jaredlunde/curls-addons": "^4.0.3",
+  "@stellar-apps/min-height-hero": "^2.0.2"
 }
 
 // package.json dev dependencies

packages/inst-templates/create-react-router-app/lib/src/client.js

@@ -8,19 +8,10 @@ import App from './index'
 
 const history = createHistory()
 const root = document.getElementById('⚛️')
-
-async function render (App) {
-  const app = <Router history={history} children={<App/>}/>
-
-  if (process.env.NODE_ENV === 'production') {
-    await Broker.loadInitial()
-  }
-
-  return ReactDOM.hydrate(app, root)
-}
+const hydrate = App => ReactDOM.hydrate(<Router history={history} children={<App/>}/>, root)
 
 if (__DEV__) {
-  module.hot && module.hot.accept('./index', () => render(require('./index').default))
+  module.hot && module.hot.accept('./index', () => hydrate(require('./index').default))
 }
 
-render(App)
+Broker.loadInitial().then(() => hydrate(App))

packages/inst-templates/create-react-router-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stellar-apps/create-react-router-app",
-  "version": "1.0.23",
+  "version": "1.0.25",
   "main": "index.js",
   "author": "Jared Lunde <[email protected]> (https://BeStellar.co)",
   "license": "MIT",

packages/min-height-hero/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stellar-apps/min-height-hero",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "main": "dist/cjs/index.js",
   "author": "Jared Lunde <[email protected]> (https://BeStellar.co)",
   "license": "MIT",

packages/min-height-hero/src/Hero.js

@@ -37,7 +37,7 @@ export default class Hero extends React.Component {
   }
 
   render () {
-    let {headerID, footerID, maxHeight, ...props} = this.props
+    let {headerID, footerID, maxHeight, innerRef, ...props} = this.props
 
     if (typeof document !== 'undefined') {
       this.headerEl = document.getElementById(headerID)
@@ -53,6 +53,7 @@ export default class Hero extends React.Component {
             wrap
             w='100%'
             minH={this.getHeight(height)}
+            ref={innerRef}
             {...props}
           />
         )}

packages/viewport-hero/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stellar-apps/viewport-hero",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "main": "dist/cjs/index.js",
   "author": "Jared Lunde <[email protected]> (https://BeStellar.co)",
   "license": "MIT",

packages/viewport-hero/src/Hero.js

@@ -15,7 +15,7 @@ export default class Hero extends React.Component {
   }
 
   render () {
-    let {children, headerID, footerID, trimFrom, ...props} = this.props
+    let {children, headerID, footerID, trimFrom, innerRef, ...props} = this.props
 
     if (typeof document !== 'undefined') {
       this.headerEl = document.getElementById(this.props.headerID)
@@ -32,6 +32,7 @@ export default class Hero extends React.Component {
       CurlsHero, {
         key: `hero-${this.didMount}`,
         trimHeight,
+        ref: innerRef,
         ...props,
         children
       }