Merge branch 'master' into update_themr

Author: markusguenther

.travis.yml

@@ -4,6 +4,8 @@ cache:
   directories:
     - node_modules
 node_js:
-  - "4"
+  - "node"
 before_install:
-  - npm install -g babel-cli
+  - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.9.4
+  - export PATH="$HOME/.yarn/bin:$PATH"
+  - yarn global add babel-cli

.vscode/settings.json

@@ -0,0 +1,2 @@
+{
+}

README.md

@@ -1,13 +1,23 @@
-[![npm version](https://img.shields.io/npm/v/react-css-themr.svg?style=flat-square)](https://www.npmjs.com/package/react-css-themr)
-[![Build Status](http://img.shields.io/travis/javivelasco/react-css-themr/master.svg?style=flat-square)](https://travis-ci.org/javivelasco/react-css-themr)
-[![NPM Status](http://img.shields.io/npm/dm/react-css-themr.svg?style=flat-square)](https://www.npmjs.com/package/react-css-themr)
+[![npm version](https://img.shields.io/npm/v/@friendsofreactjs/react-css-themr.svg?style=flat-square)](https://www.npmjs.com/package/@friendsofreactjs/react-css-themr)
+[![Build Status](http://img.shields.io/travis/FriendsOfReactJS/react-css-themr/master.svg?style=flat-square)](https://travis-ci.org/FriendsOfReactJS/react-css-themr)
+[![NPM Status](http://img.shields.io/npm/dm/@friendsofreactjs/react-css-themr.svg?style=flat-square)](https://www.npmjs.com/package/@friendsofreactjs/react-css-themr)
+[![Dependency Status](https://david-dm.org/FriendsOfReactJS/react-css-themr.svg)](https://david-dm.org/FriendsOfReactJS/react-css-themr) [![devDependency Status](https://david-dm.org/FriendsOfReactJS/react-css-themr/dev-status.svg)](https://david-dm.org/FriendsOfReactJS/react-css-themr#info=devDependencies&view=table)
+[![Twitter](https://img.shields.io/twitter/follow/friendsofreact.svg?style=social)](https://twitter.com/friendsofreact) [![Greenkeeper badge](https://badges.greenkeeper.io/FriendsOfReactJS/react-css-themr.svg)](https://greenkeeper.io/)
 
-# React CSS Themr
+# Friends of react: React CSS Themr
+
+```
+⚛️️️❗️❗️⚛️
+This is a fork of React CSS Themr, that is not maintained anymore. We thank Javi Velasco for all his efforts and for
+creating such a great package. This package should not be unmaintained - so the friends of react will continue.
+
+Sadly Javi did not responed so we can not continue with the same package name. You find us now on npm with the prefix/scope `@friendsofreactjs`.
+```
 
 Easy theming and composition for CSS Modules.
 
 ```
-$ npm install --save react-css-themr
+$ npm install --save @friendsofreactjs/react-css-themr
 ```
 
 **Note: Feedback and contributions on the docs are highly appreciated.**
@@ -22,7 +32,7 @@ Taking ideas from [future-react-ui](https://github.com/nikgraf/future-react-ui)
 
 The most immediate way of providing a classname object is via *props*. In case you want to import a component with a theme already injected, you have to write a higher order component that does the job. This is ok for your own components, but for ui-kits like [React Toolbox](http://www.react-toolbox.com) or [Belle](http://nikgraf.github.io/belle/), you'd have to write a wrapper for every single component you want to use. In this fancy, you can understand the theme as a **set** of related classname objects for different components. It makes sense to group them together in a single object and move it through the component tree using a context. This way, you can provide a theme either via **context**, **hoc** or **props**.
 
-The approach of react-css-themr consists of a *provider* and a *decorator*. The provider sets a context theme. The decorator adds to your components the logic to figure out which theme should be used or how should it be composed, depending on configuration, context and props.
+The approach of @friendsofreactjs/react-css-themr consists of a *provider* and a *decorator*. The provider sets a context theme. The decorator adds to your components the logic to figure out which theme should be used or how should it be composed, depending on configuration, context and props.
 
 ## Combining CSS modules
 
@@ -41,7 +51,7 @@ Say you have a `Button` component you want to make themeable. You should pass a
 ```jsx
 // Button.js
 import React, { Component } from 'react';
-import { themr } from 'react-css-themr';
+import { themr } from '@friendsofreactjs/react-css-themr';
 
 @themr('MyThemedButton')
 class Button extends Component {
@@ -80,7 +90,7 @@ If you use a component with a base theme, you may want to import the component w
 ```jsx
 // SuccessButton.js
 import React, { Component } from 'react';
-import { themr } from 'react-css-themr';
+import { themr } from '@friendsofreactjs/react-css-themr';
 import successTheme from './SuccessButton.css';
 
 @themr('MySuccessButton', successTheme)
@@ -108,7 +118,7 @@ import style from './Section.css';
 
 export default () => (
   <section className={style.section}>
-    <SuccessButton theme={style.button}>Yai!</SuccessButton>
+    <SuccessButton theme={style}>Yai!</SuccessButton>
   </section>
 );
 ```
@@ -129,7 +139,7 @@ Although context theming is not limited to ui-kits, it's very useful to avoid de
 ```jsx
 import React from 'react';
 import { render } from 'react-dom';
-import { ThemeProvider } from 'react-css-themr';
+import { ThemeProvider } from '@friendsofreactjs/react-css-themr';
 import App from './app'
 
 const contextTheme = {
@@ -174,4 +184,4 @@ Thanks to [Nik Graf](http://www.twitter.com/nikgraf) and [Mark Dalgleish](http:/
 
 ## License
 
-This project is licensed under the terms of the [MIT license](https://github.com/javivelasco/react-css-themr/blob/master/LICENSE).
+This project is licensed under the terms of the [MIT license](https://github.com/FriendsOfReactJS/@friendsofreactjs/react-css-themr/blob/master/LICENSE).

index.d.ts

@@ -1,6 +1,6 @@
 import * as React from "react";
 
-declare module "react-css-themr" {
+declare module "@friendsofreactjs/react-css-themr" {
   type TReactCSSThemrTheme = {
     [key: string]: string | TReactCSSThemrTheme
   }

package.json

@@ -1,53 +1,50 @@
 {
-  "name": "react-css-themr",
-  "description": "React CSS Themr",
-  "homepage": "https://github.com/javivelasco/react-css-themr#readme",
-  "version": "2.1.2",
+  "name": "@friendsofreactjs/react-css-themr",
+  "description": "Friends of ReactJS: React CSS Themr",
+  "homepage": "https://github.com/FriendsOfReactJS/react-css-themr#readme",
+  "version": "3.0.1",
   "main": "./lib",
-  "author": {
-    "email": "javier.velasco86@gmail.com",
-    "name": "Javi Velasco",
-    "url": "http://javivelasco.com/"
-  },
+  "author": "Javi Velasco <javier.velasco86@gmail.com> (http://javivelasco.com/)",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/javivelasco/react-css-themr.git"
+    "url": "git+https://github.com/FriendsOfReactJS/react-css-themr.git"
   },
   "bugs": {
-    "url": "https://github.com/javivelasco/react-css-themr/issues"
+    "url": "https://github.com/FriendsOfReactJS/react-css-themr/issues"
   },
   "keywords": [
     "css-modules",
     "customization",
     "react",
     "react-css-themr",
-    "theming"
+    "theming",
+    "friends of react"
   ],
   "dependencies": {
-    "hoist-non-react-statics": "^1.2.0",
-    "invariant": "^2.2.1"
+    "hoist-non-react-statics": "^3.0.1",
+    "invariant": "^2.2.4"
   },
   "devDependencies": {
-    "@types/react": "^15.0.24",
-    "babel-cli": "^6.24.1",
-    "babel-core": "^6.24.1",
+    "@types/react": "^16.4.7",
+    "babel-cli": "^6.26.0",
+    "babel-core": "^6.26.3",
     "babel-eslint": "^7.2.3",
-    "babel-plugin-transform-decorators-legacy": "^1.3.4",
+    "babel-plugin-transform-decorators-legacy": "^1.3.5",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-react": "^6.24.1",
     "babel-preset-stage-0": "^6.24.1",
     "eslint": "^3.19.0",
     "eslint-config-rackt": "^1.1.1",
     "eslint-plugin-babel": "^4.1.1",
-    "eslint-plugin-react": "^7.0.0",
+    "eslint-plugin-react": "^7.10.0",
     "expect": "^1.18.0",
-    "fbjs": "^0.8.12",
+    "fbjs": "^0.8.17",
     "jsdom": "^9.8.3",
     "mocha": "^3.3.0",
-    "prop-types": "^15.5.9",
-    "react": "^15.5.4",
-    "react-dom": "^15.5.4",
-    "rimraf": "^2.6.1",
+    "prop-types": "^15.6.2",
+    "react": "^16.4.2",
+    "react-dom": "^16.4.2",
+    "rimraf": "^2.6.2",
     "sinon": "^1.17.6"
   },
   "files": [
@@ -64,7 +61,21 @@
   },
   "license": "MIT",
   "peerDependencies": {
-    "react": "^0.14.0 || ^15.0.0-0"
+    "react": "^0.14.0 || ^15.0.0-0 || ^16.0.0"
+  },
+  "typings": "./index.d.ts",
+  "directories": {
+    "lib": "lib",
+    "test": "test"
   },
-  "typings": "./index.d.ts"
+  "greenkeeper": {
+    "ignore": [
+      "expect",
+      "mocha",
+      "sinon",
+      "jsdom",
+      "eslint",
+      "babel-eslint"
+    ]
+  }
 }

src/components/themr.js

@@ -92,8 +92,11 @@ export default (componentName, localTheme, options = {}) => (ThemedComponent) =>
     getNamespacedTheme(props) {
       const { themeNamespace, theme } = props
       if (!themeNamespace) return theme
-      if (themeNamespace && !theme) throw new Error('Invalid themeNamespace use in react-css-themr. ' +
+
+      if (themeNamespace && !theme) {
+        throw new Error('Invalid themeNamespace use in friendsofreactjs/react-css-themr. ' +
         'themeNamespace prop should be used only with theme prop.')
+      }
 
       return Object.keys(theme)
         .filter(key => key.startsWith(themeNamespace))
@@ -262,7 +265,7 @@ function merge(original = {}, mixin = {}) {
 function validateComposeOption(composeTheme) {
   if ([ COMPOSE_DEEPLY, COMPOSE_SOFTLY, DONT_COMPOSE ].indexOf(composeTheme) === -1) {
     throw new Error(
-      `Invalid composeTheme option for react-css-themr. Valid composition options\
+      `Invalid composeTheme option for friendsofreactjs/react-css-themr. Valid composition options\
  are ${COMPOSE_DEEPLY}, ${COMPOSE_SOFTLY} and ${DONT_COMPOSE}. The given\
  option was ${composeTheme}`
     )

test/components/ThemeProvider.spec.js

@@ -4,6 +4,16 @@ import PropTypes from 'prop-types'
 import TestUtils from 'react-dom/test-utils'
 import { ThemeProvider } from '../../src/index'
 
+
+before(function () {
+  /* eslint-disable no-console */
+  console.error = function () {}
+})
+
+after(function () {
+  delete console.error
+})
+
 describe('ThemeProvider', () => {
   class Child extends Component {
     render() {

test/components/themr.spec.js

@@ -351,7 +351,7 @@ describe('Themr decorator function', () => {
       <ProviderMock theme={theme}>
         <Container themeNamespace="container"/>
       </ProviderMock>
-    )).toThrow(/Invalid themeNamespace use in react-css-themr. themeNamespace prop should be used only with theme prop./)
+    )).toThrow(/Invalid themeNamespace use in friendsofreactjs\/react-css-themr. themeNamespace prop should be used only with theme prop./)
   })
 
   it('when providing a themeNamespace prop composes a theme', () => {

test/setup.js

@@ -1,3 +1,4 @@
+import raf from './tempPolyfills'
 import { jsdom } from 'jsdom'
 
 global.document = jsdom('<!doctype html><html><body></body></html>')

test/tempPolyfills.js

@@ -0,0 +1,5 @@
+const raf = global.requestAnimationFrame = (cb) => {
+  setTimeout(cb, 0)
+}
+
+export default raf