Skip to content
Permalink
Browse files

feat(electron): upgrade to Electron 4

  • Loading branch information...
devinus committed Dec 26, 2018
1 parent 75cf70a commit 9539f22d7747320a448fe948a5acc060d9d4683d
Showing with 135 additions and 157 deletions.
  1. +1 −1 .tool-versions
  2. +1 −1 .travis.yml
  3. +1 −1 Dockerfile
  4. +2 −2 appveyor.yml
  5. +11 −11 package.json
  6. +119 −141 yarn.lock
@@ -1,2 +1,2 @@
nodejs 10.14.2
nodejs 10.15.0
python 2.7.15
@@ -1,7 +1,7 @@
---
language: node_js
node_js:
- 10.14.2
- 10.15.0

jobs:
include:
@@ -1,4 +1,4 @@
FROM node:10.14.2
FROM node:10.15.0

ENV DEBIAN_FRONTEND=noninteractive

@@ -10,7 +10,7 @@ environment:
MOCHA_REPORTER: 'mocha-appveyor-reporter'
GYP_MSVS_VERSION: '2017'
matrix:
- nodejs_version: '10.14.2'
- nodejs_version: '10.15.0'

cache:
- node_modules -> yarn.lock
@@ -27,7 +27,7 @@ install:
- yarn --version
- appveyor-retry yarn --frozen-lockfile --non-interactive

build: off
build: 'off'

test_script:
- yarn lint:js
@@ -76,6 +76,9 @@
"pre-commit": "lint-staged"
}
},
"engines": {
"node": ">= 10.11.0"
},
"dependencies": {
"about-window": "^1.12.1",
"bluebird": "^3.5.3",
@@ -86,7 +89,7 @@
"cross-spawn": "^6.0.5",
"debounce-fn": "^1.0.0",
"del": "^3.0.0",
"electron": "3.0.13",
"electron": "4.0.0",
"electron-compile": "^6.4.3",
"electron-context-menu": "^0.10.1",
"electron-debug": "^2.0.0",
@@ -101,7 +104,7 @@
"electron-window-state": "^5.0.3",
"express-jwt": "^5.3.1",
"extract-zip": "^1.6.7",
"get-port": "^4.0.0",
"get-port": "^4.1.0",
"got": "^9.5.0",
"graceful-fs": "^4.1.15",
"helmet": "^3.15.0",
@@ -148,7 +151,7 @@
"babel-eslint": "^10.0.1",
"bignumber.js": "^8.0.1",
"bip39": "^2.5.0",
"bootstrap": "^4.1.3",
"bootstrap": "^4.2.1",
"broccoli-asset-rev": "^3.0.0",
"broccoli-funnel": "^2.0.1",
"broccoli-merge-trees": "^3.0.2",
@@ -163,7 +166,7 @@
"electron-forge": "^5.2.3",
"electron-installer-dmg": "^2.0.0",
"electron-packager": "~12.2.0",
"electron-prebuilt-compile": "3.0.13",
"electron-prebuilt-compile": "4.0.0",
"ember-ajax": "^4.0.1",
"ember-auto-import": "^1.2.19",
"ember-bootstrap": "^2.4.0",
@@ -215,7 +218,7 @@
"ember-in-viewport": "^3.2.2",
"ember-intl": "^3.5.0",
"ember-keyboard-shortcuts": "^1.1.2",
"ember-lifeline": "^3.0.9",
"ember-lifeline": "^3.1.0",
"ember-load": "^0.0.16",
"ember-load-initializers": "^2.0.0",
"ember-local-storage": "^1.5.0",
@@ -233,12 +236,12 @@
"ember-service-worker": "^0.7.1",
"ember-service-worker-asset-cache": "^0.6.4",
"ember-service-worker-index": "^0.7.0",
"ember-simple-auth": "^1.7.0",
"ember-simple-auth": "^1.8.0",
"ember-source": "^3.6.1",
"ember-truth-helpers": "^2.1.0",
"ember-web-app": "^2.3.0",
"ember-web-app": "^2.3.1",
"ember-window-mock": "^0.5.3",
"eslint": "^5.10.0",
"eslint": "^5.11.0",
"eslint-config-airbnb-base": "^13.1.0",
"eslint-plugin-babel": "^5.3.0",
"eslint-plugin-chai-expect": "^2.0.1",
@@ -272,8 +275,5 @@
"electron-forge": "^5.2.3",
"electron-installer-dmg": "^2.0.0",
"electron-packager": "~12.2.0"
},
"engines": {
"node": ">= 10.2.0"
}
}

0 comments on commit 9539f22

Please sign in to comment.
You can’t perform that action at this time.