diff --git a/jslib b/jslib index c0fd5f71f8..7d0583f47b 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit c0fd5f71f8e2cf36165c565b4967ac0e379f166f +Subproject commit 7d0583f47b5359037a7ef212a902a72fe4c48211 diff --git a/package-lock.json b/package-lock.json index 42ca900141..6cd3cd3fc7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1841,6 +1841,31 @@ "sha.js": "^2.4.8" } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -6887,6 +6912,12 @@ "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", "dev": true }, + "nice-try": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.4.tgz", + "integrity": "sha512-2NpiFHqC87y/zFke0fC0spBXL3bBsoh/p5H1EFhshxjCR5+0g2d6BiXbUFz9v1sAcxsk2htp2eQnNIci2dIYcA==", + "dev": true + }, "no-case": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", diff --git a/package.json b/package.json index 1ad4cd5cdb..945168f7cb 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ }, "license": "GPL-3.0", "scripts": { + "start": "cross-env ELECTRON_IS_DEV=0 ELECTRON_NO_UPDATER=1 electron ./build", "sub:init": "git submodule update --init --recursive", "sub:update": "git submodule update --remote", "sub:pull": "git submodule foreach git pull origin master", @@ -201,6 +202,7 @@ "clean-webpack-plugin": "^0.1.17", "concurrently": "3.5.1", "copy-webpack-plugin": "^4.2.0", + "cross-env": "^5.1.4", "css-loader": "^0.28.7", "del": "^3.0.0", "electron": "2.0.7", diff --git a/webpack.renderer.js b/webpack.renderer.js index bbbf36dfc6..8624baba44 100644 --- a/webpack.renderer.js +++ b/webpack.renderer.js @@ -125,7 +125,7 @@ const renderer = { filename: '[name].js.map', include: ['app/main.js'] }), - extractCss + extractCss, ] };