diff --git a/packages/bash-types/package.json b/packages/bash-types/package.json index fdd584c..577b643 100644 --- a/packages/bash-types/package.json +++ b/packages/bash-types/package.json @@ -9,36 +9,27 @@ "url": "https://github.com/capsulerun/bash.git", "directory": "packages/bash-types" }, - "main": "./dist/index.cjs", - "module": "./dist/index.js", "types": "./src/index.ts", "exports": { ".": { "types": "./src/index.ts", - "source": "./src/index.ts", - "import": "./dist/index.js", - "require": "./dist/index.cjs" + "source": "./src/index.ts" } }, "publishConfig": { "types": "./dist/index.d.ts", "exports": { ".": { - "types": "./dist/index.d.ts", - "import": "./dist/index.js", - "require": "./dist/index.cjs" + "types": "./dist/index.d.ts" } } }, "scripts": { - "build": "tsup", + "build": "tsc --project tsconfig.json", "test": "echo \"Error: no test specified\" && exit 1" }, "keywords": [], "author": "", "license": "Apache-2.0", - "packageManager": "pnpm@10.21.0", - "devDependencies": { - "tsup": "^8.0.0" - } + "packageManager": "pnpm@10.21.0" } diff --git a/packages/bash-types/tsconfig.json b/packages/bash-types/tsconfig.json index 9c8a7d7..f498a9c 100644 --- a/packages/bash-types/tsconfig.json +++ b/packages/bash-types/tsconfig.json @@ -2,7 +2,9 @@ "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "dist", - "rootDir": "src" + "rootDir": "src", + "declaration": true, + "emitDeclarationOnly": true }, "include": ["src/**/*"] } diff --git a/packages/bash-types/tsup.config.ts b/packages/bash-types/tsup.config.ts deleted file mode 100644 index 39da97d..0000000 --- a/packages/bash-types/tsup.config.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { defineConfig } from 'tsup'; - -export default defineConfig({ - entry: ['src/index.ts'], - format: ['esm', 'cjs'], - dts: true, - clean: true, - minify: false, -}); diff --git a/packages/bash-wasm/package.json b/packages/bash-wasm/package.json index d93cf57..f74219c 100644 --- a/packages/bash-wasm/package.json +++ b/packages/bash-wasm/package.json @@ -35,7 +35,7 @@ "dist/sandboxes" ], "scripts": { - "build": "tsup", + "build": "tsup && tsc --project tsconfig.json", "pretest": "pip install -r sandboxes/python/requirements.txt -q", "test": "vitest run" }, diff --git a/packages/bash-wasm/tsconfig.json b/packages/bash-wasm/tsconfig.json index ed464a9..492deb9 100644 --- a/packages/bash-wasm/tsconfig.json +++ b/packages/bash-wasm/tsconfig.json @@ -2,7 +2,10 @@ "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "./dist", - "rootDir": "./src" + "rootDir": "./src", + "types": ["node"], + "declaration": true, + "emitDeclarationOnly": true }, "include": ["src/**/*"], "exclude": ["node_modules", "dist"] diff --git a/packages/bash-wasm/tsup.config.ts b/packages/bash-wasm/tsup.config.ts index 4edfbc8..7258dda 100644 --- a/packages/bash-wasm/tsup.config.ts +++ b/packages/bash-wasm/tsup.config.ts @@ -3,8 +3,9 @@ import { defineConfig } from 'tsup'; export default defineConfig({ entry: ['src/index.ts'], format: ['esm', 'cjs'], - dts: true, + dts: false, clean: true, treeshake: true, skipNodeModulesBundle: true, + tsconfig: 'tsconfig.json', }); diff --git a/packages/bash/package.json b/packages/bash/package.json index d86579e..6d4f4d7 100644 --- a/packages/bash/package.json +++ b/packages/bash/package.json @@ -31,7 +31,7 @@ } }, "scripts": { - "build": "tsup", + "build": "tsup && tsc --project tsconfig.json", "test": "vitest run" }, "license": "Apache-2.0", diff --git a/packages/bash/tsconfig.json b/packages/bash/tsconfig.json index e4a2a8b..aa6403a 100644 --- a/packages/bash/tsconfig.json +++ b/packages/bash/tsconfig.json @@ -3,7 +3,9 @@ "compilerOptions": { "outDir": "./dist", "rootDir": "./src", - "types": ["node"] + "types": ["node"], + "declaration": true, + "emitDeclarationOnly": false }, "include": ["src/**/*.ts"], "exclude": ["node_modules", "dist", "tsup.config.ts"] diff --git a/packages/bash/tsup.config.ts b/packages/bash/tsup.config.ts index 4edfbc8..7258dda 100644 --- a/packages/bash/tsup.config.ts +++ b/packages/bash/tsup.config.ts @@ -3,8 +3,9 @@ import { defineConfig } from 'tsup'; export default defineConfig({ entry: ['src/index.ts'], format: ['esm', 'cjs'], - dts: true, + dts: false, clean: true, treeshake: true, skipNodeModulesBundle: true, + tsconfig: 'tsconfig.json', }); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 21593f3..6c96d0a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -112,11 +112,7 @@ importers: specifier: ^4.0.0 version: 4.21.0 - packages/bash-types: - devDependencies: - tsup: - specifier: ^8.0.0 - version: 8.5.1(postcss@8.5.9)(tsx@4.21.0)(typescript@6.0.2)(yaml@2.8.3) + packages/bash-types: {} packages/bash-wasm: dependencies: