Skip to content

Commit e552eaa

Browse files
authored
Merge branch 'ep2025' into ep2025-images
2 parents 604bbf3 + e0a7329 commit e552eaa

File tree

3 files changed

+29
-3
lines changed

3 files changed

+29
-3
lines changed

astro.config.mjs

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import path, { dirname } from "path";
2+
import { fileURLToPath } from "url";
13
import { defineConfig } from "astro/config";
24
import mdx from "@astrojs/mdx";
35
import { h } from "hastscript";
@@ -11,8 +13,21 @@ import metaTags from "astro-meta-tags";
1113
import pagefind from "astro-pagefind";
1214
import deleteUnusedImages from "astro-delete-unused-images";
1315

16+
const __filename = fileURLToPath(import.meta.url);
17+
const __dirname = dirname(__filename); // @type-check enabled!
18+
1419
// https://astro.build/config
1520
export default defineConfig({
21+
vite: {
22+
define: {
23+
"process.env.VITE_BUILD_TIME": JSON.stringify(new Date().toISOString()),
24+
},
25+
resolve: {
26+
alias: {
27+
$: path.resolve(__dirname, "./src"),
28+
},
29+
},
30+
},
1631
markdown: {
1732
remarkPlugins: [
1833
[
@@ -35,7 +50,7 @@ export default defineConfig({
3550
],
3651
],
3752
},
38-
site: "https://ep2025.europython.eu",
53+
site: process.env.SITE_URL || "https://ep2025.europython.eu",
3954
redirects: {
4055
"/c-api-summit/": "/programme/c-api-summit/",
4156
"/programme/cfp/": "/programme/cfp/",
@@ -58,4 +73,7 @@ export default defineConfig({
5873
deleteUnusedImages(),
5974
],
6075
output: "static",
76+
build: {
77+
minify: true,
78+
},
6179
});

src/components/ticket-tiers/ticket-tiers.astro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ const formatPrice = (price: number | string) => {
9999
---
100100

101101
<div class="ticket-tiers-container">
102-
<div class="grid grid-cols-1 md:grid-cols-3 lg:grid-cols-3 gap-10 md:gap-6 lg:gap-10">
102+
<div class="grid grid-cols-1 lg:grid-cols-3 gap-10 md:gap-6 lg:gap-10">
103103
{tiers.map((tier) => (
104104
<div class="bg-white text-black rounded-2xl p-6 pb-20 relative not-prose z-0">
105105
<div>

tsconfig.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
"compilerOptions": {
44
"strictNullChecks": true,
55
"jsx": "react-jsx",
6-
"jsxImportSource": "react"
6+
"jsxImportSource": "react",
7+
"paths": {
8+
"@components/*": ["src/components/*"],
9+
"@layouts/*": ["src/layouts/*"],
10+
"@ui/*": ["src/components/ui/*"],
11+
"@assets/*": ["src/assets/*"],
12+
"@i18n/*": ["src/i18n/*"],
13+
"@src/*": ["src/*"]
14+
}
715
}
816
}

0 commit comments

Comments
 (0)