@itcase/config 1.7.8 → 1.7.10

package/README.md

@@ -186,17 +186,7 @@ import { semanticReleaseMonorepo } from '@itcase/config/semantic-release/index.j
 export default semanticReleaseMonorepo
 ```
 
-В корне монорепозитория зафиксируйте writer 9. Иначе `CHANGELOG.md` получает только заголовок версии: `@commitlint/config-conventional` ставит `conventional-changelog-conventionalcommits` 10, а semantic-release тянет `conventional-changelog-writer` 8, и тот не печатает коммиты.
-
-```json
-{
-  "overrides": {
-    "conventional-changelog-writer": "9.2.1"
-  }
-}
-```
-
-После этого `npm install`. Уже опубликованный релиз сам не перепишется.
+Заметки монорепозитория печатает `conventional-changelog-writer` 9 из этого пакета. Writer 8, который ставит semantic-release, для `conventional-changelog-conventionalcommits` 10 оставляет в `CHANGELOG.md` только заголовок версии. Отдельный `overrides` в репозитории не нужен. Уже опубликованный релиз сам не перепишется.
 
 ## Подключение Husky
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itcase/config",
-  "version": "1.7.8",
+  "version": "1.7.10",
   "author": "ITCase",
   "description": "ITCase Config",
   "engines": {
@@ -67,6 +67,7 @@
     "chokidar-cli": "^3.0.0",
     "commitizen": "^4.3.2",
     "conventional-changelog-conventionalcommits": "9.3.1",
+    "conventional-changelog-writer": "9.2.1",
     "cssnano": "^9.0.5",
     "cssnano-preset-default": "^9.0.5",
     "inquirer": "^14.2.2",

package/semantic-release/common.js

@@ -12,17 +12,19 @@ import {
   releaseRules,
 } from './config.js'
 
-const issuesReleaseNotesScript = join(
+const releaseNotesFromIssuesScript = join(
   dirname(fileURLToPath(import.meta.url)),
-  'issuesReleaseNotes.js',
+  'releaseNotesFromIssues.js',
 )
 
-// Ссылки на задачи из PR. Репозиторий задач и токен приходят из CI:
-// RELEASE_NOTES_ISSUES_REPO, RELEASE_NOTES_GH_TOKEN.
-const issuesReleaseNotesPlugin = [
+// Ссылки на задачи из PR.
+// Pull request'ы текущего репозитория читает GITHUB_TOKEN.
+// Задачи другого репозитория читает RELEASE_NOTES_GH_TOKEN.
+// RELEASE_NOTES_ISSUES_REPO — репозиторий задач.
+const releaseNotesFromIssuesPlugin = [
   '@semantic-release/exec',
   {
-    generateNotesCmd: `node ${JSON.stringify(issuesReleaseNotesScript)} "\${lastRelease.gitTag}" "\${nextRelease.gitTag}"`,
+    generateNotesCmd: `node ${JSON.stringify(releaseNotesFromIssuesScript)} "\${lastRelease.gitTag}" "\${nextRelease.gitTag}"`,
   },
 ]
 
@@ -132,6 +134,6 @@ function createSemanticReleaseConfig({
 export {
   commonPlugins,
   createSemanticReleaseConfig,
-  issuesReleaseNotesPlugin,
+  releaseNotesFromIssuesPlugin,
   releaseNotesGeneratorConfig,
 }

package/semantic-release/releaseNotesFromCommits.js

@@ -0,0 +1,116 @@
+import { existsSync, readFileSync } from 'node:fs'
+import { dirname, join } from 'node:path'
+import { format, pathToFileURL } from 'node:url'
+
+import { writeChangelogString } from 'conventional-changelog-writer'
+import { filterRevertedCommitsSync } from 'conventional-commits-filter'
+import { CommitParser } from 'conventional-commits-parser'
+
+import { releaseNotesGeneratorConfig } from './common.js'
+
+// Импорт из этого файла резолвит writer 9, зависимость @itcase/config.
+// Writer 8, который semantic-release поднимает в корень монорепозитория,
+// для preset 10 печатает только заголовок версии.
+
+function resolvePackageEntry(cwd, packageName) {
+  let directory = cwd
+
+  while (true) {
+    const packageDir = join(directory, 'node_modules', packageName)
+    const packageJsonPath = join(packageDir, 'package.json')
+
+    if (existsSync(packageJsonPath)) {
+      const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf8'))
+      const exportEntry = packageJson.exports
+      const relativeEntry =
+        exportEntry?.import ||
+        exportEntry?.['.']?.import ||
+        packageJson.module ||
+        packageJson.main
+
+      return pathToFileURL(join(packageDir, relativeEntry)).href
+    }
+
+    const parentDirectory = dirname(directory)
+    if (parentDirectory === directory) {
+      break
+    }
+    directory = parentDirectory
+  }
+
+  throw new Error(`Cannot resolve "${packageName}" from "${cwd}"`)
+}
+
+async function loadPreset(cwd, presetConfig) {
+  const presetUrl = resolvePackageEntry(
+    cwd,
+    'conventional-changelog-conventionalcommits',
+  )
+  const presetModule = await import(presetUrl)
+
+  return presetModule.default(presetConfig)
+}
+
+async function generateReleaseNotes(pluginConfig, context) {
+  const { commits, cwd, lastRelease, nextRelease, options } = context
+  const repositoryUrl = options.repositoryUrl.replace(/\.git$/i, '')
+  const loadedPreset = await loadPreset(cwd, pluginConfig.presetConfig)
+  const parser = new CommitParser({
+    referenceActions: [
+      'close',
+      'closes',
+      'closed',
+      'fix',
+      'fixes',
+      'fixed',
+      'resolve',
+      'resolves',
+      'resolved',
+    ],
+    issuePrefixes: ['#', 'gh-'],
+    ...loadedPreset.parser,
+    ...pluginConfig.parserOpts,
+  })
+  const parsedCommits = filterRevertedCommitsSync(
+    commits
+      .filter((commit) => commit.message?.trim())
+      .map((rawCommit) => ({
+        ...rawCommit,
+        ...parser.parse(rawCommit.message),
+      })),
+  )
+  const previousTag = lastRelease.gitTag || lastRelease.gitHead
+  const currentTag = nextRelease.gitTag || nextRelease.gitHead
+  const repository = new URL(repositoryUrl)
+  const protocol = repository.protocol === 'http:' ? 'http' : 'https'
+  const [, owner, repositoryName] =
+    /^\/(?<owner>[^/]+)?\/?(?<repository>.+)?$/.exec(repository.pathname) || []
+
+  return writeChangelogString(
+    parsedCommits,
+    {
+      commit: 'commit',
+      currentTag,
+      host: format({
+        hostname: repository.hostname,
+        port: repository.port,
+        protocol: `${protocol}:`,
+      }),
+      linkCompare: Boolean(currentTag && previousTag),
+      owner,
+      previousTag,
+      repository: repositoryName,
+      version: nextRelease.version,
+      issue: 'issues',
+    },
+    { ...loadedPreset.writer, ...pluginConfig.writerOpts },
+  )
+}
+
+const releaseNotesFromCommitsPlugin = {
+  async generateNotes(_pluginConfig, context) {
+    return generateReleaseNotes(releaseNotesGeneratorConfig, context)
+  },
+}
+
+export { releaseNotesFromCommitsPlugin }

package/semantic-release/{issuesReleaseNotes.js → releaseNotesFromIssues.js}

@@ -14,8 +14,11 @@ import { join } from 'node:path'
  */
 const [lastTagArg, nextTagArg] = process.argv.slice(2)
 
-// Token is passed from GitHub Actions env and used for all API calls
-const githubToken = process.env.RELEASE_NOTES_GH_TOKEN
+// Pull requests of this repository. In GitHub Actions this is the workflow token.
+const repositoryToken = process.env.GITHUB_TOKEN || process.env.GH_TOKEN
+
+// Issues live in another repository. The workflow token cannot read them.
+const issuesToken = process.env.RELEASE_NOTES_GH_TOKEN
 
 const currentProjectOwner = process.env.GITHUB_REPOSITORY?.split('/')[0]
 const currentProjectRepo = process.env.GITHUB_REPOSITORY?.split('/')[1]
@@ -27,8 +30,12 @@ const releaseNotesIssuesRepo = process.env.RELEASE_NOTES_ISSUES_REPO
 const issuesProjectOwner = releaseNotesIssuesRepo?.split('/')[0]
 const issuesProjectRepo = releaseNotesIssuesRepo?.split('/')[1]
 
-if (!currentProjectOwner || !currentProjectRepo || !githubToken) {
-  throw new Error('Missing "GITHUB_REPOSITORY" or "RELEASE_NOTES_GH_TOKEN"')
+if (!currentProjectOwner || !currentProjectRepo || !repositoryToken) {
+  throw new Error('Missing "GITHUB_REPOSITORY" or "GITHUB_TOKEN"')
+}
+
+if (!issuesToken) {
+  throw new Error('Missing "RELEASE_NOTES_GH_TOKEN"')
 }
 
 if (!issuesProjectOwner || !issuesProjectRepo) {
@@ -269,7 +276,7 @@ async function run() {
 }
 
 // Small helper for GitHub REST API with common headers and query serialization.
-async function fetchGithubApi(pathname, queryParams = {}) {
+async function fetchGithubApi(pathname, token, queryParams = {}) {
   const apiUrl = new URL(`https://api.github.com${pathname}`)
 
   for (const [key, value] of Object.entries(queryParams)) {
@@ -282,7 +289,7 @@ async function fetchGithubApi(pathname, queryParams = {}) {
   const response = await fetch(apiUrl, {
     headers: {
       Accept: 'application/vnd.github+json',
-      Authorization: `Bearer ${githubToken}`,
+      Authorization: `Bearer ${token}`,
       'User-Agent': 'semantic-release-issues-notes',
       // GitHub REST API version header
       'X-GitHub-Api-Version': '2026-03-10',
@@ -428,6 +435,7 @@ async function getAssociatedPullRequestsForCommit(commitSha) {
   // Works for both merge-commit and regular commits associated with PRs.
   const response = await fetchGithubApi(
     `/repos/${currentProjectOwner}/${currentProjectRepo}/commits/${commitSha}/pulls`,
+    repositoryToken,
   )
   return Array.isArray(response) ? response : []
 }
@@ -449,7 +457,7 @@ async function loadIssue(ref) {
   const [issueOwner, issueRepo] = repoRef.split('/')
   const issuePath = `/repos/${issueOwner}/${issueRepo}/issues/${issueNumber}`
   try {
-    return await fetchGithubApi(issuePath)
+    return await fetchGithubApi(issuePath, issuesToken)
   } catch (error) {
     throw new Error(
       `Failed to load issue for ref="${ref}" using path="${issuePath}"`,

package/semantic-release/semanticReleaseApp.js

@@ -1,6 +1,6 @@
 import {
   createSemanticReleaseConfig,
-  issuesReleaseNotesPlugin,
+  releaseNotesFromIssuesPlugin,
 } from './common.js'
 
 const DEFAULT_VERSION_ASSETS = [
@@ -18,7 +18,7 @@ const DEFAULT_RELEASE_ASSETS = ['builds/*.apk']
  * - Не публикует в npm
  * - Коммитит package + Android version-файлы
  * - Прикрепляет к GitHub release APK из `builds/` (если есть; отсутствующие пропускаются)
- * - Заметки релиза: сначала задачи из issuesReleaseNotes.js, если они есть, потом обычные коммиты
+ * - Заметки релиза: сначала задачи из releaseNotesFromIssues.js, если они есть, потом обычные коммиты
  *
  * Сборку APK делайте в prepare проекта или отдельным CI job до publish.
  *
@@ -39,7 +39,7 @@ function createSemanticReleaseApp({
   versionAssets = DEFAULT_VERSION_ASSETS,
 } = {}) {
   return createSemanticReleaseConfig({
-    additionalPlugins: [issuesReleaseNotesPlugin],
+    additionalPlugins: [releaseNotesFromIssuesPlugin],
     branches: branches,
     gitConfig: {
       message:

package/semantic-release/semanticReleaseMonorepo.js

@@ -4,6 +4,7 @@ import { readFile, writeFile } from 'node:fs/promises'
 import { resolve } from 'node:path'
 
 import { createSemanticReleaseConfig } from './common.js'
+import { releaseNotesFromCommitsPlugin } from './releaseNotesFromCommits.js'
 
 const RELEASE_ASSETS = [
   'lerna.json',
@@ -41,16 +42,14 @@ const semanticReleaseMonorepo = createSemanticReleaseConfig({
     [
       'semantic-release-lerna',
       {
-        // Заметки пишет @semantic-release/release-notes-generator, не lerna.
-        // В корне репозитория, который релизится, нужен override
-        // "conventional-changelog-writer": "9.2.1". Writer 8 не печатает
-        // коммиты для conventional-changelog-conventionalcommits 10.
         generateNotes: false,
         latch: false,
       },
     ],
+    releaseNotesFromCommitsPlugin,
   ],
   preparePlugins: [keepLernaIndependentPlugin],
+  skipReleaseNotesGenerator: true,
 })
 
 export { semanticReleaseMonorepo }

package/semantic-release/semanticReleaseProject.js

@@ -1,10 +1,10 @@
 import {
   createSemanticReleaseConfig,
-  issuesReleaseNotesPlugin,
+  releaseNotesFromIssuesPlugin,
 } from './common.js'
 
 const semanticReleaseProject = createSemanticReleaseConfig({
-  additionalPlugins: [issuesReleaseNotesPlugin],
+  additionalPlugins: [releaseNotesFromIssuesPlugin],
   branches: ['docker/master'],
   gitConfig: {
     message: 'release: publishing new version ${nextRelease.version} [skip ci]',