From 1f16233afa5db4fc607f66b766d1ca00e51ffda9 Mon Sep 17 00:00:00 2001
From: Lyubo Marinov <lmarinov@atlassian.com>
Date: Sat, 22 Apr 2017 17:27:16 -0500
Subject: [PATCH] Upgrade NPM dependencies/packages

---
 flow-typed/npm/react-i18next_v2.x.x.js | 36 --------------------------
 flow-typed/npm/redux_v3.x.x.js         |  8 +++---
 package.json                           | 12 ++++-----
 3 files changed, 11 insertions(+), 45 deletions(-)
 delete mode 100644 flow-typed/npm/react-i18next_v2.x.x.js

diff --git a/flow-typed/npm/react-i18next_v2.x.x.js b/flow-typed/npm/react-i18next_v2.x.x.js
deleted file mode 100644
index 124c53e4b..000000000
--- a/flow-typed/npm/react-i18next_v2.x.x.js
+++ /dev/null
@@ -1,36 +0,0 @@
-// flow-typed signature: 57cf34196930be78935a42e5c8ac3cb6
-// flow-typed version: ae6284e7b7/react-i18next_v2.x.x/flow_>=v0.36.x_<=v0.39.x
-
-declare module 'react-i18next' {
-  declare type TFunction = (key?: ?string, data?: ?Object) => string;
-  declare type Locales = string | Array<string>;
-
-  declare type StatelessComponent<P> = (props: P) => ?React$Element<any>;
-
-  declare type Comp<P> = StatelessComponent<P> | Class<React$Component<*, P, *>>;
-
-  declare type Translator<OP, P> = {
-    (component: StatelessComponent<P>): Class<React$Component<void, OP, void>>;
-    <Def, St>(component: Class<React$Component<Def, P, St>>): Class<React$Component<Def, OP, St>>;
-  }
-
-  declare function translate<OP, P>(locales: Locales): Translator<OP, P>;
-
-  declare type NamespacesProps = {
-    components: Array<Comp<*>>,
-    i18n: { loadNamespaces: Function },
-  };
-
-  declare function loadNamespaces(props: NamespacesProps): Promise<void>;
-
-  declare type ProviderProps = { i18n: Object, children: React$Element<any> };
-
-  declare var I18nextProvider: Class<React$Component<void, ProviderProps, void>>;
-
-  declare type InterpolateProps = {
-    children?: React$Element<any>,
-    className?: string,
-  };
-
-  declare var Interpolate: Class<React$Component<void, InterpolateProps, void>>;
-}
diff --git a/flow-typed/npm/redux_v3.x.x.js b/flow-typed/npm/redux_v3.x.x.js
index 0094abfa9..f4f5e2005 100644
--- a/flow-typed/npm/redux_v3.x.x.js
+++ b/flow-typed/npm/redux_v3.x.x.js
@@ -1,5 +1,5 @@
-// flow-typed signature: ba132c96664f1a05288f3eb2272a3c35
-// flow-typed version: c4bbd91cfc/redux_v3.x.x/flow_>=v0.33.x
+// flow-typed signature: 7f1a115f75043c44385071ea3f33c586
+// flow-typed version: 358375125e/redux_v3.x.x/flow_>=v0.33.x
 
 declare module 'redux' {
 
@@ -27,6 +27,8 @@ declare module 'redux' {
 
   declare type Reducer<S, A> = (state: S, action: A) => S;
 
+  declare type CombinedReducer<S, A> = (state: $Shape<S> & {} | void, action: A) => S;
+
   declare type Middleware<S, A> =
     (api: MiddlewareAPI<S, A>) =>
       (next: Dispatch<A>) => Dispatch<A>;
@@ -49,7 +51,7 @@ declare module 'redux' {
   declare function bindActionCreators<A, C: ActionCreator<A, any>>(actionCreator: C, dispatch: Dispatch<A>): C;
   declare function bindActionCreators<A, K, C: ActionCreators<K, A>>(actionCreators: C, dispatch: Dispatch<A>): C;
 
-  declare function combineReducers<O: Object, A>(reducers: O): Reducer<$ObjMap<O, <S>(r: Reducer<S, any>) => S>, A>;
+  declare function combineReducers<O: Object, A>(reducers: O): CombinedReducer<$ObjMap<O, <S>(r: Reducer<S, any>) => S>, A>;
 
   declare function compose<S, A>(...fns: Array<StoreEnhancer<S, A>>): Function;
 
diff --git a/package.json b/package.json
index f92acd217..6abcde676 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "bootstrap": "3.1.1",
     "es6-iterator": "2.0.1",
     "es6-symbol": "3.1.1",
-    "i18next": "7.1.3",
+    "i18next": "8.0.0",
     "i18next-browser-languagedetector": "1.0.1",
     "i18next-xhr-backend": "1.4.1",
     "jitsi-meet-logger": "jitsi/jitsi-meet-logger",
@@ -44,7 +44,7 @@
     "postis": "2.2.0",
     "react": "15.4.2",
     "react-dom": "15.4.2",
-    "react-i18next": "2.2.3",
+    "react-i18next": "3.1.0",
     "react-native": "0.42.3",
     "react-native-background-timer": "1.0.0",
     "react-native-immersive": "0.0.4",
@@ -66,8 +66,8 @@
   },
   "devDependencies": {
     "babel-core": "6.24.1",
-    "babel-eslint": "7.2.1",
-    "babel-loader": "6.4.1",
+    "babel-eslint": "7.2.3",
+    "babel-loader": "7.0.0",
     "babel-polyfill": "6.23.0",
     "babel-preset-es2015": "6.24.1",
     "babel-preset-react": "6.24.1",
@@ -77,9 +77,9 @@
     "eslint": "3.19.0",
     "eslint-plugin-flowtype": "2.30.4",
     "eslint-plugin-import": "2.2.0",
-    "eslint-plugin-jsdoc": "3.0.0",
+    "eslint-plugin-jsdoc": "3.0.2",
     "eslint-plugin-react": "6.10.3",
-    "eslint-plugin-react-native": "2.3.1",
+    "eslint-plugin-react-native": "2.3.2",
     "expose-loader": "0.7.3",
     "file-loader": "0.11.1",
     "flow-bin": "0.38.0",