feat(taro-cli): 调整 rn 编译配置

NervJS · Jan 7, 2020 · 8d6f9b3 · 8d6f9b3
1 parent e7134e6
commit 8d6f9b3
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 7 deletions.
diff --git a/packages/taro-cli/src/plugin.ts b/packages/taro-cli/src/plugin.ts
@@ -35,7 +35,7 @@ import {
 import { buildDepComponents, buildSingleComponent, getComponentsNamedMap } from './mini/component'
 import { compileDepScripts, initCompileScripts } from './mini/compileScript'
 import { compileDepStyles, initCompileStyles } from './mini/compileStyle'
-import { IBuildConfig } from './util/types'
+import { IBuildOptions } from './util/types'
 
 const PLUGIN_ROOT = 'plugin/'
 const DOC_ROOT = 'doc/'
@@ -45,7 +45,7 @@ const PLUGIN_MOCK_JSON = 'plugin-mock.json'
 
 let isCopyingFiles = {}
 
-export async function build (appPath: string, { watch, platform }: IBuildConfig) {
+export async function build (appPath: string, { watch, platform }: IBuildOptions) {
   switch (platform) {
     case BUILD_TYPES.WEAPP:
       buildWxPlugin(appPath, { watch })

diff --git a/packages/taro-cli/src/rn.ts b/packages/taro-cli/src/rn.ts
@@ -6,14 +6,15 @@ import * as chokidar from 'chokidar'
 import chalk from 'chalk'
 import * as _ from 'lodash'
 import * as klaw from 'klaw'
+import { TogglableOptions, ICommonPlugin, IOption } from '@tarojs/taro/types/compile'
 
 import * as Util from './util'
 import CONFIG from './config'
 import * as StyleProcess from './rn/styleProcess'
 import { parseJSCode as transformJSCode } from './rn/transformJS'
 import { PROJECT_CONFIG, processTypeEnum, REG_STYLE, REG_SCRIPTS, REG_TYPESCRIPT, BUILD_TYPES } from './util/constants'
 import { convertToJDReact } from './jdreact/convert_to_jdreact'
-import { IBuildConfig } from './util/types'
+import { IBuildOptions } from './util/types'
 // import { Error } from 'tslint/lib/error'
 
 let isBuildingStyles = {}
@@ -44,7 +45,13 @@ class Compiler {
   entryFilePath: string
   entryFileName: string
   entryBaseName: string
-  pluginsConfig
+  babel: TogglableOptions
+  csso: TogglableOptions
+  uglify: TogglableOptions
+  sass: IOption
+  less: IOption
+  stylus: IOption
+  plugins: ICommonPlugin[]
   rnConfig
   hasJDReactOutput: boolean
   babelConfig: any
@@ -59,7 +66,13 @@ class Compiler {
     this.entryFilePath = Util.resolveScriptPath(path.join(this.sourceDir, CONFIG.ENTRY))
     this.entryFileName = path.basename(this.entryFilePath)
     this.entryBaseName = path.basename(this.entryFilePath, path.extname(this.entryFileName))
-    this.pluginsConfig = this.projectConfig.plugins || {}
+    this.babel = this.projectConfig.babel
+    this.csso = this.projectConfig.csso
+    this.uglify = this.projectConfig.uglify
+    this.plugins = this.projectConfig.plugins
+    this.sass = this.projectConfig.sass
+    this.stylus = this.projectConfig.stylus
+    this.less = this.projectConfig.less
     this.rnConfig = this.projectConfig.rn || {}
     this.babelConfig = this.projectConfig.plugins.babel // 用来配置 babel
 
@@ -89,7 +102,14 @@ class Compiler {
       const filePath = path.join(p)
       const fileExt = path.extname(filePath)
       Util.printLog(processTypeEnum.COMPILE, _.camelCase(fileExt).toUpperCase(), filePath)
-      return StyleProcess.loadStyle({filePath, pluginsConfig: this.pluginsConfig}, this.appPath)
+      return StyleProcess.loadStyle({
+        filePath,
+        pluginsConfig: {
+          sass: this.sass,
+          less: this.less,
+          stylus: this.stylus
+        }
+      }, this.appPath)
     })).then(resList => { // postcss
       return Promise.all(resList.map(item => {
         return StyleProcess.postCSS({...item as { css: string, filePath: string }, projectConfig: this.projectConfig})
@@ -345,7 +365,7 @@ function installDep (path: string) {
 
 export { Compiler }
 
-export async function build (appPath: string, buildConfig: IBuildConfig) {
+export async function build (appPath: string, buildConfig: IBuildOptions) {
   const { watch } = buildConfig
   process.env.TARO_ENV = BUILD_TYPES.RN
   await Util.checkCliAndFrameworkVersion(appPath, BUILD_TYPES.RN)