diff --git a/.drone.jsonnet b/.drone.jsonnet index fefec26..ecbbc49 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -16,8 +16,8 @@ local lint_step = { local build_step = { name: "build", - image: bun_image, - commands: ["bun run build"], + image: node_image, + commands: ["npm run build"], }; local pack_step = { diff --git a/bun.lockb b/bun.lockb index 50ca046..50ef8b8 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/package.json b/package.json index 31d1619..b43ebf5 100644 --- a/package.json +++ b/package.json @@ -11,8 +11,8 @@ "exports": { ".": { "import": { - "types": "./dist/lib.d.mts", - "default": "./dist/lib.mjs" + "types": "./dist/lib.d.ts", + "default": "./dist/lib.js" }, "require": { "types": "./dist/lib.d.cts", @@ -21,17 +21,17 @@ }, "./schema": { "import": { - "types": "./dist/schema.d.mts", - "default": "./dist/schema.mjs" + "types": "./dist/schema/lib.d.ts", + "default": "./dist/schema/lib.js" }, "require": { - "types": "./dist/schema.d.cts", - "default": "./dist/schema.cjs" + "types": "./dist/schema/lib.d.cts", + "default": "./dist/schema/lib.cjs" } } }, "scripts": { - "build": "rollup -c rollup.config.ts", + "build": "tsup", "lint:tsc": "tsc --noEmit", "clean:cache": "rm -f tsconfig.tsbuildinfo", "clean:dist": "rm -rf dist", @@ -47,15 +47,10 @@ "zod": "^3.22.4" }, "devDependencies": { - "@rollup/plugin-node-resolve": "^15.2.3", "@types/lodash-es": "^4.17.12", "bun-types": "latest", "npm-check-updates": "^16.14.17", "npm-sort": "^0.0.4", - "rollup": "^4.13.0", - "rollup-plugin-cleanup": "^3.2.1", - "rollup-plugin-ts": "^3.4.5", - "ts-functional-pipe": "^3.1.2", "tsup": "^8.0.2", "tsx": "^4.7.1", "typescript": "^5.4.3" diff --git a/rollup.config.ts b/rollup.config.ts deleted file mode 100644 index 566206a..0000000 --- a/rollup.config.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { nodeResolve } from "@rollup/plugin-node-resolve" -import { defineConfig } from "rollup" -import cleanup from "rollup-plugin-cleanup" -import ts from "rollup-plugin-ts" -import pkg from "./package.json" assert { type: "json" } - - -export const createBundleConfig = ( - input: string, - name: keyof typeof pkg.exports, -) => - defineConfig({ - input, - - output: [ - { - file: pkg.exports[name].import.default, - format: "esm", - }, - { - file: pkg.exports[name].require.default, - format: "cjs", - }, - ], - - external: id => !/^[./]/.test(id), - - plugins: [ - nodeResolve(), - ts(), - - cleanup({ - comments: "jsdoc", - extensions: ["ts"], - }), - ], - }) - - -export default [ - createBundleConfig("src/lib.ts", "."), - createBundleConfig("src/schema/lib.ts", "./schema"), -] diff --git a/tsup.config.ts b/tsup.config.ts new file mode 100644 index 0000000..ed2a957 --- /dev/null +++ b/tsup.config.ts @@ -0,0 +1,11 @@ +import { defineConfig } from "tsup" + + +export default defineConfig({ + entry: ["src/lib.ts", "src/schema/lib.ts"], + format: ["esm", "cjs"], + dts: true, + splitting: false, + sourcemap: true, + clean: true, +})