@nocobase/cli 3.0.0-alpha.7 → 3.0.0-alpha.8

package/dist/lib/portal-source.js

@@ -24,6 +24,10 @@ import { listPortalWorkspaces } from './portal-list.js';
 import { findPortalListItem } from './portal-info.js';
 import { resolvePnpmInstallCommand, run, runPnpmInstallCommand } from './run-npm.js';
 const execFileAsync = promisify(execFile);
+const NOCOBASE_CLI_GIT_IDENTITY = {
+    name: 'NocoBase CLI',
+    email: '314549027+nocobase-cli@users.noreply.github.com',
+};
 const portalSourceText = (key, values, fallback) => translateCli(`commands.portalSource.${key}`, values, { fallback });
 const PULL_SOURCE_OPERATION = {
     method: 'POST',
@@ -215,6 +219,33 @@ async function runGit(args, cwd) {
         maxBuffer: 10 * 1024 * 1024,
     });
 }
+function isValidGitIdentity(identity) {
+    return (!/[\r\n<>]/.test(identity.name) &&
+        !/[\r\n<>\s]/.test(identity.email) &&
+        identity.email.includes('@'));
+}
+async function resolveLocalGitIdentity(cwd) {
+    let output;
+    try {
+        output = (await runGit(['var', 'GIT_AUTHOR_IDENT'], cwd)).stdout;
+    }
+    catch {
+        return undefined;
+    }
+    const match = /^(.*) <([^<>]+)> -?\d+ [+-]\d{4}$/.exec(trimValue(output));
+    if (!match) {
+        return undefined;
+    }
+    const identity = { name: match[1], email: match[2] };
+    if (!isValidGitIdentity(identity)) {
+        return undefined;
+    }
+    if (identity.name === NOCOBASE_CLI_GIT_IDENTITY.name &&
+        identity.email === NOCOBASE_CLI_GIT_IDENTITY.email) {
+        return undefined;
+    }
+    return identity;
+}
 async function installPortalDependencies(params) {
     if (params.installDependencies === false) {
         return {
@@ -488,6 +519,7 @@ async function pullGitPortalSource(params) {
 }
 async function pushGitPortalSource(params) {
     const git = assertGitSourceConfig(params.context);
+    const localIdentity = await resolveLocalGitIdentity(params.context.portalDir);
     const tempDir = await mkdtemp(path.join(os.tmpdir(), 'nocobase-cli-portal-git-push-'));
     try {
         const repoDir = await cloneGitSource({
@@ -506,15 +538,20 @@ async function pushGitPortalSource(params) {
         if (!status.stdout.trim()) {
             return undefined;
         }
-        await runGit([
+        const commitIdentity = localIdentity ?? NOCOBASE_CLI_GIT_IDENTITY;
+        const commitArgs = [
             '-c',
-            'user.name=NocoBase CLI',
+            `user.name=${commitIdentity.name}`,
             '-c',
-            'user.email=nocobase-cli@localhost',
+            `user.email=${commitIdentity.email}`,
             'commit',
             '-m',
             trimValue(params.message) || `chore(portal): update ${params.context.portal}`,
-        ], repoDir);
+        ];
+        if (localIdentity) {
+            commitArgs.push('-m', `Co-authored-by: ${NOCOBASE_CLI_GIT_IDENTITY.name} <${NOCOBASE_CLI_GIT_IDENTITY.email}>`);
+        }
+        await runGit(commitArgs, repoDir);
         await runGit(['push', 'origin', git.branch], repoDir);
         const revision = await runGit(['rev-parse', 'HEAD'], repoDir);
         return revision.stdout.trim();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "3.0.0-alpha.7",
+  "version": "3.0.0-alpha.8",
   "description": "NocoBase Command Line Tool",
   "type": "module",
   "main": "dist/generated/command-registry.js",
@@ -147,5 +147,5 @@
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git"
   },
-  "gitHead": "19cd28c710f3b3c614ebe2fd7d5a415d527ee559"
+  "gitHead": "ce017f3deb8b2414c6b13818042c4187270d1d8a"
 }