@rm-industries/create-forge 0.4.0-beta.1 → 0.4.0-beta.3

package/dist/template/package.json

@@ -41,7 +41,7 @@
     "@fontsource/fira-sans": "^5.3.0",
     "@rm-industries/content-model": "0.2.0-alpha.0",
     "@sveltia/cms": "0.203.2",
-    "astro": "^7.2.3"
+    "astro": "^7.2.9"
   },
   "devDependencies": {
     "@astrojs/check": "^0.9.10",
@@ -55,10 +55,10 @@
     "@vitest/coverage-v8": "^4.1.11",
     "audit-ci": "7.1.0",
     "cspell": "^10.0.1",
-    "daisyui": "^5.7.18",
+    "daisyui": "^5.7.22",
     "knip": "^6.33.0",
     "markdownlint-cli": "^0.49.0",
-    "oxfmt": "^0.63.0",
+    "oxfmt": "^0.65.0",
     "oxlint": "^1.72.0",
     "stylelint": "^17.14.1",
     "stylelint-config-standard": "^40.0.0",

package/dist/template/src/components/navigation/Footer.astro

@@ -1,6 +1,7 @@
 ---
 import { site } from '../../config/site';
 import { isExternalHref } from '../../lib/navigation';
+import { resolveSiteHref } from '../../lib/paths';
 import Container from '../ui/Container.astro';
 ---
 
@@ -18,7 +19,7 @@ import Container from '../ui/Container.astro';
           <h2>Elsewhere</h2>
           {site.socialLinks.map((item) => (
             <a
-              href={item.href}
+              href={resolveSiteHref(item.href)}
               class="link link-hover"
               target={isExternalHref(item.href) ? '_blank' : undefined}
               rel={isExternalHref(item.href) ? 'noopener noreferrer' : undefined}

package/dist/template/src/components/navigation/Navbar.astro

@@ -1,6 +1,7 @@
 ---
 import type { SiteLink } from '../../config/site';
 import { isCurrentPath } from '../../lib/navigation';
+import { resolveSiteHref } from '../../lib/paths';
 
 interface Props {
   brand: string;
@@ -10,22 +11,24 @@ interface Props {
 }
 
 const { brand, brandHref = '/', links, currentPath } = Astro.props;
+const resolvedBrandHref = resolveSiteHref(brandHref);
 ---
 
 <div class="navbar rounded-box bg-base-200 shadow-sm">
   <div class="navbar-start">
-    <a href={brandHref} class="btn btn-ghost text-xl">{brand}</a>
+    <a href={resolvedBrandHref} class="btn btn-ghost text-xl">{brand}</a>
   </div>
 
   <nav class="navbar-end hidden sm:flex" aria-label="Primary navigation">
     <ul class="menu menu-horizontal" role="list">
       {
         links.map((item) => {
-          const isCurrent = isCurrentPath(currentPath, item.href);
+          const href = resolveSiteHref(item.href);
+          const isCurrent = isCurrentPath(currentPath, href);
 
           return (
             <li>
-              <a href={item.href} aria-current={isCurrent ? 'page' : undefined} class:list={[isCurrent && 'menu-active']}>
+              <a {href} aria-current={isCurrent ? 'page' : undefined} class:list={[isCurrent && 'menu-active']}>
                 {item.label}
               </a>
             </li>
@@ -42,11 +45,12 @@ const { brand, brandHref = '/', links, currentPath } = Astro.props;
         <ul class="menu" role="list">
           {
             links.map((item) => {
-              const isCurrent = isCurrentPath(currentPath, item.href);
+              const href = resolveSiteHref(item.href);
+              const isCurrent = isCurrentPath(currentPath, href);
 
               return (
                 <li>
-                  <a href={item.href} aria-current={isCurrent ? 'page' : undefined} class:list={[isCurrent && 'menu-active']}>
+                  <a {href} aria-current={isCurrent ? 'page' : undefined} class:list={[isCurrent && 'menu-active']}>
                     {item.label}
                   </a>
                 </li>

package/dist/template/src/components/navigation/Pagination.astro

@@ -1,4 +1,6 @@
 ---
+import { resolveSiteHref } from '../../lib/paths';
+
 interface PaginationLink {
   href: string;
   label: string;
@@ -16,7 +18,7 @@ const { previous, next, label = 'Pagination' } = Astro.props;
 <nav aria-label={label} class="join grid grid-cols-2">
   {
     previous ? (
-      <a href={previous.href} rel="prev" class="btn btn-outline join-item">
+      <a href={resolveSiteHref(previous.href)} rel="prev" class="btn btn-outline join-item">
         <span aria-hidden="true">←</span>
         <span>{previous.label}</span>
       </a>
@@ -26,7 +28,7 @@ const { previous, next, label = 'Pagination' } = Astro.props;
   }
   {
     next ? (
-      <a href={next.href} rel="next" class="btn btn-outline join-item">
+      <a href={resolveSiteHref(next.href)} rel="next" class="btn btn-outline join-item">
         <span>{next.label}</span>
         <span aria-hidden="true">→</span>
       </a>

package/dist/template/src/components/seo/SeoHead.astro

@@ -1,5 +1,6 @@
 ---
 import { site } from '../../config/site';
+import { resolveSiteHref } from '../../lib/paths';
 
 interface Props {
   title?: string;
@@ -21,18 +22,18 @@ const normalizedPath = (() => {
   const path = `/${canonicalPath}`.replace(/\/{2,}/g, '/');
   return path === '/' ? path : `${path.replace(/\/$/, '')}/`;
 })();
-const canonicalUrl = new URL(normalizedPath, site.url);
+const canonicalUrl = new URL(resolveSiteHref(normalizedPath), new URL(site.url).origin);
 const pageTitle = title ? `${title} | ${site.name}` : site.name;
-const socialImageUrl = new URL(site.socialImage, site.url);
+const socialImageUrl = new URL(resolveSiteHref(site.socialImage), new URL(site.url).origin);
 ---
 
 <title>{pageTitle}</title>
 <meta name="description" content={description} />
 <link rel="canonical" href={canonicalUrl} />
-<link rel="sitemap" href="/sitemap-index.xml" />
-<link rel="alternate" type="application/rss+xml" title={`${site.name} RSS feed`} href="/rss.xml" />
-<link rel="icon" href="/favicon.svg" type="image/svg+xml" />
-<link rel="manifest" href="/site.webmanifest" />
+<link rel="sitemap" href={resolveSiteHref('/sitemap-index.xml')} />
+<link rel="alternate" type="application/rss+xml" title={`${site.name} RSS feed`} href={resolveSiteHref('/rss.xml')} />
+<link rel="icon" href={resolveSiteHref('/favicon.svg')} type="image/svg+xml" />
+<link rel="manifest" href={resolveSiteHref('/site.webmanifest')} />
 
 <meta property="og:site_name" content={site.name} />
 <meta property="og:title" content={pageTitle} />

package/dist/template/src/components/ui/Card.astro

@@ -1,4 +1,6 @@
 ---
+import { resolveSiteHref } from '../../lib/paths';
+
 interface Props {
   class?: string;
   href?: string;
@@ -7,11 +9,12 @@ interface Props {
 
 const { class: className, href, size = 'md' } = Astro.props;
 const classes = ['card bg-base-200', `card-${size}`, className];
+const resolvedHref = href ? resolveSiteHref(href) : undefined;
 ---
 
 {
-  href ? (
-    <a href={href} class:list={classes}>
+  resolvedHref ? (
+    <a href={resolvedHref} class:list={classes}>
       <div class="card-body">
         <slot />
       </div>

package/dist/template/src/config/deployment.test.ts

@@ -0,0 +1,16 @@
+import { describe, expect, it } from 'vitest';
+
+import { getDeploymentConfig } from './deployment';
+
+describe('getDeploymentConfig', () => {
+  it('configures a root deployment from an origin-only canonical URL', () => {
+    expect(getDeploymentConfig('https://example.com/')).toEqual({ base: undefined, site: 'https://example.com' });
+  });
+
+  it('configures a project deployment from a canonical URL pathname', () => {
+    expect(getDeploymentConfig('https://owner.github.io/project/')).toEqual({
+      base: '/project',
+      site: 'https://owner.github.io',
+    });
+  });
+});

package/dist/template/src/config/deployment.ts

@@ -0,0 +1,14 @@
+export interface DeploymentConfig {
+  base: string | undefined;
+  site: string;
+}
+
+/** Derive Astro's origin and optional project path from the canonical site URL. */
+export const getDeploymentConfig = (siteUrl: string): DeploymentConfig => {
+  const canonicalUrl = new URL(siteUrl);
+
+  return {
+    base: canonicalUrl.pathname === '/' ? undefined : canonicalUrl.pathname.replace(/\/$/, ''),
+    site: canonicalUrl.origin,
+  };
+};

package/dist/template/src/integrations/sveltia/config.ts

@@ -3,11 +3,12 @@ import type { CmsConfig } from '@sveltia/cms';
 
 import { contentModels } from '../../config/content-models/registry.ts';
 import { cmsBranding } from '../../config/site.ts';
+import { resolveSiteHref } from '../../lib/paths.ts';
 
 export const sveltiaConfig = {
   load_config_file: false,
   app_title: cmsBranding.appTitle,
-  logo: { src: '/favicon.svg' },
+  logo: { src: resolveSiteHref('/favicon.svg') },
   backend: {
     name: 'github',
     repo: 'your-github-user/your-repository',
@@ -22,7 +23,7 @@ export const sveltiaConfig = {
     },
   },
   media_folder: 'public/assets',
-  public_folder: '/assets',
+  public_folder: resolveSiteHref('/assets'),
   output: { omit_empty_optional_fields: true },
   collections: contentModels.map(createSveltiaCollection),
 } satisfies CmsConfig;

package/dist/template/src/lib/paths.test.ts

@@ -0,0 +1,26 @@
+import { describe, expect, it } from 'vitest';
+
+import { resolveSiteHref } from './paths';
+
+describe('resolveSiteHref', () => {
+  it('keeps root-relative URLs unchanged for root deployments', () => {
+    expect(resolveSiteHref('/articles/', '/')).toBe('/articles/');
+  });
+
+  it('prefixes root-relative URLs for project deployments', () => {
+    expect(resolveSiteHref('/articles/', '/forge/')).toBe('/forge/articles/');
+    expect(resolveSiteHref('/articles/', 'forge')).toBe('/forge/articles/');
+  });
+
+  it('does not prefix an existing deployment base', () => {
+    expect(resolveSiteHref('/forge/articles/', '/forge/')).toBe('/forge/articles/');
+    expect(resolveSiteHref('/forge', '/forge/')).toBe('/forge');
+  });
+
+  it.each(['https://example.com', '//cdn.example.com/file.svg', '#content', 'mailto:hello@example.com'])(
+    'keeps non-local URL %s unchanged',
+    (href) => {
+      expect(resolveSiteHref(href, '/forge/')).toBe(href);
+    },
+  );
+});

package/dist/template/src/lib/paths.ts

@@ -0,0 +1,17 @@
+const normalizeBase = (base: string): string => {
+  const withLeadingSlash = base.startsWith('/') ? base : `/${base}`;
+
+  if (withLeadingSlash === '/') return withLeadingSlash;
+
+  return withLeadingSlash.replace(/\/+$/, '');
+};
+
+/** Prefix a root-relative URL with Astro's deployment base path. */
+export const resolveSiteHref = (href: string, base = import.meta.env.BASE_URL): string => {
+  if (!href.startsWith('/') || href.startsWith('//')) return href;
+
+  const normalizedBase = normalizeBase(base);
+  if (normalizedBase === '/' || href === normalizedBase || href.startsWith(`${normalizedBase}/`)) return href;
+
+  return `${normalizedBase}${href}`;
+};

package/dist/template/src/pages/404.astro

@@ -1,6 +1,7 @@
 ---
 import Container from '../components/ui/Container.astro';
 import BaseLayout from '../layouts/BaseLayout.astro';
+import { resolveSiteHref } from '../lib/paths';
 ---
 
 <BaseLayout title="Page not found" description="The requested page could not be found." canonicalPath="/404/">
@@ -10,7 +11,7 @@ import BaseLayout from '../layouts/BaseLayout.astro';
         <div class="badge badge-outline">404</div>
         <h1 class="text-4xl font-bold">That page is not here.</h1>
         <p>The address may have changed, or the page may no longer exist.</p>
-        <a href="/" class="btn btn-primary">Return home</a>
+        <a href={resolveSiteHref('/')} class="btn btn-primary">Return home</a>
       </div>
     </section>
   </Container>

package/dist/template/src/pages/about.astro

@@ -1,6 +1,7 @@
 ---
 import Container from '../components/ui/Container.astro';
 import BaseLayout from '../layouts/BaseLayout.astro';
+import { resolveSiteHref } from '../lib/paths';
 ---
 
 <BaseLayout title="About" description="Learn how this generic Forge starter is structured and how to make it your own.">
@@ -16,7 +17,10 @@ import BaseLayout from '../layouts/BaseLayout.astro';
       <h2>What is already connected</h2>
       <p>Semantic navigation, responsive layout primitives, local fonts, theme-aware styling, canonical metadata, a sitemap, an RSS feed, and automated accessibility checks are ready to extend.</p>
 
-      <p><a href="/articles/">Explore the example articles</a> or return to the <a href="/">homepage</a>.</p>
+      <p>
+        <a href={resolveSiteHref('/articles/')}>Explore the example articles</a> or return to the
+        <a href={resolveSiteHref('/')}>homepage</a>.
+      </p>
     </article>
   </Container>
 </BaseLayout>

package/dist/template/src/pages/index.astro

@@ -3,6 +3,7 @@ import BaseLayout from '../layouts/BaseLayout.astro';
 import { site } from '../config/site';
 import Card from '../components/ui/Card.astro';
 import Container from '../components/ui/Container.astro';
+import { resolveSiteHref } from '../lib/paths';
 ---
 
 <BaseLayout>
@@ -14,8 +15,8 @@ import Container from '../components/ui/Container.astro';
           <h1 class="text-5xl font-bold tracking-tight sm:text-6xl">Build something worth publishing.</h1>
           <p class="text-lg">{site.description} Start with accessible components, typed configuration, and a theme system that works without client JavaScript.</p>
           <div class="flex flex-wrap justify-center gap-3">
-            <a href="/articles/" class="btn btn-primary">Read the examples</a>
-            <a href="/about/" class="btn btn-ghost">About this starter</a>
+            <a href={resolveSiteHref('/articles/')} class="btn btn-primary">Read the examples</a>
+            <a href={resolveSiteHref('/about/')} class="btn btn-ghost">About this starter</a>
           </div>
         </div>
       </div>
@@ -56,7 +57,7 @@ import Container from '../components/ui/Container.astro';
         <h2 id="start-title" class="card-title text-3xl">Replace the examples with your own story.</h2>
         <p>Update the typed site configuration, choose your content model, and grow the template one reusable piece at a time.</p>
         <div class="card-actions">
-          <a href="/articles/" class="btn">Browse the articles</a>
+          <a href={resolveSiteHref('/articles/')} class="btn">Browse the articles</a>
         </div>
       </div>
     </section>

package/dist/template/src/pages/rss.xml.ts

@@ -2,6 +2,7 @@ import rss from '@astrojs/rss';
 
 import { site } from '../config/site';
 import { getArticles } from '../lib/articles';
+import { resolveSiteHref } from '../lib/paths';
 
 export const GET = async () =>
   rss({
@@ -11,7 +12,7 @@ export const GET = async () =>
     items: (await getArticles()).map((article) => ({
       title: article.data.title,
       description: article.data.description,
-      link: `/articles/${article.id}/`,
+      link: resolveSiteHref(`/articles/${article.id}/`),
       pubDate: article.data.publishedAt,
     })),
   });

package/dist/template/src/pages/site.webmanifest.ts

@@ -1,6 +1,7 @@
 import type { APIRoute } from 'astro';
 
 import { site } from '../config/site';
+import { resolveSiteHref } from '../lib/paths';
 import { darkThemeColor } from '../themes/site-theme';
 
 export const GET: APIRoute = () =>
@@ -9,11 +10,11 @@ export const GET: APIRoute = () =>
       name: site.name,
       short_name: site.name,
       description: site.description,
-      start_url: '/',
+      start_url: resolveSiteHref('/'),
       display: 'standalone',
       background_color: darkThemeColor,
       theme_color: darkThemeColor,
-      icons: [{ src: '/favicon.svg', sizes: 'any', type: 'image/svg+xml' }],
+      icons: [{ src: resolveSiteHref('/favicon.svg'), sizes: 'any', type: 'image/svg+xml' }],
     }),
     { headers: { 'Content-Type': 'application/manifest+json' } },
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rm-industries/create-forge",
-  "version": "0.4.0-beta.1",
+  "version": "0.4.0-beta.3",
   "description": "Create a content-driven Forge website",
   "keywords": [
     "astro",
@@ -19,7 +19,7 @@
     "directory": "packages/create-forge"
   },
   "bin": {
-    "create-forge": "./dist/index.mjs"
+    "create-forge": "dist/index.mjs"
   },
   "files": [
     "dist"
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.7.0",
-    "commander": "^14.0.3",
+    "commander": "^15.0.0",
     "validate-npm-package-name": "^8.0.0"
   },
   "devDependencies": {