From b9b749f54b6550c786921be5a644057fc6fd5643 Mon Sep 17 00:00:00 2001 From: luckyadam Date: Fri, 24 May 2019 15:39:30 +0800 Subject: [PATCH] =?UTF-8?q?fix(cli):=20=E5=A4=9A=E7=AB=AF=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E4=B8=8D=E5=86=8D=E4=B8=BB=E5=8A=A8=E8=BE=93=E5=87=BA?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=88=B0=E5=AF=B9=E5=BA=94=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-cli/src/build.ts | 2 +- packages/taro-cli/src/h5/index.ts | 2 +- packages/taro-cli/src/mini/helper.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/taro-cli/src/build.ts b/packages/taro-cli/src/build.ts index cac80a351249..b6b678b8ada8 100644 --- a/packages/taro-cli/src/build.ts +++ b/packages/taro-cli/src/build.ts @@ -11,7 +11,7 @@ import { IBuildConfig } from './util/types' export default function build (appPath, buildConfig: IBuildConfig) { const { type, watch, platform, port, release } = buildConfig const configDir = require(path.join(appPath, PROJECT_CONFIG))(_.merge) - const outputPath = path.join(appPath, `${configDir.outputRoot || CONFIG.OUTPUT_DIR}/${type}`) + const outputPath = path.join(appPath, configDir.outputRoot || CONFIG.OUTPUT_DIR) if (!fs.existsSync(outputPath)) { fs.ensureDirSync(outputPath) } else if (type !== BUILD_TYPES.H5 && (type !== BUILD_TYPES.QUICKAPP || !watch)) { diff --git a/packages/taro-cli/src/h5/index.ts b/packages/taro-cli/src/h5/index.ts index 530580f6e51d..c1053d072014 100644 --- a/packages/taro-cli/src/h5/index.ts +++ b/packages/taro-cli/src/h5/index.ts @@ -86,7 +86,7 @@ class Compiler { this.projectConfig = projectConfig const sourceDir = projectConfig.sourceRoot || CONFIG.SOURCE_DIR this.sourceRoot = sourceDir - const outputDir = `${projectConfig.outputRoot || CONFIG.OUTPUT_DIR}/h5` + const outputDir = projectConfig.outputRoot || CONFIG.OUTPUT_DIR this.outputDir = outputDir this.h5Config = projectConfig.h5 const routerConfig = this.h5Config.router diff --git a/packages/taro-cli/src/mini/helper.ts b/packages/taro-cli/src/mini/helper.ts index 87ce0f3f3306..1f3b8b9f184d 100644 --- a/packages/taro-cli/src/mini/helper.ts +++ b/packages/taro-cli/src/mini/helper.ts @@ -105,7 +105,7 @@ export function setBuildData (appPath: string, adapter: BUILD_TYPES): IBuildData const configDir = path.join(appPath, PROJECT_CONFIG) const projectConfig = require(configDir)(_.merge) const sourceDirName = projectConfig.sourceRoot || CONFIG.SOURCE_DIR - const outputDirName = `${projectConfig.outputRoot || CONFIG.OUTPUT_DIR}/${adapter}` + const outputDirName = projectConfig.outputRoot || CONFIG.OUTPUT_DIR const sourceDir = path.join(appPath, sourceDirName) const outputDir = path.join(appPath, outputDirName) const entryFilePath = resolveScriptPath(path.join(sourceDir, CONFIG.ENTRY))