Enable esModuleInterop to ease the transition to ES modules

src/api-binder/index.ts

@@ -1,8 +1,8 @@
-import * as Bluebird from 'bluebird';
+import Bluebird from 'bluebird';
 import { stripIndent } from 'common-tags';
 import { isLeft } from 'fp-ts/lib/Either';
 import * as t from 'io-ts';
-import * as _ from 'lodash';
+import _ from 'lodash';
 import { PinejsClientRequest } from 'pinejs-client-request';
 import * as url from 'url';
 import * as deviceRegister from '../lib/register-device';

src/api-binder/report.ts

@@ -1,5 +1,5 @@
 import * as url from 'url';
-import * as _ from 'lodash';
+import _ from 'lodash';
 import { delay } from 'bluebird';
 import { CoreOptions } from 'request';
 import { performance } from 'perf_hooks';

src/compose/app.ts

@@ -1,4 +1,4 @@
-import * as _ from 'lodash';
+import _ from 'lodash';
 import { promises as fs } from 'fs';
 
 import Network from './network';
@@ -14,7 +14,7 @@ import {
 } from './composition-steps';
 import * as targetStateCache from '../device-state/target-state-cache';
 import * as dockerUtils from '../lib/docker-utils';
-import constants = require('../lib/constants');
+import constants from '../lib/constants';
 
 import { getStepsFromStrategy } from './update-strategies';
 

src/compose/application-manager.ts

@@ -1,4 +1,4 @@
-import * as _ from 'lodash';
+import _ from 'lodash';
 import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types';
 
@@ -10,7 +10,7 @@ import proxyvisor from '../proxyvisor';
 
 import * as dbFormat from '../device-state/db-format';
 import { validateTargetContracts } from '../lib/contracts';
-import constants = require('../lib/constants');
+import constants from '../lib/constants';
 import { docker } from '../lib/docker-utils';
 import log from '../lib/supervisor-console';
 import {

src/compose/composition-steps.ts

@@ -1,4 +1,4 @@
-import * as _ from 'lodash';
+import _ from 'lodash';
 
 import * as config from '../config';
 

src/compose/images.ts

@@ -1,7 +1,7 @@
-import * as Bluebird from 'bluebird';
-import * as Docker from 'dockerode';
+import Bluebird from 'bluebird';
+import Docker from 'dockerode';
 import { EventEmitter } from 'events';
-import * as _ from 'lodash';
+import _ from 'lodash';
 import StrictEventEmitter from 'strict-event-emitter-types';
 
 import * as config from '../config';

src/compose/network-manager.ts

@@ -1,10 +1,10 @@
-import * as Bluebird from 'bluebird';
-import * as _ from 'lodash';
+import Bluebird from 'bluebird';
+import _ from 'lodash';
 
 import * as constants from '../lib/constants';
 import { docker } from '../lib/docker-utils';
 import { isNotFoundError } from '../lib/errors';
-import logTypes = require('../lib/log-types');
+import * as logTypes from '../lib/log-types';
 import log from '../lib/supervisor-console';
 
 import * as logger from '../logger';

src/compose/network.ts

@@ -1,8 +1,8 @@
-import * as _ from 'lodash';
+import _ from 'lodash';
 import * as dockerode from 'dockerode';
 
 import { docker } from '../lib/docker-utils';
-import logTypes = require('../lib/log-types');
+import * as logTypes from '../lib/log-types';
 import * as logger from '../logger';
 import log from '../lib/supervisor-console';
 import * as ComposeUtils from './utils';

src/compose/ports.ts

@@ -1,4 +1,4 @@
-import * as _ from 'lodash';
+import _ from 'lodash';
 import { TypedError } from 'typed-error';
 
 // Adapted from https://github.com/docker/docker-py/blob/master/docker/utils/ports.py#L3

src/compose/sanitise.ts

@@ -1,4 +1,4 @@
-import * as _ from 'lodash';
+import _ from 'lodash';
 
 import { ConfigMap, ServiceComposeConfig } from './types/service';
 

src/compose/service-manager.ts

@@ -1,9 +1,9 @@
-import * as Bluebird from 'bluebird';
+import Bluebird from 'bluebird';
 import * as Dockerode from 'dockerode';
 import { EventEmitter } from 'events';
 import { isLeft } from 'fp-ts/lib/Either';
 import * as JSONStream from 'JSONStream';
-import * as _ from 'lodash';
+import _ from 'lodash';
 import { promises as fs } from 'fs';
 import StrictEventEmitter from 'strict-event-emitter-types';
 
@@ -12,7 +12,7 @@ import { docker } from '../lib/docker-utils';
 import * as logger from '../logger';
 
 import { PermissiveNumber } from '../config/types';
-import constants = require('../lib/constants');
+import constants from '../lib/constants';
 import {
 	InternalInconsistencyError,
 	isNotFoundError,

src/compose/service.ts

@@ -1,7 +1,7 @@
 import { detailedDiff as diff } from 'deep-object-diff';
 import * as Dockerode from 'dockerode';
-import Duration = require('duration-js');
-import * as _ from 'lodash';
+import Duration from 'duration-js';
+import _ from 'lodash';
 import * as path from 'path';
 
 import { DockerPortOptions, PortMap } from './ports';

src/compose/utils.ts

@@ -1,6 +1,6 @@
 import * as Dockerode from 'dockerode';
-import Duration = require('duration-js');
-import * as _ from 'lodash';
+import Duration from 'duration-js';
+import _ from 'lodash';
 import { parse as parseCommand } from 'shell-quote';
 
 import * as constants from '../lib/constants';

src/compose/volume-manager.ts

@@ -1,8 +1,8 @@
-import * as _ from 'lodash';
+import _ from 'lodash';
 import * as Path from 'path';
 import { VolumeInspectInfo } from 'dockerode';
 
-import constants = require('../lib/constants');
+import constants from '../lib/constants';
 import { isNotFoundError, InternalInconsistencyError } from '../lib/errors';
 import { safeRename } from '../lib/fs-utils';
 import { docker } from '../lib/docker-utils';

src/compose/volume.ts

@@ -1,8 +1,8 @@
-import * as Docker from 'dockerode';
-import isEqual = require('lodash/isEqual');
-import omitBy = require('lodash/omitBy');
+import Docker from 'dockerode';
+import isEqual from 'lodash/isEqual';
+import omitBy from 'lodash/omitBy';
 
-import constants = require('../lib/constants');
+import constants from '../lib/constants';
 import { docker } from '../lib/docker-utils';
 import { InternalInconsistencyError } from '../lib/errors';
 import * as LogTypes from '../lib/log-types';

src/config/backends/backend.ts

@@ -1,4 +1,4 @@
-import * as _ from 'lodash';
+import _ from 'lodash';
 
 export interface ConfigOptions {
 	[key: string]: string | string[];

src/config/backends/config-fs.ts

@@ -1,4 +1,4 @@
-import * as _ from 'lodash';
+import _ from 'lodash';
 import { promises as fs } from 'fs';
 import * as path from 'path';
 

src/config/backends/config-txt.ts

@@ -1,4 +1,4 @@
-import * as _ from 'lodash';
+import _ from 'lodash';
 
 import { ConfigOptions, ConfigBackend } from './backend';
 import * as constants from '../../lib/constants';

src/config/backends/extlinux-file.ts

@@ -1,4 +1,4 @@
-import * as _ from 'lodash';
+import _ from 'lodash';
 
 import { ConfigOptions } from './backend';
 import {

src/config/backends/extlinux.ts

@@ -1,5 +1,5 @@
-import * as _ from 'lodash';
-import * as semver from 'semver';
+import _ from 'lodash';
+import semver from 'semver';
 
 import { ConfigOptions, ConfigBackend } from './backend';
 import {

src/config/backends/extra-uEnv.ts

@@ -1,4 +1,4 @@
-import * as _ from 'lodash';
+import _ from 'lodash';
 
 import { ConfigOptions, ConfigBackend } from './backend';
 import * as constants from '../../lib/constants';

src/config/backends/index.ts

@@ -1,4 +1,4 @@
-import * as _ from 'lodash';
+import _ from 'lodash';
 
 import { Extlinux } from './extlinux';
 import { ExtraUEnv } from './extra-uEnv';

src/config/backends/odmdata.ts

@@ -1,4 +1,4 @@
-import * as _ from 'lodash';
+import _ from 'lodash';
 import { promises as fs } from 'fs';
 
 import { ConfigOptions, ConfigBackend } from './backend';

src/config/backends/splash-image.ts

@@ -1,5 +1,5 @@
-import * as Bluebird from 'bluebird';
-import * as _ from 'lodash';
+import Bluebird from 'bluebird';
+import _ from 'lodash';
 import { promises as fs } from 'fs';
 import * as path from 'path';
 

src/config/configJson.ts

@@ -1,5 +1,5 @@
-import * as Bluebird from 'bluebird';
-import * as _ from 'lodash';
+import Bluebird from 'bluebird';
+import _ from 'lodash';
 import * as path from 'path';
 
 import * as constants from '../lib/constants';

src/config/functions.ts

@@ -1,8 +1,7 @@
-import * as Bluebird from 'bluebird';
-import * as _ from 'lodash';
-import * as memoizee from 'memoizee';
+import _ from 'lodash';
+import memoizee from 'memoizee';
 
-import supervisorVersion = require('../lib/supervisor-version');
+import supervisorVersion from '../lib/supervisor-version';
 
 import * as config from '.';
 import * as constants from '../lib/constants';
@@ -12,8 +11,8 @@ import * as hostUtils from '../lib/host-utils';
 import log from '../lib/supervisor-console';
 
 export const fnSchema = {
-	version: () => {
-		return Bluebird.resolve(supervisorVersion);
+	version: async () => {
+		return supervisorVersion;
 	},
 	currentApiKey: () => {
 		return config

src/config/index.ts

@@ -1,6 +1,6 @@
 import { EventEmitter } from 'events';
 import type { Knex } from 'knex';
-import * as _ from 'lodash';
+import _ from 'lodash';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { inspect } from 'util';
 import { generateUniqueKey } from '../lib/register-device';
@@ -86,7 +86,7 @@ export async function get<T extends SchemaTypeKey>(
 		// we can validate the output of the function as well, ensuring that the type matches
 		const promiseValue = FnSchema.fnSchema[fnKey]();
 		return promiseValue
-			.then((value: unknown) => {
+			.then((value) => {
 				const decoded = schemaTypes[key].type.decode(value);
 
 				return checkValueDecode(decoded, key, value) && decoded.right;

src/config/types.ts

@@ -1,6 +1,6 @@
 import { either, isRight } from 'fp-ts/lib/Either';
 import * as t from 'io-ts';
-import * as _ from 'lodash';
+import _ from 'lodash';
 
 import { InternalInconsistencyError } from '../lib/errors';
 import { checkBooleanish, checkTruthy } from '../lib/validation';

src/config/utils.ts

@@ -1,5 +1,5 @@
-import * as _ from 'lodash';
-import * as Bluebird from 'bluebird';
+import _ from 'lodash';
+import Bluebird from 'bluebird';
 
 import * as config from '../config';
 import * as constants from '../lib/constants';

src/db.ts

@@ -1,6 +1,6 @@
 import { knex, Knex } from 'knex';
 import * as path from 'path';
-import * as _ from 'lodash';
+import _ from 'lodash';
 
 import * as constants from './lib/constants';
 

src/device-api/api-keys.ts

@@ -1,6 +1,6 @@
-import * as _ from 'lodash';
-import * as express from 'express';
-import * as memoizee from 'memoizee';
+import _ from 'lodash';
+import express from 'express';
+import memoizee from 'memoizee';
 import { TypedError } from 'typed-error';
 
 import * as db from '../db';

src/device-api/common.ts

@@ -1,5 +1,5 @@
-import * as Bluebird from 'bluebird';
-import * as _ from 'lodash';
+import Bluebird from 'bluebird';
+import _ from 'lodash';
 
 import * as logger from '../logger';
 import * as deviceState from '../device-state';

src/device-api/index.ts

@@ -1,12 +1,12 @@
-import * as express from 'express';
-import * as _ from 'lodash';
+import express from 'express';
+import _ from 'lodash';
 
 import * as middleware from './middleware';
 import * as apiKeys from './api-keys';
 import * as eventTracker from '../event-tracker';
 import { reportCurrentState } from '../device-state';
 import proxyvisor from '../proxyvisor';
-import blink = require('../lib/blink');
+import blink from '../lib/blink';
 import log from '../lib/supervisor-console';
 
 import type { Server } from 'http';

src/device-api/middleware/errors.ts

@@ -1,4 +1,4 @@
-import * as _ from 'lodash';
+import _ from 'lodash';
 
 import { UpdatesLockedError } from '../../lib/errors';
 import log from '../../lib/supervisor-console';

src/device-api/middleware/logging.ts

@@ -1,4 +1,4 @@
-import * as morgan from 'morgan';
+import morgan from 'morgan';
 import { Request } from 'express';
 
 import log from '../../lib/supervisor-console';

src/device-api/v1.ts

@@ -1,5 +1,5 @@
-import * as express from 'express';
-import * as _ from 'lodash';
+import express from 'express';
+import _ from 'lodash';
 
 import { doRestart, doPurge } from './common';
 import { AuthorizedRequest } from './api-keys';

src/device-api/v2.ts

@@ -1,7 +1,7 @@
-import * as Bluebird from 'bluebird';
-import * as express from 'express';
+import Bluebird from 'bluebird';
+import express from 'express';
 import type { Response, NextFunction } from 'express';
-import * as _ from 'lodash';
+import _ from 'lodash';
 
 import * as deviceState from '../device-state';
 import * as apiBinder from '../api-binder';
@@ -28,7 +28,7 @@ import {
 	v2ServiceEndpointInputErrorMessage,
 } from './messages';
 import log from '../lib/supervisor-console';
-import supervisorVersion = require('../lib/supervisor-version');
+import supervisorVersion from '../lib/supervisor-version';
 import { checkInt, checkTruthy } from '../lib/validation';
 import { isVPNActive } from '../network';
 import { doPurge, doRestart, safeStateClone } from './common';

src/device-config.ts

@@ -1,4 +1,4 @@
-import * as _ from 'lodash';
+import _ from 'lodash';
 import { inspect } from 'util';
 import { promises as fs } from 'fs';
 

src/device-state.ts

@@ -1,11 +1,11 @@
-import * as Bluebird from 'bluebird';
+import Bluebird from 'bluebird';
 import { stripIndent } from 'common-tags';
 import { EventEmitter } from 'events';
-import * as _ from 'lodash';
+import _ from 'lodash';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { isRight } from 'fp-ts/lib/Either';
 import Reporter from 'io-ts-reporters';
-import prettyMs = require('pretty-ms');
+import prettyMs from 'pretty-ms';
 
 import * as config from './config';
 import * as db from './db';
@@ -15,7 +15,7 @@ import * as globalEventBus from './event-bus';
 import * as network from './network';
 import * as deviceConfig from './device-config';
 
-import constants = require('./lib/constants');
+import constants from './lib/constants';
 import * as dbus from './lib/dbus';
 import {
 	InternalInconsistencyError,