fix(dependencies): re-export all dependencies exports (#72)

electron-userland · Jun 24, 2020 · 62d0aac · 62d0aac
1 parent ef81d09
commit 62d0aac
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git 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
@@ -15,20 +15,15 @@ const template = require('./template')
 const sandboxHelper = require('./sandboxhelper')
 
 module.exports = {
+  ...dependencies,
   ...sandboxHelper,
   createDesktopFile: desktop.createDesktopFile,
   createTemplatedFile: template.createTemplatedFile,
   ElectronInstaller,
   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,