@infly/libs 2.0.43 → 2.0.45

package/build/build-dist/script-management.js

@@ -1,5 +1,5 @@
-function shouldManageBuildScripts(inflyConfig) {
-  return inflyConfig?.buildConfigs?.manageScripts !== false;
-}
-
-module.exports = { shouldManageBuildScripts };
+function shouldManageBuildScripts(inflyConfig) {
+  return inflyConfig?.buildConfigs?.manageScripts !== false;
+}
+
+module.exports = { shouldManageBuildScripts };

package/{script/build → build/build-utils}/command.js

@@ -2,14 +2,19 @@ const { spawn } = require("child_process");
 
 function run(command, args, options = {}) {
   return new Promise((resolve, reject) => {
-    const child = spawn(command, args, {
+    const useShell = options.shell !== undefined ? options.shell : process.platform === "win32";
+    // Avoid DEP0190: when shell=true, pass command+args as single string
+    const [cmd, cmdArgs] = useShell
+      ? [[command, ...args].join(" "), []]
+      : [command, args];
+    const child = spawn(cmd, cmdArgs, {
       cwd: options.cwd || process.cwd(),
       env: {
         ...process.env,
         ...(options.env || {})
       },
       stdio: options.stdio || "inherit",
-      shell: process.platform === "win32"
+      shell: useShell
     });
 
     child.on("close", (code) => {
@@ -25,14 +30,18 @@ function run(command, args, options = {}) {
 }
 
 function spawnBackground(command, args, options = {}) {
-  const child = spawn(command, args, {
+  const useShell = options.shell !== undefined ? options.shell : process.platform === "win32";
+  const [cmd, cmdArgs] = useShell
+    ? [[command, ...args].join(" "), []]
+    : [command, args];
+  const child = spawn(cmd, cmdArgs, {
     cwd: options.cwd || process.cwd(),
     env: {
       ...process.env,
       ...(options.env || {})
     },
     stdio: options.stdio || "inherit",
-    shell: process.platform === "win32"
+    shell: useShell
   });
 
   child.on("error", (error) => {

package/{script/build → build/build-utils}/deps.js

@@ -9,7 +9,7 @@ const path = require("path");
  *
  * 示例（vue.config.js）：
  *   alias: {
- *     "@postal-benefits-platform": projectResolve("../postal-benefits-platform/src")
+ *     "@example-admin": projectResolve("../example-admin/src")
  *   }
  *
  * @param {string} appDir - 当前 app 目录的绝对路径

package/{script/build → build/build-utils}/git.js

@@ -1,7 +1,7 @@
 const fs = require("fs");
 const path = require("path");
-const { checkAndUpdatePackages } = require("../git-automation");
-const { gitOutput, findGitRepo, getGitCommonDir } = require("../git-automation/git-utils");
+const { checkAndUpdatePackages } = require("../../script/git-automation");
+const { gitOutput, findGitRepo, getGitCommonDir } = require("../../script/git-automation/git-utils");
 const { run } = require("./command");
 
 function getTargetBranch(rootPackageJson, mode) {
@@ -77,9 +77,11 @@ function getDistRepoInfo(rootDir, pkg, targetBranch, options = {}) {
     fs.existsSync(nextConfigTs)
   );
 
-  let outputDir;
+  let outputDir = pkg.viteOutputDir;
 
-  if (hasVueConfig) {
+  if (outputDir) {
+    // Vite 注册表已经提供经过校验的 dist 根，禁止再执行历史 vue.config.js。
+  } else if (hasVueConfig) {
     outputDir = require(vueConfigPath).outputDir;
   } else if (hasNextConfig) {
     outputDir = pkg.packageJson.infly?.buildConfigs?.outputPath;

package/{script/build → build/build-utils}/preview.js

@@ -34,7 +34,10 @@ function startBatchPreviews(rootDir, packages) {
     const child = spawnBackground("infly-libs", ["preview", "--no-build"], {
       cwd: path.join(rootDir, pkg.dir),
       env: createBuildContext({
-        batchPreview: true
+        batchPreview: true,
+        outputDir: pkg.targetOutputDir || undefined,
+        target: pkg.targetKey || undefined,
+        targetLabel: pkg.targetLabel || undefined,
       })
     });
 

package/{script/webhook/webhook.js → build/build-utils/webhook-single.js}

@@ -63,7 +63,7 @@ function postVersionFileAndMsg(publishText, extraParams = {}) {
     gitAutoPushRepos,
     gitAutoPushReposBranchMap,
     repos,
-    deployUrl = "https://cicd.sutpay.com/"
+    deployUrl = ""
   } = extraParams || {};
   const { branch, commitMsg, author } = gitInfo || {};
   const webhookMessage = getWebhookMessage();
@@ -82,7 +82,12 @@ function postVersionFileAndMsg(publishText, extraParams = {}) {
     } */
   let content = publishText;
   if (gitAutoPushReposBranchMap) {
-    content = `${publishText}\n构建文件：已推送对应仓库【${repos}】- 分支【${gitAutoPushReposBranchMap[branch]}】\n构建人：${author}\n部署系统：${deployUrl}`;
+    content = [
+      publishText,
+      `构建文件：已推送对应仓库【${repos}】- 分支【${gitAutoPushReposBranchMap[branch]}】`,
+      `构建人：${author}`,
+      deployUrl ? `部署系统：${deployUrl}` : ""
+    ].filter(Boolean).join("\n");
   } else {
     content = `${publishText}\n构建文件下载地址：${GITPATH}\n${webhookExtraText}\n`;
   }

package/{script/build → build/build-utils}/webhook.js

@@ -36,7 +36,7 @@ function getRecordContent(record, deployUrl) {
       publishText,
       `构建文件：已推送对应仓库【${repos || ""}】- 分支【${targetBranch}】`,
       `构建人：${author || ""}`,
-      `部署系统：${deployUrl}`
+      deployUrl ? `部署系统：${deployUrl}` : ""
     ]
       .filter(Boolean)
       .join("\n");
@@ -77,7 +77,7 @@ async function postBatchWebhook(batchWebhookFile, extraArgs, mode) {
   }
 
   const [firstRecord] = records;
-  const { webhookUrl, webhookAtUser = [], gitInfo = {}, deployUrl = "https://cicd.sutpay.com/" } =
+  const { webhookUrl, webhookAtUser = [], gitInfo = {}, deployUrl = "" } =
     firstRecord.extraParams || {};
 
   if (!webhookUrl) {
@@ -114,5 +114,6 @@ async function postBatchWebhook(batchWebhookFile, extraArgs, mode) {
 }
 
 module.exports = {
+  getRecordContent,
   postBatchWebhook
 };

package/build/docker/compose-command.js

@@ -1,74 +1,74 @@
-const fs = require("node:fs");
-const path = require("node:path");
-
-const {
-  EXIT_SELECTION,
-  selectOption: defaultSelectOption,
-} = require("../../tools/select-option");
-const { composeRelease: defaultComposeRelease } = require("./compose-release");
-
-function loadTargetConfig(configPath) {
-  const resolvedPath = path.resolve(configPath);
-  delete require.cache[require.resolve(resolvedPath)];
-  return {
-    config: require(resolvedPath),
-    configDir: path.dirname(resolvedPath),
-  };
-}
-
-function loadPackageTargetConfig(cwd = process.cwd()) {
-  const packagePath = path.resolve(cwd, "package.json");
-  if (!fs.existsSync(packagePath)) {
-    throw new Error(`Package config not found: ${packagePath}`);
-  }
-  delete require.cache[require.resolve(packagePath)];
-  const packageJson = require(packagePath);
-  return {
-    config: packageJson.infly?.docker,
-    configDir: path.dirname(packagePath),
-  };
-}
-
-async function runComposeCommand(options = {}, dependencies = {}) {
-  const composeRelease = dependencies.composeRelease || defaultComposeRelease;
-  const usesDirectConfig = !options.config
-    && !options.configObject
-    && (options.projectDir || options.file);
-  if (usesDirectConfig) return composeRelease(options);
-
-  const loaded = options.config
-    ? loadTargetConfig(options.config)
-    : options.configObject
-      ? { config: options.configObject, configDir: options.configDir || process.cwd() }
-      : loadPackageTargetConfig(options.cwd || process.cwd());
-  const targets = loaded.config?.targets;
-  if (!targets || Object.keys(targets).length === 0) {
-    throw new Error("Docker target config must define at least one target.");
-  }
-
-  const selectOption = dependencies.selectOption || defaultSelectOption;
-  const log = dependencies.log || console.log;
-  const targetName = options.target || await selectOption(
-    "请选择 Docker 发布目标",
-    Object.entries(targets).map(([value, target]) => ({
-      value,
-      label: target.label || value,
-    })),
-  );
-  if (targetName === EXIT_SELECTION) {
-    log("已退出，未执行任何操作。");
-    return { cancelled: true };
-  }
-  const target = targets[targetName];
-  if (!target) throw new Error(`Unknown Docker target: ${targetName}`);
-
-  return composeRelease({
-    projectDir: loaded.configDir,
-    file: target.file,
-    bump: options.bump || "patch",
-    push: Boolean(options.push),
-    dryRun: Boolean(options.dryRun),
-  });
-}
-
-module.exports = { loadPackageTargetConfig, loadTargetConfig, runComposeCommand };
+const fs = require("node:fs");
+const path = require("node:path");
+
+const {
+  EXIT_SELECTION,
+  selectOption: defaultSelectOption,
+} = require("../../tools/select-option");
+const { composeRelease: defaultComposeRelease } = require("./compose-release");
+
+function loadTargetConfig(configPath) {
+  const resolvedPath = path.resolve(configPath);
+  delete require.cache[require.resolve(resolvedPath)];
+  return {
+    config: require(resolvedPath),
+    configDir: path.dirname(resolvedPath),
+  };
+}
+
+function loadPackageTargetConfig(cwd = process.cwd()) {
+  const packagePath = path.resolve(cwd, "package.json");
+  if (!fs.existsSync(packagePath)) {
+    throw new Error(`Package config not found: ${packagePath}`);
+  }
+  delete require.cache[require.resolve(packagePath)];
+  const packageJson = require(packagePath);
+  return {
+    config: packageJson.infly?.docker,
+    configDir: path.dirname(packagePath),
+  };
+}
+
+async function runComposeCommand(options = {}, dependencies = {}) {
+  const composeRelease = dependencies.composeRelease || defaultComposeRelease;
+  const usesDirectConfig = !options.config
+    && !options.configObject
+    && (options.projectDir || options.file);
+  if (usesDirectConfig) return composeRelease(options);
+
+  const loaded = options.config
+    ? loadTargetConfig(options.config)
+    : options.configObject
+      ? { config: options.configObject, configDir: options.configDir || process.cwd() }
+      : loadPackageTargetConfig(options.cwd || process.cwd());
+  const targets = loaded.config?.targets;
+  if (!targets || Object.keys(targets).length === 0) {
+    throw new Error("Docker target config must define at least one target.");
+  }
+
+  const selectOption = dependencies.selectOption || defaultSelectOption;
+  const log = dependencies.log || console.log;
+  const targetName = options.target || await selectOption(
+    "请选择 Docker 发布目标",
+    Object.entries(targets).map(([value, target]) => ({
+      value,
+      label: target.label || value,
+    })),
+  );
+  if (targetName === EXIT_SELECTION) {
+    log("已退出，未执行任何操作。");
+    return { cancelled: true };
+  }
+  const target = targets[targetName];
+  if (!target) throw new Error(`Unknown Docker target: ${targetName}`);
+
+  return composeRelease({
+    projectDir: loaded.configDir,
+    file: target.file,
+    bump: options.bump || "patch",
+    push: Boolean(options.push),
+    dryRun: Boolean(options.dryRun),
+  });
+}
+
+module.exports = { loadPackageTargetConfig, loadTargetConfig, runComposeCommand };

package/build/docker/compose-release.js

@@ -1,91 +1,91 @@
-const { execFileSync } = require("node:child_process");
-const fs = require("node:fs");
-const path = require("node:path");
-
-function bumpComposeImageVersion(content, bump = "patch") {
-  if (bump !== "patch") {
-    throw new Error(`Unsupported version bump: ${bump}. Only patch is supported.`);
-  }
-
-  const imageRegex = /^(\s*image:\s*)([^\s#]+):(\d+)\.(\d+)\.(\d+)(\s*(?:#.*)?)$/gm;
-  const matches = [...content.matchAll(imageRegex)];
-
-  if (matches.length !== 1) {
-    throw new Error(`Compose file must contain exactly one versioned image; found ${matches.length}.`);
-  }
-
-  const [, prefix, image, major, minor, patchVersion, suffix] = matches[0];
-  const from = `${image}:${major}.${minor}.${patchVersion}`;
-  const to = `${image}:${major}.${minor}.${Number(patchVersion) + 1}`;
-  const replacement = `${prefix}${to}${suffix}`;
-
-  return {
-    content: content.replace(imageRegex, replacement),
-    from,
-    to,
-  };
-}
-
-function resolveComposePath(projectDir, file) {
-  if (!projectDir) throw new Error("--project-dir is required.");
-  if (!file) throw new Error("--file is required.");
-
-  const resolvedProjectDir = path.resolve(projectDir);
-  const composePath = path.resolve(resolvedProjectDir, file);
-  const relative = path.relative(resolvedProjectDir, composePath);
-
-  if (relative.startsWith("..") || path.isAbsolute(relative)) {
-    throw new Error("Compose file must be inside project-dir.");
-  }
-  if (!fs.existsSync(composePath)) {
-    throw new Error(`Compose file not found: ${composePath}`);
-  }
-
-  return { projectDir: resolvedProjectDir, composePath };
-}
-
-function defaultRunDocker(args, options) {
-  execFileSync("docker", args, { cwd: options.cwd, stdio: "inherit" });
-}
-
-function composeRelease(options = {}, dependencies = {}) {
-  const {
-    projectDir,
-    file,
-    bump = "patch",
-    push = false,
-    dryRun = false,
-  } = options;
-  const runDocker = dependencies.runDocker || defaultRunDocker;
-  const resolved = resolveComposePath(projectDir, file);
-  const original = fs.readFileSync(resolved.composePath, "utf8");
-  const updated = bumpComposeImageVersion(original, bump);
-  const baseArgs = ["compose", "-f", resolved.composePath];
-
-  console.log(`Version update: ${updated.from} -> ${updated.to}`);
-
-  if (dryRun) {
-    console.log(`[dry-run] docker ${[...baseArgs, "config"].join(" ")}`);
-    console.log(`[dry-run] docker ${[...baseArgs, "build"].join(" ")}`);
-    if (push) console.log(`[dry-run] docker ${[...baseArgs, "push"].join(" ")}`);
-    return { ...updated, projectDir: resolved.projectDir, composePath: resolved.composePath };
-  }
-
-  fs.writeFileSync(resolved.composePath, updated.content, "utf8");
-  try {
-    runDocker([...baseArgs, "config"], { cwd: resolved.projectDir });
-    runDocker([...baseArgs, "build"], { cwd: resolved.projectDir });
-    if (push) runDocker([...baseArgs, "push"], { cwd: resolved.projectDir });
-  } catch (error) {
-    fs.writeFileSync(resolved.composePath, original, "utf8");
-    throw error;
-  }
-
-  return { ...updated, projectDir: resolved.projectDir, composePath: resolved.composePath };
-}
-
-module.exports = {
-  bumpComposeImageVersion,
-  composeRelease,
-  resolveComposePath,
-};
+const { execFileSync } = require("node:child_process");
+const fs = require("node:fs");
+const path = require("node:path");
+
+function bumpComposeImageVersion(content, bump = "patch") {
+  if (bump !== "patch") {
+    throw new Error(`Unsupported version bump: ${bump}. Only patch is supported.`);
+  }
+
+  const imageRegex = /^(\s*image:\s*)([^\s#]+):(\d+)\.(\d+)\.(\d+)(\s*(?:#.*)?)$/gm;
+  const matches = [...content.matchAll(imageRegex)];
+
+  if (matches.length !== 1) {
+    throw new Error(`Compose file must contain exactly one versioned image; found ${matches.length}.`);
+  }
+
+  const [, prefix, image, major, minor, patchVersion, suffix] = matches[0];
+  const from = `${image}:${major}.${minor}.${patchVersion}`;
+  const to = `${image}:${major}.${minor}.${Number(patchVersion) + 1}`;
+  const replacement = `${prefix}${to}${suffix}`;
+
+  return {
+    content: content.replace(imageRegex, replacement),
+    from,
+    to,
+  };
+}
+
+function resolveComposePath(projectDir, file) {
+  if (!projectDir) throw new Error("--project-dir is required.");
+  if (!file) throw new Error("--file is required.");
+
+  const resolvedProjectDir = path.resolve(projectDir);
+  const composePath = path.resolve(resolvedProjectDir, file);
+  const relative = path.relative(resolvedProjectDir, composePath);
+
+  if (relative.startsWith("..") || path.isAbsolute(relative)) {
+    throw new Error("Compose file must be inside project-dir.");
+  }
+  if (!fs.existsSync(composePath)) {
+    throw new Error(`Compose file not found: ${composePath}`);
+  }
+
+  return { projectDir: resolvedProjectDir, composePath };
+}
+
+function defaultRunDocker(args, options) {
+  execFileSync("docker", args, { cwd: options.cwd, stdio: "inherit" });
+}
+
+function composeRelease(options = {}, dependencies = {}) {
+  const {
+    projectDir,
+    file,
+    bump = "patch",
+    push = false,
+    dryRun = false,
+  } = options;
+  const runDocker = dependencies.runDocker || defaultRunDocker;
+  const resolved = resolveComposePath(projectDir, file);
+  const original = fs.readFileSync(resolved.composePath, "utf8");
+  const updated = bumpComposeImageVersion(original, bump);
+  const baseArgs = ["compose", "-f", resolved.composePath];
+
+  console.log(`Version update: ${updated.from} -> ${updated.to}`);
+
+  if (dryRun) {
+    console.log(`[dry-run] docker ${[...baseArgs, "config"].join(" ")}`);
+    console.log(`[dry-run] docker ${[...baseArgs, "build"].join(" ")}`);
+    if (push) console.log(`[dry-run] docker ${[...baseArgs, "push"].join(" ")}`);
+    return { ...updated, projectDir: resolved.projectDir, composePath: resolved.composePath };
+  }
+
+  fs.writeFileSync(resolved.composePath, updated.content, "utf8");
+  try {
+    runDocker([...baseArgs, "config"], { cwd: resolved.projectDir });
+    runDocker([...baseArgs, "build"], { cwd: resolved.projectDir });
+    if (push) runDocker([...baseArgs, "push"], { cwd: resolved.projectDir });
+  } catch (error) {
+    fs.writeFileSync(resolved.composePath, original, "utf8");
+    throw error;
+  }
+
+  return { ...updated, projectDir: resolved.projectDir, composePath: resolved.composePath };
+}
+
+module.exports = {
+  bumpComposeImageVersion,
+  composeRelease,
+  resolveComposePath,
+};

package/compat/init.js

@@ -0,0 +1,9 @@
+"use strict";
+
+function init(projectRoot) {
+  return require("../adapters/vue2/postinstall").initVue2Project(projectRoot);
+}
+
+module.exports = {
+  init,
+};

package/index.js

@@ -1,23 +1,11 @@
-const buildDist = require("./build/build-dist");
-const projectPreview = require("./tools/project-preview");
-const path = require("path");
+"use strict";
 
-function init() {
-  // 检查是否在 infly-libs 包自身目录中执行
-  const currentDir = process.cwd();
-  const packageDir = __dirname;
-  
-  // 如果当前目录就是 infly-libs 包目录，跳过执行
-  if (currentDir === packageDir) {
-    return;
-  }
-  
-  projectPreview.scriptInit();
-  buildDist.scriptInit();
+function init(projectRoot) {
+  return require("./compat/init").init(projectRoot);
 }
 
-init();
-
-module.exports = {
-  init
-};
+module.exports = Object.freeze({
+  name: "@infly/libs",
+  framework: "agnostic",
+  init,
+});