Update modules, use latest electron and fix bad requires. App is up and running, but needs debugging of the frontend and a fierce refactor.

This commit is contained in:
mmcwilliams 2017-12-19 22:02:08 -05:00
parent 236908993e
commit 339303c0c2
4 changed files with 6661 additions and 9 deletions

View File

@ -1,7 +1,6 @@
#!/bin/bash #!/bin/bash
npm install -g gulp electron npm install -g gulp electron
npm install electron-prebuilt
npm install npm install
./node_modules/.bin/electron-rebuild ./node_modules/.bin/electron-rebuild
mkdir logs mkdir logs

View File

@ -1,13 +1,13 @@
var electron = require('electron'), var electron = require('electron'),
fs = require('fs'), Menu = electron.Menu,
Menu = require('menu'), MenuItem = electron.MenuItem,
MenuItem = require('menu-item'), ipcMain = electron.ipcMain,
ipcMain = require('electron').ipcMain, BrowserWindow = electron.BrowserWindow,
app = electron.app, app = electron.app,
fs = require('fs'),
winston = require('winston'), winston = require('winston'),
moment = require('moment'), moment = require('moment'),
BrowserWindow = electron.BrowserWindow,
uuid = require('uuid'), uuid = require('uuid'),
Q = require('q'), Q = require('q'),
events = require('events'), events = require('events'),

6652
app/package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -4,7 +4,8 @@
"description": "16mm optical printer", "description": "16mm optical printer",
"main": "main.js", "main": "main.js",
"scripts": { "scripts": {
"start": "gulp && electron main.js" "start": "gulp && electron main.js",
"install": "electron-rebuild"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
@ -23,20 +24,20 @@
}, },
"homepage": "https://github.com/sixteenmillimeter/mcopy#readme", "homepage": "https://github.com/sixteenmillimeter/mcopy#readme",
"devDependencies": { "devDependencies": {
"electron-inspector": "^0.1.4",
"electron-packager": "^8.4.0", "electron-packager": "^8.4.0",
"electron-prebuilt": "^1.4.12",
"electron-rebuild": "^1.4.0", "electron-rebuild": "^1.4.0",
"gulp": "^3.9.1", "gulp": "^3.9.1",
"gulp-concat": "^2.6.1", "gulp-concat": "^2.6.1",
"gulp-less": "^3.3.0" "gulp-less": "^3.3.0"
}, },
"dependencies": { "dependencies": {
"electron": "^1.8.1",
"humanize-duration": "^3.10.0", "humanize-duration": "^3.10.0",
"moment": "^2.17.1", "moment": "^2.17.1",
"node-notifier": "^4.6.1", "node-notifier": "^4.6.1",
"q": "^1.4.1", "q": "^1.4.1",
"serialport": "^4.0.7", "serialport": "^4.0.7",
"sqlite3": "^3.1.13",
"uuid": "^3.0.1", "uuid": "^3.0.1",
"winston": "^2.3.0" "winston": "^2.3.0"
} }