Skip to content

Commit 774c855

Browse files
authored
Merge branch 'main' into lachieh/eslint-updates-unicorn-react-hooks
Signed-off-by: Lachlan Heywood <[email protected]>
2 parents 38e206c + fcbaac2 commit 774c855

File tree

16 files changed

+234
-602
lines changed

16 files changed

+234
-602
lines changed

.changeset/funny-paths-find.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@wasmcloud/lattice-client-react': patch
3+
'washboard-ui': patch
4+
---
5+
6+
Update tailwindcss and remove as unused dependency

.github/actions/ts-setup/action.yml

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ inputs:
1616
description: NPM token
1717
required: false
1818
default: ''
19-
cache-key:
20-
description: Cache key
21-
required: false
22-
default: 'main'
2319

2420
runs:
2521
using: composite
@@ -58,26 +54,10 @@ runs:
5854
echo "======================"
5955
echo "::endgroup::"
6056
61-
- name: Cache Turbo Build
62-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
63-
with:
64-
path: ${{ inputs.working-directory }}/.turbo
65-
key: ${{ runner.os }}-turbo-${{ github.sha }}-${{ github.workflow }}-${{ inputs.cache-key || github.job || 'main' }}
66-
restore-keys: |
67-
${{ runner.os }}-turbo-${{ github.sha }}-${{ github.workflow }}-${{ inputs.cache-key || github.job || 'main' }}
68-
${{ runner.os }}-turbo-${{ github.sha }}-${{ github.workflow }}-
69-
${{ runner.os }}-turbo-${{ github.sha }}-
70-
${{ runner.os }}-turbo-
57+
- name: Configure Turbo Cache
58+
uses: rharkor/caching-for-turbo@2b4b5b14a8d16b8556a58993a8ac331d56d8906d # v2.3.2
7159

7260
- name: Install Dependencies
7361
working-directory: ${{ inputs.working-directory }}
7462
shell: bash
7563
run: yarn install
76-
77-
- name: Turbo Run Summary
78-
uses: gacts/run-and-post-run@d803f6920adc9a47eeac4cb6c93dbc2e2890c684 # v1.4.2
79-
with:
80-
post: |
81-
echo "::group::Turbo Run Summary"
82-
cat ${{ inputs.working-directory }}/.turbo/runs/*.json || echo 'No Turbo Run Summary found'
83-
echo "::endgroup::"

.github/actions/wash-versions/action.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

.github/workflows/ci_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Checkout
2020
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
2121

22-
- name: Setup Node, Yarn, and Turbo
22+
- name: Setup Node and Yarn
2323
uses: ./.github/actions/ts-setup
2424

2525
- name: Build

.github/workflows/ci_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
with:
5757
token: ${{ steps.app-token.outputs.token }}
5858

59-
- name: Setup Node, Yarn, and Turbo
59+
- name: Setup Node, Yarn
6060
uses: ./.github/actions/ts-setup
6161
with:
6262
npm-token: ${{ secrets.NPM_TOKEN }}

.github/workflows/ci_test.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ jobs:
4040
id: fetch
4141
uses: ./.github/actions/crate-versions
4242
with:
43-
crate: wash-cli
44-
lookback: '1'
43+
crate: wash
44+
lookback: '3'
4545

4646
outputs:
4747
versions: ${{ steps.fetch.outputs.versions }}
@@ -66,10 +66,8 @@ jobs:
6666
- name: Checkout
6767
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
6868

69-
- name: Setup Node, Yarn, and Turbo
69+
- name: Setup Node, Yarn
7070
uses: ./.github/actions/ts-setup
71-
with:
72-
cache-key: ${{ format('e2e-wash-{0}', matrix.wash) }}
7371

7472
- name: Install `wash` CLI
7573
uses: taiki-e/install-action@d6912b47771be2c443ec90dbb3d28e023987e782 # v2.62.1

.github/workflows/tag-push_washboard-ui.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Checkout
1414
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
1515

16-
- name: Setup Node, Yarn, and Turbo
16+
- name: Setup Node, Yarn
1717
uses: ./.github/actions/ts-setup
1818

1919
- name: Build

apps/washboard-ui/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@
5353
"react-dom": "19.0.0",
5454
"react-hook-form": "^7.65.0",
5555
"react-router-dom": "^7.9.4",
56-
"tailwind-merge": "^2.6.0",
56+
"tailwind-merge": "^3.3.1",
5757
"tailwindcss-animate": "^1.0.7",
5858
"usehooks-ts": "^3.1.1",
5959
"zod": "^4.1.12"
6060
},
6161
"devDependencies": {
6262
"@playwright/test": "^1.55.1",
63-
"@tailwindcss/vite": "^4.1.13",
63+
"@tailwindcss/vite": "^4.1.16",
6464
"@types/node": "^24.5.2",
6565
"@types/react": "19.0.0",
6666
"@types/react-dom": "19.0.0",
@@ -76,7 +76,7 @@
7676
"postcss": "^8.5.6",
7777
"prettier": "^3.6.2",
7878
"rollup-plugin-sourcemaps": "^0.6.3",
79-
"tailwindcss": "^4.0.0",
79+
"tailwindcss": "^4.1.16",
8080
"typescript": "^5.9.2",
8181
"uuid": "^13.0.0",
8282
"vite": "^7.1.11",

apps/washboard-ui/src/app/components/hosts-summary.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,7 @@ export function HostsSummary(): ReactElement {
4040
<TableRow>
4141
<TableHead className="p-2 align-baseline">Host ID</TableHead>
4242
<TableCell>
43-
<ShortCopy
44-
text={host.host_id}
45-
className="md:w-64 lg:w-auto lg:[mask-image:none]"
46-
/>
43+
<ShortCopy text={host.host_id} className="md:w-64 lg:w-auto lg:mask-none" />
4744
</TableCell>
4845
</TableRow>
4946
<TableRow>

apps/washboard-ui/src/app/styles/index.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@import 'tailwindcss';
2+
23
@plugin 'tailwindcss-animate';
34

45
@custom-variant dark (&:is(.dark *));
@@ -93,7 +94,7 @@
9394
}
9495
body,
9596
#root {
96-
@apply min-h-[100vh] min-w-[100vw] w-screen h-screen;
97+
@apply min-h-screen min-w-screen w-screen h-screen;
9798
}
9899
body {
99100
@apply bg-background text-foreground;

0 commit comments

Comments
 (0)