use module.exports explicitly instead of this
Merge branch 'feature/componentize'

* feature/componentize:
  use module.exports explicitly instead of this