Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Apr 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions packages/authentication-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/authentication-client/src/core.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion packages/authentication-client/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'];
Expand Down
45 changes: 0 additions & 45 deletions packages/authentication-client/test/integration/primus.test.ts

This file was deleted.

3 changes: 0 additions & 3 deletions packages/client/index.d.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand All @@ -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;
}
14 changes: 7 additions & 7 deletions packages/client/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion packages/client/primus.js

This file was deleted.

2 changes: 0 additions & 2 deletions packages/client/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
});
Expand Down
1 change: 0 additions & 1 deletion packages/client/src/primus.js

This file was deleted.

29 changes: 0 additions & 29 deletions packages/client/test/sockets/primus.test.js

This file was deleted.

2 changes: 1 addition & 1 deletion packages/client/test/sockets/socketio.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 0 additions & 2 deletions packages/client/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ module.exports = [
createConfig('rest', true),
createConfig('socketio'),
createConfig('socketio', true),
createConfig('primus'),
createConfig('primus', true),
createConfig('authentication'),
createConfig('authentication', true)
];
1 change: 0 additions & 1 deletion packages/primus-client/.npmignore

This file was deleted.

Loading