fix(cli): 修复编译 ui 库及 plugin 时报错的问题，close #4965

NervJS · Dec 2, 2019 · 36ef638 · 36ef638
1 parent a42bc6e
commit 36ef638
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/packages/taro-cli/src/build.ts b/packages/taro-cli/src/build.ts
@@ -17,7 +17,6 @@ export default async function build (appPath, buildConfig: IBuildConfig) {
   } else if (type !== BUILD_TYPES.H5 && (type !== BUILD_TYPES.QUICKAPP || !watch)) {
     Util.emptyDirectory(outputPath)
   }
-  await Util.checkCliAndFrameworkVersion(appPath, type)
   switch (type) {
     case BUILD_TYPES.H5:
       buildForH5(appPath, { watch, port })

diff --git a/packages/taro-cli/src/h5/index.ts b/packages/taro-cli/src/h5/index.ts
@@ -21,7 +21,8 @@ import {
   promoteRelativePath,
   recursiveMerge,
   replaceAliasPath,
-  resolveScriptPath
+  resolveScriptPath,
+  checkCliAndFrameworkVersion
 } from '../util'
 import {
   convertAstExpressionToVariable as toVar,
@@ -1452,6 +1453,7 @@ export { Compiler }
 
 export async function build (appPath: string, buildConfig: IBuildConfig) {
   process.env.TARO_ENV = BUILD_TYPES.H5
+  await checkCliAndFrameworkVersion(appPath, BUILD_TYPES.H5)
   const compiler = new Compiler(appPath)
   await compiler.clean()
   await compiler.buildTemp()

diff --git a/packages/taro-cli/src/mini/index.ts b/packages/taro-cli/src/mini/index.ts
@@ -15,7 +15,8 @@ import {
   unzip,
   shouldUseYarn,
   shouldUseCnpm,
-  resolvePureScriptPath
+  resolvePureScriptPath,
+  checkCliAndFrameworkVersion
 } from '../util'
 import { processTypeEnum, BUILD_TYPES } from '../util/constants'
 import { IMiniAppBuildConfig } from '../util/types'
@@ -265,6 +266,7 @@ export async function build (
   const buildData = envHasBeenSet ? getBuildData() : setBuildData(appPath, adapter)
   const isQuickApp = adapter === BUILD_TYPES.QUICKAPP
   let quickappJSON
+  await checkCliAndFrameworkVersion(appPath, adapter)
   process.env.TARO_ENV = adapter
   if (!envHasBeenSet) {
     setIsProduction(process.env.NODE_ENV === 'production' || !watch)

diff --git a/packages/taro-cli/src/rn.ts b/packages/taro-cli/src/rn.ts
@@ -343,8 +343,9 @@ function installDep (path: string) {
 export { Compiler }
 
 export async function build (appPath: string, buildConfig: IBuildConfig) {
-  const {watch} = buildConfig
+  const { watch } = buildConfig
   process.env.TARO_ENV = BUILD_TYPES.RN
+  await Util.checkCliAndFrameworkVersion(appPath, BUILD_TYPES.RN)
   const compiler = new Compiler(appPath)
   fs.ensureDirSync(compiler.tempPath)
   const t0 = performance.now()

diff --git a/packages/taro-cli/src/util/index.ts b/packages/taro-cli/src/util/index.ts
@@ -490,7 +490,8 @@ export async function checkCliAndFrameworkVersion (appPath, buildAdapter) {
       process.exit(1)
     }
   } else {
-    printLog(processTypeEnum.WARNING, '依赖安装', chalk.red(`项目依赖 ${frameworkName} 未安装，或安装有误！`))
+    printLog(processTypeEnum.WARNING, '依赖安装', chalk.red(`项目依赖 ${frameworkName} 未安装，或安装有误，请重新安装此依赖！`))
+    process.exit(1)
   }
 }