chore(package): Remove @feathersjs/primus packages from core (#1919)

BREAKING CHANGE: Remove primus packages to be moved into the ecosystem. See #1899
feathersjs · Apr 16, 2020 · d20b7d5 · d20b7d5
1 parent 7abe3e6
commit d20b7d5
Show file tree

Hide file tree

Showing 31 changed files with 9 additions and 1,984 deletions.
diff --git a/packages/authentication-client/package.json b/packages/authentication-client/package.json
@@ -52,8 +52,6 @@
   "devDependencies": {
     "@feathersjs/authentication-local": "^4.5.2",
     "@feathersjs/express": "^4.5.2",
-    "@feathersjs/primus": "^4.5.2",
-    "@feathersjs/primus-client": "^4.5.2",
     "@feathersjs/rest-client": "^4.5.2",
     "@feathersjs/socketio": "^4.5.2",
     "@feathersjs/socketio-client": "^4.5.2",

diff --git a/packages/authentication-client/src/core.ts b/packages/authentication-client/src/core.ts
@@ -37,7 +37,7 @@ export class AuthenticationClient {
   options: AuthenticationClientOptions;
 
   constructor (app: Application, options: AuthenticationClientOptions) {
-    const socket = app.io || app.primus;
+    const socket = app.io || (app as any).primus;
     const storage = new StorageWrapper(app.get('storage') || options.storage);
 
     this.app = app;

diff --git a/packages/authentication-client/src/index.ts b/packages/authentication-client/src/index.ts
@@ -7,7 +7,6 @@ declare module '@feathersjs/feathers' {
   interface Application<ServiceTypes = {}> {
     io?: any;
     rest?: any;
-    primus?: any;
     authentication: AuthenticationClient;
     authenticate: AuthenticationClient['authenticate'];
     reAuthenticate: AuthenticationClient['reAuthenticate'];

diff --git a/packages/authentication-client/test/integration/primus.test.ts b/packages/authentication-client/test/integration/primus.test.ts
diff --git a/packages/client/index.d.ts b/packages/client/index.d.ts
@@ -1,7 +1,6 @@
 import feathers from '@feathersjs/feathers';
 import authentication from '@feathersjs/authentication-client';
 import errors from '@feathersjs/errors';
-import primus from '@feathersjs/primus-client';
 import rest from '@feathersjs/rest-client';
 import socketio from '@feathersjs/socketio-client';
 
@@ -13,14 +12,12 @@ export = feathersClient;
 type Feathers = typeof feathers;
 type FeathersAuthenticationClient = typeof authentication;
 type FeathersErrors = typeof errors;
-type FeathersPrimusClient = typeof primus;
 type FeathersRestClient = typeof rest;
 type FeathersSocketIOClient = typeof socketio;
 
 interface FeathersClient extends Feathers {
     authentication: FeathersAuthenticationClient;
     errors: FeathersErrors;
-    primus: FeathersPrimusClient;
     rest: FeathersRestClient;
     socketio: FeathersSocketIOClient;
 }
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@feathersjs/client",
-  "description": "A module that consolidates Feathers client modules for REST (jQuery, Request, Superagent) and Websocket (Socket.io, Primus) connections",
+  "description": "A module that consolidates Feathers client modules for REST and Websocket connections",
   "version": "4.5.2",
   "repository": {
     "type": "git",
@@ -38,18 +38,18 @@
     "last 2 versions",
     "IE 10"
   ],
-  "devDependencies": {
-    "@babel/core": "^7.9.0",
-    "@babel/preset-env": "^7.9.5",
+  "dependencies": {
     "@feathersjs/authentication-client": "^4.5.2",
     "@feathersjs/errors": "^4.5.2",
     "@feathersjs/express": "^4.5.2",
     "@feathersjs/feathers": "^4.5.2",
-    "@feathersjs/primus": "^4.5.2",
-    "@feathersjs/primus-client": "^4.5.2",
     "@feathersjs/rest-client": "^4.5.2",
     "@feathersjs/socketio": "^4.5.2",
-    "@feathersjs/socketio-client": "^4.5.2",
+    "@feathersjs/socketio-client": "^4.5.2"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.9.0",
+    "@babel/preset-env": "^7.9.0",
     "@feathersjs/tests": "^4.5.2",
     "babel-loader": "^8.1.0",
     "body-parser": "^1.19.0",

diff --git a/packages/client/primus.js b/packages/client/primus.js
diff --git a/packages/client/src/index.js b/packages/client/src/index.js
@@ -3,12 +3,10 @@ const errors = require('@feathersjs/errors');
 const authentication = require('@feathersjs/authentication-client');
 const rest = require('@feathersjs/rest-client');
 const socketio = require('@feathersjs/socketio-client');
-const primus = require('@feathersjs/primus-client');
 
 Object.assign(feathers, {
   errors,
   socketio,
-  primus,
   rest,
   authentication
 });

diff --git a/packages/client/src/primus.js b/packages/client/src/primus.js
diff --git a/packages/client/test/sockets/primus.test.js b/packages/client/test/sockets/primus.test.js
diff --git a/packages/client/test/sockets/socketio.test.js b/packages/client/test/sockets/socketio.test.js
@@ -3,7 +3,7 @@ const socketio = require('@feathersjs/socketio');
 const baseTests = require('@feathersjs/tests/lib/client');
 
 const app = require('../fixture');
-const feathers = require('../../');
+const feathers = require('../../src');
 
 describe('Socket.io connector', function () {
   const socket = io('http://localhost:9988');

diff --git a/packages/client/webpack.config.js b/packages/client/webpack.config.js
@@ -61,8 +61,6 @@ module.exports = [
   createConfig('rest', true),
   createConfig('socketio'),
   createConfig('socketio', true),
-  createConfig('primus'),
-  createConfig('primus', true),
   createConfig('authentication'),
   createConfig('authentication', true)
 ];
diff --git a/packages/primus-client/.npmignore b/packages/primus-client/.npmignore