From e6c8a63a04892938bf0f6b4bafe6b1a6e6008497 Mon Sep 17 00:00:00 2001 From: cha0s Date: Fri, 19 Jan 2024 00:15:57 -0600 Subject: [PATCH] refactor: bootstrap --- build/flecks.yml | 9 +- build/web.webpack.config.js | 2 +- lerna.json | 2 +- package.json | 82 +++++++++---------- packages/app/package.json | 34 ++++---- .../app/src/components/app/login/index.jsx | 2 +- packages/bootstrap/package.json | 6 +- packages/combat/package.json | 22 ++--- packages/core/package.json | 30 +++---- packages/farm/package.json | 20 ++--- packages/inventory/package.json | 16 ++-- packages/universe/package.json | 26 +++--- 12 files changed, 124 insertions(+), 127 deletions(-) diff --git a/build/flecks.yml b/build/flecks.yml index c6a8f91..e774942 100644 --- a/build/flecks.yml +++ b/build/flecks.yml @@ -38,17 +38,15 @@ '@avocado/traits': {} '@flecks/core': id: 'humus' -'@flecks/db': {} -'@flecks/db/server': +'@flecks/db': database: '/tmp/humus.sqlite' port: 32352 '@flecks/docker': {} '@flecks/dox': {} -'@flecks/electron/server': +'@flecks/electron': browserWindowOptions: backgroundColor: '#212121' show: false - installExtensions: false '@flecks/governor': {} '@flecks/passport-local-react': {} '@flecks/react': {} @@ -64,8 +62,7 @@ - '--stack-trace-limit=30' - '--inspect' '@flecks/socket': {} -'@flecks/web': {} -'@flecks/web/server': +'@flecks/web': devDisableHostCheck: true dll: - '@babel/core' diff --git a/build/web.webpack.config.js b/build/web.webpack.config.js index 3f9cc5b..22ac9bd 100644 --- a/build/web.webpack.config.js +++ b/build/web.webpack.config.js @@ -1,5 +1,5 @@ const {copy} = require('@flecks/core/server'); -const configFn = require('@flecks/web/server/build/web.webpack.config'); +const configFn = require('@flecks/web/build/web.webpack.config'); module.exports = async (env, argv, flecks) => { const config = await configFn(env, argv, flecks); diff --git a/lerna.json b/lerna.json index d56167d..bb1e14a 100644 --- a/lerna.json +++ b/lerna.json @@ -2,5 +2,5 @@ "packages": [ "packages/*" ], - "version": "2.0.0" + "version": "4.0.0" } diff --git a/package.json b/package.json index f723ac7..9c4d254 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "browserslist": [ "last 2 Chrome versions" ], - "version": "2.0.0", + "version": "4.0.0", "private": true, "scripts": { "build": "FLECKS_ENV__flecks_server__start=0 npm run build:only", @@ -23,51 +23,51 @@ "up": "yarn add $(for i in $(ls node_modules/@flecks); do echo -n \"@flecks/$i \"; done) $(for i in $(ls node_modules/@avocado); do echo -n \"@avocado/$i \"; done)" }, "dependencies": { - "@avocado/behavior": "^3.0.0", - "@avocado/color": "^3.0.0", - "@avocado/core": "^3.0.0", - "@avocado/dialog": "^3.0.0", - "@avocado/entity": "^3.0.0", - "@avocado/filters": "^3.0.0", - "@avocado/graphics": "^3.0.0", - "@avocado/input": "^3.0.0", - "@avocado/math": "^3.0.0", - "@avocado/physics": "^3.0.0", - "@avocado/react": "^3.0.0", - "@avocado/resource": "^3.0.0", - "@avocado/s13n": "^3.0.0", - "@avocado/sound": "^3.0.0", - "@avocado/timing": "^3.0.0", - "@avocado/topdown": "^3.0.0", - "@avocado/traits": "^3.0.0", - "@flecks/core": "^2.0.3", - "@flecks/create-app": "^2.0.3", - "@flecks/db": "^2.0.3", - "@flecks/dox": "^2.0.3", - "@flecks/electron": "^2.0.3", - "@flecks/governor": "^2.0.3", - "@flecks/passport-local-react": "^2.0.3", - "@flecks/react": "^2.0.3", - "@flecks/redis": "^2.0.3", - "@flecks/redux": "^2.0.3", - "@flecks/repl": "^2.0.3", - "@flecks/server": "^2.0.3", - "@flecks/socket": "^2.0.3", - "@flecks/web": "^2.0.3", - "@humus/app": "^2.1.0", - "@humus/bootstrap": "^3.0.0", - "@humus/combat": "^2.1.0", - "@humus/core": "^2.1.0", - "@humus/farm": "^2.1.0", - "@humus/inventory": "^2.1.0", - "@humus/universe": "^2.1.0", + "@avocado/behavior": "^4.0.0", + "@avocado/color": "^4.0.0", + "@avocado/core": "^4.0.0", + "@avocado/dialog": "^4.0.0", + "@avocado/entity": "^4.0.0", + "@avocado/filters": "^4.0.0", + "@avocado/graphics": "^4.0.0", + "@avocado/input": "^4.0.0", + "@avocado/math": "^4.0.0", + "@avocado/physics": "^4.0.0", + "@avocado/react": "^4.0.0", + "@avocado/resource": "^4.0.0", + "@avocado/s13n": "^4.0.0", + "@avocado/sound": "^4.0.0", + "@avocado/timing": "^4.0.0", + "@avocado/topdown": "^4.0.0", + "@avocado/traits": "^4.0.0", + "@flecks/core": "^3.0.0", + "@flecks/create-app": "^3.0.0", + "@flecks/db": "^3.0.0", + "@flecks/dox": "^3.0.0", + "@flecks/electron": "^3.0.0", + "@flecks/governor": "^3.0.0", + "@flecks/passport-local-react": "^3.0.0", + "@flecks/react": "^3.0.0", + "@flecks/redis": "^3.0.0", + "@flecks/redux": "^3.0.0", + "@flecks/repl": "^3.0.0", + "@flecks/server": "^3.0.0", + "@flecks/socket": "^3.0.0", + "@flecks/web": "^3.0.0", + "@humus/app": "^4.0.0", + "@humus/bootstrap": "^4.0.0", + "@humus/combat": "^4.0.0", + "@humus/core": "^4.0.0", + "@humus/farm": "^4.0.0", + "@humus/inventory": "^4.0.0", + "@humus/universe": "^4.0.0", "@inlet/react-pixi": "^6.0.7", "pg": "^8.7.3", "pg-hstore": "^2.3.4" }, "devDependencies": { - "@flecks/create-fleck": "^2.0.3", - "@flecks/docker": "^2.0.3", + "@flecks/create-fleck": "^3.0.0", + "@flecks/docker": "^3.0.0", "lerna": "^3.22.1", "patch-package": "^6.4.7", "postinstall-postinstall": "^2.1.0" diff --git a/packages/app/package.json b/packages/app/package.json index 97375f0..709bc5e 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -1,6 +1,6 @@ { "name": "@humus/app", - "version": "2.1.0", + "version": "4.0.0", "repository": { "type": "git", "url": "https://git.hq.cha0s.io/cha0s/humus.git", @@ -19,25 +19,25 @@ "index.js" ], "dependencies": { - "@avocado/graphics": "^3.0.0", - "@avocado/input": "^3.0.0", - "@avocado/math": "^3.0.0", - "@avocado/react": "^3.0.0", - "@avocado/resource": "^3.0.0", - "@avocado/s13n": "^3.0.0", - "@avocado/topdown": "^3.0.0", - "@flecks/core": "^2.0.3", - "@flecks/passport-local-react": "^2.0.3", - "@flecks/passport-react": "^2.0.3", - "@flecks/react": "^2.0.3", - "@flecks/redux": "^2.0.3", - "@flecks/socket": "^2.0.3", - "@flecks/web": "^2.0.3", - "@humus/inventory": "^2.1.0", + "@avocado/graphics": "^4.0.0", + "@avocado/input": "^4.0.0", + "@avocado/math": "^4.0.0", + "@avocado/react": "^4.0.0", + "@avocado/resource": "^4.0.0", + "@avocado/s13n": "^4.0.0", + "@avocado/topdown": "^4.0.0", + "@flecks/core": "^3.0.0", + "@flecks/passport-local-react": "^3.0.0", + "@flecks/passport-react": "^3.0.0", + "@flecks/react": "^3.0.0", + "@flecks/redux": "^3.0.0", + "@flecks/socket": "^3.0.0", + "@flecks/web": "^3.0.0", + "@humus/inventory": "^4.0.0", "fscreen": "^1.2.0", "react-joystick-component": "^4.0.0" }, "devDependencies": { - "@flecks/fleck": "^2.0.3" + "@flecks/fleck": "^3.0.0" } } diff --git a/packages/app/src/components/app/login/index.jsx b/packages/app/src/components/app/login/index.jsx index 591a98a..f36f9cc 100644 --- a/packages/app/src/components/app/login/index.jsx +++ b/packages/app/src/components/app/login/index.jsx @@ -1,5 +1,5 @@ import {React} from '@flecks/react'; -import {Login as PassportLogin} from '@flecks/passport-local-react'; +import {Login as PassportLogin} from '@flecks/passport-react'; import styles from './index.module.scss'; diff --git a/packages/bootstrap/package.json b/packages/bootstrap/package.json index bc4c659..42d52c7 100644 --- a/packages/bootstrap/package.json +++ b/packages/bootstrap/package.json @@ -1,6 +1,6 @@ { "name": "@humus/bootstrap", - "version": "3.0.0", + "version": "4.0.0", "repository": { "type": "git", "url": "https://git.hq.cha0s.io/cha0s/humus.git", @@ -17,9 +17,9 @@ "server.js" ], "dependencies": { - "@flecks/core": "^2.0.3" + "@flecks/core": "^3.0.0" }, "devDependencies": { - "@flecks/fleck": "^2.0.3" + "@flecks/fleck": "^3.0.0" } } diff --git a/packages/combat/package.json b/packages/combat/package.json index b7faa6f..c1fbb78 100644 --- a/packages/combat/package.json +++ b/packages/combat/package.json @@ -1,6 +1,6 @@ { "name": "@humus/combat", - "version": "2.1.0", + "version": "4.0.0", "repository": { "type": "git", "url": "https://git.hq.cha0s.io/cha0s/humus.git", @@ -21,19 +21,19 @@ "persea.js" ], "dependencies": { - "@avocado/behavior": "^3.0.0", - "@avocado/entity": "^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": "^2.0.3", - "@flecks/react": "^2.0.3", - "@flecks/socket": "^2.0.3", + "@avocado/behavior": "^4.0.0", + "@avocado/entity": "^4.0.0", + "@avocado/math": "^4.0.0", + "@avocado/react": "^4.0.0", + "@avocado/resource": "^4.0.0", + "@avocado/traits": "^4.0.0", + "@flecks/core": "^3.0.0", + "@flecks/react": "^3.0.0", + "@flecks/socket": "^3.0.0", "debug": "4.3.1", "lodash.flatten": "^4.4.0" }, "devDependencies": { - "@flecks/fleck": "^2.0.3" + "@flecks/fleck": "^3.0.0" } } diff --git a/packages/core/package.json b/packages/core/package.json index 5ccff5f..d94a552 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@humus/core", - "version": "2.1.0", + "version": "4.0.0", "repository": { "type": "git", "url": "https://git.hq.cha0s.io/cha0s/humus.git", @@ -23,23 +23,23 @@ "persea.js" ], "dependencies": { - "@avocado/behavior": "^3.0.0", - "@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/s13n": "^3.0.0", - "@avocado/traits": "^3.0.0", - "@flecks/core": "^2.0.3", - "@flecks/react": "^2.0.3", - "@flecks/redux": "^2.0.3", - "@flecks/socket": "^2.0.3", + "@avocado/behavior": "^4.0.0", + "@avocado/core": "^4.0.0", + "@avocado/entity": "^4.0.0", + "@avocado/graphics": "^4.0.0", + "@avocado/math": "^4.0.0", + "@avocado/react": "^4.0.0", + "@avocado/resource": "^4.0.0", + "@avocado/s13n": "^4.0.0", + "@avocado/traits": "^4.0.0", + "@flecks/core": "^3.0.0", + "@flecks/react": "^3.0.0", + "@flecks/redux": "^3.0.0", + "@flecks/socket": "^3.0.0", "debug": "4.3.1", "is-electron": "^2.2.1" }, "devDependencies": { - "@flecks/fleck": "^2.0.3" + "@flecks/fleck": "^3.0.0" } } diff --git a/packages/farm/package.json b/packages/farm/package.json index add259d..0f625b9 100644 --- a/packages/farm/package.json +++ b/packages/farm/package.json @@ -1,6 +1,6 @@ { "name": "@humus/farm", - "version": "2.1.0", + "version": "4.0.0", "repository": { "type": "git", "url": "https://git.hq.cha0s.io/cha0s/humus.git", @@ -20,17 +20,17 @@ "index.js" ], "dependencies": { - "@avocado/behavior": "^3.0.0", - "@avocado/core": "^3.0.0", - "@avocado/graphics": "^3.0.0", - "@avocado/math": "^3.0.0", - "@avocado/timing": "^3.0.0", - "@avocado/traits": "^3.0.0", - "@flecks/core": "^2.0.3", - "@flecks/socket": "^2.0.3", + "@avocado/behavior": "^4.0.0", + "@avocado/core": "^4.0.0", + "@avocado/graphics": "^4.0.0", + "@avocado/math": "^4.0.0", + "@avocado/timing": "^4.0.0", + "@avocado/traits": "^4.0.0", + "@flecks/core": "^3.0.0", + "@flecks/socket": "^3.0.0", "debug": "4.3.1" }, "devDependencies": { - "@flecks/fleck": "^2.0.3" + "@flecks/fleck": "^3.0.0" } } diff --git a/packages/inventory/package.json b/packages/inventory/package.json index c97505e..20b4e26 100644 --- a/packages/inventory/package.json +++ b/packages/inventory/package.json @@ -1,6 +1,6 @@ { "name": "@humus/inventory", - "version": "2.1.0", + "version": "4.0.0", "repository": { "type": "git", "url": "https://git.hq.cha0s.io/cha0s/humus.git", @@ -20,15 +20,15 @@ "index.js" ], "dependencies": { - "@avocado/behavior": "^3.0.0", - "@avocado/timing": "^3.0.0", - "@avocado/traits": "^3.0.0", - "@flecks/core": "^2.0.3", - "@flecks/react": "^2.0.3", - "@flecks/socket": "^2.0.3", + "@avocado/behavior": "^4.0.0", + "@avocado/timing": "^4.0.0", + "@avocado/traits": "^4.0.0", + "@flecks/core": "^3.0.0", + "@flecks/react": "^3.0.0", + "@flecks/socket": "^3.0.0", "debug": "4.3.1" }, "devDependencies": { - "@flecks/fleck": "^2.0.3" + "@flecks/fleck": "^3.0.0" } } diff --git a/packages/universe/package.json b/packages/universe/package.json index 27294f7..788eead 100644 --- a/packages/universe/package.json +++ b/packages/universe/package.json @@ -1,6 +1,6 @@ { "name": "@humus/universe", - "version": "2.1.0", + "version": "4.0.0", "repository": { "type": "git", "url": "https://git.hq.cha0s.io/cha0s/humus.git", @@ -22,21 +22,21 @@ "server.js" ], "dependencies": { - "@avocado/filters": "^3.0.0", - "@avocado/math": "^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": "^2.0.3", - "@flecks/react": "^2.0.3", - "@flecks/redux": "^2.0.3", - "@flecks/socket": "^2.0.3", - "@humus/app": "^2.1.0", + "@avocado/filters": "^4.0.0", + "@avocado/math": "^4.0.0", + "@avocado/resource": "^4.0.0", + "@avocado/s13n": "^4.0.0", + "@avocado/timing": "^4.0.0", + "@avocado/traits": "^4.0.0", + "@flecks/core": "^3.0.0", + "@flecks/react": "^3.0.0", + "@flecks/redux": "^3.0.0", + "@flecks/socket": "^3.0.0", + "@humus/app": "^4.0.0", "debug": "4.3.1", "express": "^4.17.1" }, "devDependencies": { - "@flecks/fleck": "^2.0.3" + "@flecks/fleck": "^3.0.0" } }