From 2ba0bdedf4555963e4f159f70ea17f486ec86195 Mon Sep 17 00:00:00 2001 From: Chris Duncan Date: Tue, 31 Mar 2026 03:23:19 -0700 Subject: [PATCH] Simplify build output. --- esbuild/config.mjs | 4 ++-- package.json | 21 +++++++++------------ src/{main.ts => index.ts} | 0 tsconfig.json | 4 ++-- 4 files changed, 13 insertions(+), 16 deletions(-) rename src/{main.ts => index.ts} (100%) diff --git a/esbuild/config.mjs b/esbuild/config.mjs index 92f5b05..c72c22f 100644 --- a/esbuild/config.mjs +++ b/esbuild/config.mjs @@ -27,7 +27,7 @@ export const browserOptions = { target: 'es2022', dropLabels: ['NODE'], entryPoints: [ - { in: './src/main.ts', out: 'browser.min' } + { in: './src/index.ts', out: 'browser' } ], inject: [ './esbuild/inject/buffer.mjs' @@ -46,7 +46,7 @@ export const nodeOptions = { target: 'node22', dropLabels: ['BROWSER'], entryPoints: [ - { in: './src/main.ts', out: 'nodejs.min' } + { in: './src/index.ts', out: 'index' } ], external: ['node:worker_threads'], inject: [ diff --git a/package.json b/package.json index ff1c3a3..8af1085 100644 --- a/package.json +++ b/package.json @@ -43,9 +43,9 @@ "url": "git+https://zoso.dev/libnemo.git" }, "scripts": { - "clean": "rm -rf dist types && tsc", - "build": "npm run clean && node esbuild/dev.mjs && cp -r types dist", - "build:prod": "npm run clean && node esbuild/prod.mjs && cp -r types dist", + "clean": "rm -rf dist && tsc", + "build": "npm run clean && node esbuild/dev.mjs", + "build:prod": "npm run clean && node esbuild/prod.mjs", "prepublishOnly": "npm run test:prod", "reinstall": "rm -rf node_modules package-lock.json && npm cache clean --force && npm i", "test": "npm run build && npm run test:node", @@ -54,9 +54,6 @@ "test:node": "node --test --test-force-exit --no-experimental-strip-types --env-file .env", "test:prod": "npm run build:prod && npm run test:node" }, - "imports": { - "#types": "./src/types.d.ts" - }, "dependencies": { "@ledgerhq/hw-transport-web-ble": "^6.33.1", "@ledgerhq/hw-transport-webhid": "^6.34.0", @@ -77,12 +74,12 @@ "type": "module", "exports": { ".": { - "types": "./dist/types/main.d.ts", - "node": "./dist/nodejs.min.js", - "browser": "./dist/browser.min.js", - "import": "./dist/main.js", - "default": "./dist/global.min.js" + "types": "./dist/index.d.ts", + "browser": "./dist/browser.js", + "node": "./dist/index.js", + "import": "./dist/index.js", + "default": "./dist/index.js" } }, - "unpkg": "dist/browser.min.js" + "unpkg": "dist/browser.js" } diff --git a/src/main.ts b/src/index.ts similarity index 100% rename from src/main.ts rename to src/index.ts diff --git a/tsconfig.json b/tsconfig.json index 9839a27..0dfacf3 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,7 +3,7 @@ "alwaysStrict": true, "checkJs": true, "declaration": true, - "declarationDir": "./types", + "declarationDir": "./dist", "emitDeclarationOnly": true, "forceConsistentCasingInFileNames": true, "isolatedModules": true, @@ -13,7 +13,7 @@ "noFallthroughCasesInSwitch": true, "rootDir": "src", "strict": true, - "target": "es2024", + "target": "es2022", "lib": [ "DOM", "ES2022" -- 2.47.3