fix(electron): extensions
This commit is contained in:
parent
f1df3c60ce
commit
1bcd198aaf
|
@ -24,11 +24,7 @@ exports.hooks = {
|
|||
/**
|
||||
* Install devtools extensions (by default).
|
||||
*
|
||||
* If `true`, will install some devtools extensions based on which flecks are enabled.
|
||||
*
|
||||
* You can pass an array of Chrome store IDs to install a list of custom extensions.
|
||||
*
|
||||
* Extensions will not be installed if `'production' === process.env.NODE_ENV`
|
||||
*/
|
||||
installExtensions: true,
|
||||
/**
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
],
|
||||
"dependencies": {
|
||||
"@flecks/core": "^3.0.0",
|
||||
"electron": "^18.0.1",
|
||||
"electron": "^28.1.4",
|
||||
"electron-devtools-installer": "^3.2.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
|
|
@ -2,10 +2,6 @@ import {Flecks} from '@flecks/core';
|
|||
|
||||
const electron = __non_webpack_require__('electron');
|
||||
|
||||
const {
|
||||
NODE_ENV,
|
||||
} = process.env;
|
||||
|
||||
let win;
|
||||
|
||||
async function createWindow(flecks) {
|
||||
|
@ -39,27 +35,15 @@ export const hooks = {
|
|||
},
|
||||
'@flecks/electron/server.window': async (win, flecks) => {
|
||||
const {public: $$public} = flecks.get('@flecks/web');
|
||||
const {
|
||||
installExtensions,
|
||||
url = `http://${$$public}`,
|
||||
} = flecks.get('@flecks/electron');
|
||||
if (installExtensions && 'production' !== NODE_ENV) {
|
||||
const {
|
||||
default: installExtension,
|
||||
REDUX_DEVTOOLS,
|
||||
REACT_DEVELOPER_TOOLS,
|
||||
} = __non_webpack_require__('electron-devtools-installer');
|
||||
let extensions = installExtensions;
|
||||
if (!Array.isArray(extensions)) {
|
||||
extensions = [];
|
||||
if (flecks.fleck('@flecks/react')) {
|
||||
extensions.push(REACT_DEVELOPER_TOOLS);
|
||||
}
|
||||
if (flecks.fleck('@flecks/redux')) {
|
||||
extensions.push(REDUX_DEVTOOLS);
|
||||
}
|
||||
}
|
||||
await installExtension(extensions);
|
||||
const {installExtensions, url = `http://${$$public}`} = flecks.get('@flecks/electron');
|
||||
if (installExtensions) {
|
||||
const installer = __non_webpack_require__('electron-devtools-installer');
|
||||
const {default: installExtension} = installer;
|
||||
await installExtension([
|
||||
...Array.isArray(installExtensions) ? installExtensions : [],
|
||||
...flecks.invokeFlat('@flecks/electron/server.extensions', installer)
|
||||
.flat(),
|
||||
]);
|
||||
}
|
||||
await win.loadURL(url);
|
||||
},
|
||||
|
|
|
@ -3,6 +3,7 @@ import {Flecks} from '@flecks/core';
|
|||
import ssr from './ssr';
|
||||
|
||||
export const hooks = {
|
||||
'@flecks/electron/server.extensions': (installer) => [installer.REACT_DEVELOPER_TOOLS],
|
||||
'@flecks/web/server.stream.html': Flecks.priority(
|
||||
(stream, req, flecks) => (
|
||||
flecks.get('@flecks/react.ssr') ? ssr(stream, req, flecks) : stream
|
||||
|
|
|
@ -9,6 +9,11 @@ const debug = D('@flecks/redux/server');
|
|||
const debugSilly = debug.extend('silly');
|
||||
|
||||
export const hooks = {
|
||||
'@flecks/electron/server.extensions': (installer) => [installer.REDUX_DEVTOOLS],
|
||||
'@flecks/react.providers': Flecks.priority(
|
||||
(req) => [Provider, {store: req.redux}],
|
||||
{before: '@flecks/react/router/server'},
|
||||
),
|
||||
'@flecks/web/server.request.route': (flecks) => async (req, res, next) => {
|
||||
const slices = await flecks.invokeMergeUnique('@flecks/redux.slices');
|
||||
const reducer = createReducer(flecks, slices);
|
||||
|
@ -30,8 +35,4 @@ export const hooks = {
|
|||
preloadedState: req.redux.getState(),
|
||||
},
|
||||
}),
|
||||
'@flecks/react.providers': Flecks.priority(
|
||||
(req) => [Provider, {store: req.redux}],
|
||||
{before: '@flecks/react/router/server'},
|
||||
),
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue
Block a user