diff --git a/packages/behavior/package.json b/packages/behavior/package.json index eb11289..3ecd39d 100644 --- a/packages/behavior/package.json +++ b/packages/behavior/package.json @@ -26,9 +26,9 @@ "@avocado/resource": "^4.0.0", "@avocado/traits": "^4.0.0", "@babel/parser": "^7.13.13", - "@flecks/core": "^3.0.0", - "@flecks/react": "^3.0.0", - "@flecks/react-redux": "^3.0.0", + "@flecks/core": "^3.1.3", + "@flecks/react": "^3.1.3", + "@flecks/react-redux": "^3.1.3", "babeler": "^1.0.0", "lodash.get": "^4.4.2", "lodash.set": "^4.3.2", @@ -36,7 +36,7 @@ "natsort": "^2.0.2" }, "devDependencies": { - "@flecks/build": "^3.0.0", - "@flecks/fleck": "^3.0.0" + "@flecks/build": "^3.1.3", + "@flecks/fleck": "^3.1.3" } } diff --git a/packages/code/package.json b/packages/code/package.json index 3358e28..fbb1ccc 100644 --- a/packages/code/package.json +++ b/packages/code/package.json @@ -15,11 +15,11 @@ "@babel/generator": "7.17.x", "@babel/parser": "^7.17.7", "@babel/types": "^7.17.0", - "@flecks/core": "^3.0.0", + "@flecks/core": "^3.1.3", "babel-walk": "^3.0.0" }, "devDependencies": { - "@flecks/build": "^3.0.0", - "@flecks/fleck": "^3.0.0" + "@flecks/build": "^3.1.3", + "@flecks/fleck": "^3.1.3" } } diff --git a/packages/color/package.json b/packages/color/package.json index 0ce7dff..0e5162a 100644 --- a/packages/color/package.json +++ b/packages/color/package.json @@ -19,12 +19,12 @@ "index.js" ], "dependencies": { - "@flecks/core": "^3.0.0", + "@flecks/core": "^3.1.3", "lodash.get": "^4.4.2", "lodash.set": "^4.3.2" }, "devDependencies": { - "@flecks/build": "^3.0.0", - "@flecks/fleck": "^3.0.0" + "@flecks/build": "^3.1.3", + "@flecks/fleck": "^3.1.3" } } diff --git a/packages/core/package.json b/packages/core/package.json index 4046a90..ffbfd88 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,11 +19,11 @@ "index.js" ], "dependencies": { - "@flecks/core": "^3.0.0", + "@flecks/core": "^3.1.3", "chai": "4.2.0" }, "devDependencies": { - "@flecks/build": "^3.0.0", - "@flecks/fleck": "^3.0.0" + "@flecks/build": "^3.1.3", + "@flecks/fleck": "^3.1.3" } } diff --git a/packages/dialog/package.json b/packages/dialog/package.json index 91a87ad..2f4aebf 100644 --- a/packages/dialog/package.json +++ b/packages/dialog/package.json @@ -20,7 +20,7 @@ ], "dependencies": { "@avocado/entity": "^4.0.0", - "@flecks/core": "^3.0.0", + "@flecks/core": "^3.1.3", "lodash.get": "^4.4.2", "lodash.set": "^4.3.2", "remark-mdx": "2.0.0-next.8", @@ -29,7 +29,7 @@ "unist-util-visit-parents": "^3.1.1" }, "devDependencies": { - "@flecks/build": "^3.0.0", - "@flecks/fleck": "^3.0.0" + "@flecks/build": "^3.1.3", + "@flecks/fleck": "^3.1.3" } } diff --git a/packages/ecs/package.json b/packages/ecs/package.json index 748d482..702aae0 100644 --- a/packages/ecs/package.json +++ b/packages/ecs/package.json @@ -12,10 +12,10 @@ "index.js" ], "dependencies": { - "@flecks/core": "^3.0.0" + "@flecks/core": "^3.1.3" }, "devDependencies": { - "@flecks/build": "^3.0.0", - "@flecks/fleck": "^3.0.0" + "@flecks/build": "^3.1.3", + "@flecks/fleck": "^3.1.3" } } diff --git a/packages/entity/package.json b/packages/entity/package.json index 5bd0313..fc82c9a 100644 --- a/packages/entity/package.json +++ b/packages/entity/package.json @@ -30,9 +30,9 @@ "@avocado/s13n": "^4.0.0", "@avocado/timing": "^4.0.0", "@avocado/traits": "^4.0.0", - "@flecks/core": "^3.0.0", - "@flecks/react": "^3.0.0", - "@flecks/socket": "^3.0.0", + "@flecks/core": "^3.1.3", + "@flecks/react": "^3.1.3", + "@flecks/socket": "^3.1.3", "debug": "4.3.1", "deepmerge": "^4.2.2", "lodash.difference": "^4.5.0", @@ -40,7 +40,7 @@ "react-autosuggest": "^10.1.0" }, "devDependencies": { - "@flecks/build": "^3.0.0", - "@flecks/fleck": "^3.0.0" + "@flecks/build": "^3.1.3", + "@flecks/fleck": "^3.1.3" } } diff --git a/packages/entity/test/alive.js b/packages/entity/test/alive.js index 0ff0b8c..5b581fe 100644 --- a/packages/entity/test/alive.js +++ b/packages/entity/test/alive.js @@ -18,7 +18,6 @@ beforeEach(async () => { '@flecks/socket': require('@flecks/socket'), }, }); - await Promise.all(flecks.invokeFlat('@flecks/core.starting')); ({Entity} = flecks.avocado.resource.Resources); }); afterEach(() => { diff --git a/packages/entity/test/directional.js b/packages/entity/test/directional.js index 5bb3c41..3272035 100644 --- a/packages/entity/test/directional.js +++ b/packages/entity/test/directional.js @@ -17,7 +17,6 @@ beforeEach(async () => { '@flecks/socket': require('@flecks/socket'), }, }); - await Promise.all(flecks.invokeFlat('@flecks/core.starting')); ({Entity} = flecks.avocado.resource.Resources); }); afterEach(() => { diff --git a/packages/entity/test/entity.js b/packages/entity/test/entity.js index 5547351..6e9f0ce 100644 --- a/packages/entity/test/entity.js +++ b/packages/entity/test/entity.js @@ -16,7 +16,6 @@ beforeEach(async () => { '@flecks/react': require('@flecks/react'), }, }); - await Promise.all(flecks.invokeFlat('@flecks/core.starting')); ({Entity} = flecks.avocado.resource.Resources); }); afterEach(() => { diff --git a/packages/entity/test/json.js b/packages/entity/test/json.js index becb959..57577d4 100644 --- a/packages/entity/test/json.js +++ b/packages/entity/test/json.js @@ -16,7 +16,6 @@ beforeEach(async () => { '@flecks/react': require('@flecks/react'), }, }); - await Promise.all(flecks.invokeFlat('@flecks/core.starting')); ({Entity} = flecks.avocado.resource.Resources); }); afterEach(() => { diff --git a/packages/entity/test/mobile.js b/packages/entity/test/mobile.js index 9039726..e2dae12 100644 --- a/packages/entity/test/mobile.js +++ b/packages/entity/test/mobile.js @@ -16,7 +16,6 @@ beforeEach(async () => { '@flecks/socket': require('@flecks/socket'), }, }); - await Promise.all(flecks.invokeFlat('@flecks/core.starting')); ({Entity} = flecks.avocado.resource.Resources); }); afterEach(() => { diff --git a/packages/entity/test/perishable.js b/packages/entity/test/perishable.js index 7ca74c5..3e4fbc7 100644 --- a/packages/entity/test/perishable.js +++ b/packages/entity/test/perishable.js @@ -16,7 +16,6 @@ beforeEach(async () => { '@flecks/socket': require('@flecks/socket'), }, }); - await Promise.all(flecks.invokeFlat('@flecks/core.starting')); ({Entity} = flecks.avocado.resource.Resources); }); afterEach(() => { diff --git a/packages/entity/test/positioned.js b/packages/entity/test/positioned.js index 109f683..bfb3ab7 100644 --- a/packages/entity/test/positioned.js +++ b/packages/entity/test/positioned.js @@ -16,7 +16,6 @@ beforeEach(async () => { '@flecks/socket': require('@flecks/socket'), }, }); - await Promise.all(flecks.invokeFlat('@flecks/core.starting')); ({Entity} = flecks.avocado.resource.Resources); }); afterEach(() => { diff --git a/packages/entity/test/spawner.js b/packages/entity/test/spawner.js index 336a425..1d2fbb4 100644 --- a/packages/entity/test/spawner.js +++ b/packages/entity/test/spawner.js @@ -18,7 +18,6 @@ beforeEach(async () => { '@flecks/socket': require('@flecks/socket'), }, }); - await Promise.all(flecks.invokeFlat('@flecks/core.starting')); ({Entity, EntityList} = flecks.avocado.resource.Resources); }); afterEach(() => { diff --git a/packages/filters/package.json b/packages/filters/package.json index a796bff..ffcf3c3 100644 --- a/packages/filters/package.json +++ b/packages/filters/package.json @@ -12,13 +12,13 @@ "client.js" ], "dependencies": { - "@flecks/core": "^3.0.0", + "@flecks/core": "^3.1.3", "@pixi/core": "^5.3.9", "@pixi/filter-color-matrix": "^5.3.9", "webpack-glsl-loader": "^1.0.1" }, "devDependencies": { - "@flecks/build": "^3.0.0", - "@flecks/fleck": "^3.0.0" + "@flecks/build": "^3.1.3", + "@flecks/fleck": "^3.1.3" } } diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 8a3ff1b..322f98a 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -23,10 +23,10 @@ "@avocado/core": "^4.0.0", "@avocado/math": "^4.0.0", "@avocado/resource": "^4.0.0", - "@flecks/core": "^3.0.0", - "@flecks/react": "^3.0.0", - "@flecks/server": "^3.0.0", - "@flecks/web": "^3.0.0", + "@flecks/core": "^3.1.3", + "@flecks/react": "^3.1.3", + "@flecks/server": "^3.1.3", + "@flecks/web": "^3.1.3", "@pixi/constants": "^5.3.9", "@pixi/core": "^5.3.9", "@pixi/display": "^5.3.9", @@ -43,7 +43,7 @@ "lru-cache": "^6.0.0" }, "devDependencies": { - "@flecks/build": "^3.0.0", - "@flecks/fleck": "^3.0.0" + "@flecks/build": "^3.1.3", + "@flecks/fleck": "^3.1.3" } } diff --git a/packages/input/package.json b/packages/input/package.json index 5f5cbe2..32512a9 100644 --- a/packages/input/package.json +++ b/packages/input/package.json @@ -23,13 +23,13 @@ "@avocado/math": "^4.0.0", "@avocado/timing": "^4.0.0", "@avocado/traits": "^4.0.0", - "@flecks/core": "^3.0.0", - "@flecks/socket": "^3.0.0", + "@flecks/core": "^3.1.3", + "@flecks/socket": "^3.1.3", "debug": "4.3.1", "gamepads": "^1.2.2" }, "devDependencies": { - "@flecks/build": "^3.0.0", - "@flecks/fleck": "^3.0.0" + "@flecks/build": "^3.1.3", + "@flecks/fleck": "^3.1.3" } } diff --git a/packages/math/package.json b/packages/math/package.json index eedce8f..5c61a97 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -22,13 +22,13 @@ "dependencies": { "@avocado/code": "^4.0.0", "@avocado/react": "^4.0.0", - "@flecks/core": "^3.0.0", - "@flecks/react": "^3.0.0", + "@flecks/core": "^3.1.3", + "@flecks/react": "^3.1.3", "graham_scan": "^1.0.4", "seedrandom": "^3.0.5" }, "devDependencies": { - "@flecks/build": "^3.0.0", - "@flecks/fleck": "^3.0.0" + "@flecks/build": "^3.1.3", + "@flecks/fleck": "^3.1.3" } } diff --git a/packages/physics/package.json b/packages/physics/package.json index d78f791..d84cf81 100644 --- a/packages/physics/package.json +++ b/packages/physics/package.json @@ -28,9 +28,9 @@ "@avocado/resource": "^4.0.0", "@avocado/timing": "^4.0.0", "@avocado/traits": "^4.0.0", - "@flecks/core": "^3.0.0", - "@flecks/react": "^3.0.0", - "@flecks/socket": "^3.0.0", + "@flecks/core": "^3.1.3", + "@flecks/react": "^3.1.3", + "@flecks/socket": "^3.1.3", "deepmerge": "^4.2.2", "immutable": "^4.0.0-rc.12", "kefir": "^3.8.8", @@ -39,7 +39,7 @@ "proton-engine": "^5.2.7" }, "devDependencies": { - "@flecks/build": "^3.0.0", - "@flecks/fleck": "^3.0.0" + "@flecks/build": "^3.1.3", + "@flecks/fleck": "^3.1.3" } } diff --git a/packages/react/package.json b/packages/react/package.json index 60a2dbd..3158bb8 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -17,8 +17,8 @@ "index.js" ], "dependencies": { - "@flecks/core": "^3.0.0", - "@flecks/react": "^3.0.0", + "@flecks/core": "^3.1.3", + "@flecks/react": "^3.1.3", "ace-builds": "^1.4.12", "deepmerge": "^4.2.2", "react-ace": "^9.4.0", @@ -26,7 +26,7 @@ "react-modal": "^3.12.1" }, "devDependencies": { - "@flecks/build": "^3.0.0", - "@flecks/fleck": "^3.0.0" + "@flecks/build": "^3.1.3", + "@flecks/fleck": "^3.1.3" } } diff --git a/packages/resource/package.json b/packages/resource/package.json index 52255fb..b770d41 100644 --- a/packages/resource/package.json +++ b/packages/resource/package.json @@ -22,10 +22,10 @@ "dependencies": { "@avocado/core": "^4.0.0", "@avocado/react": "^4.0.0", - "@flecks/core": "^3.0.0", - "@flecks/react": "^3.0.0", - "@flecks/react-redux": "^3.0.0", - "@flecks/redux": "^3.0.0", + "@flecks/core": "^3.1.3", + "@flecks/react": "^3.1.3", + "@flecks/react-redux": "^3.1.3", + "@flecks/redux": "^3.1.3", "deepmerge": "^4.2.2", "fast-json-patch": "^3.0.0-1", "lru-cache": "^6.0.0", @@ -33,7 +33,7 @@ "styled-components": "^5.2.1" }, "devDependencies": { - "@flecks/build": "^3.0.0", - "@flecks/fleck": "^3.0.0" + "@flecks/build": "^3.1.3", + "@flecks/fleck": "^3.1.3" } } diff --git a/packages/resource/src/index.js b/packages/resource/src/index.js index bd41f07..ba50381 100644 --- a/packages/resource/src/index.js +++ b/packages/resource/src/index.js @@ -5,20 +5,17 @@ export * as JSONB from './jsonb'; export {default as JsonResource} from './json-resource'; export const hooks = { + '@flecks/core.gathered': () => ({ + resources: { + idProperty: 'resourceId', + typeProperty: 'resourceType', + }, + }), '@flecks/core.hmr': (path) => { if ('@avocado/resource' === path) { resourceCache.reset(); } }, - '@flecks/core.starting': (flecks) => { - flecks.avocado.resource.Resources = flecks.gather( - '@avocado/resource.resources', - { - idProperty: 'resourceId', - typeProperty: 'resourceType', - }, - ); - }, }; export const mixin = (Flecks) => class FlecksWithAvocadoResource extends Flecks { @@ -31,7 +28,11 @@ export const mixin = (Flecks) => class FlecksWithAvocadoResource extends Flecks if (!this.avocado.resource) { this.avocado.resource = {}; } - this.avocado.resource.Resources = {}; + Object.defineProperty( + this.avocado.resource, + 'Resources', + {get: () => this.gathered('@avocado/resource.resources')}, + ); } }; diff --git a/packages/s13n/package.json b/packages/s13n/package.json index 24785c8..f730fe7 100644 --- a/packages/s13n/package.json +++ b/packages/s13n/package.json @@ -19,12 +19,12 @@ "index.js" ], "dependencies": { - "@flecks/core": "^3.0.0", - "@flecks/socket": "^3.0.0", + "@flecks/core": "^3.1.3", + "@flecks/socket": "^3.1.3", "msgpack-lite": "^0.1.26" }, "devDependencies": { - "@flecks/build": "^3.0.0", - "@flecks/fleck": "^3.0.0" + "@flecks/build": "^3.1.3", + "@flecks/fleck": "^3.1.3" } } diff --git a/packages/sound/package.json b/packages/sound/package.json index 58e42cf..a799328 100644 --- a/packages/sound/package.json +++ b/packages/sound/package.json @@ -24,14 +24,14 @@ "@avocado/react": "^4.0.0", "@avocado/resource": "^4.0.0", "@avocado/traits": "^4.0.0", - "@flecks/core": "^3.0.0", - "@flecks/react": "^3.0.0", - "@flecks/socket": "^3.0.0", + "@flecks/core": "^3.1.3", + "@flecks/react": "^3.1.3", + "@flecks/socket": "^3.1.3", "debug": "4.3.1", "lru-cache": "^6.0.0" }, "devDependencies": { - "@flecks/build": "^3.0.0", - "@flecks/fleck": "^3.0.0" + "@flecks/build": "^3.1.3", + "@flecks/fleck": "^3.1.3" } } diff --git a/packages/state/package.json b/packages/state/package.json index 42d9783..e82e3e3 100644 --- a/packages/state/package.json +++ b/packages/state/package.json @@ -12,12 +12,12 @@ "index.js" ], "dependencies": { - "@flecks/core": "^3.0.0", + "@flecks/core": "^3.1.3", "@reduxjs/toolkit": "^1.8.1", "immutable": "^4.0.0" }, "devDependencies": { - "@flecks/build": "^3.0.0", - "@flecks/fleck": "^3.0.0" + "@flecks/build": "^3.1.3", + "@flecks/fleck": "^3.1.3" } } diff --git a/packages/timing/package.json b/packages/timing/package.json index 94f63a8..49fc8a1 100644 --- a/packages/timing/package.json +++ b/packages/timing/package.json @@ -27,13 +27,13 @@ "@avocado/react": "^4.0.0", "@avocado/resource": "^4.0.0", "@avocado/traits": "^4.0.0", - "@flecks/core": "^3.0.0", - "@flecks/react": "^3.0.0", - "@flecks/socket": "^3.0.0", + "@flecks/core": "^3.1.3", + "@flecks/react": "^3.1.3", + "@flecks/socket": "^3.1.3", "lodash.mapvalues": "^4.6.0" }, "devDependencies": { - "@flecks/build": "^3.0.0", - "@flecks/fleck": "^3.0.0" + "@flecks/build": "^3.1.3", + "@flecks/fleck": "^3.1.3" } } diff --git a/packages/topdown/package.json b/packages/topdown/package.json index e47e0a2..397f17f 100644 --- a/packages/topdown/package.json +++ b/packages/topdown/package.json @@ -29,16 +29,16 @@ "@avocado/s13n": "^4.0.0", "@avocado/timing": "^4.0.0", "@avocado/traits": "^4.0.0", - "@flecks/core": "^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", + "@flecks/core": "^3.1.3", + "@flecks/react": "^3.1.3", + "@flecks/react-redux": "^3.1.3", + "@flecks/redux": "^3.1.3", + "@flecks/socket": "^3.1.3", + "@flecks/web": "^3.1.3", "deepmerge": "^4.2.2" }, "devDependencies": { - "@flecks/build": "^3.0.0", - "@flecks/fleck": "^3.0.0" + "@flecks/build": "^3.1.3", + "@flecks/fleck": "^3.1.3" } } diff --git a/packages/traits/package.json b/packages/traits/package.json index dcb4a94..a06a5e6 100644 --- a/packages/traits/package.json +++ b/packages/traits/package.json @@ -22,10 +22,10 @@ "dependencies": { "@avocado/code": "^4.0.0", "@avocado/resource": "^4.0.0", - "@flecks/core": "^3.0.0" + "@flecks/core": "^3.1.3" }, "devDependencies": { - "@flecks/build": "^3.0.0", - "@flecks/fleck": "^3.0.0" + "@flecks/build": "^3.1.3", + "@flecks/fleck": "^3.1.3" } } diff --git a/packages/traits/src/index.js b/packages/traits/src/index.js index bb4ae9f..3f05464 100644 --- a/packages/traits/src/index.js +++ b/packages/traits/src/index.js @@ -2,9 +2,9 @@ export {default as Trait} from './trait'; export {default as StateProperty} from './state-property'; export const hooks = { - '@flecks/core.starting': (flecks) => { - flecks.avocado.traits.Traits = flecks.gather('@avocado/traits.traits'); - }, + '@flecks/core.gathered': () => ({ + traits: {}, + }), }; export const mixin = (Flecks) => class FlecksWithAvocadoTraits extends Flecks { @@ -17,7 +17,11 @@ export const mixin = (Flecks) => class FlecksWithAvocadoTraits extends Flecks { if (!this.avocado.traits) { this.avocado.traits = {}; } - this.avocado.traits.Traits = {}; + Object.defineProperty( + this.avocado.traits, + 'Traits', + {get: () => this.gathered('@avocado/traits.traits')}, + ); } };