From f3993b82ee7dd282ae0f7f2fa4d5fdd600ae2f96 Mon Sep 17 00:00:00 2001 From: cha0s Date: Sat, 2 Apr 2022 07:28:21 -0500 Subject: [PATCH] refactor: integrate persea --- packages/behavior-persea/.gitignore | 116 ------------------ packages/behavior-persea/package.json | 40 ------ packages/behavior-persea/test/exists.js | 5 - .../build/flecks.yml | 0 packages/behavior/package.json | 11 +- .../persea}/controllers/script/component.jsx | 2 +- .../controllers/script/component.module.scss | 0 .../src/persea}/controllers/script/index.js | 2 +- .../src => behavior/src/persea}/index.js | 4 +- .../src/persea}/traits/behaved.jsx | 2 +- .../src/persea}/traits/behaved.scss | 0 packages/entity-persea/.gitignore | 116 ------------------ packages/entity-persea/package.json | 41 ------- packages/entity-persea/test/exists.js | 5 - packages/entity/build/flecks.yml | 5 - packages/entity/package.json | 10 +- .../persea}/controllers/entity/component.jsx | 0 .../persea}/controllers/entity/component.scss | 0 .../persea}/controllers/entity/from-buffer.js | 2 +- .../src/persea}/controllers/entity/index.js | 0 .../controllers/entity/stage/index.jsx | 0 .../controllers/entity/stage/index.scss | 0 .../persea}/controllers/entity/to-buffer.js | 2 +- .../controllers/entity/traits/index.jsx | 4 +- .../controllers/entity/traits/index.scss | 0 .../controllers/entity/traits/suggest.jsx | 0 .../persea}/controllers/entity/view/index.jsx | 0 .../controllers/entity/view/index.scss | 0 .../src => entity/src/persea}/index.js | 4 +- .../src/persea}/traits/alive.jsx | 2 +- .../src/persea}/traits/alive.scss | 0 .../src/persea}/traits/directional.jsx | 2 +- packages/graphics-persea/.gitignore | 116 ------------------ packages/graphics-persea/package.json | 36 ------ packages/graphics-persea/test/exists.js | 5 - packages/graphics/package.json | 5 + .../persea}/controllers/image/component.jsx | 2 +- .../persea}/controllers/image/component.scss | 0 .../src/persea}/controllers/image/index.js | 2 +- .../src => graphics/src/persea}/index.js | 2 +- packages/math/package.json | 2 + packages/physics-persea/.gitignore | 116 ------------------ packages/physics-persea/package.json | 41 ------- packages/physics-persea/test/exists.js | 5 - .../build/flecks.yml | 0 packages/physics/package.json | 8 ++ .../src => physics/src/persea}/index.js | 2 +- .../src/persea}/traits/collider.jsx | 2 +- .../src/persea}/traits/emitted.jsx | 2 +- .../src/persea}/traits/emitted.scss | 0 .../src/persea}/traits/emitter.jsx | 2 +- .../src/persea}/traits/emitter/particle.jsx | 4 +- .../src/persea}/traits/emitter/particle.scss | 0 packages/resource-persea/.gitignore | 116 ------------------ packages/resource-persea/package.json | 41 ------- packages/resource-persea/test/exists.js | 5 - .../build/flecks.yml | 0 packages/resource/package.json | 12 +- .../persea}/components/json-tabs/index.jsx | 2 +- .../persea}/components/json-tabs/index.scss | 0 .../src/persea}/components/resource/index.jsx | 2 +- .../components/resource/index.module.scss | 0 .../src/persea}/context/json-patcher.js | 0 .../persea}/controllers/binary/component.jsx | 2 +- .../persea}/controllers/binary/component.scss | 0 .../persea}/controllers/binary/from-buffer.js | 0 .../src/persea}/controllers/binary/index.js | 0 .../persea}/controllers/binary/to-buffer.js | 0 .../persea}/controllers/json/component.jsx | 4 +- .../persea}/controllers/json/component.scss | 0 .../persea}/controllers/json/from-buffer.js | 0 .../src/persea}/controllers/json/index.js | 0 .../src/persea}/controllers/json/to-buffer.js | 0 .../persea}/controllers/text/component.jsx | 0 .../persea}/controllers/text/component.scss | 0 .../persea}/controllers/text/from-buffer.js | 0 .../src/persea}/controllers/text/index.js | 0 .../src/persea}/controllers/text/to-buffer.js | 0 .../src/persea}/hooks/use-full-json.js | 0 .../src/persea}/hooks/use-json-patcher.js | 0 .../persea}/hooks/use-resource-controller.js | 2 +- .../src => resource/src/persea}/index.js | 4 +- .../src => resource/src/persea}/prop-types.js | 0 .../src/persea}/state/index.js | 0 .../src => resource/src/persea}/state/json.js | 0 .../src/persea}/state/reducer.js | 0 .../src/persea}/state/replace.js | 0 packages/sound-persea/.gitignore | 116 ------------------ packages/sound-persea/package.json | 38 ------ packages/sound-persea/test/exists.js | 5 - .../build/flecks.yml | 0 packages/sound/package.json | 6 + .../persea}/controllers/audio/component.jsx | 2 +- .../controllers/audio/component.module.scss | 0 .../src/persea}/controllers/audio/index.js | 2 +- .../persea}/controllers/sound/component.jsx | 2 +- .../persea}/controllers/sound/component.scss | 0 .../src/persea}/controllers/sound/index.js | 2 +- .../src/persea}/controllers/sound/src.jsx | 0 .../src => sound/src/persea}/index.js | 4 +- .../src/persea}/traits/audible.jsx | 2 +- .../src/persea}/traits/audible.scss | 0 packages/timing-persea/.gitignore | 116 ------------------ packages/timing-persea/build/flecks.yml | 3 - packages/timing-persea/package.json | 40 ------ packages/timing-persea/test/exists.js | 5 - .../build/flecks.yml | 0 packages/timing/package.json | 6 + .../components/animation-visualization.jsx | 0 .../components/animation-visualization.scss | 0 .../controllers/animation/component.jsx | 4 +- .../controllers/animation/component.scss | 0 .../persea}/controllers/animation/index.js | 2 +- .../src => timing/src/persea}/index.js | 4 +- .../src/persea}/traits/animated.jsx | 2 +- .../src/persea}/traits/animated.scss | 0 .../src/persea}/traits/animated/animation.jsx | 4 +- packages/topdown-persea/.gitignore | 116 ------------------ packages/topdown-persea/build/flecks.yml | 3 - packages/topdown-persea/package.json | 41 ------- packages/topdown-persea/test/exists.js | 5 - packages/topdown/package.json | 5 + .../persea}/controllers/room/component.jsx | 2 +- .../controllers/room/component.module.scss | 0 .../persea}/controllers/room/icon.module.scss | 0 .../src/persea}/controllers/room/img/move.png | Bin .../persea}/controllers/room/img/paint.png | Bin .../persea}/controllers/room/img/select.png | Bin .../src/persea}/controllers/room/index.js | 2 +- .../src/persea}/controllers/room/map.png | Bin .../src => topdown/src/persea}/index.js | 8 +- .../room-sides/entities-side/group.png | Bin .../persea}/room-sides/entities-side/icon.jsx | 0 .../room-sides/entities-side/icon.module.scss | 0 .../persea}/room-sides/entities-side/index.js | 0 .../persea}/room-sides/entities-side/page.jsx | 4 +- .../room-sides/entities-side/page.module.scss | 0 .../persea}/room-sides/tiles-side/icon.jsx | 0 .../room-sides/tiles-side/icon.module.scss | 0 .../persea}/room-sides/tiles-side/index.js | 0 .../persea}/room-sides/tiles-side/page.jsx | 0 .../persea}/room-sides/tiles-side/tileset.png | Bin packages/traits-persea/.gitignore | 116 ------------------ packages/traits-persea/build/flecks.yml | 3 - packages/traits-persea/package.json | 32 ----- packages/traits-persea/test/exists.js | 5 - .../{sound-persea => traits}/build/flecks.yml | 0 packages/traits/package.json | 2 + .../src => traits/src/persea}/index.js | 4 +- 149 files changed, 119 insertions(+), 1511 deletions(-) delete mode 100644 packages/behavior-persea/.gitignore delete mode 100644 packages/behavior-persea/package.json delete mode 100644 packages/behavior-persea/test/exists.js rename packages/{behavior-persea => behavior}/build/flecks.yml (100%) rename packages/{behavior-persea/src => behavior/src/persea}/controllers/script/component.jsx (92%) rename packages/{behavior-persea/src => behavior/src/persea}/controllers/script/component.module.scss (100%) rename packages/{behavior-persea/src => behavior/src/persea}/controllers/script/index.js (74%) rename packages/{behavior-persea/src => behavior/src/persea}/index.js (72%) rename packages/{behavior-persea/src => behavior/src/persea}/traits/behaved.jsx (96%) rename packages/{behavior-persea/src => behavior/src/persea}/traits/behaved.scss (100%) delete mode 100644 packages/entity-persea/.gitignore delete mode 100644 packages/entity-persea/package.json delete mode 100644 packages/entity-persea/test/exists.js rename packages/{entity-persea/src => entity/src/persea}/controllers/entity/component.jsx (100%) rename packages/{entity-persea/src => entity/src/persea}/controllers/entity/component.scss (100%) rename packages/{entity-persea/src => entity/src/persea}/controllers/entity/from-buffer.js (85%) rename packages/{entity-persea/src => entity/src/persea}/controllers/entity/index.js (100%) rename packages/{entity-persea/src => entity/src/persea}/controllers/entity/stage/index.jsx (100%) rename packages/{entity-persea/src => entity/src/persea}/controllers/entity/stage/index.scss (100%) rename packages/{entity-persea/src => entity/src/persea}/controllers/entity/to-buffer.js (85%) rename packages/{entity-persea/src => entity/src/persea}/controllers/entity/traits/index.jsx (96%) rename packages/{entity-persea/src => entity/src/persea}/controllers/entity/traits/index.scss (100%) rename packages/{entity-persea/src => entity/src/persea}/controllers/entity/traits/suggest.jsx (100%) rename packages/{entity-persea/src => entity/src/persea}/controllers/entity/view/index.jsx (100%) rename packages/{entity-persea/src => entity/src/persea}/controllers/entity/view/index.scss (100%) rename packages/{entity-persea/src => entity/src/persea}/index.js (72%) rename packages/{entity-persea/src => entity/src/persea}/traits/alive.jsx (96%) rename packages/{entity-persea/src => entity/src/persea}/traits/alive.scss (100%) rename packages/{entity-persea/src => entity/src/persea}/traits/directional.jsx (97%) delete mode 100644 packages/graphics-persea/.gitignore delete mode 100644 packages/graphics-persea/package.json delete mode 100644 packages/graphics-persea/test/exists.js rename packages/{graphics-persea/src => graphics/src/persea}/controllers/image/component.jsx (90%) rename packages/{graphics-persea/src => graphics/src/persea}/controllers/image/component.scss (100%) rename packages/{graphics-persea/src => graphics/src/persea}/controllers/image/index.js (69%) rename packages/{graphics-persea/src => graphics/src/persea}/index.js (78%) delete mode 100644 packages/physics-persea/.gitignore delete mode 100644 packages/physics-persea/package.json delete mode 100644 packages/physics-persea/test/exists.js rename packages/{entity-persea => physics}/build/flecks.yml (100%) rename packages/{physics-persea/src => physics/src/persea}/index.js (74%) rename packages/{physics-persea/src => physics/src/persea}/traits/collider.jsx (98%) rename packages/{physics-persea/src => physics/src/persea}/traits/emitted.jsx (99%) rename packages/{physics-persea/src => physics/src/persea}/traits/emitted.scss (100%) rename packages/{physics-persea/src => physics/src/persea}/traits/emitter.jsx (95%) rename packages/{physics-persea/src => physics/src/persea}/traits/emitter/particle.jsx (95%) rename packages/{physics-persea/src => physics/src/persea}/traits/emitter/particle.scss (100%) delete mode 100644 packages/resource-persea/.gitignore delete mode 100644 packages/resource-persea/package.json delete mode 100644 packages/resource-persea/test/exists.js rename packages/{graphics-persea => resource}/build/flecks.yml (100%) rename packages/{resource-persea/src => resource/src/persea}/components/json-tabs/index.jsx (98%) rename packages/{resource-persea/src => resource/src/persea}/components/json-tabs/index.scss (100%) rename packages/{resource-persea/src => resource/src/persea}/components/resource/index.jsx (96%) rename packages/{resource-persea/src => resource/src/persea}/components/resource/index.module.scss (100%) rename packages/{resource-persea/src => resource/src/persea}/context/json-patcher.js (100%) rename packages/{resource-persea/src => resource/src/persea}/controllers/binary/component.jsx (96%) rename packages/{resource-persea/src => resource/src/persea}/controllers/binary/component.scss (100%) rename packages/{resource-persea/src => resource/src/persea}/controllers/binary/from-buffer.js (100%) rename packages/{resource-persea/src => resource/src/persea}/controllers/binary/index.js (100%) rename packages/{resource-persea/src => resource/src/persea}/controllers/binary/to-buffer.js (100%) rename packages/{resource-persea/src => resource/src/persea}/controllers/json/component.jsx (90%) rename packages/{resource-persea/src => resource/src/persea}/controllers/json/component.scss (100%) rename packages/{resource-persea/src => resource/src/persea}/controllers/json/from-buffer.js (100%) rename packages/{resource-persea/src => resource/src/persea}/controllers/json/index.js (100%) rename packages/{resource-persea/src => resource/src/persea}/controllers/json/to-buffer.js (100%) rename packages/{resource-persea/src => resource/src/persea}/controllers/text/component.jsx (100%) rename packages/{resource-persea/src => resource/src/persea}/controllers/text/component.scss (100%) rename packages/{resource-persea/src => resource/src/persea}/controllers/text/from-buffer.js (100%) rename packages/{resource-persea/src => resource/src/persea}/controllers/text/index.js (100%) rename packages/{resource-persea/src => resource/src/persea}/controllers/text/to-buffer.js (100%) rename packages/{resource-persea/src => resource/src/persea}/hooks/use-full-json.js (100%) rename packages/{resource-persea/src => resource/src/persea}/hooks/use-json-patcher.js (100%) rename packages/{resource-persea/src => resource/src/persea}/hooks/use-resource-controller.js (72%) rename packages/{resource-persea/src => resource/src/persea}/index.js (88%) rename packages/{resource-persea/src => resource/src/persea}/prop-types.js (100%) rename packages/{resource-persea/src => resource/src/persea}/state/index.js (100%) rename packages/{resource-persea/src => resource/src/persea}/state/json.js (100%) rename packages/{resource-persea/src => resource/src/persea}/state/reducer.js (100%) rename packages/{resource-persea/src => resource/src/persea}/state/replace.js (100%) delete mode 100644 packages/sound-persea/.gitignore delete mode 100644 packages/sound-persea/package.json delete mode 100644 packages/sound-persea/test/exists.js rename packages/{physics-persea => sound}/build/flecks.yml (100%) rename packages/{sound-persea/src => sound/src/persea}/controllers/audio/component.jsx (91%) rename packages/{sound-persea/src => sound/src/persea}/controllers/audio/component.module.scss (100%) rename packages/{sound-persea/src => sound/src/persea}/controllers/audio/index.js (68%) rename packages/{sound-persea/src => sound/src/persea}/controllers/sound/component.jsx (97%) rename packages/{sound-persea/src => sound/src/persea}/controllers/sound/component.scss (100%) rename packages/{sound-persea/src => sound/src/persea}/controllers/sound/index.js (68%) rename packages/{sound-persea/src => sound/src/persea}/controllers/sound/src.jsx (100%) rename packages/{sound-persea/src => sound/src/persea}/index.js (77%) rename packages/{sound-persea/src => sound/src/persea}/traits/audible.jsx (97%) rename packages/{sound-persea/src => sound/src/persea}/traits/audible.scss (100%) delete mode 100644 packages/timing-persea/.gitignore delete mode 100644 packages/timing-persea/build/flecks.yml delete mode 100644 packages/timing-persea/package.json delete mode 100644 packages/timing-persea/test/exists.js rename packages/{resource-persea => timing}/build/flecks.yml (100%) rename packages/{timing-persea/src => timing/src/persea}/components/animation-visualization.jsx (100%) rename packages/{timing-persea/src => timing/src/persea}/components/animation-visualization.scss (100%) rename packages/{timing-persea/src => timing/src/persea}/controllers/animation/component.jsx (97%) rename packages/{timing-persea/src => timing/src/persea}/controllers/animation/component.scss (100%) rename packages/{timing-persea/src => timing/src/persea}/controllers/animation/index.js (68%) rename packages/{timing-persea/src => timing/src/persea}/index.js (73%) rename packages/{timing-persea/src => timing/src/persea}/traits/animated.jsx (97%) rename packages/{timing-persea/src => timing/src/persea}/traits/animated.scss (100%) rename packages/{timing-persea/src => timing/src/persea}/traits/animated/animation.jsx (95%) delete mode 100644 packages/topdown-persea/.gitignore delete mode 100644 packages/topdown-persea/build/flecks.yml delete mode 100644 packages/topdown-persea/package.json delete mode 100644 packages/topdown-persea/test/exists.js rename packages/{topdown-persea/src => topdown/src/persea}/controllers/room/component.jsx (98%) rename packages/{topdown-persea/src => topdown/src/persea}/controllers/room/component.module.scss (100%) rename packages/{topdown-persea/src => topdown/src/persea}/controllers/room/icon.module.scss (100%) rename packages/{topdown-persea/src => topdown/src/persea}/controllers/room/img/move.png (100%) rename packages/{topdown-persea/src => topdown/src/persea}/controllers/room/img/paint.png (100%) rename packages/{topdown-persea/src => topdown/src/persea}/controllers/room/img/select.png (100%) rename packages/{topdown-persea/src => topdown/src/persea}/controllers/room/index.js (76%) rename packages/{topdown-persea/src => topdown/src/persea}/controllers/room/map.png (100%) rename packages/{topdown-persea/src => topdown/src/persea}/index.js (66%) rename packages/{topdown-persea/src => topdown/src/persea}/room-sides/entities-side/group.png (100%) rename packages/{topdown-persea/src => topdown/src/persea}/room-sides/entities-side/icon.jsx (100%) rename packages/{topdown-persea/src => topdown/src/persea}/room-sides/entities-side/icon.module.scss (100%) rename packages/{topdown-persea/src => topdown/src/persea}/room-sides/entities-side/index.js (100%) rename packages/{topdown-persea/src => topdown/src/persea}/room-sides/entities-side/page.jsx (97%) rename packages/{topdown-persea/src => topdown/src/persea}/room-sides/entities-side/page.module.scss (100%) rename packages/{topdown-persea/src => topdown/src/persea}/room-sides/tiles-side/icon.jsx (100%) rename packages/{topdown-persea/src => topdown/src/persea}/room-sides/tiles-side/icon.module.scss (100%) rename packages/{topdown-persea/src => topdown/src/persea}/room-sides/tiles-side/index.js (100%) rename packages/{topdown-persea/src => topdown/src/persea}/room-sides/tiles-side/page.jsx (100%) rename packages/{topdown-persea/src => topdown/src/persea}/room-sides/tiles-side/tileset.png (100%) delete mode 100644 packages/traits-persea/.gitignore delete mode 100644 packages/traits-persea/build/flecks.yml delete mode 100644 packages/traits-persea/package.json delete mode 100644 packages/traits-persea/test/exists.js rename packages/{sound-persea => traits}/build/flecks.yml (100%) rename packages/{traits-persea/src => traits/src/persea}/index.js (59%) diff --git a/packages/behavior-persea/.gitignore b/packages/behavior-persea/.gitignore deleted file mode 100644 index 1f22b9c..0000000 --- a/packages/behavior-persea/.gitignore +++ /dev/null @@ -1,116 +0,0 @@ -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -lerna-debug.log* - -# Diagnostic reports (https://nodejs.org/api/report.html) -report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage -*.lcov - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# Snowpack dependency directory (https://snowpack.dev/) -web_modules/ - -# TypeScript cache -*.tsbuildinfo - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Microbundle cache -.rpt2_cache/ -.rts2_cache_cjs/ -.rts2_cache_es/ -.rts2_cache_umd/ - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env -.env.test - -# parcel-bundler cache (https://parceljs.org/) -.cache -.parcel-cache - -# Next.js build output -.next -out - -# Nuxt.js build / generate output -.nuxt -dist - -# Gatsby files -.cache/ -# Comment in the public line in if your project uses Gatsby and not Next.js -# https://nextjs.org/blog/next-9-1#public-directory-support -# public - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless/ - -# FuseBox cache -.fusebox/ - -# DynamoDB Local files -.dynamodb/ - -# TernJS port file -.tern-port - -# Stores VSCode versions used for testing VSCode extensions -.vscode-test - -# yarn v2 -.yarn/cache -.yarn/unplugged -.yarn/build-state.yml -.yarn/install-state.gz -.pnp.* diff --git a/packages/behavior-persea/package.json b/packages/behavior-persea/package.json deleted file mode 100644 index 525019d..0000000 --- a/packages/behavior-persea/package.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "@avocado/behavior-persea", - "version": "3.0.0", - "repository": { - "type": "git", - "url": "https://git.hq.cha0s.io/cha0s/avocado.git", - "directory": "packages/behavior-persea" - }, - "main": "index.js", - "scripts": { - "build": "flecks build", - "clean": "flecks clean", - "lint": "flecks lint", - "postversion": "cp package.json dist", - "test": "flecks test" - }, - "files": [ - "build", - "index.css", - "index.css.map", - "index.js", - "index.js.map", - "src", - "test", - "test.js", - "test.js.map" - ], - "dependencies": { - "@avocado/math": "^3.0.0", - "@avocado/react": "^3.0.0", - "@avocado/resource-persea": "^3.0.0", - "@flecks/core": "^1.4.1", - "@flecks/react": "^1.4.1", - "@flecks/redux": "^1.4.1", - "natsort": "^2.0.2" - }, - "devDependencies": { - "@flecks/fleck": "^1.4.1" - } -} diff --git a/packages/behavior-persea/test/exists.js b/packages/behavior-persea/test/exists.js deleted file mode 100644 index 1ce8043..0000000 --- a/packages/behavior-persea/test/exists.js +++ /dev/null @@ -1,5 +0,0 @@ -import {expect} from 'chai'; - -it('exists', () => { - expect(true).to.be.true; -}); diff --git a/packages/behavior-persea/build/flecks.yml b/packages/behavior/build/flecks.yml similarity index 100% rename from packages/behavior-persea/build/flecks.yml rename to packages/behavior/build/flecks.yml diff --git a/packages/behavior/package.json b/packages/behavior/package.json index 67beded..4a0ddb6 100644 --- a/packages/behavior/package.json +++ b/packages/behavior/package.json @@ -20,6 +20,10 @@ "build", "index.js", "index.js.map", + "persea.css", + "persea.css.map", + "persea.js", + "persea.js.map", "src", "test", "test.js", @@ -27,14 +31,19 @@ ], "dependencies": { "@avocado/core": "^3.0.0", + "@avocado/math": "^3.0.0", + "@avocado/react": "^3.0.0", "@avocado/resource": "^3.0.0", "@avocado/traits": "^3.0.0", "@babel/parser": "^7.13.13", "@flecks/core": "^1.4.1", + "@flecks/react": "^1.4.1", + "@flecks/redux": "^1.4.1", "babeler": "^1.0.0", "lodash.get": "^4.4.2", "lodash.set": "^4.3.2", - "lru-cache": "^6.0.0" + "lru-cache": "^6.0.0", + "natsort": "^2.0.2" }, "devDependencies": { "@flecks/fleck": "^1.4.1" diff --git a/packages/behavior-persea/src/controllers/script/component.jsx b/packages/behavior/src/persea/controllers/script/component.jsx similarity index 92% rename from packages/behavior-persea/src/controllers/script/component.jsx rename to packages/behavior/src/persea/controllers/script/component.jsx index 8e50d5e..470aeb3 100644 --- a/packages/behavior-persea/src/controllers/script/component.jsx +++ b/packages/behavior/src/persea/controllers/script/component.jsx @@ -1,5 +1,5 @@ import {Code} from '@avocado/react'; -import {Context, replaceResource} from '@avocado/resource-persea'; +import {Context, replaceResource} from '@avocado/resource/persea'; import { PropTypes, React, diff --git a/packages/behavior-persea/src/controllers/script/component.module.scss b/packages/behavior/src/persea/controllers/script/component.module.scss similarity index 100% rename from packages/behavior-persea/src/controllers/script/component.module.scss rename to packages/behavior/src/persea/controllers/script/component.module.scss diff --git a/packages/behavior-persea/src/controllers/script/index.js b/packages/behavior/src/persea/controllers/script/index.js similarity index 74% rename from packages/behavior-persea/src/controllers/script/index.js rename to packages/behavior/src/persea/controllers/script/index.js index 3c9e3a5..f547a44 100644 --- a/packages/behavior-persea/src/controllers/script/index.js +++ b/packages/behavior/src/persea/controllers/script/index.js @@ -1,4 +1,4 @@ -import {TextController} from '@avocado/resource-persea'; +import {TextController} from '@avocado/resource/persea'; import Component from './component'; diff --git a/packages/behavior-persea/src/index.js b/packages/behavior/src/persea/index.js similarity index 72% rename from packages/behavior-persea/src/index.js rename to packages/behavior/src/persea/index.js index e44fe84..94682a2 100644 --- a/packages/behavior-persea/src/index.js +++ b/packages/behavior/src/persea/index.js @@ -8,10 +8,10 @@ export { export default { [Hooks]: { - '@avocado/resource-persea.controllers': () => [ + '@avocado/resource/persea.controllers': () => [ ScriptController, ], - '@avocado/traits-persea.components': Flecks.provide( + '@avocado/traits/persea.components': Flecks.provide( require.context('./traits', false, /\.jsx$/), {invoke: false}, ), diff --git a/packages/behavior-persea/src/traits/behaved.jsx b/packages/behavior/src/persea/traits/behaved.jsx similarity index 96% rename from packages/behavior-persea/src/traits/behaved.jsx rename to packages/behavior/src/persea/traits/behaved.jsx index 30554fe..3664874 100644 --- a/packages/behavior-persea/src/traits/behaved.jsx +++ b/packages/behavior/src/persea/traits/behaved.jsx @@ -2,7 +2,7 @@ import './behaved.scss'; import {join} from 'path'; -import {JsonTabs, useJsonPatcher} from '@avocado/resource-persea'; +import {JsonTabs, useJsonPatcher} from '@avocado/resource/persea'; import { hot, PropTypes, diff --git a/packages/behavior-persea/src/traits/behaved.scss b/packages/behavior/src/persea/traits/behaved.scss similarity index 100% rename from packages/behavior-persea/src/traits/behaved.scss rename to packages/behavior/src/persea/traits/behaved.scss diff --git a/packages/entity-persea/.gitignore b/packages/entity-persea/.gitignore deleted file mode 100644 index 1f22b9c..0000000 --- a/packages/entity-persea/.gitignore +++ /dev/null @@ -1,116 +0,0 @@ -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -lerna-debug.log* - -# Diagnostic reports (https://nodejs.org/api/report.html) -report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage -*.lcov - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# Snowpack dependency directory (https://snowpack.dev/) -web_modules/ - -# TypeScript cache -*.tsbuildinfo - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Microbundle cache -.rpt2_cache/ -.rts2_cache_cjs/ -.rts2_cache_es/ -.rts2_cache_umd/ - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env -.env.test - -# parcel-bundler cache (https://parceljs.org/) -.cache -.parcel-cache - -# Next.js build output -.next -out - -# Nuxt.js build / generate output -.nuxt -dist - -# Gatsby files -.cache/ -# Comment in the public line in if your project uses Gatsby and not Next.js -# https://nextjs.org/blog/next-9-1#public-directory-support -# public - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless/ - -# FuseBox cache -.fusebox/ - -# DynamoDB Local files -.dynamodb/ - -# TernJS port file -.tern-port - -# Stores VSCode versions used for testing VSCode extensions -.vscode-test - -# yarn v2 -.yarn/cache -.yarn/unplugged -.yarn/build-state.yml -.yarn/install-state.gz -.pnp.* diff --git a/packages/entity-persea/package.json b/packages/entity-persea/package.json deleted file mode 100644 index eda97ab..0000000 --- a/packages/entity-persea/package.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "name": "@avocado/entity-persea", - "version": "3.0.0", - "repository": { - "type": "git", - "url": "https://git.hq.cha0s.io/cha0s/avocado.git", - "directory": "packages/entity-persea" - }, - "main": "index.js", - "scripts": { - "build": "flecks build", - "clean": "flecks clean", - "lint": "flecks lint", - "postversion": "cp package.json dist", - "test": "flecks test" - }, - "files": [ - "build", - "index.css", - "index.css.map", - "index.js", - "index.js.map", - "src", - "test", - "test.js", - "test.js.map" - ], - "dependencies": { - "@avocado/graphics": "^3.0.0", - "@avocado/math": "^3.0.0", - "@avocado/react": "^3.0.0", - "@avocado/resource-persea": "^3.0.0", - "@flecks/core": "^1.4.1", - "@flecks/react": "^1.4.1", - "lodash.difference": "^4.5.0", - "react-autosuggest": "^10.1.0" - }, - "devDependencies": { - "@flecks/fleck": "^1.4.1" - } -} diff --git a/packages/entity-persea/test/exists.js b/packages/entity-persea/test/exists.js deleted file mode 100644 index 1ce8043..0000000 --- a/packages/entity-persea/test/exists.js +++ /dev/null @@ -1,5 +0,0 @@ -import {expect} from 'chai'; - -it('exists', () => { - expect(true).to.be.true; -}); diff --git a/packages/entity/build/flecks.yml b/packages/entity/build/flecks.yml index b1a180f..6c8bf17 100644 --- a/packages/entity/build/flecks.yml +++ b/packages/entity/build/flecks.yml @@ -1,8 +1,3 @@ -'@avocado/entity:./src': {} -'@avocado/graphics': {} -'@avocado/resource': {} -'@avocado/traits': {} '@flecks/core': {} '@flecks/fleck': {} '@flecks/react': {} -'@flecks/socket': {} diff --git a/packages/entity/package.json b/packages/entity/package.json index 1544cff..a28fd78 100644 --- a/packages/entity/package.json +++ b/packages/entity/package.json @@ -20,6 +20,10 @@ "build", "index.js", "index.js.map", + "persea.css", + "persea.css.map", + "persea.js", + "persea.js.map", "src", "test", "test.js", @@ -31,15 +35,19 @@ "@avocado/core": "^3.0.0", "@avocado/graphics": "^3.0.0", "@avocado/math": "^3.0.0", + "@avocado/react": "^3.0.0", "@avocado/resource": "^3.0.0", "@avocado/s13n": "^3.0.0", "@avocado/timing": "^3.0.0", "@avocado/traits": "^3.0.0", "@flecks/core": "^1.4.1", + "@flecks/react": "^1.4.1", "@flecks/socket": "^1.4.1", "debug": "4.3.1", "deepmerge": "^4.2.2", - "lodash.without": "^4.4.0" + "lodash.difference": "^4.5.0", + "lodash.without": "^4.4.0", + "react-autosuggest": "^10.1.0" }, "devDependencies": { "@flecks/fleck": "^1.4.1" diff --git a/packages/entity-persea/src/controllers/entity/component.jsx b/packages/entity/src/persea/controllers/entity/component.jsx similarity index 100% rename from packages/entity-persea/src/controllers/entity/component.jsx rename to packages/entity/src/persea/controllers/entity/component.jsx diff --git a/packages/entity-persea/src/controllers/entity/component.scss b/packages/entity/src/persea/controllers/entity/component.scss similarity index 100% rename from packages/entity-persea/src/controllers/entity/component.scss rename to packages/entity/src/persea/controllers/entity/component.scss diff --git a/packages/entity-persea/src/controllers/entity/from-buffer.js b/packages/entity/src/persea/controllers/entity/from-buffer.js similarity index 85% rename from packages/entity-persea/src/controllers/entity/from-buffer.js rename to packages/entity/src/persea/controllers/entity/from-buffer.js index 15ad7e6..5e5142e 100644 --- a/packages/entity-persea/src/controllers/entity/from-buffer.js +++ b/packages/entity/src/persea/controllers/entity/from-buffer.js @@ -1,4 +1,4 @@ -import {JsonController} from '@avocado/resource-persea'; +import {JsonController} from '@avocado/resource/persea'; export default (buffer, flecks) => { const {Entity} = flecks.get('$avocado/resource.resources'); diff --git a/packages/entity-persea/src/controllers/entity/index.js b/packages/entity/src/persea/controllers/entity/index.js similarity index 100% rename from packages/entity-persea/src/controllers/entity/index.js rename to packages/entity/src/persea/controllers/entity/index.js diff --git a/packages/entity-persea/src/controllers/entity/stage/index.jsx b/packages/entity/src/persea/controllers/entity/stage/index.jsx similarity index 100% rename from packages/entity-persea/src/controllers/entity/stage/index.jsx rename to packages/entity/src/persea/controllers/entity/stage/index.jsx diff --git a/packages/entity-persea/src/controllers/entity/stage/index.scss b/packages/entity/src/persea/controllers/entity/stage/index.scss similarity index 100% rename from packages/entity-persea/src/controllers/entity/stage/index.scss rename to packages/entity/src/persea/controllers/entity/stage/index.scss diff --git a/packages/entity-persea/src/controllers/entity/to-buffer.js b/packages/entity/src/persea/controllers/entity/to-buffer.js similarity index 85% rename from packages/entity-persea/src/controllers/entity/to-buffer.js rename to packages/entity/src/persea/controllers/entity/to-buffer.js index 1c47b47..d299510 100644 --- a/packages/entity-persea/src/controllers/entity/to-buffer.js +++ b/packages/entity/src/persea/controllers/entity/to-buffer.js @@ -1,4 +1,4 @@ -import {JsonController} from '@avocado/resource-persea'; +import {JsonController} from '@avocado/resource/persea'; export default (resource, flecks) => { const {Entity} = flecks.get('$avocado/resource.resources'); diff --git a/packages/entity-persea/src/controllers/entity/traits/index.jsx b/packages/entity/src/persea/controllers/entity/traits/index.jsx similarity index 96% rename from packages/entity-persea/src/controllers/entity/traits/index.jsx rename to packages/entity/src/persea/controllers/entity/traits/index.jsx index ce56ce5..219fd68 100644 --- a/packages/entity-persea/src/controllers/entity/traits/index.jsx +++ b/packages/entity/src/persea/controllers/entity/traits/index.jsx @@ -9,7 +9,7 @@ import { TabList, TabPanel, } from '@avocado/react'; -import {JsonController, useJsonPatcher} from '@avocado/resource-persea'; +import {JsonController, useJsonPatcher} from '@avocado/resource/persea'; import { PropTypes, React, @@ -67,7 +67,7 @@ const Traits = ({ .map(([, {type}]) => type), types, ); - const Components = flecks.get('$avocado/traits-persea.components'); + const Components = flecks.get('$avocado/traits/persea.components'); const tabPanels = types.map((type) => { const Component = Components[type] || JsonTraitComponent; return ( diff --git a/packages/entity-persea/src/controllers/entity/traits/index.scss b/packages/entity/src/persea/controllers/entity/traits/index.scss similarity index 100% rename from packages/entity-persea/src/controllers/entity/traits/index.scss rename to packages/entity/src/persea/controllers/entity/traits/index.scss diff --git a/packages/entity-persea/src/controllers/entity/traits/suggest.jsx b/packages/entity/src/persea/controllers/entity/traits/suggest.jsx similarity index 100% rename from packages/entity-persea/src/controllers/entity/traits/suggest.jsx rename to packages/entity/src/persea/controllers/entity/traits/suggest.jsx diff --git a/packages/entity-persea/src/controllers/entity/view/index.jsx b/packages/entity/src/persea/controllers/entity/view/index.jsx similarity index 100% rename from packages/entity-persea/src/controllers/entity/view/index.jsx rename to packages/entity/src/persea/controllers/entity/view/index.jsx diff --git a/packages/entity-persea/src/controllers/entity/view/index.scss b/packages/entity/src/persea/controllers/entity/view/index.scss similarity index 100% rename from packages/entity-persea/src/controllers/entity/view/index.scss rename to packages/entity/src/persea/controllers/entity/view/index.scss diff --git a/packages/entity-persea/src/index.js b/packages/entity/src/persea/index.js similarity index 72% rename from packages/entity-persea/src/index.js rename to packages/entity/src/persea/index.js index baa5f33..912d2a0 100644 --- a/packages/entity-persea/src/index.js +++ b/packages/entity/src/persea/index.js @@ -8,10 +8,10 @@ export { export default { [Hooks]: { - '@avocado/resource-persea.controllers': () => [ + '@avocado/resource/persea.controllers': () => [ EntityController, ], - '@avocado/traits-persea.components': Flecks.provide( + '@avocado/traits/persea.components': Flecks.provide( require.context('./traits', false, /\.jsx$/), {invoke: false}, ), diff --git a/packages/entity-persea/src/traits/alive.jsx b/packages/entity/src/persea/traits/alive.jsx similarity index 96% rename from packages/entity-persea/src/traits/alive.jsx rename to packages/entity/src/persea/traits/alive.jsx index 4ef3b2d..c3107cb 100644 --- a/packages/entity-persea/src/traits/alive.jsx +++ b/packages/entity/src/persea/traits/alive.jsx @@ -7,7 +7,7 @@ import { PropTypes, React, } from '@flecks/react'; -import {useJsonPatcher} from '@avocado/resource-persea'; +import {useJsonPatcher} from '@avocado/resource/persea'; const Alive = ({ json, diff --git a/packages/entity-persea/src/traits/alive.scss b/packages/entity/src/persea/traits/alive.scss similarity index 100% rename from packages/entity-persea/src/traits/alive.scss rename to packages/entity/src/persea/traits/alive.scss diff --git a/packages/entity-persea/src/traits/directional.jsx b/packages/entity/src/persea/traits/directional.jsx similarity index 97% rename from packages/entity-persea/src/traits/directional.jsx rename to packages/entity/src/persea/traits/directional.jsx index 3a714e7..991f144 100644 --- a/packages/entity-persea/src/traits/directional.jsx +++ b/packages/entity/src/persea/traits/directional.jsx @@ -8,7 +8,7 @@ import { PropTypes, React, } from '@flecks/react'; -import {useJsonPatcher} from '@avocado/resource-persea'; +import {useJsonPatcher} from '@avocado/resource/persea'; const Directional = ({json, path}) => { const patch = useJsonPatcher(); diff --git a/packages/graphics-persea/.gitignore b/packages/graphics-persea/.gitignore deleted file mode 100644 index 1f22b9c..0000000 --- a/packages/graphics-persea/.gitignore +++ /dev/null @@ -1,116 +0,0 @@ -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -lerna-debug.log* - -# Diagnostic reports (https://nodejs.org/api/report.html) -report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage -*.lcov - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# Snowpack dependency directory (https://snowpack.dev/) -web_modules/ - -# TypeScript cache -*.tsbuildinfo - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Microbundle cache -.rpt2_cache/ -.rts2_cache_cjs/ -.rts2_cache_es/ -.rts2_cache_umd/ - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env -.env.test - -# parcel-bundler cache (https://parceljs.org/) -.cache -.parcel-cache - -# Next.js build output -.next -out - -# Nuxt.js build / generate output -.nuxt -dist - -# Gatsby files -.cache/ -# Comment in the public line in if your project uses Gatsby and not Next.js -# https://nextjs.org/blog/next-9-1#public-directory-support -# public - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless/ - -# FuseBox cache -.fusebox/ - -# DynamoDB Local files -.dynamodb/ - -# TernJS port file -.tern-port - -# Stores VSCode versions used for testing VSCode extensions -.vscode-test - -# yarn v2 -.yarn/cache -.yarn/unplugged -.yarn/build-state.yml -.yarn/install-state.gz -.pnp.* diff --git a/packages/graphics-persea/package.json b/packages/graphics-persea/package.json deleted file mode 100644 index 6f88933..0000000 --- a/packages/graphics-persea/package.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "name": "@avocado/graphics-persea", - "version": "3.0.0", - "repository": { - "type": "git", - "url": "https://git.hq.cha0s.io/cha0s/avocado.git", - "directory": "packages/graphics-persea" - }, - "main": "index.js", - "scripts": { - "build": "flecks build", - "clean": "flecks clean", - "lint": "flecks lint", - "postversion": "cp package.json dist", - "test": "flecks test" - }, - "files": [ - "build", - "index.css", - "index.css.map", - "index.js", - "index.js.map", - "src", - "test", - "test.js", - "test.js.map" - ], - "dependencies": { - "@avocado/resource-persea": "^3.0.0", - "@flecks/core": "^1.4.1", - "@flecks/react": "^1.4.1" - }, - "devDependencies": { - "@flecks/fleck": "^1.4.1" - } -} diff --git a/packages/graphics-persea/test/exists.js b/packages/graphics-persea/test/exists.js deleted file mode 100644 index 1ce8043..0000000 --- a/packages/graphics-persea/test/exists.js +++ /dev/null @@ -1,5 +0,0 @@ -import {expect} from 'chai'; - -it('exists', () => { - expect(true).to.be.true; -}); diff --git a/packages/graphics/package.json b/packages/graphics/package.json index f36b8a8..8839fa8 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -22,6 +22,10 @@ "index.css.map", "index.js", "index.js.map", + "persea.css", + "persea.css.map", + "persea.js", + "persea.js.map", "src", "test", "test.js", @@ -34,6 +38,7 @@ "@avocado/resource": "^3.0.0", "@flecks/core": "^1.4.1", "@flecks/react": "^1.4.1", + "@flecks/web": "^1.4.1", "@pixi/constants": "^5.3.9", "@pixi/core": "^5.3.9", "@pixi/display": "^5.3.9", diff --git a/packages/graphics-persea/src/controllers/image/component.jsx b/packages/graphics/src/persea/controllers/image/component.jsx similarity index 90% rename from packages/graphics-persea/src/controllers/image/component.jsx rename to packages/graphics/src/persea/controllers/image/component.jsx index 1f0fa8c..b32c6aa 100644 --- a/packages/graphics-persea/src/controllers/image/component.jsx +++ b/packages/graphics/src/persea/controllers/image/component.jsx @@ -1,4 +1,4 @@ -import {BinaryController} from '@avocado/resource-persea'; +import {BinaryController} from '@avocado/resource/persea'; import './component.scss'; diff --git a/packages/graphics-persea/src/controllers/image/component.scss b/packages/graphics/src/persea/controllers/image/component.scss similarity index 100% rename from packages/graphics-persea/src/controllers/image/component.scss rename to packages/graphics/src/persea/controllers/image/component.scss diff --git a/packages/graphics-persea/src/controllers/image/index.js b/packages/graphics/src/persea/controllers/image/index.js similarity index 69% rename from packages/graphics-persea/src/controllers/image/index.js rename to packages/graphics/src/persea/controllers/image/index.js index 64cb238..f36d227 100644 --- a/packages/graphics-persea/src/controllers/image/index.js +++ b/packages/graphics/src/persea/controllers/image/index.js @@ -1,4 +1,4 @@ -import {BinaryController} from '@avocado/resource-persea'; +import {BinaryController} from '@avocado/resource/persea'; import Component from './component'; diff --git a/packages/graphics-persea/src/index.js b/packages/graphics/src/persea/index.js similarity index 78% rename from packages/graphics-persea/src/index.js rename to packages/graphics/src/persea/index.js index 9bd7fe6..df88e36 100644 --- a/packages/graphics-persea/src/index.js +++ b/packages/graphics/src/persea/index.js @@ -8,7 +8,7 @@ export { export default { [Hooks]: { - '@avocado/resource-persea.controllers': () => [ + '@avocado/resource/persea.controllers': () => [ ImageController, ], }, diff --git a/packages/math/package.json b/packages/math/package.json index 8b3cd8f..5d60b3a 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -20,6 +20,8 @@ "build", "index.js", "index.js.map", + "persea.css", + "persea.css.map", "persea.js", "persea.js.map", "src", diff --git a/packages/physics-persea/.gitignore b/packages/physics-persea/.gitignore deleted file mode 100644 index 1f22b9c..0000000 --- a/packages/physics-persea/.gitignore +++ /dev/null @@ -1,116 +0,0 @@ -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -lerna-debug.log* - -# Diagnostic reports (https://nodejs.org/api/report.html) -report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage -*.lcov - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# Snowpack dependency directory (https://snowpack.dev/) -web_modules/ - -# TypeScript cache -*.tsbuildinfo - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Microbundle cache -.rpt2_cache/ -.rts2_cache_cjs/ -.rts2_cache_es/ -.rts2_cache_umd/ - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env -.env.test - -# parcel-bundler cache (https://parceljs.org/) -.cache -.parcel-cache - -# Next.js build output -.next -out - -# Nuxt.js build / generate output -.nuxt -dist - -# Gatsby files -.cache/ -# Comment in the public line in if your project uses Gatsby and not Next.js -# https://nextjs.org/blog/next-9-1#public-directory-support -# public - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless/ - -# FuseBox cache -.fusebox/ - -# DynamoDB Local files -.dynamodb/ - -# TernJS port file -.tern-port - -# Stores VSCode versions used for testing VSCode extensions -.vscode-test - -# yarn v2 -.yarn/cache -.yarn/unplugged -.yarn/build-state.yml -.yarn/install-state.gz -.pnp.* diff --git a/packages/physics-persea/package.json b/packages/physics-persea/package.json deleted file mode 100644 index 9348804..0000000 --- a/packages/physics-persea/package.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "name": "@avocado/physics-persea", - "version": "3.0.0", - "repository": { - "type": "git", - "url": "https://git.hq.cha0s.io/cha0s/avocado.git", - "directory": "packages/physics-persea" - }, - "main": "index.js", - "scripts": { - "build": "flecks build", - "clean": "flecks clean", - "lint": "flecks lint", - "postversion": "cp package.json dist", - "test": "flecks test" - }, - "files": [ - "build", - "index.css", - "index.css.map", - "index.js", - "index.js.map", - "src", - "test", - "test.js", - "test.js.map" - ], - "dependencies": { - "@avocado/entity": "^3.0.0", - "@avocado/entity-persea": "^3.0.0", - "@avocado/graphics": "^3.0.0", - "@avocado/math": "^3.0.0", - "@avocado/react": "^3.0.0", - "@avocado/resource-persea": "^3.0.0", - "@flecks/core": "^1.4.1", - "@flecks/react": "^1.4.1" - }, - "devDependencies": { - "@flecks/fleck": "^1.4.1" - } -} diff --git a/packages/physics-persea/test/exists.js b/packages/physics-persea/test/exists.js deleted file mode 100644 index 1ce8043..0000000 --- a/packages/physics-persea/test/exists.js +++ /dev/null @@ -1,5 +0,0 @@ -import {expect} from 'chai'; - -it('exists', () => { - expect(true).to.be.true; -}); diff --git a/packages/entity-persea/build/flecks.yml b/packages/physics/build/flecks.yml similarity index 100% rename from packages/entity-persea/build/flecks.yml rename to packages/physics/build/flecks.yml diff --git a/packages/physics/package.json b/packages/physics/package.json index adf49f6..e80e296 100644 --- a/packages/physics/package.json +++ b/packages/physics/package.json @@ -20,6 +20,10 @@ "build", "index.js", "index.js.map", + "persea.css", + "persea.css.map", + "persea.js", + "persea.js.map", "src", "test", "test.js", @@ -27,11 +31,15 @@ ], "dependencies": { "@avocado/core": "^3.0.0", + "@avocado/entity": "^3.0.0", "@avocado/graphics": "^3.0.0", "@avocado/math": "^3.0.0", + "@avocado/react": "^3.0.0", + "@avocado/resource": "^3.0.0", "@avocado/timing": "^3.0.0", "@avocado/traits": "^3.0.0", "@flecks/core": "^1.4.1", + "@flecks/react": "^1.4.1", "@flecks/socket": "^1.4.1", "deepmerge": "^4.2.2", "immutable": "^4.0.0-rc.12", diff --git a/packages/physics-persea/src/index.js b/packages/physics/src/persea/index.js similarity index 74% rename from packages/physics-persea/src/index.js rename to packages/physics/src/persea/index.js index 6ebd8c2..822e294 100644 --- a/packages/physics-persea/src/index.js +++ b/packages/physics/src/persea/index.js @@ -2,7 +2,7 @@ import {Flecks, Hooks} from '@flecks/core'; export default { [Hooks]: { - '@avocado/traits-persea.components': Flecks.provide( + '@avocado/traits/persea.components': Flecks.provide( require.context('./traits', false, /\.jsx$/), {invoke: false}, ), diff --git a/packages/physics-persea/src/traits/collider.jsx b/packages/physics/src/persea/traits/collider.jsx similarity index 98% rename from packages/physics-persea/src/traits/collider.jsx rename to packages/physics/src/persea/traits/collider.jsx index 9d9d403..12c304f 100644 --- a/packages/physics-persea/src/traits/collider.jsx +++ b/packages/physics/src/persea/traits/collider.jsx @@ -1,7 +1,7 @@ import {join} from 'path'; import {Code, Json} from '@avocado/react'; -import {useJsonPatcher} from '@avocado/resource-persea'; +import {useJsonPatcher} from '@avocado/resource/persea'; import { hot, PropTypes, diff --git a/packages/physics-persea/src/traits/emitted.jsx b/packages/physics/src/persea/traits/emitted.jsx similarity index 99% rename from packages/physics-persea/src/traits/emitted.jsx rename to packages/physics/src/persea/traits/emitted.jsx index cd9959e..02d2b3b 100644 --- a/packages/physics-persea/src/traits/emitted.jsx +++ b/packages/physics/src/persea/traits/emitted.jsx @@ -3,7 +3,7 @@ import './emitted.scss'; import {join} from 'path'; import {Number} from '@avocado/react'; -import {useJsonPatcher} from '@avocado/resource-persea'; +import {useJsonPatcher} from '@avocado/resource/persea'; import { Range, rangePropType, diff --git a/packages/physics-persea/src/traits/emitted.scss b/packages/physics/src/persea/traits/emitted.scss similarity index 100% rename from packages/physics-persea/src/traits/emitted.scss rename to packages/physics/src/persea/traits/emitted.scss diff --git a/packages/physics-persea/src/traits/emitter.jsx b/packages/physics/src/persea/traits/emitter.jsx similarity index 95% rename from packages/physics-persea/src/traits/emitter.jsx rename to packages/physics/src/persea/traits/emitter.jsx index 501fd75..b1a32e0 100644 --- a/packages/physics-persea/src/traits/emitter.jsx +++ b/packages/physics/src/persea/traits/emitter.jsx @@ -1,6 +1,6 @@ import {join} from 'path'; -import {JsonTabs} from '@avocado/resource-persea'; +import {JsonTabs} from '@avocado/resource/persea'; import { hot, memo, diff --git a/packages/physics-persea/src/traits/emitter/particle.jsx b/packages/physics/src/persea/traits/emitter/particle.jsx similarity index 95% rename from packages/physics-persea/src/traits/emitter/particle.jsx rename to packages/physics/src/persea/traits/emitter/particle.jsx index cbcfb33..cd77fe1 100644 --- a/packages/physics-persea/src/traits/emitter/particle.jsx +++ b/packages/physics/src/persea/traits/emitter/particle.jsx @@ -3,10 +3,10 @@ import './particle.scss'; import {join} from 'path'; import {EntityListView} from '@avocado/entity'; -import {EntityController} from '@avocado/entity-persea'; +import {EntityController} from '@avocado/entity/persea'; import {Stage} from '@avocado/graphics'; import {Number} from '@avocado/react'; -import {useJsonPatcher} from '@avocado/resource-persea'; +import {useJsonPatcher} from '@avocado/resource/persea'; import { PropTypes, React, diff --git a/packages/physics-persea/src/traits/emitter/particle.scss b/packages/physics/src/persea/traits/emitter/particle.scss similarity index 100% rename from packages/physics-persea/src/traits/emitter/particle.scss rename to packages/physics/src/persea/traits/emitter/particle.scss diff --git a/packages/resource-persea/.gitignore b/packages/resource-persea/.gitignore deleted file mode 100644 index 1f22b9c..0000000 --- a/packages/resource-persea/.gitignore +++ /dev/null @@ -1,116 +0,0 @@ -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -lerna-debug.log* - -# Diagnostic reports (https://nodejs.org/api/report.html) -report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage -*.lcov - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# Snowpack dependency directory (https://snowpack.dev/) -web_modules/ - -# TypeScript cache -*.tsbuildinfo - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Microbundle cache -.rpt2_cache/ -.rts2_cache_cjs/ -.rts2_cache_es/ -.rts2_cache_umd/ - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env -.env.test - -# parcel-bundler cache (https://parceljs.org/) -.cache -.parcel-cache - -# Next.js build output -.next -out - -# Nuxt.js build / generate output -.nuxt -dist - -# Gatsby files -.cache/ -# Comment in the public line in if your project uses Gatsby and not Next.js -# https://nextjs.org/blog/next-9-1#public-directory-support -# public - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless/ - -# FuseBox cache -.fusebox/ - -# DynamoDB Local files -.dynamodb/ - -# TernJS port file -.tern-port - -# Stores VSCode versions used for testing VSCode extensions -.vscode-test - -# yarn v2 -.yarn/cache -.yarn/unplugged -.yarn/build-state.yml -.yarn/install-state.gz -.pnp.* diff --git a/packages/resource-persea/package.json b/packages/resource-persea/package.json deleted file mode 100644 index 73ee2dd..0000000 --- a/packages/resource-persea/package.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "name": "@avocado/resource-persea", - "version": "3.0.0", - "repository": { - "type": "git", - "url": "https://git.hq.cha0s.io/cha0s/avocado.git", - "directory": "packages/resource-persea" - }, - "main": "index.js", - "scripts": { - "build": "flecks build", - "clean": "flecks clean", - "lint": "flecks lint", - "postversion": "cp package.json dist", - "test": "flecks test" - }, - "files": [ - "build", - "index.css", - "index.css.map", - "index.js", - "index.js.map", - "src", - "test", - "test.js", - "test.js.map" - ], - "dependencies": { - "@avocado/react": "^3.0.0", - "@avocado/resource": "^3.0.0", - "@flecks/core": "^1.4.1", - "@flecks/react": "^1.4.1", - "@flecks/redux": "^1.4.1", - "fast-json-patch": "^3.0.0-1", - "react-hex-editor": "^0.3.0", - "styled-components": "^5.2.1" - }, - "devDependencies": { - "@flecks/fleck": "^1.4.1" - } -} diff --git a/packages/resource-persea/test/exists.js b/packages/resource-persea/test/exists.js deleted file mode 100644 index 1ce8043..0000000 --- a/packages/resource-persea/test/exists.js +++ /dev/null @@ -1,5 +0,0 @@ -import {expect} from 'chai'; - -it('exists', () => { - expect(true).to.be.true; -}); diff --git a/packages/graphics-persea/build/flecks.yml b/packages/resource/build/flecks.yml similarity index 100% rename from packages/graphics-persea/build/flecks.yml rename to packages/resource/build/flecks.yml diff --git a/packages/resource/package.json b/packages/resource/package.json index 89d1034..bc78687 100644 --- a/packages/resource/package.json +++ b/packages/resource/package.json @@ -20,6 +20,10 @@ "build", "index.js", "index.js.map", + "persea.css", + "persea.css.map", + "persea.js", + "persea.js.map", "src", "test", "test.js", @@ -28,9 +32,15 @@ ], "dependencies": { "@avocado/core": "^3.0.0", + "@avocado/react": "^3.0.0", "@flecks/core": "^1.4.1", + "@flecks/react": "^1.4.1", + "@flecks/redux": "^1.4.1", "deepmerge": "^4.2.2", - "lru-cache": "^6.0.0" + "fast-json-patch": "^3.0.0-1", + "lru-cache": "^6.0.0", + "react-hex-editor": "^0.3.0", + "styled-components": "^5.2.1" }, "devDependencies": { "@flecks/fleck": "^1.4.1" diff --git a/packages/resource-persea/src/components/json-tabs/index.jsx b/packages/resource/src/persea/components/json-tabs/index.jsx similarity index 98% rename from packages/resource-persea/src/components/json-tabs/index.jsx rename to packages/resource/src/persea/components/json-tabs/index.jsx index 8e210d4..f478f96 100644 --- a/packages/resource-persea/src/components/json-tabs/index.jsx +++ b/packages/resource/src/persea/components/json-tabs/index.jsx @@ -6,7 +6,7 @@ import { TabList, TabPanel, } from '@avocado/react'; -import useJsonPatcher from '@avocado/resource-persea/hooks/use-json-patcher'; +import useJsonPatcher from '@avocado/resource/persea/hooks/use-json-patcher'; import { PropTypes, React, diff --git a/packages/resource-persea/src/components/json-tabs/index.scss b/packages/resource/src/persea/components/json-tabs/index.scss similarity index 100% rename from packages/resource-persea/src/components/json-tabs/index.scss rename to packages/resource/src/persea/components/json-tabs/index.scss diff --git a/packages/resource-persea/src/components/resource/index.jsx b/packages/resource/src/persea/components/resource/index.jsx similarity index 96% rename from packages/resource-persea/src/components/resource/index.jsx rename to packages/resource/src/persea/components/resource/index.jsx index 59e3327..dfe75ac 100644 --- a/packages/resource-persea/src/components/resource/index.jsx +++ b/packages/resource/src/persea/components/resource/index.jsx @@ -1,4 +1,4 @@ -import useResourceController from '@avocado/resource-persea/hooks/use-resource-controller'; +import useResourceController from '@avocado/resource/persea/hooks/use-resource-controller'; import { PropTypes, React, diff --git a/packages/resource-persea/src/components/resource/index.module.scss b/packages/resource/src/persea/components/resource/index.module.scss similarity index 100% rename from packages/resource-persea/src/components/resource/index.module.scss rename to packages/resource/src/persea/components/resource/index.module.scss diff --git a/packages/resource-persea/src/context/json-patcher.js b/packages/resource/src/persea/context/json-patcher.js similarity index 100% rename from packages/resource-persea/src/context/json-patcher.js rename to packages/resource/src/persea/context/json-patcher.js diff --git a/packages/resource-persea/src/controllers/binary/component.jsx b/packages/resource/src/persea/controllers/binary/component.jsx similarity index 96% rename from packages/resource-persea/src/controllers/binary/component.jsx rename to packages/resource/src/persea/controllers/binary/component.jsx index 35464f8..2db812c 100644 --- a/packages/resource-persea/src/controllers/binary/component.jsx +++ b/packages/resource/src/persea/controllers/binary/component.jsx @@ -1,6 +1,6 @@ import './component.scss'; -import {controller as controllerPropTypes} from '@avocado/resource-persea/prop-types'; +import {controller as controllerPropTypes} from '@avocado/resource/persea/prop-types'; import {React} from '@flecks/react'; import HexEditor from 'react-hex-editor'; import oneDarkPro from 'react-hex-editor/themes/oneDarkPro'; diff --git a/packages/resource-persea/src/controllers/binary/component.scss b/packages/resource/src/persea/controllers/binary/component.scss similarity index 100% rename from packages/resource-persea/src/controllers/binary/component.scss rename to packages/resource/src/persea/controllers/binary/component.scss diff --git a/packages/resource-persea/src/controllers/binary/from-buffer.js b/packages/resource/src/persea/controllers/binary/from-buffer.js similarity index 100% rename from packages/resource-persea/src/controllers/binary/from-buffer.js rename to packages/resource/src/persea/controllers/binary/from-buffer.js diff --git a/packages/resource-persea/src/controllers/binary/index.js b/packages/resource/src/persea/controllers/binary/index.js similarity index 100% rename from packages/resource-persea/src/controllers/binary/index.js rename to packages/resource/src/persea/controllers/binary/index.js diff --git a/packages/resource-persea/src/controllers/binary/to-buffer.js b/packages/resource/src/persea/controllers/binary/to-buffer.js similarity index 100% rename from packages/resource-persea/src/controllers/binary/to-buffer.js rename to packages/resource/src/persea/controllers/binary/to-buffer.js diff --git a/packages/resource-persea/src/controllers/json/component.jsx b/packages/resource/src/persea/controllers/json/component.jsx similarity index 90% rename from packages/resource-persea/src/controllers/json/component.jsx rename to packages/resource/src/persea/controllers/json/component.jsx index 4c565b9..7640c2a 100644 --- a/packages/resource-persea/src/controllers/json/component.jsx +++ b/packages/resource/src/persea/controllers/json/component.jsx @@ -3,8 +3,8 @@ import './component.scss'; import {join} from 'path'; import {Json as JsonComponent} from '@avocado/react'; -import useJsonPatcher from '@avocado/resource-persea/hooks/use-json-patcher'; -import {controller as controllerPropTypes} from '@avocado/resource-persea/prop-types'; +import useJsonPatcher from '@avocado/resource/persea/hooks/use-json-patcher'; +import {controller as controllerPropTypes} from '@avocado/resource/persea/prop-types'; import {React} from '@flecks/react'; import {compare} from 'fast-json-patch'; diff --git a/packages/resource-persea/src/controllers/json/component.scss b/packages/resource/src/persea/controllers/json/component.scss similarity index 100% rename from packages/resource-persea/src/controllers/json/component.scss rename to packages/resource/src/persea/controllers/json/component.scss diff --git a/packages/resource-persea/src/controllers/json/from-buffer.js b/packages/resource/src/persea/controllers/json/from-buffer.js similarity index 100% rename from packages/resource-persea/src/controllers/json/from-buffer.js rename to packages/resource/src/persea/controllers/json/from-buffer.js diff --git a/packages/resource-persea/src/controllers/json/index.js b/packages/resource/src/persea/controllers/json/index.js similarity index 100% rename from packages/resource-persea/src/controllers/json/index.js rename to packages/resource/src/persea/controllers/json/index.js diff --git a/packages/resource-persea/src/controllers/json/to-buffer.js b/packages/resource/src/persea/controllers/json/to-buffer.js similarity index 100% rename from packages/resource-persea/src/controllers/json/to-buffer.js rename to packages/resource/src/persea/controllers/json/to-buffer.js diff --git a/packages/resource-persea/src/controllers/text/component.jsx b/packages/resource/src/persea/controllers/text/component.jsx similarity index 100% rename from packages/resource-persea/src/controllers/text/component.jsx rename to packages/resource/src/persea/controllers/text/component.jsx diff --git a/packages/resource-persea/src/controllers/text/component.scss b/packages/resource/src/persea/controllers/text/component.scss similarity index 100% rename from packages/resource-persea/src/controllers/text/component.scss rename to packages/resource/src/persea/controllers/text/component.scss diff --git a/packages/resource-persea/src/controllers/text/from-buffer.js b/packages/resource/src/persea/controllers/text/from-buffer.js similarity index 100% rename from packages/resource-persea/src/controllers/text/from-buffer.js rename to packages/resource/src/persea/controllers/text/from-buffer.js diff --git a/packages/resource-persea/src/controllers/text/index.js b/packages/resource/src/persea/controllers/text/index.js similarity index 100% rename from packages/resource-persea/src/controllers/text/index.js rename to packages/resource/src/persea/controllers/text/index.js diff --git a/packages/resource-persea/src/controllers/text/to-buffer.js b/packages/resource/src/persea/controllers/text/to-buffer.js similarity index 100% rename from packages/resource-persea/src/controllers/text/to-buffer.js rename to packages/resource/src/persea/controllers/text/to-buffer.js diff --git a/packages/resource-persea/src/hooks/use-full-json.js b/packages/resource/src/persea/hooks/use-full-json.js similarity index 100% rename from packages/resource-persea/src/hooks/use-full-json.js rename to packages/resource/src/persea/hooks/use-full-json.js diff --git a/packages/resource-persea/src/hooks/use-json-patcher.js b/packages/resource/src/persea/hooks/use-json-patcher.js similarity index 100% rename from packages/resource-persea/src/hooks/use-json-patcher.js rename to packages/resource/src/persea/hooks/use-json-patcher.js diff --git a/packages/resource-persea/src/hooks/use-resource-controller.js b/packages/resource/src/persea/hooks/use-resource-controller.js similarity index 72% rename from packages/resource-persea/src/hooks/use-resource-controller.js rename to packages/resource/src/persea/hooks/use-resource-controller.js index d6d92df..b8410d6 100644 --- a/packages/resource-persea/src/hooks/use-resource-controller.js +++ b/packages/resource/src/persea/hooks/use-resource-controller.js @@ -2,6 +2,6 @@ import {useFlecks} from '@flecks/react'; export default (uri) => ( useFlecks() - .get('$avocado/resource-persea.controllers') + .get('$avocado/resource/persea.controllers') .find(({matcher}) => uri.match(matcher)) ); diff --git a/packages/resource-persea/src/index.js b/packages/resource/src/persea/index.js similarity index 88% rename from packages/resource-persea/src/index.js rename to packages/resource/src/persea/index.js index c117ace..5495e70 100644 --- a/packages/resource-persea/src/index.js +++ b/packages/resource/src/persea/index.js @@ -27,14 +27,14 @@ export default { [Hooks]: { '@flecks/core.starting': async (flecks) => { const Controllers = ( - await flecks.invokeSequentialAsync('@avocado/resource-persea.controllers') + await flecks.invokeSequentialAsync('@avocado/resource/persea.controllers') ).flat(); Controllers.push( JsonController, TextController, BinaryController, ); - flecks.set('$avocado/resource-persea.controllers', Controllers); + flecks.set('$avocado/resource/persea.controllers', Controllers); }, '@flecks/redux.reducers': () => reducer, }, diff --git a/packages/resource-persea/src/prop-types.js b/packages/resource/src/persea/prop-types.js similarity index 100% rename from packages/resource-persea/src/prop-types.js rename to packages/resource/src/persea/prop-types.js diff --git a/packages/resource-persea/src/state/index.js b/packages/resource/src/persea/state/index.js similarity index 100% rename from packages/resource-persea/src/state/index.js rename to packages/resource/src/persea/state/index.js diff --git a/packages/resource-persea/src/state/json.js b/packages/resource/src/persea/state/json.js similarity index 100% rename from packages/resource-persea/src/state/json.js rename to packages/resource/src/persea/state/json.js diff --git a/packages/resource-persea/src/state/reducer.js b/packages/resource/src/persea/state/reducer.js similarity index 100% rename from packages/resource-persea/src/state/reducer.js rename to packages/resource/src/persea/state/reducer.js diff --git a/packages/resource-persea/src/state/replace.js b/packages/resource/src/persea/state/replace.js similarity index 100% rename from packages/resource-persea/src/state/replace.js rename to packages/resource/src/persea/state/replace.js diff --git a/packages/sound-persea/.gitignore b/packages/sound-persea/.gitignore deleted file mode 100644 index 1f22b9c..0000000 --- a/packages/sound-persea/.gitignore +++ /dev/null @@ -1,116 +0,0 @@ -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -lerna-debug.log* - -# Diagnostic reports (https://nodejs.org/api/report.html) -report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage -*.lcov - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# Snowpack dependency directory (https://snowpack.dev/) -web_modules/ - -# TypeScript cache -*.tsbuildinfo - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Microbundle cache -.rpt2_cache/ -.rts2_cache_cjs/ -.rts2_cache_es/ -.rts2_cache_umd/ - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env -.env.test - -# parcel-bundler cache (https://parceljs.org/) -.cache -.parcel-cache - -# Next.js build output -.next -out - -# Nuxt.js build / generate output -.nuxt -dist - -# Gatsby files -.cache/ -# Comment in the public line in if your project uses Gatsby and not Next.js -# https://nextjs.org/blog/next-9-1#public-directory-support -# public - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless/ - -# FuseBox cache -.fusebox/ - -# DynamoDB Local files -.dynamodb/ - -# TernJS port file -.tern-port - -# Stores VSCode versions used for testing VSCode extensions -.vscode-test - -# yarn v2 -.yarn/cache -.yarn/unplugged -.yarn/build-state.yml -.yarn/install-state.gz -.pnp.* diff --git a/packages/sound-persea/package.json b/packages/sound-persea/package.json deleted file mode 100644 index 2ab8454..0000000 --- a/packages/sound-persea/package.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "name": "@avocado/sound-persea", - "version": "3.0.0", - "repository": { - "type": "git", - "url": "https://git.hq.cha0s.io/cha0s/avocado.git", - "directory": "packages/sound-persea" - }, - "main": "index.js", - "scripts": { - "build": "flecks build", - "clean": "flecks clean", - "lint": "flecks lint", - "postversion": "cp package.json dist", - "test": "flecks test" - }, - "files": [ - "build", - "index.css", - "index.css.map", - "index.js", - "index.js.map", - "src", - "test", - "test.js", - "test.js.map" - ], - "dependencies": { - "@avocado/react": "^3.0.0", - "@avocado/resource": "^3.0.0", - "@avocado/resource-persea": "^3.0.0", - "@flecks/core": "^1.4.1", - "@flecks/react": "^1.4.1" - }, - "devDependencies": { - "@flecks/fleck": "^1.4.1" - } -} diff --git a/packages/sound-persea/test/exists.js b/packages/sound-persea/test/exists.js deleted file mode 100644 index 1ce8043..0000000 --- a/packages/sound-persea/test/exists.js +++ /dev/null @@ -1,5 +0,0 @@ -import {expect} from 'chai'; - -it('exists', () => { - expect(true).to.be.true; -}); diff --git a/packages/physics-persea/build/flecks.yml b/packages/sound/build/flecks.yml similarity index 100% rename from packages/physics-persea/build/flecks.yml rename to packages/sound/build/flecks.yml diff --git a/packages/sound/package.json b/packages/sound/package.json index bba5835..82e6a78 100644 --- a/packages/sound/package.json +++ b/packages/sound/package.json @@ -20,15 +20,21 @@ "build", "index.js", "index.js.map", + "persea.css", + "persea.css.map", + "persea.js", + "persea.js.map", "src", "test", "test.js", "test.js.map" ], "dependencies": { + "@avocado/react": "^3.0.0", "@avocado/resource": "^3.0.0", "@avocado/traits": "^3.0.0", "@flecks/core": "^1.4.1", + "@flecks/react": "^1.4.1", "@flecks/socket": "^1.4.1", "debug": "4.3.1", "lru-cache": "^6.0.0" diff --git a/packages/sound-persea/src/controllers/audio/component.jsx b/packages/sound/src/persea/controllers/audio/component.jsx similarity index 91% rename from packages/sound-persea/src/controllers/audio/component.jsx rename to packages/sound/src/persea/controllers/audio/component.jsx index 01340a5..b8ad514 100644 --- a/packages/sound-persea/src/controllers/audio/component.jsx +++ b/packages/sound/src/persea/controllers/audio/component.jsx @@ -1,4 +1,4 @@ -import {BinaryController} from '@avocado/resource-persea'; +import {BinaryController} from '@avocado/resource/persea'; import { PropTypes, React, diff --git a/packages/sound-persea/src/controllers/audio/component.module.scss b/packages/sound/src/persea/controllers/audio/component.module.scss similarity index 100% rename from packages/sound-persea/src/controllers/audio/component.module.scss rename to packages/sound/src/persea/controllers/audio/component.module.scss diff --git a/packages/sound-persea/src/controllers/audio/index.js b/packages/sound/src/persea/controllers/audio/index.js similarity index 68% rename from packages/sound-persea/src/controllers/audio/index.js rename to packages/sound/src/persea/controllers/audio/index.js index 1b17b64..5d33d39 100644 --- a/packages/sound-persea/src/controllers/audio/index.js +++ b/packages/sound/src/persea/controllers/audio/index.js @@ -1,4 +1,4 @@ -import {BinaryController} from '@avocado/resource-persea'; +import {BinaryController} from '@avocado/resource/persea'; import Component from './component'; diff --git a/packages/sound-persea/src/controllers/sound/component.jsx b/packages/sound/src/persea/controllers/sound/component.jsx similarity index 97% rename from packages/sound-persea/src/controllers/sound/component.jsx rename to packages/sound/src/persea/controllers/sound/component.jsx index b91dbb9..e5d7b8f 100644 --- a/packages/sound-persea/src/controllers/sound/component.jsx +++ b/packages/sound/src/persea/controllers/sound/component.jsx @@ -5,7 +5,7 @@ import {join} from 'path'; import { Number, } from '@avocado/react'; -import {useJsonPatcher} from '@avocado/resource-persea'; +import {useJsonPatcher} from '@avocado/resource/persea'; import { PropTypes, React, diff --git a/packages/sound-persea/src/controllers/sound/component.scss b/packages/sound/src/persea/controllers/sound/component.scss similarity index 100% rename from packages/sound-persea/src/controllers/sound/component.scss rename to packages/sound/src/persea/controllers/sound/component.scss diff --git a/packages/sound-persea/src/controllers/sound/index.js b/packages/sound/src/persea/controllers/sound/index.js similarity index 68% rename from packages/sound-persea/src/controllers/sound/index.js rename to packages/sound/src/persea/controllers/sound/index.js index aa961a5..9e902e3 100644 --- a/packages/sound-persea/src/controllers/sound/index.js +++ b/packages/sound/src/persea/controllers/sound/index.js @@ -1,4 +1,4 @@ -import {JsonController} from '@avocado/resource-persea'; +import {JsonController} from '@avocado/resource/persea'; import Component from './component'; diff --git a/packages/sound-persea/src/controllers/sound/src.jsx b/packages/sound/src/persea/controllers/sound/src.jsx similarity index 100% rename from packages/sound-persea/src/controllers/sound/src.jsx rename to packages/sound/src/persea/controllers/sound/src.jsx diff --git a/packages/sound-persea/src/index.js b/packages/sound/src/persea/index.js similarity index 77% rename from packages/sound-persea/src/index.js rename to packages/sound/src/persea/index.js index b9d024e..8b223be 100644 --- a/packages/sound-persea/src/index.js +++ b/packages/sound/src/persea/index.js @@ -10,11 +10,11 @@ export { export default { [Hooks]: { - '@avocado/resource-persea.controllers': () => [ + '@avocado/resource/persea.controllers': () => [ AudioController, SoundController, ], - '@avocado/traits-persea.components': Flecks.provide( + '@avocado/traits/persea.components': Flecks.provide( require.context('./traits', false, /\.jsx$/), {invoke: false}, ), diff --git a/packages/sound-persea/src/traits/audible.jsx b/packages/sound/src/persea/traits/audible.jsx similarity index 97% rename from packages/sound-persea/src/traits/audible.jsx rename to packages/sound/src/persea/traits/audible.jsx index 886c1c2..81f95d9 100644 --- a/packages/sound-persea/src/traits/audible.jsx +++ b/packages/sound/src/persea/traits/audible.jsx @@ -2,7 +2,7 @@ import './audible.scss'; import {join} from 'path'; -import {useJsonPatcher} from '@avocado/resource-persea'; +import {useJsonPatcher} from '@avocado/resource/persea'; import { hot, PropTypes, diff --git a/packages/sound-persea/src/traits/audible.scss b/packages/sound/src/persea/traits/audible.scss similarity index 100% rename from packages/sound-persea/src/traits/audible.scss rename to packages/sound/src/persea/traits/audible.scss diff --git a/packages/timing-persea/.gitignore b/packages/timing-persea/.gitignore deleted file mode 100644 index 1f22b9c..0000000 --- a/packages/timing-persea/.gitignore +++ /dev/null @@ -1,116 +0,0 @@ -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -lerna-debug.log* - -# Diagnostic reports (https://nodejs.org/api/report.html) -report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage -*.lcov - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# Snowpack dependency directory (https://snowpack.dev/) -web_modules/ - -# TypeScript cache -*.tsbuildinfo - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Microbundle cache -.rpt2_cache/ -.rts2_cache_cjs/ -.rts2_cache_es/ -.rts2_cache_umd/ - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env -.env.test - -# parcel-bundler cache (https://parceljs.org/) -.cache -.parcel-cache - -# Next.js build output -.next -out - -# Nuxt.js build / generate output -.nuxt -dist - -# Gatsby files -.cache/ -# Comment in the public line in if your project uses Gatsby and not Next.js -# https://nextjs.org/blog/next-9-1#public-directory-support -# public - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless/ - -# FuseBox cache -.fusebox/ - -# DynamoDB Local files -.dynamodb/ - -# TernJS port file -.tern-port - -# Stores VSCode versions used for testing VSCode extensions -.vscode-test - -# yarn v2 -.yarn/cache -.yarn/unplugged -.yarn/build-state.yml -.yarn/install-state.gz -.pnp.* diff --git a/packages/timing-persea/build/flecks.yml b/packages/timing-persea/build/flecks.yml deleted file mode 100644 index 6c8bf17..0000000 --- a/packages/timing-persea/build/flecks.yml +++ /dev/null @@ -1,3 +0,0 @@ -'@flecks/core': {} -'@flecks/fleck': {} -'@flecks/react': {} diff --git a/packages/timing-persea/package.json b/packages/timing-persea/package.json deleted file mode 100644 index 83ae6c9..0000000 --- a/packages/timing-persea/package.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "@avocado/timing-persea", - "version": "3.0.0", - "repository": { - "type": "git", - "url": "https://git.hq.cha0s.io/cha0s/avocado.git", - "directory": "packages/timing-persea" - }, - "main": "index.js", - "scripts": { - "build": "flecks build", - "clean": "flecks clean", - "lint": "flecks lint", - "postversion": "cp package.json dist", - "test": "flecks test" - }, - "files": [ - "build", - "index.css", - "index.css.map", - "index.js", - "index.js.map", - "src", - "test", - "test.js", - "test.js.map" - ], - "dependencies": { - "@avocado/graphics": "^3.0.0", - "@avocado/math": "^3.0.0", - "@avocado/react": "^3.0.0", - "@avocado/resource-persea": "^3.0.0", - "@avocado/timing": "^3.0.0", - "@flecks/core": "^1.4.1", - "@flecks/react": "^1.4.1" - }, - "devDependencies": { - "@flecks/fleck": "^1.4.1" - } -} diff --git a/packages/timing-persea/test/exists.js b/packages/timing-persea/test/exists.js deleted file mode 100644 index 1ce8043..0000000 --- a/packages/timing-persea/test/exists.js +++ /dev/null @@ -1,5 +0,0 @@ -import {expect} from 'chai'; - -it('exists', () => { - expect(true).to.be.true; -}); diff --git a/packages/resource-persea/build/flecks.yml b/packages/timing/build/flecks.yml similarity index 100% rename from packages/resource-persea/build/flecks.yml rename to packages/timing/build/flecks.yml diff --git a/packages/timing/package.json b/packages/timing/package.json index d9e40df..d203c67 100644 --- a/packages/timing/package.json +++ b/packages/timing/package.json @@ -20,6 +20,10 @@ "build", "index.js", "index.js.map", + "persea.css", + "persea.css.map", + "persea.js", + "persea.js.map", "server.js", "server.js.map", "src", @@ -31,9 +35,11 @@ "@avocado/core": "^3.0.0", "@avocado/graphics": "^3.0.0", "@avocado/math": "^3.0.0", + "@avocado/react": "^3.0.0", "@avocado/resource": "^3.0.0", "@avocado/traits": "^3.0.0", "@flecks/core": "^1.4.1", + "@flecks/react": "^1.4.1", "@flecks/socket": "^1.4.1", "lodash.mapvalues": "^4.6.0" }, diff --git a/packages/timing-persea/src/components/animation-visualization.jsx b/packages/timing/src/persea/components/animation-visualization.jsx similarity index 100% rename from packages/timing-persea/src/components/animation-visualization.jsx rename to packages/timing/src/persea/components/animation-visualization.jsx diff --git a/packages/timing-persea/src/components/animation-visualization.scss b/packages/timing/src/persea/components/animation-visualization.scss similarity index 100% rename from packages/timing-persea/src/components/animation-visualization.scss rename to packages/timing/src/persea/components/animation-visualization.scss diff --git a/packages/timing-persea/src/controllers/animation/component.jsx b/packages/timing/src/persea/controllers/animation/component.jsx similarity index 97% rename from packages/timing-persea/src/controllers/animation/component.jsx rename to packages/timing/src/persea/controllers/animation/component.jsx index 3d1e89e..9cb4ad5 100644 --- a/packages/timing-persea/src/controllers/animation/component.jsx +++ b/packages/timing/src/persea/controllers/animation/component.jsx @@ -11,8 +11,8 @@ import { Vector as VectorComponent, vectorPropType, } from '@avocado/math/persea'; -import {useJsonPatcher} from '@avocado/resource-persea'; -import AnimationVisualization from '@avocado/timing-persea/components/animation-visualization'; +import {useJsonPatcher} from '@avocado/resource/persea'; +import AnimationVisualization from '@avocado/timing/persea/components/animation-visualization'; const Animation = ({ resource, diff --git a/packages/timing-persea/src/controllers/animation/component.scss b/packages/timing/src/persea/controllers/animation/component.scss similarity index 100% rename from packages/timing-persea/src/controllers/animation/component.scss rename to packages/timing/src/persea/controllers/animation/component.scss diff --git a/packages/timing-persea/src/controllers/animation/index.js b/packages/timing/src/persea/controllers/animation/index.js similarity index 68% rename from packages/timing-persea/src/controllers/animation/index.js rename to packages/timing/src/persea/controllers/animation/index.js index c700643..e5fac54 100644 --- a/packages/timing-persea/src/controllers/animation/index.js +++ b/packages/timing/src/persea/controllers/animation/index.js @@ -1,4 +1,4 @@ -import {JsonController} from '@avocado/resource-persea'; +import {JsonController} from '@avocado/resource/persea'; import Component from './component'; diff --git a/packages/timing-persea/src/index.js b/packages/timing/src/persea/index.js similarity index 73% rename from packages/timing-persea/src/index.js rename to packages/timing/src/persea/index.js index 6618728..ce4ac01 100644 --- a/packages/timing-persea/src/index.js +++ b/packages/timing/src/persea/index.js @@ -8,10 +8,10 @@ export { export default { [Hooks]: { - '@avocado/resource-persea.controllers': () => [ + '@avocado/resource/persea.controllers': () => [ AnimationController, ], - '@avocado/traits-persea.components': Flecks.provide( + '@avocado/traits/persea.components': Flecks.provide( require.context('./traits', false, /\.jsx$/), {invoke: false}, ), diff --git a/packages/timing-persea/src/traits/animated.jsx b/packages/timing/src/persea/traits/animated.jsx similarity index 97% rename from packages/timing-persea/src/traits/animated.jsx rename to packages/timing/src/persea/traits/animated.jsx index 0ac8a9b..6e57283 100644 --- a/packages/timing-persea/src/traits/animated.jsx +++ b/packages/timing/src/persea/traits/animated.jsx @@ -4,7 +4,7 @@ import {join} from 'path'; import {Vector as VectorComponent} from '@avocado/math/persea'; import {Number} from '@avocado/react'; -import {JsonTabs, useJsonPatcher} from '@avocado/resource-persea'; +import {JsonTabs, useJsonPatcher} from '@avocado/resource/persea'; import { hot, PropTypes, diff --git a/packages/timing-persea/src/traits/animated.scss b/packages/timing/src/persea/traits/animated.scss similarity index 100% rename from packages/timing-persea/src/traits/animated.scss rename to packages/timing/src/persea/traits/animated.scss diff --git a/packages/timing-persea/src/traits/animated/animation.jsx b/packages/timing/src/persea/traits/animated/animation.jsx similarity index 95% rename from packages/timing-persea/src/traits/animated/animation.jsx rename to packages/timing/src/persea/traits/animated/animation.jsx index 53f64df..d4be9c7 100644 --- a/packages/timing-persea/src/traits/animated/animation.jsx +++ b/packages/timing/src/persea/traits/animated/animation.jsx @@ -8,9 +8,9 @@ import { } from '@avocado/math'; import { useFullJson, -} from '@avocado/resource-persea'; +} from '@avocado/resource/persea'; import {AnimationView} from '@avocado/timing'; -import AnimationVisualization from '@avocado/timing-persea/components/animation-visualization'; +import AnimationVisualization from '@avocado/timing/persea/components/animation-visualization'; import { PropTypes, React, diff --git a/packages/topdown-persea/.gitignore b/packages/topdown-persea/.gitignore deleted file mode 100644 index 1f22b9c..0000000 --- a/packages/topdown-persea/.gitignore +++ /dev/null @@ -1,116 +0,0 @@ -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -lerna-debug.log* - -# Diagnostic reports (https://nodejs.org/api/report.html) -report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage -*.lcov - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# Snowpack dependency directory (https://snowpack.dev/) -web_modules/ - -# TypeScript cache -*.tsbuildinfo - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Microbundle cache -.rpt2_cache/ -.rts2_cache_cjs/ -.rts2_cache_es/ -.rts2_cache_umd/ - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env -.env.test - -# parcel-bundler cache (https://parceljs.org/) -.cache -.parcel-cache - -# Next.js build output -.next -out - -# Nuxt.js build / generate output -.nuxt -dist - -# Gatsby files -.cache/ -# Comment in the public line in if your project uses Gatsby and not Next.js -# https://nextjs.org/blog/next-9-1#public-directory-support -# public - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless/ - -# FuseBox cache -.fusebox/ - -# DynamoDB Local files -.dynamodb/ - -# TernJS port file -.tern-port - -# Stores VSCode versions used for testing VSCode extensions -.vscode-test - -# yarn v2 -.yarn/cache -.yarn/unplugged -.yarn/build-state.yml -.yarn/install-state.gz -.pnp.* diff --git a/packages/topdown-persea/build/flecks.yml b/packages/topdown-persea/build/flecks.yml deleted file mode 100644 index 6c8bf17..0000000 --- a/packages/topdown-persea/build/flecks.yml +++ /dev/null @@ -1,3 +0,0 @@ -'@flecks/core': {} -'@flecks/fleck': {} -'@flecks/react': {} diff --git a/packages/topdown-persea/package.json b/packages/topdown-persea/package.json deleted file mode 100644 index 6ccc871..0000000 --- a/packages/topdown-persea/package.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "name": "@avocado/topdown-persea", - "version": "3.0.0", - "repository": { - "type": "git", - "url": "https://git.hq.cha0s.io/cha0s/avocado.git", - "directory": "packages/topdown-persea" - }, - "main": "index.js", - "scripts": { - "build": "flecks build", - "clean": "flecks clean", - "lint": "flecks lint", - "postversion": "cp package.json dist", - "test": "flecks test" - }, - "files": [ - "build", - "index.css", - "index.css.map", - "index.js", - "index.js.map", - "src", - "test", - "test.js", - "test.js.map" - ], - "dependencies": { - "@avocado/entity-persea": "^3.0.0", - "@avocado/graphics": "^3.0.0", - "@avocado/math": "^3.0.0", - "@avocado/react": "^3.0.0", - "@avocado/resource-persea": "^3.0.0", - "@avocado/timing": "^3.0.0", - "@flecks/core": "^1.4.1", - "@flecks/react": "^1.4.1" - }, - "devDependencies": { - "@flecks/fleck": "^1.4.1" - } -} diff --git a/packages/topdown-persea/test/exists.js b/packages/topdown-persea/test/exists.js deleted file mode 100644 index 1ce8043..0000000 --- a/packages/topdown-persea/test/exists.js +++ /dev/null @@ -1,5 +0,0 @@ -import {expect} from 'chai'; - -it('exists', () => { - expect(true).to.be.true; -}); diff --git a/packages/topdown/package.json b/packages/topdown/package.json index 7a7313f..0a39c4e 100644 --- a/packages/topdown/package.json +++ b/packages/topdown/package.json @@ -22,6 +22,10 @@ "index.css.map", "index.js", "index.js.map", + "persea.css", + "persea.css.map", + "persea.js", + "persea.js.map", "src", "test", "test.js", @@ -34,6 +38,7 @@ "@avocado/entity": "^3.0.0", "@avocado/graphics": "^3.0.0", "@avocado/math": "^3.0.0", + "@avocado/react": "^3.0.0", "@avocado/resource": "^3.0.0", "@avocado/s13n": "^3.0.0", "@avocado/timing": "^3.0.0", diff --git a/packages/topdown-persea/src/controllers/room/component.jsx b/packages/topdown/src/persea/controllers/room/component.jsx similarity index 98% rename from packages/topdown-persea/src/controllers/room/component.jsx rename to packages/topdown/src/persea/controllers/room/component.jsx index c343a34..8753ae0 100644 --- a/packages/topdown-persea/src/controllers/room/component.jsx +++ b/packages/topdown/src/persea/controllers/room/component.jsx @@ -40,7 +40,7 @@ const RoomComponent = ({ const [room, setRoom] = useState(); const [roomRenderable, setRoomRenderable] = useState(); const [viewport, setViewport] = useState([0, 0]); - const roomSides = flecks.get('$avocado/topdown-persea.room-sides'); + const roomSides = flecks.get('$avocado/topdown/persea.room-sides'); const [currentPageIndex, setCurrentPageIndex] = useState(0); const onRef = useCallback((stage) => { setEvents(stage?.events()); diff --git a/packages/topdown-persea/src/controllers/room/component.module.scss b/packages/topdown/src/persea/controllers/room/component.module.scss similarity index 100% rename from packages/topdown-persea/src/controllers/room/component.module.scss rename to packages/topdown/src/persea/controllers/room/component.module.scss diff --git a/packages/topdown-persea/src/controllers/room/icon.module.scss b/packages/topdown/src/persea/controllers/room/icon.module.scss similarity index 100% rename from packages/topdown-persea/src/controllers/room/icon.module.scss rename to packages/topdown/src/persea/controllers/room/icon.module.scss diff --git a/packages/topdown-persea/src/controllers/room/img/move.png b/packages/topdown/src/persea/controllers/room/img/move.png similarity index 100% rename from packages/topdown-persea/src/controllers/room/img/move.png rename to packages/topdown/src/persea/controllers/room/img/move.png diff --git a/packages/topdown-persea/src/controllers/room/img/paint.png b/packages/topdown/src/persea/controllers/room/img/paint.png similarity index 100% rename from packages/topdown-persea/src/controllers/room/img/paint.png rename to packages/topdown/src/persea/controllers/room/img/paint.png diff --git a/packages/topdown-persea/src/controllers/room/img/select.png b/packages/topdown/src/persea/controllers/room/img/select.png similarity index 100% rename from packages/topdown-persea/src/controllers/room/img/select.png rename to packages/topdown/src/persea/controllers/room/img/select.png diff --git a/packages/topdown-persea/src/controllers/room/index.js b/packages/topdown/src/persea/controllers/room/index.js similarity index 76% rename from packages/topdown-persea/src/controllers/room/index.js rename to packages/topdown/src/persea/controllers/room/index.js index 3848a10..632e00e 100644 --- a/packages/topdown-persea/src/controllers/room/index.js +++ b/packages/topdown/src/persea/controllers/room/index.js @@ -1,4 +1,4 @@ -import {JsonController} from '@avocado/resource-persea'; +import {JsonController} from '@avocado/resource/persea'; import Component from './component'; diff --git a/packages/topdown-persea/src/controllers/room/map.png b/packages/topdown/src/persea/controllers/room/map.png similarity index 100% rename from packages/topdown-persea/src/controllers/room/map.png rename to packages/topdown/src/persea/controllers/room/map.png diff --git a/packages/topdown-persea/src/index.js b/packages/topdown/src/persea/index.js similarity index 66% rename from packages/topdown-persea/src/index.js rename to packages/topdown/src/persea/index.js index e90eeb9..7272761 100644 --- a/packages/topdown-persea/src/index.js +++ b/packages/topdown/src/persea/index.js @@ -10,16 +10,16 @@ export { export default { [Hooks]: { - '@avocado/resource-persea.controllers': () => [ + '@avocado/resource/persea.controllers': () => [ RoomController, ], '@flecks/core.starting': (flecks) => { flecks.set( - '$avocado/topdown-persea.room-sides', - flecks.invokeFlat('@avocado/topdown-persea.room-sides').flat(), + '$avocado/topdown/persea.room-sides', + flecks.invokeFlat('@avocado/topdown/persea.room-sides').flat(), ); }, - '@avocado/topdown-persea.room-sides': () => [ + '@avocado/topdown/persea.room-sides': () => [ TilesSide, EntitiesSide, ], diff --git a/packages/topdown-persea/src/room-sides/entities-side/group.png b/packages/topdown/src/persea/room-sides/entities-side/group.png similarity index 100% rename from packages/topdown-persea/src/room-sides/entities-side/group.png rename to packages/topdown/src/persea/room-sides/entities-side/group.png diff --git a/packages/topdown-persea/src/room-sides/entities-side/icon.jsx b/packages/topdown/src/persea/room-sides/entities-side/icon.jsx similarity index 100% rename from packages/topdown-persea/src/room-sides/entities-side/icon.jsx rename to packages/topdown/src/persea/room-sides/entities-side/icon.jsx diff --git a/packages/topdown-persea/src/room-sides/entities-side/icon.module.scss b/packages/topdown/src/persea/room-sides/entities-side/icon.module.scss similarity index 100% rename from packages/topdown-persea/src/room-sides/entities-side/icon.module.scss rename to packages/topdown/src/persea/room-sides/entities-side/icon.module.scss diff --git a/packages/topdown-persea/src/room-sides/entities-side/index.js b/packages/topdown/src/persea/room-sides/entities-side/index.js similarity index 100% rename from packages/topdown-persea/src/room-sides/entities-side/index.js rename to packages/topdown/src/persea/room-sides/entities-side/index.js diff --git a/packages/topdown-persea/src/room-sides/entities-side/page.jsx b/packages/topdown/src/persea/room-sides/entities-side/page.jsx similarity index 97% rename from packages/topdown-persea/src/room-sides/entities-side/page.jsx rename to packages/topdown/src/persea/room-sides/entities-side/page.jsx index ac04c5d..f62128a 100644 --- a/packages/topdown-persea/src/room-sides/entities-side/page.jsx +++ b/packages/topdown/src/persea/room-sides/entities-side/page.jsx @@ -1,7 +1,7 @@ /* eslint-disable react/prop-types */ -import {EntityController} from '@avocado/entity-persea'; +import {EntityController} from '@avocado/entity/persea'; import {Color} from '@avocado/graphics'; -import {useJsonPatcher} from '@avocado/resource-persea'; +import {useJsonPatcher} from '@avocado/resource/persea'; import {LfoResult} from '@avocado/timing'; import {merge} from '@flecks/core'; import { diff --git a/packages/topdown-persea/src/room-sides/entities-side/page.module.scss b/packages/topdown/src/persea/room-sides/entities-side/page.module.scss similarity index 100% rename from packages/topdown-persea/src/room-sides/entities-side/page.module.scss rename to packages/topdown/src/persea/room-sides/entities-side/page.module.scss diff --git a/packages/topdown-persea/src/room-sides/tiles-side/icon.jsx b/packages/topdown/src/persea/room-sides/tiles-side/icon.jsx similarity index 100% rename from packages/topdown-persea/src/room-sides/tiles-side/icon.jsx rename to packages/topdown/src/persea/room-sides/tiles-side/icon.jsx diff --git a/packages/topdown-persea/src/room-sides/tiles-side/icon.module.scss b/packages/topdown/src/persea/room-sides/tiles-side/icon.module.scss similarity index 100% rename from packages/topdown-persea/src/room-sides/tiles-side/icon.module.scss rename to packages/topdown/src/persea/room-sides/tiles-side/icon.module.scss diff --git a/packages/topdown-persea/src/room-sides/tiles-side/index.js b/packages/topdown/src/persea/room-sides/tiles-side/index.js similarity index 100% rename from packages/topdown-persea/src/room-sides/tiles-side/index.js rename to packages/topdown/src/persea/room-sides/tiles-side/index.js diff --git a/packages/topdown-persea/src/room-sides/tiles-side/page.jsx b/packages/topdown/src/persea/room-sides/tiles-side/page.jsx similarity index 100% rename from packages/topdown-persea/src/room-sides/tiles-side/page.jsx rename to packages/topdown/src/persea/room-sides/tiles-side/page.jsx diff --git a/packages/topdown-persea/src/room-sides/tiles-side/tileset.png b/packages/topdown/src/persea/room-sides/tiles-side/tileset.png similarity index 100% rename from packages/topdown-persea/src/room-sides/tiles-side/tileset.png rename to packages/topdown/src/persea/room-sides/tiles-side/tileset.png diff --git a/packages/traits-persea/.gitignore b/packages/traits-persea/.gitignore deleted file mode 100644 index 1f22b9c..0000000 --- a/packages/traits-persea/.gitignore +++ /dev/null @@ -1,116 +0,0 @@ -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -lerna-debug.log* - -# Diagnostic reports (https://nodejs.org/api/report.html) -report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage -*.lcov - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# Snowpack dependency directory (https://snowpack.dev/) -web_modules/ - -# TypeScript cache -*.tsbuildinfo - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Microbundle cache -.rpt2_cache/ -.rts2_cache_cjs/ -.rts2_cache_es/ -.rts2_cache_umd/ - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env -.env.test - -# parcel-bundler cache (https://parceljs.org/) -.cache -.parcel-cache - -# Next.js build output -.next -out - -# Nuxt.js build / generate output -.nuxt -dist - -# Gatsby files -.cache/ -# Comment in the public line in if your project uses Gatsby and not Next.js -# https://nextjs.org/blog/next-9-1#public-directory-support -# public - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless/ - -# FuseBox cache -.fusebox/ - -# DynamoDB Local files -.dynamodb/ - -# TernJS port file -.tern-port - -# Stores VSCode versions used for testing VSCode extensions -.vscode-test - -# yarn v2 -.yarn/cache -.yarn/unplugged -.yarn/build-state.yml -.yarn/install-state.gz -.pnp.* diff --git a/packages/traits-persea/build/flecks.yml b/packages/traits-persea/build/flecks.yml deleted file mode 100644 index 6c8bf17..0000000 --- a/packages/traits-persea/build/flecks.yml +++ /dev/null @@ -1,3 +0,0 @@ -'@flecks/core': {} -'@flecks/fleck': {} -'@flecks/react': {} diff --git a/packages/traits-persea/package.json b/packages/traits-persea/package.json deleted file mode 100644 index 342031f..0000000 --- a/packages/traits-persea/package.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "name": "@avocado/traits-persea", - "version": "3.0.0", - "repository": { - "type": "git", - "url": "https://git.hq.cha0s.io/cha0s/avocado.git", - "directory": "packages/traits-persea" - }, - "main": "index.js", - "scripts": { - "build": "flecks build", - "clean": "flecks clean", - "lint": "flecks lint", - "postversion": "cp package.json dist", - "test": "flecks test" - }, - "files": [ - "build", - "index.js", - "index.js.map", - "src", - "test", - "test.js", - "test.js.map" - ], - "dependencies": { - "@flecks/core": "^1.4.1" - }, - "devDependencies": { - "@flecks/fleck": "^1.4.1" - } -} diff --git a/packages/traits-persea/test/exists.js b/packages/traits-persea/test/exists.js deleted file mode 100644 index 1ce8043..0000000 --- a/packages/traits-persea/test/exists.js +++ /dev/null @@ -1,5 +0,0 @@ -import {expect} from 'chai'; - -it('exists', () => { - expect(true).to.be.true; -}); diff --git a/packages/sound-persea/build/flecks.yml b/packages/traits/build/flecks.yml similarity index 100% rename from packages/sound-persea/build/flecks.yml rename to packages/traits/build/flecks.yml diff --git a/packages/traits/package.json b/packages/traits/package.json index 4f04b5c..6c24e5d 100644 --- a/packages/traits/package.json +++ b/packages/traits/package.json @@ -20,6 +20,8 @@ "build", "index.js", "index.js.map", + "persea.js", + "persea.js.map", "src", "test", "test.js", diff --git a/packages/traits-persea/src/index.js b/packages/traits/src/persea/index.js similarity index 59% rename from packages/traits-persea/src/index.js rename to packages/traits/src/persea/index.js index 50e931b..7d552c3 100644 --- a/packages/traits-persea/src/index.js +++ b/packages/traits/src/persea/index.js @@ -4,8 +4,8 @@ export default { [Hooks]: { '@flecks/core.starting': async (flecks) => { flecks.set( - '$avocado/traits-persea.components', - flecks.invokeMerge('@avocado/traits-persea.components'), + '$avocado/traits/persea.components', + flecks.invokeMerge('@avocado/traits/persea.components'), ); }, },