Skip to content

Commit e5eff39

Browse files
fcastilloecmalept
authored andcommitted
Merge user dependencies with Electron dependencies (#98)
1 parent b18f583 commit e5eff39

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
},
3535
"dependencies": {
3636
"debug": "^3.1.0",
37-
"electron-installer-common": "^0.1.0",
37+
"electron-installer-common": "^0.2.0",
3838
"fs-extra": "^5.0.0",
3939
"lodash": "^4.17.4",
4040
"nodeify": "^1.0.1",

src/installer.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
const _ = require('lodash')
44
const common = require('electron-installer-common')
55
const debug = require('debug')
6+
const dependencies = require('electron-installer-common/src/dependencies')
67
const fs = require('fs-extra')
78
const nodeify = require('nodeify')
89
const path = require('path')
@@ -78,7 +79,10 @@ function getOptions (data, defaults) {
7879

7980
// Wrap the extended description to avoid rpmlint warning about
8081
// `description-line-too-long`.
81-
options.productDescription = wrap(options.productDescription, {width: 80, indent: ''})
82+
options.productDescription = wrap(options.productDescription, { width: 80, indent: '' })
83+
84+
// Merges user and default dependencies
85+
options.requires = dependencies.mergeUserSpecified(data, 'requires', defaults)
8286

8387
// Scan if there are any installation scripts and adds them to the options
8488
return generateScripts(options)

0 commit comments

Comments
 (0)