blume 0.1.2 → 0.1.4

package/dist/cli/index.js

@@ -2716,6 +2716,11 @@ var uiStringsObject = z.object({
     label: z.string().default("Language"),
     untranslated: z.string().default("Not translated")
   }).default({}),
+  notFound: z.object({
+    description: z.string().default("We couldn't find the page you're looking for."),
+    home: z.string().default("Back to home"),
+    title: z.string().default("Page not found")
+  }).default({}),
   page: z.object({
     lastUpdated: z.string().default("Last updated on"),
     next: z.string().default("Next"),
@@ -4035,6 +4040,44 @@ const canonical = base ? base + "/changelog" : null;
 </RootLayout>
 `;
 };
+var notFoundPageTemplate = () => `---
+// Generated by Blume. Do not edit. Override by adding \`pages/404.astro\`.
+import PageLayout from "blume/components/layout/PageLayout.astro";
+import data from "../generated/data.json";
+
+export const prerender = true;
+
+const nf = data.ui.notFound;
+---
+
+<PageLayout
+  site={{ title: data.config.title, description: data.config.description }}
+  logo={data.config.logo}
+  favicon={data.config.favicon}
+  appleIcon={data.config.appleIcon}
+  banner={data.config.banner}
+  analytics={data.config.analytics}
+  navigation={data.navigation}
+  page={{ title: nf.title, route: "/404" }}
+  themeMode={data.config.theme.mode}
+  fontCssVars={data.fontCssVars}
+  searchEnabled={data.config.search.enabled}
+  ui={data.ui}
+  noindex={true}
+>
+  <div
+    class="mx-auto flex min-h-[60vh] max-w-2xl flex-col items-center justify-center gap-4 px-6 py-24 text-center"
+  >
+    <p class="text-6xl font-bold text-muted-foreground">404</p>
+    <h1 class="text-2xl font-semibold text-foreground">{nf.title}</h1>
+    <p class="text-muted-foreground">{nf.description}</p>
+    <a
+      class="mt-2 rounded-md bg-accent px-4 py-2 text-sm font-medium text-accent-foreground"
+      href="/">{nf.home}</a
+    >
+  </div>
+</PageLayout>
+`;
 var userComponentsTemplate = (componentsFile) => {
   if (!componentsFile) {
     return `// Generated by Blume. Do not edit.
@@ -5112,9 +5155,23 @@ var FRAMEWORK_BY_EXT2 = {
   vue: "vue"
 };
 var EXAMPLE_FILE = /\.(?<ext>astro|jsx|svelte|tsx|vue)$/u;
-var discoverExamples = async (root, subdir = "examples") => {
-  const dir = join10(root, subdir);
-  const matches = await glob2(["**/*.{astro,jsx,svelte,tsx,vue}"], {
+var DEFAULT_EXAMPLE_GLOB = "**/*.{astro,jsx,svelte,tsx,vue}";
+var GLOB_MAGIC = /[!*?[\]{}]/u;
+var splitGlobBase = (pattern) => {
+  const segments = pattern.split("/");
+  const firstMagic = segments.findIndex((segment) => GLOB_MAGIC.test(segment));
+  if (firstMagic === -1) {
+    return { base: pattern, rest: "" };
+  }
+  return {
+    base: segments.slice(0, firstMagic).join("/"),
+    rest: segments.slice(firstMagic).join("/")
+  };
+};
+var discoverExamples = async (root, pattern = "examples") => {
+  const { base, rest } = GLOB_MAGIC.test(pattern) ? splitGlobBase(pattern) : { base: pattern, rest: DEFAULT_EXAMPLE_GLOB };
+  const dir = join10(root, base);
+  const matches = await glob2([rest], {
     absolute: true,
     cwd: dir,
     onlyFiles: true
@@ -5168,6 +5225,7 @@ var discoverPages = async (pagesRoot) => {
     return { entrypoint: file, pattern };
   });
 };
+var routeIsTaken = (pages, contentPages, route) => pages.some((page) => page.pattern === route) || contentPages.some((page) => page.route === route);
 var PRIVATE_SEGMENT = /^[._]/u;
 var humanizeSegment = (segment) => segment.split(/[-_]/u).filter(Boolean).map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(" ");
 var customOgRoutes = (pages, siteTitle, siteDescription) => {
@@ -5579,6 +5637,12 @@ var writeMcpFiles = async (project, plan, write) => {
     write(join11(plan.dir, "server-card.ts"), staticJsonEndpointTemplate(buildMcpServerCard(discoveryInput)))
   ]);
 };
+var writeNotFoundPage = async (write, srcDir, pages, contentPages) => {
+  if (routeIsTaken(pages, contentPages, "/404")) {
+    return;
+  }
+  await write(join11(srcDir, "pages", "404.astro"), notFoundPageTemplate());
+};
 var generateRuntime = async (project) => {
   const { context, config } = project;
   const out = context.outDir;
@@ -5667,6 +5731,7 @@ var generateRuntime = async (project) => {
   if (hasChangelog && !changelogRouteTaken) {
     await write(join11(srcDir, "pages", "changelog.astro"), changelogIndexTemplate({ askEnabled, exportEpub, exportPdf }));
   }
+  await writeNotFoundPage(write, srcDir, pages, project.graph.pages);
   await write(searchClientPath, searchClientTemplate(config));
   if (servesStaticIndex(config.search.provider)) {
     const documents = await buildSearchDocuments(project);
@@ -5700,7 +5765,7 @@ var generateRuntime = async (project) => {
     ...exampleDiscovery.warnings
   ];
   for (const dep of searchProviderMeta(config.search.provider).runtimeDeps) {
-    if (!canResolveFrom(context.root, dep)) {
+    if (!(canResolveFrom(context.root, dep) || canResolveFrom(packageRoot(), dep))) {
       warnings.push(`Search provider "${config.search.provider}" needs "${dep}", which isn't installed. Run \`npm install ${dep}\` (or your package manager's equivalent).`);
     }
   }
@@ -7352,7 +7417,8 @@ var toNavNode = (node) => {
     display: node.display,
     icon: node.icon,
     kind: "group",
-    label: node.label
+    label: node.label,
+    path: node.routePath
   };
 };
 var buildFileSystemSidebar = (pages, folderMeta, sharedMeta, metaPrefix) => {
@@ -7364,9 +7430,12 @@ var buildFileSystemSidebar = (pages, folderMeta, sharedMeta, metaPrefix) => {
     const parts = page.navPath.split("/");
     const filename = parts.at(-1) ?? page.navPath;
     const dirs = parts.slice(0, -1);
+    const folderParts = page.route.split("/").filter(Boolean).slice(0, -1);
+    const offset = Math.max(0, folderParts.length - dirs.length);
     let parent = root;
-    for (const dir of dirs) {
+    for (const [index, dir] of dirs.entries()) {
       parent = ensureGroup(parent, dir);
+      parent.routePath ??= `/${folderParts.slice(0, offset + index + 1).join("/")}`;
     }
     parent.children.push({
       badge: page.meta.sidebar.badge,
@@ -10064,7 +10133,7 @@ var eject = async (root) => {
     context.themeFile ? readFile14(context.themeFile, "utf-8") : Promise.resolve(""),
     buildRawMarkdown(project),
     discoverIslands(root),
-    discoverExamples(root)
+    discoverExamples(root, config.examples)
   ]);
   const frameworks = new Set([
     ...islands.islands.map((island) => island.framework),
@@ -10178,6 +10247,12 @@ var eject = async (root) => {
       path: join24(srcDir, "pages", "og", "[...slug].png.ts")
     });
   }
+  if (!routeIsTaken(pages, project.graph.pages, "/404")) {
+    files.push({
+      content: notFoundPageTemplate(),
+      path: join24(srcDir, "pages", "404.astro")
+    });
+  }
   files.push({
     content: searchClientTemplate(config),
     path: join24(genDir, "search-client.ts")
@@ -12725,5 +12800,5 @@ var main = defineCommand11({
 });
 runMain(main);
 
-//# debugId=C5E764B7F3B6157B64756E2164756E21
+//# debugId=A553178EDDFDE46E64756E2164756E21
 //# sourceMappingURL=index.js.map