@gadmin2n/cli 0.0.136 → 0.0.138

package/actions/update.action.js

@@ -998,6 +998,7 @@ class UpdateAction extends abstract_action_1.AbstractAction {
             let preflight = null;
             let baseHandle = null;
             let theirsHandle = null;
+            let changesApplied = false;
             try {
                 if (templateEnabled) {
                     try {
@@ -1084,6 +1085,7 @@ class UpdateAction extends abstract_action_1.AbstractAction {
                             // Pre-apply preview + confirm (skipped under --yes).
                             const applyAndReport = () => {
                                 const conflicts = applyPlan(plan, baseRoot, instanceDir, theirsRoot, mergeOpts);
+                                changesApplied = true;
                                 // Always advance meta to new version, even when conflicts present (invariant #2).
                                 (0, base_store_1.writeMeta)(instanceDir, {
                                     schematicsVersion,
@@ -1152,6 +1154,19 @@ class UpdateAction extends abstract_action_1.AbstractAction {
                 if (pkgSnapshots) {
                     yield maybeInstallChangedDeps(pkgSnapshots, dryRun);
                 }
+                // Final: remind the user to commit the changes.
+                if (changesApplied && !dryRun) {
+                    console.info(chalk.bold('\n═══════════════════════════════════════════════════'));
+                    console.info(chalk.bold('  Next step'));
+                    console.info(chalk.bold('═══════════════════════════════════════════════════\n'));
+                    console.info(chalk.cyan('📝 Template files have been updated. Commit the changes:'));
+                    console.info();
+                    console.info(chalk.white('   git add .'));
+                    console.info(chalk.white('   git commit -m "chore: upgrade gadmin2 template"'));
+                    console.info();
+                    console.info(chalk.gray('   Tip: review the diff first with `git diff --staged` before committing.'));
+                    console.info();
+                }
             }
             finally {
                 if (baseHandle)

package/lib/template-merge/materialize.js

@@ -33,6 +33,7 @@ function materializeFromLocalRegistry(registryDir, version, templateName) {
     }
     const dst = fs.mkdtempSync(path.join(os.tmpdir(), 'gadmin2-base-'));
     copyTreeRecursive(src, dst);
+    restoreGitignoreNames(dst);
     let cleaned = false;
     const cleanup = () => {
         if (cleaned)
@@ -88,6 +89,7 @@ function materializeFromNpm(version, templateName) {
         const candidates = templateNameCandidates(templateName).map((n) => path.join(tmp, 'package/dist/lib/application/files', n));
         for (const c of candidates) {
             if (fs.existsSync(c)) {
+                restoreGitignoreNames(c);
                 return { dir: c, cleanup };
             }
         }
@@ -127,6 +129,26 @@ function copyTreeRecursive(src, dst) {
         // symlinks / sockets: skip
     }
 }
+/**
+ * Rename all `gitignore` files back to `.gitignore` in the materialized
+ * template directory. The schematics prebuild script renames `.gitignore` →
+ * `gitignore` before `npm pack` because npm strips dotfiles named `.gitignore`
+ * from tarballs. After extraction we must restore the canonical name so that
+ * the 3-way merge compares `base/.gitignore` vs `ours/.gitignore` vs
+ * `theirs/.gitignore` — without this, the merge misidentifies the file as
+ * deleted by the instance and added by the instance under a different name.
+ */
+function restoreGitignoreNames(dir) {
+    for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+        const abs = path.join(dir, entry.name);
+        if (entry.isDirectory()) {
+            restoreGitignoreNames(abs);
+        }
+        else if (entry.isFile() && entry.name === 'gitignore') {
+            fs.renameSync(abs, path.join(dir, '.gitignore'));
+        }
+    }
+}
 /**
  * Resolve the latest published version of `@gadmin2n/schematics`.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gadmin2n/cli",
-  "version": "0.0.136",
+  "version": "0.0.138",
   "description": "Gadmin - modern, fast, powerful node.js web framework (@cli)",
   "publishConfig": {
     "access": "public"
@@ -47,7 +47,7 @@
     "@angular-devkit/core": "13.3.2",
     "@angular-devkit/schematics": "13.3.2",
     "@angular-devkit/schematics-cli": "13.3.2",
-    "@gadmin2n/schematics": "^0.0.108",
+    "@gadmin2n/schematics": "^0.0.109",
     "abc": "^0.6.1",
     "chalk": "3.0.0",
     "chokidar": "3.5.3",