quine-global/hyper
1
0
Fork 0
mirror of https://github.com/quine-global/hyper.git synced 2026-01-15 13:18:40 -09:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert #2126 (#2202)

Browse source
This commit is contained in:
CHaBou 2017-09-15 20:23:03 +02:00 committed by Timothy
parent 53a5a425f7
commit 97d1ae33d3
2 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/config/init.js
View file

@ -1,5 +1,4 @@
const vm = require('vm'); const vm = require('vm');
const merge = require('lodash/merge');
const notify = require('../notify'); const notify = require('../notify');
const _extract = function (script) { const _extract = function (script) {
@ -37,9 +36,6 @@ const _init = function (cfg) {
return _extractDefault(cfg.defaultCfg); return _extractDefault(cfg.defaultCfg);
} }
// Use options from default config when not specified in user config #1588
_cfg.config = merge(_extractDefault(cfg.defaultCfg).config, _cfg.config);
// Ignore undefined values in plugin and localPlugins array Issue #1862 // Ignore undefined values in plugin and localPlugins array Issue #1862
_cfg.plugins = (_cfg.plugins && _cfg.plugins.filter(Boolean)) || []; _cfg.plugins = (_cfg.plugins && _cfg.plugins.filter(Boolean)) || [];
_cfg.localPlugins = (_cfg.localPlugins && _cfg.localPlugins.filter(Boolean)) || []; _cfg.localPlugins = (_cfg.localPlugins && _cfg.localPlugins.filter(Boolean)) || [];

1
app/package.json
View file

@ -19,7 +19,6 @@
"electron-config": "1.0.0", "electron-config": "1.0.0",
"electron-is-dev": "0.3.0", "electron-is-dev": "0.3.0",
"electron-squirrel-startup": "1.0.0", "electron-squirrel-startup": "1.0.0",
"lodash": "4.17.4",
"file-uri-to-path": "1.0.0", "file-uri-to-path": "1.0.0",
"git-describe": "4.0.2", "git-describe": "4.0.2",
"mkdirp": "0.5.1", "mkdirp": "0.5.1",