diff --git a/latus.yml b/latus.yml index a94f571..a15ac7e 100644 --- a/latus.yml +++ b/latus.yml @@ -1,39 +1,39 @@ '@avocado/behavior': {} -'@avocado/behavior/persea': {} +'@avocado/behavior-persea': {} '@avocado/color': {} '@avocado/entity': {} -'@avocado/entity/persea': {} +'@avocado/entity-persea': {} '@avocado/graphics': {} -'@avocado/graphics/persea': {} +'@avocado/graphics-persea': {} '@avocado/input': {} '@avocado/math': {} -'@avocado/math/persea': {} +'@avocado/math-persea': {} '@avocado/persea': {} '@avocado/physics': {} -'@avocado/physics/persea': {} +'@avocado/physics-persea': {} '@avocado/react': {} -'@avocado/resource': { - 'persea.controllers': [ - '@avocado/behavior/persea', - '@avocado/graphics/persea', - '@avocado/entity/persea', - '@avocado/sound/persea', - '@avocado/timing/persea', +'@avocado/resource': {} +'@avocado/resource-persea': { + 'controllers': [ + '@avocado/behavior-persea', + '@avocado/graphics-persea', + '@avocado/entity-persea', + '@avocado/sound-persea', + '@avocado/timing-persea', ], } -'@avocado/resource/persea': {} '@avocado/s13n': {} '@avocado/sound': {} -'@avocado/sound/persea': {} +'@avocado/sound-persea': {} '@avocado/timing': {} -'@avocado/timing/persea': {} +'@avocado/timing-persea': {} '@avocado/topdown': {} '@avocado/traits': {} -'@avocado/traits/persea': {} +'@avocado/traits-persea': {} '@humus/combat': {} -'@humus/combat/persea': {} +'@humus/combat-persea': {} '@humus/core': {} -'@humus/core/persea': {} +'@humus/core-persea': {} '@latus/core': { id: 'persea', } diff --git a/package.json b/package.json index 4d40a2c..2e897d1 100644 --- a/package.json +++ b/package.json @@ -18,20 +18,29 @@ }, "dependencies": { "@avocado/behavior": "^2.0.0", + "@avocado/behavior-persea": "^1.0.0", "@avocado/color": "^1.0.0", "@avocado/core": "^2.0.0", "@avocado/entity": "^2.0.0", + "@avocado/entity-persea": "^1.0.0", "@avocado/graphics": "^2.0.0", + "@avocado/graphics-persea": "^1.0.0", "@avocado/input": "^2.0.0", "@avocado/math": "^2.0.0", + "@avocado/math-persea": "^1.0.0", "@avocado/persea": "^1.0.0", "@avocado/physics": "^1.0.0", + "@avocado/physics-persea": "^1.0.0", "@avocado/resource": "^2.0.0", + "@avocado/resource-persea": "^1.0.0", "@avocado/s13n": "^2.0.0", "@avocado/sound": "^1.0.0", + "@avocado/sound-persea": "^1.0.0", "@avocado/timing": "^2.0.0", + "@avocado/timing-persea": "^1.0.0", "@avocado/topdown": "^2.0.0", "@avocado/traits": "^2.0.0", + "@avocado/traits-persea": "^1.0.0", "@humus/combat": "^1.0.0", "@humus/core": "^1.0.0", "@latus/core": "^2.0.0", diff --git a/packages/core/package.json b/packages/core/package.json index 17a3da9..745da7c 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -25,6 +25,7 @@ "@avocado/persea": "^1.0.0", "@avocado/react": "^1.0.0", "@avocado/resource": "^2.0.0", + "@avocado/resource-persea": "^1.0.0", "@latus/core": "^2.0.0", "@latus/db": "^2.0.0", "@latus/react": "^2.0.0", diff --git a/packages/core/src/components/resource/route/index.jsx b/packages/core/src/components/resource/route/index.jsx index 322199e..0bc382e 100644 --- a/packages/core/src/components/resource/route/index.jsx +++ b/packages/core/src/components/resource/route/index.jsx @@ -1,7 +1,7 @@ import './index.scss'; import {UriContext} from '@avocado/persea'; -import {Resource} from '@avocado/resource/persea'; +import {Resource} from '@avocado/resource-persea'; import {PropTypes, React} from '@latus/react'; import { useDispatch, diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 1fee39d..0a28ab1 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1,4 +1,4 @@ -import {patchJsonResource} from '@avocado/resource/persea'; +import {patchJsonResource} from '@avocado/resource-persea'; import {projects, user} from './state'; diff --git a/packages/core/src/server/packets/decorators/action.js b/packages/core/src/server/packets/decorators/action.js index 778af65..c992781 100644 --- a/packages/core/src/server/packets/decorators/action.js +++ b/packages/core/src/server/packets/decorators/action.js @@ -1,4 +1,4 @@ -import {patchJsonResource} from '@avocado/resource/persea'; +import {patchJsonResource} from '@avocado/resource-persea'; export default (Action, latus) => class ProjectAction extends Action { diff --git a/packages/core/yarn.lock b/packages/core/yarn.lock index c5f7d2f..2beaade 100644 --- a/packages/core/yarn.lock +++ b/packages/core/yarn.lock @@ -114,6 +114,18 @@ "@latus/react" "^2.0.0" classnames "^2.2.6" +"@avocado/resource-persea@^1.0.0": + version "1.0.0" + resolved "https://verdaccio.hq.cha0s.io/@avocado%2fresource-persea/-/resource-persea-1.0.0.tgz#11f81e801188806863d6d10cf4ca7ec63dbe2805" + integrity sha512-vmGbvctgsf88vZm2hZp6HPBaERJCg+reyY/m1z5feEowugr83qfOh8p4b2ScvOAHf2NhmzZm8au6htRUEfOp9w== + dependencies: + "@avocado/persea" "^1.0.0" + "@avocado/resource" "^2.0.0" + "@latus/react" "^2.0.0" + "@latus/redux" "^2.0.0" + fast-json-patch "^3.0.0-1" + react-hex-editor "^0.3.0" + "@avocado/resource@2.0.0", "@avocado/resource@^2.0.0": version "2.0.0" resolved "https://verdaccio.hq.cha0s.io/@avocado%2fresource/-/resource-2.0.0.tgz#c7f5d67966bdd497d649159ef174e93ad1ba90e6" diff --git a/yarn.lock b/yarn.lock index 2b3f0be..671bf28 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,6 +2,15 @@ # yarn lockfile v1 +"@avocado/behavior-persea@^1.0.0": + version "1.0.0" + resolved "https://verdaccio.hq.cha0s.io/@avocado%2fbehavior-persea/-/behavior-persea-1.0.0.tgz#ffd473fa7e4fcc7d5edb50d018d9b0583e7a1214" + integrity sha512-KmsSS2WuR9iuyPHQZvXEhQdyzuhZUaQTLjKVT0g6TdZdt9OSLi9+UZfidwwC4A/hH0aHrPh4buCTlqSnO8WqlA== + dependencies: + "@avocado/persea" "^1.0.0" + "@avocado/resource" "^2.0.0" + "@latus/react" "^2.0.0" + "@avocado/behavior@2.0.0", "@avocado/behavior@^2.0.0": version "2.0.0" resolved "https://verdaccio.hq.cha0s.io/@avocado%2fbehavior/-/behavior-2.0.0.tgz#fef2733eb95ac520f35033f49554e863eeab6650" @@ -46,6 +55,19 @@ autoprefixer "^9.8.6" debug "4.3.1" +"@avocado/entity-persea@^1.0.0": + version "1.0.0" + resolved "https://verdaccio.hq.cha0s.io/@avocado%2fentity-persea/-/entity-persea-1.0.0.tgz#c007fba24a8fda4da0713bc629bf92b8b7f6ed4d" + integrity sha512-U/LOq2bwj22DQ0OG+o25QLGWTBq7kMgq98NbRWt6YZrQ2nWizX9zfJBnhSktT4QSr7Q7A6wLesHuBBYF9GMXTQ== + dependencies: + "@avocado/graphics" "^2.0.0" + "@avocado/math" "^2.0.0" + "@avocado/persea" "^1.0.0" + "@avocado/resource" "^2.0.0" + "@latus/react" "^2.0.0" + lodash.difference "^4.5.0" + react-autosuggest "^10.1.0" + "@avocado/entity@^2.0.0": version "2.0.0" resolved "https://verdaccio.hq.cha0s.io/@avocado%2fentity/-/entity-2.0.0.tgz#ecdf5ebd5a6d7570069ce4c69ec0e3a393e832e3" @@ -70,6 +92,14 @@ react-autosuggest "^10.1.0" react-tabs "^3.1.2" +"@avocado/graphics-persea@^1.0.0": + version "1.0.0" + resolved "https://verdaccio.hq.cha0s.io/@avocado%2fgraphics-persea/-/graphics-persea-1.0.0.tgz#bf4aba9bd7a2a9cc7403cac1c52c93ea3c251799" + integrity sha512-tSQzrJvxL//vfnwtkqee1KW/gf4hgW7LgQo+4f+D+3BxLI0VtpgbPfqnRKjAQgsHDnqJNvzfTc+ndDY6L2GnTA== + dependencies: + "@avocado/resource" "^2.0.0" + "@latus/react" "^2.0.0" + "@avocado/graphics@2.0.0", "@avocado/graphics@^2.0.0": version "2.0.0" resolved "https://verdaccio.hq.cha0s.io/@avocado%2fgraphics/-/graphics-2.0.0.tgz#21943d9beb9bfe9eece894fd1858b1eb7f0f0e5f" @@ -116,6 +146,14 @@ debug "4.3.1" gamepads "^1.2.2" +"@avocado/math-persea@^1.0.0": + version "1.0.0" + resolved "https://verdaccio.hq.cha0s.io/@avocado%2fmath-persea/-/math-persea-1.0.0.tgz#3b6ea004b6a91e0fa87d79b7e78a849be64977bf" + integrity sha512-2sPJ+XkZNBrBhzvsZgUpv00AUi7vMuBep1Uec0M580rxiT1pTo4/A7NKr+DATlfh8kGCPx9bqeynxUG4horncA== + dependencies: + "@avocado/persea" "^1.0.0" + "@latus/react" "^2.0.0" + "@avocado/math@2.0.0", "@avocado/math@^2.0.0": version "2.0.0" resolved "https://verdaccio.hq.cha0s.io/@avocado%2fmath/-/math-2.0.0.tgz#e12c769d2b7d7b1148f02de3571abc1f49079f5d" @@ -140,6 +178,18 @@ react-json-editor-ajrm "^2.5.13" react-modal "^3.12.1" +"@avocado/physics-persea@^1.0.0": + version "1.0.0" + resolved "https://verdaccio.hq.cha0s.io/@avocado%2fphysics-persea/-/physics-persea-1.0.0.tgz#09879960e7327ad015d3f7a5ceb2415b8fd079c2" + integrity sha512-Ja4P6x56CHMnDuAEoeIuScjJbe1uf/sAKBcM578ImVenNxofiAz71NNptn7mlmrqWosO1AxiBCjK9ARYu7WBxg== + dependencies: + "@avocado/entity" "^2.0.0" + "@avocado/graphics" "^2.0.0" + "@avocado/math" "^2.0.0" + "@avocado/persea" "^1.0.0" + "@avocado/resource" "^2.0.0" + "@latus/react" "^2.0.0" + "@avocado/physics@^1.0.0": version "1.0.0" resolved "https://verdaccio.hq.cha0s.io/@avocado%2fphysics/-/physics-1.0.0.tgz#7579779b8cbdd710820f85c0ceafff097e815f6b" @@ -177,6 +227,18 @@ "@latus/react" "^2.0.0" classnames "^2.2.6" +"@avocado/resource-persea@^1.0.0": + version "1.0.0" + resolved "https://verdaccio.hq.cha0s.io/@avocado%2fresource-persea/-/resource-persea-1.0.0.tgz#11f81e801188806863d6d10cf4ca7ec63dbe2805" + integrity sha512-vmGbvctgsf88vZm2hZp6HPBaERJCg+reyY/m1z5feEowugr83qfOh8p4b2ScvOAHf2NhmzZm8au6htRUEfOp9w== + dependencies: + "@avocado/persea" "^1.0.0" + "@avocado/resource" "^2.0.0" + "@latus/react" "^2.0.0" + "@latus/redux" "^2.0.0" + fast-json-patch "^3.0.0-1" + react-hex-editor "^0.3.0" + "@avocado/resource@2.0.0", "@avocado/resource@^2.0.0": version "2.0.0" resolved "https://verdaccio.hq.cha0s.io/@avocado%2fresource/-/resource-2.0.0.tgz#c7f5d67966bdd497d649159ef174e93ad1ba90e6" @@ -214,6 +276,15 @@ dependencies: "@babel/types" "^7.13.14" +"@avocado/sound-persea@^1.0.0": + version "1.0.0" + resolved "https://verdaccio.hq.cha0s.io/@avocado%2fsound-persea/-/sound-persea-1.0.0.tgz#5e587ccdf158918b75276c5c903456dd25737eff" + integrity sha512-21OAqh5OyMsfw8rZvXw2xto3qljrZ5EE9VzVLoRbQAI5gMYGeuizn7EA2XImnS0g4Co95xOfeaLJIC1hqzxmRg== + dependencies: + "@avocado/persea" "^1.0.0" + "@avocado/resource" "^2.0.0" + "@latus/react" "^2.0.0" + "@avocado/sound@^1.0.0": version "1.0.0" resolved "https://verdaccio.hq.cha0s.io/@avocado%2fsound/-/sound-1.0.0.tgz#b433398d42e939c5e140697fa02b9bd2630f6dcd" @@ -227,6 +298,13 @@ debug "4.3.1" lru-cache "^6.0.0" +"@avocado/timing-persea@^1.0.0": + version "1.0.0" + resolved "https://verdaccio.hq.cha0s.io/@avocado%2ftiming-persea/-/timing-persea-1.0.0.tgz#7fe07476ee1bc4c314c84303b9ceb5b603ac7cc0" + integrity sha512-b89jSDrcq0k1pobI+WdNdI39DLaMGBy1rNCX1OgFh3acDy4hpZL5HMIAzfufqng+8xYkrwJEAmiLtcGIGjXd/Q== + dependencies: + "@latus/react" "^2.0.0" + "@avocado/timing@2.0.0", "@avocado/timing@^2.0.0": version "2.0.0" resolved "https://verdaccio.hq.cha0s.io/@avocado%2ftiming/-/timing-2.0.0.tgz#d162ddd6461e34c4a792fae7e2c015f8d22a8e4a" @@ -262,6 +340,13 @@ "@latus/socket" "^2.0.0" debug "4.3.1" +"@avocado/traits-persea@^1.0.0": + version "1.0.0" + resolved "https://verdaccio.hq.cha0s.io/@avocado%2ftraits-persea/-/traits-persea-1.0.0.tgz#1ab0dad5c055e16045a273f7eadcac86460a35c0" + integrity sha512-6q2omgLmHEfOTkJtZHSrckvySH6biSUXtArY4BhW2N3cSVpS4YsFJdliqQqVrfvrH+U74I0nwKzNAGTKFnmX+A== + dependencies: + "@latus/react" "^2.0.0" + "@avocado/traits@^2.0.0": version "2.0.0" resolved "https://verdaccio.hq.cha0s.io/@avocado%2ftraits/-/traits-2.0.0.tgz#77e7dc8e0b0302576677246ea97273fa23921b30"