update to use prop-types in react 15.5.x

Author: jamuhl

CHANGELOG.md

@@ -1,3 +1,9 @@
+### 3.0.0
+- [BREAKING] assert you install prop-types as a peerDependency based on changes in react >= 15.5.x
+- update react to 15.5.x use prop-types module to remove react warnings [PR248](https://github.com/i18next/react-i18next/pull/248)
+- update all dependencies
+- move react, prop-types to peerDependencies
+
 ### 2.2.3
 - try not access store if undefined for hmr
 

package.json

@@ -25,37 +25,37 @@
     "hoist-non-react-statics": "1.2.0"
   },
   "devDependencies": {
-    "babel-cli": "6.11.4",
-    "babel-core": "6.13.2",
-    "babel-eslint": "6.1.2",
-    "babel-jest": "14.1.0",
-    "babel-preset-es2015": "6.13.2",
-    "babel-preset-es2015-rollup": "1.2.0",
-    "babel-preset-stage-0": "6.5.0",
-    "babel-register": "6.11.6",
+    "babel-cli": "6.24.1",
+    "babel-core": "6.24.1",
+    "babel-eslint": "7.2.1",
+    "babel-jest": "19.0.0",
+    "babel-preset-es2015": "6.24.1",
+    "babel-preset-es2015-rollup": "3.0.0",
+    "babel-preset-stage-0": "6.24.1",
+    "babel-register": "6.24.1",
     "coveralls": "^2.11.12",
-    "enzyme": "2.4.1",
-    "eslint": "3.3.1",
-    "eslint-config-airbnb": "10.0.1",
-    "eslint-plugin-import": "1.13.0",
-    "eslint-plugin-jsx-a11y": "2.1.0",
-    "eslint-plugin-react": "6.1.2",
-    "i18next": "3.4.1",
-    "jest": "14.1.0",
-    "jest-cli": "14.1.0",
+    "enzyme": "2.8.0",
+    "eslint": "3.19.0",
+    "eslint-config-airbnb": "14.1.0",
+    "eslint-plugin-import": "2.2.0",
+    "eslint-plugin-jsx-a11y": "4.0.0",
+    "eslint-plugin-react": "6.10.3",
+    "i18next": "7.1.3",
+    "jest": "19.0.2",
+    "jest-cli": "19.0.2",
     "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",
-    "rollup-plugin-commonjs": "3.3.1",
-    "rollup-plugin-node-resolve": "2.0.0",
+    "rimraf": "2.6.1",
+    "rollup": "0.41.6",
+    "rollup-plugin-babel": "2.7.1",
+    "rollup-plugin-commonjs": "8.0.2",
+    "rollup-plugin-node-resolve": "3.0.0",
     "rollup-plugin-uglify": "1.0.1",
-    "yargs": "5.0.0"
+    "yargs": "7.0.2"
   },
   "peerDependencies": {
-    "i18next": ">= 6.0.1"
+    "i18next": ">= 6.0.1",
+    "react": ">= 15.0.0",
+    "prop-types": ">= 15.0.0"
   },
   "scripts": {
     "clean": "rimraf dist && mkdirp dist",

react-i18next.js

@@ -1,26 +1,16 @@
 (function (global, 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));
+	(factory((global.reactI18next = global.reactI18next || {}),global.React,global.PropTypes));
 }(this, (function (exports,React,PropTypes) { 'use strict';
 
 var React__default = 'default' in React ? React['default'] : React;
+PropTypes = 'default' in PropTypes ? PropTypes['default'] : PropTypes;
 
-function interopDefault(ex) {
-	return ex && typeof ex === 'object' && 'default' in ex ? ex['default'] : ex;
-}
-
-function createCommonjsModule(fn, module) {
-	return module = { exports: {} }, fn(module, module.exports), module.exports;
-}
-
-var index = createCommonjsModule(function (module) {
 /**
  * Copyright 2015, Yahoo! Inc.
  * Copyrights licensed under the New BSD License. See the accompanying LICENSE file for terms.
  */
-'use strict';
-
 var REACT_STATICS = {
     childContextTypes: true,
     contextTypes: true,
@@ -43,7 +33,7 @@ var KNOWN_STATICS = {
 
 var isGetOwnPropertySymbolsAvailable = typeof Object.getOwnPropertySymbols === 'function';
 
-module.exports = function hoistNonReactStatics(targetComponent, sourceComponent, customStatics) {
+var index = function hoistNonReactStatics(targetComponent, sourceComponent, customStatics) {
     if (typeof sourceComponent !== 'string') { // don't hoist over string (html) components
         var keys = Object.getOwnPropertyNames(sourceComponent);
 
@@ -65,16 +55,23 @@ module.exports = function hoistNonReactStatics(targetComponent, sourceComponent,
 
     return targetComponent;
 };
-});
-
-var hoistStatics = interopDefault(index);
 
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) {
   return typeof obj;
 } : function (obj) {
-  return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj;
+  return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
 };
 
+
+
+
+
+
+
+
+
+
+
 var classCallCheck = function (instance, Constructor) {
   if (!(instance instanceof Constructor)) {
     throw new TypeError("Cannot call a class as a function");
@@ -99,6 +96,10 @@ var createClass = function () {
   };
 }();
 
+
+
+
+
 var defineProperty = function (obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
@@ -128,6 +129,8 @@ var _extends = Object.assign || function (target) {
   return target;
 };
 
+
+
 var inherits = function (subClass, superClass) {
   if (typeof superClass !== "function" && superClass !== null) {
     throw new TypeError("Super expression must either be null or a function, not " + typeof superClass);
@@ -144,6 +147,16 @@ var inherits = function (subClass, superClass) {
   if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass;
 };
 
+
+
+
+
+
+
+
+
+
+
 var possibleConstructorReturn = function (self, call) {
   if (!self) {
     throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
@@ -152,6 +165,10 @@ var possibleConstructorReturn = function (self, call) {
   return call && (typeof call === "object" || typeof call === "function") ? call : self;
 };
 
+
+
+
+
 var slicedToArray = function () {
   function sliceIterator(arr, i) {
     var _arr = [];
@@ -195,17 +212,17 @@ function getDisplayName(component) {
 }
 
 function translate(namespaces) {
-  var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
-  var _options$withRef = options.withRef;
-  var withRef = _options$withRef === undefined ? false : _options$withRef;
-  var _options$wait = options.wait;
-  var wait = _options$wait === undefined ? false : _options$wait;
-  var _options$bindI18n = options.bindI18n;
-  var bindI18n = _options$bindI18n === undefined ? 'languageChanged loaded' : _options$bindI18n;
-  var _options$bindStore = options.bindStore;
-  var bindStore = _options$bindStore === undefined ? 'added removed' : _options$bindStore;
-  var _options$translateFun = options.translateFuncName;
-  var translateFuncName = _options$translateFun === undefined ? 't' : _options$translateFun;
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var _options$withRef = options.withRef,
+      withRef = _options$withRef === undefined ? false : _options$withRef,
+      _options$wait = options.wait,
+      wait = _options$wait === undefined ? false : _options$wait,
+      _options$bindI18n = options.bindI18n,
+      bindI18n = _options$bindI18n === undefined ? 'languageChanged loaded' : _options$bindI18n,
+      _options$bindStore = options.bindStore,
+      bindStore = _options$bindStore === undefined ? 'added removed' : _options$bindStore,
+      _options$translateFun = options.translateFuncName,
+      translateFuncName = _options$translateFun === undefined ? 't' : _options$translateFun;
 
 
   return function Wrapper(WrappedComponent) {
@@ -215,7 +232,7 @@ function translate(namespaces) {
       function Translate(props, context) {
         classCallCheck(this, Translate);
 
-        var _this = possibleConstructorReturn(this, Object.getPrototypeOf(Translate).call(this, props, context));
+        var _this = possibleConstructorReturn(this, (Translate.__proto__ || Object.getPrototypeOf(Translate)).call(this, props, context));
 
         _this.i18n = context.i18n || props.i18n;
         namespaces = namespaces || _this.i18n.options.defaultNS;
@@ -312,9 +329,9 @@ function translate(namespaces) {
         value: function render() {
           var _extraProps;
 
-          var _state = this.state;
-          var i18nLoadedAt = _state.i18nLoadedAt;
-          var ready = _state.ready;
+          var _state = this.state,
+              i18nLoadedAt = _state.i18nLoadedAt,
+              ready = _state.ready;
 
           var extraProps = (_extraProps = { i18nLoadedAt: i18nLoadedAt }, defineProperty(_extraProps, translateFuncName, this[translateFuncName]), defineProperty(_extraProps, 'i18n', this.i18n), _extraProps);
 
@@ -342,7 +359,7 @@ function translate(namespaces) {
 
     Translate.namespaces = namespaces;
 
-    return hoistStatics(Translate, WrappedComponent);
+    return index(Translate, WrappedComponent);
   };
 }
 
@@ -352,7 +369,7 @@ var Interpolate = function (_Component) {
   function Interpolate(props, context) {
     classCallCheck(this, Interpolate);
 
-    var _this = possibleConstructorReturn(this, Object.getPrototypeOf(Interpolate).call(this, props, context));
+    var _this = possibleConstructorReturn(this, (Interpolate.__proto__ || Object.getPrototypeOf(Interpolate)).call(this, props, context));
 
     _this.i18n = context.i18n;
     _this.t = context.t;
@@ -366,9 +383,9 @@ var Interpolate = function (_Component) {
 
       var parent = this.props.parent || 'span';
       var REGEXP = this.props.regexp || this.i18n.services.interpolator.regexp;
-      var _props = this.props;
-      var className = _props.className;
-      var style = _props.style;
+      var _props = this.props,
+          className = _props.className,
+          style = _props.style;
 
       // Set to true if you want to use raw HTML in translation values
       // See https://github.com/i18next/react-i18next/issues/189
@@ -437,7 +454,7 @@ var I18nextProvider = function (_Component) {
   function I18nextProvider(props, context) {
     classCallCheck(this, I18nextProvider);
 
-    var _this = possibleConstructorReturn(this, Object.getPrototypeOf(I18nextProvider).call(this, props, context));
+    var _this = possibleConstructorReturn(this, (I18nextProvider.__proto__ || Object.getPrototypeOf(I18nextProvider)).call(this, props, context));
 
     _this.i18n = props.i18n;
     return _this;
@@ -486,10 +503,9 @@ function eachComponents(components, iterator) {
 
       try {
         for (var _iterator = Object.entries(components[i])[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-          var _step$value = slicedToArray(_step.value, 2);
-
-          var key = _step$value[0];
-          var value = _step$value[1];
+          var _step$value = slicedToArray(_step.value, 2),
+              key = _step$value[0],
+              value = _step$value[1];
 
           iterator(value, i, key);
         }
@@ -515,10 +531,10 @@ function eachComponents(components, iterator) {
 
 function filterAndFlattenComponents(components) {
   var flattened = [];
-  eachComponents(components, function (Component) {
-    if (Component && Component.namespaces) {
+  eachComponents(components, function (Component$$1) {
+    if (Component$$1 && Component$$1.namespaces) {
 
-      Component.namespaces.forEach(function (namespace) {
+      Component$$1.namespaces.forEach(function (namespace) {
         if (flattened.indexOf(namespace) === -1) {
           flattened.push(namespace);
         }
@@ -529,8 +545,8 @@ function filterAndFlattenComponents(components) {
 }
 
 function loadNamespaces(_ref) {
-  var components = _ref.components;
-  var i18n = _ref.i18n;
+  var components = _ref.components,
+      i18n = _ref.i18n;
 
   var allNamespaces = filterAndFlattenComponents(components);