From b10ff0d7fe155f53430842577b24e15c19c9ebd2 Mon Sep 17 00:00:00 2001 From: cha0s Date: Sun, 28 Apr 2019 23:45:18 -0500 Subject: [PATCH] refactor: byebye mixins package --- client/app.js | 3 +-- client/cycle-tracker.js | 3 +-- package.json | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/client/app.js b/client/app.js index 433faf7..a50ea4c 100644 --- a/client/app.js +++ b/client/app.js @@ -2,12 +2,11 @@ import React from 'react'; import ReactDOM from 'react-dom'; // 2nd party. -import {compose} from '@avocado/core'; +import {compose, EventEmitter, Property} from '@avocado/core'; import {EntityPacketSynchronizer} from '@avocado/entity'; import {Stage} from '@avocado/graphics'; import {ActionRegistry, InputNormalizer, InputPacket} from '@avocado/input'; import {Vector} from '@avocado/math'; -import {EventEmitter, Property} from '@avocado/mixins'; import {SocketClient} from '@avocado/net/client/socket'; import {SocketIoParser} from '@avocado/net'; import { diff --git a/client/cycle-tracker.js b/client/cycle-tracker.js index f2f5e5e..abe1ee6 100644 --- a/client/cycle-tracker.js +++ b/client/cycle-tracker.js @@ -1,5 +1,4 @@ -import {compose} from '@avocado/core'; -import {EventEmitter, Property} from '@avocado/mixins'; +import {compose, EventEmitter, Property} from '@avocado/core'; import {Ticker} from '@avocado/timing'; const decorate = compose( diff --git a/package.json b/package.json index 33e57fe..c439ce5 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,6 @@ "@avocado/entity": "1.x", "@avocado/graphics": "1.x", "@avocado/input": "1.x", - "@avocado/mixins": "1.x", "@avocado/net": "^1.0.0", "@avocado/physics": "1.x", "@avocado/resource": "1.x",