From 20e0d6361298ddb7a81a3a7dc9ab08c9cd2cac1a Mon Sep 17 00:00:00 2001 From: Hugo Dias Date: Fri, 14 Feb 2020 14:35:30 +0000 Subject: [PATCH 1/2] fix: pin electron 6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 976969b51..ddf508824 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "conventional-github-releaser": "^3.1.3", "dependency-check": "^4.1.0", "documentation": "^12.1.4", - "electron": "^8.0.0", + "electron": "^6.0.0", "electron-mocha": "^8.2.0", "eslint": "^6.3.0", "eslint-config-standard": "^14.1.0", From 3898fce48a86afd75314afab109de4e87348c2e5 Mon Sep 17 00:00:00 2001 From: Hugo Dias Date: Fri, 14 Feb 2020 16:13:05 +0000 Subject: [PATCH 2/2] fix: fix electron detection --- package.json | 2 +- src/fixtures.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index ddf508824..976969b51 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "conventional-github-releaser": "^3.1.3", "dependency-check": "^4.1.0", "documentation": "^12.1.4", - "electron": "^6.0.0", + "electron": "^8.0.0", "electron-mocha": "^8.2.0", "eslint": "^6.3.0", "eslint-config-standard": "^14.1.0", diff --git a/src/fixtures.js b/src/fixtures.js index 554b38075..da2ef9a7c 100644 --- a/src/fixtures.js +++ b/src/fixtures.js @@ -1,12 +1,12 @@ /* global self */ 'use strict' -const { isNode } = require('ipfs-utils/src/env') +const { isNode, isElectron } = require('ipfs-utils/src/env') const path = require('path') // note: filePath needs to be relative to the module root module.exports = function loadFixtures (filePath, module) { - if (isNode) { + if (isNode || isElectron) { if (module) { filePath = path.join(module, filePath) }