Use untildify package and enable esModuleInterop

Also adjusts imports since esModuleInterop is enabled

package.json

@@ -12,6 +12,7 @@
     "postmark": "^2.2.4",
     "request": "^2.88.0",
     "table": "^5.2.0",
+    "untildify": "^4.0.0",
     "yargonaut": "^1.1.4",
     "yargs": "^13.2.4"
   },

src/commands/email/raw.ts

@@ -1,4 +1,4 @@
-import * as ora from 'ora'
+import ora from 'ora'
 import { ServerClient } from 'postmark'
 import { log, validateToken } from '../../utils'
 

src/commands/email/template.ts

@@ -1,4 +1,4 @@
-import * as ora from 'ora'
+import ora from 'ora'
 import { ServerClient } from 'postmark'
 import { log, validateToken } from '../../utils'
 

src/commands/servers/list.ts

@@ -1,4 +1,4 @@
-import * as ora from 'ora'
+import ora from 'ora'
 import { AccountClient } from 'postmark'
 import { log, validateToken } from '../../utils'
 

src/commands/templates/pull.ts

@@ -1,15 +1,16 @@
 import { join } from 'path'
 import { outputFileSync, existsSync, ensureDirSync } from 'fs-extra'
 import { prompt } from 'inquirer'
-import * as ora from 'ora'
+import ora from 'ora'
+import untildify from 'untildify'
 import { ServerClient } from 'postmark'
 
 import {
   ProcessTemplatesOptions,
   Template,
   TemplateListOptions,
 } from '../../types'
-import { log, validateToken, pluralize, untildify } from '../../utils'
+import { log, validateToken, pluralize } from '../../utils'
 
 interface Types {
   serverToken: string

src/commands/templates/push.ts

@@ -1,9 +1,10 @@
 import chalk from 'chalk'
-import * as ora from 'ora'
+import ora from 'ora'
 import { join } from 'path'
 import { find } from 'lodash'
 import { prompt } from 'inquirer'
 import { table, getBorderCharacters } from 'table'
+import untildify from 'untildify'
 import {
   readJsonSync,
   readFileSync,
@@ -18,7 +19,7 @@ import {
   TemplatePushResults,
   TemplatePushReview,
 } from '../../types'
-import { pluralize, untildify, log, validateToken } from '../../utils'
+import { pluralize, log, validateToken } from '../../utils'
 
 interface Types {
   serverToken: string

src/utils.ts

@@ -1,5 +1,4 @@
 import { Argv } from 'yargs'
-import { homedir } from 'os'
 import chalk from 'chalk'
 import { prompt } from 'inquirer'
 
@@ -14,14 +13,6 @@ export const cmd = (name: string, desc: string) => ({
   builder: (yargs: Argv) => yargs.commandDir(`commands/${name}`),
 })
 
-/**
- * Converts tildy paths to absolute paths.
- * Take from https://github.com/sindresorhus/untildify
- * @returns string containing resolved home directory
- */
-export const untildify = (input: string) =>
-  homedir() ? input.replace(/^~(?=$|\/|\\)/, homedir()) : input
-
 /**
  * Convert a string to compatible template alias
  * @returns the formatted string

test/integration/email.template.test.ts

@@ -1,6 +1,6 @@
 import {expect} from "chai";
 import "mocha";
-import * as execa from 'execa'
+import execa from 'execa'
 import {serverToken, fromAddress, toAddress, CLICommand} from "./shared";
 import * as postmark from 'postmark';
 

test/integration/email.test.ts

@@ -1,6 +1,6 @@
 import {expect} from "chai";
 import "mocha";
-import * as execa from 'execa'
+import execa from 'execa'
 import {serverToken, fromAddress, toAddress, CLICommand} from "./shared";
 
 describe("Email send command", () => {

test/integration/general.test.ts

@@ -1,6 +1,6 @@
 import { expect } from "chai";
 import "mocha";
-import * as execa from 'execa'
+import execa from 'execa'
 import {CLICommand, packageJson} from "./shared";
 
 describe("Default command", () => {

test/integration/servers.test.ts

@@ -1,6 +1,6 @@
 import { expect } from "chai";
 import "mocha";
-import * as execa from 'execa'
+import execa from 'execa'
 
 import {accountToken, CLICommand} from "./shared";
 

test/integration/shared.ts

@@ -1,4 +1,4 @@
-import * as nconf from "nconf";
+import nconf from "nconf";
 
 export const testingKeys = nconf.env().file({ file: __dirname + "/../config/testing_keys.json" });
 export const accountToken: string = testingKeys.get("ACCOUNT_TOKEN");

test/integration/templates.pull.test.ts

@@ -1,6 +1,6 @@
 import {expect} from "chai";
 import "mocha";
-import * as execa from 'execa'
+import execa from 'execa'
 import * as fs from 'fs-extra';
 
 const dirTree = require("directory-tree");

test/integration/templates.push.test.ts

@@ -1,6 +1,6 @@
 import {expect} from "chai";
 import "mocha";
-import * as execa from 'execa'
+import execa from 'execa'
 import * as fs from 'fs-extra';
 import {DirectoryTree} from "directory-tree";
 

tsconfig.json

@@ -11,7 +11,8 @@
     "noImplicitThis": true,
     "lib": ["es5", "es2017", "dom"],
     "declaration": true,
-    "resolveJsonModule": true
+    "resolveJsonModule": true,
+    "esModuleInterop": true
   },
   "include": ["src/**/*"],
   "exclude": ["test/**/*"]