Bump default Electron to 2.0.5, upgrade deps

This commit is contained in:
Ronan Jouchet 2018-07-21 08:45:01 -04:00
parent 22ef3d39b6
commit bbef14ccc6
6 changed files with 12 additions and 11 deletions

View File

@ -4,7 +4,7 @@
"description": "Placeholder for the nativefier cli to override with a target url", "description": "Placeholder for the nativefier cli to override with a target url",
"main": "lib/main.js", "main": "lib/main.js",
"dependencies": { "dependencies": {
"electron-context-menu": "^0.9.1", "electron-context-menu": "^0.10.0",
"electron-dl": "^1.10.0", "electron-dl": "^1.10.0",
"electron-window-state": "^4.1.1", "electron-window-state": "^4.1.1",
"loglevel": "^1.5.1", "loglevel": "^1.5.1",

View File

@ -63,27 +63,27 @@
}, },
"devDependencies": { "devDependencies": {
"babel-core": "^6.26.0", "babel-core": "^6.26.0",
"babel-jest": "^22.1.0", "babel-jest": "^23.4.0",
"babel-loader": "^7.1.2", "babel-loader": "^7.1.2",
"babel-plugin-transform-object-rest-spread": "^6.26.0", "babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-preset-env": "^1.6.1", "babel-preset-env": "^1.6.1",
"babel-register": "^6.26.0", "babel-register": "^6.26.0",
"chai": "^4.1.2", "chai": "^4.1.2",
"del": "^3.0.0", "del": "^3.0.0",
"eslint": "^4.17.0", "eslint": "^5.2.0",
"eslint-config-airbnb-base": "^12.1.0", "eslint-config-airbnb-base": "^13.0.0",
"eslint-config-prettier": "^2.9.0", "eslint-config-prettier": "^2.9.0",
"eslint-plugin-import": "^2.8.0", "eslint-plugin-import": "^2.8.0",
"eslint-plugin-prettier": "^2.6.0", "eslint-plugin-prettier": "^2.6.0",
"gulp": "^3.9.1", "gulp": "^3.9.1",
"gulp-babel": "^7.0.1", "gulp-babel": "^7.0.1",
"gulp-sourcemaps": "^2.6.4", "gulp-sourcemaps": "^2.6.4",
"jest": "^22.1.4", "jest": "^23.4.1",
"prettier": "^1.12.1", "prettier": "^1.12.1",
"regenerator-runtime": "^0.11.1", "regenerator-runtime": "^0.12.0",
"require-dir": "^1.0.0", "require-dir": "^1.0.0",
"run-sequence": "^2.2.1", "run-sequence": "^2.2.1",
"webpack-stream": "^4.0.0" "webpack-stream": "^5.0.0"
}, },
"engines": { "engines": {
"node": ">= 4.0" "node": ">= 4.0"

View File

@ -1,5 +1,5 @@
import path from 'path'; import path from 'path';
export const DEFAULT_APP_NAME = 'APP'; export const DEFAULT_APP_NAME = 'APP';
export const ELECTRON_VERSION = '2.0.4'; export const ELECTRON_VERSION = '2.0.5';
export const PLACEHOLDER_APP_DIR = path.join(__dirname, './../', 'app'); export const PLACEHOLDER_APP_DIR = path.join(__dirname, './../', 'app');

View File

@ -3,7 +3,7 @@ import _ from 'lodash';
import log from 'loglevel'; import log from 'loglevel';
const ELECTRON_VERSIONS_URL = 'https://atom.io/download/atom-shell/index.json'; const ELECTRON_VERSIONS_URL = 'https://atom.io/download/atom-shell/index.json';
const DEFAULT_CHROME_VERSION = '58.0.3029.110'; const DEFAULT_CHROME_VERSION = '61.0.3163.100';
function getChromeVersionForElectronVersion( function getChromeVersionForElectronVersion(
electronVersion, electronVersion,

View File

@ -31,7 +31,7 @@ describe('Infer User Agent', () => {
const TIMEOUT_URL = 'http://www.google.com:81/'; const TIMEOUT_URL = 'http://www.google.com:81/';
await expect(inferUserAgent('1.6.7', 'darwin', TIMEOUT_URL)).resolves.toBe( await expect(inferUserAgent('1.6.7', 'darwin', TIMEOUT_URL)).resolves.toBe(
'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/61.0.3163.100 Safari/537.36',
); );
}); });
}); });

View File

@ -16,9 +16,10 @@ module.exports = {
}, },
externals: nodeModules, externals: nodeModules,
module: { module: {
loaders: [ rules: [
{ test: /\.js$/, exclude: /node_modules/, loader: 'babel-loader' }, { test: /\.js$/, exclude: /node_modules/, loader: 'babel-loader' },
], ],
}, },
devtool: 'source-map', devtool: 'source-map',
mode: 'none',
}; };