refactor: react-redux and aliases

build/flecks.yml

@@ -1,12 +1,12 @@
-'@avocado/behavior': {}
-'@avocado/code': {}
-'@avocado/color': {}
-'@avocado/core': {}
-'@avocado/dialog': {}
-'@avocado/entity': {}
-'@avocado/filters': {}
-'@avocado/graphics': {}
-'@avocado/input':
+'@avocado/behavior:../avocado/packages/behavior': {}
+'@avocado/code:../avocado/packages/code': {}
+'@avocado/color:../avocado/packages/color': {}
+'@avocado/core:../avocado/packages/core': {}
+'@avocado/dialog:../avocado/packages/dialog': {}
+'@avocado/entity:../avocado/packages/entity': {}
+'@avocado/filters:../avocado/packages/filters': {}
+'@avocado/graphics:../avocado/packages/graphics': {}
+'@avocado/input:../avocado/packages/input':
   actions:
     - 'HotbarSlot0'
     - 'HotbarSlot1'
@@ -26,16 +26,16 @@
     - 'MoveRight'
     - 'UseItem'
     - 'Interact'
-'@avocado/math': {}
-'@avocado/physics': {}
-'@avocado/react': {}
-'@avocado/resource': {}
-'@avocado/s13n': {}
-'@avocado/sandbox': {}
-'@avocado/sound': {}
-'@avocado/timing': {}
-'@avocado/topdown': {}
-'@avocado/traits': {}
+'@avocado/math:../avocado/packages/math': {}
+'@avocado/physics:../avocado/packages/physics': {}
+'@avocado/react:../avocado/packages/react': {}
+'@avocado/resource:../avocado/packages/resource': {}
+'@avocado/s13n:../avocado/packages/s13n': {}
+'@avocado/sandbox:../avocado/packages/sandbox': {}
+'@avocado/sound:../avocado/packages/sound': {}
+'@avocado/timing:../avocado/packages/timing': {}
+'@avocado/topdown:../avocado/packages/topdown': {}
+'@avocado/traits:../avocado/packages/traits': {}
 '@flecks/build':
   packageManager: 'yarn'
 '@flecks/core':

package.json

@@ -23,27 +23,8 @@
     "up": "yarn add $(for i in $(ls node_modules/@flecks); do echo -n \"@flecks/$i \"; done) $(for i in $(ls node_modules/@avocado); do echo -n \"@avocado/$i \"; done)"
   },
   "dependencies": {
-    "@avocado/behavior": "^4.0.0",
-    "@avocado/color": "^4.0.0",
-    "@avocado/core": "^4.0.0",
-    "@avocado/dialog": "^4.0.0",
-    "@avocado/entity": "^4.0.0",
-    "@avocado/filters": "^4.0.0",
-    "@avocado/graphics": "^4.0.0",
-    "@avocado/input": "^4.0.0",
-    "@avocado/math": "^4.0.0",
-    "@avocado/physics": "^4.0.0",
-    "@avocado/react": "^4.0.0",
-    "@avocado/resource": "^4.0.0",
-    "@avocado/s13n": "^4.0.0",
-    "@avocado/sound": "^4.0.0",
-    "@avocado/timing": "^4.0.0",
-    "@avocado/topdown": "^4.0.0",
-    "@avocado/traits": "^4.0.0",
     "@flecks/core": "^3.0.0",
-    "@flecks/create-app": "^3.0.0",
     "@flecks/db": "^3.0.0",
-    "@flecks/dox": "^3.0.0",
     "@flecks/electron": "^3.0.0",
     "@flecks/governor": "^3.0.0",
     "@flecks/passport-local-react": "^3.0.0",
@@ -54,13 +35,6 @@
     "@flecks/server": "^3.0.0",
     "@flecks/socket": "^3.0.0",
     "@flecks/web": "^3.0.0",
-    "@humus/app": "^4.0.0",
-    "@humus/bootstrap": "^4.0.0",
-    "@humus/combat": "^4.0.0",
-    "@humus/core": "^4.0.0",
-    "@humus/farm": "^4.0.0",
-    "@humus/inventory": "^4.0.0",
-    "@humus/universe": "^4.0.0",
     "@inlet/react-pixi": "^6.0.7",
     "pg": "^8.7.3",
     "pg-hstore": "^2.3.4"

packages/app/build/flecks.bootstrap.js

@@ -1 +1 @@
-exports.dependencies = ['@flecks/react'];
+exports.dependencies = ['@flecks/react-redux'];

packages/app/package.json

@@ -29,6 +29,7 @@
     "@flecks/passport-local-react": "^3.0.0",
     "@flecks/passport-react": "^3.0.0",
     "@flecks/react": "^3.0.0",
+    "@flecks/react-redux": "^3.0.0",
     "@flecks/redux": "^3.0.0",
     "@flecks/socket": "^3.0.0",
     "@flecks/web": "^3.0.0",

packages/app/src/components/app/play/index.jsx

@@ -5,7 +5,7 @@ import {
   useState,
 } from '@flecks/react';
 import {push} from '@flecks/react/router';
-import {useDispatch} from '@flecks/redux';
+import {useDispatch} from '@flecks/react-redux';
 import {useSocket} from '@flecks/socket';
 import fscreen from 'fscreen';
 

packages/app/src/hooks/use-self-entity.js

@@ -3,7 +3,7 @@ import {
   useFlecks,
   useState,
 } from '@flecks/react';
-import {useSelector} from '@flecks/redux';
+import {useSelector} from '@flecks/react-redux';
 
 import {selfEntitySelector} from '../state';
 import useRoom from './use-room';

packages/core/src/server.js

@@ -34,6 +34,6 @@ export const hooks = {
       }
       next();
     },
-    {after: '@flecks/passport/server'},
+    {before: '@flecks/redux/server', after: '@flecks/passport/server'},
   ),
 };