Skip to content

Commit e6a936e

Browse files
authored
chore: use esModuleInterop: true (#1226)
1 parent 138403d commit e6a936e

12 files changed

+30
-22
lines changed

package-lock.json

+12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
"npm": ">=6.12.0 <7.0.0"
2020
},
2121
"devDependencies": {
22+
"@types/command-line-args": "5.0.0",
23+
"@types/command-line-usage": "5.0.1",
2224
"@types/decompress": "4.2.3",
2325
"@types/electron-devtools-installer": "2.0.2",
2426
"@types/electron-settings": "3.0.0",

packages/uhk-agent/src/custom_types/command-line-args.d.ts

-1
This file was deleted.

packages/uhk-agent/src/custom_types/command-line-usage.d.ts

-1
This file was deleted.

packages/uhk-agent/src/custom_types/decompress.d.ts

-1
This file was deleted.

packages/uhk-agent/src/services/app-update.service.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { ipcMain } from 'electron';
22
import { autoUpdater } from 'electron-updater';
33
import { UpdateInfo, ProgressInfo } from 'builder-util-runtime';
4-
import * as settings from 'electron-settings';
4+
import settings from 'electron-settings';
55
import * as isDev from 'electron-is-dev';
6-
import * as storage from 'electron-settings';
6+
import storage from 'electron-settings';
77

88
import { ApplicationSettings, IpcEvents, LogService } from 'uhk-common';
99
import { MainServiceBase } from './main-service-base';

packages/uhk-agent/src/util/command-line.ts

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
1-
/// <reference path="../custom_types/command-line-args.d.ts"/>
2-
/// <reference path="../custom_types/command-line-usage.d.ts"/>
3-
4-
import * as commandLineArgs from 'command-line-args';
5-
import * as commandLineUsage from 'command-line-usage';
1+
import commandLineArgs from 'command-line-args';
2+
import commandLineUsage from 'command-line-usage';
63
import { CommandLineArgs } from 'uhk-common';
74

8-
const optionDefinitions = [
5+
const optionDefinitions: commandLineArgs.OptionDefinition[] = [
96
{ name: 'modules', type: Boolean },
107
{ name: 'help', type: Boolean },
118
{ name: 'preserve-udev-rules', type: Boolean },
129
{ name: 'spe', type: Boolean }, // simulate privilege escalation error
1310
{ name: 'usb-driver', type: String }
1411
];
1512

16-
export const options: CommandLineArgs = commandLineArgs(optionDefinitions, { partial: true });
13+
export const options: CommandLineArgs = commandLineArgs(optionDefinitions, { partial: true }) as CommandLineArgs;
1714

18-
const sections = [
15+
const sections: commandLineUsage.Section[] = [
1916
{
2017
header: 'UHK Agent',
2118
content: 'Ultimate Hacking Keyboard configurator'

packages/uhk-agent/src/util/save-extract-firmware.ts

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
import * as fs from 'fs';
22
import * as path from 'path';
33
import { dirSync } from 'tmp';
4-
import * as decompress from 'decompress';
5-
import * as decompressTarbz from 'decompress-tarbz2';
6-
import * as decompressTargz from 'decompress-targz';
7-
import { extname } from 'path';
4+
import decompress from 'decompress';
5+
import decompressTarbz from 'decompress-tarbz2';
6+
import decompressTargz from 'decompress-targz';
87
import { UploadFileData } from 'uhk-common';
98

109
import { TmpFirmware } from '../models/tmp-firmware';
1110

1211
export async function saveTmpFirmware(fileData: UploadFileData): Promise<TmpFirmware> {
1312
const tmpDirectory = dirSync();
14-
const extension = extname(fileData.filename);
13+
const extension = path.extname(fileData.filename);
1514
const zipFilePath = path.join(tmpDirectory.name, `firmware${extension}`);
1615

1716
await writeDataToFile(fileData.data, zipFilePath);

packages/uhk-agent/src/util/window.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as electron from 'electron';
2-
import * as settings from 'electron-settings';
2+
import settings from 'electron-settings';
33

44
import { logger } from '../services/logger.service';
55
import { WindowState } from '../models/window-state';

packages/uhk-common/src/util/create-md5-hash.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Buffer } from 'buffer/';
2-
import * as md5 from 'md5';
2+
import md5 from 'md5';
33

44
export function createMd5Hash(buffer: Buffer): string {
55
return md5(buffer);

packages/uhk-common/src/util/user-configuration-history-helpers.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as moment from 'moment';
1+
import moment from 'moment';
22

33
export const FILENAME_DATE_FORMAT = 'YYYYMMDD-HHmmss';
44
export const DISPLAY_DATE_FORMAT = 'YYYY-MM-DD HH:mm:ss';

tsconfig.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
"declaration": true,
66
"module": "commonjs",
77
"moduleResolution": "node",
8+
"esModuleInterop": true,
89
"emitDecoratorMetadata": true,
910
"experimentalDecorators": true,
10-
"target": "es2016",
11+
"target": "ES2016",
1112
"importHelpers": true
1213
}
1314
}

0 commit comments

Comments
 (0)