fix(cli): 修复部分文件打包时不压缩的问题

NervJS · May 23, 2019 · 4699d02 · 4699d02
1 parent def3cab
commit 4699d02
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/packages/taro-cli/src/mini/astProcess.ts b/packages/taro-cli/src/mini/astProcess.ts
@@ -36,7 +36,8 @@ import {
   isAliasPath,
   replaceAliasPath,
   traverseObjectNode,
-  isQuickAppPkg
+  isQuickAppPkg,
+  getBabelConfig
 } from '../util'
 import {
   convertObjectToAstExpression,
@@ -476,8 +477,8 @@ export function parseAst (
                 npmOutputDir,
                 compileInclude,
                 env: projectConfig.env || {},
-                uglify: projectConfig!.plugins!.uglify || {},
-                babelConfig: projectConfig!.plugins!.babel || {}
+                uglify: projectConfig!.plugins!.uglify || {  enable: true  },
+                babelConfig: getBabelConfig(projectConfig!.plugins!.babel) || {}
               })
             } else {
               source.value = value
@@ -582,8 +583,8 @@ export function parseAst (
                   npmOutputDir,
                   compileInclude,
                   env: projectConfig.env || {},
-                  uglify: projectConfig!.plugins!.uglify || {},
-                  babelConfig: projectConfig!.plugins!.babel || {}
+                  uglify: projectConfig!.plugins!.uglify || {  enable: true  },
+                  babelConfig: getBabelConfig(projectConfig!.plugins!.babel) || {}
                 })
               } else {
                 args[0].value = value
@@ -869,8 +870,8 @@ export function parseAst (
           npmOutputDir,
           compileInclude,
           env: projectConfig.env || {},
-          uglify: projectConfig!.plugins!.uglify || {},
-          babelConfig: projectConfig!.plugins!.babel || {}
+          uglify: projectConfig!.plugins!.uglify || {  enable: true  },
+          babelConfig: getBabelConfig(projectConfig!.plugins!.babel) || {}
         }) : taroMiniAppFramework
         switch (type) {
           case PARSE_AST_TYPE.ENTRY:

diff --git a/packages/taro-cli/src/mini/compileScript.ts b/packages/taro-cli/src/mini/compileScript.ts
@@ -95,7 +95,7 @@ export function compileDepScripts (scriptFiles: string[], needUseBabel?: boolean
           }
           fs.ensureDirSync(path.dirname(outputItem))
           if (isProduction && needUseBabel) {
-            uglifyJS(resCode, item, appPath, projectConfig!.plugins!.uglify as TogglableOptions)
+            resCode = uglifyJS(resCode, item, appPath, projectConfig!.plugins!.uglify as TogglableOptions)
           }
           if (NODE_MODULES_REG.test(item)) {
             resCode = npmCodeHack(outputItem, resCode, buildAdapter)

diff --git a/packages/taro-cli/src/mini/compileStyle.ts b/packages/taro-cli/src/mini/compileStyle.ts
@@ -16,7 +16,8 @@ import {
 import {
   isNpmPkg,
   processStyleImports,
-  promoteRelativePath
+  promoteRelativePath,
+  getBabelConfig
 } from '../util'
 import { CSS_EXT, FILE_PROCESSOR_MAP, DEVICE_RATIO_NAME, BUILD_TYPES } from '../util/constants'
 import { IMiniAppConfig } from '../util/types'
@@ -222,8 +223,8 @@ export function compileDepStyles (outputFilePath: string, styleFiles: string[])
           npmOutputDir,
           compileInclude,
           env: projectConfig.env || {},
-          uglify: projectConfig!.plugins!.uglify || {},
-          babelConfig: projectConfig!.plugins!.babel || {}
+          uglify: projectConfig!.plugins!.uglify || {  enable: true  },
+          babelConfig: getBabelConfig(projectConfig!.plugins!.babel) || {}
         })
         const importRelativePath = promoteRelativePath(path.relative(filePath, npmInfo.main))
         return str.replace(stylePath, importRelativePath)

diff --git a/packages/taro-cli/src/mini/component.ts b/packages/taro-cli/src/mini/component.ts
@@ -250,7 +250,7 @@ export async function buildSingleComponent (
     if (!isQuickApp) {
       resCode = await compileScriptFile(resCode, component, outputComponentJSPath, buildAdapter)
       if (isProduction) {
-        uglifyJS(resCode, component, appPath, projectConfig!.plugins!.uglify as TogglableOptions)
+        resCode = uglifyJS(resCode, component, appPath, projectConfig!.plugins!.uglify as TogglableOptions)
       }
     } else {
       // 快应用编译，搜集创建组件 ux 文件

diff --git a/packages/taro-cli/src/mini/page.ts b/packages/taro-cli/src/mini/page.ts
@@ -156,7 +156,7 @@ export async function buildSinglePage (page: string) {
     if (!isQuickApp) {
       resCode = await compileScriptFile(resCode, pageJs, outputPageJSPath, buildAdapter)
       if (isProduction) {
-        uglifyJS(resCode, pageJs, appPath, projectConfig!.plugins!.uglify as TogglableOptions)
+        resCode = uglifyJS(resCode, pageJs, appPath, projectConfig!.plugins!.uglify as TogglableOptions)
       }
     } else {
       // 快应用编译，搜集创建页面 ux 文件