create-zudo-doc 2.4.0 → 2.5.0

package/dist/scaffold.d.ts

@@ -11,5 +11,5 @@ export { getSecondaryLang };
  *
  * Bumped in lockstep by scripts/release-create-zudo-doc.sh.
  */
-export declare const ZUDO_DOC_PIN = "^2.4.0";
+export declare const ZUDO_DOC_PIN = "^2.5.0";
 export declare function scaffold(choices: UserChoices): Promise<void>;

package/dist/scaffold.js

@@ -18,7 +18,7 @@ export { getSecondaryLang };
  *
  * Bumped in lockstep by scripts/release-create-zudo-doc.sh.
  */
-export const ZUDO_DOC_PIN = "^2.4.0";
+export const ZUDO_DOC_PIN = "^2.5.0";
 /**
  * Files in `templates/base/**` that must never be copied into a generated
  * project. Each entry is matched against the path relative to `templates/base/`
@@ -489,15 +489,17 @@ function generatePackageJson(choices) {
         // next.74: routine toolchain bump from next.72 (next.73
         // skipped), adopted in lockstep with the root package.json pins. No
         // consumer-facing / CLI change.
-        // next.75 (current pin): toolchain bump from next.74 restoring Tailwind
+        // next.75: toolchain bump from next.74 restoring Tailwind
         // class-candidate scanning through symlinked project trees
         // (zudolab/zudo-doc#2511), adopted in lockstep with the root package.json
         // pins. No consumer-facing / CLI change.
-        "@takazudo/zfb": "0.1.0-next.75",
-        "@takazudo/zfb-runtime": "0.1.0-next.75",
+        // next.76 (current pin): routine toolchain bump from next.75, adopted in
+        // lockstep with the root package.json pins. No consumer-facing / CLI change.
+        "@takazudo/zfb": "0.1.0-next.76",
+        "@takazudo/zfb-runtime": "0.1.0-next.76",
         // zfb-adapter-cloudflare — required for any route with `prerender = false`.
         // Pinned in lockstep with @takazudo/zfb.
-        "@takazudo/zfb-adapter-cloudflare": "0.1.0-next.75",
+        "@takazudo/zfb-adapter-cloudflare": "0.1.0-next.76",
         // @takazudo/zudo-doc — published from this monorepo via
         // .github/workflows/publish-zudo-doc.yml. The pin here is bumped in
         // lockstep by scripts/release-create-zudo-doc.sh whenever zudo-doc's
@@ -580,7 +582,7 @@ function generatePackageJson(choices) {
         // @takazudo/zudo-doc/integrations/doc-history which in turn imports
         // @takazudo/zudo-doc-history-server/git-history. Without this dep the
         // plugin host fails at init with ERR_MODULE_NOT_FOUND — W8A (#1739).
-        deps["@takazudo/zudo-doc-history-server"] = "^2.4.0";
+        deps["@takazudo/zudo-doc-history-server"] = "^2.5.0";
         // tsx is no longer needed here: the relocated package plugin imports the
         // runner directly (no `tsx -e` spawn) since the package ships compiled
         // dist/ — package-first migration #2321 (#2337).

package/dist/settings-gen.js

@@ -212,10 +212,10 @@ export function generateSettingsFile(choices) {
     if (choices.features.includes("claudeResources")) {
         lines.push(`  claudeResources: {`);
         lines.push(`    claudeDir: ".claude",`);
-        lines.push(`  } as { claudeDir: string; projectRoot?: string } | false,`);
+        lines.push(`  } as { claudeDir: string; projectRoot?: string; scanRoot?: string } | false,`);
     }
     else {
-        lines.push(`  claudeResources: false as { claudeDir: string; projectRoot?: string } | false,`);
+        lines.push(`  claudeResources: false as { claudeDir: string; projectRoot?: string; scanRoot?: string } | false,`);
     }
     if (choices.features.includes("claudeResources")) {
         lines.push(`  defaultLocaleOnlyPrefixes: [`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-zudo-doc",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "description": "Create a new zudo-doc documentation site",
   "license": "MIT",
   "author": "Takeshi Takatsudo",

package/templates/features/claudeResources/files/src/integrations/claude-resources/__tests__/generate.test.ts

@@ -575,6 +575,88 @@ describe("generateClaudeResourcesDocs", () => {
     });
   });
 
+  // ---------------------------------------------------------------------------
+  // excludeDirs boundary matching (#2561)
+  // ---------------------------------------------------------------------------
+
+  describe("excludeDirs boundary matching", () => {
+    it("discovers CLAUDE.md in a prefix-colliding sibling of an excluded dir (dist-extra vs dist)", () => {
+      fs.mkdirSync(path.join(tmpDir, "dist-extra"), { recursive: true });
+      fs.writeFileSync(
+        path.join(tmpDir, "dist-extra", "CLAUDE.md"),
+        "# dist-extra instructions",
+      );
+
+      const result = generateClaudeResourcesDocs({
+        claudeDir,
+        projectRoot: tmpDir,
+        docsDir,
+      });
+
+      // root/CLAUDE.md (from the fixture) + dist-extra/CLAUDE.md
+      expect(result.claudemd).toBe(2);
+      const decoyPage = path.join(docsDir, "claude-md", "dist-extra.mdx");
+      expect(fs.existsSync(decoyPage)).toBe(true);
+      expect(fs.readFileSync(decoyPage, "utf8")).toContain("dist-extra instructions");
+    });
+
+    it("still excludes CLAUDE.md directly inside the excluded dist directory", () => {
+      fs.mkdirSync(path.join(tmpDir, "dist"), { recursive: true });
+      fs.writeFileSync(
+        path.join(tmpDir, "dist", "CLAUDE.md"),
+        "# dist instructions — should be excluded",
+      );
+
+      const result = generateClaudeResourcesDocs({
+        claudeDir,
+        projectRoot: tmpDir,
+        docsDir,
+      });
+
+      // Only root/CLAUDE.md (from the fixture) — dist/CLAUDE.md is excluded.
+      expect(result.claudemd).toBe(1);
+      expect(fs.existsSync(path.join(docsDir, "claude-md", "dist.mdx"))).toBe(false);
+    });
+
+    it("still excludes nested CLAUDE.md files under the excluded dist directory (exact-match boundary holds)", () => {
+      fs.mkdirSync(path.join(tmpDir, "dist", "nested"), { recursive: true });
+      fs.writeFileSync(
+        path.join(tmpDir, "dist", "nested", "CLAUDE.md"),
+        "# nested dist instructions — should be excluded",
+      );
+
+      const result = generateClaudeResourcesDocs({
+        claudeDir,
+        projectRoot: tmpDir,
+        docsDir,
+      });
+
+      // Only root/CLAUDE.md (from the fixture) — the whole dist/ subtree,
+      // including nested dirs, is excluded once the top-level dist match hits.
+      expect(result.claudemd).toBe(1);
+      expect(fs.existsSync(path.join(docsDir, "claude-md", "dist--nested.mdx"))).toBe(false);
+    });
+
+    it("still excludes docsDir contents when docsDir carries a trailing separator", () => {
+      // path.join preserves a trailing separator on a single argument, so the
+      // docsDir exclude entry keeps it — the boundary compare must not break.
+      fs.writeFileSync(
+        path.join(docsDir, "CLAUDE.md"),
+        "# decoy inside docsDir — should be excluded",
+      );
+
+      const result = generateClaudeResourcesDocs({
+        claudeDir,
+        projectRoot: tmpDir,
+        docsDir: docsDir + path.sep,
+      });
+
+      // Only root/CLAUDE.md (from the fixture) — docs/CLAUDE.md is excluded.
+      expect(result.claudemd).toBe(1);
+      expect(fs.existsSync(path.join(docsDir, "claude-md", "docs.mdx"))).toBe(false);
+    });
+  });
+
   // ---------------------------------------------------------------------------
   // CLAUDE.md repo-relative link downgrade (#2411, Class B)
   // ---------------------------------------------------------------------------

package/templates/features/claudeResources/files/src/integrations/claude-resources/generate.ts

@@ -214,11 +214,19 @@ function findClaudeMdFiles(dir: string, excludeDirs: string[]): string[] {
   const results: string[] = [];
   if (!fs.existsSync(dir)) return results;
 
+  // Strip trailing separators (path.join preserves one on e.g. "docs/") so the
+  // boundary compare below stays exact for such entries too.
+  const excludes = excludeDirs.map((d) =>
+    d.endsWith(path.sep) ? d.slice(0, -path.sep.length) : d,
+  );
+
   for (const item of fs.readdirSync(dir)) {
     if (item === "node_modules") continue;
     if (item.startsWith(".")) continue;
     const itemPath = path.join(dir, item);
-    if (excludeDirs.some((d) => itemPath.startsWith(d))) continue;
+    // Path-segment-boundary-aware: a raw startsWith(d) would also match a
+    // sibling like "dist-extra" against an excluded "dist" (#2561).
+    if (excludes.some((d) => itemPath === d || itemPath.startsWith(d + path.sep))) continue;
 
     // lstat (not stat) so symlinks aren't followed — a symlinked dir can point
     // back into the project (e.g. e2e fixtures linking to packages/) or out to
@@ -231,7 +239,7 @@ function findClaudeMdFiles(dir: string, excludeDirs: string[]): string[] {
       continue;
     }
     if (stat.isDirectory()) {
-      results.push(...findClaudeMdFiles(itemPath, excludeDirs));
+      results.push(...findClaudeMdFiles(itemPath, excludes));
     } else if (stat.isFile() && item === "CLAUDE.md") {
       results.push(itemPath);
     }