2 files changed, 31 insertions, 14 deletions

diff --git a/config/build-common.js b/config/build-common.js
index aea2335..ff5a218 100644
--- a/config/build-common.js
+++ b/config/build-common.js
@@ -1,11 +1,17 @@
-// @ts-check
+import { readFileSync } from 'fs';
+import { dirname, join } from 'path';
+import { fileURLToPath } from 'url';
 
-// `resolveJsonModule` is disabled for this package, but vite will load the json nevertheless.
-// @ts-ignore
-const { chrome: chromeVersion, node: nodeVersion } = require('../.electron-vendors.cache.json');
+const thisDir = fileURLToDirname(import.meta.url);
+
+// We import this from a vite config, where top-level await is not available (es2021),
+// so we have to use the synchronous filesystem API.
+const electronVendorsJson = readFileSync(join(thisDir, '../.electron-vendors.cache.json'), 'utf8');
+
+const { chrome: chromeVersion, node: nodeVersion } = JSON.parse(electronVendorsJson);
 
 /** @type {string} */
-module.exports.banner = `/*!
+export const banner = `/*!
  * Copyright (C)  2021-2022 Sophie contributors
  *
  * This file is part of Sophie.
@@ -27,7 +33,15 @@ module.exports.banner = `/*!
 `;
 
 /** @type {string} */
-module.exports.chrome = `chrome${chromeVersion}`;
+export const chrome = `chrome${chromeVersion}`;
 
 /** @type {string} */
-module.exports.node = `node${nodeVersion}`;
+export const node = `node${nodeVersion}`;
+
+/**
+ * @param {string} url
+ * @returns {string}
+ */
+export function fileURLToDirname(url) {
+  return dirname(fileURLToPath(url));
+}
diff --git a/config/esbuild-config.js b/config/esbuild-config.js
index 9140b89..52d1a59 100644
--- a/config/esbuild-config.js
+++ b/config/esbuild-config.js
@@ -1,6 +1,4 @@
-// @ts-check
-
-const { banner } = require('./build-common');
+import { banner } from './build-common.js';
 
 /** @type {string} */
 const mode = process.env.MODE || 'development';
@@ -8,8 +6,10 @@ const mode = process.env.MODE || 'development';
 /** @type {boolean} */
 const isDevelopment = mode === 'development';
 
+/** @type {string} */
 const modeString = JSON.stringify(mode);
 
+/** @type {Record<string, string>} */
 const defineEnv = {
   'import.meta.env.DEV': JSON.stringify(isDevelopment),
   'import.meta.env.MODE': modeString,
@@ -20,13 +20,16 @@ const defineEnv = {
 
 /**
  * @param {import('esbuild').BuildOptions} config
- * @param {object | unknown} metaEnvVars
+ * @param {Record<string, string>} [metaEnvVars]
  * @returns {import('esbuild').BuildOptions}
  */
-module.exports.getConfig = function(config, metaEnvVars) {
+export function getConfig(config, metaEnvVars) {
+  /** @type {Record<string, string>} */
   const defineMeta = {};
-  for (const varName in metaEnvVars) {
-    defineMeta[`import.meta.env.${varName}`] = JSON.stringify(metaEnvVars[varName]);
+  if (metaEnvVars) {
+    for (const varName in metaEnvVars) {
+      defineMeta[`import.meta.env.${varName}`] = JSON.stringify(metaEnvVars[varName]);
+    }
   }
   return {
     logLevel: 'info',