Merge branch 'master' into regex-directive

Scrum · web-flow · commit 0da0c81d1dac · 2018-01-19T11:49:35.000+03:00
diff --git a/index.js b/index.js
@@ -40,7 +40,7 @@ function postHTMLParser(html, options) {
     }
 
     function parserDirective(name, data) {
-        var directives = objectAssign(defaultDirectives, options.directives);
+        var directives = [].concat(defaultDirectives, options.directives || []);
         var last = bufArray.last();
 
         var tagName;
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "posthtml-parser",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Parse HTML/XML to PostHTMLTree",
   "keywords": [
     "html",

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ function postHTMLParser(html, options) {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`function parserDirective(name, data) {`
`43`		`- var directives = objectAssign(defaultDirectives, options.directives);`
	`43`	`+ var directives = [].concat(defaultDirectives, options.directives \|\| []);`
`44`	`44`	`var last = bufArray.last();`
`45`	`45`
`46`	`46`	`var tagName;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "posthtml-parser",`
`3`		`- "version": "0.3.2",`
	`3`	`+ "version": "0.3.3",`
`4`	`4`	`"description": "Parse HTML/XML to PostHTMLTree",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"html",`