diff --git a/package-lock.json b/package-lock.json index 29eed30c..ac463373 100644 --- a/package-lock.json +++ b/package-lock.json @@ -843,6 +843,29 @@ "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==", "dev": true }, + "@types/events": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz", + "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==", + "dev": true + }, + "@types/glob": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz", + "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==", + "dev": true, + "requires": { + "@types/events": "*", + "@types/minimatch": "*", + "@types/node": "*" + } + }, + "@types/minimatch": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", + "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==", + "dev": true + }, "@types/node": { "version": "10.12.26", "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.26.tgz", @@ -1435,8 +1458,7 @@ "about-window": { "version": "1.12.1", "resolved": "https://registry.npmjs.org/about-window/-/about-window-1.12.1.tgz", - "integrity": "sha512-P/fJACq7RBFpv5Ql0kIqpOYgFqQ8WdoZoB7wrKmDvwTSKVOMbUZMYnQYtnOW6dHmMCYuNrmQFf+MxvuhE+KrzQ==", - "dev": true + "integrity": "sha512-P/fJACq7RBFpv5Ql0kIqpOYgFqQ8WdoZoB7wrKmDvwTSKVOMbUZMYnQYtnOW6dHmMCYuNrmQFf+MxvuhE+KrzQ==" }, "accepts": { "version": "1.3.5", @@ -3190,6 +3212,15 @@ "which": "^1.2.8" } }, + "cross-spawn-promise": { + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/cross-spawn-promise/-/cross-spawn-promise-0.10.1.tgz", + "integrity": "sha1-25y0xQxgtyoVvgSbeBIs44LYexA=", + "dev": true, + "requires": { + "cross-spawn": "^5.1.0" + } + }, "crypto-browserify": { "version": "3.12.0", "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", @@ -3988,6 +4019,24 @@ } } }, + "electron-installer-common": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/electron-installer-common/-/electron-installer-common-0.6.2.tgz", + "integrity": "sha512-k/uB9+rYxQx5sxCNlmdn5fqjWRbDCGIQjdDi9101mVHr0dUkrupLjtgjaaXbvdtUxHTYTbk53l77YnXM6ZGbHg==", + "dev": true, + "requires": { + "asar": "^1.0.0", + "cross-spawn-promise": "^0.10.1", + "debug": "^4.1.1", + "fs-extra": "^7.0.1", + "glob": "^7.1.3", + "glob-promise": "^3.4.0", + "lodash": "^4.17.11", + "parse-author": "^2.0.0", + "semver": "^5.6.0", + "tmp-promise": "^1.0.5" + } + }, "electron-installer-dmg": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/electron-installer-dmg/-/electron-installer-dmg-2.0.0.tgz", @@ -5175,12 +5224,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5195,17 +5246,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -5322,7 +5376,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -5334,6 +5389,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -5348,6 +5404,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -5355,12 +5412,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -5379,6 +5438,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -5459,7 +5519,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -5471,6 +5532,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -5592,6 +5654,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -5882,6 +5945,15 @@ } } }, + "glob-promise": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/glob-promise/-/glob-promise-3.4.0.tgz", + "integrity": "sha512-q08RJ6O+eJn+dVanerAndJwIcumgbDdYiUT7zFQl3Wm1xD6fBKtah7H8ZJChj4wP+8C+QfeVy8xautR7rdmKEw==", + "dev": true, + "requires": { + "@types/glob": "*" + } + }, "glob-to-regexp": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz", @@ -6402,7 +6474,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/imul/-/imul-1.0.1.tgz", "integrity": "sha1-nVhnFh6LPelsLDjV3HyxAvNeKsk=", - "dev": true + "dev": true, + "optional": true }, "imurmurhash": { "version": "0.1.4", @@ -6795,7 +6868,8 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz", "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=", - "dev": true + "dev": true, + "optional": true }, "is-regex": { "version": "1.0.4", @@ -7790,7 +7864,8 @@ "version": "2.12.1", "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz", "integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==", - "dev": true + "dev": true, + "optional": true }, "nanomatch": { "version": "1.2.13", diff --git a/package.json b/package.json index 38b9978a..09397ea7 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "author": "OpenFlexure", "description": "An electron-based user client for the OpenFlexure Microscope Server", "main": "app.js", - "version": "0.1.1-alpha", + "version": "0.1.1-beta", "license": "GNU General Public License v3.0 ", "private": true, "scripts": { @@ -14,24 +14,25 @@ "build": "vue-cli-service build", "dev": "set NODE_ENV=DEV&& electron app.dev.js", "run": "vue-cli-service build && electron .", - "package-win": "electron-packager . openflexure-ev --ignore=^/src --overwrite --asar=true --platform=win32 --arch=x64 --icon=icons/win/icon.ico --prune=true --out=release-builds --version-string.CompanyName=CE --version-string.FileDescription=CE --version-string.ProductName=\"OpenFlexure Microscope JS\"", - "package-linux": "electron-packager . openflexure-ev --ignore=^/src --overwrite --asar=true --platform=linux --arch=x64 --icon=icons/png/1024x1024.png --prune=true --out=release-builds", - "package-rpi": "electron-packager . openflexure-ev --ignore=^/src --overwrite --asar=true --platform=linux --electron-version=3.0.13 --arch=armv7l --icon=icons/png/1024x1024.png --prune=true --out=release-builds", - "package-darwin": "electron-packager . openflexure-ev --ignore=^/src --overwrite --platform=darwin --arch=x64 --icon=icons/mac/icon.icns --prune=true --out=release-builds", + "package-win": "electron-packager . openflexure-ev --ignore=\"^/(src|installers|\\..*)\" --overwrite --asar --platform=win32 --arch=x64 --icon=icons/win/icon.ico --prune=true --out=release-builds --version-string.CompanyName=CE --version-string.FileDescription=CE --version-string.ProductName=\"OpenFlexure Microscope JS\"", + "package-linux": "electron-packager . openflexure-ev --ignore=\"^/(src|installers|\\..*)\" --overwrite --asar --platform=linux --arch=x64 --icon=icons/png/1024x1024.png --prune=true --out=release-builds", + "package-rpi": "electron-packager . openflexure-ev --ignore=\"^/(src|installers|\\..*)\" --overwrite --asar --platform=linux --electron-version=3.0.13 --arch=armv7l --icon=icons/png/1024x1024.png --prune=true --out=release-builds", + "package-darwin": "electron-packager . openflexure-ev --ignore=\"^/(src|installers|\\..*)\" --overwrite --platform=darwin --arch=x64 --icon=icons/mac/icon.icns --prune=true --out=release-builds", "package-all": "npm run package-win && npm run package-linux && npm run package-rpi && npm run package-darwin", "make": "npm run build && npm run package-all" }, "dependencies": { - "electron-context-menu": "^0.11.0" + "electron-context-menu": "^0.11.0", + "about-window": "^1.12.1" }, "devDependencies": { "@vue/cli-plugin-babel": "^3.3.0", "@vue/cli-service": "^3.3.0", - "about-window": "^1.12.1", "axios": "^0.18.0", "css-loader": "^2.1.0", "electron": "^4.0.5", "electron-installer-common": "^0.6.1", + "electron-installer-debian": "^1.1.1", "electron-installer-dmg": "^2.0.0", "electron-packager": "^13.1.0", "electron-windows-store": "^2.1.0",