@ranger1/dx 0.1.61 → 0.1.63

package/lib/cli/commands/deploy.js

@@ -2,6 +2,36 @@ import { logger } from '../../logger.js'
 import { envManager } from '../../env.js'
 import { validateEnvironment } from '../../validate-env.js'
 
+export function mergeLayeredDeployEnv(layeredEnv, manager, runtimeEnv = process.env) {
+  const vercelCriticalKeys = new Set([
+    'VERCEL_TOKEN',
+    'VERCEL_ORG_ID',
+    'VERCEL_PROJECT_ID_FRONT',
+    'VERCEL_PROJECT_ID_ADMIN',
+    'VERCEL_PROJECT_ID_TELEGRAM_BOT',
+  ])
+
+  for (const [key, value] of Object.entries(layeredEnv)) {
+    if (vercelCriticalKeys.has(key)) {
+      const currentValue = runtimeEnv[key]
+      const currentUsable =
+        currentValue !== undefined && currentValue !== null && !manager.isPlaceholderEnvValue(currentValue)
+      const incomingIsPlaceholder = manager.isPlaceholderEnvValue(value)
+
+      // 保留外部显式注入的真实凭据，避免被 .env.<env> 的占位符回退污染。
+      if (currentUsable && incomingIsPlaceholder) continue
+
+      runtimeEnv[key] = value
+      continue
+    }
+
+    const currentValue = runtimeEnv[key]
+    if (!currentValue || manager.isPlaceholderEnvValue(currentValue)) {
+      runtimeEnv[key] = value
+    }
+  }
+}
+
 export function parseTelegramWebhookFlags(argv = []) {
   const args = Array.isArray(argv) ? argv : []
 
@@ -86,27 +116,8 @@ export async function handleDeploy(cli, args) {
     })
   }
 
-  // 默认仅在缺失/占位时覆盖，避免破坏显式传入的环境变量。
-  // 但对 Vercel 部署关键变量，强制使用当前环境层，确保不受 shell 残留值影响。
-  const vercelCriticalKeys = new Set([
-    'VERCEL_TOKEN',
-    'VERCEL_ORG_ID',
-    'VERCEL_PROJECT_ID_FRONT',
-    'VERCEL_PROJECT_ID_ADMIN',
-    'VERCEL_PROJECT_ID_TELEGRAM_BOT',
-  ])
-
-  for (const [key, value] of Object.entries(layeredEnv)) {
-    if (vercelCriticalKeys.has(key)) {
-      process.env[key] = value
-      continue
-    }
-
-    const currentValue = process.env[key]
-    if (!currentValue || envManager.isPlaceholderEnvValue(currentValue)) {
-      process.env[key] = value
-    }
-  }
+  // 默认仅在缺失/占位时覆盖；Vercel 关键变量额外避免“真实值被占位符覆盖”的回退污染。
+  mergeLayeredDeployEnv(layeredEnv, envManager, process.env)
   envManager.syncEnvironments(environment)
 
   const { deployToVercel } = await import('../../vercel-deploy.js')

package/lib/vercel-deploy.js

@@ -101,13 +101,17 @@ function listMissingConfigs(targetConfigs, projectRoot) {
   return missing
 }
 
-function appendTargetArgs(baseArgs, { orgId }) {
+function appendTargetArgs(baseArgs, { orgId, token }) {
   const args = [...baseArgs]
 
   if (orgId) {
     args.push('--scope', orgId)
   }
 
+  if (token) {
+    args.push('--token', token)
+  }
+
   return args
 }
 
@@ -431,7 +435,8 @@ export async function deployToVercel(target, options = {}) {
       // 第一步：本地构建
       logger.step(`本地构建 ${t} (${environment})`)
       const buildArgs = appendTargetArgs(['build', '--local-config', configPath, '--yes'], {
-        orgId
+        orgId,
+        token
       })
 
       // staging 和 production 环境需要 --prod 标志，确保构建产物与部署环境匹配
@@ -447,7 +452,8 @@ export async function deployToVercel(target, options = {}) {
       const baseDeployArgs = appendTargetArgs(
         ['deploy', '--prebuilt', '--local-config', configPath, '--yes'],
         {
-          orgId
+          orgId,
+          token
         }
       )
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ranger1/dx",
-  "version": "0.1.61",
+  "version": "0.1.63",
   "type": "module",
   "license": "MIT",
   "repository": {