Merge pull request #1 from bertho-zero/master

Pull request from upstream

Author: arfianadam

.babelrc

@@ -7,13 +7,18 @@
   "plugins": [
     "transform-runtime",
     "add-module-exports",
-    "transform-decorators-legacy"
+    "transform-decorators-legacy",
+    [
+      "flow-runtime",
+      {
+        "assert": true,
+        "annotate": true
+      }
+    ]
   ],
   "env": {
     "development": {
-      "plugins": [
-        "typecheck"
-      ]
+      "plugins": []
     }
   }
 }

README.md

@@ -16,6 +16,8 @@ import * as actions from './actions';
 import { mapUrl } from './utils/url.js';
 import auth, { socketAuth } from './services/authentication';
 
+process.on('unhandledRejection', error => console.error(error));
+
 const pretty = new PrettyError();
 const app = feathers();
 

api/api.js

@@ -99,26 +99,27 @@
   },
   "dependencies": {
     "async": "^2.1.4",
-    "babel-core": "^6.21.0",
+    "babel-core": "^6.22.1",
     "babel-plugin-add-module-exports": "^0.2.1",
+    "babel-plugin-flow-runtime": "^0.2.1",
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
-    "babel-plugin-transform-runtime": "^6.15.0",
-    "babel-polyfill": "^6.20.0",
-    "babel-preset-es2015": "^6.18.0",
-    "babel-preset-react": "^6.16.0",
-    "babel-preset-stage-0": "^6.16.0",
-    "babel-register": "^6.18.0",
-    "babel-runtime": "^6.20.0",
+    "babel-plugin-transform-runtime": "^6.22.0",
+    "babel-polyfill": "^6.22.0",
+    "babel-preset-es2015": "^6.22.0",
+    "babel-preset-react": "^6.22.0",
+    "babel-preset-stage-0": "^6.22.0",
+    "babel-register": "^6.22.0",
+    "babel-runtime": "^6.22.0",
     "body-parser": "^1.16.0",
     "compression": "^1.6.2",
     "cookie-parser": "^1.4.3",
-    "express": "^4.14.0",
-    "express-session": "^1.14.2",
+    "express": "^4.14.1",
+    "express-session": "^1.15.0",
     "feathers": "^2.0.3",
     "feathers-authentication": "^1.0.2",
-    "feathers-authentication-client": "git+https://github.com/bertho-zero/feathers-authentication-client.git#patch-3",
+    "feathers-authentication-client": "^0.1.7",
     "feathers-authentication-jwt": "^0.3.1",
-    "feathers-authentication-local": "^0.3.2",
+    "feathers-authentication-local": "^0.3.3",
     "feathers-authentication-oauth1": "^0.2.3",
     "feathers-authentication-oauth2": "^0.2.3",
     "feathers-errors": "^2.5.0",
@@ -127,6 +128,7 @@
     "feathers-nedb": "^2.6.0",
     "feathers-rest": "^1.6.0",
     "feathers-socketio": "^1.4.2",
+    "flow-runtime": "^0.2.1",
     "http-proxy": "^1.16.2",
     "is-promise": "^2.1.0",
     "js-cookie": "^2.1.3",
@@ -135,7 +137,7 @@
     "lodash.isplainobject": "^4.0.6",
     "lru-memoize": "^1.0.1",
     "morgan": "^1.7.0",
-    "multireducer": "^3.0.3",
+    "multireducer": "^3.1.0",
     "nedb": "^1.8.0",
     "passport-facebook-token": "^3.3.0",
     "pretty-error": "^2.0.2",
@@ -149,54 +151,53 @@
     "react-router-redux": "^4.0.7",
     "react-router-scroll": "^0.4.1",
     "redux": "^3.6.0",
-    "redux-auth-wrapper": "^0.9.0",
+    "redux-auth-wrapper": "^1.0.0",
     "redux-connect": "^5.0.0",
-    "redux-form": "^6.4.3",
-    "redux-persist": "^4.0.1",
+    "redux-form": "^6.5.0",
+    "redux-persist": "^4.1.1",
     "serialize-javascript": "^1.3.0",
     "serve-favicon": "^2.3.2",
     "socket.io": "^1.7.2",
     "socket.io-client": "^1.7.2",
-    "superagent": "^3.3.2"
+    "superagent": "^3.4.1"
   },
   "devDependencies": {
     "autoprefixer-loader": "^3.2.0",
     "babel-eslint": "^7.1.1",
     "babel-jest": "^18.0.0",
     "babel-loader": "^6.2.10",
-    "babel-plugin-typecheck": "^3.9.0",
     "better-npm-run": "^0.0.14",
-    "bootstrap-loader": "^2.0.0-beta.19",
+    "bootstrap-loader": "^2.0.0-beta.20",
     "bootstrap-sass": "^3.3.7",
     "chai": "^3.5.0",
     "clean-webpack-plugin": "^0.1.15",
     "concurrently": "^3.1.0",
     "css-loader": "^0.26.1",
-    "eslint": "^3.13.1",
+    "eslint": "^3.15.0",
     "eslint-config-airbnb": "^14.0.0",
     "eslint-loader": "^1.6.1",
     "eslint-plugin-import": "^2.2.0",
     "eslint-plugin-jsx-a11y": "^3.0.2",
     "eslint-plugin-react": "^6.9.0",
-    "extract-text-webpack-plugin": "^2.0.0-beta.4",
-    "file-loader": "^0.9.0",
+    "extract-text-webpack-plugin": "2.0.0-beta.5",
+    "file-loader": "^0.10.0",
     "font-awesome": "^4.7.0",
     "font-awesome-webpack": "^0.0.4",
     "happypack": "^3.0.2",
-    "html-webpack-plugin": "^2.26.0",
+    "html-webpack-plugin": "^2.28.0",
     "jest": "^18.1.0",
-    "karma": "^1.4.0",
+    "karma": "^1.4.1",
     "karma-cli": "^1.0.1",
     "karma-mocha": "^1.3.0",
-    "karma-mocha-reporter": "^2.2.1",
+    "karma-mocha-reporter": "^2.2.2",
     "karma-phantomjs-launcher": "^1.0.2",
     "karma-sourcemap-loader": "^0.3.7",
-    "karma-webpack": "^2.0.1",
+    "karma-webpack": "^2.0.2",
     "less": "^2.7.2",
     "less-loader": "^2.2.3",
     "lighthouse": "^1.4.1",
     "mocha": "^3.2.0",
-    "node-sass": "^4.3.0",
+    "node-sass": "^4.5.0",
     "phantomjs-polyfill": "^0.0.2",
     "phantomjs-prebuilt": "^2.1.14",
     "piping": "^1.0.0-rc.4",
@@ -212,12 +213,12 @@
     "sinon": "^1.17.7",
     "strip-loader": "^0.1.2",
     "style-loader": "^0.13.1",
-    "sw-precache-webpack-plugin": "^0.7.2",
+    "sw-precache-webpack-plugin": "^0.8.0",
     "timekeeper": "^1.0.0",
     "url-loader": "^0.5.7",
-    "webpack": "^2.1.0-beta.27",
-    "webpack-dev-middleware": "^1.9.0",
-    "webpack-hot-middleware": "^2.15.0",
+    "webpack": "^2.2.1",
+    "webpack-dev-middleware": "^1.10.0",
+    "webpack-hot-middleware": "^2.16.1",
     "webpack-isomorphic-tools": "^2.6.6"
   },
   "engines": {

package.json

@@ -5,10 +5,9 @@ import socketio from 'feathers-socketio/client';
 import authentication from 'feathers-authentication-client';
 import io from 'socket.io-client';
 import superagent from 'superagent';
-import localForage from 'localforage';
 import config from './config';
 
-const storage = __SERVER__ ? require('localstorage-memory') : localForage;
+const storage = __SERVER__ ? require('localstorage-memory') : require('localforage');
 
 const host = clientUrl => (__SERVER__ ? `http://${config.apiHost}:${config.apiPort}` : clientUrl);
 

src/app.js

@@ -14,11 +14,15 @@ import Helmet from 'react-helmet';
  */
 export default class Html extends Component {
   static propTypes = {
-    assets: PropTypes.object.isRequired,
+    assets: PropTypes.object,
     component: PropTypes.node.isRequired,
     store: PropTypes.object.isRequired
   };
 
+  static defaultProps = {
+    assets: {}
+  };
+
   render() {
     const { assets, component, store } = this.props;
     const content = component ? ReactDOM.renderToString(component) : '';

src/helpers/Html.js

@@ -3,5 +3,5 @@ import ReactDOM from 'react-dom/server';
 import Html from './helpers/Html';
 
 export default function () {
-  return `<!doctype html>${ReactDOM.renderToStaticMarkup(<Html assets={{}} />)}`;
+  return `<!doctype html>${ReactDOM.renderToStaticMarkup(<Html />)}`;
 }

src/progressive.js src/pwa.jssrc/progressive.js renamed to src/pwa.js

@@ -33,8 +33,8 @@ export default function createStore(history, client, data, persistConfig = null)
   }
 
   const finalCreateStore = compose(...enhancers)(_createStore);
-  const asyncNoopReducers = getMissingReducers(createReducers(), data);
-  const store = finalCreateStore(combineReducers(createReducers(asyncNoopReducers)), data);
+  const missingReducers = getMissingReducers(createReducers(), data);
+  const store = finalCreateStore(combineReducers(createReducers(missingReducers)), data);
 
   store.asyncReducers = {};
   store.inject = inject.bind(null, store);

src/redux/create.js

@@ -2,61 +2,17 @@ import React from 'react';
 import { IndexRoute, Route } from 'react-router';
 import { routerActions } from 'react-router-redux';
 import { UserAuthWrapper } from 'redux-auth-wrapper';
-import async from 'async';
-import isPromise from 'is-promise';
-import { isLoaded as isAuthLoaded, load as loadAuth } from 'redux/modules/auth';
 import { App, Home, NotFound } from 'containers';
+import getRoutesUtils from 'utils/routes';
 
 // eslint-disable-next-line import/no-dynamic-require
 if (typeof System.import === 'undefined') System.import = module => Promise.resolve(require(module));
 
 export default store => {
-  const injectReducerAndRender = (name, reducerPromise, containerPromise) =>
-    Promise.all([reducerPromise, containerPromise])
-      .then(([reducer, container]) => {
-        store.inject(name, reducer.default || reducer);
-        return container.default || container;
-      });
-
-  const onEnterChain = (...listOfOnEnters) => (nextState, replace, onEnterCb) => {
-    let redirected = false;
-    const wrappedReplace = (...args) => {
-      replace(...args);
-      redirected = true;
-    };
-    async.eachSeries(listOfOnEnters, (onEnter, callback) => {
-      if (!redirected) {
-        const result = onEnter(store, nextState, wrappedReplace);
-        if (isPromise(result)) return result.then(() => callback(), callback);
-      }
-      callback();
-    }, err => {
-      if (err) onEnterCb(err);
-      onEnterCb();
-    });
-  };
-
-  const loadAuthIfNeeded = () => {
-    if (!isAuthLoaded(store.getState())) {
-      return store.dispatch(loadAuth()).catch(() => {});
-    }
-    return Promise.resolve();
-  };
-
-  const checkPermissions = chainedPermissions => loadAuthIfNeeded().then(() => chainedPermissions);
-
-  const enterPermissions = (...listOfPermissions) => {
-    const permissions = [loadAuthIfNeeded].concat(listOfPermissions.map(perm => perm.onEnter || perm));
-    return onEnterChain(...permissions);
-  };
-
-  const permissionsComponent = (...listOfPermissions) => ({
-    onEnter: enterPermissions(...listOfPermissions),
-    getComponent: () => checkPermissions(listOfPermissions.reduceRight(
-      (prev, next) => next(prev),
-      props => props.children
-    ))
-  });
+  const {
+    injectReducerAndRender,
+    permissionsComponent
+  } = getRoutesUtils(store);
 
   /* Permissions */
 
@@ -84,19 +40,23 @@ export default store => {
       <IndexRoute component={Home} />
 
       {/* Routes requiring login */}
-      <Route {...permissionsComponent(isAuthenticated)}>
+      {/*
+        You can also protect a route like this:
+        <Route path="protected-route" {...permissionsComponent(isAuthenticated)(Component)}>
+      */}
+      <Route {...permissionsComponent(isAuthenticated)()}>
         <Route path="loginSuccess" getComponent={() => System.import('./containers/LoginSuccess/LoginSuccess')} />
         <Route
           path="chatFeathers"
           getComponent={() => injectReducerAndRender(
-            'chat', System.import('./redux/modules/chat'),
+            { chat: System.import('./redux/modules/chat') },
             System.import('./containers/ChatFeathers/ChatFeathers')
           )}
         />
       </Route>
 
       {/* Routes disallow login */}
-      <Route {...permissionsComponent(isNotAuthenticated)}>
+      <Route {...permissionsComponent(isNotAuthenticated)()}>
         <Route path="register" getComponent={() => System.import('./containers/Register/Register')} />
       </Route>
 
@@ -106,14 +66,14 @@ export default store => {
       <Route
         path="survey"
         getComponent={() => injectReducerAndRender(
-          'survey', System.import('./redux/modules/survey'),
+          { survey: System.import('./redux/modules/survey') },
           System.import('./containers/Survey/Survey')
         )}
       />
       <Route
         path="widgets"
         getComponent={() => injectReducerAndRender(
-          'widgets', System.import('./redux/modules/widgets'),
+          { widgets: System.import('./redux/modules/widgets') },
           System.import('./containers/Widgets/Widgets')
         )}
       />

src/routes.js

@@ -20,6 +20,8 @@ import Html from 'helpers/Html';
 import getRoutes from 'routes';
 import { exposeInitialRequest } from 'app';
 
+process.on('unhandledRejection', error => console.error(error));
+
 const targetUrl = `http://${config.apiHost}:${config.apiPort}`;
 const pretty = new PrettyError();
 const app = express();