Skip to content

Commit

Permalink
ref/ electron main from js to ts
Browse files Browse the repository at this point in the history
  • Loading branch information
maximegris committed May 23, 2017
1 parent 93dcc52 commit 835d32b
Show file tree
Hide file tree
Showing 4 changed files with 78 additions and 88 deletions.
81 changes: 0 additions & 81 deletions main.js

This file was deleted.

71 changes: 71 additions & 0 deletions main.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
import { app, BrowserWindow, screen } from 'electron';
import * as path from 'path';


let win, serve;
const args = process.argv.slice(1);
serve = args.some(val => val === "--serve");

if (serve) {
require('electron-reload')(__dirname, {
});
}

function createWindow() {

let electronScreen = screen;
let size = electronScreen.getPrimaryDisplay().workAreaSize;

// Create the browser window.
win = new BrowserWindow({
x: 0,
y: 0,
width: size.width,
height: size.height
});

// and load the index.html of the app.
win.loadURL('file://' + __dirname + '/index.html');

// Open the DevTools.
if (serve) {
win.webContents.openDevTools();
}

// Emitted when the window is closed.
win.on('closed', () => {
// Dereference the window object, usually you would store window
// in an array if your app supports multi windows, this is the time
// when you should delete the corresponding element.
win = null;
});
}

try {

// This method will be called when Electron has finished
// initialization and is ready to create browser windows.
// Some APIs can only be used after this event occurs.
app.on('ready', createWindow);

// Quit when all windows are closed.
app.on('window-all-closed', () => {
// On OS X it is common for applications and their menu bar
// to stay active until the user quits explicitly with Cmd + Q
if (process.platform !== 'darwin') {
app.quit();
}
});

app.on('activate', () => {
// On OS X it's common to re-create a window in the app when the
// dock icon is clicked and there are no other windows open.
if (win === null) {
createWindow();
}
});

} catch (e) {
// Catch Error
//throw e;
}
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@
"ng": "ng",
"lint": "ng lint",
"start": "webpack --watch",
"start:web": "webpack-dev-server . --port 4200",
"build": "webpack --display-error-details && copyfiles main.js package.json dist",
"dependencies:prod": "cd ./dist && npm install --only=prod && cd ..",
"start:web": "webpack-dev-server --content-base . --port 4200 --inline",
"build:electron:main": "tsc main.ts --outDir dist && copyfiles package.json dist",
"build": "webpack --display-error-details && npm run build:electron:main",
"build:prod": "cross-env NODE_ENV='production' npm run build",
"electron:serve": "electron . --serve",
"electron:serve": "npm run build:electron:main && electron ./dist --serve",
"electron:test": "electron ./dist",
"electron:dev": "npm run build && electron dist/main.js",
"electron:prod": "npm run build:prod && electron dist/main.js",
"electron:linux": "npm run build:prod && node package.js --asar --platform=linux --arch=x64",
"electron:windows": "npm run build:prod && node package.js --asar --platform=win32 --arch=ia32",
"electron:mac": "npm run build:prod && node package.js --asar --platform=darwin --arch=x64",
"test": "karma start ./karma.conf.js",
"e2e": "protractor ./protractor.conf.js",
"pree2e": "webdriver-manager update --standalone false --gecko false --quiet"
"pree2e": "webdriver-manager update --standalone false --gecko false --quiet && npm run build",
"e2e": "protractor ./protractor.conf.js"
},
"dependencies": {
"@angular/common": "4.0.2",
Expand Down
2 changes: 1 addition & 1 deletion protractor.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ exports.config = {
'browserName': 'chrome',
chromeOptions: {
binary: './node_modules/electron/dist/electron.exe',
args: ['--test-type=webdriver', 'app=main.js']
args: ['--test-type=webdriver', 'app=dist/main.js']
}
},
directConnect: true,
Expand Down

0 comments on commit 835d32b

Please sign in to comment.