@infly/libs 2.0.36 → 2.0.37

package/bin/cli.js

@@ -1,31 +1,38 @@
 #!/usr/bin/env node
 
-const { init: buildInit, scriptInit: buildScriptInit, beforeBuild } = require("../build/build-dist");
-const { init: previewInit, scriptInit: previewScriptInit } = require("../tools/project-preview");
+function loadBuildDist() {
+  return require("../build/build-dist");
+}
+
+function loadPreview() {
+  return require("../tools/project-preview");
+}
 
 const command = process.argv[2];
 const commandMap = {
-  afterBuild: buildInit,
-  initZip: buildInit,
-  preview: previewInit,
-  "--preview": previewInit,
-  beforeBuild: beforeBuild,
+  afterBuild: () => loadBuildDist().init(),
+  initZip: () => loadBuildDist().init(),
+  preview: () => loadPreview().init(),
+  "--preview": () => loadPreview().init(),
+  beforeBuild: () => loadBuildDist().beforeBuild(),
   scriptOverride: () => {
-    previewScriptInit();
-    buildScriptInit();
+    const preview = loadPreview();
+    const buildDist = loadBuildDist();
+
+    preview.scriptInit();
+    buildDist.scriptInit();
   }
 };
 
-// 执行命令
-if (command && commandMap[command]) {
-  commandMap[command]();
-} else {
-  console.error(`未知命令: ${command || "未提供命令"}`);
-  console.log(
-    "可用命令: " +
-      Object.keys(commandMap)
-        .filter((cmd) => typeof commandMap[cmd] === "function")
-        .join(", ")
-  );
-  process.exit(1); // 使用非零退出码表示错误
-}
+(async () => {
+  if (command && commandMap[command]) {
+    await commandMap[command]();
+  } else {
+    console.error(`未知命令: ${command || "未提供命令"}`);
+    console.log(`可用命令: ${Object.keys(commandMap).join(", ")}`);
+    process.exit(1);
+  }
+})().catch((error) => {
+  console.error("执行失败:", error);
+  process.exit(1);
+});

package/build/build-dist/index.js

@@ -1,4 +1,4 @@
-/**
+/**
  * 构建工具
  * @description
  * 工具实现根据配置自动切换分支，构建到配置的对应文件夹路径，并且执行自动提交推送，也可执行自动压缩提交到当前项目
@@ -29,7 +29,9 @@ const {
   getCurrentBranch,
   getLatestCommitInfo,
   getLastCommitByFile,
-  checkAndUpdatePackages
+  checkAndUpdatePackages,
+  checkSingleDirGitStatus,
+  pullSingleDirFromBranch
 } = require("../../script/git-automation");
 
 const scriptEvent = process.env.npm_lifecycle_event;
@@ -60,16 +62,23 @@ const { title: projectTitle } = fs.existsSync(targetProjectSettingsJS) ? require
 
 const isExistTargetProjectVersionConfig = fs.existsSync(targetProjectVersionConfigPath); // 安装依赖项目下是否存在旧版本控制文件
 const isExistVueConfigFile = fs.existsSync(targetProjectVueConfigPath); // 安装依赖项目下是否存在vue.config.js文件
+const hasNextConfig = !isExistVueConfigFile && ( // Next.js 项目检测
+  fs.existsSync(targetProjectFileResolve("next.config.js")) ||
+  fs.existsSync(targetProjectFileResolve("next.config.mjs")) ||
+  fs.existsSync(targetProjectFileResolve("next.config.ts"))
+);
 const isMaster = currentBranch === "master"; // 是否在master分支
 const isPkg = versionFileName === "package.json";
 
 const targetProjectVueConfig = isExistVueConfigFile ? require(targetProjectVueConfigPath) : {};
-const { outputDir: targetProjectOutputDir, configureWebpack } = targetProjectVueConfig || {};
+const { outputDir: vueOutputDir, configureWebpack } = targetProjectVueConfig || {};
+let targetProjectOutputDir = vueOutputDir;
 
 const { updateDevText = "测试环境" } = { master: { updateDevText: "正式环境" } }[currentBranch] || {}; // 更新环境和处理分支
 
 const configPath = path.resolve(projectRoot, versionFileName);
 let buildConfig = JSON.parse(fs.readFileSync(configPath, "utf-8")) || {};
+let tempPlatformName = "";
 
 buildConfig = normalizeBuildConfig(buildConfig, npmPackageConfigKey, currentBranch, projectTitle);
 
@@ -89,12 +98,112 @@ const {
   enableClipboard, // 启用粘贴板
   disableUpdateVersionEnv // 禁止更新版本信息环境
 } = buildConfigs || {};
+// Next.js 项目：优先使用 infly.buildConfigs.outputPath
+if (!targetProjectOutputDir && outputPath) {
+  targetProjectOutputDir = outputPath;
+}
+if (targetProjectOutputDir && !path.isAbsolute(targetProjectOutputDir)) {
+  targetProjectOutputDir = path.resolve(projectRoot, targetProjectOutputDir);
+}
 const buildFoldName = zipBuildFoldName || targetProjectOutputDir || "dist";
-const { mainVersion: verMainVersion, platformName, baseName, versionList = [], links } = versionConfig || {};
+const { mainVersion: verMainVersion, baseName, versionList = [], links } = versionConfig || {};
 const mainVersion = verMainVersion || major; // 主版本号
 const [lastestVersionItem] = versionList || [];
 const { lastVersion = projectVersion || "1.0.0" } = lastestVersionItem || {};
 
+function getBuildContext() {
+  try {
+    return JSON.parse(process.env.INFLY_BUILD_CONTEXT || "{}");
+  } catch {
+    return {};
+  }
+}
+
+const buildContext = getBuildContext();
+
+function hasArg(name) {
+  return process.argv.includes(name);
+}
+
+function appendBatchWebhookRecord(publishText, extraParams = {}) {
+  const batchWebhookFile = buildContext.batchWebhookFile || process.env.INFLY_BATCH_WEBHOOK_FILE;
+
+  if (!batchWebhookFile) {
+    return false;
+  }
+
+  fs.appendFileSync(batchWebhookFile, `${JSON.stringify({ publishText, extraParams })}\n`);
+  return true;
+}
+
+function getArgValue(name) {
+  const index = process.argv.indexOf(name);
+  return index >= 0 ? process.argv[index + 1] : "";
+}
+
+function getNextStandaloneServerPath(distPath) {
+  const rootServerPath = path.join(distPath, "server.js");
+  const workspaceServerPath = path.join(distPath, "apps", projectName, "server.js");
+
+  if (fs.existsSync(rootServerPath)) {
+    return rootServerPath;
+  }
+
+  return workspaceServerPath;
+}
+
+function getBuildMode() {
+  const modeArg = getArgValue("--mode");
+  const lifecycleText = [process.env.npm_lifecycle_event, process.env.npm_lifecycle_script, ...process.argv]
+    .filter(Boolean)
+    .join(" ");
+
+  if (modeArg === "staging" || lifecycleText.includes("build:stage") || lifecycleText.includes("--mode staging")) {
+    return "stage";
+  }
+
+  if (
+    modeArg === "production" ||
+    modeArg === "prod" ||
+    lifecycleText.includes("build:prod") ||
+    lifecycleText.includes("build:pro")
+  ) {
+    return "prod";
+  }
+
+  return "";
+}
+
+function getStageBranch(branchMap = {}, branch = currentBranch) {
+  if (branch !== "master" && branchMap[branch] && branchMap[branch] !== "master") {
+    return branch;
+  }
+
+  if (branchMap.develop && branchMap.develop !== "master") {
+    return "develop";
+  }
+
+  if (branchMap.release && branchMap.release !== "master") {
+    return "release";
+  }
+
+  return Object.keys(branchMap).find((key) => branchMap[key] && branchMap[key] !== "master") || branch;
+}
+
+function getBuildTargetBranch(branchMap = {}) {
+  const buildMode = getBuildMode();
+
+  if (buildMode === "prod") {
+    return "master";
+  }
+
+  if (buildMode === "stage") {
+    return getStageBranch(branchMap);
+  }
+
+  return currentBranch;
+}
+
 async function init() {
   try {
     // validateConfig(buildConfig);
@@ -109,7 +218,7 @@ async function init() {
 
     // 处理所需版本文件信息
     const timestamp = new Date().toISOString().slice(0, 10).replace(/-/g, ".");
-    const baseFileName = `${platformName}-${buildFoldName}-${baseName}`;
+    const baseFileName = `${tempPlatformName}-${buildFoldName}-${baseName}`;
     const newVersion = isMaster ? incrementVersion(lastVersion, mainVersion) : lastVersion; // 非正式环境构建不更新版本信息
     const newFileName = baseFileName.replace("{version}", newVersion).replace("{timestamp}", timestamp);
     const gitInfo = getLatestCommitInfo() || {};
@@ -118,7 +227,7 @@ async function init() {
     if (typeof tempLink === "object") {
       tempLink = tempLink[process.env.VUE_APP_PLATFORM] || tempLink["DEFAULT"] || JSON.stringify(tempLink);
     }
-    const publishText = `${platformName}：\n更新到：${tempLink}\n更新时间：${timestamp}\n版本号：v${newVersion}\n分支：${branch}\n更新环境：${updateDevText}\n更新内容：\n${commitMsg}`;
+    const publishText = `${tempPlatformName}：\n更新到：${tempLink}\n更新时间：${timestamp}\n版本号：v${newVersion}\n分支：${branch}\n更新环境：${updateDevText}\n更新内容：\n${commitMsg}`;
     const newZipFileInfo = [
       {
         version: newVersion,
@@ -134,11 +243,12 @@ async function init() {
     const outputDir = path.resolve(projectRoot, "./", outputPath);
     const outputPathFull = path.join(outputDir, newFileName);
     const distPath = gitAutoPushRepos ? targetProjectOutputDir : path.resolve(projectRoot, "./" + buildFoldName);
-    const indexHtmlPath = path.join(distPath, "index.html");
+    // Next.js standalone 项目检查 server.js，Vue/SPA 项目检查 index.html
+    const validatePath = hasNextConfig ? getNextStandaloneServerPath(distPath) : path.join(distPath, "index.html");
 
     // 校验构建文件是否存在，确保构建成功
     validateFileExists(distPath, "distPath");
-    validateFileExists(indexHtmlPath, "indexHtmlPath");
+    validateFileExists(validatePath, hasNextConfig ? "serverJsPath" : "indexHtmlPath");
 
     // 非自动推送到构建仓库，进行构建文件压缩和检查是否压缩成功
     if (!gitAutoPushRepos) {
@@ -162,6 +272,8 @@ async function init() {
         gitInfo,
         gitAutoCommitText,
         gitAutoPushReposBranchMap,
+        gitLockDir: buildContext.gitLockDir,
+        gitProcessOrder: buildContext.gitProcessOrder,
         ...checkGitStatusParams
       });
     }
@@ -175,17 +287,21 @@ async function init() {
     }
 
     if (webhookUrl) {
-      postVersionFileAndMsg(publishText, {
+      const webhookParams = {
         projectName,
         newFileName,
         gitInfo,
         targetProjectOutputDir,
         repos: path.relative(__dirname, targetProjectOutputDir).replace(/^(\.\.\\){4}apps\\/, ""),
         ...buildConfigs
-      });
+      };
+
+      if (!appendBatchWebhookRecord(publishText, webhookParams)) {
+        postVersionFileAndMsg(publishText, webhookParams);
+      }
     }
 
-    if (enablePreview) {
+    if (enablePreview && buildContext.skipPreview !== true && process.env.INFLY_SKIP_PREVIEW !== "1") {
       await previewInit(true);
     }
   } catch (error) {
@@ -216,17 +332,14 @@ function normalizeBuildConfig(config, packageKey, branch, title) {
   }
 
   // 处理平台名称配置
-  if (typeof normalizedConfig?.versionConfig?.platformName === "object") {
-    normalizedConfig.versionConfig.platformName =
-      normalizedConfig.versionConfig.platformName[branch] ||
-      normalizedConfig.versionConfig.platformName["master"] ||
-      "构建平台";
-  }
-
-  // 使用项目标题作为默认平台名称
-  if (title && !normalizedConfig.versionConfig?.platformName) {
-    normalizedConfig.versionConfig = normalizedConfig.versionConfig || {};
-    normalizedConfig.versionConfig.platformName = title;
+  const platformName = normalizedConfig?.versionConfig?.platformName;
+  if (typeof platformName === "object") {
+    tempPlatformName = platformName[branch] || platformName["master"] || "构建平台";
+  } else if (typeof platformName === "string" && platformName) {
+    tempPlatformName = platformName;
+  } else if (title) {
+    // 使用项目标题作为默认平台名称
+    tempPlatformName = title;
   }
 
   return normalizedConfig;
@@ -268,31 +381,42 @@ function askUserConfirmation(message, defaultYes = false) {
  * 校验配置文件
  * @param {Object} buildConfig
  */
-async function validateConfig(buildConfig) {
+async function validateConfig(buildConfig, targetBranch = currentBranch) {
   if (!buildConfig) {
     console.error(global.logColor.error, `❌ ZIP压缩已禁用，版本控制文件${versionFileName}配置错误`);
     process.exit(1);
   }
 
   if (buildConfig?.buildConfigs?.enabled === false) {
-    console.warn(global.logColor.error, `⚠️  ZIP压缩已禁用，版本控制文件${versionFileName}中的enabled属性设置为false`);
+    console.warn(
+      global.logColor.error,
+      `⚠️  ZIP压缩已禁用，版本控制文件${versionFileName}中的 enabled 属性设置为 false`
+    );
     process.exit(0);
   }
 
-  if (!buildConfig?.buildConfigs?.gitAutoPushReposBranchMap[currentBranch]) {
+  if (!buildConfig?.buildConfigs?.gitAutoPushReposBranchMap[targetBranch]) {
     if (![testScript].includes(scriptEvent)) {
-      console.error(global.logColor.error, `❌ 当前分支非gitAutoPushReposBranchMap配置可构建分支，请检查`);
+      console.error(
+        global.logColor.error,
+        `❌ 目标分支 ${targetBranch} 非 gitAutoPushReposBranchMap 配置可构建分支，请检查`
+      );
       process.exit(1);
     }
   }
 
-  if (currentBranch === "master" && !process.env.npm_lifecycle_event.includes("prod")) {
-    console.error(global.logColor.error, `❌ 当前分支为 master 分支，请使用正式环境构建命令进行构建`);
+  const buildMode = getBuildMode();
+  const lifecycleEvent = process.env.npm_lifecycle_event || "";
+  const isProdBuild = buildMode === "prod" || lifecycleEvent.includes("prod");
+  const isStageBuild = buildMode === "stage" || lifecycleEvent.includes("stage");
+
+  if (targetBranch === "master" && !isProdBuild) {
+    console.error(global.logColor.error, `❌ 目标分支为 master 分支，请使用正式环境构建命令进行构建`);
     process.exit(1);
   }
 
-  if (currentBranch !== "master" && !process.env.npm_lifecycle_event.includes("stage")) {
-    console.warn(global.logColor.warning, `⚠️  当前分支为 ${currentBranch} 分支，建议使用测试环境构建命令`);
+  if (targetBranch !== "master" && !isStageBuild) {
+    console.warn(global.logColor.warning, `⚠️  目标分支为 ${targetBranch} 分支，建议使用测试环境构建命令`);
     console.log(global.logColor.info, `推荐命令: npm run infly:build:stage`);
 
     const shouldContinue = await askUserConfirmation("确定要继续当前构建吗？", false);
@@ -303,7 +427,6 @@ async function validateConfig(buildConfig) {
     }
   }
 }
-
 /**
  * 校验文件是否存在
  * @param {String} checkPath - 检查路径
@@ -320,6 +443,13 @@ function validateFileExists(checkPath, logKey) {
     indexHtmlPath: {
       error: "index.html文件不存在，请检查构建配置"
     },
+    serverJsPath: {
+      error: `server.js文件不存在，请检查 Next.js standalone 构建配置。支持 server.js 或 ${path.join(
+        "apps",
+        projectName,
+        "server.js"
+      )}`
+    },
     outputPathFull: {
       error: "压缩文件没有成功创建，请检查构建配置",
       success: `压缩完成，已成功创建文件`,
@@ -385,11 +515,14 @@ function createVersionMap(versionList = []) {
  *  @param {Boolean} disableUpdateVersionEnv - 禁用环境配置
  */
 function checkIsDisableUpdateVersionEnv(disableUpdateVersionEnv = []) {
-  let isDisableUpdateVersionEnv = process.env.npm_lifecycle_script.includes(`--mode staging`); // 默认禁用测试环境更新版本
+  const lifecycleText = [process.env.npm_lifecycle_event, process.env.npm_lifecycle_script, ...process.argv]
+    .filter(Boolean)
+    .join(" ");
+  let isDisableUpdateVersionEnv = lifecycleText.includes(`--mode staging`); // 默认禁用测试环境更新版本
 
   if (Array.isArray(disableUpdateVersionEnv) && disableUpdateVersionEnv.length > 0) {
     disableUpdateVersionEnv.forEach((item) => {
-      if (process.env.npm_lifecycle_script.includes(`--mode ${item}`)) {
+      if (lifecycleText.includes(`--mode ${item}`)) {
         isDisableUpdateVersionEnv = disableUpdateVersionEnv.includes(item);
       }
     });
@@ -405,7 +538,14 @@ function checkIsDisableUpdateVersionEnv(disableUpdateVersionEnv = []) {
  */
 function updateVersionList(zipFiles = [], extraParams) {
   const { opt = "update", buildConfig, configPath } = extraParams || {};
-  const { versionConfig } = buildConfig || {};
+  let { versionConfig } = buildConfig || {};
+  if (buildConfig && !versionConfig) {
+    buildConfig.versionConfig = {};
+    versionConfig = buildConfig.versionConfig;
+  }
+  if (versionConfig && !Array.isArray(versionConfig.versionList)) {
+    versionConfig.versionList = [];
+  }
   const { versionList = [] } = versionConfig || {};
   const { disableUpdateVersionEnv } = versionConfig || {};
   const isDisableUpdateVersionEnv = checkIsDisableUpdateVersionEnv(disableUpdateVersionEnv);
@@ -426,7 +566,10 @@ function updateVersionList(zipFiles = [], extraParams) {
       if (!versionMap[fileName] && Array.isArray(versionList)) {
         allVersionExist = false;
         buildConfig.versionConfig.versionList.unshift(singleVersionInfo);
-        console.log(global.logColor.success, `✅ 新版本${version}写入${versionFileName}文件更新成功`);
+        const updateText = isDisableUpdateVersionEnv
+          ? `✅ 新版本${version}已生成，当前环境跳过写入${versionFileName}`
+          : `✅ 新版本${version}写入${versionFileName}文件更新成功`;
+        console.log(global.logColor.success, updateText);
       }
       // 如果是更新，压缩脚本进行打包则删除全部旧文件
       if (isBuilZipScript && opt === "update") {
@@ -561,7 +704,7 @@ function copyToClipboard(text) {
  */
 function scriptInit() {
   let tempInflyConfig = {};
-  if (!isExistVueConfigFile || !fs.existsSync(targetProjectPackageJSON)) {
+  if ((!isExistVueConfigFile && !hasNextConfig) || !fs.existsSync(targetProjectPackageJSON)) {
     return;
   }
   scriptWrite(targetProjectPackageJSON, buildList);
@@ -596,7 +739,7 @@ function scriptInit() {
  * @returns
  */
 function copyVersionConfigFile() {
-  if (!isExistVueConfigFile) {
+  if (!isExistVueConfigFile && !hasNextConfig) {
     return;
   }
   const { name: projectTitle } = configureWebpack || {};
@@ -625,7 +768,7 @@ function copyVersionConfigFile() {
           tempVersionConfig.buildConfigs.buildFoldName = targetProjectOutputDir;
         }
 
-        if (projectTitle) {
+        if (projectTitle && !tempVersionConfig.versionConfig?.platformName) {
           tempVersionConfig.versionConfig.platformName = projectTitle;
         }
 
@@ -652,22 +795,44 @@ function copyVersionConfigFile() {
  * 构建前分支处理
  */
 async function beforeBuild() {
-  // 1. 先进行配置校验，如果用户取消则阻塞后续流程
-  await validateConfig(buildConfig);
+  const targetBranch = getBuildTargetBranch(gitAutoPushReposBranchMap);
+
+  await validateConfig(buildConfig, targetBranch);
+
+  if (
+    hasArg("--check-only") ||
+    buildContext.checkOnly === true ||
+    (process.env.INFLY_SKIP_BRANCH_UPDATE === "1" && process.env.INFLY_SKIP_PACKAGES_UPDATE === "1")
+  ) {
+    return;
+  }
+
+  const currentProjectStatus = checkSingleDirGitStatus(projectRoot, projectName);
+
+  if (currentProjectStatus.hasUncommitted) {
+    console.log(global.logColor.error, `\n❌ 当前项目存在未提交的更改，请先提交或暂存后再继续构建`);
+    process.exit(1);
+  }
+
+  const currentProjectUpdateResult = pullSingleDirFromBranch(projectRoot, projectName, targetBranch);
+
+  if (!currentProjectUpdateResult.success) {
+    console.log(global.logColor.error, `\n❌ 当前项目切换到 ${targetBranch} 分支失败，请检查`);
+    process.exit(1);
+  }
 
-  // 2. 执行分支切换和拉取操作
   await autoBranchProcess({
     gitAutoPushRepos,
     gitAutoPushReposBranchMap,
-    currentBranch,
+    currentBranch: targetBranch,
     targetProjectOutputDir,
-    validateConfig: () => {} // 配置验证已经在上面完成
+    validateConfig: () => {}
   });
 
-  // 3. 检查和更新 packages 下的模块（如果启用了此功能）
-  await checkAndUpdatePackages();
+  if (process.env.INFLY_SKIP_PACKAGES_UPDATE !== "1") {
+    await checkAndUpdatePackages(undefined, "master");
+  }
 }
-
 module.exports = {
   init,
   scriptInit,

package/build/webpack5/webpack.base.js

@@ -138,10 +138,19 @@ function configureWebpack(extraConfig = {}) {
 /**
  * chainWebpack配置
  */
-function chainWebpack(config) {
+function chainWebpack(config, options = {}) {
+  const { htmlPluginOptions = {} } = options || {};
+
   config.plugins.delete("preload");
   config.plugins.delete("prefetch");
 
+  if (Object.keys(htmlPluginOptions).length) {
+    config.plugin("html").tap((args) => {
+      const originalOptions = args[0] || {};
+      return [{ ...originalOptions, ...htmlPluginOptions }];
+    });
+  }
+
   // 强制禁用 modern mode（staging 环境）
   if (ENV.IS_STAGING) {
     // 删除 @vue/cli-service 的 modern mode 相关插件

package/build/webpack5/webpack.base.test.js

@@ -0,0 +1,59 @@
+"use strict";
+
+const assert = require("node:assert/strict");
+const test = require("node:test");
+const { chainWebpack } = require("./webpack.base");
+
+function createChainConfig() {
+  let htmlPluginOptions;
+  const chain = new Proxy(
+    function () {},
+    {
+      get(_target, property) {
+        if (property === "plugin") {
+          return (name) => ({
+            tap(callback) {
+              if (name === "html") {
+                [htmlPluginOptions] = callback([htmlPluginOptions || {}]);
+              }
+              return this;
+            },
+            use() {
+              return this;
+            }
+          });
+        }
+
+        return chain;
+      },
+      apply() {
+        return chain;
+      }
+    }
+  );
+
+  return {
+    config: chain,
+    getHtmlPluginOptions: () => htmlPluginOptions
+  };
+}
+
+test("chainWebpack 默认不增加 HTML 插件参数", () => {
+  const { config, getHtmlPluginOptions } = createChainConfig();
+
+  chainWebpack(config);
+
+  assert.equal(getHtmlPluginOptions()?.faviconPath, undefined);
+});
+
+test("chainWebpack 合并调用方传入的 HTML 插件参数", () => {
+  const { config, getHtmlPluginOptions } = createChainConfig();
+
+  chainWebpack(config, {
+    htmlPluginOptions: {
+      faviconPath: "favicon_xzya.ico"
+    }
+  });
+
+  assert.equal(getHtmlPluginOptions()?.faviconPath, "favicon_xzya.ico");
+});