Skip to content

Commit 669046a

Browse files
committed
updated support for electron
1 parent c14b90f commit 669046a

File tree

9 files changed

+7130
-7000
lines changed

9 files changed

+7130
-7000
lines changed

.storybook/config.js

Lines changed: 0 additions & 8 deletions
This file was deleted.

.storybook/main.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module.exports = {
2+
stories: ['../stories/*.js'],
3+
addons: ['@storybook/preset-create-react-app']
4+
}

electron/electronWindows.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,10 @@ function createWindow(windowId, options = {}) {
103103
REACT_DEVELOPER_TOOLS
104104
} = require('electron-devtools-installer');
105105

106-
installExtension(REACT_DEVELOPER_TOOLS).catch(e => {
107-
console.error('Could not install React developer tools', e);
108-
});
106+
// TODO: fix this
107+
// installExtension(REACT_DEVELOPER_TOOLS).catch(e => {
108+
// console.error('Could not install React developer tools', e);
109+
// });
109110
} catch (e) {
110111
console.error('Could not install developer extensions', e);
111112
}

electron/index.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
const fs = require('fs');
22
const path = require('path');
3-
const {app, Menu} = require('electron');
3+
const {app, Menu, ipcMain} = require('electron');
4+
45
const {
56
createWindow,
67
defineWindow,
@@ -25,7 +26,8 @@ function createMainWindow() {
2526
center: true,
2627
autoHideMenuBar: true,
2728
webPreferences: {
28-
nodeIntegration: true
29+
nodeIntegration: true,
30+
contextIsolation: false
2931
},
3032
title: app.getName()
3133
};
@@ -148,8 +150,7 @@ app.on('ready', () => {
148150
});
149151
});
150152

151-
// receive log events from the render thread
152-
app.on('log-event', args => {
153+
ipcMain.handle('log-event', async (event, args) => {
153154
try {
154155
const logPath = path.normalize(`console.log`);
155156
const payload = `\n${new Date().toTimeString()} ${args.level}: ${args.args}`;

package.json

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
"main": "main.js",
66
"homepage": "./",
77
"dependencies": {
8-
"@craco/craco": "^5.6.3",
9-
"react": "^16.12.0",
10-
"react-dom": "^16.12.0",
11-
"react-scripts": "^3.3.0"
8+
"@craco/craco": "^6.1.2",
9+
"react": "^17.0.2",
10+
"react-dom": "^17.0.2",
11+
"react-scripts": "^4.0.3"
1212
},
1313
"scripts": {
1414
"analyze": "source-map-explorer 'build/static/js/*.js'",
@@ -23,31 +23,36 @@
2323
"test": "craco test"
2424
},
2525
"eslintConfig": {
26-
"extends": "react-app"
26+
"extends": [
27+
"react-app",
28+
"react-app/jest"
29+
]
2730
},
2831
"browserslist": [
2932
">0.2%",
3033
"not dead",
31-
"not ie <= 11",
3234
"not op_mini all"
3335
],
36+
"engines": {
37+
"node": ">= 10.16"
38+
},
3439
"devDependencies": {
35-
"@babel/core": "^7.8.3",
36-
"@storybook/react": "^5.3.9",
37-
"@types/jest": "^24.9.1",
38-
"@types/node": "^13.5.0",
39-
"@types/react": "^16.9.19",
40-
"@types/react-dom": "^16.9.5",
41-
"babel-loader": "^8.0.6",
42-
"concurrently": "^5.0.2",
43-
"copyfiles": "^2.2.0",
44-
"cross-env": "^7.0.0",
45-
"electron": "^7.1.10",
46-
"electron-devtools-installer": "^2.2.4",
47-
"electron-packager": "^14.2.0",
48-
"source-map-explorer": "^2.2.2",
49-
"typescript": "^3.7.5",
50-
"wait-on": "^4.0.0",
51-
"webpack-cli": "^3.3.11"
40+
"@babel/core": "^7.14.0",
41+
"@storybook/preset-create-react-app": "^3.1.7",
42+
"@storybook/react": "^6.2.9",
43+
"@types/jest": "^26.0.23",
44+
"@types/node": "^15.0.1",
45+
"@types/react": "^17.0.4",
46+
"@types/react-dom": "^17.0.3",
47+
"concurrently": "^6.0.2",
48+
"copyfiles": "^2.4.1",
49+
"cross-env": "^7.0.3",
50+
"electron": "^12.0.6",
51+
"electron-devtools-installer": "^3.2.0",
52+
"electron-packager": "^15.2.0",
53+
"source-map-explorer": "^2.5.2",
54+
"typescript": "^4.2.4",
55+
"wait-on": "^5.3.0",
56+
"webpack-cli": "^4.6.0"
5257
}
5358
}

src/logger.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {remote} from 'electron';
1+
import {ipcRenderer} from 'electron';
22

33
/**
44
* The console.log levels that will be intercepted.
@@ -55,7 +55,7 @@ export const registerLogHandler = (handler) => {
5555
* @returns {Function}
5656
*/
5757
export const createElectronHandler = eventName => (level, ...args) => {
58-
remote.app.emit(eventName, {
58+
ipcRenderer.invoke(eventName, {
5959
level,
6060
args
6161
});

stories/Button.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import React from 'react';
2+
import {Button} from '@storybook/react/demo';
3+
4+
/**
5+
* Develop your components in isolation here using https://storybook.js.org/
6+
*/
7+
8+
export const Primary = () => <Button primary><span role="img" aria-label="so cool">😀 😎 👍 💯</span></Button>;

stories/index.js

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)