@storm-software/git-tools 2.132.3 → 2.132.6
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/bin/git.cjs +146 -99
- package/bin/git.cjs.map +1 -1
- package/bin/git.js +146 -99
- package/bin/git.js.map +1 -1
- package/dist/{chunk-52Z6PKZI.js → chunk-24CYS6A4.js} +48 -2
- package/dist/{chunk-WRSI3KUJ.cjs → chunk-DGAH7HON.cjs} +6 -6
- package/dist/{chunk-U5IGP2SZ.cjs → chunk-GEVS4JLR.cjs} +50 -4
- package/dist/{chunk-5TXHP6RI.cjs → chunk-PRUAX34Y.cjs} +99 -99
- package/dist/{chunk-RIPABM45.cjs → chunk-QZHJ2A5V.cjs} +11 -11
- package/dist/{chunk-XS6PFVQQ.js → chunk-R3JHNAJF.js} +1 -1
- package/dist/{chunk-OMWWQPRY.js → chunk-SXXS7K65.js} +2 -2
- package/dist/{chunk-4T5NCWMG.js → chunk-XENWDHMR.js} +99 -99
- package/dist/commit/minimal.cjs +4 -4
- package/dist/commit/minimal.js +2 -2
- package/dist/commit/monorepo.cjs +5 -5
- package/dist/commit/monorepo.js +3 -3
- package/dist/commitlint/minimal.cjs +2 -2
- package/dist/commitlint/minimal.js +1 -1
- package/dist/commitlint/monorepo.cjs +2 -2
- package/dist/commitlint/monorepo.js +1 -1
- package/dist/index.cjs +22 -22
- package/dist/index.js +4 -4
- package/dist/release/config.cjs +21 -21
- package/dist/release/config.js +4 -4
- package/package.json +9 -9
package/bin/git.js
CHANGED
|
@@ -41,6 +41,7 @@ import { parse } from 'yaml';
|
|
|
41
41
|
import { printAndFlushChanges } from 'nx/src/command-line/release/utils/print-changes';
|
|
42
42
|
import { createGitTagValues, handleDuplicateGitTags, createCommitMessageValues, isPrerelease, shouldPreferDockerVersionForReleaseGroup, ReleaseVersion, noDiffInChangelogMessage, shouldSkipVersionActions } from 'nx/src/command-line/release/utils/shared';
|
|
43
43
|
import { interpolate } from 'nx/src/tasks-runner/utils';
|
|
44
|
+
import { z } from 'zod';
|
|
44
45
|
import { execCommand } from 'nx/src/command-line/release/utils/exec-command';
|
|
45
46
|
import { getCommitHash, getFirstGitCommit, gitPush, gitAdd, parseCommits, getGitDiff, sanitizeProjectNameForGitTag, extractTagAndVersion } from 'nx/src/command-line/release/utils/git';
|
|
46
47
|
import semver, { prerelease, coerce, gte, valid, gt, major } from 'semver';
|
|
@@ -88,130 +89,130 @@ function stringifyCargoToml(cargoToml) {
|
|
|
88
89
|
// ../conventional-changelog/src/commit-types.ts
|
|
89
90
|
var DEFAULT_COMMIT_TYPES = {
|
|
90
91
|
/* --- Bumps version when selected --- */
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
92
|
+
chore: {
|
|
93
|
+
description: "Other changes that don't modify src or test files",
|
|
94
|
+
title: "Chore",
|
|
95
|
+
emoji: "\u2699\uFE0F ",
|
|
96
|
+
semverBump: "patch",
|
|
97
|
+
changelog: {
|
|
98
|
+
title: "Miscellaneous",
|
|
99
|
+
hidden: false
|
|
99
100
|
}
|
|
100
101
|
},
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
102
|
+
fix: {
|
|
103
|
+
description: "A change that resolves an issue previously identified with the package",
|
|
104
|
+
title: "Bug Fix",
|
|
105
|
+
emoji: "\u{1FAB2} ",
|
|
106
|
+
semverBump: "patch",
|
|
107
|
+
changelog: {
|
|
108
|
+
title: "Bug Fixes",
|
|
109
|
+
hidden: false
|
|
109
110
|
}
|
|
110
111
|
},
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
112
|
+
feat: {
|
|
113
|
+
description: "A change that adds a new feature to the package",
|
|
114
|
+
title: "Feature",
|
|
115
|
+
emoji: "\u{1F511} ",
|
|
116
|
+
semverBump: "minor",
|
|
117
|
+
changelog: {
|
|
118
|
+
title: "Features",
|
|
119
|
+
hidden: false
|
|
119
120
|
}
|
|
120
121
|
},
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
122
|
+
ci: {
|
|
123
|
+
description: "Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)",
|
|
124
|
+
title: "Continuous Integration",
|
|
125
|
+
emoji: "\u{1F9F0} ",
|
|
126
|
+
semverBump: "patch",
|
|
127
|
+
changelog: {
|
|
128
|
+
title: "Continuous Integration",
|
|
129
|
+
hidden: false
|
|
129
130
|
}
|
|
130
131
|
},
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
132
|
+
refactor: {
|
|
133
|
+
description: "A code change that neither fixes a bug nor adds a feature",
|
|
134
|
+
title: "Code Refactoring",
|
|
135
|
+
emoji: "\u{1F9EA} ",
|
|
136
|
+
semverBump: "patch",
|
|
137
|
+
changelog: {
|
|
138
|
+
title: "Source Code Improvements",
|
|
139
|
+
hidden: false
|
|
139
140
|
}
|
|
140
141
|
},
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
142
|
+
style: {
|
|
143
|
+
description: "Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)",
|
|
144
|
+
title: "Style Improvements",
|
|
145
|
+
emoji: "\u{1F48E} ",
|
|
146
|
+
semverBump: "patch",
|
|
147
|
+
changelog: {
|
|
148
|
+
title: "Style Improvements",
|
|
149
|
+
hidden: false
|
|
149
150
|
}
|
|
150
151
|
},
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
152
|
+
perf: {
|
|
153
|
+
description: "A code change that improves performance",
|
|
154
|
+
title: "Performance Improvement",
|
|
155
|
+
emoji: "\u23F1\uFE0F ",
|
|
156
|
+
semverBump: "patch",
|
|
157
|
+
changelog: {
|
|
158
|
+
title: "Performance Improvements",
|
|
159
|
+
hidden: false
|
|
159
160
|
}
|
|
160
161
|
},
|
|
161
162
|
/* --- Does not bump version when selected --- */
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
163
|
+
docs: {
|
|
164
|
+
description: "A change that only includes documentation updates",
|
|
165
|
+
title: "Documentation",
|
|
166
|
+
emoji: "\u{1F4DC} ",
|
|
167
|
+
semverBump: "none",
|
|
168
|
+
changelog: {
|
|
169
|
+
title: "Documentation",
|
|
170
|
+
hidden: false
|
|
170
171
|
}
|
|
171
172
|
},
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
173
|
+
test: {
|
|
174
|
+
description: "Adding missing tests or correcting existing tests",
|
|
175
|
+
title: "Testing",
|
|
176
|
+
emoji: "\u{1F6A8} ",
|
|
177
|
+
semverBump: "none",
|
|
178
|
+
changelog: {
|
|
179
|
+
title: "Testing",
|
|
180
|
+
hidden: true
|
|
180
181
|
}
|
|
181
182
|
},
|
|
182
183
|
/* --- Not included in commitlint but included in changelog --- */
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
184
|
+
deps: {
|
|
185
|
+
description: "Changes that add, update, or remove dependencies. This includes devDependencies and peerDependencies",
|
|
186
|
+
title: "Dependencies",
|
|
187
|
+
emoji: "\u{1F4E6} ",
|
|
188
|
+
hidden: true,
|
|
189
|
+
semverBump: "patch",
|
|
190
|
+
changelog: {
|
|
191
|
+
title: "Dependency Upgrades",
|
|
192
|
+
hidden: false
|
|
192
193
|
}
|
|
193
194
|
},
|
|
194
195
|
/* --- Not included in commitlint or changelog --- */
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
196
|
+
build: {
|
|
197
|
+
description: "Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)",
|
|
198
|
+
title: "Build",
|
|
199
|
+
emoji: "\u{1F6E0} ",
|
|
200
|
+
hidden: true,
|
|
201
|
+
semverBump: "none",
|
|
202
|
+
changelog: {
|
|
203
|
+
title: "Build",
|
|
204
|
+
hidden: true
|
|
204
205
|
}
|
|
205
206
|
},
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
207
|
+
release: {
|
|
208
|
+
description: "Publishing a commit containing a newly released version",
|
|
209
|
+
title: "Publish Release",
|
|
210
|
+
emoji: "\u{1F680} ",
|
|
211
|
+
hidden: true,
|
|
212
|
+
semverBump: "none",
|
|
213
|
+
changelog: {
|
|
214
|
+
title: "Publish Release",
|
|
215
|
+
hidden: true
|
|
215
216
|
}
|
|
216
217
|
}
|
|
217
218
|
};
|
|
@@ -2417,6 +2418,51 @@ function titleCase(input2) {
|
|
|
2417
2418
|
}
|
|
2418
2419
|
|
|
2419
2420
|
// src/utilities/changelog-utils.ts
|
|
2421
|
+
var ChangelogItemType = z.enum([
|
|
2422
|
+
"chore",
|
|
2423
|
+
"fix",
|
|
2424
|
+
"feat",
|
|
2425
|
+
"refactor",
|
|
2426
|
+
"style",
|
|
2427
|
+
"perf",
|
|
2428
|
+
"deps"
|
|
2429
|
+
]);
|
|
2430
|
+
var ChangelogBaseItemSchema = z.object({
|
|
2431
|
+
type: ChangelogItemType,
|
|
2432
|
+
scope: z.string(),
|
|
2433
|
+
description: z.string()
|
|
2434
|
+
});
|
|
2435
|
+
var ChangelogMinimalItemSchema = ChangelogBaseItemSchema.extend({
|
|
2436
|
+
type: z.enum(["chore", "refactor", "style", "perf"])
|
|
2437
|
+
});
|
|
2438
|
+
var ChangelogFixItemSchema = ChangelogBaseItemSchema.extend({
|
|
2439
|
+
type: z.enum(["fix"]),
|
|
2440
|
+
issue: z.string()
|
|
2441
|
+
});
|
|
2442
|
+
var ChangelogDepsUpdateItemSchema = ChangelogBaseItemSchema.extend({
|
|
2443
|
+
package: z.string(),
|
|
2444
|
+
version: z.string()
|
|
2445
|
+
});
|
|
2446
|
+
var ChangelogDepsItemSchema = ChangelogBaseItemSchema.extend({
|
|
2447
|
+
type: z.enum(["deps"]),
|
|
2448
|
+
updates: z.array(ChangelogDepsUpdateItemSchema)
|
|
2449
|
+
});
|
|
2450
|
+
var ChangelogFeatItemSchema = ChangelogBaseItemSchema.extend({
|
|
2451
|
+
type: z.enum(["feat"]),
|
|
2452
|
+
feature: z.string()
|
|
2453
|
+
});
|
|
2454
|
+
var ChangelogItemSchema = z.union([
|
|
2455
|
+
ChangelogMinimalItemSchema,
|
|
2456
|
+
ChangelogFixItemSchema,
|
|
2457
|
+
ChangelogDepsItemSchema,
|
|
2458
|
+
ChangelogFeatItemSchema
|
|
2459
|
+
]);
|
|
2460
|
+
z.object({
|
|
2461
|
+
version: z.string(),
|
|
2462
|
+
project: z.string(),
|
|
2463
|
+
date: z.date(),
|
|
2464
|
+
changes: z.array(ChangelogItemSchema).default([])
|
|
2465
|
+
});
|
|
2420
2466
|
async function generateChangelogContent(releaseVersion, filepath, newContent, currentContent, project, workspaceConfig) {
|
|
2421
2467
|
const formatOptions = await resolveConfig(filepath) ?? {};
|
|
2422
2468
|
const bannerUrl = typeof workspaceConfig?.release.banner === "string" ? workspaceConfig?.release.banner : workspaceConfig?.release.banner?.url;
|
|
@@ -2554,6 +2600,7 @@ async function generateChangelogForProjects({
|
|
|
2554
2600
|
}
|
|
2555
2601
|
const preferDockerVersion = shouldPreferDockerVersionForReleaseGroup(releaseGroup);
|
|
2556
2602
|
const releaseVersion = new ReleaseVersion({
|
|
2603
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
2557
2604
|
version: (preferDockerVersion === true || preferDockerVersion === "both") && projectsVersionData[project.name]?.dockerVersion ? projectsVersionData[project.name]?.dockerVersion : projectsVersionData[project.name]?.newVersion,
|
|
2558
2605
|
releaseTagPattern: releaseGroup.releaseTag.pattern,
|
|
2559
2606
|
projectName: project.name
|