spfn 0.2.0-beta.45 → 0.2.0-beta.46

package/dist/index.js

@@ -755,7 +755,7 @@ var init_deployment_config = __esm({
 
 // src/utils/version.ts
 function getCliVersion() {
-  return "0.2.0-beta.45";
+  return "0.2.0-beta.46";
 }
 function getTagFromVersion(version) {
   const match = version.match(/-([a-z]+)\./i);
@@ -1197,11 +1197,23 @@ init_logger();
 init_package_manager();
 import { Command as Command3 } from "commander";
 import { existsSync as existsSync10 } from "fs";
-import { join as join10 } from "path";
+import { join as join10, resolve, dirname as dirname2 } from "path";
 import prompts2 from "prompts";
 import ora4 from "ora";
 import { execa as execa3 } from "execa";
 import chalk4 from "chalk";
+function findPnpmWorkspaceRoot(startDir) {
+  let dir = resolve(startDir);
+  while (true) {
+    if (existsSync10(join10(dir, "pnpm-workspace.yaml"))) {
+      return dir;
+    }
+    const parent = dirname2(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  return null;
+}
 async function createProject(projectName, options) {
   const cwd = process.cwd();
   const projectPath = join10(cwd, projectName);
@@ -1230,7 +1242,11 @@ async function createProject(projectName, options) {
     pm = selectedPm;
   }
   logger.step(`Using package manager: ${pm}`);
-  const spinner = ora4("Creating Next.js project...").start();
+  const workspaceRoot = pm === "pnpm" ? findPnpmWorkspaceRoot(cwd) : null;
+  const isInWorkspace = workspaceRoot !== null;
+  if (isInWorkspace) {
+    logger.info(`Detected pnpm workspace at ${workspaceRoot}`);
+  }
   try {
     const createNextAppArgs = [
       "create-next-app@latest",
@@ -1242,10 +1258,11 @@ async function createProject(projectName, options) {
       "@/*",
       "--tailwind",
       "--no-eslint",
-      "--yes"
+      "--yes",
       // Skip prompts
+      `--use-${pm}`
     ];
-    if (options.skipInstall) {
+    if (options.skipInstall || isInWorkspace) {
       createNextAppArgs.push("--skip-install");
     }
     if (options.skipGit) {
@@ -1253,16 +1270,43 @@ async function createProject(projectName, options) {
     }
     const createCommand2 = pm === "npm" ? "npx" : pm === "yarn" ? "yarn" : pm === "pnpm" ? "pnpm" : "bunx";
     const createArgs = createCommand2 === "npx" ? createNextAppArgs : ["dlx", ...createNextAppArgs];
+    logger.step("Running create-next-app...");
     await execa3(createCommand2, createArgs, {
       cwd,
-      stdio: "inherit"
+      stdio: "inherit",
+      timeout: 3e5
+      // 5 minutes
     });
-    spinner.succeed("Next.js project created");
+    ora4().succeed("Next.js project created");
   } catch (error) {
-    spinner.fail("Failed to create Next.js project");
-    logger.error(String(error));
+    ora4().fail("Failed to create Next.js project");
+    if (error.exitCode != null) {
+      logger.error(`create-next-app exited with code ${error.exitCode}`);
+    }
+    if (error.stderr) {
+      logger.error(error.stderr);
+    } else {
+      logger.error(String(error));
+    }
     process.exit(1);
   }
+  if (isInWorkspace && !options.skipInstall) {
+    const installSpinner = ora4("Installing dependencies from workspace root...").start();
+    try {
+      await execa3("pnpm", ["install"], {
+        cwd: workspaceRoot,
+        stdio: "pipe",
+        timeout: 3e5
+      });
+      installSpinner.succeed("Dependencies installed");
+    } catch (error) {
+      installSpinner.fail("Failed to install dependencies");
+      logger.error("Run `pnpm install` from workspace root manually.");
+      if (error.stderr) {
+        logger.error(error.stderr);
+      }
+    }
+  }
   process.chdir(projectPath);
   logger.info(`
 \u{1F4C2} Changed directory to ${projectName}
@@ -1270,7 +1314,7 @@ async function createProject(projectName, options) {
   const iconsSpinner = ora4("Setting up SVGR for icon management...").start();
   try {
     const installArgs = pm === "npm" ? ["install", "--save-dev", "@svgr/webpack"] : pm === "yarn" ? ["add", "-D", "@svgr/webpack"] : pm === "pnpm" ? ["add", "-D", "@svgr/webpack"] : ["add", "-d", "@svgr/webpack"];
-    await execa3(pm, installArgs, { cwd: projectPath });
+    await execa3(pm, installArgs, { cwd: projectPath, timeout: 12e4 });
     const { setupIcons: setupIcons2 } = await Promise.resolve().then(() => (init_setup(), setup_exports));
     await setupIcons2();
     iconsSpinner.succeed("SVGR setup completed");
@@ -1278,17 +1322,19 @@ async function createProject(projectName, options) {
     iconsSpinner.warn("Failed to setup SVGR (you can run `spfn setup icons` later)");
   }
   if (options.shadcn) {
-    const shadcnSpinner = ora4("Setting up shadcn/ui...").start();
     try {
-      const shadcnCommand = pm === "npm" ? "npx" : pm === "pnpm" ? "pnpx" : pm === "yarn" ? "yarn dlx" : "bunx";
-      const shadcnArgs = pm === "yarn" ? ["shadcn@latest", "init", "--yes", "--defaults"] : ["shadcn@latest", "init", "--yes", "--defaults"];
+      const shadcnCommand = pm === "npm" ? "npx" : pm === "pnpm" ? "pnpm" : pm === "yarn" ? "yarn" : "bunx";
+      const shadcnBaseArgs = ["dlx", "shadcn@latest", "init", "--yes", "--defaults"];
+      const shadcnArgs = shadcnCommand === "npx" ? ["shadcn@latest", "init", "--yes", "--defaults"] : shadcnBaseArgs;
+      logger.step("Setting up shadcn/ui...");
       await execa3(shadcnCommand, shadcnArgs, {
         cwd: projectPath,
-        stdio: "inherit"
+        stdio: "inherit",
+        timeout: 3e5
       });
-      shadcnSpinner.succeed("shadcn/ui initialized");
+      ora4().succeed("shadcn/ui initialized");
     } catch (error) {
-      shadcnSpinner.warn("Failed to initialize shadcn/ui (you can run `npx shadcn@latest init` later)");
+      ora4().warn("Failed to initialize shadcn/ui (you can run `npx shadcn@latest init` later)");
     }
   }
   const initSpinner = ora4("Initializing SPFN...").start();
@@ -1339,7 +1385,7 @@ import { join as join11 } from "path";
 import { execa as execa4 } from "execa";
 import chokidar from "chokidar";
 function waitForReadyFile(filePath, timeoutMs = 3e4) {
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve3, reject) => {
     if (existsSync11(filePath)) {
       unlinkSync(filePath);
     }
@@ -1353,7 +1399,7 @@ function waitForReadyFile(filePath, timeoutMs = 3e4) {
       if (name === fileName && existsSync11(filePath)) {
         watcher.close();
         clearTimeout(timer);
-        resolve2(readFileSync3(filePath, "utf-8").trim());
+        resolve3(readFileSync3(filePath, "utf-8").trim());
       }
     });
   });
@@ -1506,7 +1552,7 @@ catch (error)
           serverProcess2.kill("SIGTERM");
           await serverProcess2.catch(() => {
           });
-          await new Promise((resolve2) => setTimeout(resolve2, 500));
+          await new Promise((resolve3) => setTimeout(resolve3, 500));
         } catch (error) {
         }
       }
@@ -1550,12 +1596,12 @@ catch (error)
     process.on("SIGTERM", cleanup2);
     startWatcher2();
     startServer2();
-    await new Promise((resolve2) => {
+    await new Promise((resolve3) => {
       const keepAlive = setInterval(() => {
       }, 1e6);
       process.once("beforeExit", () => {
         clearInterval(keepAlive);
-        resolve2();
+        resolve3();
       });
     });
     return;
@@ -1615,7 +1661,7 @@ catch (error)
         serverProcess.kill("SIGTERM");
         await serverProcess.catch(() => {
         });
-        await new Promise((resolve2) => setTimeout(resolve2, 500));
+        await new Promise((resolve3) => setTimeout(resolve3, 500));
       } catch (error) {
       }
     }
@@ -1670,12 +1716,12 @@ catch (error)
     logger.warn(`[SPFN] Server readiness check timed out, starting Next.js anyway...`);
   }
   startNext();
-  await new Promise((resolve2) => {
+  await new Promise((resolve3) => {
     const keepAlive = setInterval(() => {
     }, 1e6);
     process.once("beforeExit", () => {
       clearInterval(keepAlive);
-      resolve2();
+      resolve3();
     });
   });
 });
@@ -2228,7 +2274,7 @@ async function runDrizzleCommand(command) {
   }
   const args = command.split(" ");
   args.push(`--config=${configPath}`);
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve3, reject) => {
     const drizzleProcess = spawn("drizzle-kit", args, {
       stdio: "inherit",
       // Allow interactive input
@@ -2243,7 +2289,7 @@ async function runDrizzleCommand(command) {
     drizzleProcess.on("close", (code) => {
       cleanup();
       if (code === 0) {
-        resolve2();
+        resolve3();
       } else {
         reject(new Error(`drizzle-kit ${command} exited with code ${code}`));
       }
@@ -2573,15 +2619,15 @@ function parseDatabaseUrl(dbUrl) {
   }
 }
 async function isPortAvailable(port) {
-  return new Promise((resolve2) => {
+  return new Promise((resolve3) => {
     const server = net.createServer();
     server.once("error", () => {
       server.close();
-      resolve2(false);
+      resolve3(false);
     });
     server.once("listening", () => {
       server.close();
-      resolve2(true);
+      resolve3(true);
     });
     server.listen(port, "127.0.0.1");
   });
@@ -2837,7 +2883,7 @@ async function dbBackup(options) {
   pgDump.stderr?.on("data", (data) => {
     errorOutput += data.toString();
   });
-  await new Promise((resolve2, reject) => {
+  await new Promise((resolve3, reject) => {
     pgDump.on("close", async (code) => {
       if (code === 0) {
         try {
@@ -2874,7 +2920,7 @@ async function dbBackup(options) {
             tags: tags.length > 0 ? tags : void 0
           };
           await saveBackupMetadata(metadata, filename);
-          resolve2();
+          resolve3();
         } catch (error) {
           reject(error);
         }
@@ -3263,7 +3309,7 @@ async function dbRestore(backupFile, options = {}) {
       spinner.start();
     }
   });
-  await new Promise((resolve2, reject) => {
+  await new Promise((resolve3, reject) => {
     restoreProcess.on("close", (code) => {
       if (code === 0) {
         const summary = objectCount > 0 ? ` (${objectCount} objects)` : "";
@@ -3277,7 +3323,7 @@ async function dbRestore(backupFile, options = {}) {
           }
         }
         console.log(chalk21.green("\n\u2705 Database restored successfully"));
-        resolve2();
+        resolve3();
       } else {
         spinner.fail("Restore failed");
         if (errors.length > 0) {
@@ -3735,11 +3781,11 @@ function toSafeSchemaName(str) {
 
 // src/commands/generate/template-loader.ts
 import { readFileSync as readFileSync8, existsSync as existsSync22 } from "fs";
-import { join as join19, dirname as dirname2 } from "path";
+import { join as join19, dirname as dirname3 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 function findTemplatesPath2() {
   const __filename = fileURLToPath2(import.meta.url);
-  const __dirname2 = dirname2(__filename);
+  const __dirname2 = dirname3(__filename);
   const distPath = join19(__dirname2, "commands", "generate", "templates");
   if (existsSync22(distPath)) {
     return distPath;
@@ -4919,7 +4965,7 @@ generateCommand.command("fn").description("Generate a new SPFN function module")
 import { Command as Command12 } from "commander";
 import chalk28 from "chalk";
 import { existsSync as existsSync25, readFileSync as readFileSync9, writeFileSync as writeFileSync19 } from "fs";
-import { resolve } from "path";
+import { resolve as resolve2 } from "path";
 import { parse } from "dotenv";
 var VALID_ENVS = ["local", "development", "staging", "production", "test"];
 var BASE_ENV_FILES = {
@@ -5201,7 +5247,7 @@ async function initEnvFiles(options) {
   }
 }
 function writeEnvTemplate(cwd, file, vars, force) {
-  const filePath = resolve(cwd, file);
+  const filePath = resolve2(cwd, file);
   if (existsSync25(filePath) && !force) {
     console.log(chalk28.yellow(`  \u23ED\uFE0F  ${file} already exists (use --force to overwrite)`));
     return;
@@ -5250,7 +5296,7 @@ async function checkEnvFiles(options) {
     const issues = [];
     const warnings = [];
     for (const file of filesToCheck) {
-      const filePath = resolve(cwd, file);
+      const filePath = resolve2(cwd, file);
       if (!existsSync25(filePath)) {
         continue;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spfn",
-  "version": "0.2.0-beta.45",
+  "version": "0.2.0-beta.46",
   "description": "Superfunction CLI - Add SPFN to your Next.js project",
   "type": "module",
   "bin": {
@@ -78,7 +78,7 @@
     "concurrently": "^9.2.1",
     "tsx": "^4.20.6",
     "typescript": "^5.3.3",
-    "@spfn/core": "0.2.0-beta.42"
+    "@spfn/core": "0.2.0-beta.45"
   },
   "scripts": {
     "build": "tsup && node scripts/copy-templates.js",