Update all modules in app to latest version, including electron. Removed electron updater because of no plans to integrate and to reduce the app size.
This commit is contained in:
parent
112e6b543c
commit
85bfa57127
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"version": "1.6.6",
|
"version": "1.6.7",
|
||||||
"ext_port": 1111,
|
"ext_port": 1111,
|
||||||
"profiles": {
|
"profiles": {
|
||||||
"mcopy": {
|
"mcopy": {
|
||||||
|
|
|
@ -149,6 +149,7 @@ class FilmOut {
|
||||||
if (!files)
|
if (!files)
|
||||||
return false;
|
return false;
|
||||||
pathStr = files.filePaths[0];
|
pathStr = files.filePaths[0];
|
||||||
|
console.dir(pathStr);
|
||||||
if (pathStr && pathStr !== '') {
|
if (pathStr && pathStr !== '') {
|
||||||
ext = path.extname(pathStr.toLowerCase());
|
ext = path.extname(pathStr.toLowerCase());
|
||||||
valid = this.extensions.indexOf(ext) === -1 ? false : true;
|
valid = this.extensions.indexOf(ext) === -1 ? false : true;
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -54,7 +54,8 @@ var createWindow = function () {
|
||||||
skipTaskbar: true,
|
skipTaskbar: true,
|
||||||
toolbar: false,
|
toolbar: false,
|
||||||
webPreferences : {
|
webPreferences : {
|
||||||
nodeIntegration: true
|
nodeIntegration: true,
|
||||||
|
enableRemoteModule: true
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
mainWindow.setMenu(null)
|
mainWindow.setMenu(null)
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "mcopy-app",
|
"name": "mcopy-app",
|
||||||
"version": "1.6.6",
|
"version": "1.6.7",
|
||||||
"description": "GUI for the mcopy small gauge film optical printer platform",
|
"description": "GUI for the mcopy small gauge film optical printer platform",
|
||||||
"main": "main.js",
|
"main": "main.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
@ -35,19 +35,19 @@
|
||||||
},
|
},
|
||||||
"homepage": "https://github.com/sixteenmillimeter/mcopy#readme",
|
"homepage": "https://github.com/sixteenmillimeter/mcopy#readme",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/jquery": "^3.5.0",
|
"@types/jquery": "^3.5.5",
|
||||||
"chai": "^4.2.0",
|
"chai": "^4.3.0",
|
||||||
"electron": "^9.3.1",
|
"electron": "^11.3.0",
|
||||||
"electron-installer-common": "^0.10.2",
|
"electron-installer-common": "^0.10.3",
|
||||||
"electron-installer-dmg": "^3.0.0",
|
"electron-installer-dmg": "^3.0.0",
|
||||||
"electron-packager": "^15.0.0",
|
"electron-packager": "^15.2.0",
|
||||||
"electron-rebuild": "^1.11.0",
|
"electron-rebuild": "^2.3.5",
|
||||||
"electron-wix-msi": "^2.2.0",
|
"electron-wix-msi": "^3.0.6",
|
||||||
"gulp": "^4.0.2",
|
"gulp": "^4.0.2",
|
||||||
"gulp-concat": "^2.6.1",
|
"gulp-concat": "^2.6.1",
|
||||||
"gulp-less": "^4.0.1",
|
"gulp-less": "^4.0.1",
|
||||||
"mocha": "^8.0.1",
|
"mocha": "^8.3.0",
|
||||||
"typescript": "^3.9.7"
|
"typescript": "^4.1.5"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"animated-gif-detector": "^1.2.0",
|
"animated-gif-detector": "^1.2.0",
|
||||||
|
@ -58,33 +58,32 @@
|
||||||
"delay": "file:lib/delay",
|
"delay": "file:lib/delay",
|
||||||
"devices": "file:lib/devices",
|
"devices": "file:lib/devices",
|
||||||
"display": "file:lib/display",
|
"display": "file:lib/display",
|
||||||
"electron-updater": "^4.3.1",
|
|
||||||
"exec": "file:lib/exec",
|
"exec": "file:lib/exec",
|
||||||
"exit": "file:lib/exit",
|
"exit": "file:lib/exit",
|
||||||
"ffmpeg": "file:lib/ffmpeg",
|
"ffmpeg": "file:lib/ffmpeg",
|
||||||
"ffmpeg-static": "^4.2.6",
|
"ffmpeg-static": "^4.2.7",
|
||||||
"ffprobe": "file:lib/ffprobe",
|
"ffprobe": "file:lib/ffprobe",
|
||||||
"ffprobe-static": "^3.0.0",
|
"ffprobe-static": "^3.0.0",
|
||||||
"filmout": "file:lib/filmout",
|
"filmout": "file:lib/filmout",
|
||||||
"frame": "file:lib/frame",
|
"frame": "file:lib/frame",
|
||||||
"fs-extra": "^9.0.1",
|
"fs-extra": "^9.1.0",
|
||||||
"humanize-duration": "^3.23.1",
|
"humanize-duration": "^3.25.1",
|
||||||
"intval": "file:lib/intval",
|
"intval": "file:lib/intval",
|
||||||
"jimp": "^0.14.0",
|
"jimp": "^0.16.1",
|
||||||
"light": "file:lib/light",
|
"light": "file:lib/light",
|
||||||
"log": "file:lib/log",
|
"log": "file:lib/log",
|
||||||
"moment": "^2.27.0",
|
"moment": "^2.29.1",
|
||||||
"mscript": "file:lib/mscript",
|
"mscript": "file:lib/mscript",
|
||||||
"node-notifier": "^7.0.2",
|
"node-notifier": "^9.0.0",
|
||||||
"proj": "file:lib/proj",
|
"proj": "file:lib/proj",
|
||||||
"request": "^2.88.2",
|
"request": "^2.88.2",
|
||||||
"sequencer": "file:lib/sequencer",
|
"sequencer": "file:lib/sequencer",
|
||||||
"serialport": "^9.0.0",
|
"serialport": "^9.0.7",
|
||||||
"server": "file:lib/server",
|
"server": "file:lib/server",
|
||||||
"settings": "file:lib/settings",
|
"settings": "file:lib/settings",
|
||||||
"spawn": "file:lib/spawn",
|
"spawn": "file:lib/spawn",
|
||||||
"system": "file:lib/system",
|
"system": "file:lib/system",
|
||||||
"uuid": "^8.2.0",
|
"uuid": "^8.3.2",
|
||||||
"winston": "^3.3.3"
|
"winston": "^3.3.3"
|
||||||
},
|
},
|
||||||
"optionalDependencies": {
|
"optionalDependencies": {
|
||||||
|
|
|
@ -154,6 +154,8 @@ class FilmOut {
|
||||||
|
|
||||||
pathStr = files.filePaths[0];
|
pathStr = files.filePaths[0];
|
||||||
|
|
||||||
|
console.dir(pathStr)
|
||||||
|
|
||||||
if (pathStr && pathStr !== '') {
|
if (pathStr && pathStr !== '') {
|
||||||
ext = path.extname(pathStr.toLowerCase());
|
ext = path.extname(pathStr.toLowerCase());
|
||||||
valid = this.extensions.indexOf(ext) === -1 ? false : true;
|
valid = this.extensions.indexOf(ext) === -1 ? false : true;
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"version": "1.6.6",
|
"version": "1.6.7",
|
||||||
"ext_port": 1111,
|
"ext_port": 1111,
|
||||||
"profiles": {
|
"profiles": {
|
||||||
"mcopy": {
|
"mcopy": {
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
{
|
{
|
||||||
"name": "mcopy",
|
"name": "mcopy",
|
||||||
"version": "1.6.6",
|
"version": "1.6.7",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"version": "1.6.6",
|
"version": "1.6.7",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"arduino": "file:app/lib/arduino",
|
"arduino": "file:app/lib/arduino",
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "mcopy",
|
"name": "mcopy",
|
||||||
"version": "1.6.6",
|
"version": "1.6.7",
|
||||||
"description": "Small gauge film optical printer platform",
|
"description": "Small gauge film optical printer platform",
|
||||||
"main": "build.js",
|
"main": "build.js",
|
||||||
"directories": {
|
"directories": {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"version": "1.6.6",
|
"version": "1.6.7",
|
||||||
"ext_port": 1111,
|
"ext_port": 1111,
|
||||||
"profiles": {
|
"profiles": {
|
||||||
"mcopy": {
|
"mcopy": {
|
||||||
|
|
Loading…
Reference in New Issue