From 79a81538aaaa452e4144881e70f82b95aa61884b Mon Sep 17 00:00:00 2001 From: Zack Schuster Date: Thu, 14 Apr 2022 11:00:49 -0700 Subject: [PATCH] chore: use extensions in module specifiers --- ava.config.js | 5 +---- email.ts | 16 ++++++++-------- smtp/client.ts | 10 +++++----- smtp/connection.ts | 4 ++-- smtp/message.ts | 6 +++--- smtp/response.ts | 2 +- test/address.ts | 2 +- test/auth.ts | 2 +- test/client.ts | 9 +++++++-- test/date.ts | 2 +- test/message.ts | 4 ++-- test/mime.ts | 2 +- 12 files changed, 33 insertions(+), 31 deletions(-) diff --git a/ava.config.js b/ava.config.js index e8fbea9..662a23c 100644 --- a/ava.config.js +++ b/ava.config.js @@ -6,9 +6,6 @@ export default { NODE_TLS_REJECT_UNAUTHORIZED: '0', }, files: ['test/*.ts'], - nodeArguments: [ - '--loader=ts-node/esm', - '--experimental-specifier-resolution=node', - ], + nodeArguments: ['--loader=ts-node/esm'], workerThreads: false, // makes tests far slower }; diff --git a/email.ts b/email.ts index 90950f5..b3f401f 100644 --- a/email.ts +++ b/email.ts @@ -1,8 +1,8 @@ -export * from './smtp/address'; -export * from './smtp/client'; -export * from './smtp/connection'; -export * from './smtp/date'; -export * from './smtp/error'; -export * from './smtp/message'; -export * from './smtp/mime'; -export * from './smtp/response'; +export * from './smtp/address.js'; +export * from './smtp/client.js'; +export * from './smtp/connection.js'; +export * from './smtp/date.js'; +export * from './smtp/error.js'; +export * from './smtp/message.js'; +export * from './smtp/mime.js'; +export * from './smtp/response.js'; diff --git a/smtp/client.ts b/smtp/client.ts index 4a04440..56d1458 100644 --- a/smtp/client.ts +++ b/smtp/client.ts @@ -1,8 +1,8 @@ -import { addressparser } from './address'; -import type { MessageAttachment, MessageHeaders } from './message'; -import { Message } from './message'; -import type { SMTPConnectionOptions } from './connection'; -import { SMTPConnection, SMTPState } from './connection'; +import { addressparser } from './address.js'; +import type { MessageAttachment, MessageHeaders } from './message.js'; +import { Message } from './message.js'; +import type { SMTPConnectionOptions } from './connection.js'; +import { SMTPConnection, SMTPState } from './connection.js'; export type MessageCallback = < U extends Error | null, diff --git a/smtp/connection.ts b/smtp/connection.ts index e98e41f..8c4ae61 100644 --- a/smtp/connection.ts +++ b/smtp/connection.ts @@ -5,8 +5,8 @@ import { hostname } from 'os'; import { connect, createSecureContext, TLSSocket } from 'tls'; import type { ConnectionOptions } from 'tls'; -import { SMTPError, SMTPErrorStates } from './error'; -import { SMTPResponseMonitor } from './response'; +import { SMTPError, SMTPErrorStates } from './error.js'; +import { SMTPResponseMonitor } from './response.js'; /** * @readonly diff --git a/smtp/message.ts b/smtp/message.ts index 335c1f7..0a3401c 100644 --- a/smtp/message.ts +++ b/smtp/message.ts @@ -10,9 +10,9 @@ import { hostname } from 'os'; import { Stream } from 'stream'; import type { Readable } from 'stream'; -import { addressparser } from './address'; -import { getRFC2822Date } from './date'; -import { mimeWordEncode } from './mime'; +import { addressparser } from './address.js'; +import { getRFC2822Date } from './date.js'; +import { mimeWordEncode } from './mime.js'; const CRLF = '\r\n' as const; diff --git a/smtp/response.ts b/smtp/response.ts index 9fdc434..92260dd 100644 --- a/smtp/response.ts +++ b/smtp/response.ts @@ -1,4 +1,4 @@ -import { SMTPError, SMTPErrorStates } from './error'; +import { SMTPError, SMTPErrorStates } from './error.js'; import type { Socket } from 'net'; import type { TLSSocket } from 'tls'; diff --git a/test/address.ts b/test/address.ts index f935fd1..9624643 100644 --- a/test/address.ts +++ b/test/address.ts @@ -1,5 +1,5 @@ import test from 'ava'; -import { addressparser } from '../email'; +import { addressparser } from '../email.js'; test('addressparser should handle single address correctly', async (t) => { t.deepEqual(addressparser('andris@tr.ee'), [ diff --git a/test/auth.ts b/test/auth.ts index 4bcfec2..fc6ec14 100644 --- a/test/auth.ts +++ b/test/auth.ts @@ -4,7 +4,7 @@ import { simpleParser } from 'mailparser'; import type { AddressObject } from 'mailparser'; import { SMTPServer } from 'smtp-server'; -import { AUTH_METHODS, SMTPClient, Message } from '../email'; +import { AUTH_METHODS, SMTPClient, Message } from '../email.js'; let port = 2000; diff --git a/test/client.ts b/test/client.ts index 48275a1..2ae2c9f 100644 --- a/test/client.ts +++ b/test/client.ts @@ -5,8 +5,13 @@ import { simpleParser } from 'mailparser'; import type { ParsedMail, AddressObject } from 'mailparser'; import { SMTPServer } from 'smtp-server'; -import type { MessageHeaders } from '../email'; -import { DEFAULT_TIMEOUT, SMTPClient, Message, isRFC2822Date } from '../email'; +import type { MessageHeaders } from '../email.js'; +import { + DEFAULT_TIMEOUT, + SMTPClient, + Message, + isRFC2822Date, +} from '../email.js'; const parseMap = new Map(); const port = 3333; diff --git a/test/date.ts b/test/date.ts index 57a36a8..7796504 100644 --- a/test/date.ts +++ b/test/date.ts @@ -1,5 +1,5 @@ import test from 'ava'; -import { getRFC2822Date, getRFC2822DateUTC, isRFC2822Date } from '../email'; +import { getRFC2822Date, getRFC2822DateUTC, isRFC2822Date } from '../email.js'; const toD_utc = (dt: number) => getRFC2822DateUTC(new Date(dt)); const toD = (dt: number, utc = false) => getRFC2822Date(new Date(dt), utc); diff --git a/test/message.ts b/test/message.ts index 5b22127..c94b4c7 100644 --- a/test/message.ts +++ b/test/message.ts @@ -5,8 +5,8 @@ import { simpleParser } from 'mailparser'; import type { AddressObject, ParsedMail } from 'mailparser'; import { SMTPServer } from 'smtp-server'; -import { SMTPClient, Message } from '../email'; -import type { MessageAttachment, MessageHeaders } from '../email'; +import { SMTPClient, Message } from '../email.js'; +import type { MessageAttachment, MessageHeaders } from '../email.js'; /** * \@types/mailparser@3.0.2 breaks our code diff --git a/test/mime.ts b/test/mime.ts index 30b644f..60eb243 100644 --- a/test/mime.ts +++ b/test/mime.ts @@ -1,6 +1,6 @@ // adapted from https://github.com/emailjs/emailjs-mime-codec/blob/6909c706b9f09bc0e5c3faf48f723cca53e5b352/src/mimecodec-unit.js import test from 'ava'; -import { mimeEncode, mimeWordEncode } from '../email'; +import { mimeEncode, mimeWordEncode } from '../email.js'; test('mimeEncode should encode UTF-8', async (t) => { t.is(mimeEncode('tere ÕÄÖÕ'), 'tere =C3=95=C3=84=C3=96=C3=95');