@itcase/config 1.7.12 → 1.7.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itcase/config",
-  "version": "1.7.12",
+  "version": "1.7.14",
   "author": "ITCase",
   "description": "ITCase Config",
   "engines": {
@@ -68,8 +68,8 @@
     "commitizen": "^4.3.2",
     "conventional-changelog-conventionalcommits": "9.3.1",
     "conventional-changelog-writer": "9.2.1",
-    "cssnano": "^9.1.0",
-    "cssnano-preset-default": "^9.1.0",
+    "cssnano": "^9.1.1",
+    "cssnano-preset-default": "^9.1.1",
     "inquirer": "^14.2.2",
     "log-update": "^8.0.0",
     "postcss": "^8.5.28",

package/semantic-release/releaseNotesFromCommits.js

@@ -12,6 +12,24 @@ import { releaseNotesGeneratorConfig } from './common.js'
 // Writer 8, который semantic-release поднимает в корень монорепозитория,
 // для preset 10 печатает только заголовок версии.
 
+function resolveRelativeEntry(packageJson) {
+  const exportEntry = packageJson.exports
+
+  // conventional-changelog-conventionalcommits@9 объявляет exports строкой.
+  if (typeof exportEntry === 'string') {
+    return exportEntry
+  }
+
+  const dotExport = exportEntry?.['.']
+
+  return (
+    exportEntry?.import ||
+    (typeof dotExport === 'string' ? dotExport : dotExport?.import) ||
+    packageJson.module ||
+    packageJson.main
+  )
+}
+
 function resolvePackageEntry(cwd, packageName) {
   let directory = cwd
 
@@ -21,12 +39,13 @@ function resolvePackageEntry(cwd, packageName) {
 
     if (existsSync(packageJsonPath)) {
       const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf8'))
-      const exportEntry = packageJson.exports
-      const relativeEntry =
-        exportEntry?.import ||
-        exportEntry?.['.']?.import ||
-        packageJson.module ||
-        packageJson.main
+      const relativeEntry = resolveRelativeEntry(packageJson)
+
+      if (typeof relativeEntry !== 'string') {
+        throw new Error(
+          `Cannot resolve entry of "${packageName}" from "${packageJsonPath}"`,
+        )
+      }
 
       return pathToFileURL(join(packageDir, relativeEntry)).href
     }

package/smart-commit/cli.js

@@ -420,6 +420,7 @@ function buildPrompt(scopes, types, files, cwd, type) {
 
   return `Plan git commits. Do not edit files or run git commit.
 Return ONLY JSON: {"commits":[{"message":"type(scope): subject","files":["a.ts"]}]}
+Every message must be type(scope): subject. Put a scope from the list in parentheses, including when the type is "other".
 Types: ${types.join(', ')}
 Scopes (exact): ${buildScopeEnum(scopes).join(', ')}
 Subject rules:
@@ -1319,16 +1320,18 @@ async function validateAndNormalizePlans(cwd, plans, scopes, types) {
       report.errors?.map((error) => error.message).join('; ') || 'invalid'
     throw new Error(
       `Commit message failed commitlint:\n  ${plan.message}\n  ${errors}\n` +
-        'Use lower-case subject without camelCase (e.g. "public dir" not "publicDir").',
+        'Use type(scope): subject. Scope in parentheses is required. Subject is lower-case without camelCase (e.g. "public dir" not "publicDir").',
     )
   }
 }
 
 function repairCommitHeader(message, scopes, types) {
-  const match = String(message || '').match(/^(\w+)\(([^)]+)\):\s*(.+)$/)
+  const match = String(message || '')
+    .trim()
+    .match(/^(\w+)(?:\(([^)]*)\))?:\s*(.+)$/)
   if (!match) return message
 
-  let [, type, scope, subject] = match
+  let [, type, rawScope, subject] = match
   const scopeEnum = buildScopeEnum(scopes)
   if (types.length && !types.includes(type)) {
     if (types.includes('chore')) type = 'chore'
@@ -1336,9 +1339,8 @@ function repairCommitHeader(message, scopes, types) {
     else type = types[0]
   }
 
-  const matchedScope = matchScope(scope, scopeEnum)
-  if (matchedScope) scope = matchedScope
-  else scope = pickScope(scopes, ['other'])
+  const matchedScope = matchScope((rawScope || '').trim(), scopeEnum)
+  const scope = matchedScope || pickScope(scopes, ['other'])
 
   return normalizeCommitSubject(`${type}(${scope}): ${subject}`)
 }