@hanseltime/template-repo-sync 2.1.0 → 2.1.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [2.1.2](https://github.com/HanseltimeIndustries/template-repo-sync/compare/v2.1.1...v2.1.2) (2026-02-08)
+
+
+### Bug Fixes
+
+* afterref was skipping template ignores ([270b926](https://github.com/HanseltimeIndustries/template-repo-sync/commit/270b926983ddc7070c2099cfa8fa507d1b527233))
+
+## [2.1.1](https://github.com/HanseltimeIndustries/template-repo-sync/compare/v2.1.0...v2.1.1) (2026-02-08)
+
+
+### Bug Fixes
+
+* delete was not deleting the right file ([104e3ec](https://github.com/HanseltimeIndustries/template-repo-sync/commit/104e3ec8913c983f1d046bf19b197857e8016ff0))
+
 # [2.1.0](https://github.com/HanseltimeIndustries/template-repo-sync/compare/v2.0.4...v2.1.0) (2026-02-08)
 
 

package/lib/cjs/merge-file.js

@@ -28,13 +28,13 @@ async function mergeFile(relPath, context) {
     const templatePath = (0, path_1.join)(tempCloneDir, relPath);
     // Unless there's a need, we remove files that were deleted and don't pass them to plugins yet
     if (context.fileOperation === "deleted") {
-        if ((0, fs_1.existsSync)(templatePath)) {
-            await (0, promises_1.rm)(templatePath);
-            return {
-                ignoredDueToLocal: false,
-                localChanges: [],
-            };
+        if ((0, fs_1.existsSync)(filePath)) {
+            await (0, promises_1.rm)(filePath);
         }
+        return {
+            ignoredDueToLocal: false,
+            localChanges: [],
+        };
     }
     const mergeConfig = templateSyncConfig.merge?.find((mergeConfig) => (0, micromatch_1.isMatch)(relPath, mergeConfig.glob));
     const localMergeConfig = localTemplateSyncConfig.merge?.find((mergeConfig) => (0, micromatch_1.isMatch)(relPath, mergeConfig.glob));

package/lib/cjs/template-sync.js

@@ -34,6 +34,7 @@ const ref_drivers_1 = require("./ref-drivers");
 const formatting_1 = require("./formatting");
 const commentJSON = __importStar(require("comment-json"));
 const checkout_drivers_1 = require("./checkout-drivers");
+const micromatch_1 = require("micromatch");
 exports.TEMPLATE_SYNC_CONFIG = "templatesync";
 exports.TEMPLATE_SYNC_LOCAL_CONFIG = "templatesync.local";
 async function templateSync(options) {
@@ -78,6 +79,10 @@ async function templateSync(options) {
             modified: [],
         };
     }
+    // Apply ignore filters
+    filesToSync.added = filesToSync.added.filter((f) => !(0, micromatch_1.some)(f, templateSyncConfig.ignore));
+    filesToSync.modified = filesToSync.modified.filter((f) => !(0, micromatch_1.some)(f, templateSyncConfig.ignore));
+    filesToSync.deleted = filesToSync.deleted.filter((f) => !(0, micromatch_1.some)(f, templateSyncConfig.ignore));
     const localSkipFiles = [];
     const localFileChanges = {};
     const fileSyncFactory = (op) => {

package/lib/esm/merge-file.js

@@ -28,13 +28,13 @@ async function mergeFile(relPath, context) {
     const templatePath = (0, path_1.join)(tempCloneDir, relPath);
     // Unless there's a need, we remove files that were deleted and don't pass them to plugins yet
     if (context.fileOperation === "deleted") {
-        if ((0, fs_1.existsSync)(templatePath)) {
-            await (0, promises_1.rm)(templatePath);
-            return {
-                ignoredDueToLocal: false,
-                localChanges: [],
-            };
+        if ((0, fs_1.existsSync)(filePath)) {
+            await (0, promises_1.rm)(filePath);
         }
+        return {
+            ignoredDueToLocal: false,
+            localChanges: [],
+        };
     }
     const mergeConfig = templateSyncConfig.merge?.find((mergeConfig) => (0, micromatch_1.isMatch)(relPath, mergeConfig.glob));
     const localMergeConfig = localTemplateSyncConfig.merge?.find((mergeConfig) => (0, micromatch_1.isMatch)(relPath, mergeConfig.glob));

package/lib/esm/template-sync.js

@@ -34,6 +34,7 @@ const ref_drivers_1 = require("./ref-drivers");
 const formatting_1 = require("./formatting");
 const commentJSON = __importStar(require("comment-json"));
 const checkout_drivers_1 = require("./checkout-drivers");
+const micromatch_1 = require("micromatch");
 exports.TEMPLATE_SYNC_CONFIG = "templatesync";
 exports.TEMPLATE_SYNC_LOCAL_CONFIG = "templatesync.local";
 async function templateSync(options) {
@@ -78,6 +79,10 @@ async function templateSync(options) {
             modified: [],
         };
     }
+    // Apply ignore filters
+    filesToSync.added = filesToSync.added.filter((f) => !(0, micromatch_1.some)(f, templateSyncConfig.ignore));
+    filesToSync.modified = filesToSync.modified.filter((f) => !(0, micromatch_1.some)(f, templateSyncConfig.ignore));
+    filesToSync.deleted = filesToSync.deleted.filter((f) => !(0, micromatch_1.some)(f, templateSyncConfig.ignore));
     const localSkipFiles = [];
     const localFileChanges = {};
     const fileSyncFactory = (op) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hanseltime/template-repo-sync",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "An npm library that enables pluggable, customizable synchronization between template repos",
   "main": "lib/cjs/index.js",
   "types": "lib/cjs/index.d.ts",

package/src/merge-file.spec.ts

@@ -11,19 +11,19 @@ const testDownstreamDir = resolve(TEST_FIXTURES_DIR, "downstream");
 
 describe("mergeFile", () => {
   let tmpDir: string;
-  let tmpTargetDir: string;
+  let tmpTemplateDir: string;
   beforeEach(async () => {
     tmpDir = await mkdtemp(tempDir());
     copySync(testDownstreamDir, tmpDir);
-    tmpTargetDir = await mkdtemp(tempDir());
-    copySync(testTemplateDir, tmpTargetDir);
+    tmpTemplateDir = await mkdtemp(tempDir());
+    copySync(testTemplateDir, tmpTemplateDir);
   });
   afterEach(async () => {
     await rm(tmpDir, {
       force: true,
       recursive: true,
     });
-    await rm(tmpTargetDir, {
+    await rm(tmpTemplateDir, {
       force: true,
       recursive: true,
     });
@@ -49,7 +49,7 @@ describe("mergeFile", () => {
       expect(
         await mergeFile("package.json", {
           cwd: tmpDir,
-          tempCloneDir: tmpTargetDir,
+          tempCloneDir: tmpTemplateDir,
           localTemplateSyncConfig: {
             ignore: ["**/package.json"],
             merge: [],
@@ -70,7 +70,7 @@ describe("mergeFile", () => {
       expect(
         await mergeFile("package.json", {
           cwd: tmpDir,
-          tempCloneDir: tmpTargetDir,
+          tempCloneDir: tmpTemplateDir,
           localTemplateSyncConfig: {
             ignore: [],
           },
@@ -86,7 +86,7 @@ describe("mergeFile", () => {
 
       // Ensure we overwrote
       expect(await readFile(join(tmpDir, "package.json"))).toEqual(
-        await readFile(join(tmpTargetDir, "package.json")),
+        await readFile(join(tmpTemplateDir, "package.json")),
       );
     },
   );
@@ -94,7 +94,7 @@ describe("mergeFile", () => {
     expect(
       await mergeFile("package.json", {
         cwd: tmpDir,
-        tempCloneDir: tmpTargetDir,
+        tempCloneDir: tmpTemplateDir,
         localTemplateSyncConfig: {
           ignore: [],
         },
@@ -109,7 +109,7 @@ describe("mergeFile", () => {
     });
 
     // Ensure we overwrote
-    expect(existsSync(join(tmpTargetDir, "package.json"))).toBeFalsy();
+    expect(existsSync(join(tmpDir, "package.json"))).toBeFalsy();
   });
 
   // TODO - this could change if there's a use case
@@ -117,7 +117,7 @@ describe("mergeFile", () => {
     expect(
       await mergeFile("package.json", {
         cwd: tmpDir,
-        tempCloneDir: tmpTargetDir,
+        tempCloneDir: tmpTemplateDir,
         localTemplateSyncConfig: {
           ignore: [],
           merge: [
@@ -157,7 +157,7 @@ describe("mergeFile", () => {
     });
 
     // Ensure we overwrote
-    expect(existsSync(join(tmpTargetDir, "package.json"))).toBeFalsy();
+    expect(existsSync(join(tmpDir, "package.json"))).toBeFalsy();
   });
 
   describe.each([["added" as FileOperation], ["modified" as FileOperation]])(

package/src/merge-file.ts

@@ -54,13 +54,13 @@ export async function mergeFile(
 
   // Unless there's a need, we remove files that were deleted and don't pass them to plugins yet
   if (context.fileOperation === "deleted") {
-    if (existsSync(templatePath)) {
-      await rm(templatePath);
-      return {
-        ignoredDueToLocal: false,
-        localChanges: [],
-      };
+    if (existsSync(filePath)) {
+      await rm(filePath);
     }
+    return {
+      ignoredDueToLocal: false,
+      localChanges: [],
+    };
   }
 
   const mergeConfig = templateSyncConfig.merge?.find((mergeConfig) =>

package/src/template-sync.spec.ts

@@ -256,7 +256,7 @@ describe("templateSync", () => {
     // We will only update the templated.ts
     const mockDiffDriver = jest.fn().mockImplementation(async () => ({
       added: ["src/templated.ts"],
-      modified: [],
+      modified: ["src/index.ts"], // Add index.ts so we make sure it is still ignored - due to a bug
       deleted: [],
     }));
     const mockCurrentRefDriver = jest

package/src/template-sync.ts

@@ -12,6 +12,7 @@ import { TemplateRefDriverFn } from "./ref-drivers/types";
 import { inferJSONIndent } from "./formatting";
 import * as commentJSON from "comment-json";
 import { TemplateCheckoutDriverFn, gitCheckout } from "./checkout-drivers";
+import { some } from "micromatch";
 
 export interface TemplateSyncOptions {
   /**
@@ -141,6 +142,17 @@ export async function templateSync(
     };
   }
 
+  // Apply ignore filters
+  filesToSync.added = filesToSync.added.filter(
+    (f) => !some(f, templateSyncConfig.ignore),
+  );
+  filesToSync.modified = filesToSync.modified.filter(
+    (f) => !some(f, templateSyncConfig.ignore),
+  );
+  filesToSync.deleted = filesToSync.deleted.filter(
+    (f) => !some(f, templateSyncConfig.ignore),
+  );
+
   const localSkipFiles: string[] = [];
   const localFileChanges: {
     [filePath: string]: Change[];

package/test-fixtures/downstream/src/templated.js

@@ -1,2 +1,2 @@
 "use strict";
-console.log("this is templated stuff that should not change");
+console.log("this is downstream stuff that should not change");

package/test-fixtures/downstream/src/templated.ts

@@ -1 +1 @@
-console.log("this is templated stuff that should not change");
+console.log("this is downstream stuff that should not change");