upgrade to parse5 2.1

yyx990803 · yyx990803 · commit 91d417558c83 · 2016-01-05T15:26:25.000-05:00
diff --git a/lib/compiler.js b/lib/compiler.js
@@ -2,8 +2,6 @@ require('es6-promise').polyfill()
 var fs = require('fs')
 var path = require('path')
 var parse5 = require('parse5')
-var parser = new parse5.Parser()
-var serializer = new parse5.TreeSerializer()
 var hash = require('hash-sum')
 var compilers = require('./compilers')
 var options = require('./compilers/options')
@@ -79,7 +77,7 @@ compiler.compile = function (content, filePath, cb) {
   var id = '_v-' + hash(filePath || content)
 
   // parse the file into an HTML tree
-  var fragment = parser.parseFragment(content)
+  var fragment = parse5.parseFragment(content, { locationInfo: true })
 
   // check node numbers
   if (!validateNodeCount(fragment)) {
@@ -206,7 +204,7 @@ function isScoped (node) {
  */
 
 function processTemplate (node, filePath, id, hasScopedStyle) {
-  var template = checkSrc(node, filePath) || serializeTemplate(node)
+  var template = checkSrc(node, filePath) || parse5.serialize(node.content)
   var lang = checkLang(node)
   return compileAsPromise('template', template, lang, filePath)
     .then(function (res) {
@@ -234,7 +232,7 @@ function processTemplate (node, filePath, id, hasScopedStyle) {
  */
 
 function processStyle (node, filePath, id) {
-  var style = checkSrc(node, filePath) || serializer.serialize(node)
+  var style = checkSrc(node, filePath) || parse5.serialize(node)
   var lang = checkLang(node)
   return compileAsPromise('style', style, lang, filePath)
     .then(function (res) {
@@ -255,7 +253,7 @@ function processScript (node, filePath, content) {
   var lang = checkLang(node) || 'babel'
   var script = checkSrc(node, filePath)
   if (!script) {
-    script = serializer.serialize(node)
+    script = parse5.serialize(node)
     // pad the script to ensure correct line number for syntax errors
     var location = content.indexOf(script)
     var before = padContent(content.slice(0, location))
@@ -318,15 +316,6 @@ function checkSrc (node, filePath) {
   }
 }
 
-// Work around changes in parse5 >= 1.2.0
-function serializeTemplate (node) {
-  var childNode = node.childNodes[0]
-  if (childNode && childNode.nodeName === '#document-fragment') {
-    return serializer.serialize(childNode)
-  }
-  return serializer.serialize(node)
-}
-
 /**
  * Compile a piece of source code with an async compiler and
  * return a Promise.
@@ -386,7 +375,7 @@ function extract (parts, type) {
 
 function padContent (content, lang) {
   return content
-    .split(/\n\r|\n|\r/g)
+    .split(/\r?\n/g)
     .map(function () { return '' })
     .join('\n')
 }
diff --git a/lib/template-rewriter.js b/lib/template-rewriter.js
@@ -1,6 +1,4 @@
 var parse5 = require('parse5')
-var parser = new parse5.Parser()
-var serializer = new parse5.Serializer()
 var cache = require('lru-cache')(100)
 
 /**
@@ -17,7 +15,7 @@ module.exports = function (id, html) {
   if (val) {
     return Promise.resolve(val)
   }
-  var tree = parser.parseFragment(html)
+  var tree = parse5.parseFragment(html)
   walk(tree, function (node) {
     if (node.attrs) {
       node.attrs.push({
@@ -27,7 +25,7 @@ module.exports = function (id, html) {
     }
   })
   val = {
-    source: serializer.serialize(tree),
+    source: parse5.serialize(tree),
     type: 'template'
   }
   cache.set(key, val)
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
     "html-minifier": "^1.0.0",
     "lru-cache": "^2.7.0",
     "object-assign": "^4.0.1",
-    "parse5": "^1.5.0",
+    "parse5": "^2.1.0",
     "postcss": "^5.0.10",
     "postcss-selector-parser": "^1.3.0",
     "through": "^2.3.6"
