@itcase/config 1.6.39 → 1.6.40
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/package.json +1 -1
- package/semantic-release/common.js +10 -6
package/package.json
CHANGED
|
@@ -17,11 +17,18 @@ const releaseNotesGeneratorConfig = {
|
|
|
17
17
|
writerOpts: {
|
|
18
18
|
commitsSort: COMMITS_SORT,
|
|
19
19
|
commitFilter: (commit) => {
|
|
20
|
-
|
|
21
|
-
if (
|
|
20
|
+
// Фильтруем merge коммиты более строго - проверяем subject независимо от типа
|
|
21
|
+
if (commit.subject) {
|
|
22
|
+
const mergePattern =
|
|
23
|
+
/^Merge (branch|pull request|commit|remote-tracking|.*into|.*of|made by)/i
|
|
24
|
+
if (mergePattern.test(commit.subject)) {
|
|
25
|
+
return false
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
// Также фильтруем коммиты без типа, которые выглядят как merge
|
|
29
|
+
if (!commit.type && commit.subject && /^Merge/i.test(commit.subject)) {
|
|
22
30
|
return false
|
|
23
31
|
}
|
|
24
|
-
|
|
25
32
|
return true
|
|
26
33
|
},
|
|
27
34
|
},
|
|
@@ -69,17 +76,14 @@ function createSemanticReleaseConfig({
|
|
|
69
76
|
}) {
|
|
70
77
|
const plugins = [commonPlugins.commitAnalyzer]
|
|
71
78
|
|
|
72
|
-
// Добавляем release-notes-generator только если не пропущен
|
|
73
79
|
if (!skipReleaseNotesGenerator) {
|
|
74
80
|
plugins.push(commonPlugins.releaseNotesGenerator)
|
|
75
81
|
}
|
|
76
82
|
|
|
77
|
-
// Дополнительные плагины (например, semantic-release-lerna) должны идти перед changelog и git
|
|
78
83
|
plugins.push(...additionalPlugins)
|
|
79
84
|
|
|
80
85
|
plugins.push(commonPlugins.changelog)
|
|
81
86
|
|
|
82
|
-
// Добавляем npm плагин только если передан конфиг
|
|
83
87
|
if (npmConfig !== null) {
|
|
84
88
|
plugins.push(['@semantic-release/npm', npmConfig])
|
|
85
89
|
}
|