Skip to content

Commit f3cd85b

Browse files
authored
fix: integration of unraid-ui tailwind config in web (#1074)
* fix: integration of unraid-ui tailwind config in web * chore(ci): inline unraid-ui build
1 parent c27bb1b commit f3cd85b

File tree

5 files changed

+64
-46
lines changed

5 files changed

+64
-46
lines changed

.github/workflows/main.yml

Lines changed: 41 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -101,45 +101,45 @@ jobs:
101101
name: unraid-api
102102
path: ${{ github.workspace }}/api/deploy/release/*.tgz
103103

104-
build-unraid-ui:
105-
name: Build Unraid UI Library
106-
defaults:
107-
run:
108-
working-directory: unraid-ui
109-
runs-on: ubuntu-latest
110-
steps:
111-
- name: Checkout repo
112-
uses: actions/checkout@v4
113-
114-
- name: Install node
115-
uses: actions/setup-node@v4
116-
with:
117-
cache: "npm"
118-
cache-dependency-path: |
119-
unraid-ui/package-lock.json
120-
node-version-file: ".nvmrc"
121-
122-
- name: Install dependencies
123-
run: npm install
124-
125-
- name: Build
126-
run: npm run build
127-
128-
- name: Make Built Node Artifact
129-
run: |
130-
mkdir unraid-ui-dist
131-
mv dist/ unraid-ui-dist/dist/
132-
mv package.json unraid-ui-dist/package.json
133-
ls unraid-ui-dist
134-
135-
- name: Upload Artifact to Github
136-
uses: actions/upload-artifact@v4
137-
with:
138-
name: unraid-ui
139-
path: unraid-ui/unraid-ui-dist
104+
# build-unraid-ui:
105+
# name: Build Unraid UI Library
106+
# defaults:
107+
# run:
108+
# working-directory: unraid-ui
109+
# runs-on: ubuntu-latest
110+
# steps:
111+
# - name: Checkout repo
112+
# uses: actions/checkout@v4
113+
#
114+
# - name: Install node
115+
# uses: actions/setup-node@v4
116+
# with:
117+
# cache: "npm"
118+
# cache-dependency-path: |
119+
# unraid-ui/package-lock.json
120+
# node-version-file: ".nvmrc"
121+
#
122+
# - name: Install dependencies
123+
# run: npm install
124+
#
125+
# - name: Build
126+
# run: npm run build
127+
#
128+
# - name: Make Built Node Artifact
129+
# run: |
130+
# mkdir unraid-ui-dist
131+
# mv dist/ unraid-ui-dist/dist/
132+
# mv package.json unraid-ui-dist/package.json
133+
# ls unraid-ui-dist
134+
#
135+
# - name: Upload Artifact to Github
136+
# uses: actions/upload-artifact@v4
137+
# with:
138+
# name: unraid-ui
139+
# path: unraid-ui/unraid-ui-dist
140140

141141
build-web:
142-
needs: [build-unraid-ui]
142+
# needs: [build-unraid-ui]
143143
name: Build Web App
144144
environment:
145145
name: production
@@ -168,15 +168,11 @@ jobs:
168168
web/package-lock.json
169169
node-version-file: "web/.nvmrc"
170170

171-
- name: Remove Existing Unraid UI folder
172-
run: |
173-
rm -r ../unraid-ui
171+
- name: Setup Just
172+
uses: extractions/setup-just@v2
174173

175-
- name: Download Artifact for Unraid UI
176-
uses: actions/download-artifact@v4
177-
with:
178-
name: unraid-ui
179-
path: unraid-ui
174+
- name: Build Unraid UI
175+
run: just ../unraid-ui/setup
180176

181177
- name: Installing node deps
182178
run: npm install

unraid-ui/justfile

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
default: list-commands
2+
3+
list-commands:
4+
@just --list --justfile {{justfile()}} --list-heading $'\nMonorepo recipes:\n'
5+
6+
# Prepares the repo for development
7+
setup:
8+
npm install
9+
npm run build
10+
11+
clean:
12+
npm run clean
13+
rm -rf node_modules

unraid-ui/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@
8686
"import": "./dist/tailwind.config.js",
8787
"default": "./dist/tailwind.config.js"
8888
},
89+
"./tailwind.config.ts": {
90+
"import": "./tailwind.config.ts",
91+
"default": "./tailwind.config.ts"
92+
},
8993
"./theme/preset": {
9094
"types": "./dist/theme/preset.d.ts",
9195
"import": "./dist/theme/preset.js"

web/justfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,10 @@ default:
55
@just list-commands
66

77
setup:
8+
just ../unraid-ui/setup
89
cp .env.example .env
910
npm install
11+
12+
clean:
13+
rm -rf .nuxt
14+
rm -rf node_modules

web/tailwind.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'dotenv/config';
2-
import tailwindConfig from '@unraid/ui/tailwind.config';
2+
import tailwindConfig from '@unraid/ui/tailwind.config.ts';
33
import type { Config } from 'tailwindcss';
44
import remToRem from './utils/tailwind-rem-to-rem';
55

0 commit comments

Comments
 (0)