Upgrade dependencies; fix proptype check in Pagination

package.json

@@ -22,39 +22,38 @@
   },
   "homepage": "https://github.com/Alamantus/Lexiconga#readme",
   "devDependencies": {
-    "autoprefixer": "^7.1.6",
+    "autoprefixer": "^8.0.0",
     "babel-core": "^6.25.0",
     "babel-loader": "^7.1.0",
-    "babel-plugin-inferno": "^3.2.0",
+    "babel-plugin-inferno": "^4.0.0",
-    "babel-preset-es2016": "^6.24.1",
+    "babel-preset-env": "^1.6.1",
-    "css-loader": "^0.28.4",
+    "css-loader": "^0.28.9",
-    "express": "^4.15.2",
+    "express": "^4.16.2",
-    "file-loader": "^0.11.2",
+    "file-loader": "^1.1.9",
-    "html-loader": "^0.4.5",
+    "html-loader": "^0.5.5",
-    "inferno-create-element": "^3.10.1",
+    "inferno-devtools": "^4.0.4",
-    "node-sass": "^4.5.3",
+    "node-sass": "^4.7.2",
-    "postcss": "^6.0.13",
+    "postcss": "^6.0.19",
-    "postcss-loader": "^2.0.8",
+    "postcss-loader": "^2.1.0",
     "raw-loader": "^0.5.1",
     "sass-loader": "^6.0.6",
-    "style-loader": "^0.18.2",
+    "style-loader": "^0.20.2",
-    "url-loader": "^0.5.9",
+    "url-loader": "^0.6.2",
-    "webpack": "^3.0.0",
+    "webpack": "^3.11.0",
-    "webpack-dev-server": "^2.6.1"
+    "webpack-dev-server": "^2.11.1"
   },
   "dependencies": {
-    "babel-polyfill": "^6.23.0",
+    "babel-polyfill": "^6.26.0",
-    "bulma": "^0.6.0",
+    "bulma": "^0.6.2",
-    "dexie": "^1.5.1",
+    "dexie": "^2.0.1",
     "font-awesome": "^4.7.0",
-    "inferno": "^3.10.1",
+    "inferno": "^4.0.4",
-    "inferno-component": "^3.10.1",
+    "inferno-create-element": "^4.0.4",
-    "inferno-devtools": "^3.10.1",
+    "marked": "^0.3.16",
-    "marked": "^0.3.6",
+    "papaparse": "^4.3.7",
-    "papaparse": "^4.3.3",
     "prop-types": "^15.6.0",
-    "sanitize-html": "^1.14.1",
+    "sanitize-html": "^1.18.2",
     "store": "^2.0.12",
-    "sweetalert2": "^6.11.5"
+    "sweetalert2": "^7.12.12"
   }
 }

src/components/MainDisplay.jsx

@@ -1,5 +1,5 @@
 import Inferno from 'inferno';
-import Component from 'inferno-component';
+import { Component } from 'inferno';
 import PropTypes from 'prop-types';
 
 import { LeftColumn } from './structure/LeftColumn';

src/components/display/Ad.jsx

@@ -1,5 +1,5 @@
 import Inferno from 'inferno';
-import Component from 'inferno-component';
+import { Component } from 'inferno';
 
 export class Ad extends Component {
   constructor (props) {

src/components/display/DictionaryDetails/DetailsSection/index.jsx

@@ -1,5 +1,5 @@
 import Inferno from 'inferno';
-import Component from 'inferno-component';
+import { Component } from 'inferno';
 import PropTypes from 'prop-types';
 import marked from 'marked';
 import sanitizeHtml from 'sanitize-html';

src/components/display/DictionaryDetails/index.jsx

@@ -1,5 +1,5 @@
 import Inferno from 'inferno';
-import Component from 'inferno-component';
+import { Component } from 'inferno';
 import PropTypes from 'prop-types';
 import marked from 'marked';
 import sanitizeHtml from 'sanitize-html';

src/components/display/WordDisplay/index.jsx

@@ -1,5 +1,5 @@
 import Inferno from 'inferno';
-import Component from 'inferno-component';
+import { Component } from 'inferno';
 import PropTypes from 'prop-types';
 import marked from 'marked';
 import swal from 'sweetalert2';

src/components/display/WordsList.jsx

@@ -1,5 +1,5 @@
 import Inferno from 'inferno';
-import Component from 'inferno-component';
+import { Component } from 'inferno';
 import PropTypes from 'prop-types';
 import marked from 'marked';
 

src/components/management/AccountManager/LoginForm.jsx

@@ -1,5 +1,5 @@
 import Inferno from 'inferno';
-import Component from 'inferno-component';
+import { Component } from 'inferno';
 import PropTypes from 'prop-types';
 import marked from 'marked';
 import store from 'store';

src/components/management/AccountManager/index.jsx

@@ -1,5 +1,5 @@
 import Inferno from 'inferno';
-import Component from 'inferno-component';
+import { Component } from 'inferno';
 import PropTypes from 'prop-types';
 import marked from 'marked';
 import store from 'store';

src/components/management/EditDictionaryModal/index.jsx

@@ -1,5 +1,5 @@
 import Inferno from 'inferno';
-import Component from 'inferno-component';
+import { Component } from 'inferno';
 import PropTypes from 'prop-types';
 import marked from 'marked';
 

src/components/management/IPAField.jsx

@@ -1,5 +1,5 @@
 import Inferno from 'inferno';
-import Component from 'inferno-component';
+import { Component } from 'inferno';
 import PropTypes from 'prop-types';
 
 const phondueUsage = require('../../../vendor/KeyboardFire/phondue/usage.html');

src/components/management/LargeTextArea/index.jsx

@@ -1,5 +1,5 @@
 import Inferno from 'inferno';
-import Component from 'inferno-component';
+import { Component } from 'inferno';
 import PropTypes from 'prop-types';
 
 import './styles.scss';

src/components/management/SearchBox/index.jsx

@@ -1,5 +1,5 @@
 import Inferno from 'inferno';
-import Component from 'inferno-component';
+import { Component } from 'inferno';
 import PropTypes from 'prop-types';
 
 import './styles.scss';

src/components/management/WordForm.jsx

@@ -1,5 +1,5 @@
 import Inferno from 'inferno';
-import Component from 'inferno-component';
+import { Component } from 'inferno';
 import PropTypes from 'prop-types';
 
 import dictionaryData from '../../managers/DictionaryData';

src/components/structure/Header.jsx

@@ -1,5 +1,5 @@
 import Inferno from 'inferno';
-import Component from 'inferno-component';
+import { Component } from 'inferno';
 import PropTypes from 'prop-types';
 import marked from 'marked';
 

src/components/structure/Modal.jsx

@@ -1,5 +1,5 @@
 import Inferno from 'inferno';
-import Component from 'inferno-component';
+import { Component } from 'inferno';
 import PropTypes from 'prop-types';
 
 export class Modal extends Component {

src/components/structure/Pagination.jsx

@@ -5,7 +5,7 @@ export const Pagination = (props) => {
   PropTypes.checkPropTypes({
     currentPage: PropTypes.number.isRequired,
     itemsPerPage: PropTypes.number.isRequired,
-    stats: PropTypes.number,
+    stats: PropTypes.object.isRequired,
     setPage: PropTypes.func.isRequired,
   }, props, 'prop', 'Pagination');
 

src/index.jsx

@@ -2,7 +2,7 @@
 import './sass/main.scss';
 
 import Inferno from 'inferno';
-import Component from 'inferno-component';
+import { Component, render } from 'inferno';
 import store from 'store';
 
 import removeDiacritics from '../vendor/StackOverflow/removeDiacritics';
@@ -223,4 +223,4 @@ class App extends Component {
   }
 }
 
-Inferno.render(<App />, document.getElementById('site'));
+render(<App />, document.getElementById('site'));

vendor/LGabAnnell/lazyload-inferno-component/lazyload-component.js

@@ -1,60 +1,50 @@
-"use strict";
+import { createElement } from "inferno-create-element";
-var __extends = (this && this.__extends) || (function () {
+import { Component } from "inferno";
-    var extendStatics = Object.setPrototypeOf ||
+
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+/** @internal 
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+	* Function pretty much copied from infernojs - Route.ts
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var inferno_create_element_1 = require("inferno-create-element");
-var inferno_component_1 = require("inferno-component");
-/** @internal
-    * Function pretty much copied from infernojs - Route.ts
   */
 function rest(object, excluded) {
-    var t = {};
+  const t = {};
-    for (var p in object) {
+  for (let p in object) {
-        if (excluded.indexOf(p) < 0) {
+    if (excluded.indexOf(p) < 0) {
-            t[p] = object[p];
+      t[p] = object[p];
-        }
     }
-    return t;
+  }
+  return t;
 }
-var LazyLoader = /** @class */ (function (_super) {
+
-    __extends(LazyLoader, _super);
+export default class LazyLoader extends Component {
-    function LazyLoader(props, context) {
+
-        var _this = _super.call(this, props, context) || this;
+  constructor(props, context) {
-        _this.state = {
+    super(props, context);
-            child: null
+    this.state = {
-        };
+      child: null
-        _this.context = context;
+    };
-        _this.lazyLoad = props.lazyLoad;
+    this.context = context;
-        _this.children = props.children;
+    this.lazyLoad = props.lazyLoad;
-        _this.loadComponent = _this.loadComponent.bind(_this);
+    this.children = props.children;
-        return _this;
+    this.loadComponent = this.loadComponent.bind(this);
+  }
+
+  loadComponent(componentName, props) {
+    let finalProps;
+    if (!props) {
+      finalProps = rest(this.props, ["lazyLoad", "children"]);
+    } else {
+      finalProps = Object.assign({}, props, rest(this.props, ["lazyLoad", "children"]));
     }
-    LazyLoader.prototype.loadComponent = function (componentName, props) {
+
-        var finalProps;
+    this.setState({
-        if (!props) {
+      child: createElement(componentName, finalProps, this.children)
-            finalProps = rest(this.props, ["lazyLoad", "children"]);
+    });
-        }
+  }
-        else {
+
-            finalProps = Object.assign({}, props, rest(this.props, ["lazyLoad", "children"]));
+  componentWillMount() {
-        }
+    this.lazyLoad(this.loadComponent, {props: this.props, router: this.context.router});
-        this.setState({
+  }
-            child: inferno_create_element_1.default(componentName, finalProps, this.children)
+
-        });
+  render() {
-    };
+    return this.state.child ? this.state.child : null;
-    LazyLoader.prototype.componentWillMount = function () {
+  }
-        this.lazyLoad(this.loadComponent, { props: this.props, router: this.context.router });
+}
-    };
-    LazyLoader.prototype.render = function () {
-        return this.state.child ? this.state.child : null;
-    };
-    return LazyLoader;
-}(inferno_component_1.default));
-exports.default = LazyLoader;

webpack.config.js

@@ -73,7 +73,7 @@ const webpackConfig = {
             loader: 'babel-loader',
             options: {
               presets: [
-                'es2016',
+                'env',
               ],
               plugins: [
                 'inferno',