Skip to content

Commit 0bb52be

Browse files
committed
PD-0000 allow new branch names'
1 parent b3d5331 commit 0bb52be

2 files changed

Lines changed: 16 additions & 14 deletions

File tree

scripts/validate-branch-name.husky.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
#!/usr/bin/env node
22

3-
// Enforce branch naming: <developer-name>/AA-0000[anything]
3+
// Enforce branch naming: <developer-name>/PROJECT-NNN[anything]
44
// - developer-name: lowercase letters, numbers, dot, underscore, hyphen (one or more)
5-
// - ticket: exactly 2 uppercase letters, hyphen, exactly 4 digits (e.g., PD-0000)
5+
// - ticket: one or more uppercase letters, hyphen, one or more digits (e.g., PD-0000, ENGAGE-243)
66
// - suffix: any optional characters after the ticket (e.g., "/feature-x", "-refactor", etc.)
77
// Special allowed names: transifex
88
// Examples:
99
// yourname/PD-0000
10+
// lmendoza/ENGAGE-243
1011
// yourname/PD-0000-my-feature
1112
// your.name/AB-0123/quick-fix
1213

@@ -67,15 +68,16 @@ function main() {
6768
process.exit(0)
6869
}
6970

70-
// developer-name / AA-0000 [anything]
71-
const pattern = /^[a-z0-9._-]+\/[A-Z]{2}-\d{4}.*$/
71+
// developer-name / PROJECT-NNN [anything] (e.g. PD-0000, ENGAGE-243)
72+
const pattern = /^[a-z0-9._-]+\/[A-Z]+-\d+.*$/
7273

7374
if (!pattern.test(branch)) {
7475
console.error(
75-
'\u001b[31mBranch name must follow "<developer-name>/AA-0000[anything]" or be a special allowed name (e.g., "transifex").\u001b[0m'
76+
'\u001b[31mBranch name must follow "<developer-name>/PROJECT-NNN[anything]" or be a special allowed name (e.g., "transifex").\u001b[0m'
7677
)
7778
console.error('\nExamples:')
7879
console.error(' yourname/PD-0000')
80+
console.error(' lmendoza/ENGAGE-243')
7981
console.error(' yourname/PD-0000-my-feature')
8082
console.error(' your.name/AB-0123/quick-fix')
8183
console.error(' transifex')

scripts/validate-commit-msg.husky.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
#!/usr/bin/env node
22

3-
// Enforce commit message format: AA-0000 [optional message]
4-
// - AA: exactly 2 uppercase letters (A-Z)
5-
// - 0000: exactly 4 digits
6-
// - Example: PD-0000 Add feature
7-
// - Also valid: PD-0000
3+
// Enforce commit message format: PROJECT-NNN [optional message]
4+
// - PROJECT: one or more uppercase letters (A-Z)
5+
// - NNN: one or more digits
6+
// - Examples: PD-0000, ENGAGE-243, ENGAGE-243 Add feature
87

98
const fs = require('fs')
109

@@ -49,16 +48,17 @@ try {
4948
process.exit(0)
5049
}
5150

52-
// Pattern: start, 2 uppercase letters, hyphen, 4 digits, optional space and message
53-
const pattern = /^[A-Z]{2}-\d{4}(?:\s.+)?$/
51+
// Pattern: PROJECT-NNN (e.g. PD-0000, ENGAGE-243), optional space and message
52+
const pattern = /^[A-Z]+-\d+(?:\s.+)?$/
5453

5554
if (!pattern.test(firstLine)) {
5655
console.error(
57-
'\u001b[31mCommit message must start with an issue key like "AA-0000" followed by an optional message.\u001b[0m'
56+
'\u001b[31mCommit message must start with an issue key like "PROJECT-NNN" (e.g. PD-0000, ENGAGE-243) followed by an optional message.\u001b[0m'
5857
)
5958
console.error('\nExamples:')
6059
console.error(' PD-0000')
61-
console.error(' PD-0000 Fix broken tests')
60+
console.error(' ENGAGE-243')
61+
console.error(' ENGAGE-243 Fix broken tests')
6262
console.error('\nYour message was:')
6363
console.error(` ${firstLine || '(empty)'}`)
6464
process.exit(1)

0 commit comments

Comments
 (0)