feat: move to bun + tsc, raise target to 14.18+ and 16.20+

talentlessguy · talentlessguy · commit d7994a035f5f · 2023-10-27T16:36:56.000+03:00
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc b/.eslintrc
@@ -1,23 +1,18 @@
 {
+  "root": true,
+  "extends": ["prettier", "plugin:prettier/recommended", "plugin:@typescript-eslint/recommended"],
+  "plugins": ["@typescript-eslint", "prettier"],
   "parser": "@typescript-eslint/parser",
-  "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier"],
-  "plugins": ["@typescript-eslint"],
   "parserOptions": {
-    "ecmaVersion": 2020,
-    "sourceType": "module"
-  },
-  "env": {
-    "node": true,
-    "es6": true
+    "project": "./tsconfig.eslint.json"
   },
+  "ignorePatterns": ["dist/", "node_modules/"],
+  "overrides": [
+    {
+      "files": ["src/**/*.ts", "tests/**/*.ts"]
+    }
+  ],
   "rules": {
-    "@typescript-eslint/explicit-function-return-type": "off",
-    "@typescript-eslint/no-explicit-any": "off",
-    "@typescript-eslint/no-unused-vars": "off",
-    "@typescript-eslint/explicit-module-boundary-types": "off",
-    "@typescript-eslint/ban-ts-comment": "off",
-    "no-unused-vars": "off",
-    "no-console": "off",
-    "no-undef": "off"
+    "@typescript-eslint/explicit-module-boundary-types": "off"
   }
 }
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1,4 +1,2 @@
-ko_fi: v1rtl
-liberapay: v1rtl
 issuehunt: talentlessguy
-github: talentlessguy
+github: [tinyhttp, talentlessguy]
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,38 +1,27 @@
-# This is a basic workflow to help you get started with Actions
+on: [push]
 
-name: CI
-
-# Controls when the action will run. Triggers the workflow on push or pull request
-# events but only for the master branch
-on:
-  push:
-    branches: [master]
-  pull_request:
-    branches: [master]
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "test"
   test:
-    # The type of runner that the job will run on
     runs-on: ubuntu-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2-beta
-        with:
-          node-version: 14.x
-      - name: install pnpm
-        uses: pnpm/action-setup@v2
+      - uses: actions/checkout@v3
+      - uses: oven-sh/setup-bun@v1
         with:
-          version: 6.x
-      - run: pnpm install
-      - run: pnpm test:coverage
-      - run: pnpm test:report
+          bun-version: latest
+      - run: bun install
+      - run: bun test:coverage
+      - run: bun test:report
       - name: Coveralls
         uses: coverallsapp/github-action@master
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          path-to-lcov: ./coverage.lcov
+          path-to-lcov: ./lcov.info
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: oven-sh/setup-bun@v1
+        with:
+          bun-version: latest
+      - run: bun install
+      - run: bun run build
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@ node_modules
 dist
 coverage
 log
-*.tsbuildinfo
+*.tsbuildinfo
+lcov.info
diff --git a/.prettierignore b/.prettierignore
diff --git a/bun.lockb b/bun.lockb
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "url": "https://github.com/tinyhttp/logger.git"
   },
   "engines": {
-    "node": ">=12.4 || 14.x || >=16"
+    "node": ">=14.18 || >=16.20"
   },
   "types": "./dist/index.d.ts",
   "exports": "./dist/index.js",
@@ -26,40 +26,37 @@
     "dist"
   ],
   "dependencies": {
-    "colorette": "^2.0.20",
-    "dayjs": "^1.11.7",
-    "http-status-emojis": "^2.2.0"
+    "colorette": "latest",
+    "dayjs": "latest",
+    "http-status-emojis": "latest"
   },
   "scripts": {
-    "build": "rollup -c",
-    "test": "uvu -r tsm tests",
-    "test:coverage": "c8 --include=src pnpm test",
-    "test:report": "c8 report --reporter=text-lcov > coverage.lcov",
+    "build": "tsc",
+    "test": "tsx tests/index.test.ts",
+    "test:coverage": "c8 tsx --test tests/index.test.ts",
+    "test:report": "c8 report --reporter=text-lcov > lcov.info",
     "lint": "eslint . --ext=ts",
     "format": "prettier --check \"./**/*.{ts,md}\"",
     "format:fix": "prettier --write \"./**/*.{ts,md}\"",
     "prepare": "husky install"
   },
   "devDependencies": {
-    "@commitlint/cli": "17.6.3",
-    "@commitlint/config-conventional": "17.6.3",
-    "@rollup/plugin-typescript": "^11.1.1",
-    "@tinyhttp/app": "2.1.0",
-    "@types/node": "^20.2.5",
-    "@typescript-eslint/eslint-plugin": "^5.59.7",
-    "@typescript-eslint/parser": "^5.59.7",
-    "c8": "^7.13.0",
-    "eslint": "^8.41.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-prettier": "^4.2.1",
-    "expect": "^29.5.0",
+    "@commitlint/cli": "^18.2.0",
+    "@commitlint/config-conventional": "^18.1.0",
+    "@tinyhttp/app": "^2.2.0",
+    "@types/node": "^20.8.9",
+    "@typescript-eslint/eslint-plugin": "^6.9.0",
+    "@typescript-eslint/parser": "^6.9.0",
+    "bun-types": "^1.0.7",
+    "c8": "^8.0.1",
+    "eslint": "^8.52.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-prettier": "^5.0.1",
+    "expect": "^29.7.0",
     "husky": "^8.0.3",
-    "prettier": "^2.8.8",
-    "rollup": "^3.23.0",
+    "prettier": "^3.0.3",
     "supertest-fetch": "^1.5.0",
-    "tslib": "^2.5.2",
-    "tsm": "^2.3.0",
-    "typescript": "^5.0.4",
-    "uvu": "^0.5.6"
+    "tsx": "^3.14.0",
+    "typescript": "^5.2.2"
   }
 }
diff --git a/rollup.config.js b/rollup.config.js
diff --git a/src/filelogger.ts b/src/filelogger.ts
@@ -1,5 +1,5 @@
-import { accessSync, writeFileSync, createWriteStream, WriteStream, mkdirSync } from 'fs'
-import { dirname as directoryname } from 'path'
+import { accessSync, writeFileSync, createWriteStream, WriteStream, mkdirSync } from 'node:fs'
+import { dirname as directoryname } from 'node:path'
 
 export class FileLogger {
   readonly #filename: string
diff --git a/src/index.ts b/src/index.ts
@@ -1,8 +1,8 @@
 import { cyan, red, magenta, bold } from 'colorette'
 import statusEmoji from 'http-status-emojis'
 import dayjs from 'dayjs'
-import { METHODS, ServerResponse as Response, IncomingMessage as Request } from 'http'
-import { FileLogger } from './filelogger'
+import { METHODS, ServerResponse as Response, IncomingMessage as Request } from 'node:http'
+import { FileLogger } from './filelogger.js'
 
 export enum LogLevel {
   error = 'error',
@@ -27,7 +27,7 @@ export interface LoggerOptions {
 
 const compileArgs = (
   args: (string | number)[],
-  req: Request & Partial<{ originalUrl: string; ip: any }>,
+  req: Request & Partial<{ originalUrl: string; ip: string }>,
   res: Response,
   options: LoggerOptions = {},
   status?: string,
diff --git a/tests/index.test.ts b/tests/index.test.ts
@@ -1,27 +1,23 @@
-import { Context, suite, uvu } from 'uvu'
+import { describe, it } from 'node:test'
 import { LogLevel, logger } from '../src/index'
 import { cyan, red, magenta, bold } from 'colorette'
 import { makeFetch } from 'supertest-fetch'
 import { App } from '@tinyhttp/app'
-import expect from 'expect'
-import * as assert from 'uvu/assert'
-import { promises, constants as fsConstants, readFileSync, unlinkSync, existsSync } from 'fs'
-import { resolve } from 'path'
-
-function describe(name: string, fn: (it: uvu.Test<Context>) => void) {
-  const s = suite(name)
-  fn(s)
-  s.run()
+import { expect } from 'expect'
+import * as assert from 'node:assert/strict'
+import { promises, readFileSync } from 'node:fs'
+import { rm } from 'node:fs/promises'
+
+async function checkFileExists(file: string) {
+  try {
+    await promises.access(file)
+    return true
+  } catch {
+    return false
+  }
 }
 
-function checkFileExists(file) {
-  return promises
-    .access(file)
-    .then(() => true)
-    .catch(() => false)
-}
-
-describe('Logger tests', (it) => {
+describe('Logger tests', () => {
   it('should use the timestamp format specified in the `format` property', () => {
     const originalConsoleLog = console.log
 
@@ -97,8 +93,8 @@ describe('Logger tests', (it) => {
         server.close()
       })
   })
-  describe('Log file tests', (it) => {
-    it('should check if log file and directory is created', async (test) => {
+  describe('Log file tests', () => {
+    it('should check if log file and directory is created', async () => {
       const filename = './tests/tiny.log'
 
       const app = new App()
@@ -118,9 +114,12 @@ describe('Logger tests', (it) => {
         .then(async () => {
           assert.equal(await checkFileExists(filename), true)
         })
-        .finally(() => server.close())
+        .finally(async () => {
+          await rm(filename)
+          server.close()
+        })
     })
-    it('should read log file and check if logs are written', async (test) => {
+    it('should read log file and check if logs are written', async () => {
       const filename = './logs/test1/tiny.log'
       const level = LogLevel.warn
       const app = new App()
@@ -146,11 +145,14 @@ describe('Logger tests', (it) => {
             `[${level.toUpperCase()}] GET 404 Not Found /`
           )
         })
-        .finally(() => server.close())
+        .finally(async () => {
+          await rm(filename)
+          server.close()
+        })
     })
   })
 
-  describe('Color logs', (it) => {
+  describe('Color logs', () => {
     const createColorTest = (status: number, color: string) => {
       return async () => {
         const customOutput = (log: string) => {
@@ -188,7 +190,7 @@ describe('Logger tests', (it) => {
       createColorTest(500, 'magenta')()
     })
   })
-  describe('Badge Log', (it) => {
+  describe('Badge Log', () => {
     it('should display emoji', () => {
       const app = new App()
 
diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json
@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "types": [
+      "bun-types" // add Bun global
+    ]
+  },
+  "include": ["tests", "src"]
+}
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,19 +1,14 @@
 {
   "compilerOptions": {
-    "rootDir": "src",
+    "module": "NodeNext",
+    "target": "ES2022",
+    "moduleResolution": "NodeNext",
+    "moduleDetection": "force",
+    "strict": false,
+    "downlevelIteration": true,
+    "skipLibCheck": true,
     "outDir": "dist",
-    "declaration": true,
-    "declarationDir": "dist",
-    "module": "ESNext",
-    "target": "ES2019",
-    "preserveSymlinks": true,
-    "allowSyntheticDefaultImports": true,
-    "moduleResolution": "Node",
-    "baseUrl": ".",
-    "declarationMap": true,
-    "composite": true,
-    "sourceMap": true,
-    "alwaysStrict": true
+    "declaration": true
   },
-  "include": ["./src/*.ts"]
+  "include": ["src"]
 }
