Skip to content

Commit a5e97ca

Browse files
committed
Catch some other issues from recent ESM changes
1 parent 28ce37b commit a5e97ca

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

setup-server.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as path from 'path';
22
import * as os from 'os';
3-
import { promises as fs, createWriteStream } from 'fs'
3+
import { promises as fs, createWriteStream, readFileSync } from 'fs'
44
import { promisify } from 'util';
55

66
import _ from 'lodash';
@@ -22,7 +22,9 @@ const requiredServerVersion = 'v' + packageJson.config['httptoolkit-server-versi
2222
// This real prod server will then be used with the real prod web UI, but this local desktop app.
2323
async function setUpLocalEnv() {
2424
const serverExists = await canAccess('./httptoolkit-server/package.json');
25-
const serverVersion = serverExists ? require('./httptoolkit-server/package.json').version : null;
25+
const serverVersion = serverExists
26+
? JSON.parse(readFileSync('./httptoolkit-server/package.json').toString()).version
27+
: null;
2628

2729
if (!serverVersion || semver.neq(serverVersion, requiredServerVersion)) {
2830
if (serverExists) await deleteDir('./httptoolkit-server');

src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const rmRF = (p: string) => fs.rm(p, { recursive: true, force: true });
1818

1919
import windowStateKeeper from 'electron-window-state';
2020
import { getSystemProxy } from 'os-proxy-config';
21-
import registerContextMenu = require('electron-context-menu');
21+
import registerContextMenu from 'electron-context-menu';
2222
import { getDeferred, delay } from '@httptoolkit/util';
2323

2424
import { getMenu, shouldAutoHideMenu } from './menu.ts';

0 commit comments

Comments
 (0)