Merge pull request i18next#248 from kadishmal/247

Fix i18next#247: PropTypes warnings.

Author: jamuhl

__tests__/i18nextProvider-test.js

@@ -1,5 +1,6 @@
 jest.unmock('../src/I18nextProvider');
 import React from 'react';
+import PropTypes from 'prop-types';
 import  I18nextProvider from '../src/I18nextProvider' ;
 
 describe('I18nextProvider', () => {
@@ -8,7 +9,7 @@ describe('I18nextProvider', () => {
     const wrapper = new I18nextProvider({ i18n });
     expect(wrapper.getChildContext().i18n).toBe(i18n);
     expect(I18nextProvider.childContextTypes.i18n)
-      .toBe(React.PropTypes.object.isRequired);
+      .toBe(PropTypes.object.isRequired);
   });
   it('should throw an exception if you try to change i18n object', () => {
     const i18n = {};
@@ -28,10 +29,10 @@ describe('I18nextProvider', () => {
   });
   it('should have i18n proptype required', () => {
     expect(I18nextProvider.propTypes.i18n)
-      .toBe(React.PropTypes.object.isRequired);
+      .toBe(PropTypes.object.isRequired);
   });
   it('should have children proptype required', () => {
     expect(I18nextProvider.propTypes.children)
-      .toBe(React.PropTypes.element.isRequired);
+      .toBe(PropTypes.element.isRequired);
   });
 });

__tests__/interpolate-test.js

@@ -1,13 +1,14 @@
 jest.unmock('../src/translate');
 import React from 'react';
+import PropTypes from 'prop-types';
 import Interpolate from '../src/interpolate';
 
 describe('interpolate', () => {
   it('should have some stuff', () => {
     expect(Interpolate.contextTypes.i18n)
-      .toBe(React.PropTypes.object.isRequired);
+      .toBe(PropTypes.object.isRequired);
     expect(Interpolate.contextTypes.t)
-      .toBe(React.PropTypes.func.isRequired);
+      .toBe(PropTypes.func.isRequired);
     const props = {};
     const context = {
       i18n: {},

__tests__/translate-test.js

@@ -1,5 +1,6 @@
 jest.unmock('../src/translate');
 import React from 'react';
+import PropTypes from 'prop-types';
 import translate from '../src/translate';
 
 describe('translate', () => {
@@ -14,8 +15,8 @@ describe('translate', () => {
     Elem.NOT_KNOWN_REACT_STATIC = 'IS HOISTED ?';
     const wrapped = wrap(Elem);
     expect(wrapped.WrappedComponent).toBe(Elem);
-    expect(wrapped.contextTypes.i18n).toBe(React.PropTypes.object);
-    expect(wrapped.childContextTypes.t).toBe(React.PropTypes.func.isRequired);
+    expect(wrapped.contextTypes.i18n).toBe(PropTypes.object);
+    expect(wrapped.childContextTypes.t).toBe(PropTypes.func.isRequired);
     expect(wrapped.displayName).toBe('Translate(Elem)');
     expect(wrapped.namespaces.length).toBe(2);
     expect(wrapped.namespaces[0]).toBe('ns1');

package.json

@@ -45,6 +45,7 @@
     "jest-cli": "14.1.0",
     "mkdirp": "0.5.1",
     "react": "15.3.0",
+    "prop-types": "15.5.6",
     "rimraf": "2.5.4",
     "rollup": "0.34.10",
     "rollup-plugin-babel": "2.6.1",

react-i18next.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('react')) :
-	typeof define === 'function' && define.amd ? define('reactI18next', ['exports', 'react'], factory) :
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('react'), require('prop-types')) :
+	typeof define === 'function' && define.amd ? define('reactI18next', ['exports', 'react', 'prop-types'], factory) :
 	(factory((global.reactI18next = global.reactI18next || {}),global.React));
-}(this, (function (exports,React) { 'use strict';
+}(this, (function (exports,React,PropTypes) { 'use strict';
 
 var React__default = 'default' in React ? React['default'] : React;
 
@@ -333,10 +333,10 @@ function translate(namespaces) {
     Translate.WrappedComponent = WrappedComponent;
 
     Translate.contextTypes = {
-      i18n: React.PropTypes.object
+      i18n: PropTypes.object
     };
 
-    Translate.childContextTypes = defineProperty({}, translateFuncName, React.PropTypes.func.isRequired);
+    Translate.childContextTypes = defineProperty({}, translateFuncName, PropTypes.func.isRequired);
 
     Translate.displayName = 'Translate(' + getDisplayName(WrappedComponent) + ')';
 
@@ -422,13 +422,13 @@ var Interpolate = function (_Component) {
 }(React.Component);
 
 Interpolate.propTypes = {
-  children: React.PropTypes.node,
-  className: React.PropTypes.string
+  children: PropTypes.node,
+  className: PropTypes.string
 };
 
 Interpolate.contextTypes = {
-  i18n: React.PropTypes.object.isRequired,
-  t: React.PropTypes.func.isRequired
+  i18n: PropTypes.object.isRequired,
+  t: PropTypes.func.isRequired
 };
 
 var I18nextProvider = function (_Component) {
@@ -467,12 +467,12 @@ var I18nextProvider = function (_Component) {
 }(React.Component);
 
 I18nextProvider.propTypes = {
-  i18n: React.PropTypes.object.isRequired,
-  children: React.PropTypes.element.isRequired
+  i18n: PropTypes.object.isRequired,
+  children: PropTypes.element.isRequired
 };
 
 I18nextProvider.childContextTypes = {
-  i18n: React.PropTypes.object.isRequired
+  i18n: PropTypes.object.isRequired
 };
 
 // Borrowed from https://github.com/Rezonans/redux-async-connect/blob/master/modules/ReduxAsyncConnect.js#L16
@@ -546,4 +546,4 @@ exports.I18nextProvider = I18nextProvider;
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+})));

react-i18next.min.js

@@ -1,4 +1,5 @@
-import { Component, PropTypes, Children } from 'react';
+import { Component, Children } from 'react';
+import PropTypes from 'prop-types';
 
 class I18nextProvider extends Component {
   constructor(props, context) {

src/I18nextProvider.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 
 class Interpolate extends Component {
 

src/interpolate.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import hoistStatics from 'hoist-non-react-statics';
 
 function getDisplayName(component) {