diff --git a/package.json b/package.json index 03d22b7..5b1a3c3 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,9 @@ "lint": "eslint --ignore-path .gitignore ./src/**/*.{js,jsx} && stylelint --ignore-path .gitignore ./src/**/*.{css,scss}", "start": "webpack-dev-server --hot --host 0.0.0.0 --config=./webpack.dev.config.js", "build": "cross-env NODE_ENV=production webpack --config webpack.common.config.js", - "package": "electron-builder build -mwl -p never && open ./dist", - "dist": "rm -rf {dist,build}/ && npm run build && npm run package", + "package": "electron-builder build -ml -p never", + "package:win": "electron-builder build -w -p never", + "dist": "./scripts/release-prepare.sh", "release": "release-it --non-interactive", "changelog": "auto-changelog -p", "format": "prettier --write 'src/**/*.{js,jsx}' && npm run format:css", @@ -27,53 +28,53 @@ "license": "MIT", "dependencies": { "@coingecko/cryptoformat": "^0.3.3", - "ethereum-address": "0.0.4", + "ethereum-address": "^0.0.4", "ethereum-blockies": "github:MyEtherWallet/blockies", "ms": "^2.1.2" }, "devDependencies": { - "@babel/core": "^7.6.2", - "@babel/plugin-proposal-class-properties": "^7.5.5", - "@babel/preset-env": "^7.6.2", - "@babel/preset-react": "^7.0.0", + "@babel/core": "^7.7.2", + "@babel/plugin-proposal-class-properties": "^7.7.0", + "@babel/preset-env": "^7.7.1", + "@babel/preset-react": "^7.7.0", "@jest-runner/electron": "^2.0.2", "@reach/router": "^1.2.1", "@react-mock/state": "^0.1.8", "@svgr/webpack": "^4.3.3", - "@testing-library/jest-dom": "^4.1.0", - "@testing-library/react": "^9.3.0", - "auto-changelog": "^1.16.1", + "@testing-library/jest-dom": "^4.2.3", + "@testing-library/react": "^9.3.2", + "auto-changelog": "^1.16.2", "babel-eslint": "^10.0.3", "babel-jest": "^24.9.0", "babel-loader": "^8.0.6", - "copy-webpack-plugin": "^5.0.4", + "copy-webpack-plugin": "^5.0.5", "cross-env": "^6.0.3", "css-loader": "^3.2.0", - "electron": "beta", - "electron-builder": "^21.2.0", + "electron": "^7.1.1", + "electron-builder": "^22.1.0", "electron-devtools-installer": "^2.2.4", - "electron-store": "^5.0.0", - "eslint": "^6.5.1", - "eslint-config-prettier": "^6.4.0", + "electron-store": "^5.1.0", + "eslint": "^6.6.0", + "eslint-config-prettier": "^6.5.0", "eslint-plugin-react": "^7.16.0", "file-loader": "^4.2.0", "html-webpack-plugin": "^3.2.0", "identity-obj-proxy": "^3.0.0", "jest": "^24.9.0", "mini-css-extract-plugin": "^0.8.0", - "prettier": "^1.18.2", + "prettier": "^1.19.1", "prettier-stylelint": "^0.4.2", - "react": "^16.10.2", - "react-dom": "^16.10.2", - "react-pose": "^4.0.8", - "release-it": "^12.4.2", + "react": "^16.11.0", + "react-dom": "^16.11.0", + "react-pose": "^4.0.9", + "release-it": "^12.4.3", "style-loader": "^1.0.0", - "stylelint": "^11.0.0", + "stylelint": "^11.1.1", "stylelint-config-css-modules": "^1.5.0", "stylelint-config-standard": "^19.0.0", - "webpack": "^4.41.0", - "webpack-cli": "^3.3.9", - "webpack-dev-server": "^3.8.2" + "webpack": "^4.41.2", + "webpack-cli": "^3.3.10", + "webpack-dev-server": "^3.9.0" }, "browserslist": "electron >= 6.0", "build": { @@ -86,7 +87,8 @@ ], "mac": { "category": "public.app-category.finance", - "identity": null + "identity": null, + "darkModeSupport": true }, "linux": { "target": [ diff --git a/scripts/release-prepare.sh b/scripts/release-prepare.sh new file mode 100755 index 0000000..6b4d8e7 --- /dev/null +++ b/scripts/release-prepare.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +rm -rf {dist,build}/ && \ +npm run build && \ +npm run package && \ + +if [ -x "$(command -v docker)" ]; then + docker run --rm \ + --env-file <(env | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS_TAG|TRAVIS|TRAVIS_REPO_|TRAVIS_BUILD_|TRAVIS_BRANCH|TRAVIS_PULL_REQUEST_|APPVEYOR_|CSC_|GH_|GITHUB_|BT_|AWS_|STRIP|BUILD_') \ + --env ELECTRON_CACHE="/root/.cache/electron" \ + --env ELECTRON_BUILDER_CACHE="/root/.cache/electron-builder" \ + -v ${PWD}:/project \ + -v ${PWD##*/}-node-modules:/project/node_modules \ + -v ~/.cache/electron:/root/.cache/electron \ + -v ~/.cache/electron-builder:/root/.cache/electron-builder \ + electronuserland/builder:wine \ + /bin/bash -c "npm i && npm run build && npm run package:win" +fi +