@ranger1/dx 0.1.57 → 0.1.59

package/lib/vercel-deploy.js

@@ -11,23 +11,29 @@ const TARGET_CONFIGS = {
   front: {
     configFile: 'vercel.front.json',
     projectIdEnvVar: 'VERCEL_PROJECT_ID_FRONT',
-    deployCwd: 'apps/front',
+    deployCwd: '.',
+    deployMode: 'prebuilt',
+    prebuiltCwd: '.'
   },
   admin: {
     configFile: 'vercel.admin.json',
     projectIdEnvVar: 'VERCEL_PROJECT_ID_ADMIN',
     deployCwd: 'apps/admin-front',
+    deployMode: 'prebuilt'
   },
   'telegram-bot': {
     configFile: 'vercel.telegram-bot.json',
     projectIdEnvVar: 'VERCEL_PROJECT_ID_TELEGRAM_BOT',
-  },
+    deployMode: 'prebuilt'
+  }
 }
 
+const ALLOWED_DEPLOY_MODES = ['prebuilt']
+
 const APP_ENV_MAP = {
   development: 'dev',
   staging: 'staging',
-  production: 'prod',
+  production: 'prod'
 }
 
 const VERCEL_PROJECT_LINK_PATH = '.vercel/project.json'
@@ -53,6 +59,14 @@ function isMissingFilesError(err) {
   )
 }
 
+function isNextPrebuiltMissingPathError(err) {
+  const text = collectErrorText(err)
+  return (
+    text.includes('ENOENT') &&
+    (text.includes('next-server.js') || text.includes('/node_modules/.pnpm/'))
+  )
+}
+
 function listMissingVarKeys(targetConfigs, token, orgId) {
   const missing = []
 
@@ -102,6 +116,20 @@ export function resolveTargetRunCwd(projectRoot, targetConfig) {
   return join(projectRoot, targetConfig.deployCwd)
 }
 
+export function resolveTargetDeployMode(targetConfig) {
+  if (!targetConfig?.deployMode) return 'prebuilt'
+  return targetConfig.deployMode
+}
+
+export function isSupportedDeployMode(mode) {
+  return ALLOWED_DEPLOY_MODES.includes(mode)
+}
+
+export function resolveTargetPrebuiltCwd(projectRoot, targetConfig, runCwd) {
+  if (!targetConfig?.prebuiltCwd) return runCwd
+  return join(projectRoot, targetConfig.prebuiltCwd)
+}
+
 function maskIdentifier(value) {
   const raw = String(value || '').trim()
   if (raw.length <= 10) return raw || '-'
@@ -122,7 +150,7 @@ function readLinkedProjectContext(contextRoot) {
       path,
       orgId: parsed?.orgId || null,
       projectId: parsed?.projectId || null,
-      parseError: null,
+      parseError: null
     }
   } catch (error) {
     return {
@@ -130,7 +158,7 @@ function readLinkedProjectContext(contextRoot) {
       path,
       orgId: null,
       projectId: null,
-      parseError: error,
+      parseError: error
     }
   }
 }
@@ -148,7 +176,7 @@ async function runVercel(args, options = {}) {
     const child = spawn('vercel', args, {
       cwd: cwd || process.cwd(),
       env: env || process.env,
-      stdio: ['inherit', 'pipe', 'pipe'],
+      stdio: ['inherit', 'pipe', 'pipe']
     })
 
     let stdout = ''
@@ -201,7 +229,7 @@ export async function deployPrebuiltWithFallback(options) {
     },
     onMissingFiles = () => {
       logger.warn('检测到 missing_files，自动使用 --archive=tgz 重试一次')
-    },
+    }
   } = options || {}
 
   try {
@@ -223,7 +251,7 @@ export async function deployToVercel(target, options = {}) {
     environment = 'staging',
     telegramWebhook = null,
     strictContext = true,
-    run = runVercel,
+    run = runVercel
   } = options
 
   // 校验环境参数
@@ -270,7 +298,9 @@ export async function deployToVercel(target, options = {}) {
       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(
+        '  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 与环境变量上下文，避免环境漂移。')
@@ -302,14 +332,33 @@ export async function deployToVercel(target, options = {}) {
     const configFile = targetConfig.configFile
     const configPath = join(projectRoot, configFile)
     const runCwd = resolveTargetRunCwd(projectRoot, targetConfig)
+    const deployMode = resolveTargetDeployMode(targetConfig)
+    const prebuiltCwd = resolveTargetPrebuiltCwd(projectRoot, targetConfig, runCwd)
 
     if (!existsSync(runCwd)) {
-      logger.error(`部署目录不存在: target=${t} deployCwd=${targetConfig.deployCwd || '.'} resolved=${runCwd}`)
+      logger.error(
+        `部署目录不存在: target=${t} deployCwd=${targetConfig.deployCwd || '.'} resolved=${runCwd}`
+      )
+      process.exitCode = 1
+      return
+    }
+
+    if (!isSupportedDeployMode(deployMode)) {
+      logger.error(`不支持的部署模式: target=${t} mode=${deployMode}`)
+      logger.info(`可用部署模式: ${ALLOWED_DEPLOY_MODES.join(', ')}`)
+      process.exitCode = 1
+      return
+    }
+
+    if (!existsSync(prebuiltCwd)) {
+      logger.error(
+        `预构建部署目录不存在: target=${t} prebuiltCwd=${targetConfig.prebuiltCwd || targetConfig.deployCwd || '.'} resolved=${prebuiltCwd}`
+      )
       process.exitCode = 1
       return
     }
 
-    const linkedContext = readLinkedProjectContext(runCwd)
+    const linkedContext = readLinkedProjectContext(prebuiltCwd)
 
     const linkedMismatch =
       linkedContext.exists &&
@@ -319,7 +368,7 @@ export async function deployToVercel(target, options = {}) {
 
     if (linkedContext.exists && linkedContext.parseError) {
       logger.warn(
-        `检测到 ${VERCEL_PROJECT_LINK_PATH} 但解析失败: ${linkedContext.parseError.message}`,
+        `检测到 ${VERCEL_PROJECT_LINK_PATH} 但解析失败: ${linkedContext.parseError.message}`
       )
       if (strictContext) {
         logger.error('strictContext 已开启，已阻止继续部署以避免回退污染')
@@ -332,7 +381,7 @@ export async function deployToVercel(target, options = {}) {
       logger.error('检测到 .vercel 链接冲突')
       logger.error(`  当前目标: org=${maskIdentifier(orgId)} project=${maskIdentifier(projectId)}`)
       logger.error(
-        `  本地链接: org=${maskIdentifier(linkedContext.orgId)} project=${maskIdentifier(linkedContext.projectId)}`,
+        `  本地链接: org=${maskIdentifier(linkedContext.orgId)} project=${maskIdentifier(linkedContext.projectId)}`
       )
       if (strictContext) {
         logger.error('strictContext 已开启，已阻止部署（请清理 .vercel 或修正环境变量）')
@@ -343,7 +392,7 @@ export async function deployToVercel(target, options = {}) {
     }
 
     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`,
+      `[deploy-context] env=${environment} target=${t} mode=${deployMode} runCwd=${runCwd} prebuiltCwd=${prebuiltCwd} strict=${strictContext ? 1 : 0} org=${maskIdentifier(orgId)} project=${maskIdentifier(projectId)} linked=${linkedContext.exists ? 'yes' : 'no'} token=env`
     )
 
     const envVars = {
@@ -351,7 +400,7 @@ export async function deployToVercel(target, options = {}) {
       VERCEL_PROJECT_ID: projectId,
       APP_ENV: buildEnv,
       NODE_ENV: envManager.mapAppEnvToNodeEnv(environment),
-      VERCEL_ORG_ID: orgId,
+      VERCEL_ORG_ID: orgId
     }
 
     // 不通过 CLI args 传递 token，避免出现在错误信息/日志中
@@ -364,7 +413,9 @@ export async function deployToVercel(target, options = {}) {
       try {
         originalAuthor = execSync('git log -1 --format="%an <%ae>"', { encoding: 'utf8' }).trim()
         const authorName = authorEmail.split('@')[0]
-        execSync(`git commit --amend --author="${authorName} <${authorEmail}>" --no-edit`, { stdio: 'ignore' })
+        execSync(`git commit --amend --author="${authorName} <${authorEmail}>" --no-edit`, {
+          stdio: 'ignore'
+        })
         logger.info(`临时修改 commit author: ${originalAuthor} -> ${authorName} <${authorEmail}>`)
       } catch (e) {
         logger.warn(`修改 commit author 失败: ${e.message}`)
@@ -374,17 +425,14 @@ export async function deployToVercel(target, options = {}) {
 
     try {
       if (strictContext && process.env.DX_VERCEL_KEEP_LINK !== '1') {
-        clearLinkedProjectContext(runCwd)
+        clearLinkedProjectContext(prebuiltCwd)
       }
 
       // 第一步：本地构建
       logger.step(`本地构建 ${t} (${environment})`)
-      const buildArgs = appendTargetArgs(
-        ['build', '--local-config', configPath, '--yes'],
-        {
-          orgId,
-        },
-      )
+      const buildArgs = appendTargetArgs(['build', '--local-config', configPath, '--yes'], {
+        orgId
+      })
 
       // staging 和 production 环境需要 --prod 标志，确保构建产物与部署环境匹配
       if (environment === 'staging' || environment === 'production') {
@@ -394,13 +442,13 @@ export async function deployToVercel(target, options = {}) {
       await run(buildArgs, { env: envVars, cwd: runCwd })
       logger.success(`${t} 本地构建成功`)
 
-      // 第二步：上传预构建产物
       logger.step(`部署 ${t} 到 Vercel (${environment})`)
+
       const baseDeployArgs = appendTargetArgs(
         ['deploy', '--prebuilt', '--local-config', configPath, '--yes'],
         {
-          orgId,
-        },
+          orgId
+        }
       )
 
       // staging 和 production 环境都添加 --prod 标志以绑定固定域名
@@ -411,8 +459,8 @@ export async function deployToVercel(target, options = {}) {
       const deployResult = await deployPrebuiltWithFallback({
         baseArgs: baseDeployArgs,
         env: envVars,
-        cwd: runCwd,
-        run,
+        cwd: prebuiltCwd,
+        run
       })
 
       const deployOutput = [deployResult?.result?.stdout, deployResult?.result?.stderr]
@@ -425,13 +473,18 @@ export async function deployToVercel(target, options = {}) {
         await handleTelegramBotDeploy(environment, projectId, orgId, token, {
           deployOutput,
           projectNameHint: 'telegram-bot',
-          ...(telegramWebhook || {}),
+          ...(telegramWebhook || {})
         })
         logger.success(`${t} 部署成功（Webhook 已校验）`)
       } else {
         logger.success(`${t} 部署成功`)
       }
     } catch (error) {
+      if (deployMode === 'prebuilt' && isNextPrebuiltMissingPathError(error)) {
+        logger.error(
+          '高优先级提示：检测到 Next.js 预构建产物缺失（next-server.js/node_modules/.pnpm）。请检查 front prebuiltCwd 与构建产物路径是否一致。'
+        )
+      }
       const message = error?.message || String(error)
       logger.error(`${t} 构建或部署失败: ${message}`)
       process.exitCode = 1

package/package.json

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