chore: move back to esm

bin/test.ts

@@ -2,7 +2,6 @@ import 'dotenv/config'
 import { assert } from '@japa/assert'
 import { specReporter } from '@japa/spec-reporter'
 import { processCliArgs, configure, run } from '@japa/runner'
-import { pathToFileURL } from 'url'
 
 /*
 |--------------------------------------------------------------------------
@@ -22,7 +21,7 @@ configure({
   plugins: [assert()],
   reporters: [specReporter()],
   forceExit: true,
-  importer: (filePath) => import(pathToFileURL(filePath).href),
+  importer: (filePath) => import(filePath),
   suites: [
     {
       name: 'unit',

examples/basic.ts

@@ -1,6 +1,6 @@
 import 'dotenv/config'
 import { pino } from 'pino'
-import { LokiOptions } from '../src/types/index.js'
+import { LokiOptions } from '../src/types/index'
 
 const transport = pino.transport<LokiOptions>({
   // 👇 Replace this with "pino-loki"

examples/batching.ts

@@ -4,7 +4,7 @@
 
 import 'dotenv/config'
 import { pino } from 'pino'
-import { LokiOptions } from '../src/types/index.js'
+import { LokiOptions } from '../src/types/index'
 
 const transport = pino.transport<LokiOptions>({
   // 👇 Replace this with "pino-loki"
@@ -28,15 +28,19 @@ const transport = pino.transport<LokiOptions>({
 
 const logger = pino(transport)
 
-// These logs will be batched and sent to loki after 2 seconds
-logger.info('Hello 1!')
-logger.info('Hello 2!')
-logger.info('Hello 3!')
+async function main() {
+  // These logs will be batched and sent to loki after 2 seconds
+  logger.info('Hello 1!')
+  logger.info('Hello 2!')
+  logger.info('Hello 3!')
 
-await new Promise((resolve) => setTimeout(resolve, 3000))
+  await new Promise((resolve) => setTimeout(resolve, 3000))
 
-// These logs will also be batched but sent immediately since
-// our main process is about to exit
-logger.info('Hello 4!')
-logger.info('Hello 5!')
-logger.info('Hello 6!')
+  // These logs will also be batched but sent immediately since
+  // our main process is about to exit
+  logger.info('Hello 4!')
+  logger.info('Hello 5!')
+  logger.info('Hello 6!')
+}
+
+main()

examples/custom_timestamp.ts

@@ -10,7 +10,7 @@
 
 import 'dotenv/config'
 import { pino } from 'pino'
-import { LokiOptions } from '../src/index.js'
+import { LokiOptions } from '../src/index'
 
 const loadNs = process.hrtime()
 const loadMs = new Date().getTime()

examples/module_usage.ts

@@ -8,7 +8,7 @@
 
 import 'dotenv/config'
 import { pino } from 'pino'
-import pinoLoki from '../src/index.js'
+import pinoLoki from '../src/index'
 
 const logger = pino(
   { level: 'info' },

package.json

@@ -1,7 +1,7 @@
 {
   "name": "pino-loki",
   "version": "2.1.2",
-  "type": "module",
+  "type": "commonjs",
   "description": "A transport for pino that sends messages to Loki",
   "keywords": [
     "pino",
@@ -53,8 +53,8 @@
     "prepublishOnly": "pnpm build",
     "release": "bumpp --commit --push --tag && pnpm publish",
     "stub": "unbuild --stub",
-    "quick:test": "node --loader=ts-node/esm bin/test.ts",
-    "test": "c8 node --loader=ts-node/esm bin/test.ts",
+    "quick:test": "node -r ts-node/register bin/test.ts",
+    "test": "c8 node -r ts-node/register bin/test.ts",
     "typecheck": "tsc --noEmit"
   },
   "devDependencies": {

src/cli.ts

@@ -1,7 +1,7 @@
-import type { LokiOptions } from './types/index.js'
+import type { LokiOptions } from './types/index'
 import { program } from 'commander'
-import pkg from '../package.json' assert { type: 'json' }
-import build from './index.js'
+import pkg from '../package.json'
+import build from './index'
 import pump from 'pump'
 
 /**
@@ -54,7 +54,10 @@ export const createPinoLokiConfigFromArgs = () => {
   return config
 }
 
-const config = createPinoLokiConfigFromArgs()
-const pinoLoki = build(config)
+function main() {
+  const config = createPinoLokiConfigFromArgs()
+  const pinoLoki = build(config)
+  pump(process.stdin, pinoLoki)
+}
 
-pump(process.stdin, pinoLoki)
+main()

src/index.ts

@@ -1,10 +1,7 @@
 import abstractTransportBuild from 'pino-abstract-transport'
-import { PinoLog, LokiOptions } from './types/index.js'
-import { LogPusher } from './log_pusher/index.js'
-import debug from './debug.js'
-
-// @ts-ignore
-const build = abstractTransportBuild as typeof abstractTransportBuild.default
+import { PinoLog, LokiOptions } from './types/index'
+import { LogPusher } from './log_pusher/index'
+import debug from './debug'
 
 /**
  * Resolves the options for the Pino Loki transport
@@ -30,7 +27,7 @@ function pinoLoki(userOptions: LokiOptions) {
   let batchInterval: NodeJS.Timer | undefined
   let pinoLogBuffer: PinoLog[] = []
 
-  return build(
+  return abstractTransportBuild(
     async (source) => {
       if (options.batching) {
         batchInterval = setInterval(async () => {

src/log_builder/index.ts

@@ -1,4 +1,4 @@
-import { LokiLog, LokiLogLevel, PinoLog } from '../types/index.js'
+import { LokiLog, LokiLogLevel, PinoLog } from '../types/index'
 
 const NANOSECONDS_LENGTH = 19
 

src/log_pusher/index.ts

@@ -1,6 +1,6 @@
-import { PinoLog, LokiOptions } from '../types/index.js'
-import { LogBuilder } from '../log_builder/index.js'
-import debug from '../debug.js'
+import { PinoLog, LokiOptions } from '../types/index'
+import { LogBuilder } from '../log_builder/index'
+import debug from '../debug'
 import got, { Got, RequestError } from 'got'
 
 /**

tests/integration/loki.spec.ts

@@ -1,10 +1,10 @@
 import { test } from '@japa/runner'
-import pinoLoki from '../../src/index.js'
+import pinoLoki from '../../src/index'
 import { pino } from 'pino'
-import { LokiClient } from '../../tests_helpers/index.js'
+import { LokiClient } from '../../tests_helpers/index'
 import { randomUUID } from 'crypto'
-import { sleep } from '../../src/utils/index.js'
-import { LokiOptions } from '../../src/types/index.js'
+import { sleep } from '../../src/utils/index'
+import { LokiOptions } from '../../src/types/index'
 
 const credentials = {
   host: process.env.LOKI_HOST!,
@@ -99,7 +99,7 @@ test.group('Loki integration', () => {
     const application = randomUUID()
 
     const logger = pino.transport<LokiOptions>({
-      target: '../../dist/index.mjs',
+      target: '../../dist/index.cjs',
 
       options: {
         ...credentials,

tests/unit/cli.spec.ts

@@ -1,5 +1,5 @@
 import { test } from '@japa/runner'
-import { createPinoLokiConfigFromArgs } from '../../src/cli.js'
+import { createPinoLokiConfigFromArgs } from '../../src/cli'
 
 test.group('Cli', () => {
   test('Should parse custom labels', ({ assert }) => {

tests/unit/log_builder.spec.ts

@@ -1,7 +1,7 @@
 import { test } from '@japa/runner'
-import { PinoLog } from '../../src/types/index.js'
-import { LogBuilder } from '../../src/log_builder/index.js'
-import { sleep } from '../../src/utils/index.js'
+import { PinoLog } from '../../src/types/index'
+import { LogBuilder } from '../../src/log_builder/index'
+import { sleep } from '../../src/utils/index'
 
 const loadNs = process.hrtime()
 const loadMs = new Date().getTime()

tests/unit/log_pusher.spec.ts

@@ -1,5 +1,5 @@
 import { test } from '@japa/runner'
-import { LogPusher } from '../../src/log_pusher/index.js'
+import { LogPusher } from '../../src/log_pusher/index'
 import nock from 'nock'
 
 test.group('LogPusher', (group) => {

tests_helpers/index.ts

@@ -1,4 +1,4 @@
-import { got } from 'got'
+import got from 'got'
 
 interface QueryRangeResponse<StreamType extends Record<string, string>> {
   status: string

tsconfig.json

@@ -1,12 +1,11 @@
 {
-
   "ts-node": {
     "transpileOnly": true
   },
 
   "compilerOptions": {
     "target": "ESNext",
-    "module": "NodeNext",
+    "module": "CommonJS",
     "lib": ["ESNext"],
     "noUnusedLocals": true,
     "noUnusedParameters": true,