Merge pull request #230 from ELIXIR-NO/revert-229-chore/update-deps

yasinmiran · web-flow · commit 3140669b906a · 2025-12-08T16:10:02.000+01:00
Revert "chore: update to astro v5"
diff --git a/.gitignore b/.gitignore
@@ -22,5 +22,3 @@ pnpm-debug.log*
 
 # jetbrains setting folder
 .idea/
-
-public/pagefind
diff --git a/astro.config.mjs b/astro.config.mjs
@@ -22,6 +22,6 @@ export default defineConfig({
             transformer: "sass"
         }
     },
-    output: "server",
+    output: "hybrid",
     adapter: cloudflare(),
 });
diff --git a/package.json b/package.json
@@ -15,17 +15,17 @@
     "postbuild": "pagefind --site dist"
   },
   "dependencies": {
-    "@astrojs/check": "^0.9.0",
-    "@astrojs/cloudflare": "^12.0.0",
-    "@astrojs/markdown-remark": "^6.0.0",
-    "@astrojs/mdx": "^4.0.0",
-    "@astrojs/react": "^4.0.0",
-    "@astrojs/tailwind": "^6.0.0",
+    "@astrojs/check": "^0.5.10",
+    "@astrojs/cloudflare": "^11.1.0",
+    "@astrojs/markdown-remark": "^5.2.0",
+    "@astrojs/mdx": "^3.0.0",
+    "@astrojs/react": "^3.3.1",
+    "@astrojs/tailwind": "^5.1.0",
     "@headlessui/react": "^2.1.2",
     "@heroicons/react": "^2.1.3",
     "@tailwindcss/forms": "^0.5.7",
     "animate.css": "^4.1.1",
-    "astro": "^5.0.0",
+    "astro": "^4.7.0",
     "dayjs": "^1.11.12",
     "dompurify": "^3.2.4",
     "leaflet": "^1.9.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/public/assets/news/genomic-data-infrastructure-is-launched-a-new-eu-project-to-unlock-the-potential-of-human-genomics-for-healthcare-research-and-innovation/gdi-logo.svg b/public/assets/news/genomic-data-infrastructure-is-launched-a-new-eu-project-to-unlock-the-potential-of-human-genomics-for-healthcare-research-and-innovation/gdi-logo.svg
diff --git a/public/assets/news/norwegian-life-sciences-infrastructures-announce-strategic-agreement-for-establishing-long-term-collaboration-on-the-management-of-research-data/cover.jpg b/public/assets/news/norwegian-life-sciences-infrastructures-announce-strategic-agreement-for-establishing-long-term-collaboration-on-the-management-of-research-data/cover.jpg
diff --git a/src/components/featured-news.astro b/src/components/featured-news.astro
@@ -10,7 +10,7 @@ const news = (await getCollection("news"))
     {news.map((article) => {
         return (
                 <li>
-                    <a href={`/news/${article.id}`}>
+                    <a href={`/news/${article.slug}`}>
                         <span class="link block">{article.data.title}</span>
                         <time class="datetime block text-sm">{article.data.date}</time>
                     </a>
diff --git a/src/components/services-list.astro b/src/components/services-list.astro
@@ -7,7 +7,7 @@ const { services } = Astro.props;
         {services.map((service) => (
                 <li class={`overflow-clip bg-light-surface dark:bg-dark-surface shadow-2xl relative px-6 py-6 flex animate__animated animate__fadeIn`}
                     data-tags={`${service.tags?.join(",")}`}>
-                    <a href={`/services/${service.id}`}>
+                    <a href={`/services/${service.slug}`}>
                         {service.tags.includes("service") && (
                                 <span class="absolute shadow top-0 z-10 text-xs right-0 text-white bg-brand-primary px-1.5 py-0.5 rounded-bl opacity-75">
                                     Node Service
diff --git a/src/content/news/course-using-the-norwegian-e-infrastructure-for-life-science-nels-and-usegalaxyno-28-29-nov.mdx b/src/content/news/course-using-the-norwegian-e-infrastructure-for-life-science-nels-and-usegalaxyno-28-29-nov.mdx
diff --git a/src/content/news/elixir-norway-and-the-centre-for-digital-life-norway-is-organizing-a-data-management-planning-workshop-for-life-science-projects.mdx b/src/content/news/elixir-norway-and-the-centre-for-digital-life-norway-is-organizing-a-data-management-planning-workshop-for-life-science-projects.mdx
diff --git a/src/content/news/genomic-data-infrastructure-is-launched-a-new-eu-project-to-unlock-the-potential-of-human-genomics-for-healthcare-research-and-innovation.mdx b/src/content/news/genomic-data-infrastructure-is-launched-a-new-eu-project-to-unlock-the-potential-of-human-genomics-for-healthcare-research-and-innovation.mdx
@@ -4,7 +4,7 @@ variant: "article"
 title: "Genomic Data Infrastructure is launched—a new EU project to unlock the potential of human genomics for healthcare, research and innovation"
 date: "Nov 17, 2022"
 cover:
-    source: "/assets/news/genomic-data-infrastructure-eu-launch/gdi-logo.svg"
+    source: "/assets/news/genomic-data-infrastructure-is-launched-a-new-eu-project-to-unlock-the-potential-of-human-genomics-for-healthcare-research-and-innovation/gdi-logo.svg"
 summary: "Today,the European Genomic Data Infrastructure (GDI) projectkicks-off in Brussels, Belgium. The new €40 million GDI project, coordinated by ELIXIR, is jointly funded by the European Commission underthe Digital Europe Programmeand through co-funding from participating Member States. In the area of health, the Digital Europe Programme aims to support the creation of elements of the European Health Data Space."
 ---
 
diff --git a/src/content/news/genomic-data-infrastructure-nytt-eu-prosjekt-skal-utlse-potensialet-som-ligger-i-humane-genomdata-for-persontilpasset-medisin-forskning-og-innovasjon.mdx b/src/content/news/genomic-data-infrastructure-nytt-eu-prosjekt-skal-utlse-potensialet-som-ligger-i-humane-genomdata-for-persontilpasset-medisin-forskning-og-innovasjon.mdx
@@ -4,7 +4,7 @@ variant: "article"
 title: "Genomic Data Infrastructure - nytt EU-prosjekt skal utløse potensialet som ligger i humane genomdata for persontilpasset medisin, forskning og innovasjon"
 date: "Nov 17, 2022"
 cover:
-    source: "/assets/news/genomic-data-infrastructure-eu-launch/gdi-logo.svg"
+    source: "/assets/news/genomic-data-infrastructure-is-launched-a-new-eu-project-to-unlock-the-potential-of-human-genomics-for-healthcare-research-and-innovation/gdi-logo.svg"
 summary: "I dag lanseresGenomic Data Infrastructure (GDI), som er et stort nytt europeisk prosjekt for bedret tilgjengelighet til humane genomiske og kliniske data på tvers av europeiske landegrenser på en sikker måte."
 ---
 
@@ -25,4 +25,4 @@ Gjennom GDI vil man nå i Europa få tilgang til et datanettverk med mer enn en
 - Kjell Petersen, teknisk koordinator ELIXIR Norge, Universitetet i Bergen, epost: kjell.petersen@uib.no
 - Christine Stansberg, nodekoordinator ELIXIR Norge, Universitetet i Bergen, epost: christine.stansberg@uib.no
 
-Mer utfyllende pressemelding finnes på engelsk [HER](news/genomic-data-infrastructure-eu-launch).
+Mer utfyllende pressemelding finnes på engelsk [HER](news/genomic-data-infrastructure-is-launched-a-new-eu-project-to-unlock-the-potential-of-human-genomics-for-healthcare-research-and-innovation).
diff --git a/src/content/news/job-vacancies-permanent-positions-as-senior-engineer-chief-engineer-system-developer-in-elixir-norway-in-bergen.mdx b/src/content/news/job-vacancies-permanent-positions-as-senior-engineer-chief-engineer-system-developer-in-elixir-norway-in-bergen.mdx
diff --git a/src/content/news/norwegian-life-sciences-infrastructures-announce-strategic-agreement-for-establishing-long-term-collaboration-on-the-management-of-research-data.mdx b/src/content/news/norwegian-life-sciences-infrastructures-announce-strategic-agreement-for-establishing-long-term-collaboration-on-the-management-of-research-data.mdx
@@ -3,7 +3,7 @@ layout: "../../layouts/page.astro"
 variant: "article"
 title: "Norwegian Life Sciences Infrastructures announce strategic agreement for establishing long-term collaboration on the management of research data."
 cover:
-    source: "/assets/news/norwegian-life-science-data-agreement/cover.jpg"
+    source: "/assets/news/norwegian-life-sciences-infrastructures-announce-strategic-agreement-for-establishing-long-term-collaboration-on-the-management-of-research-data/cover.jpg"
     caption: "Sushma Grellscheid HoN (right) and Korbinian Bösl (left) DM coordinator (Picture: Randi Eilertsen)"
 date: "Nov 13, 2023"
 summary: "Today, nine Life Science Research Infrastructure programs in Norway signed an agreement for establishing a long-term collaboration aiming to revolutionise the management and exchange of life science data in Norway."
diff --git a/src/pages/about/[...organization].astro b/src/pages/about/[...organization].astro
@@ -1,22 +1,20 @@
 ---
-import { getCollection, render } from "astro:content";
+import { getCollection } from "astro:content";
 import { components } from "../../components/elements";
 
-export const prerender = true;
-
 export async function getStaticPaths() {
     const organizations = await getCollection("about");
     return organizations.map((entry) => ({
         params: {
-            organization: entry.id,
+            organization: entry.slug,
         },
         props: {
             entry,
         },
     }));
 }
 const { entry } = Astro.props;
-const { Content } = await render(entry);
+const { Content } = await entry.render();
 ---
 
 <Content components={components} />
diff --git a/src/pages/events/[...events].astro b/src/pages/events/[...events].astro
@@ -1,15 +1,13 @@
 ---
-import { getCollection, render } from "astro:content";
+import { getCollection } from "astro:content";
 import { components } from "../../components/elements";
 
-export const prerender = true;
-
 export async function getStaticPaths() {
     const events = await getCollection("events");
     return events.map((entry) => {
         return {
             params: {
-                events: entry.id,
+                events: entry.slug,
             },
             props: {
                 entry,
@@ -19,7 +17,7 @@ export async function getStaticPaths() {
 }
 
 const { entry } = Astro.props;
-const { Content: MarkdownContent } = await render(entry);
+const { Content: MarkdownContent } = await entry.render();
 ---
 
 <MarkdownContent components={components} />
diff --git a/src/pages/events/index.astro b/src/pages/events/index.astro
@@ -26,7 +26,7 @@ events.sort((a, b) => parseDate(b.data.date) - parseDate(a.data.date));
             events.map((entry) => {
                 return (
                     <CardV2
-                        link={`/events/${entry.id}`}
+                        link={`/events/${entry.slug}`}
                         title={entry.data.title}
                         summary={entry.data.summary}
                         cover={entry.data?.cover?.source}
diff --git a/src/pages/funding-and-projects/[...project].astro b/src/pages/funding-and-projects/[...project].astro
@@ -1,22 +1,20 @@
 ---
-import { getCollection, render } from "astro:content";
+import { getCollection } from "astro:content";
 import { components } from "../../components/elements";
 
-export const prerender = true;
-
 export async function getStaticPaths() {
     const projects = await getCollection("funding-and-projects");
     return projects.map((entry) => ({
         params: {
-            project: entry.id,
+            project: entry.slug,
         },
         props: {
             entry,
         },
     }));
 }
 const { entry } = Astro.props;
-const { Content: MarkdownContent } = await render(entry);
+const { Content: MarkdownContent } = await entry.render();
 ---
 
 <MarkdownContent components={components} class="content" />
diff --git a/src/pages/news/[...news].astro b/src/pages/news/[...news].astro
@@ -1,9 +1,7 @@
 ---
-import { getCollection, render } from "astro:content";
+import { getCollection } from "astro:content";
 import { components } from "../../components/elements";
 
-export const prerender = true;
-
 export async function getStaticPaths() {
     const news = await getCollection("news");
     return news.map((entry, index) => {
@@ -13,7 +11,7 @@ export async function getStaticPaths() {
         ];
         return {
             params: {
-                news: entry.id,
+                news: entry.slug,
             },
             props: {
                 entry,
@@ -25,7 +23,7 @@ export async function getStaticPaths() {
 }
 
 const { entry } = Astro.props;
-const { Content: MarkdownContent } = await render(entry);
+const { Content: MarkdownContent } = await entry.render();
 ---
 
 <MarkdownContent components={components} />
diff --git a/src/pages/news/index.astro b/src/pages/news/index.astro
@@ -29,7 +29,7 @@ news.sort((a, b) => parseDate(b.data.date) - parseDate(a.data.date));
         {news.map((entry) => {
             return (
                     <CardV2
-                            link={`/news/${entry.id}`}
+                            link={`/news/${entry.slug}`}
                             title={entry.data.title}
                             summary={entry.data.summary}
                             cover={entry.data?.cover?.source}
diff --git a/src/pages/services/[...service].astro b/src/pages/services/[...service].astro
@@ -1,22 +1,20 @@
 ---
-import { getCollection, render } from "astro:content";
+import { getCollection } from "astro:content";
 import { components } from "../../components/elements";
 
-export const prerender = true;
-
 export async function getStaticPaths() {
     const services = await getCollection("services");
     return services.map((entry) => ({
         params: {
-            service: entry.id,
+            service: entry.slug,
         },
         props: {
             entry,
         },
     }));
 }
 const { entry } = Astro.props;
-const { Content } = await render(entry);
+const { Content } = await entry.render();
 ---
 
 <Content components={components} />
diff --git a/src/pages/services/index.astro b/src/pages/services/index.astro
@@ -22,7 +22,7 @@ const tags = sortStringsByLength([
     };
 });
 
-const _services = services.map(({ id, data }) => ({ id, ...data }));
+const _services = services.map(({ slug, id, data }) => ({ slug, id, ...data }));
 ---
 
 <Page title="Services" variant="sidebar">

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,6 @@ export default defineConfig({`
`22`	`22`	`transformer: "sass"`
`23`	`23`	`}`
`24`	`24`	`},`
`25`		`- output: "server",`
	`25`	`+ output: "hybrid",`
`26`	`26`	`adapter: cloudflare(),`
`27`	`27`	`});`