alemonjs 2.1.88 → 2.1.89

package/bin/README.md

@@ -117,7 +117,8 @@ alemonc publish --dry-run
 - 传 `patch/minor/major/prepatch/preminor/premajor/prerelease` 时会自动递增
 - 传具体版本号时会直接以该版本发布
 - 默认先执行 `npm run build`
-- 文件选择规则直接复用 npm 机制，也就是 `package.json.files`、`.npmignore`、`.gitignore` 和 npm 默认规则
+- 默认发布内容是 `lib/`、`package.json`、`README.md`
+- 如果项目配置了 `.npmignore` 或 `package.json.files`，则切换为 npm 文件选择规则
 - 最终把产物提交到 git `release` 分支，并推送对应 tag
 - 默认要求 git 工作区干净，发布成功后会自动提交源码中的 `package.json` 版本变更
 

package/bin/publish.js

@@ -6,6 +6,7 @@ import { execSync, spawnSync } from 'child_process';
 
 const RELEASE_TYPES = new Set(['patch', 'minor', 'major', 'prepatch', 'preminor', 'premajor', 'prerelease']);
 const SEMVER_RE = /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/;
+const DEFAULT_PUBLISH_FILES = ['lib', 'package.json', 'README.md'];
 
 function readPackageJson() {
   const pkgPath = join(process.cwd(), 'package.json');
@@ -188,29 +189,49 @@ function getPackResult(cwd = process.cwd()) {
   return result[0];
 }
 
-function copyPublishFiles(files) {
-  const stageDir = fs.mkdtempSync(join(os.tmpdir(), 'alemon-publish-'));
+function hasNpmPublishRules(pkg) {
+  if (fs.existsSync(join(process.cwd(), '.npmignore'))) {
+    return true;
+  }
 
-  for (const item of files) {
-    const relativePath = item.path;
-    const sourcePath = join(process.cwd(), relativePath);
-    const targetPath = join(stageDir, relativePath);
+  return Array.isArray(pkg.files) && pkg.files.length > 0;
+}
 
-    fs.mkdirSync(join(targetPath, '..'), { recursive: true });
-    fs.copyFileSync(sourcePath, targetPath);
+function getDefaultPublishFiles() {
+  return DEFAULT_PUBLISH_FILES.filter(file => fs.existsSync(join(process.cwd(), file)));
+}
+
+function warnDefaultPublishState(pkg, publishFiles) {
+  const hasLibDir = fs.existsSync(join(process.cwd(), 'lib'));
+  const mainField = typeof pkg.main === 'string' ? pkg.main : '';
+
+  if (!hasLibDir && mainField.startsWith('./lib/')) {
+    console.warn(`警告: 缺少 lib/ 目录，但 package.json main 指向 ${mainField}，将继续发布`);
   }
 
-  return stageDir;
+  if (publishFiles.length === 0) {
+    console.warn('警告: 默认发布规则下没有匹配到任何文件');
+  }
 }
 
-function materializePublishDir(sourceDir, files) {
-  const publishDir = fs.mkdtempSync(join(os.tmpdir(), 'alemon-release-'));
+function copyPublishFiles(files) {
+  const publishDir = fs.mkdtempSync(join(os.tmpdir(), 'alemon-publish-'));
 
   for (const item of files) {
-    const relativePath = item.path;
-    const sourcePath = join(sourceDir, relativePath);
+    const relativePath = typeof item === 'string' ? item : item.path;
+    const sourcePath = join(process.cwd(), relativePath);
     const targetPath = join(publishDir, relativePath);
 
+    if (!fs.existsSync(sourcePath)) {
+      continue;
+    }
+
+    if (fs.statSync(sourcePath).isDirectory()) {
+      fs.mkdirSync(join(targetPath, '..'), { recursive: true });
+      fs.cpSync(sourcePath, targetPath, { recursive: true });
+      continue;
+    }
+
     fs.mkdirSync(join(targetPath, '..'), { recursive: true });
     fs.copyFileSync(sourcePath, targetPath);
   }
@@ -335,7 +356,6 @@ export async function publish(release, options = {}) {
     console.log(`已更新 package.json 版本: ${localVersion} -> ${targetVersion}`);
   }
 
-  let stageDir = null;
   let publishDir = null;
   let worktreeDir = null;
   try {
@@ -350,13 +370,17 @@ export async function publish(release, options = {}) {
       console.log('已跳过构建');
     }
 
-    const packResult = getPackResult();
-    stageDir = copyPublishFiles(packResult.files);
+    const useNpmRules = hasNpmPublishRules(pkg);
+    const publishFiles = useNpmRules ? getPackResult().files : getDefaultPublishFiles();
 
-    const filteredPackResult = getPackResult(stageDir);
-    publishDir = materializePublishDir(stageDir, filteredPackResult.files);
+    if (!useNpmRules) {
+      warnDefaultPublishState(pkg, publishFiles);
+    }
 
-    console.log(`发布文件数: ${filteredPackResult.files.length}`);
+    publishDir = copyPublishFiles(publishFiles);
+
+    console.log(`发布规则: ${useNpmRules ? 'npm' : 'default'}`);
+    console.log(`发布文件数: ${publishFiles.length}`);
 
     if (options.dryRun) {
       console.log('dry-run 模式，不会真正推送到 git');
@@ -388,9 +412,6 @@ export async function publish(release, options = {}) {
     }
     throw error;
   } finally {
-    if (stageDir) {
-      fs.rmSync(stageDir, { recursive: true, force: true });
-    }
     if (publishDir) {
       fs.rmSync(publishDir, { recursive: true, force: true });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "2.1.88",
+  "version": "2.1.89",
   "description": "bot script",
   "author": "lemonade",
   "license": "MIT",
@@ -93,4 +93,4 @@
     "url": "https://github.com/lemonade-lab/alemonjs.git"
   },
   "gitHead": "c6aa5616afe091a37610dad22fbb2d2618d943b8"
-}
+}