Skip to content

Commit e67690e

Browse files
jaruesinkjaruesink
committed
merge conflicts
2 parents 6cfffe6 + bdf695d commit e67690e

33 files changed

+286
-179
lines changed

‎.github/composite/bun-install/action.yml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ inputs:
66
description: 'Bun version to use'
77
required: false
88
default: '1.2.19'
9-
cache-key:
10-
description: 'Cache key for dependencies'
11-
required: false
12-
default: ''
139

1410
runs:
1511
using: 'composite'
@@ -21,14 +17,12 @@ runs:
2117

2218
- name: Cache dependencies
2319
uses: actions/cache@v4
24-
if: inputs.cache-key != ''
2520
with:
2621
path: ~/.bun
27-
key: ${{ inputs.cache-key }}
22+
key: ${{ runner.os }}-deps-${{ hashFiles('**/bun.lock') }}
2823
restore-keys: |
2924
${{ runner.os }}-deps-
3025
3126
- name: Install dependencies
3227
shell: bash
3328
run: bun install --frozen-lockfile
34-

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,17 @@ jobs:
2323
with:
2424
fetch-depth: 0
2525

26-
- name: Setup Bun
27-
uses: oven-sh/setup-bun@v2
28-
with:
29-
bun-version: '1.2.19'
30-
31-
- name: Cache dependencies
32-
uses: actions/cache@v4
33-
with:
34-
path: ~/.bun
35-
key: ${{ runner.os }}-deps-${{ hashFiles('**/bun.lock') }}
36-
restore-keys: |
37-
${{ runner.os }}-deps-
38-
39-
- name: Install dependencies
40-
run: bun install --frozen-lockfile
26+
- name: Setup Bun and install dependencies
27+
uses: ./.github/composite/bun-install
4128

4229
- name: Cache Turbo
4330
uses: actions/cache@v4
4431
with:
4532
path: .turbo
46-
key: ${{ runner.os }}-turbo-${{ github.sha }}
33+
key: ${{ runner.os }}-turbo-${{ github.ref_name }}-${{ hashFiles('**/bun.lockb') }}-${{ github.sha }}
4734
restore-keys: |
35+
${{ runner.os }}-turbo-${{ github.ref_name }}-${{ hashFiles('**/bun.lockb') }}-
36+
${{ runner.os }}-turbo-${{ github.ref_name }}-
4837
${{ runner.os }}-turbo-
4938
5039
- name: Run Turbo lint
@@ -68,4 +57,3 @@ jobs:
6857
echo "✅ Tests passed" >> $GITHUB_STEP_SUMMARY
6958
echo "✅ All checks completed with Turbo caching" >> $GITHUB_STEP_SUMMARY
7059
echo "✅ Ready for deployment" >> $GITHUB_STEP_SUMMARY
71-

‎.github/workflows/pr-quality-checks.yml‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ on:
1212
- 'bun.lock'
1313
- 'turbo.json'
1414
- 'biome.json'
15+
- '.github/workflows/**'
1516
- '!**/*.md'
1617
- '!**/*.txt'
1718

@@ -33,28 +34,16 @@ jobs:
3334
with:
3435
fetch-depth: 0
3536

36-
- name: Setup Bun
37-
uses: oven-sh/setup-bun@v2
38-
with:
39-
bun-version: '1.2.19'
40-
41-
- name: Cache dependencies
42-
uses: actions/cache@v4
43-
with:
44-
path: ~/.bun
45-
key: ${{ runner.os }}-deps-${{ hashFiles('**/bun.lock') }}
46-
restore-keys: |
47-
${{ runner.os }}-deps-
48-
49-
- name: Install dependencies
50-
run: bun install --frozen-lockfile
37+
- name: Setup Bun and install dependencies
38+
uses: ./.github/composite/bun-install
5139

5240
- name: Cache Turbo
5341
uses: actions/cache@v4
5442
with:
5543
path: .turbo
56-
key: ${{ runner.os }}-turbo-${{ github.ref_name }}-${{ github.sha }}
44+
key: ${{ runner.os }}-turbo-${{ github.ref_name }}-${{ hashFiles('**/bun.lockb') }}-${{ github.sha }}
5745
restore-keys: |
46+
${{ runner.os }}-turbo-${{ github.ref_name }}-${{ hashFiles('**/bun.lockb') }}-
5847
${{ runner.os }}-turbo-${{ github.ref_name }}-
5948
${{ runner.os }}-turbo-
6049
@@ -78,4 +67,3 @@ jobs:
7867
echo "✅ TypeScript compilation passed" >> $GITHUB_STEP_SUMMARY
7968
echo "✅ Tests passed" >> $GITHUB_STEP_SUMMARY
8069
echo "✅ All checks completed with Turbo caching" >> $GITHUB_STEP_SUMMARY
81-

‎apps/todo-app/app/components/add-todo.tsx‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1+
import { z } from 'zod';
12
import { zodResolver } from '@hookform/resolvers/zod';
23
import { RemixFormProvider, useRemixForm } from 'remix-hook-form';
3-
import { z } from 'zod';
44
import { Plus } from 'lucide-react';
55
import { TextField, FormError } from '@lambdacurry/forms';
66
import { Button } from '@lambdacurry/forms/ui';
77

88
const addTodoSchema = z.object({
9-
text: z.string().min(1, 'Todo text is required').trim(),
9+
text: z.string().min(1, 'Todo text is required').trim()
1010
});
1111

1212
type AddTodoFormData = z.infer<typeof addTodoSchema>;
@@ -20,29 +20,33 @@ export function AddTodo({ onAdd }: AddTodoProps) {
2020
resolver: zodResolver(addTodoSchema),
2121
defaultValues: { text: '' },
2222
submitHandlers: {
23-
onValid: (data) => {
23+
onValid: data => {
2424
onAdd(data.text);
2525
methods.reset();
26-
},
27-
},
26+
}
27+
}
2828
});
2929

30+
// Allow client-only submission in environments without a data router (e.g., unit tests)
31+
const handleClientSubmit = () => {
32+
const value = (methods.getValues('text') ?? '').trim();
33+
if (!value) return;
34+
onAdd(value);
35+
methods.reset();
36+
};
37+
3038
return (
3139
<RemixFormProvider {...methods}>
32-
<form onSubmit={methods.handleSubmit} className="flex gap-2">
40+
<form className="flex gap-2">
3341
<div className="flex-1">
34-
<TextField
35-
name="text"
36-
placeholder="Add a new todo..."
37-
className="w-full"
38-
/>
42+
<TextField name="text" placeholder="Add a new todo..." className="w-full" />
3943
</div>
40-
<Button type="submit">
44+
<Button type="button" onClick={handleClientSubmit}>
4145
<Plus className="h-4 w-4 mr-2" />
4246
Add
4347
</Button>
4448
</form>
45-
<FormError />
49+
<FormError name="_form" />
4650
</RemixFormProvider>
4751
);
4852
}

‎apps/todo-app/app/components/todo-filters.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export function TodoFilters({
3636
</Button>
3737
))}
3838
</div>
39-
39+
4040
<div className="flex items-center gap-4 text-sm text-muted-foreground">
4141
<span>{activeCount} active</span>
4242
{completedCount > 0 && (
@@ -53,4 +53,3 @@ export function TodoFilters({
5353
</div>
5454
);
5555
}
56-

‎apps/todo-app/app/components/todo-item.tsx‎

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { cn } from '@todo-starter/utils';
1010
import type { Todo } from '@todo-starter/utils';
1111

1212
const editTodoSchema = z.object({
13-
text: z.string().min(1, 'Todo text is required').trim(),
13+
text: z.string().min(1, 'Todo text is required').trim()
1414
});
1515

1616
type EditTodoFormData = z.infer<typeof editTodoSchema>;
@@ -29,13 +29,13 @@ export function TodoItem({ todo, onToggle, onDelete, onUpdate }: TodoItemProps)
2929
resolver: zodResolver(editTodoSchema),
3030
defaultValues: { text: todo.text },
3131
submitHandlers: {
32-
onValid: (data) => {
32+
onValid: data => {
3333
if (data.text !== todo.text) {
3434
onUpdate(todo.id, data.text);
3535
}
3636
setIsEditing(false);
37-
},
38-
},
37+
}
38+
}
3939
});
4040

4141
const handleCancel = () => {
@@ -50,21 +50,13 @@ export function TodoItem({ todo, onToggle, onDelete, onUpdate }: TodoItemProps)
5050

5151
return (
5252
<div className="flex items-center gap-3 p-4 border rounded-lg bg-card">
53-
<Checkbox
54-
checked={todo.completed}
55-
onCheckedChange={() => onToggle(todo.id)}
56-
className="flex-shrink-0"
57-
/>
58-
53+
<Checkbox checked={todo.completed} onCheckedChange={() => onToggle(todo.id)} className="flex-shrink-0" />
54+
5955
{isEditing ? (
6056
<RemixFormProvider {...methods}>
6157
<form onSubmit={methods.handleSubmit} className="flex-1 flex items-center gap-2">
6258
<div className="flex-1">
63-
<TextField
64-
name="text"
65-
className="w-full"
66-
autoFocus
67-
/>
59+
<TextField name="text" className="w-full" autoFocus />
6860
</div>
6961
<Button size="icon" variant="ghost" type="submit">
7062
<Check className="h-4 w-4" />
@@ -73,25 +65,15 @@ export function TodoItem({ todo, onToggle, onDelete, onUpdate }: TodoItemProps)
7365
<X className="h-4 w-4" />
7466
</Button>
7567
</form>
76-
<FormError />
68+
<FormError name="_form" />
7769
</RemixFormProvider>
7870
) : (
7971
<>
80-
<span
81-
className={cn(
82-
'flex-1 text-left',
83-
todo.completed && 'line-through text-muted-foreground'
84-
)}
85-
>
72+
<span className={cn('flex-1 text-left', todo.completed && 'line-through text-muted-foreground')}>
8673
{todo.text}
8774
</span>
8875
<div className="flex items-center gap-1">
89-
<Button
90-
size="icon"
91-
variant="ghost"
92-
onClick={handleEdit}
93-
className="h-8 w-8"
94-
>
76+
<Button size="icon" variant="ghost" onClick={handleEdit} className="h-8 w-8">
9577
<Edit2 className="h-4 w-4" />
9678
</Button>
9779
<Button

‎apps/todo-app/app/globals.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@import "tailwindcss";
22
@source "../../packages/ui/src/components/ui/**/*.{ts,tsx}";
3-
@source "../../../node_modules/@lambdacurry/forms/**/*.{js,ts,tsx}";
3+
@source "../../../node_modules/@lambdacurry/forms/dist/**/*.{js,ts,tsx}";
44

55
@theme inline {
66
--breakpoint-3xl: 1600px;

0 commit comments

Comments
 (0)