refactor: byebye mixins package

packages/behavior/item/actions.js

@@ -1,5 +1,4 @@
-import {compose, TickingPromise} from '@avocado/core';
+import {compose, EventEmitter, TickingPromise} from '@avocado/core';
-import {EventEmitter} from '@avocado/mixins';
 
 import {Traversal} from './traversal';
 import {Traversals} from './traversals';

packages/core/index.js

@@ -67,3 +67,6 @@ export class TickingPromise extends Promise {
     this.ticker = null;
   }
 }
+
+export {EventEmitterMixin as EventEmitter} from './event-emitter';
+export {PropertyMixin as Property} from './property';

packages/entity/index.js

@@ -2,8 +2,7 @@ import * as I from 'immutable';
 import D from 'debug';
 import without from 'lodash.without';
 
-import {compose} from '@avocado/core';
+import {compose, EventEmitter} from '@avocado/core';
-import {EventEmitter} from '@avocado/mixins';
 import {Resource} from '@avocado/resource';
 import {Synchronized} from '@avocado/state';
 

packages/entity/list/index.js

@@ -1,9 +1,8 @@
 import * as I from 'immutable';
 import mapValues from 'lodash.mapvalues';
 
-import {arrayUnique, compose} from '@avocado/core';
+import {arrayUnique, compose, EventEmitter} from '@avocado/core';
 import {QuadTree, Rectangle, Vector} from '@avocado/math';
-import {EventEmitter} from '@avocado/mixins';
 import {Synchronized} from '@avocado/state';
 
 import {Entity} from '../index';

packages/entity/trait/index.js

@@ -1,8 +1,7 @@
 import * as I from 'immutable';
 
-import {compose} from '@avocado/core';
+import {compose, Property} from '@avocado/core';
 import {Vector} from '@avocado/math';
-import {Property} from '@avocado/mixins';
 import {Resource} from '@avocado/resource';
 import {Synchronized} from '@avocado/state';
 

packages/entity/traits/existent.trait.js

@@ -1,5 +1,5 @@
 import {compose, TickingPromise} from '@avocado/core';
-import {TransitionResult} from '@avocado/mixins';
+import {TransitionResult} from '@avocado/timing';
 
 import {StateProperty, Trait} from '../trait';
 

packages/entity/traits/positioned.trait.js

@@ -1,6 +1,5 @@
-import {compose} from '@avocado/core';
+import {compose, EventEmitter} from '@avocado/core';
 import {Vector} from '@avocado/math';
-import {EventEmitter} from '@avocado/mixins';
 
 import {Trait} from '../trait';
 

packages/graphics/color.js

@@ -1,5 +1,4 @@
-import {compose} from '@avocado/core';
+import {compose, Property} from '@avocado/core';
-import {Property} from '@avocado/mixins';
 
 const decorate = compose(
   Property('red'),

packages/graphics/renderable.js

@@ -1,5 +1,4 @@
-import {compose} from '@avocado/core';
+import {compose, EventEmitter} from '@avocado/core';
-import {EventEmitter} from '@avocado/mixins';
 
 const decorate = compose(
   EventEmitter,

packages/graphics/stage.js

@@ -1,6 +1,5 @@
-import {compose} from '@avocado/core';
+import {compose, Property} from '@avocado/core';
 import {Vector} from '@avocado/math';
-import {Property} from '@avocado/mixins';
 
 import {Container} from './container';
 import {Renderer} from './renderer';

packages/graphics/three/scene.js

@@ -2,8 +2,7 @@ const PIXI = 'undefined' !== typeof window ? require('pixi.js') : undefined;
 
 import * as THREE from 'three';
 
-import {compose} from '@avocado/core';
+import {compose, Property} from '@avocado/core';
-import {Property} from '@avocado/mixins';
 
 import {hasGraphics} from '../has-graphics';
 import {Image} from '../image';

packages/graphics/traits/emitter.trait.js

@@ -1,10 +1,9 @@
-import {compose} from '@avocado/core';
+import {compose, Property} from '@avocado/core';
 import {Trait} from '@avocado/entity';
-import {Property} from '@avocado/mixins';
 import {Ticker} from '@avocado/timing';
 
 const decorate = compose(
-)
+);
 
 export class Emitter extends decorate(Trait) {
 

packages/graphics/traits/staged.trait.js

@@ -1,6 +1,5 @@
-import {compose} from '@avocado/core';
+import {compose, Property} from '@avocado/core';
 import {Trait} from '@avocado/entity';
-import {Property} from '@avocado/mixins';
 
 const decorate = compose(
   Property('stage', {

packages/graphics/traits/visible.trait.js

@@ -1,9 +1,8 @@
 import * as I from 'immutable';
 
-import {compose} from '@avocado/core';
+import {compose, Property} from '@avocado/core';
 import {StateProperty, Trait} from '@avocado/entity';
 import {Rectangle, Vector} from '@avocado/math';
-import {Property} from '@avocado/mixins';
 
 import {Container} from '../container';
 import {hasGraphics} from '../has-graphics';

packages/input/action-registry.js

@@ -1,7 +1,6 @@
 import * as I from 'immutable';
 
-import {compose} from '@avocado/core';
+import {compose, EventEmitter} from '@avocado/core';
-import {EventEmitter} from '@avocado/mixins';
 
 const decorate = compose(
   EventEmitter,

packages/input/normalizer.js

@@ -1,5 +1,4 @@
-import {compose} from '@avocado/core';
+import {compose, EventEmitter} from '@avocado/core';
-import {EventEmitter} from '@avocado/mixins';
 
 const decorate = compose(
   EventEmitter,

packages/math/vector/mixin.js

@@ -1,5 +1,4 @@
-import {compose} from '@avocado/core';
+import {compose, Property} from '@avocado/core';
-import {Mixin, Property} from '@avocado/mixins'
 
 import * as Vector from './index'
 

packages/mixins/index.js

@@ -1,4 +0,0 @@
-export {EventEmitterMixin as EventEmitter} from './event-emitter';
-export {LfoMixin as Lfo} from './lfo';
-export {PropertyMixin as Property} from './property';
-export {TransitionMixin as Transition, TransitionResult} from './transition';

packages/mixins/package.json

@@ -1,10 +0,0 @@
-{
-  "name": "@avocado/mixins",
-  "version": "1.0.2",
-  "main": "index.js",
-  "author": "cha0s",
-  "license": "MIT",
-  "dependencies": {
-    "@avocado/core": "1.x"
-  }
-}

packages/net/client/socket-worker.js

@@ -1,8 +1,7 @@
 import D from 'debug';
 import io from 'socket.io-client';
 
-import {compose} from '@avocado/core';
+import {compose, EventEmitter} from '@avocado/core';
-import {EventEmitter} from '@avocado/mixins';
 
 import {allPackets, idFromPacket} from '../packet';
 

packages/net/client/socket.js

@@ -1,8 +1,7 @@
 import D from 'debug';
 import io from 'socket.io-client';
 
-import {compose} from '@avocado/core';
+import {compose, EventEmitter} from '@avocado/core';
-import {EventEmitter} from '@avocado/mixins';
 
 import {SocketIoParser, allPackets, idFromPacket} from '../packet';
 

packages/net/packet/socket.io-parser.js

@@ -1,5 +1,4 @@
-import {compose} from '@avocado/core';
+import {compose, EventEmitter} from '@avocado/core';
-import {EventEmitter} from '@avocado/mixins';
 
 import {packetFromId} from './registry';
 

packages/net/server/socket.js

@@ -1,7 +1,6 @@
 import SocketIoServer from 'socket.io';
 
-import {compose} from '@avocado/core';
+import {compose, EventEmitter} from '@avocado/core';
-import {EventEmitter} from '@avocado/mixins';
 
 import {SocketIoParser, allPackets, idFromPacket} from '../packet';
 

packages/physics/circle.js

@@ -1,5 +1,4 @@
-import {compose} from '@avocado/core';
+import {compose, Property} from '@avocado/core';
-import {Property} from '@avocado/mixins';
 
 import {Shape} from './shape';
 

packages/physics/dummy/body.js

@@ -1,8 +1,7 @@
 import * as I from 'immutable';
 
-import {compose, virtualize} from '@avocado/core';
+import {compose, EventEmitter, virtualize} from '@avocado/core';
 import {Rectangle, Vector} from '@avocado/math';
-import {EventEmitter} from '@avocado/mixins';
 
 import {AbstractBody} from '../abstract/body';
 

packages/physics/shape.js

@@ -1,6 +1,5 @@
-import {compose} from '@avocado/core';
+import {compose, EventEmitter, Property} from '@avocado/core';
 import {Vector} from '@avocado/math';
-import {EventEmitter, Property} from '@avocado/mixins';
 
 const decorate = compose(
   EventEmitter,

packages/resource/index.js

@@ -1,7 +1,6 @@
 import uuid from 'uuid/v4';
 
-import {compose} from '@avocado/core';
+import {compose, Property} from '@avocado/core';
-import {Property} from '@avocado/mixins';
 
 const decorate = compose(
   Property('instanceUuid'),

packages/state/synchronized.js

@@ -1,7 +1,6 @@
 import * as I from 'immutable';
 
-import {compose} from '@avocado/core';
+import {compose, Property} from '@avocado/core';
-import {Property} from '@avocado/mixins';
 
 import {nextStep} from './next-step';
 

packages/timing/animation.js

@@ -1,6 +1,5 @@
-import {compose} from '@avocado/core';
+import {compose, EventEmitter, Property} from '@avocado/core';
 import {Rectangle, Vector} from '@avocado/math';
-import {EventEmitter, Property} from '@avocado/mixins';
 import {Resource} from '@avocado/resource';
 
 import {TimedIndexMixin as TimedIndex} from './timed-index';

packages/timing/index.js

@@ -6,5 +6,7 @@ export {
   requestAnimationFrame,
   setAnimation,
 } from './animation-frame';
+export {LfoMixin as Lfo} from './lfo';
 export {Ticker} from './ticker';
 export {TimedIndexMixin as TimedIndex} from './timed-index';
+export {TransitionMixin as Transition, TransitionResult} from './transition';

packages/timing/lfo/modulated-property.js

@@ -1,7 +1,5 @@
-import {compose} from '@avocado/core';
+import {compose, EventEmitter, Property} from '@avocado/core';
 
-import {EventEmitterMixin as EventEmitter} from '../event-emitter';
-import {PropertyMixin as Property} from '../property';
 import {TransitionMixin as Transition} from '../transition';
 
 const Modulator = {

packages/timing/ticker.js

@@ -1,5 +1,4 @@
-import {compose} from '@avocado/core';
+import {compose, EventEmitter, Property} from '@avocado/core';
-import {EventEmitter, Property} from '@avocado/mixins';
 
 const decorate = compose(
   EventEmitter,

packages/timing/timed-index.js

@@ -1,5 +1,4 @@
-import {compose} from '@avocado/core';
+import {compose, EventEmitter, Property} from '@avocado/core';
-import {EventEmitter, Property} from '@avocado/mixins';
 
 import {Ticker} from './ticker';
 

packages/timing/transition/result.js

@@ -1,6 +1,4 @@
-import {compose} from '@avocado/core';
+import {compose, EventEmitter} from '@avocado/core';
-
-import {EventEmitterMixin as EventEmitter} from '../event-emitter';
 
 import easingFunctions from './easing';
 

packages/topdown/camera.js

@@ -1,6 +1,5 @@
-import {compose} from '@avocado/core';
+import {compose, EventEmitter, Property} from '@avocado/core';
 import {Rectangle, Vector} from '@avocado/math';
-import {EventEmitter, Property} from '@avocado/mixins';
 
 const decorate = compose(
   EventEmitter,

packages/topdown/layer.js

@@ -1,9 +1,8 @@
 import * as I from 'immutable';
 
-import {compose} from '@avocado/core';
+import {compose, EventEmitter, Property} from '@avocado/core';
 import {Entity, EntityList} from '@avocado/entity';
 import {Vector} from '@avocado/math';
-import {EventEmitter, Property} from '@avocado/mixins';
 import {ShapeList} from '@avocado/physics';
 import {Synchronized} from '@avocado/state';
 

packages/topdown/layers.js

@@ -1,7 +1,6 @@
 import * as I from 'immutable';
 
-import {arrayUnique, compose, flatten} from '@avocado/core';
+import {arrayUnique, compose, EventEmitter, flatten} from '@avocado/core';
-import {EventEmitter} from '@avocado/mixins';
 import {Synchronized} from '@avocado/state';
 
 import {Layer} from './layer';

packages/topdown/room.js

@@ -1,8 +1,7 @@
 import * as I from 'immutable';
 
-import {compose} from '@avocado/core';
+import {compose, EventEmitter, Property} from '@avocado/core';
 import {Vector} from '@avocado/math';
-import {EventEmitter, Property} from '@avocado/mixins';
 import {RectangleShape} from '@avocado/physics';
 import {Synchronized} from '@avocado/state';
 

packages/topdown/tiles.js

@@ -1,8 +1,7 @@
 import * as I from 'immutable';
 
-import {compose} from '@avocado/core';
+import {compose, EventEmitter} from '@avocado/core';
 import {Rectangle, Vector} from '@avocado/math';
-import {EventEmitter} from '@avocado/mixins';
 import {Synchronized} from '@avocado/state';
 
 const decorate = compose(