From d9671a58913e3496fb3c36b557b30664dbe6666b Mon Sep 17 00:00:00 2001 From: Jonathan Haines Date: Thu, 27 Mar 2025 15:07:16 +1100 Subject: [PATCH] build(trpc-server): lint published package (#1064) --- .github/workflows/ci-trpc-server.yml | 1 + packages/trpc-server/package.json | 39 +++++++++++++++++--------- packages/trpc-server/tsconfig.cjs.json | 8 ------ packages/trpc-server/tsconfig.esm.json | 8 ------ packages/trpc-server/tsconfig.json | 4 +-- yarn.lock | 16 +++++++---- 6 files changed, 38 insertions(+), 38 deletions(-) delete mode 100644 packages/trpc-server/tsconfig.cjs.json delete mode 100644 packages/trpc-server/tsconfig.esm.json diff --git a/.github/workflows/ci-trpc-server.yml b/.github/workflows/ci-trpc-server.yml index eac584b8..b130b52c 100644 --- a/.github/workflows/ci-trpc-server.yml +++ b/.github/workflows/ci-trpc-server.yml @@ -19,6 +19,7 @@ jobs: node-version: 18.x - run: yarn workspaces focus hono-middleware @hono/trpc-server - run: yarn workspace @hono/trpc-server build + - run: yarn workspace @hono/trpc-server publint - run: yarn test --coverage --project @hono/trpc-server - uses: codecov/codecov-action@v5 with: diff --git a/packages/trpc-server/package.json b/packages/trpc-server/package.json index 18b8945c..60929c30 100644 --- a/packages/trpc-server/package.json +++ b/packages/trpc-server/package.json @@ -2,19 +2,29 @@ "name": "@hono/trpc-server", "version": "0.3.4", "description": "tRPC Server Middleware for Hono", - "main": "dist/cjs/index.js", - "module": "dist/esm/index.js", - "types": "dist/esm/index.d.ts", + "type": "module", + "module": "dist/index.js", + "types": "dist/index.d.ts", "files": [ "dist" ], "scripts": { - "test": "vitest", - "build:cjs": "tsc -p tsconfig.cjs.json", - "build:esm": "tsc -p tsconfig.esm.json", - "build": "rimraf dist && yarn build:cjs && yarn build:esm", - "prerelease": "yarn build && yarn test", - "release": "yarn publish" + "build": "tsup ./src/index.ts", + "prepack": "yarn build", + "publint": "attw --pack && publint", + "test": "vitest" + }, + "exports": { + ".": { + "import": { + "types": "./dist/index.d.ts", + "default": "./dist/index.js" + }, + "require": { + "types": "./dist/index.d.cts", + "default": "./dist/index.cjs" + } + } }, "license": "MIT", "publishConfig": { @@ -23,7 +33,8 @@ }, "repository": { "type": "git", - "url": "https://github.com/honojs/middleware.git" + "url": "git+https://github.com/honojs/middleware.git", + "directory": "packages/trpc-server" }, "homepage": "https://honojs.dev", "peerDependencies": { @@ -31,13 +42,15 @@ "hono": ">=4.*" }, "devDependencies": { - "@trpc/server": "^10.10.0 || >11.0.0-rc", + "@arethetypeswrong/cli": "^0.17.4", + "@trpc/server": "^11.0.0", "hono": "^4.3.6", - "rimraf": "^5.0.5", + "publint": "^0.3.9", + "tsup": "^8.4.0", "vitest": "^3.0.8", "zod": "^3.20.2" }, "engines": { "node": ">=16.0.0" } -} +} \ No newline at end of file diff --git a/packages/trpc-server/tsconfig.cjs.json b/packages/trpc-server/tsconfig.cjs.json deleted file mode 100644 index b8bf50ee..00000000 --- a/packages/trpc-server/tsconfig.cjs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "module": "CommonJS", - "declaration": false, - "outDir": "./dist/cjs" - } -} \ No newline at end of file diff --git a/packages/trpc-server/tsconfig.esm.json b/packages/trpc-server/tsconfig.esm.json deleted file mode 100644 index 8130f1a5..00000000 --- a/packages/trpc-server/tsconfig.esm.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "module": "ESNext", - "declaration": true, - "outDir": "./dist/esm" - } -} \ No newline at end of file diff --git a/packages/trpc-server/tsconfig.json b/packages/trpc-server/tsconfig.json index efd0b896..dcc1e9e9 100644 --- a/packages/trpc-server/tsconfig.json +++ b/packages/trpc-server/tsconfig.json @@ -1,8 +1,6 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "rootDir": "./src", "types": ["vitest/globals"] - }, - "include": ["src/**/*.ts"] + } } diff --git a/yarn.lock b/yarn.lock index 81a40a00..1bff5d44 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2898,9 +2898,11 @@ __metadata: version: 0.0.0-use.local resolution: "@hono/trpc-server@workspace:packages/trpc-server" dependencies: - "@trpc/server": "npm:^10.10.0 || >11.0.0-rc" + "@arethetypeswrong/cli": "npm:^0.17.4" + "@trpc/server": "npm:^11.0.0" hono: "npm:^4.3.6" - rimraf: "npm:^5.0.5" + publint: "npm:^0.3.9" + tsup: "npm:^8.4.0" vitest: "npm:^3.0.8" zod: "npm:^3.20.2" peerDependencies: @@ -4547,10 +4549,12 @@ __metadata: languageName: node linkType: hard -"@trpc/server@npm:^10.10.0 || >11.0.0-rc": - version: 11.0.0-rc.433 - resolution: "@trpc/server@npm:11.0.0-rc.433" - checksum: feb96e58b049566ab4b10ab563130db360ddd80f211a0048e92f5cbbefa0bf174befe776a7fbd8dd799eece61578b3a8d7ce4eca122e1257e49b99f2bd467cd3 +"@trpc/server@npm:^11.0.0": + version: 11.0.0 + resolution: "@trpc/server@npm:11.0.0" + peerDependencies: + typescript: ">=5.7.2" + checksum: 0fa6b9fd44d0378471df827fa1f35623d2ef463fe1af7c89de9433b22c81d0db5d60695a77a5ca723e91d2b77be08a48dee77703851109151c8e9febab478125 languageName: node linkType: hard