@betterstart/cli 0.1.16 → 0.1.18

package/dist/cli.js

@@ -4672,7 +4672,12 @@ export const ${toCamelCase5(junctionName)} = pgTable(
 }
 function mergeImports(content, requiredImports, needsSql) {
   const pgCoreMatch = content.match(/import\s+\{([^}]+)\}\s+from\s+['"]drizzle-orm\/pg-core['"]/);
-  const hasSqlImport = content.includes("import { sql } from 'drizzle-orm'");
+  const drizzleOrmMatch = content.match(/import\s*\{([^}]*)\}\s*from\s*['"]drizzle-orm['"]/);
+  const existingDrizzleOrmImports = /* @__PURE__ */ new Set();
+  if (drizzleOrmMatch) {
+    drizzleOrmMatch[1].split(",").map((i) => i.trim()).filter(Boolean).forEach((i) => existingDrizzleOrmImports.add(i));
+  }
+  const hasSqlImport = existingDrizzleOrmImports.has("sql");
   const existing = /* @__PURE__ */ new Set();
   if (pgCoreMatch) {
     pgCoreMatch[1].split(",").map((i) => i.trim()).filter(Boolean).forEach((i) => {
@@ -4687,9 +4692,9 @@ function mergeImports(content, requiredImports, needsSql) {
   let updated = content;
   if (pgCoreMatch) {
     updated = updated.replace(/import\s+\{[^}]+\}\s+from\s+['"]drizzle-orm\/pg-core['"]/, newImport);
-  } else if (hasSqlImport) {
+  } else if (drizzleOrmMatch) {
     updated = updated.replace(
-      /import\s+\{[^}]+\}\s+from\s+['"]drizzle-orm['"]/,
+      /import\s*\{[^}]*\}\s*from\s*['"]drizzle-orm['"]/,
       (match) => `${match}
 ${newImport}`
     );
@@ -4698,8 +4703,17 @@ ${newImport}`
 ${updated}`;
   }
   if (needsSql && !hasSqlImport) {
-    updated = `import { sql } from 'drizzle-orm'
+    if (drizzleOrmMatch) {
+      existingDrizzleOrmImports.add("sql");
+      const sortedOrm = Array.from(existingDrizzleOrmImports).sort();
+      updated = updated.replace(
+        /import\s*\{[^}]*\}\s*from\s*['"]drizzle-orm['"]/,
+        `import { ${sortedOrm.join(", ")} } from 'drizzle-orm'`
+      );
+    } else {
+      updated = `import { sql } from 'drizzle-orm'
 ${updated}`;
+    }
   }
   return updated;
 }
@@ -11663,7 +11677,7 @@ var CORE_DEPS = [
   "vaul"
 ];
 var EMAIL_DEPS = ["resend", "@react-email/components"];
-var DEV_DEPS = ["drizzle-kit", "sass", "@types/katex", "@types/markdown-it"];
+var DEV_DEPS = ["drizzle-kit", "tsx", "sass", "@types/katex", "@types/markdown-it"];
 var BIOME_DEV_DEPS = ["@biomejs/biome"];
 function buildAddArgs(pm, deps, dev) {
   const devFlag = dev ? pm === "yarn" ? "--dev" : "-D" : "";
@@ -13437,8 +13451,24 @@ function buildSeedScript() {
  * AUTO-GENERATED \u2014 safe to delete after running
  */
 
-import { loadEnvConfig } from '@next/env'
-loadEnvConfig(process.cwd())
+import { readFileSync } from 'node:fs'
+import { resolve } from 'node:path'
+
+// Load .env.local (inline \u2014 avoids @next/env dependency)
+for (const envFile of ['.env.local', '.env']) {
+  try {
+    const content = readFileSync(resolve(process.cwd(), envFile), 'utf-8')
+    for (const line of content.split('\\n')) {
+      const trimmed = line.trim()
+      if (!trimmed || trimmed.startsWith('#')) continue
+      const eqIdx = trimmed.indexOf('=')
+      if (eqIdx === -1) continue
+      const key = trimmed.slice(0, eqIdx).trim()
+      const val = trimmed.slice(eqIdx + 1).trim().replace(/^['"]|['"]$/g, '')
+      if (!process.env[key]) process.env[key] = val
+    }
+  } catch {}
+}
 
 import { neon } from '@neondatabase/serverless'
 import { drizzle } from 'drizzle-orm/neon-http'
@@ -13557,7 +13587,8 @@ var seedCommand = new Command2("seed").description("Create the initial admin use
   spinner3.start("Creating admin user...");
   try {
     const { execFileSync: execFileSync5 } = await import("child_process");
-    execFileSync5("npx", ["tsx", seedPath], {
+    const tsxBin = path36.join(cwd, "node_modules", ".bin", "tsx");
+    execFileSync5(tsxBin, [seedPath], {
       cwd,
       stdio: "pipe",
       env: {
@@ -13992,7 +14023,8 @@ async function runSeed(cwd, cmsDir, email, password3) {
   }
   fs32.writeFileSync(seedPath, buildSeedScript(), "utf-8");
   try {
-    execFileSync4("npx", ["tsx", seedPath], {
+    const tsxBin = path37.join(cwd, "node_modules", ".bin", "tsx");
+    execFileSync4(tsxBin, [seedPath], {
       cwd,
       stdio: "pipe",
       timeout: 3e4,
@@ -14014,7 +14046,8 @@ async function runSeed(cwd, cmsDir, email, password3) {
 }
 function runDrizzlePush(cwd) {
   return new Promise((resolve) => {
-    const child = spawn2("npx", ["drizzle-kit", "push", "--force"], {
+    const drizzleBin = path37.join(cwd, "node_modules", ".bin", "drizzle-kit");
+    const child = spawn2(drizzleBin, ["push", "--force"], {
       cwd,
       stdio: "pipe",
       env: { ...process.env }