refactor(transformer): 转换前先格式化 wxml

fix #4142 fix #3010
NervJS · Aug 16, 2019 · e4a6f93 · e4a6f93
1 parent af495de
commit e4a6f93
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/packages/taroize/package.json b/packages/taroize/package.json
@@ -27,6 +27,7 @@
     "babel-types": "^6.26.0",
     "babylon": "^6.18.0",
     "himalaya-wxml": "^1.1.0",
+    "html": "^1.0.0",
     "lodash": "^4.17.5",
     "typescript": "^3.0.1"
   },

diff --git a/packages/taroize/src/wxml.ts b/packages/taroize/src/wxml.ts
@@ -8,6 +8,7 @@ import { parseTemplate, parseModule } from './template'
 import { usedComponents, errors, globals } from './global'
 import { reserveKeyWords } from './constant'
 import { parse as parseFile } from 'babylon'
+const { prettyPrint } = require('html')
 
 const allCamelCase = (str: string) =>
   str.charAt(0).toUpperCase() + camelCase(str.substr(1))
@@ -298,6 +299,14 @@ export function parseWXML (dirPath: string, wxml?: string, parseImport?: boolean
   imports: Imports[]
   refIds: Set<string>
 } {
+  try {
+    wxml = prettyPrint(wxml, {
+      max_char: 0,
+      unformatted: ['text']
+    })
+  } catch (error) {
+    //
+  }
   if (!parseImport) {
     errors.length = 0
     usedComponents.clear()