From e15f97f2404388f978ab906f67aaf20892835f00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Szabo?= Date: Thu, 23 Nov 2023 23:24:50 -0300 Subject: [PATCH] ES Module w/ Babel is a NIGHTMARE --- lib/controllers/conflict-controller.js | 2 +- lib/controllers/issueish-list-controller.js | 2 +- lib/controllers/root-controller.js | 2 +- lib/git-shell-out-strategy.js | 2 +- lib/models/event-logger.js | 2 +- lib/views/actionable-review-view.js | 2 +- lib/views/directory-select.js | 2 +- lib/views/git-timings-view.js | 2 +- lib/views/staging-view.js | 2 +- lib/worker-manager.js | 2 +- lib/worker.js | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/controllers/conflict-controller.js b/lib/controllers/conflict-controller.js index b803e8e428..9595719685 100644 --- a/lib/controllers/conflict-controller.js +++ b/lib/controllers/conflict-controller.js @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import remote from '@electron/remote'; +const remote = require('@electron/remote'); const {Menu, MenuItem} = remote; import {autobind} from '../helpers'; diff --git a/lib/controllers/issueish-list-controller.js b/lib/controllers/issueish-list-controller.js index 348480e9c4..9c1ec20366 100644 --- a/lib/controllers/issueish-list-controller.js +++ b/lib/controllers/issueish-list-controller.js @@ -5,7 +5,7 @@ import {EndpointPropType} from '../prop-types'; import IssueishListView from '../views/issueish-list-view'; import Issueish from '../models/issueish'; import {shell} from 'electron'; -import remote from '@electron/remote'; +const remote = require('@electron/remote'); const {Menu, MenuItem} = remote; import {addEvent} from '../reporter-proxy'; diff --git a/lib/controllers/root-controller.js b/lib/controllers/root-controller.js index 99083ff6f6..db46d2f3df 100644 --- a/lib/controllers/root-controller.js +++ b/lib/controllers/root-controller.js @@ -1,6 +1,6 @@ import fs from 'fs-extra'; import path from 'path'; -import remote from '@electron/remote'; +const remote = require('@electron/remote'); import React, {Fragment} from 'react'; import PropTypes from 'prop-types'; diff --git a/lib/git-shell-out-strategy.js b/lib/git-shell-out-strategy.js index e9afa735b5..2909a61489 100644 --- a/lib/git-shell-out-strategy.js +++ b/lib/git-shell-out-strategy.js @@ -3,7 +3,7 @@ import os from 'os'; import childProcess from 'child_process'; import fs from 'fs-extra'; import util from 'util'; -import remote from '@electron/remote'; +const remote = require('@electron/remote'); import {CompositeDisposable} from 'event-kit'; import {GitProcess} from 'dugite'; diff --git a/lib/models/event-logger.js b/lib/models/event-logger.js index 404c5966d7..00c561073a 100644 --- a/lib/models/event-logger.js +++ b/lib/models/event-logger.js @@ -1,5 +1,5 @@ import path from 'path'; -import remote from '@electron/remote'; +const remote = require('@electron/remote'); let headless = null; diff --git a/lib/views/actionable-review-view.js b/lib/views/actionable-review-view.js index 789183b540..862b26fd60 100644 --- a/lib/views/actionable-review-view.js +++ b/lib/views/actionable-review-view.js @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import cx from 'classnames'; import {shell} from 'electron'; -import remote from '@electron/remote'; +const remote = require('@electron/remote'); import {TextBuffer} from 'atom'; import AtomTextEditor from '../atom/atom-text-editor'; import RefHolder from '../models/ref-holder'; diff --git a/lib/views/directory-select.js b/lib/views/directory-select.js index b9be7362bb..b09e1a18f9 100644 --- a/lib/views/directory-select.js +++ b/lib/views/directory-select.js @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import remote from '@electron/remote'; +const remote = require('@electron/remote'); import {TabbableTextEditor, TabbableButton} from './tabbable'; diff --git a/lib/views/git-timings-view.js b/lib/views/git-timings-view.js index cd1b155c40..6d6a793a83 100644 --- a/lib/views/git-timings-view.js +++ b/lib/views/git-timings-view.js @@ -1,6 +1,6 @@ import {TextBuffer} from 'atom'; import {Emitter, CompositeDisposable} from 'event-kit'; -import remote from '@electron/remote'; +const remote = require('@electron/remote'); const {dialog} = remote; import React from 'react'; import ReactDom from 'react-dom'; diff --git a/lib/views/staging-view.js b/lib/views/staging-view.js index c29b16155f..790c7923c5 100644 --- a/lib/views/staging-view.js +++ b/lib/views/staging-view.js @@ -1,5 +1,5 @@ import {Disposable, CompositeDisposable} from 'event-kit'; -import remote from '@electron/remote'; +const remote = require('@electron/remote'); const {Menu, MenuItem} = remote; import {File} from 'atom'; import React, {Fragment} from 'react'; diff --git a/lib/worker-manager.js b/lib/worker-manager.js index 3714c9523f..8a13046b2f 100644 --- a/lib/worker-manager.js +++ b/lib/worker-manager.js @@ -2,7 +2,7 @@ import path from 'path'; import querystring from 'querystring'; import {ipcRenderer as ipc} from 'electron'; -import remote from '@electron/remote'; +const remote = require('@electron/remote'); const {BrowserWindow} = remote; import {Emitter, Disposable, CompositeDisposable} from 'event-kit'; diff --git a/lib/worker.js b/lib/worker.js index 49ca4ecefb..1452e6771a 100644 --- a/lib/worker.js +++ b/lib/worker.js @@ -1,7 +1,7 @@ const qs = require('querystring'); const {ipcRenderer: ipc} = require('electron'); -import remote from '@electron/remote'; +const remote = require('@electron/remote'); const {GitProcess} = require('dugite');