@ts-max/deploy 0.0.18 → 0.0.20

package/dist/index.cjs

@@ -26,9 +26,12 @@ const defaultConfig = {
   RANCHER_URL: void 0,
   RANCHER_BEARER_TOKEN: void 0,
   RANCHER_NAME_SPACE: "front-center",
-  GIT_URL: getGitUrl(),
-  GIT_BRANCH: getGitBranch$1(),
+  // Git information is resolved lazily in val() so explicit configuration can
+  // be used even when the command is run outside a Git worktree.
+  GIT_URL: "",
+  GIT_BRANCH: "",
   NODE_VERSION: "18",
+  NOTICE_ENABLED: false,
   NOTICE_USERS: void 0,
   MESSAGE_URL: void 0,
   MESSAGE_TOKEN: void 0
@@ -46,11 +49,13 @@ function getConfig() {
   return fs.existsSync(configPath) ? require(configPath) : {};
 }
 function val(key) {
-  let _defaultValue = defaultConfig[key];
-  if (_defaultValue === void 0 || _defaultValue === "") _defaultValue = account[key];
   const envValue = getProcessEnv(key);
   if (envValue !== void 0) return envValue;
   if (key in customerConfig) return customerConfig[key];
+  if (key === "GIT_URL") return getGitUrl() || account[key];
+  if (key === "GIT_BRANCH") return getGitBranch$1();
+  let _defaultValue = defaultConfig[key];
+  if (_defaultValue === void 0 || _defaultValue === "") _defaultValue = account[key];
   return _defaultValue;
 }
 function getProcessEnv(key) {
@@ -67,16 +72,15 @@ function getAccount() {
   return JSON.parse(res.getBody("utf8"));
 }
 function getGitRoot() {
-  let rootPath = __cwd;
-  while (rootPath) {
-    if (fs.existsSync(path.join(rootPath, ".git"))) {
-      break;
-    }
-    const paths = rootPath.split(path.sep);
-    rootPath = paths.slice(0, paths.length - 1).join(path.sep);
+  try {
+    return child_process.execSync("git rev-parse --show-toplevel", {
+      cwd: __cwd,
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"]
+    }).trim();
+  } catch {
+    throw new Error("非git仓库，或 非仓库中子文件夹");
   }
-  if (rootPath) return rootPath;
-  throw new Error("非git仓库，或 非仓库中子文件夹");
 }
 function httpToSSH(url) {
   if (!url) return url;
@@ -88,11 +92,16 @@ function httpToSSH(url) {
 }
 function getGitUrl() {
   const gitRoot = getGitRoot();
-  const gitConfigPath = path.join(gitRoot, ".git", "config");
-  const configContent = fs.readFileSync(gitConfigPath, "UTF-8");
-  const arr = configContent.split("\n	");
-  const url = arr.find((item) => item.startsWith("url = ")) || "";
-  return httpToSSH(url.replace("url = ", ""));
+  try {
+    const url = child_process.execSync("git config --get remote.origin.url", {
+      cwd: gitRoot,
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"]
+    }).trim();
+    return httpToSSH(url);
+  } catch {
+    return "";
+  }
 }
 function getGitBranch$1() {
   return child_process.execSync("git rev-parse --abbrev-ref HEAD").toString().trim();
@@ -276,6 +285,7 @@ async function showLog(buildNumber) {
   config.DOMAIN && console.log(`- web访问域名： ${config.DOMAIN}`);
 }
 async function notice(buildNumber) {
+  if (!config.NOTICE_ENABLED) return;
   const jenkinsAddress = getJenkinsAddress(`/${buildNumber}/console`);
   const webAddress = await getWebAddress();
   let users = config.NOTICE_USERS || [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ts-max/deploy",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "description": "部署脚本",
   "main": "./dist/index.cjs",
   "types": "./dist/index.d.ts",
@@ -45,5 +45,5 @@
     "cli"
   ],
   "license": "MIT",
-  "gitHead": "d1f2cf24a6fe65d2a2e1c6fa8d5fcc945b732279"
+  "gitHead": "9e20383e4c4e28f8be62e7953abffb07c204af09"
 }