Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove electron-is-dev #1640

Merged
merged 2 commits into from
Jan 18, 2024
Merged

Remove electron-is-dev #1640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e7a565
Remove electron-is-dev
bendemboski Jan 18, 2024
5425135
Bump up end to end test timeout
bendemboski Jan 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ module.exports = {
'devtron',
'electron',
'electron-devtools-installer',
'electron-is-dev',
'ember-electron',
],
},
Expand Down
3 changes: 1 addition & 2 deletions forge/files/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand All @@ -32,7 +31,7 @@ app.on('window-all-closed', () => {
});

app.on('ready', async () => {
if (isDev) {
if (app.isPackaged) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bendemboski should this be !app.isPackaged? Seems like dev should be not packaged right? Maybe I am misunderstanding.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1698

try {
require('devtron').install();
} catch (err) {
Expand Down
2 changes: 1 addition & 1 deletion forge/template.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion node-tests/acceptance/end-to-end-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion node-tests/fixtures/ember-test/test-index-extra.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
Loading