Updating feathers packages

Removed socket stuff because we're not using it
kogg · Jun 9, 2016 · 3f002d8 · 3f002d8
1 parent f8d4018
commit 3f002d8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 17 deletions.
diff --git a/application/browser.js b/application/browser.js
@@ -1,14 +1,9 @@
 var feathers = require('feathers-client');
+var rest     = require('feathers-rest/client');
 
 var app = feathers(document.location.origin);
-if (process.env.npm_package_feathersjs_socket) {
-	/* global io */
-	app.configure(feathers.socketio(io()));
-	/* global io:false */
-} else {
-	global.fetch = null;
-	require('whatwg-fetch');
-	app.configure(feathers.fetch(global.fetch));
-}
+global.fetch = null;
+require('whatwg-fetch');
+app.configure(rest().fetch(global.fetch));
 
 module.exports = app;
diff --git a/application/index.jsx b/application/index.jsx
@@ -6,6 +6,7 @@ var helmet        = require('helmet');
 var match         = require('react-router').match;
 var path          = require('path');
 var promisify     = require('es6-promisify');
+var rest          = require('feathers-rest');
 var serverRender  = require('feathers-react-redux/serverRender');
 var sm            = require('sitemap');
 var Provider      = require('react-redux').Provider;
@@ -28,10 +29,7 @@ app.use(bodyParser.urlencoded({ extended: true }));
 
 app.use(feathers.static(path.join(__dirname, '../assets'), { maxage: '365d' }));
 app.use(feathers.static(path.join(__dirname, '../dist'), { maxage: '365d' }));
-app.configure(feathers.rest());
-if (process.env.npm_package_feathersjs_socket) {
-	app.configure(feathers.socketio());
-}
+app.configure(rest());
 
 app.set('view engine', 'jsx');
 app.set('views', path.join(__dirname, '../components'));

diff --git a/components/index.jsx b/components/index.jsx
@@ -51,7 +51,6 @@ var HTMLDoc = React.createClass({
 				<body>
 					<div id="react-app" dangerouslySetInnerHTML={{ __html: this.props.markup }} />
 					<script id="react-state" type="text/json" dangerouslySetInnerHTML={{ __html: JSON.stringify(this.props.state) }} />
-					{process.env.npm_package_feathersjs_socket && <script type="text/javascript" src="/socket.io/socket.io.js" />}
 					<script type="text/javascript" src={'/' + HTMLDoc.cacheBuster('js/main.js')} async />
 					{this.props.head.script.toComponent()}
 				</body>

diff --git a/package.json b/package.json
@@ -86,9 +86,10 @@
     "exorcist": "^0.4.0",
     "express-react-views": "^0.9.0",
     "fast-levenshtein": "^1.1.3",
-    "feathers": "^1.3.0",
-    "feathers-client": "^0.5.3",
+    "feathers": "^2.0.1",
+    "feathers-client": "^1.3.2",
     "feathers-react-redux": "^0.4.1",
+    "feathers-rest": "^1.4.2",
     "filesaverjs": "^0.2.1",
     "googleapis": "^2.1.7",
     "helmet": "^1.1.0",
@@ -118,7 +119,6 @@
     "rollbar": "^0.5.16",
     "rollbar-browser": "^1.9.1",
     "sitemap": "^1.6.0",
-    "socket.io": "^1.4.6",
     "sorcery": "^0.9.2",
     "svg2png": "^3.0.0",
     "uglify-js": "^2.6.1",