[ci] update-templates

withastro · Nov 28, 2024 · e74bad0 · e74bad0
1 parent b7d7ba1
commit e74bad0
Show file tree

Hide file tree

Showing 29 changed files with 65 additions and 74 deletions.
diff --git a/templates/basics/package.json b/templates/basics/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.16.15"
+    "astro": "^4.16.16"
   }
 }
diff --git a/templates/blog/package.json b/templates/blog/package.json
@@ -14,6 +14,6 @@
     "@astrojs/mdx": "^3.1.9",
     "@astrojs/rss": "^4.0.9",
     "@astrojs/sitemap": "^3.2.1",
-    "astro": "^4.16.15"
+    "astro": "^4.16.16"
   }
 }
diff --git a/templates/blog/src/components/HeaderLink.astro b/templates/blog/src/components/HeaderLink.astro
@@ -4,10 +4,9 @@ import type { HTMLAttributes } from 'astro/types';
 type Props = HTMLAttributes<'a'>;
 
 const { href, class: className, ...props } = Astro.props;
-
-const { pathname } = Astro.url;
+const pathname = Astro.url.pathname.replace(import.meta.env.BASE_URL, '');
 const subpath = pathname.match(/[^\/]+/g);
-const isActive = href === pathname || href === '/' + subpath?.[0];
+const isActive = href === pathname || href === '/' + (subpath?.[0] || '');
 ---
 
 <a href={href} class:list={[className, { active: isActive }]} {...props}>

diff --git a/templates/component/package.json b/templates/component/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.16.15"
+    "astro": "^4.16.16"
   },
   "peerDependencies": {
     "astro": "^4.0.0"

diff --git a/templates/container-with-vitest/package.json b/templates/container-with-vitest/package.json
@@ -12,11 +12,11 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "astro": "^4.16.15",
+    "astro": "^4.16.16",
     "@astrojs/react": "^3.6.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "vitest": "^2.1.4"
+    "vitest": "^2.1.6"
   },
   "devDependencies": {
     "@types/react": "^18.3.12",

diff --git a/templates/framework-alpine/package.json b/templates/framework-alpine/package.json
@@ -12,8 +12,8 @@
   },
   "dependencies": {
     "@astrojs/alpinejs": "^0.4.0",
-    "@types/alpinejs": "^3.13.10",
+    "@types/alpinejs": "^3.13.11",
     "alpinejs": "^3.14.3",
-    "astro": "^4.16.15"
+    "astro": "^4.16.16"
   }
 }
diff --git a/templates/framework-lit/package.json b/templates/framework-lit/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/lit": "^4.3.0",
     "@webcomponents/template-shadowroot": "^0.2.1",
-    "astro": "^4.16.15",
+    "astro": "^4.16.16",
     "lit": "^3.2.1"
   }
 }
diff --git a/templates/framework-multiple/package.json b/templates/framework-multiple/package.json
@@ -18,12 +18,12 @@
     "@astrojs/vue": "^4.5.3",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
-    "astro": "^4.16.15",
-    "preact": "^10.24.3",
+    "astro": "^4.16.16",
+    "preact": "^10.25.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "solid-js": "^1.9.3",
-    "svelte": "^5.1.16",
-    "vue": "^3.5.12"
+    "svelte": "^5.2.9",
+    "vue": "^3.5.13"
   }
 }
diff --git a/templates/framework-preact/package.json b/templates/framework-preact/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.5.4",
     "@preact/signals": "^1.3.0",
-    "astro": "^4.16.15",
-    "preact": "^10.24.3"
+    "astro": "^4.16.16",
+    "preact": "^10.25.0"
   }
 }
diff --git a/templates/framework-react/package.json b/templates/framework-react/package.json
@@ -14,7 +14,7 @@
     "@astrojs/react": "^3.6.3",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
-    "astro": "^4.16.15",
+    "astro": "^4.16.16",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   }

diff --git a/templates/framework-solid/package.json b/templates/framework-solid/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/solid-js": "^4.4.4",
-    "astro": "^4.16.15",
+    "astro": "^4.16.16",
     "solid-js": "^1.9.3"
   }
 }
diff --git a/templates/framework-svelte/package.json b/templates/framework-svelte/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/svelte": "^6.0.2",
-    "astro": "^4.16.15",
-    "svelte": "^5.1.16"
+    "astro": "^4.16.16",
+    "svelte": "^5.2.9"
   }
 }
diff --git a/templates/framework-vue/package.json b/templates/framework-vue/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/vue": "^4.5.3",
-    "astro": "^4.16.15",
-    "vue": "^3.5.12"
+    "astro": "^4.16.16",
+    "vue": "^3.5.13"
   }
 }
diff --git a/templates/hackernews/package.json b/templates/hackernews/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/node": "^8.3.4",
-    "astro": "^4.16.15"
+    "astro": "^4.16.16"
   }
 }
diff --git a/templates/integration/package.json b/templates/integration/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.16.15"
+    "astro": "^4.16.16"
   },
   "peerDependencies": {
     "astro": "^4.0.0"

diff --git a/templates/minimal/package.json b/templates/minimal/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.16.15"
+    "astro": "^4.16.16"
   }
 }
diff --git a/templates/portfolio/package.json b/templates/portfolio/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.16.15"
+    "astro": "^4.16.16"
   }
 }
diff --git a/templates/portfolio/src/components/Nav.astro b/templates/portfolio/src/components/Nav.astro
@@ -19,6 +19,14 @@ const iconLinks: { label: string; href: string; icon: keyof typeof iconPaths }[]
 	{ label: 'dribbble', href: 'https://dribbble.com/me', icon: 'dribbble-logo' },
 	{ label: 'YouTube', href: 'https://www.youtube.com/@me/', icon: 'youtube-logo' },
 ];
+
+/** Test if a link is pointing to the current page. */
+const isCurrentPage = (href: string) => {
+	let pathname = Astro.url.pathname.replace(import.meta.env.BASE_URL, '');
+	if (pathname.at(0) !== '/') pathname = '/' + pathname;
+	if (pathname.at(-1) !== '/') pathname += '/';
+	return pathname === href || (href !== '/' && pathname.startsWith(href));
+};
 ---
 
 <nav>
@@ -41,18 +49,7 @@ const iconLinks: { label: string; href: string; icon: keyof typeof iconPaths }[]
 			{
 				textLinks.map(({ label, href }) => (
 					<li>
-						<a
-							aria-current={Astro.url.pathname === href}
-							class:list={[
-								'link',
-								{
-									active:
-										Astro.url.pathname === href ||
-										(href !== '/' && Astro.url.pathname.startsWith(href)),
-								},
-							]}
-							href={href}
-						>
+						<a aria-current={isCurrentPage(href) ? 'page' : null} class="link" href={href}>
 							{label}
 						</a>
 					</li>
@@ -79,18 +76,7 @@ const iconLinks: { label: string; href: string; icon: keyof typeof iconPaths }[]
 			{
 				textLinks.map(({ label, href }) => (
 					<li>
-						<a
-							aria-current={Astro.url.pathname === href}
-							class:list={[
-								'link',
-								{
-									active:
-										Astro.url.pathname === href ||
-										(href !== '/' && Astro.url.pathname.startsWith(href)),
-								},
-							]}
-							href={href}
-						>
+						<a aria-current={isCurrentPage(href) ? 'page' : null} class="link" href={href}>
 							{label}
 						</a>
 					</li>
@@ -234,7 +220,7 @@ const iconLinks: { label: string; href: string; icon: keyof typeof iconPaths }[]
 		text-decoration: none;
 	}
 
-	.link.active {
+	.link[aria-current] {
 		color: var(--gray-0);
 	}
 
@@ -332,7 +318,7 @@ const iconLinks: { label: string; href: string; icon: keyof typeof iconPaths }[]
 			background-color: var(--accent-subtle-overlay);
 		}
 
-		.link.active {
+		.link[aria-current='page'] {
 			color: var(--accent-text-over);
 			background-color: var(--accent-regular);
 		}
@@ -360,7 +346,7 @@ const iconLinks: { label: string; href: string; icon: keyof typeof iconPaths }[]
 		}
 	}
 	@media (forced-colors: active) {
-		.link.active {
+		.link[aria-current='page'] {
 			color: SelectedItem;
 		}
 	}

diff --git a/templates/ssr/package.json b/templates/ssr/package.json
@@ -14,7 +14,7 @@
   "dependencies": {
     "@astrojs/node": "^8.3.4",
     "@astrojs/svelte": "^6.0.2",
-    "astro": "^4.16.15",
-    "svelte": "^5.1.16"
+    "astro": "^4.16.16",
+    "svelte": "^5.2.9"
   }
 }
diff --git a/templates/starlog/package.json b/templates/starlog/package.json
@@ -10,8 +10,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.16.15",
-    "sass": "^1.80.6",
+    "astro": "^4.16.16",
+    "sass": "^1.81.0",
     "sharp": "^0.33.3"
   }
 }
diff --git a/templates/toolbar-app/package.json b/templates/toolbar-app/package.json
@@ -15,7 +15,7 @@
     "./app": "./dist/app.js"
   },
   "devDependencies": {
-    "astro": "^4.16.15",
+    "astro": "^4.16.16",
     "@types/node": "^18.17.8"
   }
 }
diff --git a/templates/with-markdoc/package.json b/templates/with-markdoc/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/markdoc": "^0.11.5",
-    "astro": "^4.16.15"
+    "astro": "^4.16.16"
   }
 }
diff --git a/templates/with-mdx/package.json b/templates/with-mdx/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/mdx": "^3.1.9",
     "@astrojs/preact": "^3.5.4",
-    "astro": "^4.16.15",
-    "preact": "^10.24.3"
+    "astro": "^4.16.16",
+    "preact": "^10.25.0"
   }
 }
diff --git a/templates/with-nanostores/package.json b/templates/with-nanostores/package.json
@@ -13,8 +13,8 @@
   "dependencies": {
     "@astrojs/preact": "^3.5.4",
     "@nanostores/preact": "^0.5.2",
-    "astro": "^4.16.15",
+    "astro": "^4.16.16",
     "nanostores": "^0.11.3",
-    "preact": "^10.24.3"
+    "preact": "^10.25.0"
   }
 }
diff --git a/templates/with-nanostores/src/layouts/Layout.astro b/templates/with-nanostores/src/layouts/Layout.astro
@@ -1,6 +1,7 @@
 ---
 import CartFlyout from '../components/CartFlyout';
 import CartFlyoutToggle from '../components/CartFlyoutToggle';
+import { withBase } from '../utils';
 
 interface Props {
 	title: string;
@@ -15,15 +16,15 @@ const { title } = Astro.props;
 		<meta charset="UTF-8" />
 		<meta name="viewport" content="width=device-width" />
 		<meta name="generator" content={Astro.generator} />
-		<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+		<link rel="icon" type="image/svg+xml" href={withBase('/favicon.svg')} />
 		<title>{title}</title>
 	</head>
 	<body>
 		<header>
 			<nav>
-				<a href="/" class="nav-header"
-					><span style="color: var(--astro-blue)">Astro</span> storefront</a
-				>
+				<a href={withBase('/')} class="nav-header">
+					<span style="color: var(--astro-blue)">Astro</span> storefront
+				</a>
 				<CartFlyoutToggle client:load />
 			</nav>
 		</header>

diff --git a/templates/with-nanostores/src/pages/index.astro b/templates/with-nanostores/src/pages/index.astro
@@ -3,11 +3,12 @@ import type { CartItemDisplayInfo } from '../cartStore';
 import Layout from '../layouts/Layout.astro';
 import AddToCartForm from '../components/AddToCartForm';
 import FigurineDescription from '../components/FigurineDescription.astro';
+import { withBase } from '../utils';
 
 const item: CartItemDisplayInfo = {
 	id: 'astronaut-figurine',
 	name: 'Astronaut Figurine',
-	imageSrc: '/images/astronaut-figurine.png',
+	imageSrc: withBase('/images/astronaut-figurine.png'),
 };
 ---
 

diff --git a/templates/with-nanostores/src/utils.ts b/templates/with-nanostores/src/utils.ts
@@ -0,0 +1,4 @@
+const base = import.meta.env.BASE_URL.replace(/\/$/, '');
+
+/** Prefix a URL path with the site’s base path if set. */
+export const withBase = (path: string) => base + path;
diff --git a/templates/with-tailwindcss/package.json b/templates/with-tailwindcss/package.json
@@ -14,10 +14,10 @@
     "@astrojs/mdx": "^3.1.9",
     "@astrojs/tailwind": "^5.1.2",
     "@types/canvas-confetti": "^1.6.4",
-    "astro": "^4.16.15",
+    "astro": "^4.16.16",
     "autoprefixer": "^10.4.20",
     "canvas-confetti": "^1.9.3",
-    "postcss": "^8.4.47",
-    "tailwindcss": "^3.4.14"
+    "postcss": "^8.4.49",
+    "tailwindcss": "^3.4.15"
   }
 }
diff --git a/templates/with-vitest/package.json b/templates/with-vitest/package.json
@@ -12,7 +12,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "astro": "^4.16.15",
-    "vitest": "^2.1.4"
+    "astro": "^4.16.16",
+    "vitest": "^2.1.6"
   }
 }