Skip to content

Commit dbd754d

Browse files
orochaaorochaa
authored
Merge branch 'main' into core-multiline
2 parents be0f5ca + f9db1bd commit dbd754d

22 files changed

+60
-39
lines changed

‎.changeset/legal-bags-tie.md

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
"@clack/prompts": major
3+
"@clack/core": major
4+
---
5+
6+
The package is now distributed as ESM-only. In `v0` releases, the package was dual-published as CJS and ESM.
7+
8+
For existing CJS projects using Node v20+, please see Node's guide on [Loading ECMAScript modules using `require()`](https://nodejs.org/docs/latest-v20.x/api/modules.html#loading-ecmascript-modules-using-require).

‎.changeset/pre.json

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"mode": "pre",
3+
"tag": "alpha",
4+
"initialVersions": {
5+
"@example/basic": "0.0.0",
6+
"@example/changesets": "0.0.0",
7+
"@clack/core": "0.4.1",
8+
"@clack/prompts": "0.10.0"
9+
},
10+
"changesets": []
11+
}

‎.github/workflows/ci.yml

+1
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,6 @@ jobs:
2626
node-version: 20
2727
cache: "pnpm"
2828
- run: pnpm install
29+
- run: pnpm run build
2930
- run: pnpm run type-check
3031
- run: pnpm run test

‎.github/workflows/lint.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ jobs:
1818
node-version: 20
1919
cache: "pnpm"
2020
- run: pnpm install
21-
- run: pnpm type-check
21+
- run: pnpm run build
22+
- run: pnpm run type-check

‎README.md

+3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
<h4 align="center"><a href="packages/core#readme"><code>@clack/core</code></a>: unstyled, extensible primitives for CLIs</h4>
1313
<h4 align="center"><a href="packages/prompts#readme"><code>@clack/prompts</code></a>: beautiful, ready-to-use CLI prompt components</h4>
1414

15+
> [!WARNING]
16+
> Clack's `main` branch is tracking the [`alpha` release line for `v1.0.0+`](https://github.com/bombshell-dev/clack/pull/250). To view the relatively stable `v0` line, please browse the [v0](https://github.com/bombshell-dev/clack/tree/v0) branch.
17+
1518
<br />
1619
<br />
1720

‎build.preset.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export default definePreset({
66
declaration: true,
77
sourcemap: true,
88
rollup: {
9-
emitCJS: true,
9+
emitCJS: false,
1010
inlineDependencies: true,
1111
esbuild: {
1212
minify: true,

‎packages/core/package.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22
"name": "@clack/core",
33
"version": "0.4.1",
44
"type": "module",
5-
"main": "./dist/index.cjs",
5+
"main": "./dist/index.mjs",
66
"module": "./dist/index.mjs",
77
"exports": {
88
".": {
99
"types": "./dist/index.d.ts",
10-
"import": "./dist/index.mjs",
11-
"require": "./dist/index.cjs"
10+
"default": "./dist/index.mjs"
1211
},
1312
"./package.json": "./package.json"
1413
},

‎packages/core/src/index.ts

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
export type { ClackState as State } from './types';
2-
export type { ClackSettings } from './utils/settings';
1+
export type { ClackState as State } from './types.js';
2+
export type { ClackSettings } from './utils/settings.js';
33

4-
export { default as ConfirmPrompt } from './prompts/confirm';
5-
export { default as GroupMultiSelectPrompt } from './prompts/group-multiselect';
6-
export { default as MultiSelectPrompt } from './prompts/multi-select';
7-
export { default as PasswordPrompt } from './prompts/password';
8-
export { default as Prompt } from './prompts/prompt';
9-
export { default as SelectPrompt } from './prompts/select';
10-
export { default as SelectKeyPrompt } from './prompts/select-key';
11-
export { default as TextPrompt } from './prompts/text';
12-
export { block, isCancel, strLength } from './utils';
13-
export { updateSettings } from './utils/settings';
4+
export { default as ConfirmPrompt } from './prompts/confirm.js';
5+
export { default as GroupMultiSelectPrompt } from './prompts/group-multiselect.js';
6+
export { default as MultiSelectPrompt } from './prompts/multi-select.js';
7+
export { default as PasswordPrompt } from './prompts/password.js';
8+
export { default as Prompt } from './prompts/prompt.js';
9+
export { default as SelectPrompt } from './prompts/select.js';
10+
export { default as SelectKeyPrompt } from './prompts/select-key.js';
11+
export { default as TextPrompt } from './prompts/text.js';
12+
export { block, isCancel, strLength } from './utils/index.js';
13+
export { updateSettings } from './utils/settings.js';

‎packages/core/src/prompts/confirm.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { cursor } from 'sisteransi';
2-
import Prompt, { type PromptOptions } from './prompt';
2+
import Prompt, { type PromptOptions } from './prompt.js';
33

44
interface ConfirmOptions extends PromptOptions<ConfirmPrompt> {
55
active: string;

‎packages/core/src/prompts/group-multiselect.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Prompt, { type PromptOptions } from './prompt';
1+
import Prompt, { type PromptOptions } from './prompt.js';
22

33
interface GroupMultiSelectOptions<T extends { value: any }>
44
extends PromptOptions<GroupMultiSelectPrompt<T>> {

‎packages/core/src/prompts/multi-select.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Prompt, { type PromptOptions } from './prompt';
1+
import Prompt, { type PromptOptions } from './prompt.js';
22

33
interface MultiSelectOptions<T extends { value: any }> extends PromptOptions<MultiSelectPrompt<T>> {
44
options: T[];

‎packages/core/src/prompts/password.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import color from 'picocolors';
2-
import Prompt, { type PromptOptions } from './prompt';
2+
import Prompt, { type PromptOptions } from './prompt.js';
33

44
interface PasswordOptions extends PromptOptions<PasswordPrompt> {
55
mask?: string;

‎packages/core/src/prompts/prompt.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import { cursor, erase } from 'sisteransi';
66
import wrap from 'wrap-ansi';
77
import { strLength } from '../utils';
88

9-
import { CANCEL_SYMBOL, diffLines, isActionKey, setRawMode, settings } from '../utils';
9+
import { CANCEL_SYMBOL, diffLines, isActionKey, setRawMode, settings } from '../utils/index.js';
1010

11-
import type { ClackEvents, ClackState } from '../types';
12-
import type { Action } from '../utils';
11+
import type { ClackEvents, ClackState } from '../types.js';
12+
import type { Action } from '../utils/index.js';
1313

1414
export interface PromptOptions<Self extends Prompt> {
1515
render(this: Omit<Self, 'prompt'>): string | undefined;

‎packages/core/src/prompts/select-key.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Prompt, { type PromptOptions } from './prompt';
1+
import Prompt, { type PromptOptions } from './prompt.js';
22

33
interface SelectKeyOptions<T extends { value: any }> extends PromptOptions<SelectKeyPrompt<T>> {
44
options: T[];

‎packages/core/src/prompts/select.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Prompt, { type PromptOptions } from './prompt';
1+
import Prompt, { type PromptOptions } from './prompt.js';
22

33
interface SelectOptions<T extends { value: any }> extends PromptOptions<SelectPrompt<T>> {
44
options: T[];

‎packages/core/src/prompts/text.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import color from 'picocolors';
2-
import Prompt, { type PromptOptions } from './prompt';
2+
import Prompt, { type PromptOptions } from './prompt.js';
33

44
export interface TextOptions extends PromptOptions<TextPrompt> {
55
placeholder?: string;

‎packages/core/src/types.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { Action } from './utils/settings';
1+
import type { Action } from './utils/settings.js';
22

33
/**
44
* The state of the prompt

‎packages/core/src/utils/index.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import type { Key } from 'node:readline';
33
import * as readline from 'node:readline';
44
import type { Readable } from 'node:stream';
55
import { cursor } from 'sisteransi';
6-
import { isActionKey } from './settings';
6+
import { isActionKey } from './settings.js';
77

8-
export * from './string';
9-
export * from './settings';
8+
export * from './string.js';
9+
export * from './settings.js';
1010

1111
const isWindows = globalThis.process.platform.startsWith('win');
1212

‎packages/prompts/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -204,4 +204,4 @@ stream.error((function *() { yield 'Error!'; })());
204204
stream.message((function *() { yield 'Hello'; yield ", World" })(), { symbol: color.cyan('~') });
205205
```
206206

207-
[clack-log-prompts](https://github.com/bombshell-dev/clack/blob/main/.github/assets/clack-logs.png)
207+
![clack-log-prompts](https://github.com/bombshell-dev/clack/blob/main/.github/assets/clack-logs.png)

‎packages/prompts/package.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22
"name": "@clack/prompts",
33
"version": "0.10.0",
44
"type": "module",
5-
"main": "./dist/index.cjs",
5+
"main": "./dist/index.mjs",
66
"module": "./dist/index.mjs",
77
"exports": {
88
".": {
99
"types": "./dist/index.d.ts",
10-
"import": "./dist/index.mjs",
11-
"require": "./dist/index.cjs"
10+
"default": "./dist/index.mjs"
1211
},
1312
"./package.json": "./package.json"
1413
},

‎pnpm-workspace.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
packages:
22
- 'examples/**'
3-
- 'packages/**/*'
3+
- 'packages/*'

‎tsconfig.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
{
22
"compilerOptions": {
33
"noEmit": true,
4-
"module": "ESNext",
4+
"module": "node16",
55
"target": "ESNext",
6-
"moduleResolution": "Bundler",
7-
"moduleDetection": "force",
6+
"moduleResolution": "node16",
87
"strict": true,
98
"esModuleInterop": true,
109
"forceConsistentCasingInFileNames": true,

0 commit comments

Comments
 (0)