feat: ESM

electron.cjs

@@ -0,0 +1 @@
+module.exports = require('electron')

index.cjs

@@ -0,0 +1 @@
+import('./build/main/index.js')

package.json

@@ -1,5 +1,6 @@
 {
   "name": "webtorrent-desktop",
+  "type": "module",
   "description": "WebTorrent, the streaming torrent client. For Mac, Windows, and Linux.",
   "version": "0.24.0",
   "author": {
@@ -96,7 +97,7 @@
     "webtorrent"
   ],
   "license": "MIT",
-  "main": "index.js",
+  "main": "index.cjs",
   "optionalDependencies": {
     "appdmg": "^0.6.0",
     "electron-installer-debian": "^3.1.0",

src/config.js

@@ -1,12 +1,13 @@
-const appConfig = require('application-config')('WebTorrent')
-const path = require('path')
-const { app } = require('electron')
-const arch = require('arch')
+import applicationConfig from 'application-config'
+import path from 'path'
+import arch from 'arch'
+import fs from 'fs'
+import electron from '../electron.cjs'
 
+const appConfig = applicationConfig('WebTorrent')
 const APP_NAME = 'WebTorrent'
 const APP_TEAM = 'WebTorrent, LLC'
-const APP_VERSION = require('../package.json').version
-
+const APP_VERSION = JSON.parse(fs.readFileSync('package.json').toString()).version
 const IS_TEST = isTest()
 const PORTABLE_PATH = IS_TEST
   ? path.join(process.platform === 'win32' ? 'C:\\Windows\\Temp' : '/tmp', 'WebTorrentTest')
@@ -17,93 +18,6 @@ const IS_PORTABLE = isPortable()
 const UI_HEADER_HEIGHT = 38
 const UI_TORRENT_HEIGHT = 100
 
-module.exports = {
-  ANNOUNCEMENT_URL: 'https://webtorrent.io/desktop/announcement',
-  AUTO_UPDATE_URL: 'https://webtorrent.io/desktop/update',
-  CRASH_REPORT_URL: 'https://webtorrent.io/desktop/crash-report',
-  TELEMETRY_URL: 'https://webtorrent.io/desktop/telemetry',
-
-  APP_COPYRIGHT: `Copyright © 2014-${new Date().getFullYear()} ${APP_TEAM}`,
-  APP_FILE_ICON: path.join(__dirname, '..', 'static', 'WebTorrentFile'),
-  APP_ICON: path.join(__dirname, '..', 'static', 'WebTorrent'),
-  APP_NAME,
-  APP_TEAM,
-  APP_VERSION,
-  APP_WINDOW_TITLE: APP_NAME,
-
-  CONFIG_PATH: getConfigPath(),
-
-  DEFAULT_TORRENTS: [
-    {
-      testID: 'bbb',
-      name: 'Big Buck Bunny',
-      posterFileName: 'bigBuckBunny.jpg',
-      torrentFileName: 'bigBuckBunny.torrent'
-    },
-    {
-      testID: 'cosmos',
-      name: 'Cosmos Laundromat (Preview)',
-      posterFileName: 'cosmosLaundromat.jpg',
-      torrentFileName: 'cosmosLaundromat.torrent'
-    },
-    {
-      testID: 'sintel',
-      name: 'Sintel',
-      posterFileName: 'sintel.jpg',
-      torrentFileName: 'sintel.torrent'
-    },
-    {
-      testID: 'tears',
-      name: 'Tears of Steel',
-      posterFileName: 'tearsOfSteel.jpg',
-      torrentFileName: 'tearsOfSteel.torrent'
-    },
-    {
-      testID: 'wired',
-      name: 'The WIRED CD - Rip. Sample. Mash. Share',
-      posterFileName: 'wiredCd.jpg',
-      torrentFileName: 'wiredCd.torrent'
-    }
-  ],
-
-  DELAYED_INIT: 3000 /* 3 seconds */,
-
-  DEFAULT_DOWNLOAD_PATH: getDefaultDownloadPath(),
-
-  GITHUB_URL: 'https://github.com/webtorrent/webtorrent-desktop',
-  GITHUB_URL_ISSUES: 'https://github.com/webtorrent/webtorrent-desktop/issues',
-  GITHUB_URL_RAW: 'https://raw.githubusercontent.com/webtorrent/webtorrent-desktop/master',
-  GITHUB_URL_RELEASES: 'https://github.com/webtorrent/webtorrent-desktop/releases',
-
-  HOME_PAGE_URL: 'https://webtorrent.io',
-  TWITTER_PAGE_URL: 'https://twitter.com/WebTorrentApp',
-
-  IS_PORTABLE,
-  IS_PRODUCTION,
-  IS_TEST,
-
-  OS_SYSARCH: arch() === 'x64' ? 'x64' : 'ia32',
-
-  POSTER_PATH: path.join(getConfigPath(), 'Posters'),
-  ROOT_PATH: path.join(__dirname, '..'),
-  STATIC_PATH: path.join(__dirname, '..', 'static'),
-  TORRENT_PATH: path.join(getConfigPath(), 'Torrents'),
-
-  WINDOW_ABOUT: 'file://' + path.join(__dirname, '..', 'static', 'about.html'),
-  WINDOW_MAIN: 'file://' + path.join(__dirname, '..', 'static', 'main.html'),
-  WINDOW_WEBTORRENT: 'file://' + path.join(__dirname, '..', 'static', 'webtorrent.html'),
-
-  WINDOW_INITIAL_BOUNDS: {
-    width: 500,
-    height: UI_HEADER_HEIGHT + (UI_TORRENT_HEIGHT * 6) // header + 6 torrents
-  },
-  WINDOW_MIN_HEIGHT: UI_HEADER_HEIGHT + (UI_TORRENT_HEIGHT * 2), // header + 2 torrents
-  WINDOW_MIN_WIDTH: 425,
-
-  UI_HEADER_HEIGHT,
-  UI_TORRENT_HEIGHT
-}
-
 function getConfigPath () {
   if (IS_PORTABLE) {
     return PORTABLE_PATH
@@ -121,16 +35,12 @@ function getDefaultDownloadPath () {
 }
 
 function getPath (key) {
-  if (!process.versions.electron) {
+  if (!process.versions.electron || process.type !== 'browser') {
     // Node.js process
     return ''
-  } else if (process.type === 'renderer') {
-    // Electron renderer process
-    return require('@electron/remote').app.getPath(key)
-  } else {
-    // Electron main process
-    return app.getPath(key)
   }
+  // Electron main process
+  return electron.app.getPath(key)
 }
 
 function isTest () {
@@ -147,8 +57,6 @@ function isPortable () {
     return false
   }
 
-  const fs = require('fs')
-
   try {
     // This line throws if the "Portable Settings" folder does not exist, and does
     // nothing otherwise.
@@ -174,3 +82,117 @@ function isProduction () {
     return !/\/electron$/.test(process.execPath)
   }
 }
+
+export const ANNOUNCEMENT_URL = 'https://webtorrent.io/desktop/announcement'
+export const AUTO_UPDATE_URL = 'https://webtorrent.io/desktop/update'
+export const CRASH_REPORT_URL = 'https://webtorrent.io/desktop/crash-report'
+export const TELEMETRY_URL = 'https://webtorrent.io/desktop/telemetry'
+export const APP_COPYRIGHT = `Copyright © 2014-${new Date().getFullYear()} ${APP_TEAM}`
+export const APP_FILE_ICON = new URL('../static/WebTorrentFile', import.meta.url).pathname // path.join(__dirname, '..',
+// 'static', 'WebTorrentFile')
+export const APP_ICON = new URL('../static/WebTorrent', import.meta.url).pathname // path.join(__dirname, '..',
+// 'static',
+// 'WebTorrent')
+export const CONFIG_PATH = getConfigPath()
+export const DEFAULT_TORRENTS = [
+  {
+    testID: 'bbb',
+    name: 'Big Buck Bunny',
+    posterFileName: 'bigBuckBunny.jpg',
+    torrentFileName: 'bigBuckBunny.torrent'
+  },
+  {
+    testID: 'cosmos',
+    name: 'Cosmos Laundromat (Preview)',
+    posterFileName: 'cosmosLaundromat.jpg',
+    torrentFileName: 'cosmosLaundromat.torrent'
+  },
+  {
+    testID: 'sintel',
+    name: 'Sintel',
+    posterFileName: 'sintel.jpg',
+    torrentFileName: 'sintel.torrent'
+  },
+  {
+    testID: 'tears',
+    name: 'Tears of Steel',
+    posterFileName: 'tearsOfSteel.jpg',
+    torrentFileName: 'tearsOfSteel.torrent'
+  },
+  {
+    testID: 'wired',
+    name: 'The WIRED CD - Rip. Sample. Mash. Share',
+    posterFileName: 'wiredCd.jpg',
+    torrentFileName: 'wiredCd.torrent'
+  }
+]
+export const DELAYED_INIT = 3000 /* 3 seconds */
+export const DEFAULT_DOWNLOAD_PATH = getDefaultDownloadPath()
+export const GITHUB_URL = 'https://github.com/webtorrent/webtorrent-desktop'
+export const GITHUB_URL_ISSUES = 'https://github.com/webtorrent/webtorrent-desktop/issues'
+export const GITHUB_URL_RAW = 'https://raw.githubusercontent.com/webtorrent/webtorrent-desktop/master'
+export const GITHUB_URL_RELEASES = 'https://github.com/webtorrent/webtorrent-desktop/releases'
+export const HOME_PAGE_URL = 'https://webtorrent.io'
+export const TWITTER_PAGE_URL = 'https://twitter.com/WebTorrentApp'
+export const OS_SYSARCH = arch() === 'x64' ? 'x64' : 'ia32'
+export const POSTER_PATH = path.join(getConfigPath(), 'Posters')
+export const ROOT_PATH = new URL('../', import.meta.url).pathname
+export const STATIC_PATH = new URL('../static', import.meta.url).pathname
+export const TORRENT_PATH = path.join(getConfigPath(), 'Torrents')
+export const WINDOW_ABOUT = 'file://' + new URL('../static/about.html', import.meta.url).pathname
+export const WINDOW_MAIN = 'file://' + new URL('../static/main.html', import.meta.url).pathname
+export const WINDOW_WEBTORRENT = 'file://' + new URL('../static/webtorrent.html', import.meta.url).pathname
+export const WINDOW_INITIAL_BOUNDS = {
+  width: 500,
+  height: UI_HEADER_HEIGHT + (UI_TORRENT_HEIGHT * 6) // header + 6 torrents
+}
+export const WINDOW_MIN_HEIGHT = UI_HEADER_HEIGHT + (UI_TORRENT_HEIGHT * 2)
+export const WINDOW_MIN_WIDTH = 425
+export { APP_NAME }
+export { APP_TEAM }
+export { APP_VERSION }
+export { APP_NAME as APP_WINDOW_TITLE }
+export { IS_PORTABLE }
+export { IS_PRODUCTION }
+export { IS_TEST }
+export { UI_HEADER_HEIGHT }
+export { UI_TORRENT_HEIGHT }
+export default {
+  ANNOUNCEMENT_URL,
+  AUTO_UPDATE_URL,
+  CRASH_REPORT_URL,
+  TELEMETRY_URL,
+  APP_COPYRIGHT,
+  APP_FILE_ICON,
+  APP_ICON,
+  APP_NAME,
+  APP_TEAM,
+  APP_VERSION,
+  APP_WINDOW_TITLE: APP_NAME,
+  CONFIG_PATH,
+  DEFAULT_TORRENTS,
+  DELAYED_INIT,
+  DEFAULT_DOWNLOAD_PATH,
+  GITHUB_URL,
+  GITHUB_URL_ISSUES,
+  GITHUB_URL_RAW,
+  GITHUB_URL_RELEASES,
+  HOME_PAGE_URL,
+  TWITTER_PAGE_URL,
+  IS_PORTABLE,
+  IS_PRODUCTION,
+  IS_TEST,
+  OS_SYSARCH,
+  POSTER_PATH,
+  ROOT_PATH,
+  STATIC_PATH,
+  TORRENT_PATH,
+  WINDOW_ABOUT,
+  WINDOW_MAIN,
+  WINDOW_WEBTORRENT,
+  WINDOW_INITIAL_BOUNDS,
+  WINDOW_MIN_HEIGHT,
+  WINDOW_MIN_WIDTH,
+  UI_HEADER_HEIGHT,
+  UI_TORRENT_HEIGHT
+}

src/crash-reporter.js

@@ -1,15 +1,13 @@
-module.exports = {
-  init
-}
-
-function init () {
-  const config = require('./config')
-  const { crashReporter } = require('electron')
+import electron from '../electron.cjs'
 
-  crashReporter.start({
+async function init () {
+  const config = await import('./config.js')
+  electron.crashReporter.start({
     productName: config.APP_NAME,
     submitURL: config.CRASH_REPORT_URL,
     globalExtra: { _companyName: config.APP_NAME },
     compress: true
   })
 }
+
+export default { init }

src/main/announcement.js

@@ -1,11 +1,6 @@
-module.exports = {
-  init
-}
-
-const { dialog } = require('electron')
-
-const config = require('../config')
-const log = require('./log')
+import electron from '../../electron.cjs'
+import config from '../config.js'
+import log from './log.js'
 
 const ANNOUNCEMENT_URL =
   `${config.ANNOUNCEMENT_URL}?version=${config.APP_VERSION}&platform=${process.platform}`
@@ -24,8 +19,8 @@ const ANNOUNCEMENT_URL =
  *     "detail": "Please update to v0.xx as soon as possible..."
  *   }
  */
-function init () {
-  const get = require('simple-get')
+async function init () {
+  const { default: get } = await import('simple-get')
   get.concat(ANNOUNCEMENT_URL, onResponse)
 }
 
@@ -44,11 +39,13 @@ function onResponse (err, res, data) {
     }
   }
 
-  dialog.showMessageBox({
+  electron.dialog.showMessageBox({
     type: 'info',
     buttons: ['OK'],
     title: data.title,
     message: data.message,
     detail: data.detail
   })
 }
+
+export default { init }