Skip to content

Commit

Permalink
release 0.2.5
Browse files Browse the repository at this point in the history
  • Loading branch information
kitze committed Jun 7, 2018
1 parent 4188f58 commit 091eaa1
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "cra-electron",
"description": "CRA + Electron sitting in a tree",
"author": "Kitze",
"version": "0.2.4",
"version": "0.2.5",
"private": true,
"dependencies": {
"cross-env": "5.1.6",
Expand Down
28 changes: 14 additions & 14 deletions public/electron.js
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
const electron = require('electron');
const electron = require("electron");
const app = electron.app;
const BrowserWindow = electron.BrowserWindow;

const path = require('path');
const isDev = require('electron-is-dev');
const initAutoUpdate = require('update-electron-app');
const path = require("path");
const isDev = require("electron-is-dev");

let mainWindow;

initAutoUpdate({
repo: 'kitze/react-electron-example'
require("update-electron-app")({
repo: "kitze/react-electron-example",
updateInterval: "1 hour"
});

function createWindow() {
mainWindow = new BrowserWindow({width: 900, height: 680});
mainWindow = new BrowserWindow({ width: 900, height: 680 });
mainWindow.loadURL(
isDev
? 'http://localhost:3000'
: `file://${path.join(__dirname, '../build/index.html')}`
? "http://localhost:3000"
: `file://${path.join(__dirname, "../build/index.html")}`
);
mainWindow.on('closed', () => (mainWindow = null));
mainWindow.on("closed", () => (mainWindow = null));
}

app.on('ready', createWindow);
app.on("ready", createWindow);

app.on('window-all-closed', () => {
if (process.platform !== 'darwin') {
app.on("window-all-closed", () => {
if (process.platform !== "darwin") {
app.quit();
}
});

app.on('activate', () => {
app.on("activate", () => {
if (mainWindow === null) {
createWindow();
}
Expand Down
2 changes: 1 addition & 1 deletion src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class App extends Component {
<h2>React + Electron = <span role="img" aria-label="love">😍</span></h2>
</div>
<p className="App-intro">
<b> Release 0.2.4 </b>
<b> Release 0.2.5 </b>
Version: {app.getVersion()}
</p>
</div>
Expand Down

0 comments on commit 091eaa1

Please sign in to comment.