@hanseltime/template-repo-sync 2.1.0 → 2.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +7 -0
- package/lib/cjs/merge-file.js +6 -6
- package/lib/esm/merge-file.js +6 -6
- package/package.json +1 -1
- package/src/merge-file.spec.ts +11 -11
- package/src/merge-file.ts +6 -6
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
## [2.1.1](https://github.com/HanseltimeIndustries/template-repo-sync/compare/v2.1.0...v2.1.1) (2026-02-08)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* delete was not deleting the right file ([104e3ec](https://github.com/HanseltimeIndustries/template-repo-sync/commit/104e3ec8913c983f1d046bf19b197857e8016ff0))
|
|
7
|
+
|
|
1
8
|
# [2.1.0](https://github.com/HanseltimeIndustries/template-repo-sync/compare/v2.0.4...v2.1.0) (2026-02-08)
|
|
2
9
|
|
|
3
10
|
|
package/lib/cjs/merge-file.js
CHANGED
|
@@ -28,13 +28,13 @@ async function mergeFile(relPath, context) {
|
|
|
28
28
|
const templatePath = (0, path_1.join)(tempCloneDir, relPath);
|
|
29
29
|
// Unless there's a need, we remove files that were deleted and don't pass them to plugins yet
|
|
30
30
|
if (context.fileOperation === "deleted") {
|
|
31
|
-
if ((0, fs_1.existsSync)(
|
|
32
|
-
await (0, promises_1.rm)(
|
|
33
|
-
return {
|
|
34
|
-
ignoredDueToLocal: false,
|
|
35
|
-
localChanges: [],
|
|
36
|
-
};
|
|
31
|
+
if ((0, fs_1.existsSync)(filePath)) {
|
|
32
|
+
await (0, promises_1.rm)(filePath);
|
|
37
33
|
}
|
|
34
|
+
return {
|
|
35
|
+
ignoredDueToLocal: false,
|
|
36
|
+
localChanges: [],
|
|
37
|
+
};
|
|
38
38
|
}
|
|
39
39
|
const mergeConfig = templateSyncConfig.merge?.find((mergeConfig) => (0, micromatch_1.isMatch)(relPath, mergeConfig.glob));
|
|
40
40
|
const localMergeConfig = localTemplateSyncConfig.merge?.find((mergeConfig) => (0, micromatch_1.isMatch)(relPath, mergeConfig.glob));
|
package/lib/esm/merge-file.js
CHANGED
|
@@ -28,13 +28,13 @@ async function mergeFile(relPath, context) {
|
|
|
28
28
|
const templatePath = (0, path_1.join)(tempCloneDir, relPath);
|
|
29
29
|
// Unless there's a need, we remove files that were deleted and don't pass them to plugins yet
|
|
30
30
|
if (context.fileOperation === "deleted") {
|
|
31
|
-
if ((0, fs_1.existsSync)(
|
|
32
|
-
await (0, promises_1.rm)(
|
|
33
|
-
return {
|
|
34
|
-
ignoredDueToLocal: false,
|
|
35
|
-
localChanges: [],
|
|
36
|
-
};
|
|
31
|
+
if ((0, fs_1.existsSync)(filePath)) {
|
|
32
|
+
await (0, promises_1.rm)(filePath);
|
|
37
33
|
}
|
|
34
|
+
return {
|
|
35
|
+
ignoredDueToLocal: false,
|
|
36
|
+
localChanges: [],
|
|
37
|
+
};
|
|
38
38
|
}
|
|
39
39
|
const mergeConfig = templateSyncConfig.merge?.find((mergeConfig) => (0, micromatch_1.isMatch)(relPath, mergeConfig.glob));
|
|
40
40
|
const localMergeConfig = localTemplateSyncConfig.merge?.find((mergeConfig) => (0, micromatch_1.isMatch)(relPath, mergeConfig.glob));
|
package/package.json
CHANGED
package/src/merge-file.spec.ts
CHANGED
|
@@ -11,19 +11,19 @@ const testDownstreamDir = resolve(TEST_FIXTURES_DIR, "downstream");
|
|
|
11
11
|
|
|
12
12
|
describe("mergeFile", () => {
|
|
13
13
|
let tmpDir: string;
|
|
14
|
-
let
|
|
14
|
+
let tmpTemplateDir: string;
|
|
15
15
|
beforeEach(async () => {
|
|
16
16
|
tmpDir = await mkdtemp(tempDir());
|
|
17
17
|
copySync(testDownstreamDir, tmpDir);
|
|
18
|
-
|
|
19
|
-
copySync(testTemplateDir,
|
|
18
|
+
tmpTemplateDir = await mkdtemp(tempDir());
|
|
19
|
+
copySync(testTemplateDir, tmpTemplateDir);
|
|
20
20
|
});
|
|
21
21
|
afterEach(async () => {
|
|
22
22
|
await rm(tmpDir, {
|
|
23
23
|
force: true,
|
|
24
24
|
recursive: true,
|
|
25
25
|
});
|
|
26
|
-
await rm(
|
|
26
|
+
await rm(tmpTemplateDir, {
|
|
27
27
|
force: true,
|
|
28
28
|
recursive: true,
|
|
29
29
|
});
|
|
@@ -49,7 +49,7 @@ describe("mergeFile", () => {
|
|
|
49
49
|
expect(
|
|
50
50
|
await mergeFile("package.json", {
|
|
51
51
|
cwd: tmpDir,
|
|
52
|
-
tempCloneDir:
|
|
52
|
+
tempCloneDir: tmpTemplateDir,
|
|
53
53
|
localTemplateSyncConfig: {
|
|
54
54
|
ignore: ["**/package.json"],
|
|
55
55
|
merge: [],
|
|
@@ -70,7 +70,7 @@ describe("mergeFile", () => {
|
|
|
70
70
|
expect(
|
|
71
71
|
await mergeFile("package.json", {
|
|
72
72
|
cwd: tmpDir,
|
|
73
|
-
tempCloneDir:
|
|
73
|
+
tempCloneDir: tmpTemplateDir,
|
|
74
74
|
localTemplateSyncConfig: {
|
|
75
75
|
ignore: [],
|
|
76
76
|
},
|
|
@@ -86,7 +86,7 @@ describe("mergeFile", () => {
|
|
|
86
86
|
|
|
87
87
|
// Ensure we overwrote
|
|
88
88
|
expect(await readFile(join(tmpDir, "package.json"))).toEqual(
|
|
89
|
-
await readFile(join(
|
|
89
|
+
await readFile(join(tmpTemplateDir, "package.json")),
|
|
90
90
|
);
|
|
91
91
|
},
|
|
92
92
|
);
|
|
@@ -94,7 +94,7 @@ describe("mergeFile", () => {
|
|
|
94
94
|
expect(
|
|
95
95
|
await mergeFile("package.json", {
|
|
96
96
|
cwd: tmpDir,
|
|
97
|
-
tempCloneDir:
|
|
97
|
+
tempCloneDir: tmpTemplateDir,
|
|
98
98
|
localTemplateSyncConfig: {
|
|
99
99
|
ignore: [],
|
|
100
100
|
},
|
|
@@ -109,7 +109,7 @@ describe("mergeFile", () => {
|
|
|
109
109
|
});
|
|
110
110
|
|
|
111
111
|
// Ensure we overwrote
|
|
112
|
-
expect(existsSync(join(
|
|
112
|
+
expect(existsSync(join(tmpDir, "package.json"))).toBeFalsy();
|
|
113
113
|
});
|
|
114
114
|
|
|
115
115
|
// TODO - this could change if there's a use case
|
|
@@ -117,7 +117,7 @@ describe("mergeFile", () => {
|
|
|
117
117
|
expect(
|
|
118
118
|
await mergeFile("package.json", {
|
|
119
119
|
cwd: tmpDir,
|
|
120
|
-
tempCloneDir:
|
|
120
|
+
tempCloneDir: tmpTemplateDir,
|
|
121
121
|
localTemplateSyncConfig: {
|
|
122
122
|
ignore: [],
|
|
123
123
|
merge: [
|
|
@@ -157,7 +157,7 @@ describe("mergeFile", () => {
|
|
|
157
157
|
});
|
|
158
158
|
|
|
159
159
|
// Ensure we overwrote
|
|
160
|
-
expect(existsSync(join(
|
|
160
|
+
expect(existsSync(join(tmpDir, "package.json"))).toBeFalsy();
|
|
161
161
|
});
|
|
162
162
|
|
|
163
163
|
describe.each([["added" as FileOperation], ["modified" as FileOperation]])(
|
package/src/merge-file.ts
CHANGED
|
@@ -54,13 +54,13 @@ export async function mergeFile(
|
|
|
54
54
|
|
|
55
55
|
// Unless there's a need, we remove files that were deleted and don't pass them to plugins yet
|
|
56
56
|
if (context.fileOperation === "deleted") {
|
|
57
|
-
if (existsSync(
|
|
58
|
-
await rm(
|
|
59
|
-
return {
|
|
60
|
-
ignoredDueToLocal: false,
|
|
61
|
-
localChanges: [],
|
|
62
|
-
};
|
|
57
|
+
if (existsSync(filePath)) {
|
|
58
|
+
await rm(filePath);
|
|
63
59
|
}
|
|
60
|
+
return {
|
|
61
|
+
ignoredDueToLocal: false,
|
|
62
|
+
localChanges: [],
|
|
63
|
+
};
|
|
64
64
|
}
|
|
65
65
|
|
|
66
66
|
const mergeConfig = templateSyncConfig.merge?.find((mergeConfig) =>
|