@ranger1/dx 0.1.56 → 0.1.58

package/lib/vercel-deploy.js

@@ -11,17 +11,25 @@ const TARGET_CONFIGS = {
   front: {
     configFile: 'vercel.front.json',
     projectIdEnvVar: 'VERCEL_PROJECT_ID_FRONT',
+    deployCwd: 'apps/front',
+    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',
@@ -51,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 = []
 
@@ -85,13 +101,9 @@ function listMissingConfigs(targetConfigs, projectRoot) {
   return missing
 }
 
-function appendTargetArgs(baseArgs, { cwd, orgId }) {
+function appendTargetArgs(baseArgs, { orgId }) {
   const args = [...baseArgs]
 
-  if (cwd) {
-    args.push('--cwd', cwd)
-  }
-
   if (orgId) {
     args.push('--scope', orgId)
   }
@@ -99,14 +111,33 @@ function appendTargetArgs(baseArgs, { cwd, orgId }) {
   return args
 }
 
+export function resolveTargetRunCwd(projectRoot, targetConfig) {
+  if (!targetConfig?.deployCwd) return projectRoot
+  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 || '-'
   return `${raw.slice(0, 6)}...${raw.slice(-4)}`
 }
 
-function readLinkedProjectContext(projectRoot) {
-  const path = join(projectRoot, VERCEL_PROJECT_LINK_PATH)
+function readLinkedProjectContext(contextRoot) {
+  const path = join(contextRoot, VERCEL_PROJECT_LINK_PATH)
   if (!existsSync(path)) {
     return { exists: false, path, orgId: null, projectId: null, parseError: null }
   }
@@ -132,8 +163,8 @@ function readLinkedProjectContext(projectRoot) {
   }
 }
 
-function clearLinkedProjectContext(projectRoot) {
-  const path = join(projectRoot, VERCEL_PROJECT_LINK_PATH)
+function clearLinkedProjectContext(contextRoot) {
+  const path = join(contextRoot, VERCEL_PROJECT_LINK_PATH)
   rmSync(path, { force: true })
 }
 
@@ -191,7 +222,7 @@ export async function deployPrebuiltWithFallback(options) {
     run = runVercel,
     cleanupArchiveParts = () => {
       try {
-        execSync('rm -f .vercel/source.tgz.part*', { stdio: 'ignore' })
+        execSync('rm -f .vercel/source.tgz.part*', { stdio: 'ignore', cwd: cwd || process.cwd() })
       } catch {
         // ignore
       }
@@ -298,7 +329,32 @@ export async function deployToVercel(target, options = {}) {
     const projectId = process.env[targetConfig.projectIdEnvVar]
     const configFile = targetConfig.configFile
     const configPath = join(projectRoot, configFile)
-    const linkedContext = readLinkedProjectContext(projectRoot)
+    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}`)
+      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(prebuiltCwd)
 
     const linkedMismatch =
       linkedContext.exists &&
@@ -332,7 +388,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 = {
@@ -363,7 +419,7 @@ export async function deployToVercel(target, options = {}) {
 
     try {
       if (strictContext && process.env.DX_VERCEL_KEEP_LINK !== '1') {
-        clearLinkedProjectContext(projectRoot)
+        clearLinkedProjectContext(prebuiltCwd)
       }
 
       // 第一步：本地构建
@@ -371,7 +427,6 @@ export async function deployToVercel(target, options = {}) {
       const buildArgs = appendTargetArgs(
         ['build', '--local-config', configPath, '--yes'],
         {
-          cwd: projectRoot,
           orgId,
         },
       )
@@ -381,15 +436,14 @@ export async function deployToVercel(target, options = {}) {
         buildArgs.push('--prod')
       }
 
-      await run(buildArgs, { env: envVars, cwd: projectRoot })
+      await run(buildArgs, { env: envVars, cwd: runCwd })
       logger.success(`${t} 本地构建成功`)
 
-      // 第二步：上传预构建产物
       logger.step(`部署 ${t} 到 Vercel (${environment})`)
+
       const baseDeployArgs = appendTargetArgs(
         ['deploy', '--prebuilt', '--local-config', configPath, '--yes'],
         {
-          cwd: projectRoot,
           orgId,
         },
       )
@@ -402,7 +456,7 @@ export async function deployToVercel(target, options = {}) {
       const deployResult = await deployPrebuiltWithFallback({
         baseArgs: baseDeployArgs,
         env: envVars,
-        cwd: projectRoot,
+        cwd: prebuiltCwd,
         run,
       })
 
@@ -423,6 +477,11 @@ export async function deployToVercel(target, options = {}) {
         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.56",
+  "version": "0.1.58",
   "type": "module",
   "license": "MIT",
   "repository": {