chore: some package cleanup

Author: Julien-R44

.github/workflows/ci.yml

@@ -36,10 +36,15 @@ jobs:
     strategy:
       matrix:
         node: [22.x, 24.x]
+
+    services:
+      loki:
+        image: grafana/loki:latest
+        ports:
+          - 3100:3100
+
     env:
-      LOKI_HOST: ${{ secrets.LOKI_HOST }}
-      LOKI_USERNAME: ${{ secrets.LOKI_USERNAME }}
-      LOKI_PASSWORD: ${{ secrets.LOKI_PASSWORD }}
+      LOKI_HOST: http://localhost:3100
 
     steps:
       - uses: actions/checkout@v4
@@ -59,5 +64,18 @@ jobs:
       - name: Build
         run: pnpm build
 
+      - name: Wait for Loki to be ready
+        run: |
+          for i in {1..30}; do
+            if curl -s http://localhost:3100/ready | grep -q "ready"; then
+              echo "Loki is ready"
+              exit 0
+            fi
+            echo "Waiting for Loki... ($i/30)"
+            sleep 2
+          done
+          echo "Loki failed to start"
+          exit 1
+
       - name: Test
         run: pnpm test

examples/basic.ts

@@ -7,7 +7,7 @@ import type { LokiOptions } from '../src/types.ts'
 
 const transport = pino.transport<LokiOptions>({
   // 👇 Replace this with "pino-loki"
-  target: '../dist/index.js',
+  target: '../dist/index.mjs',
 
   options: {
     // These labels will be added to every log

examples/batching.ts

@@ -10,7 +10,7 @@ import type { LokiOptions } from '../src/types.ts'
 
 const transport = pino.transport<LokiOptions>({
   // 👇 Replace this with "pino-loki"
-  target: '../dist/index.js',
+  target: '../dist/index.mjs',
 
   options: {
     batching: true,

examples/custom_timestamp.ts

@@ -24,7 +24,7 @@ function nanoseconds() {
 
 const transport = pino.transport<LokiOptions>({
   // 👇 Replace this with "pino-loki"
-  target: '../dist/index.js',
+  target: '../dist/index.mjs',
 
   options: {
     // These labels will be added to every log

examples/multiple_transports.ts

@@ -6,7 +6,7 @@ const transport = pino.transport({
   targets: [
     {
       // 👇 Replace this with "pino-loki"
-      target: '../dist/index.js',
+      target: '../dist/index.mjs',
 
       level: 'info',
       options: {

package.json

@@ -23,16 +23,22 @@
   ],
   "exports": {
     ".": {
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
+      "import": {
+        "types": "./dist/index.d.mts",
+        "default": "./dist/index.mjs"
+      },
+      "require": {
+        "types": "./dist/index.d.cts",
+        "default": "./dist/index.cjs"
+      }
     },
     "./package.json": "./package.json"
   },
   "main": "./dist/index.cjs",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.cts",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.mts",
   "bin": {
-    "pino-loki": "dist/cli.js"
+    "pino-loki": "dist/cli.mjs"
   },
   "files": [
     "dist"

tests/integration/loki.spec.ts

@@ -8,9 +8,12 @@ import { LokiClient } from '../helpers.ts'
 import { pinoLoki } from '../../src/index.ts'
 import type { LokiOptions } from '../../src/types.ts'
 
-const credentials = {
+const credentials: { host: string; basicAuth?: { username: string; password: string } } = {
   host: process.env.LOKI_HOST!,
-  basicAuth: { username: process.env.LOKI_USERNAME!, password: process.env.LOKI_PASSWORD! },
+  ...(process.env.LOKI_USERNAME &&
+    process.env.LOKI_PASSWORD && {
+      basicAuth: { username: process.env.LOKI_USERNAME, password: process.env.LOKI_PASSWORD },
+    }),
 }
 
 test.group('Loki integration', () => {
@@ -100,7 +103,7 @@ test.group('Loki integration', () => {
   test('batching mode should not drop logs when main process exits', async ({ assert }) => {
     const application = randomUUID()
 
-    const logger = pino.transport<LokiOptions>({
+    const transport = pino.transport<LokiOptions>({
       target: '../../dist/index.mjs',
       options: {
         ...credentials,
@@ -110,15 +113,15 @@ test.group('Loki integration', () => {
       },
     })
 
-    const pinoLogger = pino({}, logger)
+    const logger = pino({}, transport)
 
-    pinoLogger.info({ test: 1 })
-    pinoLogger.info({ test: 2 })
-    pinoLogger.info({ test: 3 })
+    logger.info({ test: 1 })
+    logger.info({ test: 2 })
+    logger.info({ test: 3 })
 
-    // Manually end the logger. This will be executed automatically
+    // Manually end the transport. This will be executed automatically
     // when the main process exits
-    logger.end()
+    transport.end()
 
     await setTimeout(1000)