create-ej-app 31.0.0 → 32.0.0

package/README.md

@@ -59,7 +59,7 @@ You will be prompted for:
 - Project name
 - Description
 - Template (`nextjs`, `saas-starter`, or `api`)
-- Whether to initialize git. If yes, the CLI also makes the initial commit, as long as `.env` is ignored.
+- Whether to initialize git. If yes, the CLI creates the `main` branch (or your configured default, unless it is `master`) and makes the initial commit, as long as `.env` is ignored.
 - Whether to update packages to their latest versions. With Bun it runs `bun update -i`, so you pick which packages to update.
 
 Example:

package/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { execSync } from 'child_process';
+import { execFileSync, execSync } from 'child_process';
 import { program } from 'commander';
 import { randomBytes } from 'crypto';
 import enquirer from 'enquirer';
@@ -66,6 +66,24 @@ const getUpdateCommands = (packageManager) => {
             return null;
     }
 };
+/**
+ * The branch name for a new repository: the one set in git's
+ * init.defaultBranch, unless that is unset or `master`, which become `main`.
+ */
+const defaultBranch = () => {
+    let configured = '';
+    try {
+        configured = execSync('git config --get init.defaultBranch', {
+            stdio: 'pipe'
+        })
+            .toString()
+            .trim();
+    }
+    catch {
+        // Not set
+    }
+    return configured && configured !== 'master' ? configured : 'main';
+};
 /**
  * Commits the new project once. Skips the commit when .env is not ignored, so
  * the generated secret never lands in history, and explains a missing git
@@ -266,7 +284,10 @@ program.action(async (options) => {
     }
     if (git === 'yes') {
         try {
-            execSync('git init', { cwd: projectDir, stdio: 'inherit' });
+            execFileSync('git', ['init', '-b', defaultBranch()], {
+                cwd: projectDir,
+                stdio: 'inherit'
+            });
             commitEverything(projectDir);
         }
         catch (err) {

package/cli.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import { execSync } from 'child_process'
+import { execFileSync, execSync } from 'child_process'
 import { program } from 'commander'
 import { randomBytes } from 'crypto'
 import enquirer from 'enquirer'
@@ -81,6 +81,24 @@ const getUpdateCommands = (packageManager: string) => {
   }
 }
 
+/**
+ * The branch name for a new repository: the one set in git's
+ * init.defaultBranch, unless that is unset or `master`, which become `main`.
+ */
+const defaultBranch = () => {
+  let configured = ''
+  try {
+    configured = execSync('git config --get init.defaultBranch', {
+      stdio: 'pipe'
+    })
+      .toString()
+      .trim()
+  } catch {
+    // Not set
+  }
+  return configured && configured !== 'master' ? configured : 'main'
+}
+
 /**
  * Commits the new project once. Skips the commit when .env is not ignored, so
  * the generated secret never lands in history, and explains a missing git
@@ -348,7 +366,10 @@ program.action(async (options: Options) => {
 
   if (git === 'yes') {
     try {
-      execSync('git init', { cwd: projectDir, stdio: 'inherit' })
+      execFileSync('git', ['init', '-b', defaultBranch()], {
+        cwd: projectDir,
+        stdio: 'inherit'
+      })
       commitEverything(projectDir)
     } catch (err) {
       console.error('Error initializing git repository:', err)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-ej-app",
-  "version": "31.0.0",
+  "version": "32.0.0",
   "description": "Bootstrap a next.js app with my preferred setup",
   "main": "cli.js",
   "type": "module",