Skip to content

Commit 0d646e0

Browse files
committed
chore: wip
1 parent 3b5bdfd commit 0d646e0

File tree

5 files changed

+23
-29
lines changed

5 files changed

+23
-29
lines changed

.stacks/core/actions/src/clean.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import { rimraf as del } from '@stacksjs/utils'
55
log.info('Running clean command...')
66

77
await del([
8-
projectPath('pnpm-lock.yaml'),
8+
projectPath('yarn.lock'),
99
projectPath('node_modules/'),
10+
projectPath('.stacks/dist'),
1011
projectPath('.stacks/**/dist'),
11-
projectPath('.stacks/**/node_modules'),
1212
])

.stacks/core/actions/src/fresh.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ import { runCommands } from '@stacksjs/cli'
22
import { frameworkPath } from '@stacksjs/path'
33

44
await runCommands([
5-
'buddy clean',
6-
'pnpm install',
5+
'bun buddy clean',
6+
'bun install',
77
], { cwd: frameworkPath(), verbose: true })

.stacks/core/actions/src/helpers/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export async function runAction(action: string, options?: ActionOptions): Promis
3939

4040
// we need to parse options here because they need to bw passed to the action
4141
const opts = parseOptions(options)
42-
const cmd = `bunx ${actionsPath(`${action}.ts ${opts}`)}`
42+
const cmd = `bun --bun ${actionsPath(`${action}.ts ${opts}`)}`
4343

4444
if (options?.verbose)
4545
log.debug('running command:', italic(cmd))

.stacks/core/cli/src/console.ts

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
import { log, logger } from '@stacksjs/logging'
1+
import { log } from '@stacksjs/logging'
22
import prompts from 'prompts'
33

4-
export const Console = {
5-
prompt: prompts,
6-
...logger,
7-
}
8-
94
export class Prompt {
105
private required: boolean
116

@@ -24,58 +19,58 @@ export class Prompt {
2419

2520
async select(message: any, options: any) {
2621
if (this.isRequired())
27-
return Console.prompt(message, { ...options, type: 'select', required: true })
22+
return log.prompt(message, { ...options, type: 'select', required: true })
2823

29-
return Console.prompt(message, { ...options, type: 'select' })
24+
return log.prompt(message, { ...options, type: 'select' })
3025
}
3126

3227
async checkbox(message: any, options: any) {
3328
if (this.isRequired())
34-
return Console.prompt(message, { ...options, type: 'multiselect', required: true })
29+
return log.prompt(message, { ...options, type: 'multiselect', required: true })
3530

36-
return Console.prompt(message, { ...options, type: 'multiselect' })
31+
return log.prompt(message, { ...options, type: 'multiselect' })
3732
}
3833

3934
async confirm(message: any, options: any) {
4035
if (this.isRequired())
41-
return Console.prompt(message, { ...options, type: 'confirm', required: true })
36+
return log.prompt(message, { ...options, type: 'confirm', required: true })
4237

43-
return Console.prompt(message, { ...options, type: 'confirm' })
38+
return log.prompt(message, { ...options, type: 'confirm' })
4439
}
4540

4641
async input(message: any, options: any) {
4742
if (this.isRequired())
48-
return Console.prompt(message, { ...options, type: 'text', required: true })
43+
return log.prompt(message, { ...options, type: 'text', required: true })
4944

50-
return Console.prompt(message, { ...options, type: 'text' })
45+
return log.prompt(message, { ...options, type: 'text' })
5146
}
5247

5348
async password(message: any, options: any) {
5449
if (this.isRequired())
55-
return Console.prompt(message, { ...options, type: 'password', required: true })
50+
return log.prompt(message, { ...options, type: 'password', required: true })
5651

57-
return Console.prompt(message, { ...options, type: 'password' })
52+
return log.prompt(message, { ...options, type: 'password' })
5853
}
5954

6055
async number(message: any, options: any) {
6156
if (this.isRequired())
62-
return Console.prompt(message, { ...options, type: 'numeral', required: true })
57+
return log.prompt(message, { ...options, type: 'numeral', required: true })
6358

64-
return Console.prompt(message, { ...options, type: 'numeral' })
59+
return log.prompt(message, { ...options, type: 'numeral' })
6560
}
6661

6762
async multiselect(message: any, options: any) {
6863
if (this.isRequired())
69-
return Console.prompt(message, { ...options, type: 'multiselect', required: true })
64+
return log.prompt(message, { ...options, type: 'multiselect', required: true })
7065

71-
return Console.prompt(message, { ...options, type: 'multiselect' })
66+
return log.prompt(message, { ...options, type: 'multiselect' })
7267
}
7368

7469
async autocomplete(message: any, options: any) {
7570
if (this.isRequired())
76-
return Console.prompt(message, { ...options, type: 'autocomplete', required: true })
71+
return log.prompt(message, { ...options, type: 'autocomplete', required: true })
7772

78-
return Console.prompt(message, { ...options, type: 'autocomplete' })
73+
return log.prompt(message, { ...options, type: 'autocomplete' })
7974
}
8075
}
8176

.stacks/core/logging/src/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ export function dd(...args: any[]) {
1111

1212
export const logger = console
1313
export const log = {
14-
// eslint-disable-next-line no-console
15-
success: console.log, // TODO: create a proper success method
14+
success: (...args: any[]) => logger.log(...args),
1615
prompt: prompts,
1716
...logger,
1817
}

0 commit comments

Comments
 (0)