blume 0.1.1 → 0.1.3

package/dist/cli/index.js

@@ -2526,7 +2526,7 @@ import {
 } from "node:fs/promises";
 import { createRequire as createRequire4 } from "node:module";
 import { pathToFileURL as pathToFileURL2 } from "node:url";
-import { dirname as dirname6, join as join11, normalize, relative as relative5 } from "pathe";
+import { basename as basename2, dirname as dirname6, join as join11, normalize, relative as relative5 } from "pathe";
 import { glob as glob4 } from "tinyglobby";
 
 // src/ai/ask.ts
@@ -3212,6 +3212,18 @@ var runtimeDependencies = (options) => {
   }
   return deps;
 };
+var RENDER_EXTERNAL_DEPS = [
+  "@astrojs/markdown-satteri",
+  "@pierre/diffs",
+  "@shikijs/transformers",
+  "@takumi-rs/core",
+  "@takumi-rs/helpers",
+  "github-slugger",
+  "katex",
+  "shiki",
+  "simple-icons",
+  "zod"
+];
 var renderUserAliases = (aliases) => Object.entries(aliases ?? {}).toSorted(([a], [b]) => b.length - a.length).map(([find, replacement]) => `
         ${JSON.stringify(find)}: ${JSON.stringify(replacement)},`).join("");
 var astroConfigTemplate = (options) => {
@@ -3259,7 +3271,7 @@ var astroConfigTemplate = (options) => {
 ` : "";
   const svelteImport = needsSvelte ? `import svelte from "@astrojs/svelte";
 ` : "";
-  const blumeImport = `import { blumeIntegration } from "blume/astro";
+  const blumeImport = `import { blumeIntegration, prerenderDepsPlugin } from "blume/astro";
 `;
   const twoslashImport = `import { transformerTwoslash } from "@shikijs/twoslash";
 `;
@@ -3310,19 +3322,14 @@ export default defineConfig({
   },
   devToolbar: { enabled: false },
   vite: {
-    plugins: [tailwindcss()],
-    // @takumi-rs/core (OG image rendering) is a native NAPI addon that loads a
-    // platform-specific .node binding via createRequire(import.meta.url). Astro's
-    // build bundles it into the per-environment output by default, which
-    // relocates import.meta.url and breaks the binding lookup ("Cannot find
-    // native binding") on other platforms (e.g. the Linux CI runner). Astro 7
-    // configures externalization per Vite environment, so it must be forced
-    // external on the prerender (static) and ssr (server) environments -- a
-    // top-level ssr.external only reaches the latter -- so the binding resolves
-    // from node_modules at runtime instead.
+    plugins: [tailwindcss(), prerenderDepsPlugin()],
+    // Blume's render-time deps are forced external on both build environments so
+    // native bindings resolve at runtime and isolated linkers don't bundle
+    // symlinked store copies (which would surface their children as unresolvable
+    // imports). See RENDER_EXTERNAL_DEPS / prerenderDepsPlugin.
     environments: {
-      prerender: { resolve: { external: ["@takumi-rs/core"] } },
-      ssr: { resolve: { external: ["@takumi-rs/core"] } },
+      prerender: { resolve: { external: ${JSON.stringify(RENDER_EXTERNAL_DEPS)} } },
+      ssr: { resolve: { external: ${JSON.stringify(RENDER_EXTERNAL_DEPS)} } },
     },
     resolve: {
       alias: {
@@ -5105,9 +5112,23 @@ var FRAMEWORK_BY_EXT2 = {
   vue: "vue"
 };
 var EXAMPLE_FILE = /\.(?<ext>astro|jsx|svelte|tsx|vue)$/u;
-var discoverExamples = async (root) => {
-  const dir = join10(root, "examples");
-  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
@@ -5204,16 +5225,7 @@ var blumeDepsDir = (pkgDir = packageRoot()) => {
   const candidates = [join11(pkgDir, "node_modules"), dirname6(pkgDir)];
   return candidates.find((dir) => existsSync5(join11(dir, "astro"))) ?? null;
 };
-var ensureDepsLink = async (outDir, pkgDir = packageRoot()) => {
-  const depsDir = blumeDepsDir(pkgDir);
-  if (!depsDir || !existsSync5(join11(depsDir, "@astrojs", "mdx"))) {
-    return;
-  }
-  const blumeAstro = resolvedAstroPath(depsDir);
-  if (blumeAstro && resolvedAstroPath(outDir) === blumeAstro) {
-    return;
-  }
-  const link = join11(outDir, "node_modules");
+var linkDepsJunction = async (link, depsDir) => {
   const existing = await lstat(link).catch(() => null);
   if (existing) {
     if (!existing.isSymbolicLink()) {
@@ -5221,9 +5233,42 @@ var ensureDepsLink = async (outDir, pkgDir = packageRoot()) => {
     }
     await rm(link, { force: true });
   }
-  await mkdir2(outDir, { recursive: true });
+  await mkdir2(dirname6(link), { recursive: true });
   await symlink(depsDir, link, "junction");
 };
+var readPkgVersion = (pkgJsonPath) => {
+  if (!pkgJsonPath) {
+    return null;
+  }
+  try {
+    return JSON.parse(readFileSync5(pkgJsonPath, "utf-8")).version ?? null;
+  } catch {
+    return null;
+  }
+};
+var astroConflictWarning = (blumeAstroPkg, shadowAstroPkg) => {
+  const blume = readPkgVersion(blumeAstroPkg);
+  const shadow = readPkgVersion(shadowAstroPkg);
+  const versions = blume && shadow ? `astro@${shadow} shadowing Blume's astro@${blume}` : "a second copy of Astro shadowing Blume's";
+  const pin = blume ?? "<Blume's astro version>";
+  return `Astro version conflict: another dependency hoisted ${versions} to the project root, so @astrojs/mdx binds to the wrong copy and the build fails on a missing export (e.g. "chunkToString"). A single symlink can't reconcile a split install — pin Blume's Astro by adding a package.json "overrides" (npm/bun/pnpm) or "resolutions" (yarn) entry { "astro": "${pin}" }, then reinstall. Run \`npm ls astro\` to find the dependency pulling the older copy.`;
+};
+var ensureDepsLink = async (outDir, pkgDir = packageRoot()) => {
+  const depsDir = blumeDepsDir(pkgDir);
+  if (!depsDir) {
+    return null;
+  }
+  const blumeAstro = resolvedAstroPath(depsDir);
+  const outDirAstro = resolvedAstroPath(outDir);
+  if (blumeAstro && outDirAstro === blumeAstro) {
+    return null;
+  }
+  if (existsSync5(join11(depsDir, "@astrojs", "mdx"))) {
+    await linkDepsJunction(join11(outDir, "node_modules"), depsDir);
+    return null;
+  }
+  return astroConflictWarning(blumeAstro, outDirAstro);
+};
 var ISLAND_FRAMEWORK_DEPS = {
   svelte: "@astrojs/svelte",
   vue: "@astrojs/vue"
@@ -5561,7 +5606,7 @@ var generateRuntime = async (project) => {
     written.add(normalize(path));
     return writeIfChanged(path, content);
   };
-  await ensureDepsLink(out);
+  const depsLinkWarning = await ensureDepsLink(out);
   const askEnabled = config.ai.ask?.enabled ?? false;
   const exportPdf = config.export.pdf;
   const exportEpub = config.export.epub;
@@ -5570,7 +5615,7 @@ var generateRuntime = async (project) => {
     detectNeedsReact(context.root),
     readOptional(context.themeFile),
     discoverIslands(context.root),
-    discoverExamples(context.root)
+    discoverExamples(context.root, config.examples)
   ]);
   const frameworks = new Set([
     ...islandDiscovery.islands.map((island) => island.framework),
@@ -5663,12 +5708,13 @@ var generateRuntime = async (project) => {
     ]);
   }
   const warnings = [
+    ...depsLinkWarning ? [depsLinkWarning] : [],
     ...mcp.warnings,
     ...islandDiscovery.warnings,
     ...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).`);
     }
   }
@@ -7139,6 +7185,7 @@ var blumeConfigSchema = z2.object({
   contextual: contextualConfigSchema.default({}),
   deployment: deploymentConfigSchema.default({}),
   description: z2.string().optional(),
+  examples: z2.string().default("examples"),
   export: exportConfigSchema.default(false),
   favicon: faviconConfigSchema.optional(),
   feedback: z2.boolean().default(true),
@@ -7602,7 +7649,7 @@ var gitLastModifiedTimes = (root, contentRoot, sourcePaths) => {
 };
 
 // src/core/meta.ts
-import { basename as basename2, dirname as dirname8, relative as relative8 } from "pathe";
+import { basename as basename3, dirname as dirname8, relative as relative8 } from "pathe";
 import { glob as glob5 } from "tinyglobby";
 var META_FILES = [
   "**/meta.ts",
@@ -7644,7 +7691,7 @@ var discoverFolderMeta = async (contentRoot) => {
     }
     const result = folderMetaSchema.safeParse(entry.value);
     if (result.success) {
-      const target = basename2(entry.file).startsWith("meta.$.") ? shared : meta;
+      const target = basename3(entry.file).startsWith("meta.$.") ? shared : meta;
       target.set(dir, result.data);
     } else {
       diagnostics.push(...diagnosticsFromZod(result.error, {
@@ -10031,7 +10078,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),
@@ -10269,7 +10316,7 @@ The blume package remains importable.`);
 import { existsSync as existsSync13 } from "node:fs";
 import { mkdir as mkdir6, writeFile as writeFile9 } from "node:fs/promises";
 import { defineCommand as defineCommand6 } from "citty";
-import { basename as basename3, dirname as dirname11, join as join26 } from "pathe";
+import { basename as basename4, dirname as dirname11, join as join26 } from "pathe";
 var toPackageName = (raw) => raw.toLowerCase().replaceAll(/[^a-z0-9._-]+/gu, "-").replaceAll(/^[-_.]+|[-_.]+$/gu, "") || "docs";
 var packageTemplate = (name, version) => `{
   "name": ${JSON.stringify(name)},
@@ -10329,7 +10376,7 @@ var initCommand = defineCommand6({
   async run({ args }) {
     const root = process.cwd();
     const contentDir = args["content-dir"] ?? "docs";
-    const createdPackage = await writeFileSafe(join26(root, "package.json"), packageTemplate(toPackageName(basename3(root)), getBlumeVersion()));
+    const createdPackage = await writeFileSafe(join26(root, "package.json"), packageTemplate(toPackageName(basename4(root)), getBlumeVersion()));
     await writeFileSafe(join26(root, "blume.config.ts"), CONFIG_TEMPLATE);
     await writeFileSafe(join26(root, contentDir, "index.mdx"), INDEX_TEMPLATE);
     const nextSteps = createdPackage ? `Next steps:
@@ -10356,7 +10403,7 @@ import { glob as glob8 } from "tinyglobby";
 // src/migrate/fumadocs/config.ts
 import { existsSync as existsSync14 } from "node:fs";
 import { readFile as readFile16 } from "node:fs/promises";
-import { basename as basename4, dirname as dirname12, join as join27 } from "pathe";
+import { basename as basename5, dirname as dirname12, join as join27 } from "pathe";
 var SOURCE_FILES = [
   "lib/source.ts",
   "app/source.ts",
@@ -10411,7 +10458,7 @@ var readTitle = async (root) => {
     if (GENERIC_NAMES.has(bareName(name).toLowerCase())) {
       const repoRoot = gitRepoRoot(root);
       if (repoRoot && repoRoot !== root) {
-        const repoTitle = prettifyTitle(basename4(repoRoot));
+        const repoTitle = prettifyTitle(basename5(repoRoot));
         if (repoTitle !== "Documentation") {
           return repoTitle;
         }
@@ -10699,7 +10746,7 @@ var normalizeFumadocsPageMeta = (value) => {
 // src/migrate/fumadocs/groups.ts
 import { existsSync as existsSync16, statSync as statSync2 } from "node:fs";
 import { mkdir as mkdir7, rename as rename2, writeFile as writeFile10 } from "node:fs/promises";
-import { basename as basename5, join as join28 } from "pathe";
+import { basename as basename6, join as join28 } from "pathe";
 
 // src/migrate/fumadocs/meta.ts
 var SEPARATOR = /^---(?<label>.*)---$/u;
@@ -10885,7 +10932,7 @@ var moveItemIntoGroup = async (item, docsDir, groupDir, label, warnings) => {
     warnings.push(`Sidebar entry "${item.name}" in section "${label}" matched no page or folder; skipped.`);
     return null;
   }
-  const dest = join28(groupDir, basename5(resolved.path));
+  const dest = join28(groupDir, basename6(resolved.path));
   if (existsSync16(dest)) {
     warnings.push(`Skipped moving "${item.name}" into section "${label}" (target already exists).`);
     return null;
@@ -11330,7 +11377,7 @@ var migrateMintlifyProject = async (root) => {
 // src/migrate/nextra/index.ts
 import { existsSync as existsSync19 } from "node:fs";
 import { mkdir as mkdir10, readFile as readFile19, rename as rename5, rm as rm5, writeFile as writeFile13 } from "node:fs/promises";
-import { basename as basename6, dirname as dirname16, extname as extname6, join as join31, relative as relative16 } from "pathe";
+import { basename as basename7, dirname as dirname16, extname as extname6, join as join31, relative as relative16 } from "pathe";
 import { glob as glob10 } from "tinyglobby";
 
 // src/migrate/nextra/content.ts
@@ -11567,7 +11614,7 @@ var indexFolders = (base, pageFiles, metaFiles) => {
   for (const abs of pageFiles) {
     const rel = relative16(base, abs);
     const dir = normalizeDir(dirname16(rel));
-    const slug = basename6(rel).replace(/\.mdx?$/u, "");
+    const slug = basename7(rel).replace(/\.mdx?$/u, "");
     const folder = pagesByDir.get(dir) ?? new Map;
     folder.set(slug, abs);
     pagesByDir.set(dir, folder);
@@ -11583,7 +11630,7 @@ var indexFolders = (base, pageFiles, metaFiles) => {
     }
     const parent = normalizeDir(dirname16(dir));
     const children = childDirs.get(parent) ?? new Set;
-    children.add(basename6(dir));
+    children.add(basename7(dir));
     childDirs.set(parent, children);
   }
   return { childDirs, pagesByDir };
@@ -12692,5 +12739,5 @@ var main = defineCommand11({
 });
 runMain(main);
 
-//# debugId=37F2F7467962582064756E2164756E21
+//# debugId=55EFB0DA63E08C3864756E2164756E21
 //# sourceMappingURL=index.js.map