upgrade to parse5 2.0

Author: yyx990803

lib/parser.js

@@ -1,5 +1,4 @@
 var parse5 = require('parse5')
-var parser = new parse5.Parser(null, { locationInfo: true })
 var cache = require('lru-cache')(100)
 var SourceMapGenerator = require('source-map').SourceMapGenerator
 var hash = require('hash-sum')
@@ -22,14 +21,20 @@ module.exports = function (content, filename) {
     styleImports: []
   }
 
-  var fragment = parser.parseFragment(content)
+  var fragment = parse5.parseFragment(content, {
+    locationInfo: true
+  })
 
   fragment.childNodes.forEach(function (node) {
     var type = node.tagName
     var lang = getAttribute(node, 'lang')
     var src = getAttribute(node, 'src')
     var scoped = getAttribute(node, 'scoped') != null
 
+    if (!output[type]) {
+      return
+    }
+
     // node count check
     if (
       (type === 'script' || type === 'template') &&
@@ -63,25 +68,19 @@ module.exports = function (content, filename) {
       return
     }
 
-    if (!node.childNodes || !node.childNodes.length) {
+    // skip empty script/style tags
+    if (type !== 'template' && (!node.childNodes || !node.childNodes.length)) {
       return
     }
 
-    if (!output[type]) {
-      return
-    }
-
-    // Work around changes in parse5 >= 1.2.0
-    if (node.childNodes[0].nodeName === '#document-fragment') {
-      node = node.childNodes[0]
-      if (!node.childNodes.length) {
-        return
-      }
+    // template content is nested inside the content fragment
+    if (type === 'template') {
+      node = node.content
     }
 
     // extract part
-    var start = node.childNodes[0].__location.start
-    var end = node.childNodes[node.childNodes.length - 1].__location.end
+    var start = node.childNodes[0].__location.startOffset
+    var end = node.childNodes[node.childNodes.length - 1].__location.endOffset
     var result
     var lineOffset
     if (type === 'script') {

lib/template-rewriter.js

@@ -1,13 +1,11 @@
 var parse5 = require('parse5')
-var parser = new parse5.Parser()
-var serializer = new parse5.Serializer()
 var loaderUtils = require('loader-utils')
 
 module.exports = function (html) {
   this.cacheable()
   var query = loaderUtils.parseQuery(this.query)
   var id = query.id
-  var tree = parser.parseFragment(html)
+  var tree = parse5.parseFragment(html)
   walk(tree, function (node) {
     if (node.attrs) {
       node.attrs.push({
@@ -16,7 +14,7 @@ module.exports = function (html) {
       })
     }
   })
-  return serializer.serialize(tree)
+  return parse5.serialize(tree)
 }
 
 function walk (tree, fn) {

package.json

@@ -35,7 +35,7 @@
     "loader-utils": "^0.2.10",
     "lru-cache": "^2.7.0",
     "object-assign": "^4.0.0",
-    "parse5": "^1.5.0",
+    "parse5": "^2.0.2",
     "postcss": "^5.0.10",
     "postcss-selector-parser": "^1.1.2",
     "source-map": "^0.5.3"