fix: include package-lock.json in initial commit, replace ts-node with tsx for ESM support

Author: Jszigeti

src/configs.ts

@@ -30,9 +30,9 @@ export const DEFAULT_OPTIONS: Omit<ToolOptions, 'yes' | 'default'> = {
  */
 export const TOOL_CONFIGS = {
   nodemon: {
-    deps: ['nodemon', 'ts-node'],
+    deps: ['nodemon', 'tsx'],
     scripts: {
-      dev: 'nodemon --watch src -e ts --exec "ts-node src/index.ts"',
+      dev: 'nodemon --watch src -e ts --exec "tsx src/index.ts"',
     },
   },
   eslint: {

src/generator.ts

@@ -387,25 +387,6 @@ export async function createProject(opts: CreateOptions) {
             'node_modules\ndist\n.env\n',
             'utf8',
           );
-          if (!(toolOptions.noCommit ?? false)) {
-            try {
-              runCommand(
-                'git',
-                ['add', '-A'],
-                target,
-                toolOptions.verbose ?? false,
-              );
-              runCommand(
-                'git',
-                ['commit', '-m', 'chore: initial commit'],
-                target,
-                toolOptions.verbose ?? false,
-              );
-            } catch (e) {
-              const errMsg = e instanceof Error ? e.message : String(e);
-              console.warn(MESSAGES.gitCommitFailed(errMsg));
-            }
-          }
         }
       }
     } catch (e) {
@@ -447,4 +428,56 @@ export async function createProject(opts: CreateOptions) {
       console.warn(MESSAGES.installFailed(pm, errMsg));
     }
   }
+
+  // Git initial commit AFTER npm install to include package-lock.json
+  if ((toolOptions.git ?? true) && !(toolOptions.noCommit ?? false)) {
+    try {
+      const gitAvailable = runCommand(
+        'git',
+        ['--version'],
+        target,
+        false,
+        true,
+      );
+      if (gitAvailable) {
+        const insideRepo = runCommand(
+          'git',
+          ['rev-parse', '--is-inside-work-tree'],
+          target,
+          false,
+          true,
+        );
+        const hasCommits = runCommand(
+          'git',
+          ['rev-parse', 'HEAD'],
+          target,
+          false,
+          true,
+        );
+
+        if (!insideRepo || !hasCommits) {
+          try {
+            runCommand(
+              'git',
+              ['add', '-A'],
+              target,
+              toolOptions.verbose ?? false,
+            );
+            runCommand(
+              'git',
+              ['commit', '-m', 'chore: initial commit'],
+              target,
+              toolOptions.verbose ?? false,
+            );
+          } catch (e) {
+            const errMsg = e instanceof Error ? e.message : String(e);
+            console.warn(MESSAGES.gitCommitFailed(errMsg));
+          }
+        }
+      }
+    } catch (e) {
+      const errMsg = e instanceof Error ? e.message : String(e);
+      console.warn(MESSAGES.gitCommitFailed(errMsg));
+    }
+  }
 }