@ranger1/dx 0.1.55 → 0.1.57

package/lib/vercel-deploy.js

@@ -11,10 +11,12 @@ const TARGET_CONFIGS = {
   front: {
     configFile: 'vercel.front.json',
     projectIdEnvVar: 'VERCEL_PROJECT_ID_FRONT',
+    deployCwd: 'apps/front',
   },
   admin: {
     configFile: 'vercel.admin.json',
     projectIdEnvVar: 'VERCEL_PROJECT_ID_ADMIN',
+    deployCwd: 'apps/admin-front',
   },
   'telegram-bot': {
     configFile: 'vercel.telegram-bot.json',
@@ -22,9 +24,6 @@ const TARGET_CONFIGS = {
   },
 }
 
-const EXPLICIT_ENV_VARS = ['APP_ENV', 'NODE_ENV']
-const PUBLIC_ENV_PREFIXES = ['NEXT_PUBLIC_', 'VITE_']
-
 const APP_ENV_MAP = {
   development: 'dev',
   staging: 'staging',
@@ -88,53 +87,19 @@ function listMissingConfigs(targetConfigs, projectRoot) {
   return missing
 }
 
-function appendTargetArgs(baseArgs, { cwd, orgId, projectId, explicitEnvArgs = [] }) {
+function appendTargetArgs(baseArgs, { orgId }) {
   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])
+export function resolveTargetRunCwd(projectRoot, targetConfig) {
+  if (!targetConfig?.deployCwd) return projectRoot
+  return join(projectRoot, targetConfig.deployCwd)
 }
 
 function maskIdentifier(value) {
@@ -143,8 +108,8 @@ function maskIdentifier(value) {
   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 }
   }
@@ -170,8 +135,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 })
 }
 
@@ -229,7 +194,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
       }
@@ -308,7 +273,7 @@ export async function deployToVercel(target, options = {}) {
       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，避免环境漂移。')
+      logger.info('提示：部署命令会显式校验 --scope 与环境变量上下文，避免环境漂移。')
     }
 
     if (missingConfigFiles.length > 0) {
@@ -336,7 +301,15 @@ 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)
+
+    if (!existsSync(runCwd)) {
+      logger.error(`部署目录不存在: target=${t} deployCwd=${targetConfig.deployCwd || '.'} resolved=${runCwd}`)
+      process.exitCode = 1
+      return
+    }
+
+    const linkedContext = readLinkedProjectContext(runCwd)
 
     const linkedMismatch =
       linkedContext.exists &&
@@ -373,16 +346,6 @@ export async function deployToVercel(target, options = {}) {
       `[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 deployEnvArgs = withEnvFlag(explicitEnvEntries, '--env')
-
     const envVars = {
       ...process.env,
       VERCEL_PROJECT_ID: projectId,
@@ -411,7 +374,7 @@ export async function deployToVercel(target, options = {}) {
 
     try {
       if (strictContext && process.env.DX_VERCEL_KEEP_LINK !== '1') {
-        clearLinkedProjectContext(projectRoot)
+        clearLinkedProjectContext(runCwd)
       }
 
       // 第一步：本地构建
@@ -419,9 +382,7 @@ export async function deployToVercel(target, options = {}) {
       const buildArgs = appendTargetArgs(
         ['build', '--local-config', configPath, '--yes'],
         {
-          cwd: projectRoot,
           orgId,
-          projectId,
         },
       )
 
@@ -430,7 +391,7 @@ 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} 本地构建成功`)
 
       // 第二步：上传预构建产物
@@ -438,10 +399,7 @@ export async function deployToVercel(target, options = {}) {
       const baseDeployArgs = appendTargetArgs(
         ['deploy', '--prebuilt', '--local-config', configPath, '--yes'],
         {
-          cwd: projectRoot,
           orgId,
-          projectId,
-          explicitEnvArgs: deployEnvArgs,
         },
       )
 
@@ -453,7 +411,7 @@ export async function deployToVercel(target, options = {}) {
       const deployResult = await deployPrebuiltWithFallback({
         baseArgs: baseDeployArgs,
         env: envVars,
-        cwd: projectRoot,
+        cwd: runCwd,
         run,
       })
 

package/package.json

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