@ghentcdh/create-crouton 0.0.1-alpha.80 → 0.0.1-alpha.82

package/dist/index.js

@@ -26019,7 +26019,7 @@ import { join as join4 } from "path";
 
 // ../crouton-codegen/src/prisma-shell.ts
 import { spawn } from "child_process";
-import { existsSync as existsSync2, readdirSync as readdirSync2 } from "fs";
+import { existsSync as existsSync2 } from "fs";
 import { copyFile, readFile as readFile4, readdir as readdir4, writeFile as writeFile2 } from "fs/promises";
 import { createRequire } from "module";
 import { dirname as dirname6, join as join5 } from "path";
@@ -26074,6 +26074,7 @@ var installDeps = (pm, cwd) => new Promise((resolve3, reject) => {
   );
   child.on("error", reject);
 });
+var pmExec = (pm, bin) => ({ pnpm: `pnpm exec ${bin}`, yarn: `yarn ${bin}`, bun: `bunx ${bin}`, npm: `npx ${bin}` })[pm];
 
 // src/lib/prompts.ts
 var CancelledError = class extends Error {
@@ -26136,13 +26137,13 @@ var runCreate = async (name, opts) => {
       log.info(`Using pnpm ${pnpmVersion}`);
     }
     const dbUrl = await resolveDbUrl(opts);
-    const postgres = opts.docker !== false ? await resolvePostgres(opts) : false;
+    const postgres = opts.docker !== false && !dbUrl ? await resolvePostgres(opts) : false;
     const dbName = name.replace(/[^a-zA-Z0-9]/g, "_");
     const appName = prefix || name;
     const tokens = {
       name,
       Name: toTitle(name),
-      version: true ? "0.0.1-alpha.80" : "latest",
+      version: true ? "0.0.1-alpha.82" : "latest",
       year: String((/* @__PURE__ */ new Date()).getFullYear()),
       pmRun: pm === "npm" ? "npm run" : pm,
       urlEnv: "DATABASE_URL",
@@ -26194,6 +26195,7 @@ var runCreate = async (name, opts) => {
     }
     const templateRoot = resolveTemplateDir();
     const skipPaths = !frontend ? ["apps/frontend"] : [];
+    let resourcesUpdated = false;
     if (layout === "nx") {
       const rootTemplateDir = resolve2(templateRoot, "nx", "root");
       const rootFiles = await loadAndRenderTemplates(
@@ -26245,7 +26247,7 @@ var runCreate = async (name, opts) => {
       }
       const written = await writeFiles(files, { force: opts.force });
       log.success(`Wrote ${written} file(s) to ${import_picocolors.default.cyan(name)}/`);
-      await postScaffold(opts, targetDir, pm, dbUrl, prefix);
+      ({ resourcesUpdated } = await postScaffold(opts, targetDir, pm, dbUrl, prefix));
     } else {
       const templateDir = resolve2(templateRoot, "regular");
       const files = await loadAndRenderTemplates(
@@ -26284,16 +26286,15 @@ var runCreate = async (name, opts) => {
       }
       const written = await writeFiles(files, { force: opts.force });
       log.success(`Wrote ${written} file(s) to ${import_picocolors.default.cyan(name)}/`);
-      await postScaffold(opts, targetDir, pm, dbUrl);
+      ({ resourcesUpdated } = await postScaffold(opts, targetDir, pm, dbUrl));
     }
     const pmRun = pm === "npm" ? "npm run" : pm;
     const prefixFlag = prefix ? ` --prefix ${prefix}` : "";
     note(
       [
-        opts.docker !== false && postgres ? "docker compose up -d          # start postgres" : null,
-        `${pmRun} prisma:migrate          # create initial migration`,
-        `crouton update resources${prefixFlag}        # generate resource CRUD`,
-        `${pmRun} dev                     # start dev server`
+        postgres ? "docker compose up -d                 # start postgres" : null,
+        !resourcesUpdated ? `${pmExec(pm, "crouton")} update resources${prefixFlag}  # generate resource CRUD` : null,
+        `${pmRun} dev                            # start dev server`
       ].filter(Boolean).join("\n"),
       "Next steps"
     );
@@ -26392,6 +26393,7 @@ var postScaffold = async (opts, targetDir, pm, dbUrl, prefix) => {
       s.error("Git init failed (non-fatal)");
     }
   }
+  let resourcesUpdated = false;
   if (opts.install !== false) {
     const s = spinner();
     s.start(`Installing dependencies with ${pm}`);
@@ -26406,21 +26408,24 @@ var postScaffold = async (opts, targetDir, pm, dbUrl, prefix) => {
         const s2 = spinner();
         s2.start("Running crouton update resources");
         const prefixArg = prefix ? ` --prefix ${prefix}` : "";
-        execSync2(`npx crouton update resources --yes${prefixArg}`, {
+        execSync2(`${pmExec(pm, "crouton")} update resources --yes${prefixArg}`, {
           cwd: targetDir,
           stdio: "pipe",
           env: { ...process.env, DATABASE_URL: dbUrl }
         });
+        resourcesUpdated = true;
         s2.stop("Resources updated");
       } catch (err) {
         const stderr = err instanceof Error && "stderr" in err ? String(err.stderr).trim() : "";
+        const firstLine = stderr.split("\n").find((l2) => l2.trim()) ?? "";
         log.warn(
-          "crouton update resources failed \u2014 run it manually after setting up your database." + (stderr ? `
-${import_picocolors.default.dim(stderr)}` : "")
+          "crouton update resources failed \u2014 run it manually after setting up your database."
         );
+        if (firstLine) log.error(firstLine);
       }
     }
   }
+  return { resourcesUpdated };
 };
 var resolveLayout = async (opts) => {
   if (opts.prefix) return "nx";