@itcase/config 1.7.26 → 1.7.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itcase/config",
-  "version": "1.7.26",
+  "version": "1.7.27",
   "author": "ITCase",
   "description": "ITCase Config",
   "engines": {
@@ -68,7 +68,7 @@
     "commitizen": "^4.3.2",
     "conventional-changelog-conventionalcommits": "9.3.1",
     "conventional-changelog-writer": "9.3.0",
-    "cssnano": "^9.8.0",
+    "cssnano": "^9.9.0",
     "cssnano-preset-default": "^9.8.0",
     "inquirer": "^14.2.3",
     "log-update": "^8.0.0",

package/semantic-release/androidAppPrepare.js

@@ -0,0 +1,161 @@
+import { execFileSync } from 'node:child_process'
+import { readFileSync, writeFileSync } from 'node:fs'
+import { join } from 'node:path'
+
+const MAILRU_WEBDAV_BASE = 'https://webdav.cloud.mail.ru'
+
+/**
+ * Prepare: bump Android → make APK → Mail.ru (если GIT_WORKFLOW=true).
+ *
+ * Env: SKIP_APK_BUILD, RELEASE_APK_TARGETS (stage,prod),
+ * MAILRU_USER, MAILRU_APP_PASSWORD, MAILRU_PUBLIC_URL.
+ *
+ * @param {{ apkPrefix: string, mailruDir: string }} options
+ */
+function createAndroidAppPreparePlugin({ apkPrefix, mailruDir }) {
+  if (!apkPrefix) {
+    throw new Error('createAndroidAppPreparePlugin: apkPrefix is required')
+  }
+  if (!mailruDir) {
+    throw new Error('createAndroidAppPreparePlugin: mailruDir is required')
+  }
+
+  const uploadDir = mailruDir.replace(/^\/+|\/+$/g, '')
+
+  return {
+    prepare: async (_pluginConfig, context) => {
+      const { logger, nextRelease, options } = context
+      const version = nextRelease.version
+
+      bumpAndroidVersion(version, logger)
+
+      if (options.dryRun || process.env.SKIP_APK_BUILD === '1') {
+        logger.log('Skip APK build (dry-run or SKIP_APK_BUILD=1)')
+        return
+      }
+
+      const apks = resolveApks(apkPrefix, version)
+      for (const apk of apks) {
+        logger.log(`make ${apk.make}`)
+        execFileSync('make', [apk.make], { stdio: 'inherit' })
+      }
+
+      uploadApks(apks, uploadDir, logger)
+    },
+  }
+}
+
+function bumpAndroidVersion(version, logger) {
+  if (!/^\d+\.\d+\.\d+(-[\w.-]+)?$/.test(version)) {
+    throw new Error(`Unsupported version format: "${version}"`)
+  }
+
+  const gradlePath = join(process.cwd(), 'android/app/build.gradle')
+  const content = readFileSync(gradlePath, 'utf8')
+  const vNameMatch = content.match(/def vName = "([^"]+)"/)
+  const vCodeMatch = content.match(/def vCode = (\d+)/)
+
+  if (!vNameMatch || !vCodeMatch) {
+    throw new Error('Could not find version in build.gradle')
+  }
+
+  if (vNameMatch[1] === version) {
+    logger.log(`Android vName already ${version}, skip bump`)
+    return
+  }
+
+  const newCode = Number(vCodeMatch[1]) + 1
+  writeFileSync(
+    gradlePath,
+    content
+      .replace(/def vName = "[^"]+"/, `def vName = "${version}"`)
+      .replace(/def vCode = \d+/, `def vCode = ${newCode}`),
+  )
+  logger.log(`Android vName = ${version}, vCode = ${newCode}`)
+}
+
+/** @returns {{ make: string, name: string, fileName: string }[]} */
+function resolveApks(apkPrefix, version) {
+  const defs = {
+    prod: {
+      name: 'PROD',
+      fileName: `${apkPrefix}-v${version}.apk`,
+      make: 'android-apk-prod',
+    },
+    stage: {
+      name: 'STAGE',
+      fileName: `${apkPrefix}-v${version}-STAGE.apk`,
+      make: 'android-apk-stage',
+    },
+  }
+
+  const keys = (process.env.RELEASE_APK_TARGETS || 'stage,prod')
+    .split(',')
+    .map((part) => part.trim())
+    .filter(Boolean)
+
+  if (keys.length === 0) {
+    throw new Error('RELEASE_APK_TARGETS is empty')
+  }
+
+  return keys.map((key) => {
+    const apk = defs[key]
+    if (!apk) {
+      throw new Error(
+        `Unknown RELEASE_APK_TARGETS entry: "${key}". Use stage, prod`,
+      )
+    }
+    return apk
+  })
+}
+
+function uploadApks(apks, uploadDir, logger) {
+  if (process.env.GIT_WORKFLOW !== 'true') {
+    logger.log('Skip Mail.ru upload (not CI)')
+    return
+  }
+
+  const user = process.env.MAILRU_USER
+  const password = process.env.MAILRU_APP_PASSWORD
+  const publicUrl = (process.env.MAILRU_PUBLIC_URL || '').replace(/\/$/, '')
+
+  if (!user || !password || !publicUrl) {
+    throw new Error(
+      'MAILRU_USER, MAILRU_APP_PASSWORD and MAILRU_PUBLIC_URL are required',
+    )
+  }
+
+  const uploadBase = `${MAILRU_WEBDAV_BASE}/${uploadDir}`
+  const downloads = []
+
+  for (const apk of apks) {
+    logger.log(`Upload ${apk.fileName} to ${uploadBase}/`)
+    execFileSync(
+      'curl',
+      [
+        '--fail',
+        '--silent',
+        '--show-error',
+        '--retry',
+        '2',
+        '--retry-delay',
+        '2',
+        '-T',
+        join(process.cwd(), 'builds', apk.fileName),
+        '--user',
+        `${user}:${password}`,
+        `${uploadBase}/${apk.fileName}`,
+      ],
+      { stdio: 'inherit' },
+    )
+    downloads.push({ name: apk.name, url: `${publicUrl}/${apk.fileName}` })
+  }
+
+  writeFileSync(
+    join(process.cwd(), 'builds', 'mailru-downloads.json'),
+    JSON.stringify(downloads),
+  )
+  logger.log('APK upload finished — Mail.ru links saved')
+}
+
+export { createAndroidAppPreparePlugin }

package/semantic-release/index.js

@@ -1,7 +1,4 @@
-import {
-  createSemanticReleaseApp,
-  semanticReleaseApp,
-} from './semanticReleaseApp.js'
+import { semanticReleaseApp } from './semanticReleaseApp.js'
 import { semanticReleaseBot } from './semanticReleaseBot.js'
 import { semanticReleaseDoc } from './semanticReleaseDoc.js'
 import { semanticReleaseMonorepo } from './semanticReleaseMonorepo.js'
@@ -10,7 +7,6 @@ import { semanticReleaseProject } from './semanticReleaseProject.js'
 import { semanticReleaseVSMarketplace } from './semanticReleaseVSMarketplace.js'
 
 export {
-  createSemanticReleaseApp,
   semanticReleaseApp,
   semanticReleaseBot,
   semanticReleaseDoc,

package/semantic-release/semanticReleaseApp.js

@@ -1,3 +1,4 @@
+import { createAndroidAppPreparePlugin } from './androidAppPrepare.js'
 import {
   createSemanticReleaseConfig,
   releaseNotesFromIssuesPlugin,
@@ -17,27 +18,44 @@ const DEFAULT_RELEASE_ASSETS = ['builds/*.apk']
  *
  * - Не публикует в npm
  * - Коммитит package + Android version-файлы
- * - Прикрепляет к GitHub release APK из `builds/` (если есть; отсутствующие пропускаются)
- * - Заметки релиза: сначала задачи из releaseNotesFromIssues.js, если они есть, потом обычные коммиты
+ * - Прикрепляет к GitHub release APK из `builds/`
+ * - Заметки релиза: сначала задачи, потом коммиты
  *
- * Сборку APK делайте в prepare проекта или отдельным CI job до publish.
+ * Если передан `apk`, в prepare: bump → make → Mail.ru (GIT_WORKFLOW=true).
  *
  * @param {Object} [options]
  * @param {string|string[]} [options.branches=['master']]
- * @param {string[]} [options.versionAssets] - файлы для @semantic-release/git
- * @param {string[]|Object[]} [options.releaseAssets] - assets для @semantic-release/github
- * @param {Array} [options.preparePlugins] - плагины после npm (например bump Android version + build APK)
- * @param {Object} [options.githubConfig] - доп. опции github-плагина
- * @param {Object} [options.gitConfig] - доп. опции git-плагина (мержатся поверх message/assets)
+ * @param {Object} [options.apk]
+ * @param {string} options.apk.prefix - agro-pps → builds/agro-pps-v*.apk
+ * @param {string} options.apk.mailruDir - папка WebDAV, напр. APK
+ * @param {string[]} [options.versionAssets]
+ * @param {string[]|Object[]} [options.releaseAssets] - по умолчанию builds/{prefix}-v*.apk
+ * @param {Array} [options.preparePlugins]
+ * @param {Object} [options.githubConfig]
+ * @param {Object} [options.gitConfig]
  */
-function createSemanticReleaseApp({
+function semanticReleaseApp({
+  apk,
   branches = ['master'],
   gitConfig = {},
   githubConfig = {},
   preparePlugins = [],
-  releaseAssets = DEFAULT_RELEASE_ASSETS,
+  releaseAssets,
   versionAssets = DEFAULT_VERSION_ASSETS,
 } = {}) {
+  const androidPrepare = apk
+    ? [
+        createAndroidAppPreparePlugin({
+          apkPrefix: apk.prefix,
+          mailruDir: apk.mailruDir,
+        }),
+      ]
+    : []
+
+  const githubAssets =
+    releaseAssets ??
+    (apk?.prefix ? [`builds/${apk.prefix}-v*.apk`] : DEFAULT_RELEASE_ASSETS)
+
   return createSemanticReleaseConfig({
     additionalPlugins: [releaseNotesFromIssuesPlugin],
     branches: branches,
@@ -48,16 +66,14 @@ function createSemanticReleaseApp({
       ...gitConfig,
     },
     githubConfig: {
-      assets: releaseAssets,
+      assets: githubAssets,
       ...githubConfig,
     },
     npmConfig: {
       npmPublish: false,
     },
-    preparePlugins: preparePlugins,
+    preparePlugins: [...androidPrepare, ...preparePlugins],
   })
 }
 
-const semanticReleaseApp = createSemanticReleaseApp()
-
-export { createSemanticReleaseApp, semanticReleaseApp }
+export { semanticReleaseApp }