diff --git a/client/webpack.production.config.js b/client/webpack.production.config.js index 8af886e0..ea7c6bd7 100644 --- a/client/webpack.production.config.js +++ b/client/webpack.production.config.js @@ -33,7 +33,6 @@ module.exports = { }, externals: { electron: 'require("electron")', - asar: 'require("asar")', fs: 'require("fs")', path: 'require("path")', util: 'require("util")', @@ -41,7 +40,8 @@ module.exports = { net: 'require("net")', request: 'require(require("path").join(require("electron").remote.app.getAppPath(), "node_modules", "request"))', sparkplug: 'require("./sparkplug")', - 'node-crypto': 'require("crypto")' + 'node-crypto': 'require("crypto")', + 'child_process': 'require("child_process")' }, resolve: { alias: { diff --git a/package-lock.json b/package-lock.json index c7bdb5d0..55e4a8dd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -600,9 +600,9 @@ "dev": true }, "asar": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/asar/-/asar-0.14.3.tgz", - "integrity": "sha512-+hNnVVDmYbv05We/a9knj/98w171+A94A9DNHj+3kXUr3ENTQoSEcfbJRvBBRHyOh4vukBYWujmHvvaMmQoQbg==", + "version": "0.14.6", + "resolved": "https://registry.npmjs.org/asar/-/asar-0.14.6.tgz", + "integrity": "sha512-ZqybKcdO5At6y3ge2RHxVImc6Eltb2t3sxT7lk4T4zjZBSFUuIGCIZY6f41dCjlvJSizN5QPRr8YTgMhpgBjLg==", "requires": { "chromium-pickle-js": "0.2.0", "commander": "2.16.0", @@ -610,7 +610,7 @@ "glob": "6.0.4", "minimatch": "3.0.4", "mkdirp": "0.5.1", - "mksnapshot": "0.3.1", + "mksnapshot": "0.3.4", "tmp": "0.0.28" }, "dependencies": { @@ -2828,9 +2828,6 @@ "randomfill": "1.0.4" } }, - "csp-parse": { - "version": "github:macropodhq/csp-parse#db7d5f954b420b527d7fb452a93bb6e2fa302c5a" - }, "css-color-names": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", @@ -8890,9 +8887,9 @@ "integrity": "sha1-dVSm+Nhxg0zJe1RisSLEwSTW3pE=" }, "mksnapshot": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/mksnapshot/-/mksnapshot-0.3.1.tgz", - "integrity": "sha1-JQHAVldDbXQs6Vik/5LHfkDdN+Y=", + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/mksnapshot/-/mksnapshot-0.3.4.tgz", + "integrity": "sha512-FgUTiWiY+35LgL95P/MDYrBuQO5o0s3MmaWKX6ZJWoX4vMOY9vPsAv763l1OSSelL9jPsBQ/wf4bzfqTLNPSFg==", "requires": { "decompress-zip": "0.3.0", "fs-extra": "0.26.7", @@ -9985,6 +9982,11 @@ } } }, + "original-fs": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/original-fs/-/original-fs-1.0.0.tgz", + "integrity": "sha512-X/sHggGgmoyG3plMSAZcyehbBNnADefp2uN+ahSP2OV+HjCCS4p997yDL0kC5YSHPIp9eTEfezWulEQgvx1TIQ==" + }, "os-browserify": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", diff --git a/package.json b/package.json index 53acb22f..abfa9633 100644 --- a/package.json +++ b/package.json @@ -16,13 +16,14 @@ }, "private": false, "dependencies": { - "asar": "^0.14.3", + "asar": "^0.14.6", "csp-parse": "github:macropodhq/csp-parse", "deepmerge": "^2.2.1", "fs-extra": "^7.0.0", "keytar": "^4.3.0", "nedb": "^1.8.0", - "node-sass": "^4.10.0" + "node-sass": "^4.10.0", + "original-fs": "^1.0.0" }, "devDependencies": { "aes256": "^1.0.4", @@ -91,6 +92,7 @@ "gulp_release": "gulp release", "release": "npm run lint && npm run build_release && gulp release && npm run package_release", "update_release": "npm run build_release && gulp build-release", - "inject": "node scripts/inject.js" + "inject": "node scripts/inject.js", + "tt": "npm run release --prefix client" } }