@infly/libs 2.0.26 → 2.0.37

package/bin/cli.js

@@ -1,30 +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,
-  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
  * 工具实现根据配置自动切换分支，构建到配置的对应文件夹路径，并且执行自动提交推送，也可执行自动压缩提交到当前项目
@@ -25,17 +25,18 @@ const { postVersionFileAndMsg } = require("../../script/webhook/webhook.js");
 const { scriptWrite, targetProjectFileResolve, currentProjectFileResolve } = require("../../tools/file-process.js");
 const {
   autoBranchProcess,
-  checkGitStatus,
   autoGitProcess,
   getCurrentBranch,
   getLatestCommitInfo,
   getLastCommitByFile,
-  checkAndUpdatePackages
+  checkAndUpdatePackages,
+  checkSingleDirGitStatus,
+  pullSingleDirFromBranch
 } = require("../../script/git-automation");
 
 const scriptEvent = process.env.npm_lifecycle_event;
 const isBuilZipScript = process.env.npm_lifecycle_event;
-const testScript = "infly:build:test";
+const testScript = "build:test";
 const versionFileName = "package.json";
 const oldVersionFileName = "version-config.json";
 const npmPackageConfigKey = "infly";
@@ -53,36 +54,42 @@ const { infly: currentInflyConfig } = currentPackageJsonConfig || {};
 const targetProjectVersionConfigPath = targetProjectFileResolve(oldVersionFileName);
 const targetProjectVueConfigPath = targetProjectFileResolve("vue.config.js");
 const targetProjectPackageJSON = targetProjectFileResolve("package.json");
+const targetProjectSettingsJS = targetProjectFileResolve("src/settings.js");
 const targetPackageJsonConfig = JSON.parse(fs.readFileSync(targetProjectPackageJSON, "utf-8"));
 const { name: projectName, version: projectVersion = "", infly: targetInflyConfig } = targetPackageJsonConfig || {};
 const [major = "", minor = "", patch = ""] = projectVersion.split(".");
+const { title: projectTitle } = fs.existsSync(targetProjectSettingsJS) ? require(targetProjectSettingsJS) || {} : {};
 
 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 dealBranch = isMaster ? "master" : "release";
 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: "正式环境" }, release: { updateDevText: "测试环境" } }[dealBranch] || {}; // 更新环境和处理分支
+const { updateDevText = "测试环境" } = { master: { updateDevText: "正式环境" } }[currentBranch] || {}; // 更新环境和处理分支
 
 const configPath = path.resolve(projectRoot, versionFileName);
 let buildConfig = JSON.parse(fs.readFileSync(configPath, "utf-8")) || {};
-if (buildConfig[npmPackageConfigKey]) {
-  buildConfig = buildConfig[npmPackageConfigKey];
-}
+let tempPlatformName = "";
+
+buildConfig = normalizeBuildConfig(buildConfig, npmPackageConfigKey, currentBranch, projectTitle);
 
 // 准备构建信息
-const { zipOptions, versionConfig } = buildConfig || {};
+const { buildConfigs, versionConfig } = buildConfig || {};
 const {
   buildFoldName: zipBuildFoldName, // 构建后文件名称
   outputPath, // 输出路径
   gitAuto, // 是否自动提交git
-  gitAutoPushRepos, // 自动提交文件到对应仓库
-  gitAutoPushReposBranchMap = {}, // 自动提交文件到对应仓库分支配置
+  gitAutoPushReposBranchMap, // 自动提交文件到对应仓库分支配置
+  gitAutoPushRepos = gitAutoPushReposBranchMap, // 自动提交文件到对应仓库
   gitAutoCommitText = "", // git自动提交信息
   enablePreview, // 启用预览
   openExplorer, // 启用打开资源管理器
@@ -90,13 +97,113 @@ const {
   webhookAtUser, // 企业微信机器人@用户
   enableClipboard, // 启用粘贴板
   disableUpdateVersionEnv // 禁止更新版本信息环境
-} = zipOptions || {};
+} = 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);
@@ -111,13 +218,16 @@ 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() || {};
     const { branch, commitMsg } = gitInfo || {};
-    const tempLink = typeof links === "object" ? links[dealBranch] : links || "";
-    const publishText = `${platformName}：\n更新到：${tempLink}\n更新时间：${timestamp}\n版本号：v${newVersion}\n分支：${branch}\n更新环境：${updateDevText}\n更新内容：\n${commitMsg}`;
+    let tempLink = typeof links === "object" ? links[branch] : links || "";
+    if (typeof tempLink === "object") {
+      tempLink = tempLink[process.env.VUE_APP_PLATFORM] || tempLink["DEFAULT"] || JSON.stringify(tempLink);
+    }
+    const publishText = `${tempPlatformName}：\n更新到：${tempLink}\n更新时间：${timestamp}\n版本号：v${newVersion}\n分支：${branch}\n更新环境：${updateDevText}\n更新内容：\n${commitMsg}`;
     const newZipFileInfo = [
       {
         version: newVersion,
@@ -133,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) {
@@ -157,11 +268,12 @@ async function init() {
         projectName
       };
 
-      checkGitStatus(buildFoldName, newFileName, checkGitStatusParams);
       autoGitProcess(buildFoldName, newFileName, {
         gitInfo,
         gitAutoCommitText,
         gitAutoPushReposBranchMap,
+        gitLockDir: buildContext.gitLockDir,
+        gitProcessOrder: buildContext.gitProcessOrder,
         ...checkGitStatusParams
       });
     }
@@ -175,16 +287,21 @@ async function init() {
     }
 
     if (webhookUrl) {
-      postVersionFileAndMsg(publishText, {
+      const webhookParams = {
         projectName,
         newFileName,
         gitInfo,
         targetProjectOutputDir,
-        ...zipOptions
-      });
+        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) {
@@ -193,6 +310,41 @@ async function init() {
   }
 }
 
+/**
+ * 规范化构建配置
+ * @param {Object} config - 原始配置对象
+ * @param {String} packageKey - 包配置键名
+ * @param {String} branch - 当前分支
+ * @param {String} title - 项目标题
+ * @returns {Object} 规范化后的配置对象
+ */
+function normalizeBuildConfig(config, packageKey, branch, title) {
+  let normalizedConfig = config;
+
+  // 提取嵌套的配置
+  if (normalizedConfig[packageKey]) {
+    normalizedConfig = normalizedConfig[packageKey];
+  }
+
+  // 自动启用 gitAutoPushRepos
+  if (!normalizedConfig.gitAutoPushRepos && normalizedConfig.gitAutoPushReposBranchMap) {
+    normalizedConfig.gitAutoPushRepos = true;
+  }
+
+  // 处理平台名称配置
+  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;
+}
+
 /**
  * 用户确认提示
  * @param {string} message - 提示信息
@@ -229,38 +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?.zipOptions?.enabled === false) {
-    console.warn(global.logColor.error, `⚠️  ZIP压缩已禁用，版本控制文件${versionFileName}中的enabled属性设置为false`);
+  if (buildConfig?.buildConfigs?.enabled === false) {
+    console.warn(
+      global.logColor.error,
+      `⚠️  ZIP压缩已禁用，版本控制文件${versionFileName}中的 enabled 属性设置为 false`
+    );
     process.exit(0);
   }
 
-  if (!/^release/.test(currentBranch) && currentBranch !== "master") {
+  if (!buildConfig?.buildConfigs?.gitAutoPushReposBranchMap[targetBranch]) {
     if (![testScript].includes(scriptEvent)) {
-      console.error(global.logColor.error, `❌ 当前分支非release、release/xx、master等可构建分支，请检查`);
+      console.error(
+        global.logColor.error,
+        `❌ 目标分支 ${targetBranch} 非 gitAutoPushReposBranchMap 配置可构建分支，请检查`
+      );
       process.exit(1);
     }
   }
 
-  if (currentBranch !== "master" && currentBranch !== "release" && !/^release/.test(currentBranch)) {
-    console.warn(
-      global.logColor.warning,
-      `⚠️  当前分支为 ${currentBranch}，非测试需求请在 master/release/release/xxx 等可构建分支上执行此脚本`
-    );
-  }
+  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 (currentBranch === "master" && !process.env.npm_lifecycle_event.includes("prod")) {
-    console.error(global.logColor.error, `❌ 当前分支为 master 分支，请使用正式环境构建命令进行构建`);
+  if (targetBranch === "master" && !isProdBuild) {
+    console.error(global.logColor.error, `❌ 目标分支为 master 分支，请使用正式环境构建命令进行构建`);
     process.exit(1);
   }
 
-  if (currentBranch === "release" && !process.env.npm_lifecycle_event.includes("stage")) {
-    console.warn(global.logColor.warning, `⚠️  当前分支为 release 分支，建议使用测试环境构建命令`);
+  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);
@@ -271,7 +427,6 @@ async function validateConfig(buildConfig) {
     }
   }
 }
-
 /**
  * 校验文件是否存在
  * @param {String} checkPath - 检查路径
@@ -288,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: `压缩完成，已成功创建文件`,
@@ -353,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);
       }
     });
@@ -373,7 +538,14 @@ function checkIsDisableUpdateVersionEnv(disableUpdateVersionEnv = []) {
  */
 function updateVersionList(zipFiles = [], extraParams) {
   const { opt = "update", buildConfig, configPath } = extraParams || {};
-  const { versionConfig, zipOptions } = 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);
@@ -394,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") {
@@ -529,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);
@@ -541,12 +716,12 @@ function scriptInit() {
   // 如果存在以前的版本管理文件则进行配置迁移
   if (isExistTargetProjectVersionConfig) {
     tempInflyConfig = JSON.parse(fs.readFileSync(targetProjectVersionConfigPath, "utf-8"));
-    const { versionConfig = {}, zipOptions = {} } = tempInflyConfig || {};
+    const { versionConfig = {}, buildConfigs = {} } = tempInflyConfig || {};
     if (versionConfig.versionList) {
       tempInflyConfig.versionConfig.versionList = []; // 删除旧版本列表
     }
-    if (zipOptions.buildFoldName) {
-      tempInflyConfig.zipOptions.buildFoldName = "";
+    if (buildConfigs.buildFoldName) {
+      tempInflyConfig.buildConfigs.buildFoldName = "";
     }
   }
 
@@ -564,7 +739,7 @@ function scriptInit() {
  * @returns
  */
 function copyVersionConfigFile() {
-  if (!isExistVueConfigFile) {
+  if (!isExistVueConfigFile && !hasNextConfig) {
     return;
   }
   const { name: projectTitle } = configureWebpack || {};
@@ -590,10 +765,10 @@ function copyVersionConfigFile() {
         const tempVersionConfig = JSON.parse(data);
 
         if (targetProjectOutputDir) {
-          tempVersionConfig.zipOptions.buildFoldName = targetProjectOutputDir;
+          tempVersionConfig.buildConfigs.buildFoldName = targetProjectOutputDir;
         }
 
-        if (projectTitle) {
+        if (projectTitle && !tempVersionConfig.versionConfig?.platformName) {
           tempVersionConfig.versionConfig.platformName = projectTitle;
         }
 
@@ -620,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/remove-legacy-assets-plugin.js

@@ -0,0 +1,84 @@
+/**
+ * RemoveLegacyAssetsPlugin
+ * 用于处理 Vue CLI Modern Mode 的 legacy 文件问题
+ * 
+ * 功能：
+ * 1. 在构建前创建占位文件，防止 ModernModePlugin 读取时报错
+ * 2. 在构建时删除 legacy 相关的资源
+ * 3. 在构建完成后清理占位文件
+ */
+
+"use strict";
+
+const fs = require('fs');
+const path = require('path');
+
+class RemoveLegacyAssetsPlugin {
+  constructor(options = {}) {
+    this.options = {
+      legacyFiles: [
+        'legacy-assets-index.html.json',
+        'modern-assets-index.html.json'
+      ],
+      ...options
+    };
+  }
+
+  apply(compiler) {
+    const outputPath = compiler.options.output.path;
+    const { legacyFiles } = this.options;
+
+    // 🔥 Hook 1: 构建开始前创建占位文件
+    compiler.hooks.beforeRun.tapAsync('RemoveLegacyAssetsPlugin', (compiler, callback) => {
+      // 确保输出目录存在
+      if (!fs.existsSync(outputPath)) {
+        fs.mkdirSync(outputPath, { recursive: true });
+      }
+
+      // 创建空数组的 JSON 文件（Vue CLI 期望数组格式）
+      legacyFiles.forEach(file => {
+        const filePath = path.join(outputPath, file);
+        try {
+          fs.writeFileSync(filePath, '[]');
+        } catch (err) {
+          // 忽略创建失败的错误
+          console.warn(`⚠ Failed to create placeholder: ${file}`, err.message);
+        }
+      });
+
+      callback();
+    });
+
+    // 🔥 Hook 2: 构建时删除编译产物中的 legacy 资源
+    compiler.hooks.emit.tapAsync('RemoveLegacyAssetsPlugin', (compilation, callback) => {
+      Object.keys(compilation.assets).forEach(filename => {
+        if (filename.includes('-legacy') || filename.includes('legacy-assets')) {
+          delete compilation.assets[filename];
+        }
+      });
+      callback();
+    });
+
+    // 🔥 Hook 3: 构建完成后清理占位文件
+    compiler.hooks.done.tapAsync('RemoveLegacyAssetsPlugin', (stats, callback) => {
+      // 延迟执行，确保所有读取操作完成
+      setTimeout(() => {
+        legacyFiles.forEach(file => {
+          const filePath = path.join(outputPath, file);
+          try {
+            if (fs.existsSync(filePath)) {
+              fs.unlinkSync(filePath);
+              console.log(`\x1b[32m✓ Cleaned up: ${file}\x1b[0m`);
+            }
+          } catch (err) {
+            // 忽略删除失败的错误
+            console.warn(`⚠ Failed to cleanup: ${file}`, err.message);
+          }
+        });
+        callback();
+      }, 100);
+    });
+  }
+}
+
+module.exports = RemoveLegacyAssetsPlugin;