feat: add dependencies for Electron >= 10 (#80)

Author: fcastilloec

src/dependencies.js

@@ -68,6 +68,13 @@ function getXcbDri3Depends (version, dependencyMap) {
   return semver.gte(version, '9.0.0-beta.1') ? [dependencyMap.xcbDri3] : []
 }
 
+/**
+ * Determine whether libXss is a necessary dependency, given the Electron version.
+ */
+function getXssDepends (version, dependencyMap) {
+  return semver.lt(version, '10.0.0-beta.1') ? [dependencyMap.xss] : []
+}
+
 module.exports = {
   /**
    * Determine the default dependencies for an Electron application.
@@ -77,7 +84,6 @@ module.exports = {
       getGTKDepends(version, dependencyMap),
       dependencyMap.notify,
       dependencyMap.nss,
-      dependencyMap.xss,
       dependencyMap.xtst,
       dependencyMap.xdgUtils
     ].concat(getATSPIDepends(version, dependencyMap))
@@ -86,6 +92,7 @@ module.exports = {
       .concat(getGConfDepends(version, dependencyMap))
       .concat(getUUIDDepends(version, dependencyMap))
       .concat(getXcbDri3Depends(version, dependencyMap))
+      .concat(getXssDepends(version, dependencyMap))
   },
   getATSPIDepends,
   getDRMDepends,
@@ -95,6 +102,7 @@ module.exports = {
   getTrashDepends,
   getUUIDDepends,
   getXcbDri3Depends,
+  getXssDepends,
 
   /**
    * Merge the user specified dependencies (from either the API or the CLI) with the respective

src/index.d.ts

@@ -77,6 +77,7 @@ export function getGTKDepends(version: string, dependencyMap: DependencyMap): st
 export function getTrashDepends(version: string, dependencyMap: DependencyMap): string[];
 export function getUUIDDepends(version: string, dependencyMap: DependencyMap): string[];
 export function getXcbDri3Depends(version: string, dependencyMap: DependencyMap): string[];
+export function getXssDepends(version: string, dependencyMap: DependencyMap): string[];
 export function hasSandboxHelper(appDir: string): boolean;
 export function mergeUserSpecified(data: Record<string, unknown>, dependencyKey: string, defaults: Record<string, unknown>): Record<string, unknown>;
 export function readElectronVersion(appDir: string): Promise<string>;

test/dependencies.js

@@ -100,6 +100,14 @@ test('getXcbDri3Depends: returns gbm as of 9.0', t => {
   t.is(dependencies.getXcbDri3Depends('9.0.0', dependencyMap)[0], dependencyMap.xcbDri3)
 })
 
+test('getXssDepends: retuns xss pre-10.0', t => {
+  t.is(dependencies.getXssDepends('9.0.0', dependencyMap)[0], dependencyMap.xss)
+})
+
+test('getXssDepends: retuns nothing as of 10.0', t => {
+  t.is(dependencies.getXssDepends('10.0.0', dependencyMap).length, 0)
+})
+
 function testMergeUserSpecified (t, dataPath) {
   const defaults = {
     dependencies: ['lsb', 'libXScrnSaver']

test/index.test-d.ts

@@ -51,6 +51,7 @@ expectType<string[]>(common.getGTKDepends('8.0.0', dependencyMap));
 expectType<string[]>(common.getTrashDepends('8.0.0', dependencyMap));
 expectType<string[]>(common.getUUIDDepends('8.0.0', dependencyMap));
 expectType<string[]>(common.getXcbDri3Depends('8.0.0', dependencyMap));
+expectType<string[]>(common.getXssDepends('8.0.0', dependencyMap));
 const packageJSON = {
   dependencies: {
     electron: '^8.0.0'