upgrade by cli (WIP)

Author: appinteractive

package.json

@@ -52,6 +52,14 @@
     "concurrently": "concurrently --kill-others --success first"
   },
   "dependencies": {
+    "@feathersjs/authentication": "^2.1.7",
+    "@feathersjs/authentication-jwt": "^2.0.1",
+    "@feathersjs/authentication-local": "^1.2.1",
+    "@feathersjs/configuration": "^1.0.2",
+    "@feathersjs/errors": "^3.3.0",
+    "@feathersjs/express": "^1.2.3",
+    "@feathersjs/feathers": "^3.1.7",
+    "@feathersjs/socketio": "^3.2.2",
     "body-parser": "~1.18.3",
     "cheerio": "^1.0.0-rc.2",
     "compression": "~1.7.2",
@@ -60,16 +68,9 @@
     "crypto-js": "^3.1.9-1",
     "dauria": "~2.0.0",
     "email-templates": "2.6.0",
-    "feathers": "~2.2.4",
-    "feathers-authentication": "~1.3.1",
     "feathers-authentication-hooks": "~0.1.6",
-    "feathers-authentication-jwt": "~0.3.2",
-    "feathers-authentication-local": "~0.4.4",
     "feathers-authentication-management": "~1.0.3",
     "feathers-blob": "~1.3.1",
-    "feathers-configuration": "~0.4.2",
-    "feathers-errors": "~2.9.2",
-    "feathers-hooks": "~2.1.2",
     "feathers-hooks-common": "~3.10.0",
     "feathers-logger": "0.2.3",
     "feathers-mailer": "~2.0.0",
@@ -78,9 +79,7 @@
     "feathers-mongodb-fuzzy-search": "~1.1.1",
     "feathers-mongoose": "~5.1.2",
     "feathers-profiler": "^0.1.5",
-    "feathers-rest": "~1.8.1",
     "feathers-seeder": "~1.0.10",
-    "feathers-socketio": "~2.0.1",
     "fs-blob-store": "~5.2.1",
     "fs-extra": "~4.0.2",
     "handlebars": "~4.0.11",

server/app.js

@@ -5,11 +5,11 @@ const cors = require('cors');
 // const helmet = require('helmet');
 const bodyParser = require('body-parser');
 
-const feathers = require('feathers');
-const configuration = require('feathers-configuration');
-const hooks = require('feathers-hooks');
-const rest = require('feathers-rest');
-const socketio = require('feathers-socketio');
+const feathers = require('@feathersjs/feathers');
+const express = require('@feathersjs/express');
+const configuration = require('@feathersjs/configuration');
+const rest = require('@feathersjs/express/rest');
+const socketio = require('@feathersjs/socketio');
 const seeder = require('./seeder');
 
 const middleware = require('./middleware');
@@ -21,7 +21,7 @@ const Raven = require('raven');
 const logger = require('./logger');
 const { profiler }  = require('feathers-profiler');
 
-const app = feathers();
+const app = express(feathers());
 
 app.configure(require('feathers-logger')(logger));
 
@@ -49,10 +49,8 @@ app.use(bodyParser.json());
 app.use(bodyParser.urlencoded({ extended: true }));
 app.use(favicon(path.join(app.get('public'), 'favicon.ico')));
 // Host the public folder
-app.use('/', feathers.static(app.get('public')));
+app.use('/', express.static(app.get('public')));
 
-// Set up Plugins and providers
-app.configure(hooks());
 app.configure(mongoose);
 app.configure(rest());
 

server/authentication.js

@@ -1,6 +1,6 @@
-const authentication = require('feathers-authentication');
-const jwt = require('feathers-authentication-jwt');
-const local = require('feathers-authentication-local');
+const authentication = require('@feathersjs/authentication');
+const jwt = require('@feathersjs/authentication-jwt');
+const local = require('@feathersjs/authentication-local');
 const { lowerCase } = require('feathers-hooks-common');
 
 module.exports = function () {

server/hooks/exclude-disabled.js

@@ -1,5 +1,5 @@
 // Exclude items with isEnabled = false
-const errors = require('feathers-errors');
+const errors = require('@feathersjs/errors');
 
 module.exports = function excludeDisabled() {
   return function (hook) {

server/hooks/is-admin.js

@@ -1,5 +1,5 @@
 // Check if user is admin
-const errors = require('feathers-errors');
+const errors = require('@feathersjs/errors');
 
 module.exports = () => hook => {
   if(!hook.params || !hook.params.user || hook.params.user.role !== 'admin') {

server/hooks/is-enabled.js

@@ -2,7 +2,7 @@
 // For more information on hooks see: http://docs.feathersjs.com/api/hooks.html
 
 const _ = require('lodash');
-const errors = require('feathers-errors');
+const errors = require('@feathersjs/errors');
 
 module.exports = function isEnabled(options = {}) { // eslint-disable-line no-unused-vars
   return function (hook) {

server/hooks/is-moderator.js

@@ -1,5 +1,5 @@
 // Check if user is moderator
-const errors = require('feathers-errors');
+const errors = require('@feathersjs/errors');
 
 module.exports = () => hook => {
   if(!hook.params || !hook.params.user || !['admin','moderator'].includes(hook.params.user.role)) {

server/hooks/restrictToOwnerOrModerator.js

@@ -1,5 +1,5 @@
 const { getByDot } = require('feathers-hooks-common');
-const errors = require('feathers-errors');
+const errors = require('@feathersjs/errors');
 
 module.exports = function restrictToOwnerOrModerator (query = {}) { // eslint-disable-line no-unused-vars
   return function (hook) {

server/middleware/index.js

@@ -1,4 +1,4 @@
-const handler = require('feathers-errors/handler');
+const handler = require('@feathersjs/express/errors');
 const notFound = require('feathers-errors/not-found');
 
 module.exports = function () {

server/services/admin/admin.hooks.js

@@ -1,4 +1,4 @@
-const { authenticate } = require('feathers-authentication').hooks;
+const { authenticate } = require('@feathersjs/authentication').hooks;
 const { when, isProvider } = require('feathers-hooks-common');
 const isAdmin = require('../../hooks/is-admin');