diff --git a/.eslintrc.js b/.eslintrc.js index d1cac5f6..0050bc4b 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -94,7 +94,6 @@ module.exports = { 'devtron', 'electron', 'electron-devtools-installer', - 'electron-is-dev', 'ember-electron', ], }, diff --git a/forge/files/src/index.js b/forge/files/src/index.js index c5b5d151..de1c58ef 100644 --- a/forge/files/src/index.js +++ b/forge/files/src/index.js @@ -6,7 +6,6 @@ const { const { pathToFileURL } = require('url'); const { app, BrowserWindow } = require('electron'); const path = require('path'); -const isDev = require('electron-is-dev'); const handleFileUrls = require('./handle-file-urls'); const emberAppDir = path.resolve(__dirname, '..', 'ember-dist'); @@ -32,7 +31,7 @@ app.on('window-all-closed', () => { }); app.on('ready', async () => { - if (isDev) { + if (app.isPackaged) { try { require('devtron').install(); } catch (err) { diff --git a/forge/template.js b/forge/template.js index d535b3ef..b05bfbdd 100644 --- a/forge/template.js +++ b/forge/template.js @@ -65,7 +65,7 @@ class EmberElectronTemplates extends BaseTemplate { return ['devtron']; } get dependencies() { - return ['electron-devtools-installer', 'electron-is-dev']; + return ['electron-devtools-installer']; } async initializeTemplate(dir) { diff --git a/node-tests/acceptance/end-to-end-test.js b/node-tests/acceptance/end-to-end-test.js index d563b766..1eaf9493 100644 --- a/node-tests/acceptance/end-to-end-test.js +++ b/node-tests/acceptance/end-to-end-test.js @@ -30,7 +30,7 @@ function run(cmd, args, opts = {}) { } describe('end-to-end', function () { - this.timeout(10 * 60 * 1000); + this.timeout(10 * 120 * 1000); let oldEnv; let rootDir = process.cwd(); diff --git a/node-tests/fixtures/ember-test/test-index-extra.js b/node-tests/fixtures/ember-test/test-index-extra.js index cdcd3a19..39e8650c 100644 --- a/node-tests/fixtures/ember-test/test-index-extra.js +++ b/node-tests/fixtures/ember-test/test-index-extra.js @@ -2,7 +2,7 @@ // to make sure we don't have naming conflicts with already-declared variables function testIndexExtra() { // Make sure dependencies (node_modules) are loadable - require('electron-is-dev'); + require('electron-devtools-installer'); // Make sure local libraries are loadable const helper = require('../src/helper');