provideContext.js

import React from 'react'

const provideContext = (contextKey, contextType) => (
  React.createClass({
    childContextTypes: {
      [contextKey]: contextType
    },

    getChildContext() {
      const { children, ...props } = this.props
      return {
        [contextKey]: props
      }
    },

    render() {
      return React.Children.only(this.props.children)
    }
  })
)

export default provideContext

withContext.js

import React from 'react'

export default (contextKey, contextType) => (
  (Component) => (
    React.createClass({
      contextTypes: {
        [contextKey]: contextType
      },

      render() {
        const props = {
          ...this.props,
          [contextKey]: this.context[contextKey]
        }
        return <Component {...props}/>
      }
    })
  )
)

// usage
const Something = withContext('router', PropTypes.object)(React.createClass({
  render() {
    this.props.router
  }
}))

There's a typo in SomeComponent.js right? It should be importing from AppContext?

nope.

👏