diff --git a/package.json b/package.json index b8180cb01..299d5f73f 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "prepare": "husky && turbo tsc attw", "setup": "node ./tools/setup-packages.mjs", "pretest": "turbo tsc && eslint . && yarn tsc:test", - "test": "vitest --run packages && node --test integration/**/*.test.*", + "test": "vitest --run && node --test integration/**/*.test.*", "tsc": "turbo tsc", "tsc:test": "tsc -p tsconfig.json" }, diff --git a/packages/checkbox/package.json b/packages/checkbox/package.json index 61df12a63..dc504bcb1 100644 --- a/packages/checkbox/package.json +++ b/packages/checkbox/package.json @@ -54,18 +54,15 @@ "./package.json": "./package.json", ".": { "import": { - "types": "./dist/esm/index.d.ts", - "default": "./dist/esm/index.js" + "default": "./dist/esm/index.ts" }, "require": { - "types": "./dist/commonjs/index.d.ts", - "default": "./dist/commonjs/index.js" + "default": "./dist/commonjs/index.ts" } } }, - "main": "./dist/commonjs/index.js", - "module": "./dist/esm/index.js", - "types": "./dist/commonjs/index.d.ts", + "main": "./dist/commonjs/index.ts", + "module": "./dist/esm/index.ts", "files": [ "dist" ], @@ -99,7 +96,8 @@ "exports": { "./package.json": "./package.json", ".": "./src/index.ts" - } + }, + "liveDev": true }, "peerDependencies": { "@types/node": ">=18" diff --git a/packages/confirm/package.json b/packages/confirm/package.json index 0696eeb12..05c7f4df3 100644 --- a/packages/confirm/package.json +++ b/packages/confirm/package.json @@ -54,18 +54,15 @@ "./package.json": "./package.json", ".": { "import": { - "types": "./dist/esm/index.d.ts", - "default": "./dist/esm/index.js" + "default": "./dist/esm/index.ts" }, "require": { - "types": "./dist/commonjs/index.d.ts", - "default": "./dist/commonjs/index.js" + "default": "./dist/commonjs/index.ts" } } }, - "main": "./dist/commonjs/index.js", - "module": "./dist/esm/index.js", - "types": "./dist/commonjs/index.d.ts", + "main": "./dist/commonjs/index.ts", + "module": "./dist/esm/index.ts", "files": [ "dist" ], @@ -96,7 +93,8 @@ "exports": { "./package.json": "./package.json", ".": "./src/index.ts" - } + }, + "liveDev": true }, "peerDependencies": { "@types/node": ">=18" diff --git a/packages/core/package.json b/packages/core/package.json index 70ad29b15..9f9799e80 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -54,18 +54,15 @@ "./package.json": "./package.json", ".": { "import": { - "types": "./dist/esm/index.d.ts", - "default": "./dist/esm/index.js" + "default": "./dist/esm/index.ts" }, "require": { - "types": "./dist/commonjs/index.d.ts", - "default": "./dist/commonjs/index.js" + "default": "./dist/commonjs/index.ts" } } }, - "main": "./dist/commonjs/index.js", - "module": "./dist/esm/index.js", - "types": "./dist/commonjs/index.d.ts", + "main": "./dist/commonjs/index.ts", + "module": "./dist/esm/index.ts", "files": [ "dist" ], @@ -106,6 +103,7 @@ "exports": { "./package.json": "./package.json", ".": "./src/index.ts" - } + }, + "liveDev": true } } diff --git a/packages/demo/package.json b/packages/demo/package.json index 0a1daa5d1..807b60301 100644 --- a/packages/demo/package.json +++ b/packages/demo/package.json @@ -54,15 +54,10 @@ "./package.json": "./package.json", ".": { "import": { - "types": "./dist/esm/index.d.ts", - "default": "./dist/esm/index.js" + "default": "./dist/esm/index.ts" } } }, - "module": "./dist/esm/index.js", - "bin": { - "inquirer-demo": "./dist/esm/index.js" - }, "files": [ "dist" ], @@ -84,7 +79,10 @@ "node": ">=18" }, "publishConfig": { - "access": "public" + "access": "public", + "bin": { + "inquirer-demo": "./dist/esm/index.js" + } }, "tshy": { "dialects": [ @@ -96,9 +94,11 @@ "exports": { "./package.json": "./package.json", ".": "./src/index.ts" - } + }, + "liveDev": true }, "peerDependencies": { "@types/node": ">=18" - } + }, + "module": "./dist/esm/index.ts" } diff --git a/packages/editor/package.json b/packages/editor/package.json index 4cab1fe16..ac19bc690 100644 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -54,18 +54,15 @@ "./package.json": "./package.json", ".": { "import": { - "types": "./dist/esm/index.d.ts", - "default": "./dist/esm/index.js" + "default": "./dist/esm/index.ts" }, "require": { - "types": "./dist/commonjs/index.d.ts", - "default": "./dist/commonjs/index.js" + "default": "./dist/commonjs/index.ts" } } }, - "main": "./dist/commonjs/index.js", - "module": "./dist/esm/index.js", - "types": "./dist/commonjs/index.d.ts", + "main": "./dist/commonjs/index.ts", + "module": "./dist/esm/index.ts", "files": [ "dist" ], @@ -97,7 +94,8 @@ "exports": { "./package.json": "./package.json", ".": "./src/index.ts" - } + }, + "liveDev": true }, "peerDependencies": { "@types/node": ">=18" diff --git a/packages/expand/package.json b/packages/expand/package.json index ac896d9a5..33e756b8d 100644 --- a/packages/expand/package.json +++ b/packages/expand/package.json @@ -54,18 +54,13 @@ "./package.json": "./package.json", ".": { "import": { - "types": "./dist/esm/index.d.ts", - "default": "./dist/esm/index.js" + "default": "./dist/esm/index.ts" }, "require": { - "types": "./dist/commonjs/index.d.ts", - "default": "./dist/commonjs/index.js" + "default": "./dist/commonjs/index.ts" } } }, - "main": "./dist/commonjs/index.js", - "module": "./dist/esm/index.js", - "types": "./dist/commonjs/index.d.ts", "files": [ "dist" ], @@ -97,9 +92,12 @@ "exports": { "./package.json": "./package.json", ".": "./src/index.ts" - } + }, + "liveDev": true }, "peerDependencies": { "@types/node": ">=18" - } + }, + "main": "./dist/commonjs/index.ts", + "module": "./dist/esm/index.ts" } diff --git a/packages/figures/package.json b/packages/figures/package.json index 6dcdf6198..5da4aed3e 100644 --- a/packages/figures/package.json +++ b/packages/figures/package.json @@ -55,18 +55,15 @@ "./package.json": "./package.json", ".": { "import": { - "types": "./dist/esm/index.d.ts", - "default": "./dist/esm/index.js" + "default": "./dist/esm/index.ts" }, "require": { - "types": "./dist/commonjs/index.d.ts", - "default": "./dist/commonjs/index.js" + "default": "./dist/commonjs/index.ts" } } }, - "main": "./dist/commonjs/index.js", - "module": "./dist/esm/index.js", - "types": "./dist/commonjs/index.d.ts", + "main": "./dist/commonjs/index.ts", + "module": "./dist/esm/index.ts", "files": [ "dist" ], @@ -89,6 +86,7 @@ "exports": { "./package.json": "./package.json", ".": "./src/index.ts" - } + }, + "liveDev": true } } diff --git a/packages/input/package.json b/packages/input/package.json index b74317278..fc3953832 100644 --- a/packages/input/package.json +++ b/packages/input/package.json @@ -54,18 +54,15 @@ "./package.json": "./package.json", ".": { "import": { - "types": "./dist/esm/index.d.ts", - "default": "./dist/esm/index.js" + "default": "./dist/esm/index.ts" }, "require": { - "types": "./dist/commonjs/index.d.ts", - "default": "./dist/commonjs/index.js" + "default": "./dist/commonjs/index.ts" } } }, - "main": "./dist/commonjs/index.js", - "module": "./dist/esm/index.js", - "types": "./dist/commonjs/index.d.ts", + "main": "./dist/commonjs/index.ts", + "module": "./dist/esm/index.ts", "files": [ "dist" ], @@ -96,7 +93,8 @@ "exports": { "./package.json": "./package.json", ".": "./src/index.ts" - } + }, + "liveDev": true }, "peerDependencies": { "@types/node": ">=18" diff --git a/packages/inquirer/package.json b/packages/inquirer/package.json index a8bd2314c..76bf6eac5 100644 --- a/packages/inquirer/package.json +++ b/packages/inquirer/package.json @@ -54,18 +54,15 @@ "./package.json": "./package.json", ".": { "import": { - "types": "./dist/esm/index.d.ts", - "default": "./dist/esm/index.js" + "default": "./dist/esm/index.ts" }, "require": { - "types": "./dist/commonjs/index.d.ts", - "default": "./dist/commonjs/index.js" + "default": "./dist/commonjs/index.ts" } } }, - "main": "./dist/commonjs/index.js", - "module": "./dist/esm/index.js", - "types": "./dist/commonjs/index.d.ts", + "main": "./dist/commonjs/index.ts", + "module": "./dist/esm/index.ts", "files": [ "dist" ], @@ -98,7 +95,8 @@ "exports": { "./package.json": "./package.json", ".": "./src/index.ts" - } + }, + "liveDev": true }, "peerDependencies": { "@types/node": ">=18" diff --git a/packages/number/package.json b/packages/number/package.json index 86234a6b2..aac92e2c6 100644 --- a/packages/number/package.json +++ b/packages/number/package.json @@ -54,18 +54,15 @@ "./package.json": "./package.json", ".": { "import": { - "types": "./dist/esm/index.d.ts", - "default": "./dist/esm/index.js" + "default": "./dist/esm/index.ts" }, "require": { - "types": "./dist/commonjs/index.d.ts", - "default": "./dist/commonjs/index.js" + "default": "./dist/commonjs/index.ts" } } }, - "main": "./dist/commonjs/index.js", - "module": "./dist/esm/index.js", - "types": "./dist/commonjs/index.d.ts", + "main": "./dist/commonjs/index.ts", + "module": "./dist/esm/index.ts", "files": [ "dist" ], @@ -96,7 +93,8 @@ "exports": { "./package.json": "./package.json", ".": "./src/index.ts" - } + }, + "liveDev": true }, "peerDependencies": { "@types/node": ">=18" diff --git a/packages/password/package.json b/packages/password/package.json index 90907c5a7..560ae86e6 100644 --- a/packages/password/package.json +++ b/packages/password/package.json @@ -54,18 +54,15 @@ "./package.json": "./package.json", ".": { "import": { - "types": "./dist/esm/index.d.ts", - "default": "./dist/esm/index.js" + "default": "./dist/esm/index.ts" }, "require": { - "types": "./dist/commonjs/index.d.ts", - "default": "./dist/commonjs/index.js" + "default": "./dist/commonjs/index.ts" } } }, - "main": "./dist/commonjs/index.js", - "module": "./dist/esm/index.js", - "types": "./dist/commonjs/index.d.ts", + "main": "./dist/commonjs/index.ts", + "module": "./dist/esm/index.ts", "files": [ "dist" ], @@ -97,7 +94,8 @@ "exports": { "./package.json": "./package.json", ".": "./src/index.ts" - } + }, + "liveDev": true }, "peerDependencies": { "@types/node": ">=18" diff --git a/packages/prompts/package.json b/packages/prompts/package.json index 299d47afb..7b5beaf29 100644 --- a/packages/prompts/package.json +++ b/packages/prompts/package.json @@ -56,18 +56,15 @@ "./package.json": "./package.json", ".": { "import": { - "types": "./dist/esm/index.d.ts", - "default": "./dist/esm/index.js" + "default": "./dist/esm/index.ts" }, "require": { - "types": "./dist/commonjs/index.d.ts", - "default": "./dist/commonjs/index.js" + "default": "./dist/commonjs/index.ts" } } }, - "main": "./dist/commonjs/index.js", - "module": "./dist/esm/index.js", - "types": "./dist/commonjs/index.d.ts", + "main": "./dist/commonjs/index.ts", + "module": "./dist/esm/index.ts", "files": [ "dist" ], @@ -103,7 +100,8 @@ "exports": { "./package.json": "./package.json", ".": "./src/index.ts" - } + }, + "liveDev": true }, "peerDependencies": { "@types/node": ">=18" diff --git a/packages/rawlist/package.json b/packages/rawlist/package.json index e5d7df78e..aac2b25f1 100644 --- a/packages/rawlist/package.json +++ b/packages/rawlist/package.json @@ -54,18 +54,15 @@ "./package.json": "./package.json", ".": { "import": { - "types": "./dist/esm/index.d.ts", - "default": "./dist/esm/index.js" + "default": "./dist/esm/index.ts" }, "require": { - "types": "./dist/commonjs/index.d.ts", - "default": "./dist/commonjs/index.js" + "default": "./dist/commonjs/index.ts" } } }, - "main": "./dist/commonjs/index.js", - "module": "./dist/esm/index.js", - "types": "./dist/commonjs/index.d.ts", + "main": "./dist/commonjs/index.ts", + "module": "./dist/esm/index.ts", "files": [ "dist" ], @@ -97,7 +94,8 @@ "exports": { "./package.json": "./package.json", ".": "./src/index.ts" - } + }, + "liveDev": true }, "peerDependencies": { "@types/node": ">=18" diff --git a/packages/search/package.json b/packages/search/package.json index e5faf5240..34ff814fa 100644 --- a/packages/search/package.json +++ b/packages/search/package.json @@ -54,18 +54,15 @@ "./package.json": "./package.json", ".": { "import": { - "types": "./dist/esm/index.d.ts", - "default": "./dist/esm/index.js" + "default": "./dist/esm/index.ts" }, "require": { - "types": "./dist/commonjs/index.d.ts", - "default": "./dist/commonjs/index.js" + "default": "./dist/commonjs/index.ts" } } }, - "main": "./dist/commonjs/index.js", - "module": "./dist/esm/index.js", - "types": "./dist/commonjs/index.d.ts", + "main": "./dist/commonjs/index.ts", + "module": "./dist/esm/index.ts", "files": [ "dist" ], @@ -98,7 +95,8 @@ "exports": { "./package.json": "./package.json", ".": "./src/index.ts" - } + }, + "liveDev": true }, "peerDependencies": { "@types/node": ">=18" diff --git a/packages/select/package.json b/packages/select/package.json index 0face55c9..38f1d13e7 100644 --- a/packages/select/package.json +++ b/packages/select/package.json @@ -54,18 +54,15 @@ "./package.json": "./package.json", ".": { "import": { - "types": "./dist/esm/index.d.ts", - "default": "./dist/esm/index.js" + "default": "./dist/esm/index.ts" }, "require": { - "types": "./dist/commonjs/index.d.ts", - "default": "./dist/commonjs/index.js" + "default": "./dist/commonjs/index.ts" } } }, - "main": "./dist/commonjs/index.js", - "module": "./dist/esm/index.js", - "types": "./dist/commonjs/index.d.ts", + "main": "./dist/commonjs/index.ts", + "module": "./dist/esm/index.ts", "files": [ "dist" ], @@ -99,7 +96,8 @@ "exports": { "./package.json": "./package.json", ".": "./src/index.ts" - } + }, + "liveDev": true }, "peerDependencies": { "@types/node": ">=18" diff --git a/packages/testing/package.json b/packages/testing/package.json index e2cddbc65..12f108e52 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -57,18 +57,15 @@ "./package.json": "./package.json", ".": { "import": { - "types": "./dist/esm/index.d.ts", - "default": "./dist/esm/index.js" + "default": "./dist/esm/index.ts" }, "require": { - "types": "./dist/commonjs/index.d.ts", - "default": "./dist/commonjs/index.js" + "default": "./dist/commonjs/index.ts" } } }, - "main": "./dist/commonjs/index.js", - "module": "./dist/esm/index.js", - "types": "./dist/commonjs/index.d.ts", + "main": "./dist/commonjs/index.ts", + "module": "./dist/esm/index.ts", "files": [ "dist" ], @@ -99,7 +96,8 @@ "exports": { "./package.json": "./package.json", ".": "./src/index.ts" - } + }, + "liveDev": true }, "peerDependencies": { "@types/node": ">=18" diff --git a/packages/type/package.json b/packages/type/package.json index 8dafb3a38..13f855a26 100644 --- a/packages/type/package.json +++ b/packages/type/package.json @@ -55,18 +55,15 @@ "./package.json": "./package.json", ".": { "import": { - "types": "./dist/esm/index.d.ts", - "default": "./dist/esm/index.js" + "default": "./dist/esm/index.ts" }, "require": { - "types": "./dist/commonjs/index.d.ts", - "default": "./dist/commonjs/index.js" + "default": "./dist/commonjs/index.ts" } } }, - "main": "./dist/commonjs/index.js", - "module": "./dist/esm/index.js", - "types": "./dist/commonjs/index.d.ts", + "main": "./dist/commonjs/index.ts", + "module": "./dist/esm/index.ts", "files": [ "dist" ], @@ -92,6 +89,7 @@ "exports": { "./package.json": "./package.json", ".": "./src/index.ts" - } + }, + "liveDev": true } } diff --git a/tools/setup-packages.mjs b/tools/setup-packages.mjs index ee2e43148..c4bb294d0 100644 --- a/tools/setup-packages.mjs +++ b/tools/setup-packages.mjs @@ -66,6 +66,7 @@ Promise.all( pkg.tshy = pkg.tshy ?? {}; pkg.tshy.exclude = ['src/**/*.test.ts']; + pkg.tshy.liveDev = true; pkg.scripts = pkg.scripts ?? {}; pkg.scripts.tsc = 'tshy'; diff --git a/vitest.config.ts b/vitest.config.ts index 5a682fe12..5f5362d22 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -1,9 +1,7 @@ -import { fileURLToPath, URL } from 'node:url'; -import { defineConfig, defaultExclude, coverageConfigDefaults } from 'vitest/config'; +import { defineConfig, coverageConfigDefaults } from 'vitest/config'; export default defineConfig({ test: { - exclude: ['integration/**', ...defaultExclude], coverage: { provider: 'v8', all: true, @@ -19,13 +17,4 @@ export default defineConfig({ }, testTimeout: 300, }, - resolve: { - alias: [ - { - // Resolve @inquirer/* packages to their source code - find: /@inquirer\/(.*)/, - replacement: fileURLToPath(new URL('packages/$1/src', import.meta.url)), - }, - ], - }, }); diff --git a/vitest.workspace.ts b/vitest.workspace.ts new file mode 100644 index 000000000..f83fbfd4a --- /dev/null +++ b/vitest.workspace.ts @@ -0,0 +1,6 @@ +import { defineWorkspace } from 'vitest/config'; + +export default defineWorkspace([ + // matches every folder and file inside the `packages` folder + 'packages/*', +]); diff --git a/yarn.lock b/yarn.lock index 62a25f287..47a9cf58f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -575,8 +575,6 @@ __metadata: yoctocolors-cjs: "npm:^2.1.2" peerDependencies: "@types/node": ">=18" - bin: - inquirer-demo: ./dist/esm/index.js languageName: unknown linkType: soft