Skip to content

Commit 465c195

Browse files
fix(site): fix dependecies installation, fonts issue
fix(site)[ci]: bun installation fix(site)[fonts]: fix fonts not loading issue refac(site)[ci]: make the astro action itself handle bun installation fix(site): make bun install deps in monorepo first fix(site): unocss fonts
1 parent e24c6e8 commit 465c195

10 files changed

Lines changed: 88 additions & 87 deletions

File tree

.github/workflows/deploy-website.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,20 @@ jobs:
2020
steps:
2121
- name: Checkout your repository using git
2222
uses: actions/checkout@v5
23+
24+
- name: setup node
25+
uses: actions/setup-node@v4
26+
with:
27+
node-version: lts/*
28+
- name: Setup Bun
29+
uses: oven-sh/setup-bun@v2
30+
- name: Install dependencies
31+
run: bun i
32+
2333
- name: Install, build, and upload your site
2434
uses: withastro/action@v5
2535
with:
2636
path: 'apps/site'
27-
node-version: 24
28-
package-manager: pnpm@latest
29-
build-cmd: pnpm run build
3037

3138
deploy:
3239
needs: build

apps/site/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# build output
22
dist/
3-
public/assets/fonts/
43

54
# generated types
65
.astro/

apps/site/bun.lock

Lines changed: 37 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
34.3 KB
Binary file not shown.
124 KB
Binary file not shown.
41.6 KB
Binary file not shown.

apps/site/src/components/home_page/section_3/index.astro

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
import { Image } from "astro:assets";
32
import desktopShot from "@/assets/images/screenshots/desktop/1.png";
43
import mobileShot from "@/assets/images/screenshots/mobile/1.jpg";
54
import CrossPlatformGrid from "./cross_platform_grid.astro";
@@ -19,15 +18,13 @@ let { class: classes } = Astro.props;
1918
Your Workspace, Unbounded
2019
</h2>
2120
<p class="text-xl text-base-content/60 max-w-2xl mx-auto">
22-
Switch devices without switching contexts. Cherit adapts to your workflow, wherever you are.
21+
Switch devices without switching contexts. Cherit adapts to your
22+
workflow, wherever you are.
2323
</p>
2424
</div>
2525

2626
<div class="animate-on-scroll">
27-
<CrossPlatformGrid
28-
desktop_img={desktopShot}
29-
mobile_img={mobileShot}
30-
/>
27+
<CrossPlatformGrid desktop_img={desktopShot} mobile_img={mobileShot} />
3128
</div>
3229

3330
<!-- Background decoration -->

apps/site/src/styles/fonts.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
@font-face {
22
font-family: "DTNightingale";
3-
src: url("/cherit/fonts/DTNightingale-Light.otf") format("opentype");
3+
src: url("/fonts/DTNightingale-Light.otf") format("opentype");
44
font-weight: 300;
55
font-style: normal;
66
font-display: swap;
77
}
88
@font-face {
99
font-family: "Recoleta-Regular";
10-
src: url("/cherit/fonts/Recoleta-RegularDEMO.otf") format("opentype");
10+
src: url("/fonts/Recoleta-RegularDEMO.otf") format("opentype");
1111
font-weight: 300;
1212
font-style: normal;
1313
font-display: swap;

apps/site/unocss.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export default defineConfig({
4848
processors: createLocalFontProcessor({
4949
cacheDir: "node_modules/.cache/unocss/fonts",
5050
fontAssetsDir: "public/assets/fonts",
51-
fontServeBaseUrl: "/cherit/assets/fonts",
51+
fontServeBaseUrl: "/assets/fonts",
5252
}),
5353
}),
5454
],

bun.lock

Lines changed: 35 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)