@ranger1/dx 0.1.52 → 0.1.54

package/lib/cli/commands/deploy.js

@@ -101,5 +101,9 @@ export async function handleDeploy(cli, args) {
     ? parseTelegramWebhookFlags(cli.args)
     : null
 
-  await deployToVercel(normalizedTarget, { environment, telegramWebhook })
+  const strictContext = process.env.DX_VERCEL_STRICT_CONTEXT != null
+    ? !['0', 'false', 'no'].includes(String(process.env.DX_VERCEL_STRICT_CONTEXT).toLowerCase())
+    : true
+
+  await deployToVercel(normalizedTarget, { environment, telegramWebhook, strictContext })
 }

package/lib/vercel-deploy.js

@@ -1,9 +1,41 @@
 import { execSync, spawn } from 'node:child_process'
+import { existsSync, readFileSync, rmSync } from 'node:fs'
 import { join } from 'node:path'
 import { envManager } from './env.js'
 import { logger } from './logger.js'
 
 const ALLOWED_ENVIRONMENTS = ['development', 'staging', 'production']
+const VALID_TARGETS = ['front', 'admin', 'telegram-bot']
+
+const TARGET_CONFIGS = {
+  front: {
+    configFile: 'vercel.front.json',
+    projectIdEnvVar: 'VERCEL_PROJECT_ID_FRONT',
+  },
+  admin: {
+    configFile: 'vercel.admin.json',
+    projectIdEnvVar: 'VERCEL_PROJECT_ID_ADMIN',
+  },
+  'telegram-bot': {
+    configFile: 'vercel.telegram-bot.json',
+    projectIdEnvVar: 'VERCEL_PROJECT_ID_TELEGRAM_BOT',
+  },
+}
+
+const EXPLICIT_ENV_VARS = ['APP_ENV', 'NODE_ENV']
+const PUBLIC_ENV_PREFIXES = ['NEXT_PUBLIC_', 'VITE_']
+
+const APP_ENV_MAP = {
+  development: 'dev',
+  staging: 'staging',
+  production: 'prod',
+}
+
+const VERCEL_PROJECT_LINK_PATH = '.vercel/project.json'
+
+function getTargetConfig(target) {
+  return TARGET_CONFIGS[target]
+}
 
 function collectErrorText(err) {
   const parts = []
@@ -22,6 +54,127 @@ function isMissingFilesError(err) {
   )
 }
 
+function listMissingVarKeys(targetConfigs, token, orgId) {
+  const missing = []
+
+  if (!token || envManager.isPlaceholderEnvValue(token)) {
+    missing.push('VERCEL_TOKEN')
+  }
+
+  if (!orgId || envManager.isPlaceholderEnvValue(orgId)) {
+    missing.push('VERCEL_ORG_ID')
+  }
+
+  for (const config of targetConfigs) {
+    const projectId = process.env[config.projectIdEnvVar]
+    if (!projectId || envManager.isPlaceholderEnvValue(projectId)) {
+      missing.push(config.projectIdEnvVar)
+    }
+  }
+
+  return [...new Set(missing)]
+}
+
+function listMissingConfigs(targetConfigs, projectRoot) {
+  const missing = []
+
+  for (const config of targetConfigs) {
+    const configPath = join(projectRoot, config.configFile)
+    if (!existsSync(configPath)) {
+      missing.push(config.configFile)
+    }
+  }
+
+  return missing
+}
+
+function appendTargetArgs(baseArgs, { cwd, orgId, projectId, explicitEnvArgs = [] }) {
+  const args = [...baseArgs]
+
+  if (explicitEnvArgs.length > 0) {
+    args.push(...explicitEnvArgs)
+  }
+
+  if (cwd) {
+    args.push('--cwd', cwd)
+  }
+
+  if (orgId) {
+    args.push('--scope', orgId)
+  }
+
+  if (projectId) {
+    args.push('--project', projectId)
+  }
+
+  return args
+}
+
+function collectExplicitVercelEnvEntries(sourceEnv = {}) {
+  const includeKeys = new Set(EXPLICIT_ENV_VARS)
+
+  Object.keys(sourceEnv).forEach(name => {
+    if (PUBLIC_ENV_PREFIXES.some(prefix => name.startsWith(prefix))) {
+      includeKeys.add(name)
+    }
+  })
+
+  return [...includeKeys]
+    .filter(name => {
+      const value = sourceEnv[name]
+      return !(
+        value === undefined ||
+        value === null ||
+        envManager.isPlaceholderEnvValue(value)
+      )
+    })
+    .sort()
+    .map(name => `${name}=${String(sourceEnv[name])}`)
+}
+
+function withEnvFlag(entries, flag) {
+  if (!Array.isArray(entries) || entries.length === 0) return []
+  return entries.flatMap(entry => [flag, entry])
+}
+
+function maskIdentifier(value) {
+  const raw = String(value || '').trim()
+  if (raw.length <= 10) return raw || '-'
+  return `${raw.slice(0, 6)}...${raw.slice(-4)}`
+}
+
+function readLinkedProjectContext(projectRoot) {
+  const path = join(projectRoot, VERCEL_PROJECT_LINK_PATH)
+  if (!existsSync(path)) {
+    return { exists: false, path, orgId: null, projectId: null, parseError: null }
+  }
+
+  try {
+    const content = readFileSync(path, 'utf8')
+    const parsed = JSON.parse(content)
+    return {
+      exists: true,
+      path,
+      orgId: parsed?.orgId || null,
+      projectId: parsed?.projectId || null,
+      parseError: null,
+    }
+  } catch (error) {
+    return {
+      exists: true,
+      path,
+      orgId: null,
+      projectId: null,
+      parseError: error,
+    }
+  }
+}
+
+function clearLinkedProjectContext(projectRoot) {
+  const path = join(projectRoot, VERCEL_PROJECT_LINK_PATH)
+  rmSync(path, { force: true })
+}
+
 async function runVercel(args, options = {}) {
   const { env, cwd } = options
   const MAX_CAPTURE = 20000
@@ -101,7 +254,12 @@ export async function deployPrebuiltWithFallback(options) {
 }
 
 export async function deployToVercel(target, options = {}) {
-  const { environment = 'staging', telegramWebhook = null } = options
+  const {
+    environment = 'staging',
+    telegramWebhook = null,
+    strictContext = true,
+    run = runVercel,
+  } = options
 
   // 校验环境参数
   if (!ALLOWED_ENVIRONMENTS.includes(environment)) {
@@ -111,18 +269,13 @@ export async function deployToVercel(target, options = {}) {
     return
   }
 
-  const token = process.env.VERCEL_TOKEN
-  const orgId = process.env.VERCEL_ORG_ID
-  const projectIdFront = process.env.VERCEL_PROJECT_ID_FRONT
-  const projectIdAdmin = process.env.VERCEL_PROJECT_ID_ADMIN
-  const projectIdTelegramBot = process.env.VERCEL_PROJECT_ID_TELEGRAM_BOT
-
   const normalizedTarget = String(target || '').toLowerCase()
   const targets = normalizedTarget === 'all' ? ['front', 'admin'] : [normalizedTarget]
+  const projectRoot = process.cwd()
 
   // 校验目标有效性
   for (const t of targets) {
-    if (!['front', 'admin', 'telegram-bot'].includes(t)) {
+    if (!VALID_TARGETS.includes(t)) {
       logger.error(`不支持的部署目标: ${t}`)
       logger.info('可用目标: front, admin, telegram-bot, all')
       process.exitCode = 1
@@ -130,47 +283,43 @@ export async function deployToVercel(target, options = {}) {
     }
   }
 
-  // 收集缺失的环境变量
-  const missingVars = []
-
-  if (!token || envManager.isPlaceholderEnvValue(token)) {
-    missingVars.push('VERCEL_TOKEN')
-  }
-
-  if (!orgId || envManager.isPlaceholderEnvValue(orgId)) {
-    missingVars.push('VERCEL_ORG_ID')
-  }
+  const targetConfigs = targets.map(getTargetConfig)
+  const token = process.env.VERCEL_TOKEN
+  const orgId = process.env.VERCEL_ORG_ID
 
-  // 根据目标检查对应的 PROJECT_ID
-  if (targets.includes('front') && (!projectIdFront || envManager.isPlaceholderEnvValue(projectIdFront))) {
-    missingVars.push('VERCEL_PROJECT_ID_FRONT')
-  }
+  const missingVars = listMissingVarKeys(targetConfigs, token, orgId)
+  const missingConfigFiles = listMissingConfigs(targetConfigs, projectRoot)
 
-  if (targets.includes('admin') && (!projectIdAdmin || envManager.isPlaceholderEnvValue(projectIdAdmin))) {
-    missingVars.push('VERCEL_PROJECT_ID_ADMIN')
-  }
+  if (missingVars.length > 0 || missingConfigFiles.length > 0) {
+    if (missingVars.length > 0) {
+      logger.error('缺少以下 Vercel 环境变量:')
+      missingVars.forEach(v => {
+        logger.error(`  - ${v}`)
+      })
+      logger.info('')
+      logger.info('请在 .env.<env>.local 中配置这些变量，例如:')
+      logger.info('  VERCEL_TOKEN=<your-vercel-token>')
+      logger.info('  VERCEL_ORG_ID=team_xxx')
+      logger.info('  VERCEL_PROJECT_ID_FRONT=prj_xxx')
+      logger.info('  VERCEL_PROJECT_ID_ADMIN=prj_xxx')
+      logger.info('  VERCEL_PROJECT_ID_TELEGRAM_BOT=prj_xxx')
+      logger.info('')
+      logger.info('获取方式:')
+      logger.info('  1. VERCEL_TOKEN: vercel login 后查看 ~/Library/Application Support/com.vercel.cli/auth.json')
+      logger.info('  2. PROJECT_ID: vercel project ls --scope <org> 或通过 Vercel Dashboard 获取')
+      logger.info('')
+      logger.info('提示：部署命令会显式校验 --scope 与 --project，避免环境漂移。')
+    }
 
-  if (targets.includes('telegram-bot') && (!projectIdTelegramBot || envManager.isPlaceholderEnvValue(projectIdTelegramBot))) {
-    missingVars.push('VERCEL_PROJECT_ID_TELEGRAM_BOT')
-  }
+    if (missingConfigFiles.length > 0) {
+      logger.error('缺少以下 Vercel 配置文件:')
+      missingConfigFiles.forEach(name => {
+        logger.error(`  - ${name}`)
+      })
+      logger.info('')
+      logger.info('请确认同级目录存在对应的 vercel.*.json 文件。')
+    }
 
-  // 如果有缺失变量，统一报错并退出
-  if (missingVars.length > 0) {
-    logger.error('缺少以下 Vercel 环境变量:')
-    missingVars.forEach(v => {
-      logger.error(`  - ${v}`)
-    })
-    logger.info('')
-    logger.info('请在 .env.<env>.local 中配置这些变量，例如:')
-    logger.info('  VERCEL_TOKEN=<your-vercel-token>')
-    logger.info('  VERCEL_ORG_ID=team_xxx')
-    logger.info('  VERCEL_PROJECT_ID_FRONT=prj_xxx')
-    logger.info('  VERCEL_PROJECT_ID_ADMIN=prj_xxx')
-    logger.info('  VERCEL_PROJECT_ID_TELEGRAM_BOT=prj_xxx')
-    logger.info('')
-    logger.info('获取方式:')
-    logger.info('  1. VERCEL_TOKEN: vercel login 后查看 ~/Library/Application Support/com.vercel.cli/auth.json')
-    logger.info('  2. PROJECT_ID: vercel project ls --scope <org> 或通过 Vercel Dashboard 获取')
     process.exitCode = 1
     return
   }
@@ -180,40 +329,67 @@ export async function deployToVercel(target, options = {}) {
   // - 这样 dx deploy 能兼容不同 monorepo 布局（不强依赖 apps/sdk 等目录）。
 
   // 映射环境标识：development -> dev, staging -> staging, production -> prod
-  const envMap = {
-    development: 'dev',
-    staging: 'staging',
-    production: 'prod',
-  }
-  const buildEnv = envMap[environment]
+  const buildEnv = APP_ENV_MAP[environment]
 
   for (const t of targets) {
-    // 配置文件映射
-    const configFileMap = {
-      front: 'vercel.front.json',
-      admin: 'vercel.admin.json',
-      'telegram-bot': 'vercel.telegram-bot.json',
+    const targetConfig = getTargetConfig(t)
+    const projectId = process.env[targetConfig.projectIdEnvVar]
+    const configFile = targetConfig.configFile
+    const configPath = join(projectRoot, configFile)
+    const linkedContext = readLinkedProjectContext(projectRoot)
+
+    const linkedMismatch =
+      linkedContext.exists &&
+      linkedContext.parseError == null &&
+      ((linkedContext.orgId && linkedContext.orgId !== orgId) ||
+        (linkedContext.projectId && linkedContext.projectId !== projectId))
+
+    if (linkedContext.exists && linkedContext.parseError) {
+      logger.warn(
+        `检测到 ${VERCEL_PROJECT_LINK_PATH} 但解析失败: ${linkedContext.parseError.message}`,
+      )
+      if (strictContext) {
+        logger.error('strictContext 已开启，已阻止继续部署以避免回退污染')
+        process.exitCode = 1
+        return
+      }
     }
 
-    // PROJECT_ID 映射
-    const projectIdMap = {
-      front: projectIdFront,
-      admin: projectIdAdmin,
-      'telegram-bot': projectIdTelegramBot,
+    if (linkedMismatch) {
+      logger.error('检测到 .vercel 链接冲突')
+      logger.error(`  当前目标: org=${maskIdentifier(orgId)} project=${maskIdentifier(projectId)}`)
+      logger.error(
+        `  本地链接: org=${maskIdentifier(linkedContext.orgId)} project=${maskIdentifier(linkedContext.projectId)}`,
+      )
+      if (strictContext) {
+        logger.error('strictContext 已开启，已阻止部署（请清理 .vercel 或修正环境变量）')
+        process.exitCode = 1
+        return
+      }
+      logger.warn('strictContext 已关闭，继续执行（可能存在误部署风险）')
     }
 
-    const configFile = configFileMap[t]
-    const projectId = projectIdMap[t]
-    const configPath = join(process.cwd(), configFile)
+    logger.info(
+      `[deploy-context] env=${environment} target=${t} strict=${strictContext ? 1 : 0} org=${maskIdentifier(orgId)} project=${maskIdentifier(projectId)} linked=${linkedContext.exists ? 'yes' : 'no'} token=env`,
+    )
+
+    const explicitEnvEntries = collectExplicitVercelEnvEntries({
+      ...process.env,
+      APP_ENV: buildEnv,
+      NODE_ENV: envManager.mapAppEnvToNodeEnv(environment),
+      VERCEL_ORG_ID: orgId,
+      VERCEL_PROJECT_ID: projectId,
+    })
+
+    const buildEnvArgs = withEnvFlag(explicitEnvEntries, '--build-env')
+    const deployEnvArgs = withEnvFlag(explicitEnvEntries, '--env')
 
     const envVars = {
       ...process.env,
       VERCEL_PROJECT_ID: projectId,
       APP_ENV: buildEnv,
-    }
-
-    if (orgId) {
-      envVars.VERCEL_ORG_ID = orgId
+      NODE_ENV: envManager.mapAppEnvToNodeEnv(environment),
+      VERCEL_ORG_ID: orgId,
     }
 
     // 不通过 CLI args 传递 token，避免出现在错误信息/日志中
@@ -235,39 +411,52 @@ export async function deployToVercel(target, options = {}) {
     }
 
     try {
+      if (strictContext && process.env.DX_VERCEL_KEEP_LINK !== '1') {
+        clearLinkedProjectContext(projectRoot)
+      }
+
       // 第一步：本地构建
       logger.step(`本地构建 ${t} (${environment})`)
-      const buildArgs = ['build', '--local-config', configPath, '--yes']
+      const buildArgs = appendTargetArgs(
+        ['build', '--local-config', configPath, '--yes'],
+        {
+          cwd: projectRoot,
+          orgId,
+          projectId,
+          explicitEnvArgs: buildEnvArgs,
+        },
+      )
 
       // staging 和 production 环境需要 --prod 标志，确保构建产物与部署环境匹配
       if (environment === 'staging' || environment === 'production') {
         buildArgs.push('--prod')
       }
 
-      if (orgId) {
-        buildArgs.push('--scope', orgId)
-      }
-
-      await runVercel(buildArgs, { env: envVars, cwd: process.cwd() })
+      await run(buildArgs, { env: envVars, cwd: projectRoot })
       logger.success(`${t} 本地构建成功`)
 
       // 第二步：上传预构建产物
       logger.step(`部署 ${t} 到 Vercel (${environment})`)
-      const baseDeployArgs = ['deploy', '--prebuilt', '--local-config', configPath, '--yes']
+      const baseDeployArgs = appendTargetArgs(
+        ['deploy', '--prebuilt', '--local-config', configPath, '--yes'],
+        {
+          cwd: projectRoot,
+          orgId,
+          projectId,
+          explicitEnvArgs: deployEnvArgs,
+        },
+      )
 
       // staging 和 production 环境都添加 --prod 标志以绑定固定域名
       if (environment === 'staging' || environment === 'production') {
         baseDeployArgs.push('--prod')
       }
 
-      if (orgId) {
-        baseDeployArgs.push('--scope', orgId)
-      }
-
       const deployResult = await deployPrebuiltWithFallback({
         baseArgs: baseDeployArgs,
         env: envVars,
-        cwd: process.cwd(),
+        cwd: projectRoot,
+        run,
       })
 
       const deployOutput = [deployResult?.result?.stdout, deployResult?.result?.stderr]

package/package.json

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