Merge pull request #465 from bertho-zero/deps

update dependencies

Author: bertho-zero

.babelrc

@@ -1,28 +1,57 @@
 {
   "presets": [
-    "react",
+    "@babel/preset-react",
     [
-      "env",
+      "@babel/preset-env",
       {
         "targets": {
           "browsers": ["last 2 versions", "IE >= 8"],
           "node": "current"
         },
         "useBuiltIns": "entry"
       }
-    ],
-    "stage-0"
+    ]
   ],
   "plugins": [
-    "transform-runtime",
-    "transform-decorators-legacy",
+    [
+      "@babel/plugin-transform-runtime",
+      {
+        "corejs": 2
+      }
+    ],
+    [
+      "@babel/plugin-proposal-decorators",
+      {
+        "legacy": true
+      }
+    ],
     "react-loadable/babel",
-    "react-hot-loader/babel"
+    "react-hot-loader/babel",
+    "@babel/plugin-syntax-dynamic-import",
+    "@babel/plugin-syntax-import-meta",
+    "@babel/plugin-proposal-class-properties",
+    "@babel/plugin-proposal-json-strings",
+    "@babel/plugin-proposal-function-sent",
+    "@babel/plugin-proposal-export-namespace-from",
+    "@babel/plugin-proposal-numeric-separator",
+    "@babel/plugin-proposal-throw-expressions",
+    "@babel/plugin-proposal-export-default-from",
+    "@babel/plugin-proposal-logical-assignment-operators",
+    "@babel/plugin-proposal-optional-chaining",
+    [
+      "@babel/plugin-proposal-pipeline-operator",
+      {
+        "proposal": "minimal"
+      }
+    ],
+    "@babel/plugin-proposal-nullish-coalescing-operator",
+    "@babel/plugin-proposal-do-expressions",
+    "@babel/plugin-proposal-function-bind"
   ],
   "env": {
     "development": {
       "plugins": [
-        "transform-react-jsx-source"
+        "@babel/plugin-transform-react-jsx-source"
       ]
     }
   }

.eslintignore

@@ -1 +1,2 @@
-webpack/*
+node_modules/
+static/dist/

.eslintrc

@@ -12,7 +12,7 @@
     "consistent-return": "off",
     "global-require": "off",
     "indent": ["error", 2, {"SwitchCase": 1}],
-    "max-len": ["error", 120, {"ignorePattern": "[^\\n\\r]{115,120}\\{(?:'|\") (?:'|\")\\}"}],
+    "max-len": ["warn", 120],
     "no-alert": "off",
     "no-confusing-arrow": "off",
     "no-console": "off",
@@ -24,6 +24,7 @@
     "react/jsx-closing-tag-location": "off",
     "react/jsx-filename-extension": "off",
     "react/jsx-no-target-blank": "warn",
+    "react/jsx-one-expression-per-line": "off",
     "react/no-multi-comp": ["error", {"ignoreStateless": true}],
     "react/no-unescaped-entities": "off",
     "react/prefer-stateless-function": "warn",
@@ -66,7 +67,6 @@
     "__DISABLE_SSR__": true,
     "__DEVTOOLS__": true,
     "__DLLS__": true,
-    "socket": true,
     "webpackIsomorphicTools": true
   }
 }

.travis.yml

@@ -5,7 +5,6 @@ language: node_js
 node_js:
   - '10'
   - '8'
-  - '6'
 
 addons:
   apt:

api/api.js

@@ -12,21 +12,24 @@ import channels from './channels';
 
 const pretty = new PrettyError();
 
-process.on('unhandledRejection', (reason, p) =>
-  console.error('Unhandled Rejection at: Promise ', p, pretty.render(reason)));
+process.on('unhandledRejection', (reason, p) => {
+  console.error('Unhandled Rejection at: Promise ', p, pretty.render(reason));
+});
 
 const app = express(feathers());
 
 app
   .set('config', config)
   .use(morgan('dev'))
   .use(cookieParser())
-  .use(session({
-    secret: 'react and redux rule!!!!',
-    resave: false,
-    saveUninitialized: false,
-    cookie: { maxAge: 60000 }
-  }))
+  .use(
+    session({
+      secret: 'react and redux rule!!!!',
+      resave: false,
+      saveUninitialized: false,
+      cookie: { maxAge: 60000 }
+    })
+  )
   .use(bodyParser.urlencoded({ extended: true }))
   .use(bodyParser.json())
   // Core
@@ -36,15 +39,17 @@ app
   .configure(channels)
   // Final handlers
   .use(express.notFound())
-  .use(express.errorHandler({
-    logger: {
-      error: error => {
-        if (error && error.code !== 404) {
-          console.error('API ERROR:', pretty.render(error));
+  .use(
+    express.errorHandler({
+      logger: {
+        error: error => {
+          if (error && error.code !== 404) {
+            console.error('API ERROR:', pretty.render(error));
+          }
         }
       }
-    }
-  }));
+    })
+  );
 
 if (process.env.APIPORT) {
   app.listen(process.env.APIPORT, err => {

api/config.js

@@ -1,6 +1,6 @@
 const ONE_DAY = 60 * 60 * 24 * 1000;
 
-module.exports = {
+const config = {
   auth: {
     secret: 'super secret',
     cookie: {
@@ -22,3 +22,5 @@ module.exports = {
     }
   }
 };
+
+export default config;

api/services/authentication/index.js

@@ -7,7 +7,9 @@ import FacebookTokenStrategy from 'passport-facebook-token';
 
 function populateUser() {
   return context => {
-    context.result.user = context.params.user;
+    const { result, params } = context;
+
+    result.user = params.user;
   };
 }
 
@@ -18,10 +20,12 @@ export default function authenticationService(app) {
     .configure(auth(config))
     .configure(jwt())
     .configure(local()) // .configure(oauth1()) // TODO twitter example
-    .configure(oauth2({
-      name: 'facebook', // if the name differs from your config key you need to pass your config options explicitly
-      Strategy: FacebookTokenStrategy
-    }));
+    .configure(
+      oauth2({
+        name: 'facebook', // if the name differs from your config key you need to pass your config options explicitly
+        Strategy: FacebookTokenStrategy
+      })
+    );
 
   app.service('authentication').hooks({
     before: {

api/services/messages/hooks.js

@@ -1,7 +1,9 @@
 import auth from '@feathersjs/authentication';
 import local from '@feathersjs/authentication-local';
 import { restrictToOwner } from 'feathers-authentication-hooks';
-import { fastJoin, disallow, iff, isProvider, keep } from 'feathers-hooks-common';
+import {
+  fastJoin, disallow, iff, isProvider, keep
+} from 'feathers-hooks-common';
 import { required } from 'utils/validation';
 import { validateHook as validate } from 'hooks';
 
@@ -39,9 +41,11 @@ const messagesHooks = {
     create: [
       validate(schemaValidator),
       context => {
+        const { data, params } = context;
+
         context.data = {
-          text: context.data.text,
-          sentBy: context.params.user ? context.params.user._id : null, // Set the id of current user
+          text: data.text,
+          sentBy: params.user ? params.user._id : null, // Set the id of current user
           createdAt: new Date()
         };
       }

api/services/users/hooks.js

@@ -4,7 +4,9 @@ import errors from '@feathersjs/errors';
 import { restrictToOwner } from 'feathers-authentication-hooks';
 import { discard } from 'feathers-hooks-common';
 import { validateHook } from 'hooks';
-import { required, email, match, unique } from 'utils/validation';
+import {
+  required, email, match, unique
+} from 'utils/validation';
 
 const schemaValidator = {
   email: [required, email, unique('email')],
@@ -14,9 +16,12 @@ const schemaValidator = {
 
 function validate() {
   return context => {
-    if (context.data.facebook && !context.data.email) {
-      throw new errors.BadRequest('Incomplete oauth registration', context.data);
+    const { data } = context;
+
+    if (data.facebook && !data.email) {
+      throw new errors.BadRequest('Incomplete oauth registration', data);
     }
+
     return validateHook(schemaValidator)(context);
   };
 }

bin/server.js

@@ -25,8 +25,9 @@ if (__DEVELOPMENT__) {
 
 // https://github.com/halt-hammerzeit/webpack-isomorphic-tools
 const WebpackIsomorphicTools = require('webpack-isomorphic-tools');
-global.webpackIsomorphicTools = new WebpackIsomorphicTools(
-  require('../webpack/webpack-isomorphic-tools')
-).server(rootDir, () => {
-  require('../src/server');
-});
+global.webpackIsomorphicTools = new WebpackIsomorphicTools(require('../webpack/webpack-isomorphic-tools')).server(
+  rootDir,
+  () => {
+    require('../src/server');
+  }
+);