merge dashboard into dev

[bytom/bytom-electron.git] / package.json

diff --git a/package.json b/package.json
index 6387a2b..718a73a 100644 (file)
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "files": [
       "node_modules/**/*",
       "main.js",
-      "main-process/**/*",
+      "modules/**/*",
       "static/**/*",
       "public/**",
       "!node_modules/electron/",
@@ -60,7 +60,7 @@
     },
     "asar": true
   },
-  "version": "1.0.2",
+  "version": "1.0.9",
   "description": "Bytom Wallet Desktop",
   "main": "main.js",
   "scripts": {
@@ -68,11 +68,10 @@
     "postinstall": "npm run build:dll",
     "electron-dev": "DEV_URL=http://localhost:3000/index.html  electron --inspect=5858 main.js .",
     "build": "NODE_ENV=production webpack --config webpack/webpack.app.js ",
-    "build-electron": "NODE_ENV=production MODE=electron webpack --config webpack/webpack.app.js ",
     "lint": "eslint \"src/**\"",
     "start": "hjs-dev-server webpack/webpack.app.js --hot --host 0.0.0.0",
     "generate-component": "babel-node bin/generate.js component",
-    "package": "npm run build-electron && npm-run-all package:* ",
+    "package": "npm run build && npm-run-all package:* ",
     "package:mac": "electron-builder -m ",
     "package:win-32": "ARCH_VARIABLE=386 electron-builder --win --ia32",
     "package:win-64": "ARCH_VARIABLE=amd64 electron-builder --win --x64 ",
@@ -88,16 +87,17 @@
   ],
   "dependencies": {
     "babel-polyfill": "~6.16.0",
+    "babel-register": "~6.22.0",
     "bignumber.js": "^7.2.1",
     "bootstrap-sass": "~3.4.1",
     "btoa": "^1.1.2",
     "classnames": "~2.2.5",
     "electron-settings": "~3.1.4",
+    "fetch-ponyfill": "~3.0.2",
     "glob": "~7.1.2",
     "i18next": "^11.9.1",
-    "log4js": "^2.5.3",
-    "fetch-ponyfill": "~3.0.2",
     "i18next-browser-languagedetector": "^2.2.3",
+    "log4js": "^3.0.5",
     "lodash": "~4.17.14",
     "moment": "^2.22.1",
     "moment-timezone": "^0.5.17",
@@ -134,16 +134,15 @@
     "babel-preset-es2015": "~6.9.0",
     "babel-preset-react": "~6.5.0",
     "babel-preset-react-hmre": "~1.1.1",
-    "babel-register": "~6.22.0",
     "bootstrap-loader": "~1.0.10",
     "braces": "^3.0.2",
     "chai": "~3.5.0",
     "chai-as-promised": "~6.0.0",
     "command-line-args": "~3.0.1",
     "command-line-commands": "~1.0.4",
-    "electron": "~1.8.3",
-    "electron-builder": "^20.10.0",
     "css-loader": "0.26.1",
+    "electron": "~1.8.8",
+    "electron-builder": "^20.10.0",
     "eslint": "~4.18.2",
     "eslint-plugin-react": "~7.14.2",
     "extend": "~3.0.2",