Merge pull request #1548 from MyCryptoHQ/develop
Electron Setup / Config
This commit is contained in:
Daniel Ternyak
GitHub
commit
cf82c4ca10
|
|
@ -0,0 +1,13 @@
|
|||
{
|
||||
"environments": {
|
||||
"develop": {
|
||||
"gitUrl": "git@github.com:MyCryptoHQ/MyCrypto.git",
|
||||
"distFolder": "dist/prod",
|
||||
"buildCommand": "yarn && npm run build"
|
||||
},
|
||||
"beta": {
|
||||
"gitUrl": "git@github.com:MyCryptoHQ/MyCrypto-Beta.git",
|
||||
"distFolder": "docs"
|
||||
}
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 192 KiB |
|
|
@ -18,7 +18,7 @@ export default function getWindow() {
|
|||
title: APP_TITLE,
|
||||
backgroundColor: '#fbfbfb',
|
||||
width: 1220,
|
||||
height: 680,
|
||||
height: process.platform === 'darwin' ? 680 : 720,
|
||||
minWidth: 480,
|
||||
minHeight: 400,
|
||||
titleBarStyle: 'hidden',
|
||||
|
|
|
|||
32
package.json
32
package.json
|
|
@ -18,7 +18,8 @@
|
|||
"classnames": "2.2.5",
|
||||
"electron-updater": "2.21.4",
|
||||
"ethereum-blockies-base64": "1.0.1",
|
||||
"ethereumjs-abi": "git://github.com/ethereumjs/ethereumjs-abi.git#09c3c48fd3bed143df7fa8f36f6f164205e23796",
|
||||
"ethereumjs-abi":
|
||||
"git://github.com/ethereumjs/ethereumjs-abi.git#09c3c48fd3bed143df7fa8f36f6f164205e23796",
|
||||
"ethereumjs-tx": "1.3.4",
|
||||
"ethereumjs-util": "5.1.5",
|
||||
"ethereumjs-wallet": "0.6.0",
|
||||
|
|
@ -140,7 +141,7 @@
|
|||
"worker-loader": "1.1.1"
|
||||
},
|
||||
"resolutions": {
|
||||
"*/**/@types/react": "16.3.4"
|
||||
"*/**/@types/react": "16.3.11"
|
||||
},
|
||||
"scripts": {
|
||||
"freezer": "webpack --config=./webpack_config/webpack.freezer.js && node ./dist/freezer.js",
|
||||
|
|
@ -150,13 +151,19 @@
|
|||
"prebuild": "check-node-version --package",
|
||||
"build:downloadable": "webpack --mode=production --config webpack_config/webpack.html.js",
|
||||
"prebuild:downloadable": "check-node-version --package",
|
||||
"build:electron": "webpack --config webpack_config/webpack.electron-prod.js && node webpack_config/buildElectron.js",
|
||||
"build:electron:osx": "webpack --config webpack_config/webpack.electron-prod.js && ELECTRON_OS=osx node webpack_config/buildElectron.js",
|
||||
"build:electron:windows": "webpack --config webpack_config/webpack.electron-prod.js && ELECTRON_OS=windows node webpack_config/buildElectron.js",
|
||||
"build:electron:linux": "webpack --config webpack_config/webpack.electron-prod.js && ELECTRON_OS=linux node webpack_config/buildElectron.js",
|
||||
"build:electron":
|
||||
"webpack --config webpack_config/webpack.electron-prod.js && node webpack_config/buildElectron.js",
|
||||
"build:electron:osx":
|
||||
"webpack --config webpack_config/webpack.electron-prod.js && ELECTRON_OS=osx node webpack_config/buildElectron.js",
|
||||
"build:electron:windows":
|
||||
"webpack --config webpack_config/webpack.electron-prod.js && ELECTRON_OS=windows node webpack_config/buildElectron.js",
|
||||
"build:electron:linux":
|
||||
"webpack --config webpack_config/webpack.electron-prod.js && ELECTRON_OS=linux node webpack_config/buildElectron.js",
|
||||
"prebuild:electron": "check-node-version --package",
|
||||
"jenkins:build:linux": "webpack --config webpack_config/webpack.electron-prod.js && ELECTRON_OS=JENKINS_LINUX node webpack_config/buildElectron.js",
|
||||
"jenkins:build:mac": "webpack --config webpack_config/webpack.electron-prod.js && ELECTRON_OS=JENKINS_MAC node webpack_config/buildElectron.js",
|
||||
"jenkins:build:linux":
|
||||
"webpack --config webpack_config/webpack.electron-prod.js && ELECTRON_OS=JENKINS_LINUX node webpack_config/buildElectron.js",
|
||||
"jenkins:build:mac":
|
||||
"webpack --config webpack_config/webpack.electron-prod.js && ELECTRON_OS=JENKINS_MAC node webpack_config/buildElectron.js",
|
||||
"jenkins:upload": "node jenkins/upload",
|
||||
"test:coverage": "jest --config=jest_config/jest.config.json --coverage",
|
||||
"test": "jest --config=jest_config/jest.config.json",
|
||||
|
|
@ -169,13 +176,16 @@
|
|||
"predev": "check-node-version --package",
|
||||
"dev:https": "HTTPS=true node webpack_config/devServer.js",
|
||||
"predev:https": "check-node-version --package",
|
||||
"dev:electron": "concurrently --kill-others --names 'webpack,electron' 'BUILD_ELECTRON=true node webpack_config/devServer.js' 'webpack --config webpack_config/webpack.electron-dev.js && electron dist/electron-js/main.js'",
|
||||
"dev:electron":
|
||||
"concurrently --kill-others --names 'webpack,electron' 'BUILD_ELECTRON=true node webpack_config/devServer.js' 'webpack --config webpack_config/webpack.electron-dev.js && electron dist/electron-js/main.js'",
|
||||
"tslint": "tslint --project . --exclude common/vendor/**/*",
|
||||
"tscheck": "tsc --noEmit",
|
||||
"start": "npm run dev",
|
||||
"precommit": "lint-staged",
|
||||
"formatAll": "find ./common/ -name '*.ts*' | xargs prettier --write --config ./.prettierrc --config-precedence file-override",
|
||||
"prettier:diff": "prettier --write --config ./.prettierrc --list-different \"common/**/*.ts\" \"common/**/*.tsx\"",
|
||||
"formatAll":
|
||||
"find ./common/ -name '*.ts*' | xargs prettier --write --config ./.prettierrc --config-precedence file-override",
|
||||
"prettier:diff":
|
||||
"prettier --write --config ./.prettierrc --list-different \"common/**/*.ts\" \"common/**/*.tsx\"",
|
||||
"prepush": "npm run tslint && npm run tscheck",
|
||||
"update:tokens": "ts-node scripts/update-tokens"
|
||||
},
|
||||
|
|
|
|||
14
yarn.lock
14
yarn.lock
|
|
@ -186,13 +186,7 @@
|
|||
dependencies:
|
||||
"@types/react" "*"
|
||||
|
||||
"@types/react@*", "@types/react@16.3.4":
|
||||
version "16.3.4"
|
||||
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.3.4.tgz#9bbb301cd38270ae200bed329a342bd2f140c3ea"
|
||||
dependencies:
|
||||
csstype "^2.0.0"
|
||||
|
||||
"@types/react@16.3.11":
|
||||
"@types/react@*", "@types/react@16.3.11":
|
||||
version "16.3.11"
|
||||
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.3.11.tgz#345a17f1c96420f10b9f0dc696c31091ff9d66ea"
|
||||
dependencies:
|
||||
|
|
@ -2848,7 +2842,7 @@ cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
|
|||
dependencies:
|
||||
cssom "0.3.x"
|
||||
|
||||
csstype@^2.0.0, csstype@^2.2.0:
|
||||
csstype@^2.2.0:
|
||||
version "2.2.0"
|
||||
resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.2.0.tgz#1656ef97553ac53b77090844a2531c6660ebd902"
|
||||
|
||||
|
|
@ -6573,9 +6567,9 @@ jsprim@^1.2.2:
|
|||
json-schema "0.2.3"
|
||||
verror "1.10.0"
|
||||
|
||||
"jsqr@git+https://github.com/cozmo/jsQR.git":
|
||||
"jsqr@https://github.com/cozmo/jsQR.git":
|
||||
version "1.0.4"
|
||||
resolved "git+https://github.com/cozmo/jsQR.git#d37c764bf43a41ed7c6aa1c17cbdf21b7f9cb69e"
|
||||
resolved "https://github.com/cozmo/jsQR.git#d37c764bf43a41ed7c6aa1c17cbdf21b7f9cb69e"
|
||||
|
||||
jssha@2.3.1:
|
||||
version "2.3.1"
|
||||
|
|
|
|||
Loading…
Reference in New Issue