create-nextly-app 0.0.2-alpha.56 → 0.0.2-alpha.58

package/dist/index.cjs

@@ -21125,6 +21125,47 @@ var import_fs_extra8 = __toESM(require_lib());
 var PROJECT_TYPES_WITH_FORM_BUILDER = /* @__PURE__ */ new Set([
   "blog"
 ]);
+var FONT_PACKAGE_RANGE = "^5.3.0";
+var FONT_PACKAGE_PATTERN = /@fontsource(?:-variable)?\/[a-z0-9-]+/g;
+async function collectFontDependencies(templateDirs) {
+  const effective = await effectiveTemplateFiles(templateDirs);
+  const found = /* @__PURE__ */ new Set();
+  for (const file of effective.values()) {
+    const contents = await import_fs_extra8.default.readFile(file, "utf8");
+    for (const match of contents.matchAll(FONT_PACKAGE_PATTERN)) {
+      found.add(match[0]);
+    }
+  }
+  return [...found].sort();
+}
+async function effectiveTemplateFiles(templateDirs) {
+  const effective = /* @__PURE__ */ new Map();
+  for (const root of templateDirs) {
+    if (!root || !await import_fs_extra8.default.pathExists(root)) continue;
+    for (const file of await walkSourceFiles(root)) {
+      effective.set(path14__default.default.relative(root, file), file);
+    }
+  }
+  return effective;
+}
+var SEARCH_INDEX_SCRIPT = path14__default.default.join("scripts", "build-search-index.mjs");
+async function projectHasSearchIndexScript(targetDir) {
+  return import_fs_extra8.default.pathExists(path14__default.default.join(targetDir, SEARCH_INDEX_SCRIPT));
+}
+async function walkSourceFiles(root) {
+  const out = [];
+  const entries = await import_fs_extra8.default.readdir(root, { withFileTypes: true });
+  for (const entry of entries) {
+    const full = path14__default.default.join(root, entry.name);
+    if (entry.isDirectory()) {
+      if (entry.name === "node_modules" || entry.name === ".next") continue;
+      out.push(...await walkSourceFiles(full));
+    } else if (/\.(?:tsx?|jsx?|mjs|cjs|css)$/.test(entry.name)) {
+      out.push(full);
+    }
+  }
+  return out;
+}
 function projectUsesFormBuilder(projectType) {
   return PROJECT_TYPES_WITH_FORM_BUILDER.has(projectType);
 }
@@ -21146,6 +21187,15 @@ var TEXT_EXTENSIONS = /* @__PURE__ */ new Set([
   ".cjs"
 ]);
 var SKIP_FILES = /* @__PURE__ */ new Set([".DS_Store", "Thumbs.db", ".gitkeep"]);
+var IGNORE_FILE_IN_TEMPLATE = "gitignore";
+var IGNORE_FILE_IN_PROJECT = ".gitignore";
+async function restoreIgnoreFile(targetDir) {
+  const shipped = path14__default.default.join(targetDir, IGNORE_FILE_IN_TEMPLATE);
+  if (!await import_fs_extra8.default.pathExists(shipped)) return;
+  await import_fs_extra8.default.move(shipped, path14__default.default.join(targetDir, IGNORE_FILE_IN_PROJECT), {
+    overwrite: true
+  });
+}
 function resolveTemplatePath(localTemplatePath) {
   const __dirname = path14__default.default.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href))));
   const fromDist = path14__default.default.resolve(__dirname, "../templates");
@@ -21269,7 +21319,7 @@ async function resolveRuntimeVersions() {
   resolvedRuntimeVersions = Object.fromEntries(entries);
   return resolvedRuntimeVersions;
 }
-async function generatePackageJson(projectName, database, useYalc = false, projectType = "blank") {
+async function generatePackageJson(projectName, database, useYalc = false, projectType = "blank", templateDirs = [], targetDir) {
   if (projectType === "plugin") {
     return generatePluginPackageJson(projectName, useYalc);
   }
@@ -21281,6 +21331,9 @@ async function generatePackageJson(projectName, database, useYalc = false, proje
   };
   dependencies["@tanstack/react-query"] = "^5.62.0";
   dependencies["lucide-react"] = "^0.544.0";
+  for (const font of await collectFontDependencies(templateDirs)) {
+    dependencies[font] = FONT_PACKAGE_RANGE;
+  }
   if (!useYalc) {
     const versions = await resolveNextlyVersions(
       templateNextlyChannel(projectType)
@@ -21303,12 +21356,10 @@ async function generatePackageJson(projectName, database, useYalc = false, proje
     "@tailwindcss/postcss": PINNED_VERSIONS["@tailwindcss/postcss"],
     tailwindcss: PINNED_VERSIONS.tailwindcss,
     eslint: PINNED_VERSIONS.eslint,
-    "eslint-config-next": runtimeVersions["eslint-config-next"],
-    // Pagefind powers /search in the blog template. Zero-config
-    // static index generated at `next build` time. Templates that
-    // don't ship a /search page simply won't invoke it.
-    pagefind: "^1.1.0"
+    "eslint-config-next": runtimeVersions["eslint-config-next"]
   };
+  const shipsSearchIndex = targetDir ? await projectHasSearchIndexScript(targetDir) : false;
+  if (shipsSearchIndex) devDependencies.pagefind = "^1.1.0";
   const pkg = {
     name: projectName,
     version: "0.1.0",
@@ -21320,11 +21371,25 @@ async function generatePackageJson(projectName, database, useYalc = false, proje
       // prompts, and child supervision. `nextly dev` is gone; the only
       // supported dev command is the standard `next dev`.
       dev: "next dev --turbopack",
-      // Build: migrate DB + compile Next.js + (if present) generate
-      // the Pagefind search index. Templates without the search
-      // script silently skip the last step.
-      build: "nextly migrate && next build && (test -f scripts/build-search-index.mjs && node scripts/build-search-index.mjs || true)",
-      "search:index": "node scripts/build-search-index.mjs",
+      // Build: migrate the database, compile Next.js, and generate the Pagefind
+      // search index for the templates that ship its builder.
+      //
+      // Whether that last step appears is decided HERE, from the files the
+      // scaffold actually received, rather than by a shell conditional in the
+      // script. Two reasons, and both were live:
+      //
+      // `npm run` uses cmd.exe on Windows, which has no `test` and no `true` —
+      // so the `(test -f … || true)` form this replaces failed for every Windows
+      // user, after `next build` had already succeeded. `&&` is all that remains,
+      // and cmd.exe understands it.
+      //
+      // And `|| true` turned a failed index build into a successful one. The
+      // search page then ships pointing at an index that was never written,
+      // which fails in the browser rather than in CI.
+      build: shipsSearchIndex ? "nextly migrate && next build && node scripts/build-search-index.mjs" : "nextly migrate && next build",
+      // Offered only where the file exists. A script that always fails is worse
+      // than an absent one: it reads as a supported command.
+      ...shipsSearchIndex ? { "search:index": "node scripts/build-search-index.mjs" } : {},
       start: "next start",
       lint: "next lint",
       nextly: "nextly",
@@ -21334,8 +21399,11 @@ async function generatePackageJson(projectName, database, useYalc = false, proje
       "db:setup": "nextly db:sync",
       "db:migrate": "nextly migrate",
       "db:migrate:status": "nextly migrate:status",
+      // No `db:migrate:reset`: `nextly migrate:reset` is not a command the CLI
+      // registers, so the script it generated failed for every scaffolded
+      // project. `migrate:fresh` is the one that drops all tables and re-runs
+      // the migrations, and it is already exposed above.
       "db:migrate:fresh": "nextly migrate:fresh",
-      "db:migrate:reset": "nextly migrate:reset",
       "types:generate": "nextly generate:types"
     },
     dependencies,
@@ -21437,13 +21505,46 @@ function generatePnpmWorkspaceYaml() {
 # compiled binding (sqlite apps crash at boot) and sharp/esbuild degrade.
 #
 # pnpm 11+ reads \`allowBuilds\`; pnpm 10.6+ reads \`onlyBuiltDependencies\`.
-# npm, yarn, and pnpm 9 ignore this file (they run build scripts by default).
+# npm and yarn ignore this file; pnpm 9 needs neither key, because it runs
+# build scripts by default.
+#
+# It does still READ the file, which is what the empty \`packages\` list is
+# for: through pnpm 9.3 the presence of this file declares a workspace, and
+# a missing \`packages\` key fails the install outright. This app has no
+# workspace members.
+packages: []
 allowBuilds:
 ${allowBuilds}
 onlyBuiltDependencies:
 ${onlyBuilt}
 `;
 }
+function generateNpmrc(packageManager) {
+  if (packageManager !== "pnpm") return null;
+  return `# This project is a single package, not a monorepo. pnpm 9 treats the
+# pnpm-workspace.yaml shipped for its build allowlist as declaring a
+# workspace root, which makes \`pnpm add <pkg>\` demand a -w flag. There is no
+# other package here for that check to protect.
+${NPMRC_WORKSPACE_ROOT_KEY}=true
+`;
+}
+var NPMRC_WORKSPACE_ROOT_KEY = "ignore-workspace-root-check";
+async function writeScaffoldNpmrc(targetDir, packageManager) {
+  const addition = generateNpmrc(packageManager);
+  if (!addition) return;
+  const npmrcPath = path14__default.default.join(targetDir, ".npmrc");
+  const link = await import_fs_extra8.default.lstat(npmrcPath).catch(() => null);
+  if (link?.isSymbolicLink()) return;
+  if (link && link.nlink > 1) return;
+  const existing = link ? await import_fs_extra8.default.readFile(npmrcPath, "utf-8") : "";
+  const alreadyDeclared = new RegExp(
+    `^\\s*${NPMRC_WORKSPACE_ROOT_KEY}\\s*=`,
+    "m"
+  ).test(existing);
+  if (alreadyDeclared) return;
+  const separator = existing === "" || existing.endsWith("\n") ? "" : "\n";
+  await import_fs_extra8.default.writeFile(npmrcPath, existing + separator + addition, "utf-8");
+}
 async function copyTemplate(options) {
   const {
     projectName,
@@ -21454,6 +21555,7 @@ async function copyTemplate(options) {
     useYalc = false,
     approach,
     templateSource,
+    packageManager,
     allowExistingTarget = false
   } = options;
   if (!allowExistingTarget && targetDir !== process.cwd() && await import_fs_extra8.default.pathExists(targetDir)) {
@@ -21472,7 +21574,13 @@ async function copyTemplate(options) {
     typeDir = path14__default.default.join(templatesRoot, projectType);
   }
   if (projectType === "plugin") {
-    await copyPluginTemplate({ projectName, typeDir, targetDir, useYalc });
+    await copyPluginTemplate({
+      projectName,
+      typeDir,
+      targetDir,
+      useYalc,
+      packageManager
+    });
     return;
   }
   if (!await import_fs_extra8.default.pathExists(baseDir)) {
@@ -21531,6 +21639,13 @@ async function copyTemplate(options) {
       overwrite: false
     });
   }
+  const templateScriptsDir = path14__default.default.join(typeDir, "scripts");
+  if (await import_fs_extra8.default.pathExists(templateScriptsDir)) {
+    await import_fs_extra8.default.copy(templateScriptsDir, path14__default.default.join(targetDir, "scripts"), {
+      overwrite: false,
+      filter: (src) => !SKIP_FILES.has(path14__default.default.basename(src))
+    });
+  }
   const frontendPagePath = path14__default.default.join(
     targetDir,
     "src",
@@ -21546,7 +21661,9 @@ async function copyTemplate(options) {
     projectName,
     database,
     useYalc,
-    projectType
+    projectType,
+    [baseDir, typeDir],
+    targetDir
   );
   await import_fs_extra8.default.writeFile(
     path14__default.default.join(targetDir, "package.json"),
@@ -21558,6 +21675,8 @@ async function copyTemplate(options) {
     generatePnpmWorkspaceYaml(),
     "utf-8"
   );
+  await restoreIgnoreFile(targetDir);
+  await writeScaffoldNpmrc(targetDir, packageManager);
   if (database.type === "sqlite") {
     await import_fs_extra8.default.ensureDir(path14__default.default.join(targetDir, "data"));
   }
@@ -21573,7 +21692,7 @@ async function copyTemplate(options) {
   await replacePlaceholders(targetDir, placeholders);
 }
 async function copyPluginTemplate(opts) {
-  const { projectName, typeDir, targetDir, useYalc } = opts;
+  const { projectName, typeDir, targetDir, useYalc, packageManager } = opts;
   if (!await import_fs_extra8.default.pathExists(typeDir)) {
     throw new Error(
       `Plugin template not found at ${typeDir}. The package may be corrupted or the download failed.`
@@ -21602,6 +21721,8 @@ async function copyPluginTemplate(opts) {
     generatePnpmWorkspaceYaml(),
     "utf-8"
   );
+  await restoreIgnoreFile(targetDir);
+  await writeScaffoldNpmrc(targetDir, packageManager);
   const nextlyRange = await resolvePluginNextlyRange(useYalc);
   await replacePlaceholders(
     targetDir,
@@ -25201,6 +25322,7 @@ async function createNextly(options = {}) {
       } else {
         s3.start("Scaffolding project...");
       }
+      const scaffoldPackageManager = await detectPackageManager(targetDir);
       await copyTemplate({
         projectName,
         projectType,
@@ -25210,6 +25332,7 @@ async function createNextly(options = {}) {
         useYalc,
         approach,
         templateSource,
+        packageManager: scaffoldPackageManager,
         // Suppress copyTemplate's "directory already exists" guard when the
         // installer has already negotiated the conflict with the user
         // (either by emptying the dir or accepting an overlay). Without