diff --git a/build/flecks.yml b/build/flecks.yml index 9b8a36a..ac73cbb 100644 --- a/build/flecks.yml +++ b/build/flecks.yml @@ -93,13 +93,12 @@ - 'react-window' port: 32350 public: 'humus.localhost' -'@humus/app': +'@humus/app:./packages/app': resolution: [1600, 900] -'@humus/bootstrap': {} -'@humus/combat': {} -'@humus/core': {} -'@humus/core/electron': {} -'@humus/farm': {} -'@humus/inventory': {} -'@humus/universe': +'@humus/bootstrap:./packages/bootstrap': {} +'@humus/combat:./packages/combat': {} +'@humus/core:./packages/core': {} +'@humus/farm:./packages/farm': {} +'@humus/inventory:./packages/inventory': {} +'@humus/universe:./packages/universe': resource: '../persea/projects/c41ddaac-89c2-46a4-b3e5-1d634a1a7c36' diff --git a/packages/core/package.json b/packages/core/package.json index 29d7eb7..65326da 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -17,7 +17,6 @@ "test": "flecks test" }, "files": [ - "electron/server.js", "index.js", "server.js", "persea.js" diff --git a/packages/core/src/electron/server.js b/packages/core/src/electron/server.js deleted file mode 100644 index 681fbd8..0000000 --- a/packages/core/src/electron/server.js +++ /dev/null @@ -1,33 +0,0 @@ -import {Flecks} from '@flecks/core'; -import isElectron from 'is-electron'; - -const { - NODE_ENV, -} = process.env; - -export const hooks = { - '@flecks/electron/server.window': Flecks.priority( - async (win) => { - // win.removeMenu(); - if ('production' !== NODE_ENV) { - win.openDevTools(); - } - win.maximize(); - win.once('ready-to-show', () => { - win.show(); - }); - }, - {after: '@flecks/electron/server'}, - ), - '@flecks/web/server.request.route': Flecks.priority( - (flecks) => async (req, res, next) => { - if (isElectron() && 0 === req.user.id) { - const {User} = flecks.db.Models; - req.logIn(await User.findByPk(1), next); - return; - } - next(); - }, - {after: '@flecks/passport/server'}, - ), -}; diff --git a/packages/core/src/server.js b/packages/core/src/server.js index 52d94a7..8ea526d 100644 --- a/packages/core/src/server.js +++ b/packages/core/src/server.js @@ -1,11 +1,39 @@ import {join} from 'path'; +import {Flecks} from '@flecks/core'; +import isElectron from 'is-electron'; + const { FLECKS_CORE_ROOT = process.cwd(), + NODE_ENV, } = process.env; export const hooks = { '@flecks/electron/server.browserWindowOptions.alter': (browserWindowOptions) => { browserWindowOptions.icon = join(FLECKS_CORE_ROOT, 'icon.png'); }, + '@flecks/electron/server.window': Flecks.priority( + async (win) => { + // win.removeMenu(); + if ('production' !== NODE_ENV) { + win.openDevTools(); + } + win.maximize(); + win.once('ready-to-show', () => { + win.show(); + }); + }, + {after: '@flecks/electron/server'}, + ), + '@flecks/web/server.request.route': Flecks.priority( + (flecks) => async (req, res, next) => { + if (isElectron() && 0 === req.user.id) { + const {User} = flecks.db.Models; + req.logIn(await User.findByPk(1), next); + return; + } + next(); + }, + {after: '@flecks/passport/server'}, + ), };