diff --git a/src/dependencies.js b/src/dependencies.js index 5a41d8f..e5732cf 100644 --- a/src/dependencies.js +++ b/src/dependencies.js @@ -81,20 +81,20 @@ module.exports = { dependencyMap.xtst, dependencyMap.xdgUtils ].concat(getATSPIDepends(version, dependencyMap)) - .concat(getGConfDepends(version, dependencyMap)) - .concat(getUUIDDepends(version, dependencyMap)) .concat(getDRMDepends(version, dependencyMap)) .concat(getGBMDepends(version, dependencyMap)) + .concat(getGConfDepends(version, dependencyMap)) + .concat(getUUIDDepends(version, dependencyMap)) .concat(getXcbDri3Depends(version, dependencyMap)) }, - getATSPIDepends: getATSPIDepends, - getDRMDepends: getDRMDepends, - getGBMDepends: getGBMDepends, - getGConfDepends: getGConfDepends, - getGTKDepends: getGTKDepends, - getTrashDepends: getTrashDepends, - getUUIDDepends: getUUIDDepends, - getXcbDri3Depends: getXcbDri3Depends, + getATSPIDepends, + getDRMDepends, + getGBMDepends, + getGConfDepends, + getGTKDepends, + getTrashDepends, + getUUIDDepends, + getXcbDri3Depends, /** * Merge the user specified dependencies (from either the API or the CLI) with the respective diff --git a/src/index.js b/src/index.js index ba70ce5..aff63d9 100644 --- a/src/index.js +++ b/src/index.js @@ -15,6 +15,7 @@ const template = require('./template') const sandboxHelper = require('./sandboxhelper') module.exports = { + ...dependencies, ...sandboxHelper, createDesktopFile: desktop.createDesktopFile, createTemplatedFile: template.createTemplatedFile, @@ -22,13 +23,7 @@ module.exports = { errorMessage: error.errorMessage, generateTemplate: template.generateTemplate, getDefaultsFromPackageJSON, - getDepends: dependencies.getDepends, - getGConfDepends: dependencies.getGConfDepends, - getGTKDepends: dependencies.getGTKDepends, getHomePage, - getTrashDepends: dependencies.getTrashDepends, - getUUIDDepends: dependencies.getUUIDDepends, - mergeUserSpecified: dependencies.mergeUserSpecified, readElectronVersion, readMetadata, replaceScopeName,