Skip to content

Update StudioCMS dependencies and refactor data fetching #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Adammatthiesen merged 1 commit into from
Jan 16, 2026
Merged

Update StudioCMS dependencies and refactor data fetching #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,402 changes: 617 additions & 785 deletions pnpm-lock.yaml
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 6 additions & 4 deletions www/astro.config.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ import cFetch from '@studiocms/cfetch';
import { defineConfig } from 'astro/config';
import studiocms from 'studiocms';

const site = process.env.DOKPLOY_DEPLOY_URL
? `https://${process.env.DOKPLOY_DEPLOY_URL}`
: 'https://studiocms.dev/';
const site = process.env.NODE_ENV === 'production'
? process.env.DOKPLOY_DEPLOY_URL
? `https://${process.env.DOKPLOY_DEPLOY_URL}`
: 'https://studiocms.dev/'
: 'http://localhost:4321';

// https://astro.build/config
export default defineConfig({
Expand All @@ -18,7 +20,7 @@ export default defineConfig({
},
],
},
integrations: [cFetch({ lifetime: '1h' }), studiocms()],
integrations: [cFetch({ lifetime: '1 hour' }), studiocms()],
security: {
checkOrigin: false,
},
Expand Down
10 changes: 5 additions & 5 deletions www/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@
"@astrojs/markdown-remark": "^6.3.9",
"@astrojs/node": "^9.5.1",
"@fontsource-variable/onest": "^5.2.11",
"@studiocms/cfetch": "^0.1.6",
"@studiocms/cfetch": "^0.2.0",
"@types/node": "^22.13.5",
"astro": "^5.16.4",
"pathe": "2.0.3",
"sharp": "^0.33.5",
"studiocms": "0.1.0-beta.31",
"studiocms": "0.1.1",
"tslib": "^2.8.1",
"vite": "^6.3.5",
"@studiocms/md": "0.1.0-beta.31",
"@studiocms/md": "0.1.1",
"@libsql/client": "^0.15.15",
"@libsql/kysely-libsql": "^0.4.1"
"kysely-turso": "^0.1.1"
},
"peerDependencies": {
"@studiocms/ui": "^1.0.0-beta.4"
"@studiocms/ui": "^1.0.0"
}
}
2 changes: 1 addition & 1 deletion www/src/pages/blog/[slug].astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ let { slug } = Astro.params;

const page = await runSDK(SDKCoreJs.GET.page.bySlug(`${slug}`));

if (!page) {
if (!page || page.draft === true) {
return new Response(null, { status: 404 });
}

Expand Down
2 changes: 1 addition & 1 deletion www/src/pages/blog/index.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import PageHeader from '@/components/PageHeader.astro';
import Layout from '@/layouts/Layout.astro';

const entries = await runSDK(
SDKCoreJs.GET.folderPages('dde4b58c-ff71-4b02-a261-dba8fe694644' /* Blog */, false, true)
SDKCoreJs.GET.folderPages('dde4b58c-ff71-4b02-a261-dba8fe694644' /* Blog */, false)
);

const articlePromises = entries.map(async (article) => {
Expand Down
2 changes: 1 addition & 1 deletion www/src/pages/index.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import { getDiscordMembers, getNpmMonthlyDownloads } from '../utils/stats-helper

const getNewestBlogPost = async () => {
const entries = await runSDK(
SDKCoreJs.GET.folderPages('dde4b58c-ff71-4b02-a261-dba8fe694644' /* Blog */, false, true)
SDKCoreJs.GET.folderPages('dde4b58c-ff71-4b02-a261-dba8fe694644' /* Blog */, false)
);

const articles = entries.sort((a, b) => b.publishedAt.getTime() - a.publishedAt.getTime());
Expand Down
15 changes: 6 additions & 9 deletions www/src/utils/stats-helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,11 @@ export async function getNpmMonthlyDownloads(packageName: string) {
const url = `https://api.npmjs.org/downloads/point/${startDate}:${endDate}/${packageName}`;

try {
const response = await cFetch(url);
const response = await cFetch<{ downloads: string }>(url, (res) => res.json());
if (!response.ok) {
throw new Error(`Error fetching data: ${response.statusText}`);
}
const data: { downloads: string } = await response.json();
return Number.parseInt(`${data.downloads}`);
return Number.parseInt(`${response.data.downloads}`);
} catch (error) {
console.error('Failed to fetch npm downloads:', error);
return null;
Expand All @@ -45,7 +44,7 @@ export async function getNpmMonthlyDownloads(packageName: string) {
*/
export const getStudioCMSStars = async (): Promise<number> => {
try {
const response = await cFetch('https://api.github.com/repos/withstudiocms/studiocms', {
const response = await cFetch<{ stargazers_count: number }>('https://api.github.com/repos/withstudiocms/studiocms', (res) => res.json(), {
headers: {
Authorization: `Bearer ${import.meta.env.GITHUB_TOKEN}`,
Accept: 'application/vnd.github.v3+json',
Expand All @@ -56,8 +55,7 @@ export const getStudioCMSStars = async (): Promise<number> => {
throw new Error(`GitHub API error: ${response.status}`);
}

const data = await response.json();
return Number.parseInt(`${data.stargazers_count}`);
return Number.parseInt(`${response.data.stargazers_count}`);
} catch (error) {
console.error('Error fetching StudioCMS stars:', error);
return 0;
Expand All @@ -70,9 +68,8 @@ export const getStudioCMSStars = async (): Promise<number> => {
*/
export async function getDiscordMembers() {
try {
const response = await cFetch('https://apollo.studiocms.dev/api/members/1309279407743172608');
const data = await response.json();
return Number.parseInt(`${data.members}`);
const response = await cFetch<{ members: number }>('https://apollo.studiocms.dev/api/members/1309279407743172608', (res) => res.json());
return Number.parseInt(`${response.data.members}`);
} catch (error) {
return 0;
}
Expand Down