lukechilds
/
zap-desktop
mirror of https://github.com/lukechilds/zap-desktop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #428 from mrfelton/feat/electron-2 

Update electron to v2.x
renovate/lint-staged-8.x
Ben Woosley 7 years ago
committed by GitHub
parent
66fb3af09d 615ed52e7a
commit
a22a2a5397
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 56 additions and 60 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      .babelrc
  2. 1
      .travis.yml
  3. 2
      app/api/index.js
  4. 2
      app/app.global.scss
  5. 8
      app/app.html
  6. 2
      app/package.json
  7. 14
      package.json
  8. 85
      yarn.lock

2
.babelrc
View File

@ -3,7 +3,7 @@
["env", {
"targets": {
"node": 8,
"browsers": "electron 1.7"
"browsers": "electron 2.0"
},
"useBuiltIns": true
}],

1
.travis.yml
View File

@ -5,6 +5,7 @@ language: node_js
env:
global:
- DEBUG=electron-builder
- ELECTRON_DISABLE_SECURITY_WARNINGS=true
matrix:
- TEST=lint-ci
- TEST=test-ci

2
app/api/index.js
View File

@ -26,7 +26,7 @@ export function requestBlockHeight() {
}
export function requestSuggestedNodes() {
const BASE_URL = 'http://zap.jackmallers.com/suggested-peers'
const BASE_URL = 'https://zap.jackmallers.com/suggested-peers'
return axios({
method: 'get',
url: BASE_URL

2
app/app.global.scss
View File

@ -8,7 +8,7 @@
font-family: 'Roboto';
font-style: normal;
font-weight: 300;
src: local('Roboto Light'), local('Roboto-Light'), url(http://fonts.gstatic.com/s/roboto/v15/Fl4y0QdOxyyTHEGMXX8kcaCWcynf_cDxXwCLxiixG1c.ttf) format('truetype');
src: local('Roboto Light'), local('Roboto-Light'), url(https://fonts.gstatic.com/s/roboto/v15/Fl4y0QdOxyyTHEGMXX8kcaCWcynf_cDxXwCLxiixG1c.ttf) format('truetype');
}
body {

8
app/app.html
View File

@ -2,9 +2,15 @@
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="Content-Security-Policy" content="
default-src 'self';
connect-src 'self' http://localhost:* ws://localhost:* https://api.coinmarketcap.com https://zap.jackmallers.com https://testnet-api.smartbit.com.au;
script-src 'self' http://localhost:* 'unsafe-eval' 'unsafe-inline';
font-src 'self' data: http://localhost:* https://fonts.googleapis.com https://s3.amazonaws.com https://fonts.gstatic.com;
style-src 'self' blob: https://fonts.googleapis.com https://s3.amazonaws.com https://fonts.gstatic.com 'unsafe-inline';">
<title>Zap</title>
<link rel="stylesheet" href="https://s3.amazonaws.com/fonts.typotheque.com/WF-018717-007225.css" type="text/css" />
<link href='http://fonts.googleapis.com/css?family=Raleway:700' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Raleway:700' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Orbitron' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Noto+Sans:400,700|Roboto:300' rel='stylesheet' type='text/css'>
<script>

2
app/package.json
View File

@ -10,7 +10,7 @@
"url": "https://github.com/LN-Zap/zap-desktop"
},
"scripts": {
"postinstall": "npm rebuild --runtime=electron --target=1.8.4 --disturl=https://atom.io/download/atom-shell --build-from-source"
"postinstall": "npm rebuild --runtime=electron --target=2.0.2 --disturl=https://atom.io/download/atom-shell --build-from-source"
},
"license": "MIT",
"dependencies": {

14
package.json
View File

@ -31,7 +31,7 @@
"test-e2e": "cross-env NODE_ENV=test BABEL_DISABLE_CACHE=1 node --trace-warnings ./test/runTests.js e2e",
"test-watch": "npm test -- --watch"
},
"browserslist": "electron 1.8",
"browserslist": "electron 2.0",
"engines": {
"node": ">=8.2.1",
"npm": ">=5.3.0"
@ -152,14 +152,14 @@
"babel-preset-react-optimize": "^1.0.1",
"babel-preset-stage-0": "^6.24.1",
"babel-register": "^6.26.0",
"browserslist": "^2.11.0",
"browserslist": "^3.2.8",
"chalk": "^2.4.1",
"concurrently": "^3.5.1",
"cross-env": "^5.2.0",
"cross-spawn": "^6.0.5",
"css-loader": "^0.28.11",
"electron-builder": "^20.15.3",
"electron-devtools-installer": "^2.2.1",
"electron-devtools-installer": "^2.2.4",
"enzyme": "^2.9.1",
"enzyme-to-json": "^1.5.1",
"eslint": "^4.19.1",
@ -214,9 +214,9 @@
"d3-zoom": "^1.7.1",
"debug-logger": "^0.4.1",
"devtron": "^1.4.0",
"electron": "1.8.4",
"electron-debug": "^1.2.0",
"electron-store": "^1.3.0",
"electron": "2.0.2",
"electron-debug": "^2.0.0",
"electron-store": "^2.0.0",
"font-awesome": "^4.7.0",
"history": "^4.6.3",
"lodash": "^4.17.10",
@ -234,7 +234,7 @@
"react-router-dom": "^4.1.1",
"react-router-redux": "^5.0.0-alpha.6",
"redux": "^3.7.1",
"redux-electron-ipc": "^1.1.10",
"redux-electron-ipc": "^1.1.12",
"redux-thunk": "^2.2.0",
"reselect": "^3.0.1",
"satoshi-bitcoin": "^1.0.4",

85
yarn.lock
View File

@ -2021,13 +2021,6 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
caniuse-db "^1.0.30000639"
electron-to-chromium "^1.2.7"
browserslist@^2.11.0:
version "2.11.0"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.0.tgz#50350d6873a82ebe0f3ae5483658c571ae5f9d7d"
dependencies:
caniuse-lite "^1.0.30000784"
electron-to-chromium "^1.3.30"
browserslist@^3.1.1:
version "3.1.2"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.1.2.tgz#893f29399d640ed35fe06bacd7eb1d78609a47e5"
@ -2273,10 +2266,6 @@ caniuse-db@^1.0.30000846:
version "1.0.30000856"
resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000856.tgz#fbebb99abe15a5654fc7747ebb5315bdfde3358f"
caniuse-lite@^1.0.30000784:
version "1.0.30000787"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000787.tgz#a76c4fa1d6ac00640447ec83c1e7c6b33dd615c5"
caniuse-lite@^1.0.30000810, caniuse-lite@^1.0.30000813:
version "1.0.30000813"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000813.tgz#7b25e27fdfb8d133f3c932b01f77452140fcc6c9"
@ -2737,9 +2726,9 @@ concurrently@^3.5.1:
supports-color "^3.2.3"
tree-kill "^1.1.0"
conf@^1.3.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/conf/-/conf-1.4.0.tgz#1ea66c9d7a9b601674a5bb9d2b8dc3c726625e67"
conf@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/conf/-/conf-2.0.0.tgz#43f7e282b32faca31f4d18bf279d6841ad657d5a"
dependencies:
dot-prop "^4.1.0"
env-paths "^1.0.0"
@ -3712,16 +3701,16 @@ electron-chromedriver@~1.8.0:
electron-download "^4.1.0"
extract-zip "^1.6.5"
electron-debug@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/electron-debug/-/electron-debug-1.2.0.tgz#22e51a73e1bf095d0bb51a6c3d97a203364c4222"
electron-debug@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/electron-debug/-/electron-debug-2.0.0.tgz#3059a6557acbfb091f138d83875f57bac80cea6d"
dependencies:
electron-is-dev "^0.1.0"
electron-localshortcut "^2.0.0"
electron-is-dev "^0.3.0"
electron-localshortcut "^3.0.0"
electron-devtools-installer@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/electron-devtools-installer/-/electron-devtools-installer-2.2.1.tgz#0beb73ccbf65cbc4d09e706cebda638f839b8c55"
electron-devtools-installer@^2.2.4:
version "2.2.4"
resolved "https://registry.yarnpkg.com/electron-devtools-installer/-/electron-devtools-installer-2.2.4.tgz#261a50337e37121d338b966f07922eb4939a8763"
dependencies:
"7zip" "0.0.6"
cross-unzip "0.0.2"
@ -3774,16 +3763,18 @@ electron-is-accelerator@^0.1.0:
version "0.1.2"
resolved "https://registry.yarnpkg.com/electron-is-accelerator/-/electron-is-accelerator-0.1.2.tgz#509e510c26a56b55e17f863a4b04e111846ab27b"
electron-is-dev@^0.1.0:
version "0.1.2"
resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-0.1.2.tgz#8a1043e32b3a1da1c3f553dce28ce764246167e3"
electron-is-dev@^0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-0.3.0.tgz#14e6fda5c68e9e4ecbeff9ccf037cbd7c05c5afe"
electron-localshortcut@^2.0.0:
version "2.0.2"
resolved "https://registry.yarnpkg.com/electron-localshortcut/-/electron-localshortcut-2.0.2.tgz#6a1adcd6514c957328ec7912f5ccb5e1c10706db"
electron-localshortcut@^3.0.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/electron-localshortcut/-/electron-localshortcut-3.1.0.tgz#10c1ffd537b8d39170aaf6e1551341f7780dd2ce"
dependencies:
debug "^2.6.8"
electron-is-accelerator "^0.1.0"
keyboardevent-from-electron-accelerator "^1.1.0"
keyboardevents-areequal "^0.2.1"
electron-osx-sign@0.4.10:
version "0.4.10"
@ -3820,26 +3811,16 @@ electron-publish@20.15.0:
lazy-val "^1.0.3"
mime "^2.3.1"
electron-releases@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/electron-releases/-/electron-releases-2.1.0.tgz#c5614bf811f176ce3c836e368a0625782341fd4e"
electron-store@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/electron-store/-/electron-store-1.3.0.tgz#ee488a28a61fb982fd35b658fb9cb6331eb201f8"
electron-store@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/electron-store/-/electron-store-2.0.0.tgz#1035cca2a95409d1f54c7466606345852450d64a"
dependencies:
conf "^1.3.0"
conf "^2.0.0"
electron-to-chromium@^1.2.7:
version "1.3.14"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.14.tgz#64af0f9efd3c3c6acd57d71f83b49ca7ee9c4b43"
electron-to-chromium@^1.3.30:
version "1.3.30"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.30.tgz#9666f532a64586651fc56a72513692e820d06a80"
dependencies:
electron-releases "^2.1.0"
electron-to-chromium@^1.3.36:
version "1.3.37"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.37.tgz#4a92734e0044c8cf0b1553be57eae21a4c6e5fab"
@ -3848,9 +3829,9 @@ electron-to-chromium@^1.3.47:
version "1.3.48"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.48.tgz#d3b0d8593814044e092ece2108fc3ac9aea4b900"
electron@1.8.4:
version "1.8.4"
resolved "https://registry.yarnpkg.com/electron/-/electron-1.8.4.tgz#cca8d0e6889f238f55b414ad224f03e03b226a38"
electron@2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/electron/-/electron-2.0.2.tgz#b77e05f83419cc5ec921a2d21f35b55e4bfc3d68"
dependencies:
"@types/node" "^8.0.24"
electron-download "^3.0.1"
@ -6796,6 +6777,14 @@ jsx-ast-utils@^2.0.1:
dependencies:
array-includes "^3.0.3"
keyboardevent-from-electron-accelerator@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/keyboardevent-from-electron-accelerator/-/keyboardevent-from-electron-accelerator-1.1.0.tgz#324614f6e33490c37ffc5be5876b3e85fe223c84"
keyboardevents-areequal@^0.2.1:
version "0.2.2"
resolved "https://registry.yarnpkg.com/keyboardevents-areequal/-/keyboardevents-areequal-0.2.2.tgz#88191ec738ce9f7591c25e9056de928b40277194"
killable@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.0.tgz#da8b84bd47de5395878f95d64d02f2449fe05e6b"
@ -9334,9 +9323,9 @@ reduce-function-call@^1.0.1:
dependencies:
balanced-match "^0.4.2"
redux-electron-ipc@^1.1.10:
version "1.1.10"
resolved "https://registry.yarnpkg.com/redux-electron-ipc/-/redux-electron-ipc-1.1.10.tgz#0e4de0ae30eb8571209f24e75149007e965e65d1"
redux-electron-ipc@^1.1.12:
version "1.1.12"
resolved "https://registry.yarnpkg.com/redux-electron-ipc/-/redux-electron-ipc-1.1.12.tgz#1d88f8bbca9196bafb8c30b56bd6c90afd3d7dba"
redux-logger@^3.0.6:
version "3.0.6"

Write Preview
Loading…
Cancel
Save