From 67553647f6a97407ae6308ba0b5e5ef21eec7641 Mon Sep 17 00:00:00 2001 From: cha0s Date: Mon, 22 Jan 2024 09:16:21 -0600 Subject: [PATCH] refactor: build --- build/flecks.yml | 5 ++--- build/web.webpack.config.js | 2 +- package.json | 3 ++- packages/app/build/flecks.bootstrap.js | 1 + packages/app/build/flecks.yml | 3 --- packages/app/package.json | 1 + packages/bootstrap/package.json | 1 + packages/bootstrap/src/server.js | 2 +- packages/combat/build/flecks.bootstrap.js | 1 + packages/combat/build/flecks.yml | 3 --- packages/combat/package.json | 1 + packages/core/build/flecks.bootstrap.js | 1 + packages/core/build/flecks.yml | 3 --- packages/core/package.json | 1 + packages/farm/package.json | 1 + packages/inventory/package.json | 1 + packages/universe/build/flecks.bootstrap.js | 1 + packages/universe/build/flecks.yml | 3 --- packages/universe/package.json | 1 + 19 files changed, 17 insertions(+), 18 deletions(-) create mode 100644 packages/app/build/flecks.bootstrap.js delete mode 100644 packages/app/build/flecks.yml create mode 100644 packages/combat/build/flecks.bootstrap.js delete mode 100644 packages/combat/build/flecks.yml create mode 100644 packages/core/build/flecks.bootstrap.js delete mode 100644 packages/core/build/flecks.yml create mode 100644 packages/universe/build/flecks.bootstrap.js delete mode 100644 packages/universe/build/flecks.yml diff --git a/build/flecks.yml b/build/flecks.yml index e774942..9b8a36a 100644 --- a/build/flecks.yml +++ b/build/flecks.yml @@ -36,6 +36,8 @@ '@avocado/timing': {} '@avocado/topdown': {} '@avocado/traits': {} +'@flecks/build': + packageManager: 'yarn' '@flecks/core': id: 'humus' '@flecks/db': @@ -91,9 +93,6 @@ - 'react-window' port: 32350 public: 'humus.localhost' - 'request.socket': - - '@humus/universe/server' - - '...' '@humus/app': resolution: [1600, 900] '@humus/bootstrap': {} diff --git a/build/web.webpack.config.js b/build/web.webpack.config.js index 22ac9bd..fc0700e 100644 --- a/build/web.webpack.config.js +++ b/build/web.webpack.config.js @@ -1,4 +1,4 @@ -const {copy} = require('@flecks/core/server'); +const {copy} = require('@flecks/build/server'); const configFn = require('@flecks/web/build/web.webpack.config'); module.exports = async (env, argv, flecks) => { diff --git a/package.json b/package.json index 9c4d254..120067c 100644 --- a/package.json +++ b/package.json @@ -66,9 +66,10 @@ "pg-hstore": "^2.3.4" }, "devDependencies": { + "@flecks/build": "^3.0.0", "@flecks/create-fleck": "^3.0.0", "@flecks/docker": "^3.0.0", - "lerna": "^3.22.1", + "lerna": "^8.0.2", "patch-package": "^6.4.7", "postinstall-postinstall": "^2.1.0" } diff --git a/packages/app/build/flecks.bootstrap.js b/packages/app/build/flecks.bootstrap.js new file mode 100644 index 0000000..938ee70 --- /dev/null +++ b/packages/app/build/flecks.bootstrap.js @@ -0,0 +1 @@ +exports.dependencies = ['@flecks/react']; diff --git a/packages/app/build/flecks.yml b/packages/app/build/flecks.yml deleted file mode 100644 index 6c8bf17..0000000 --- a/packages/app/build/flecks.yml +++ /dev/null @@ -1,3 +0,0 @@ -'@flecks/core': {} -'@flecks/fleck': {} -'@flecks/react': {} diff --git a/packages/app/package.json b/packages/app/package.json index 709bc5e..fc33453 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -38,6 +38,7 @@ "react-joystick-component": "^4.0.0" }, "devDependencies": { + "@flecks/build": "^3.0.0", "@flecks/fleck": "^3.0.0" } } diff --git a/packages/bootstrap/package.json b/packages/bootstrap/package.json index 42d52c7..5dc30c5 100644 --- a/packages/bootstrap/package.json +++ b/packages/bootstrap/package.json @@ -20,6 +20,7 @@ "@flecks/core": "^3.0.0" }, "devDependencies": { + "@flecks/build": "^3.0.0", "@flecks/fleck": "^3.0.0" } } diff --git a/packages/bootstrap/src/server.js b/packages/bootstrap/src/server.js index d97d27e..8be8287 100644 --- a/packages/bootstrap/src/server.js +++ b/packages/bootstrap/src/server.js @@ -13,6 +13,6 @@ export const hooks = { await user.save(); } }, - {after: ['@flecks/passport/server']}, + {after: '@flecks/passport/server', before: '@flecks/web/server'}, ), }; diff --git a/packages/combat/build/flecks.bootstrap.js b/packages/combat/build/flecks.bootstrap.js new file mode 100644 index 0000000..938ee70 --- /dev/null +++ b/packages/combat/build/flecks.bootstrap.js @@ -0,0 +1 @@ +exports.dependencies = ['@flecks/react']; diff --git a/packages/combat/build/flecks.yml b/packages/combat/build/flecks.yml deleted file mode 100644 index 6c8bf17..0000000 --- a/packages/combat/build/flecks.yml +++ /dev/null @@ -1,3 +0,0 @@ -'@flecks/core': {} -'@flecks/fleck': {} -'@flecks/react': {} diff --git a/packages/combat/package.json b/packages/combat/package.json index c1fbb78..71bbbf9 100644 --- a/packages/combat/package.json +++ b/packages/combat/package.json @@ -34,6 +34,7 @@ "lodash.flatten": "^4.4.0" }, "devDependencies": { + "@flecks/build": "^3.0.0", "@flecks/fleck": "^3.0.0" } } diff --git a/packages/core/build/flecks.bootstrap.js b/packages/core/build/flecks.bootstrap.js new file mode 100644 index 0000000..938ee70 --- /dev/null +++ b/packages/core/build/flecks.bootstrap.js @@ -0,0 +1 @@ +exports.dependencies = ['@flecks/react']; diff --git a/packages/core/build/flecks.yml b/packages/core/build/flecks.yml deleted file mode 100644 index 6c8bf17..0000000 --- a/packages/core/build/flecks.yml +++ /dev/null @@ -1,3 +0,0 @@ -'@flecks/core': {} -'@flecks/fleck': {} -'@flecks/react': {} diff --git a/packages/core/package.json b/packages/core/package.json index d94a552..29d7eb7 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -40,6 +40,7 @@ "is-electron": "^2.2.1" }, "devDependencies": { + "@flecks/build": "^3.0.0", "@flecks/fleck": "^3.0.0" } } diff --git a/packages/farm/package.json b/packages/farm/package.json index 0f625b9..1ebd4a5 100644 --- a/packages/farm/package.json +++ b/packages/farm/package.json @@ -31,6 +31,7 @@ "debug": "4.3.1" }, "devDependencies": { + "@flecks/build": "^3.0.0", "@flecks/fleck": "^3.0.0" } } diff --git a/packages/inventory/package.json b/packages/inventory/package.json index 20b4e26..d4ba99c 100644 --- a/packages/inventory/package.json +++ b/packages/inventory/package.json @@ -29,6 +29,7 @@ "debug": "4.3.1" }, "devDependencies": { + "@flecks/build": "^3.0.0", "@flecks/fleck": "^3.0.0" } } diff --git a/packages/universe/build/flecks.bootstrap.js b/packages/universe/build/flecks.bootstrap.js new file mode 100644 index 0000000..938ee70 --- /dev/null +++ b/packages/universe/build/flecks.bootstrap.js @@ -0,0 +1 @@ +exports.dependencies = ['@flecks/react']; diff --git a/packages/universe/build/flecks.yml b/packages/universe/build/flecks.yml deleted file mode 100644 index 6c8bf17..0000000 --- a/packages/universe/build/flecks.yml +++ /dev/null @@ -1,3 +0,0 @@ -'@flecks/core': {} -'@flecks/fleck': {} -'@flecks/react': {} diff --git a/packages/universe/package.json b/packages/universe/package.json index 788eead..4e9ff27 100644 --- a/packages/universe/package.json +++ b/packages/universe/package.json @@ -37,6 +37,7 @@ "express": "^4.17.1" }, "devDependencies": { + "@flecks/build": "^3.0.0", "@flecks/fleck": "^3.0.0" } }