create-jant 0.3.10 → 0.3.11

package/dist/index.js

@@ -2,13 +2,14 @@
 import { program } from "commander";
 import * as p from "@clack/prompts";
 import chalk from "chalk";
+import { execSync } from "child_process";
 import crypto from "crypto";
 import fs from "fs-extra";
 import path from "path";
 import { fileURLToPath } from "url";
 var __filename = fileURLToPath(import.meta.url);
 var __dirname = path.dirname(__filename);
-var CORE_VERSION = "0.3.10";
+var CORE_VERSION = "0.3.11";
 var TEMPLATE_DIR = fs.existsSync(path.resolve(__dirname, "../template")) ? path.resolve(__dirname, "../template") : path.resolve(__dirname, "../../../templates/jant-site");
 function isValidProjectName(name) {
   return /^[a-z0-9]([a-z0-9-]*[a-z0-9])?$/.test(name);
@@ -19,6 +20,34 @@ function toValidProjectName(name) {
 function generateAuthSecret() {
   return crypto.randomBytes(32).toString("base64");
 }
+function detectPackageManager() {
+  const userAgent = process.env.npm_config_user_agent;
+  if (userAgent) {
+    const name = userAgent.split("/")[0];
+    if (name === "pnpm" || name === "yarn" || name === "npm") {
+      return name;
+    }
+  }
+  for (const pm of ["pnpm", "yarn", "npm"]) {
+    try {
+      execSync(`${pm} --version`, { stdio: "ignore" });
+      return pm;
+    } catch {
+    }
+  }
+  return "npm";
+}
+function formatRunCmd(pm, script) {
+  return pm === "npm" ? `npm run ${script}` : `${pm} ${script}`;
+}
+function runCommand(cmd, cwd) {
+  try {
+    execSync(cmd, { stdio: "ignore", cwd });
+    return true;
+  } catch {
+    return false;
+  }
+}
 function processMarkers(content, vars) {
   content = content.replace(
     /\s*(?:\/\/|#)\s*@create-jant:\s*@remove-start[\s\S]*?(?:\/\/|#)\s*@create-jant:\s*@remove-end\n?/g,
@@ -41,7 +70,7 @@ function processMarkers(content, vars) {
   return content;
 }
 async function copyTemplate(config) {
-  const { projectName, targetDir } = config;
+  const { projectName, targetDir, packageManager } = config;
   await fs.copy(TEMPLATE_DIR, targetDir, {
     filter: (src) => {
       const basename = path.basename(src);
@@ -51,6 +80,10 @@ async function copyTemplate(config) {
       if (basename === ".swc") return false;
       if (basename === ".dev.vars") return false;
       if (basename === "pnpm-lock.yaml") return false;
+      if (basename === "yarn.lock") return false;
+      if (basename === "package-lock.json") return false;
+      if (basename === "bun.lockb") return false;
+      if (basename === "pnpm-workspace.yaml") return false;
       if (basename === "dist") return false;
       if (basename === "wrangler.demo.toml") return false;
       if (basename === "reset-demo.sql") return false;
@@ -82,6 +115,19 @@ async function copyTemplate(config) {
     if (pkg.dependencies?.["@jant/core"] === "workspace:*") {
       pkg.dependencies["@jant/core"] = `^${CORE_VERSION}`;
     }
+    if (packageManager !== "pnpm") {
+      delete pkg.packageManager;
+      if (pkg.scripts) {
+        for (const [key, value] of Object.entries(pkg.scripts)) {
+          if (typeof value === "string") {
+            pkg.scripts[key] = value.replace(
+              /pnpm (\S+)/g,
+              (_, script) => formatRunCmd(packageManager, script)
+            );
+          }
+        }
+      }
+    }
     await fs.writeJson(pkgPath, pkg, { spaces: 2 });
   }
   const wranglerPath = path.join(targetDir, "wrangler.toml");
@@ -126,11 +172,17 @@ S3_SECRET_ACCESS_KEY=
     content = processMarkers(content, {});
     await fs.writeFile(viteConfigPath, content, "utf-8");
   }
+  if (packageManager === "pnpm") {
+    const wsSource = path.join(TEMPLATE_DIR, "pnpm-workspace.yaml");
+    if (await fs.pathExists(wsSource)) {
+      await fs.copy(wsSource, path.join(targetDir, "pnpm-workspace.yaml"));
+    }
+  }
 }
 async function main() {
   console.log();
   p.intro(chalk.bgCyan.black(" create-jant "));
-  program.name("create-jant").description("Create a new Jant project").argument("[project-name]", "Name of the project").option("-y, --yes", "Skip prompts and use defaults").option("--s3", "Use S3-compatible storage instead of Cloudflare R2").parse();
+  program.name("create-jant").description("Create a new Jant project").argument("[project-name]", "Name of the project").option("-y, --yes", "Skip prompts and use defaults").option("--s3", "Use S3-compatible storage instead of Cloudflare R2").option("--no-install", "Skip dependency installation").option("--no-git", "Skip git initialization").parse();
   const args = program.args;
   const opts = program.opts();
   let projectName;
@@ -186,9 +238,13 @@ async function main() {
       await fs.emptyDir(targetDir);
     }
   }
+  const packageManager = detectPackageManager();
   const config = {
     projectName,
     targetDir,
+    packageManager,
+    install: opts.install,
+    git: opts.git,
     s3: opts.s3
   };
   const spinner2 = p.spinner();
@@ -201,11 +257,36 @@ async function main() {
     p.log.error(error instanceof Error ? error.message : String(error));
     process.exit(1);
   }
+  let installOk = false;
+  if (config.install) {
+    spinner2.start("Installing dependencies...");
+    installOk = runCommand(`${packageManager} install`, targetDir);
+    if (installOk) {
+      spinner2.stop("Dependencies installed.");
+    } else {
+      spinner2.stop(
+        chalk.yellow(
+          `Failed to install dependencies. Run ${chalk.bold(`${packageManager} install`)} manually.`
+        )
+      );
+    }
+  }
+  if (config.git) {
+    spinner2.start("Initializing git repository...");
+    const gitOk = runCommand("git init", targetDir) && runCommand("git add -A", targetDir) && runCommand('git commit -m "Initial commit"', targetDir);
+    if (gitOk) {
+      spinner2.stop("Git repository initialized.");
+    } else {
+      spinner2.stop("Skipped git initialization.");
+    }
+  }
+  const steps = [`cd ${projectName}`];
+  if (!config.install || !installOk) {
+    steps.push(`${packageManager} install`);
+  }
+  steps.push(formatRunCmd(packageManager, "dev"));
   console.log();
-  p.note(
-    [`cd ${projectName}`, "pnpm install", "pnpm dev"].join("\n"),
-    "Next steps"
-  );
+  p.note(steps.join("\n"), "Next steps");
   p.outro(chalk.green("Happy coding!"));
 }
 main().catch((error) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-jant",
-  "version": "0.3.10",
+  "version": "0.3.11",
   "description": "Create a new Jant project",
   "type": "module",
   "bin": {